summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYves-Alexis Perez <corsac@corsac.net>2012-06-29 21:24:28 +0200
committerYves-Alexis Perez <corsac@corsac.net>2012-06-29 21:24:28 +0200
commit016211f98b9fb4b75cdd19f7e4c640c0dbfd92f4 (patch)
tree0de48222fe15da81d72bc6072fb05023a21d7501
parenta8aa8cbc26cb2289bbaf806051ca9e5013cc07f1 (diff)
downloadvyos-strongswan-016211f98b9fb4b75cdd19f7e4c640c0dbfd92f4.tar.gz
vyos-strongswan-016211f98b9fb4b75cdd19f7e4c640c0dbfd92f4.zip
update copyright (add expat/mit licenses)
-rw-r--r--debian/copyright31
1 files changed, 30 insertions, 1 deletions
diff --git a/debian/copyright b/debian/copyright
index 833037fc9..0be8bf231 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2205,13 +2205,42 @@ Copyright: 2010, Martin Willi
2010, Thomas Egerer
2010, revosec AG
2010, secunet Security Networks AG
-License: MIT and GPL-2+ with OpenSSL exception
+License: Expat and GPL-2+ with OpenSSL exception
Files: src/libstrongswan/plugins/pkcs11/pkcs11.h
Copyright: 2006, Andreas Jellinghaus
2006-2007, g10 Code GmbH
License: MIT
+License: Expat
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+
+License: MIT
+ This file is free software; as a special exception the author gives
+ unlimited permission to copy and/or distribute it, with or without
+ modifications, as long as this notice is preserved.
+ .
+ This file is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY, to the extent permitted by law; without even
+ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE.
+
License: GPL
On Debian systems, the complete text of the GNU General
Public License can be found in