From: Alan T. DeKok Date: Mon, 21 Dec 2009 12:53:13 +0000 (+0100) Subject: Sync with Debian to enable SSL X-Git-Tag: release_2_1_8~6 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=178c4a30d30d0811885ca7647f2a2dd938d57fee;p=thirdparty%2Ffreeradius-server.git Sync with Debian to enable SSL --- diff --git a/debian/changelog b/debian/changelog index b46a1b87dcc..53f23d45e42 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -freeradius (2.1.7+git) experimental; urgency=low +freeradius (2.1.8+git) experimental; urgency=low * Unreleased. - -- Josip Rodin Fri, 27 Nov 2009 16:03:31 +0100 + -- Josip Rodin Mon, 21 Dec 2009 13:04:52 +0100 freeradius (2.1.7+dfsg-2) unstable; urgency=low diff --git a/debian/copyright b/debian/copyright index d4eab2cb079..c8669155a6c 100644 --- a/debian/copyright +++ b/debian/copyright @@ -73,6 +73,7 @@ On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-2 file. -- + /usr/lib/freeradius/libradius* is under the GNU LGPL version 2. This library is free software; you can redistribute it and/or @@ -84,13 +85,24 @@ On Debian systems, the complete text of the GNU Lesser General Public License can be found in /usr/share/common-licenses/LGPL. -- -Some GPL parts of this software depend on OpenSSL, the combination of -which cannot be distributed in compiled binary form. The following -modules cannot be enabled as they directly depend on OpenSSL: -rlm_eap_peap -rlm_eap_tls -rlm_eap_ttls +src/LICENSE.openssl includes a modification to the main LICENSE file, +which is GPLv2. It applies only to the files in the "src" directory. +(That directory contains the source code which has links to OpenSSL +and from which the Debian binaries are produced.) + +In addition, as a special exception, the copyright holders give +permission to link the code of this program with the OpenSSL library, +and distribute linked combinations including the two. +You must obey the GNU General Public License in all respects +for all of the code used other than OpenSSL. If you modify +file(s) with this exception, you may extend this exception to your +version of the file(s), but you are not obligated to do so. If you +do not wish to do so, delete this exception statement from your +version. If you delete this exception statement from all source +files in the program, then also delete it here. + +-- The Debian packaging is (C) 2008, Stephen Gran and is licensed under the GPL, see /usr/share/common-licenses/GPL. diff --git a/debian/rules b/debian/rules index db6cd19e38e..e57cca47a17 100755 --- a/debian/rules +++ b/debian/rules @@ -82,14 +82,9 @@ endif --with-large-files --with-udpfromto --with-edir \ --enable-developer \ --config-cache \ - --without-rlm_eap_tls \ - --without-rlm_eap_ttls \ - --without-rlm_eap_peap \ --without-rlm_eap_tnc \ - --without-rlm_otp \ --with-rlm_sql_postgresql_lib_dir=`pg_config --libdir` \ --with-rlm_sql_postgresql_include_dir=`pg_config --includedir` \ - --without-openssl \ --without-rlm_eap_ikev2 \ --without-rlm_sql_oracle \ --without-rlm_sql_unixodbc \ @@ -179,12 +174,6 @@ install-arch: build-arch-stamp dh_strip -a --dbg-package=freeradius-dbg dh_makeshlibs -a -n - for pkg in ${pkgs} ; do \ - if dh_shlibdeps -p $$pkg -- -O 2>/dev/null | grep -q libssl; then \ - echo "$$pkg links to openssl" ;\ - exit 1 ;\ - fi ;\ - done dh_shlibdeps binary-common: