updated debian packages to 4.2.12, supporting EAP-MSCHAPv2

10 files changed, 57 insertions, 7 deletions

diff --git a/packages/network-manager-strongswan/debian/changelog b/packages/network-manager-strongswan/debian/changelog
index f00d53d57..3091b139a 100644
--- a/packages/network-manager-strongswan/debian/changelog
+++ b/packages/network-manager-strongswan/debian/changelog
@@ -1,3 +1,9 @@
+network-manager-strongswan (1.0.0-2~ppa1~intrepid1) intrepid; urgency=low
+
+  * depend on EAP-MD5 and EAP-MSCHAPv2 plugins
+
+ -- Martin Willi <martin@strongswan.org>  Mon, 23 Feb 2009 14:28:56 +0100
+
 network-manager-strongswan (1.0.0-1~ppa1~intrepid1) intrepid; urgency=low
 
   * new build based on modular strongSwan packages
diff --git a/packages/network-manager-strongswan/debian/control b/packages/network-manager-strongswan/debian/control
index 87aab1088..04becde8d 100644
--- a/packages/network-manager-strongswan/debian/control
+++ b/packages/network-manager-strongswan/debian/control
@@ -15,7 +15,7 @@ Standards-Version: 3.8.0
 
 Package: network-manager-strongswan
 Architecture: any
-Depends: strongswan-nm, strongswan-eap-gtc, strongswan-agent, strongswan-openssl|strongswan-crypto-plugins
+Depends: strongswan-nm, strongswan-eap-gtc, strongswan-eap-md5, strongswan-eap-mschapv2, strongswan-agent, strongswan-openssl|strongswan-crypto-plugins
 Description: network management framework (strongSwan plugin)
  NetworkManager attempts to keep an active network connection available at
  all times.  It is intended primarily for laptops where it allows easy
diff --git a/packages/strongswan/Makefile b/packages/strongswan/Makefile
index 11f166c55..623dea16e 100644
--- a/packages/strongswan/Makefile
+++ b/packages/strongswan/Makefile
@@ -1,6 +1,6 @@
 
 SOURCE:=../../build/nm
-VERSION:=4.2.11
+VERSION:=4.2.12
 
 source:	prepare
 	cd build/strongswan-$(VERSION) && debuild -S
diff --git a/packages/strongswan/debian/changelog b/packages/strongswan/debian/changelog
index 5435cea03..b2b88182d 100644
--- a/packages/strongswan/debian/changelog
+++ b/packages/strongswan/debian/changelog
@@ -1,3 +1,9 @@
+strongswan (4.2.12-4~ppa1~intrepid1) intrepid; urgency=low
+
+  * added support for MSCHAPv2 EAP method
+
+ -- Martin Willi <martin@strongswan.org>  Mon, 23 Feb 2009 14:23:03 +0100
+
 strongswan (4.2.11-9~ppa1~intrepid1) intrepid; urgency=low
 
   * added missing kernel-netlink plugin
diff --git a/packages/strongswan/debian/control b/packages/strongswan/debian/control
index cbfdd1465..b69dd16c7 100644
--- a/packages/strongswan/debian/control
+++ b/packages/strongswan/debian/control
@@ -103,7 +103,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, libgmp3c2 (>= 4.1.4)
 Description: strongSwan standalone crypto plugins
  This package contains a set of crypto plugins for libstrongswan, all
- implemented in software. It provides SHA1/SHA2/MD5 hash implementations,
+ implemented in software. It provides SHA1/SHA2/MD5/MD4 hash implementations,
  AES, single and tripple DES encryption algorithms and a RSA and Diffie-Hellman
  implementation based on the GNU Multi Precision library.
 
@@ -155,6 +155,14 @@ Description: strongSwan EAP plugin implementing the MD5 (CHAP) method
  The EAP-MD5 method allows username/password authentication with the IKEv2
  keying daemon charon.
 
+Package: strongswan-eap-mschapv2
+Architecture: any
+Depends: ${shlibs:Depends}, strongswan-charon
+Description: strongSwan EAP plugin implementing the MSCHAPv2 method
+ The EAP-MSCHAPv2 method allows username/password authentication with the IKEv2
+ keying daemon charon. It is designed work in conjunction with Windows 7
+ Agile VPN clients or with Windows 2008 R2 Servers.
+
 Package: strongswan-nm
 Architecture: any
 Depends: ${shlibs:Depends}, strongswan-charon, network-manager (>= 0.7~~svn20080818)
diff --git a/packages/strongswan/debian/rules b/packages/strongswan/debian/rules
index f02a1049c..00f69d788 100755
--- a/packages/strongswan/debian/rules
+++ b/packages/strongswan/debian/rules
@@ -5,10 +5,10 @@
 CC = gcc
 CFLAGS = -Wall -Wno-format -Wno-pointer-sign -Wno-strict-aliasing -g
 CONFIGURE_ARGS = \
-	--disable-fips-prf --enable-openssl --enable-nm --enable-ldap \
-	--enable-eap-gtc --enable-eap-md5 --enable-agent --enable-curl \
-	--sysconfdir=/etc --prefix=/usr --libexecdir=/usr/lib \
-	--with-ipsecdir=/usr/lib/strongswan
+	--disable-fips-prf --enable-openssl --enable-md4 --enable-nm \
+	--enable-agent --enable-eap-gtc --enable-eap-md5 --enable-eap-mschapv2 \
+	--enable-ldap --enable-curl --sysconfdir=/etc --prefix=/usr \
+	--libexecdir=/usr/lib --with-ipsecdir=/usr/lib/strongswan
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -O2
diff --git a/packages/strongswan/debian/strongswan-crypto-plugins.copyright b/packages/strongswan/debian/strongswan-crypto-plugins.copyright
index ae48ea43e..352c04833 100644
--- a/packages/strongswan/debian/strongswan-crypto-plugins.copyright
+++ b/packages/strongswan/debian/strongswan-crypto-plugins.copyright
@@ -5,6 +5,7 @@ Files: src/libstrongswan/plugins/aes/*
 Files: src/libstrongswan/plugins/sha1/*
 Files: src/libstrongswan/plugins/sha2/*
 Files: src/libstrongswan/plugins/md5/*
+Files: src/libstrongswan/plugins/md4/*
 Files: src/libstrongswan/plugins/des/*
 Files: src/libstrongswan/plugins/gmp/*
 License: GPL-2
@@ -29,6 +30,25 @@ License:
  .
  These notices must be retained in any copies of any part of this
  documentation and/or software.
+Files: src/libstrongswan/plugins/md4/md4_hasher.c
+License:
+ License to copy and use this software is granted provided that it
+ is identified as the "RSA Data Security, Inc. MD4 Message-Digest
+ Algorithm" in all material mentioning or referencing this software
+ or this function.
+ .
+ License is also granted to make and use derivative works provided
+ that such works are identified as "derived from the RSA Data
+ Security, Inc. MD4 Message-Digest Algorithm" in all material
+ mentioning or referencing the derived work.
+ .
+ RSA Data Security, Inc. makes no representations concerning either
+ the merchantability of this software or the suitability of this
+ software for any particular purpose. It is provided "as is"
+ without express or implied warranty of any kind.
+ .
+ These notices must be retained in any copies of any part of this
+ documentation and/or software.
 Files: src/libstrongswan/plugins/des/des_crypter.c
 License:
  This library is free for commercial and non-commercial use as long as
diff --git a/packages/strongswan/debian/strongswan-crypto-plugins.install b/packages/strongswan/debian/strongswan-crypto-plugins.install
index 026b0bfb4..b24ab9213 100644
--- a/packages/strongswan/debian/strongswan-crypto-plugins.install
+++ b/packages/strongswan/debian/strongswan-crypto-plugins.install
@@ -1,6 +1,7 @@
 usr/lib/strongswan/plugins/libstrongswan-sha1.so*	usr/lib/strongswan/plugins/
 usr/lib/strongswan/plugins/libstrongswan-sha2.so*	usr/lib/strongswan/plugins/
 usr/lib/strongswan/plugins/libstrongswan-md5.so*	usr/lib/strongswan/plugins/
+usr/lib/strongswan/plugins/libstrongswan-md4.so*	usr/lib/strongswan/plugins/
 usr/lib/strongswan/plugins/libstrongswan-aes.so*	usr/lib/strongswan/plugins/
 usr/lib/strongswan/plugins/libstrongswan-des.so*	usr/lib/strongswan/plugins/
 usr/lib/strongswan/plugins/libstrongswan-gmp.so*	usr/lib/strongswan/plugins/
diff --git a/packages/strongswan/debian/strongswan-eap-mschapv2.copyright b/packages/strongswan/debian/strongswan-eap-mschapv2.copyright
new file mode 100644
index 000000000..52ed766bf
--- /dev/null
+++ b/packages/strongswan/debian/strongswan-eap-mschapv2.copyright
@@ -0,0 +1,7 @@
+Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=437
+Upstream-Name: strongSwan
+Upstream-Source: http://download.strongswan.org
+Files: src/charon/plugins/eap_mschapv2
+License: GPL-2
+ On Debian systems the full text of the GNU General Public License can be found
+ in the `/usr/share/common-licenses/GPL-2' file.
diff --git a/packages/strongswan/debian/strongswan-eap-mschapv2.install b/packages/strongswan/debian/strongswan-eap-mschapv2.install
new file mode 100644
index 000000000..ee280aeb8
--- /dev/null
+++ b/packages/strongswan/debian/strongswan-eap-mschapv2.install
@@ -0,0 +1,2 @@
+usr/lib/strongswan/plugins/libstrongswan-eapmschapv2.so*	usr/lib/strongswan/plugins/
+