diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/patches/02_add-LICENSE.patch | 52 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 1 insertions, 53 deletions
diff --git a/debian/changelog b/debian/changelog index 6bddb0971..11305f9db 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ strongswan (5.0.1-1) UNRELEASED; urgency=low * New upstream release. * debian/patches: - 01_fix-manpages refreshed. + - 02_add-LICENSE dropped, included upstream. -- Yves-Alexis Perez <corsac@debian.org> Wed, 02 Jan 2013 14:18:34 +0100 diff --git a/debian/patches/02_add-LICENSE.patch b/debian/patches/02_add-LICENSE.patch deleted file mode 100644 index 60e2536c2..000000000 --- a/debian/patches/02_add-LICENSE.patch +++ /dev/null @@ -1,52 +0,0 @@ -Index: strongswan/LICENSE -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ strongswan/LICENSE 2012-06-29 15:32:05.809212661 +0200 -@@ -0,0 +1,47 @@ -+Except for code in the blowfish, des, md4 and md5 plugins (see below) the -+following terms apply: -+ -+For copyright information see the headers of individual source files. -+ -+This program is free software; you can redistribute it and/or modify it under -+the terms of the GNU General Public License as published by the Free Software -+Foundation; either version 2 of the License, or (at your option) any later -+version. -+ -+This program is distributed in the hope that it will be useful, but WITHOUT ANY -+WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A -+PARTICULAR PURPOSE. See the GNU General Public License for more details. -+ -+You should have received a copy of the GNU General Public License along with -+this program; if not, see <http://www.gnu.org/licenses>. -+ -+Linking strongSwan statically or dynamically with other modules is making a -+combined work based on strongSwan. Thus, the terms and conditions of the GNU -+General Public License cover the whole combination. -+ -+In addition, as a special exception, the copyright holders of strongSwan give -+you permission to combine strongSwan with free software programs or libraries -+that are released under the GNU LGPL and with code included in the standard -+release of the OpenSSL project's OpenSSL library under the OpenSSL or SSLeay -+licenses (or modified versions of such code, with unchanged license). You may -+copy and distribute such a system following the terms of the GNU GPL for -+strongSwan and the licenses of the other code concerned, provided that you -+include the source code of that other code when and as the GNU GPL requires -+distribution of source code. -+ -+Note that people who make modified versions of strongSwan are not obligated to -+grant this special exception for their modified versions; it is their choice -+whether to do so. The GNU General Public License gives permission to release a -+modified version without this exception; this exception also makes it possible -+to release a modified version which carries forward this exception. -+ -+ -+The DES implementation in the des plugin and the Blowfish implementation in the -+blowfish plugin are under a BSD style license, see -+src/libstrongswan/plugins/des and src/libstrongswan/plugins/blowfish. -+Note that these parts have an advertising clause in it. -+ -+The MD4 and MD5 implementations in the md4 and md5 plugins are from RSA Data -+Security Inc., so this package must include the following phrase: -+"derived from the RSA Data Security, Inc. MD5 Message-Digest Algorithm". -+ diff --git a/debian/patches/series b/debian/patches/series index ff06f2f04..266c16194 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ 01_fix-manpages.patch -02_add-LICENSE.patch 03_Pass-lo-as-faked-tundev-to-NM-as-it-now-needs-a-vali.patch 04-Fixed-IPv6-source-address-lookup.patch |