New upstream release

4 files changed, 17 insertions, 11 deletions

diff --git a/debian/changelog b/debian/changelog
index b119c2a..2af6c8d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+openvpn (2.3.11-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Alberto Gonzalez Iniesta <agi@inittab.org>  Tue, 10 May 2016 17:41:53 +0200
+
 openvpn (2.3.10-1) unstable; urgency=medium
 
   * New upstream release. (Closes: #804368)
diff --git a/debian/patches/auth-pam_libpam_so_filename.patch b/debian/patches/auth-pam_libpam_so_filename.patch
index cc37600..479e111 100644
--- a/debian/patches/auth-pam_libpam_so_filename.patch
+++ b/debian/patches/auth-pam_libpam_so_filename.patch
@@ -3,9 +3,9 @@ Author: Alberto Gonzalez Iniesta <agi@inittab.org>
 Bug-Debian: http://bugs.debian.org/306335
 Index: openvpn/src/plugins/auth-pam/auth-pam.c
 ===================================================================
---- openvpn.orig/src/plugins/auth-pam/auth-pam.c	2016-01-20 12:02:15.161550568 +0100
-+++ openvpn/src/plugins/auth-pam/auth-pam.c	2016-01-20 12:02:15.157550612 +0100
-@@ -699,7 +699,7 @@
+--- openvpn.orig/src/plugins/auth-pam/auth-pam.c	2016-05-10 17:41:09.763626389 +0200
++++ openvpn/src/plugins/auth-pam/auth-pam.c	2016-05-10 17:41:09.763626389 +0200
+@@ -721,7 +721,7 @@
    struct user_pass up;
    int command;
  #ifdef USE_PAM_DLOPEN
diff --git a/debian/patches/close_socket_before_scripts.patch b/debian/patches/close_socket_before_scripts.patch
index 02fa5cc..3e53a68 100644
--- a/debian/patches/close_socket_before_scripts.patch
+++ b/debian/patches/close_socket_before_scripts.patch
@@ -6,9 +6,9 @@ Bug-Debian: http://bugs.debian.org/367716
 
 Index: openvpn/src/openvpn/socket.c
 ===================================================================
---- openvpn.orig/src/openvpn/socket.c	2016-01-20 12:02:23.237464287 +0100
-+++ openvpn/src/openvpn/socket.c	2016-01-20 12:02:23.233464331 +0100
-@@ -1492,6 +1492,10 @@
+--- openvpn.orig/src/openvpn/socket.c	2016-05-10 17:41:14.575583789 +0200
++++ openvpn/src/openvpn/socket.c	2016-05-10 17:41:14.571583824 +0200
+@@ -1502,6 +1502,10 @@
        resolve_bind_local (sock);
        resolve_remote (sock, 1, NULL, NULL);
      }
@@ -19,7 +19,7 @@ Index: openvpn/src/openvpn/socket.c
  }
  
  /* finalize socket initialization */
-@@ -1722,10 +1726,6 @@
+@@ -1732,10 +1736,6 @@
    /* set socket to non-blocking mode */
    set_nonblock (sock->sd);
  
diff --git a/debian/patches/manpage_fixes.patch b/debian/patches/manpage_fixes.patch
index e3dbb78..61f33b7 100644
--- a/debian/patches/manpage_fixes.patch
+++ b/debian/patches/manpage_fixes.patch
@@ -2,8 +2,8 @@ Description: Man page fixes
 Author: Alberto Gonzalez Iniesta <agi@inittab.org>
 Index: openvpn/doc/openvpn.8
 ===================================================================
---- openvpn.orig/doc/openvpn.8	2016-01-20 12:02:48.997189277 +0100
-+++ openvpn/doc/openvpn.8	2016-01-20 12:02:48.993189319 +0100
+--- openvpn.orig/doc/openvpn.8	2016-05-10 17:41:23.135507996 +0200
++++ openvpn/doc/openvpn.8	2016-05-10 17:41:23.131508031 +0200
 @@ -21,13 +21,13 @@
  .\"  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  .\"
@@ -20,7 +20,7 @@ Index: openvpn/doc/openvpn.8
  .\" .nf -- no formatting
  .\" .fi -- resume formatting
  .\" .ft 3 -- boldface
-@@ -4005,7 +4005,7 @@
+@@ -4006,7 +4006,7 @@
  This option is only relevant in UDP mode, i.e.
  when either
  .B \-\-proto udp
@@ -29,7 +29,7 @@ Index: openvpn/doc/openvpn.8
  .B \-\-proto
  option is specified.
  
-@@ -5277,7 +5277,7 @@
+@@ -5279,7 +5279,7 @@
  .B \-\-dev tun
  mode, OpenVPN will cause the DHCP server to masquerade as if it were
  coming from the remote endpoint.  The optional offset parameter is