Upstream 2.3.2

3 files changed, 16 insertions, 6 deletions

diff --git a/debian/changelog b/debian/changelog
index 2216963..5481ffd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+openvpn (2.3.2-1) unstable; urgency=low
+
+  * New upstream version.
+    Less messages about script security (Closes: #573129)
+  * Add --enable-pkcs11 to configure to avoid losing PKCS11.
+    Thanks Jaak Pruulmann-Vengerfeldt for noticing before the
+    upload! (Closes: #710085)
+
+ -- Alberto Gonzalez Iniesta <agi@inittab.org>  Mon, 03 Jun 2013 18:48:44 +0200
+
 openvpn (2.3.1-2) unstable; urgency=low
 
   * Add net-tools to Build-Depends. (Closes: #709108)
diff --git a/debian/patches/kfreebsd_support.patch b/debian/patches/kfreebsd_support.patch
index bfdee76..40403c7 100644
--- a/debian/patches/kfreebsd_support.patch
+++ b/debian/patches/kfreebsd_support.patch
@@ -3,9 +3,9 @@ Author: Gonéri Le Bouder <goneri@rulezlan.org>
 Bug-Debian: http://bugs.debian.org/626062
 Index: openvpn/src/openvpn/route.c
 ===================================================================
---- openvpn.orig/src/openvpn/route.c	2013-05-17 12:04:05.250078543 +0200
-+++ openvpn/src/openvpn/route.c	2013-05-17 12:04:05.242078504 +0200
-@@ -1415,7 +1415,7 @@
+--- openvpn.orig/src/openvpn/route.c	2013-06-03 18:48:16.854749664 +0200
++++ openvpn/src/openvpn/route.c	2013-06-03 18:48:16.842749606 +0200
+@@ -1416,7 +1416,7 @@
    argv_msg (D_ROUTE, &argv);
    status = openvpn_execve_check (&argv, es, 0, "ERROR: Solaris route add command failed");
  
@@ -16,8 +16,8 @@ Index: openvpn/src/openvpn/route.c
  		ROUTE_PATH);
 Index: openvpn/src/openvpn/tun.c
 ===================================================================
---- openvpn.orig/src/openvpn/tun.c	2013-05-17 12:04:05.250078543 +0200
-+++ openvpn/src/openvpn/tun.c	2013-05-17 12:04:05.246078520 +0200
+--- openvpn.orig/src/openvpn/tun.c	2013-06-03 18:48:16.854749664 +0200
++++ openvpn/src/openvpn/tun.c	2013-06-03 18:48:16.846749625 +0200
 @@ -1089,7 +1089,7 @@
  	  add_route_connected_v6_net(tt, es);
  	}
diff --git a/debian/rules b/debian/rules
index 6628bae..975881e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,7 +14,7 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 	dh $@
 
 override_dh_auto_configure:
-	dh_auto_configure -- $(shell dpkg-buildflags --export=configure) --enable-password-save --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --with-ifconfig-path=/sbin/ifconfig --with-route-path=$(ROUTE_PATH) --with-plugindir=\$${prefix}/lib/openvpn --includedir=\$${prefix}/include/openvpn
+	dh_auto_configure -- $(shell dpkg-buildflags --export=configure) --enable-password-save --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --with-ifconfig-path=/sbin/ifconfig --with-route-path=$(ROUTE_PATH) --with-plugindir=\$${prefix}/lib/openvpn --includedir=\$${prefix}/include/openvpn --enable-pkcs11
 
 
 override_dh_auto_build: