Refresh patches, remove unneeded

9 files changed, 36 insertions, 100 deletions

diff --git a/debian/changelog b/debian/changelog
index b8122f8..13dc5f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 openvpn (2.3.5-1) unstable; urgency=medium
 
-  * New upstream release
+  * New upstream release. Removed patches applied upstream:
+    client_connect_tmp_files.patch 
+    better_systemd_detection.patch
 
  -- Alberto Gonzalez Iniesta <agi@inittab.org>  Wed, 29 Oct 2014 17:44:06 +0100
 
diff --git a/debian/patches/better_systemd_detection.patch b/debian/patches/better_systemd_detection.patch
deleted file mode 100644
index 0270075..0000000
--- a/debian/patches/better_systemd_detection.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: Improved systemd detection for password prompt
-Author: Martin Pitt <martinpitt@gnome.org>
-Bug-Debian: http://bugs.debian.org/747265
-Bug: https://community.openvpn.net/openvpn/ticket/274
-Origin: upstream, https://community.openvpn.net/openvpn/attachment/ticket/274/0001-Update-systemd-check-to-current-upstream-version.patch
-Index: openvpn/src/openvpn/console.c
-===================================================================
---- openvpn.orig/src/openvpn/console.c	2012-11-05 16:29:30.000000000 +0100
-+++ openvpn/src/openvpn/console.c	2014-05-14 13:00:24.253185771 +0200
-@@ -145,13 +145,8 @@
- {
-   struct stat a, b;
- 
--  /* We simply test whether the systemd cgroup hierarchy is
--   * mounted */
--
--  return (lstat("/sys/fs/cgroup", &a) == 0)
--	  && (lstat("/sys/fs/cgroup/systemd", &b) == 0)
--	  && (a.st_dev != b.st_dev);
--
-+  /* mirror what upstream sd_booted() does */
-+  return (access("/run/systemd/system", F_OK) >= 0);
- }
- 
- static bool
diff --git a/debian/patches/client_connect_tmp_files.patch b/debian/patches/client_connect_tmp_files.patch
deleted file mode 100644
index 6770287..0000000
--- a/debian/patches/client_connect_tmp_files.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: openvpn/src/openvpn/multi.c
-===================================================================
---- openvpn.orig/src/openvpn/multi.c	2014-10-13 18:23:19.340637895 +0200
-+++ openvpn/src/openvpn/multi.c	2014-10-13 18:23:19.336637895 +0200
-@@ -1452,10 +1452,6 @@
- 			     option_types_found,
- 			     mi->context.c2.es);
- 
--      if (!platform_unlink (dc_file))
--	msg (D_MULTI_ERRORS, "MULTI: problem deleting temporary file: %s",
--	     dc_file);
--
-       /*
-        * If the --client-connect script generates a config file
-        * with an --ifconfig-push directive, it will override any
-@@ -1698,6 +1694,11 @@
- 	      multi_client_connect_post (m, mi, dc_file, option_permissions_mask, &option_types_found);
- 	      ++cc_succeeded_count;
- 	    }
-+
-+	  if (!platform_unlink (dc_file))
-+	    msg (D_MULTI_ERRORS, "MULTI: problem deleting temporary file: %s",
-+		 dc_file);
-+
-         script_depr_failed:
- 	  argv_reset (&argv);
- 	}
-@@ -1751,6 +1752,11 @@
- 	    }
- 	  else
- 	    cc_succeeded = false;
-+
-+	  if (!platform_unlink (dc_file))
-+	    msg (D_MULTI_ERRORS, "MULTI: problem deleting temporary file: %s",
-+		 dc_file);
-+
-         script_failed:
- 	  argv_reset (&argv);
- 	}
diff --git a/debian/patches/close_socket_before_scripts.patch b/debian/patches/close_socket_before_scripts.patch
index 571b86d..8d84462 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	2014-05-14 12:58:44.345184272 +0200
-+++ openvpn/src/openvpn/socket.c	2014-05-14 12:58:44.341184271 +0200
-@@ -1493,6 +1493,10 @@
+--- openvpn.orig/src/openvpn/socket.c	2014-10-30 11:30:47.118658137 +0100
++++ openvpn/src/openvpn/socket.c	2014-10-30 11:30:47.114658136 +0100
+@@ -1492,6 +1492,10 @@
        resolve_bind_local (sock);
        resolve_remote (sock, 1, NULL, NULL);
      }
@@ -19,7 +19,7 @@ Index: openvpn/src/openvpn/socket.c
  }
  
  /* finalize socket initialization */
-@@ -1723,10 +1727,6 @@
+@@ -1722,10 +1726,6 @@
    /* set socket to non-blocking mode */
    set_nonblock (sock->sd);
  
diff --git a/debian/patches/debian_nogroup_for_sample_files.patch b/debian/patches/debian_nogroup_for_sample_files.patch
index 0517e2f..920c77d 100644
--- a/debian/patches/debian_nogroup_for_sample_files.patch
+++ b/debian/patches/debian_nogroup_for_sample_files.patch
@@ -3,9 +3,9 @@ Author: Alberto Gonzalez Iniesta <agi@inittab.org>
 Bug-Debian: http://bugs.debian.org/317987
 Index: openvpn/sample/sample-config-files/server.conf
 ===================================================================
---- openvpn.orig/sample/sample-config-files/server.conf	2012-11-05 16:29:30.264804667 +0100
-+++ openvpn/sample/sample-config-files/server.conf	2012-11-05 16:43:32.080979003 +0100
-@@ -260,7 +260,7 @@
+--- openvpn.orig/sample/sample-config-files/server.conf	2014-10-30 11:30:56.118658434 +0100
++++ openvpn/sample/sample-config-files/server.conf	2014-10-30 11:30:56.114658434 +0100
+@@ -267,7 +267,7 @@
  # You can uncomment this out on
  # non-Windows systems.
  ;user nobody
@@ -16,8 +16,8 @@ Index: openvpn/sample/sample-config-files/server.conf
  # accessing certain resources on restart
 Index: openvpn/sample/sample-config-files/tls-home.conf
 ===================================================================
---- openvpn.orig/sample/sample-config-files/tls-home.conf	2012-11-05 16:29:30.264804667 +0100
-+++ openvpn/sample/sample-config-files/tls-home.conf	2012-11-05 16:43:32.080979003 +0100
+--- openvpn.orig/sample/sample-config-files/tls-home.conf	2014-10-30 11:30:56.118658434 +0100
++++ openvpn/sample/sample-config-files/tls-home.conf	2014-10-30 11:30:56.114658434 +0100
 @@ -51,7 +51,7 @@
  # "nobody" after initialization
  # for extra security.
@@ -29,8 +29,8 @@ Index: openvpn/sample/sample-config-files/tls-home.conf
  # LZO compression, uncomment
 Index: openvpn/sample/sample-config-files/static-home.conf
 ===================================================================
---- openvpn.orig/sample/sample-config-files/static-home.conf	2012-11-05 16:29:30.264804667 +0100
-+++ openvpn/sample/sample-config-files/static-home.conf	2012-11-05 16:43:32.080979003 +0100
+--- openvpn.orig/sample/sample-config-files/static-home.conf	2014-10-30 11:30:56.118658434 +0100
++++ openvpn/sample/sample-config-files/static-home.conf	2014-10-30 11:30:56.114658434 +0100
 @@ -40,7 +40,7 @@
  # "nobody" after initialization
  # for extra security.
@@ -42,8 +42,8 @@ Index: openvpn/sample/sample-config-files/static-home.conf
  # LZO compression, uncomment
 Index: openvpn/sample/sample-config-files/static-office.conf
 ===================================================================
---- openvpn.orig/sample/sample-config-files/static-office.conf	2012-11-05 16:29:30.264804667 +0100
-+++ openvpn/sample/sample-config-files/static-office.conf	2012-11-05 16:43:32.084979030 +0100
+--- openvpn.orig/sample/sample-config-files/static-office.conf	2014-10-30 11:30:56.118658434 +0100
++++ openvpn/sample/sample-config-files/static-office.conf	2014-10-30 11:30:56.114658434 +0100
 @@ -37,7 +37,7 @@
  # "nobody" after initialization
  # for extra security.
@@ -55,8 +55,8 @@ Index: openvpn/sample/sample-config-files/static-office.conf
  # LZO compression, uncomment
 Index: openvpn/sample/sample-config-files/client.conf
 ===================================================================
---- openvpn.orig/sample/sample-config-files/client.conf	2012-11-05 16:29:30.264804667 +0100
-+++ openvpn/sample/sample-config-files/client.conf	2012-11-05 16:43:32.084979030 +0100
+--- openvpn.orig/sample/sample-config-files/client.conf	2014-10-30 11:30:56.118658434 +0100
++++ openvpn/sample/sample-config-files/client.conf	2014-10-30 11:30:56.114658434 +0100
 @@ -59,7 +59,7 @@
  
  # Downgrade privileges after initialization (non-Windows only)
@@ -68,8 +68,8 @@ Index: openvpn/sample/sample-config-files/client.conf
  persist-key
 Index: openvpn/sample/sample-config-files/tls-office.conf
 ===================================================================
---- openvpn.orig/sample/sample-config-files/tls-office.conf	2012-11-05 16:29:30.264804667 +0100
-+++ openvpn/sample/sample-config-files/tls-office.conf	2012-11-05 16:43:32.084979030 +0100
+--- openvpn.orig/sample/sample-config-files/tls-office.conf	2014-10-30 11:30:56.118658434 +0100
++++ openvpn/sample/sample-config-files/tls-office.conf	2014-10-30 11:30:56.114658434 +0100
 @@ -51,7 +51,7 @@
  # "nobody" after initialization
  # for extra security.
diff --git a/debian/patches/kfreebsd_support.patch b/debian/patches/kfreebsd_support.patch
index 03b5dd7..94c6727 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	2014-05-14 12:58:57.865184474 +0200
-+++ openvpn/src/openvpn/route.c	2014-05-14 12:58:57.861184474 +0200
-@@ -1416,7 +1416,7 @@
+--- openvpn.orig/src/openvpn/route.c	2014-10-30 11:31:13.226659001 +0100
++++ openvpn/src/openvpn/route.c	2014-10-30 11:31:13.222659000 +0100
+@@ -1419,7 +1419,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	2014-05-14 12:58:57.865184474 +0200
-+++ openvpn/src/openvpn/tun.c	2014-05-14 12:58:57.861184474 +0200
+--- openvpn.orig/src/openvpn/tun.c	2014-10-30 11:31:13.226659001 +0100
++++ openvpn/src/openvpn/tun.c	2014-10-30 11:31:13.226659001 +0100
 @@ -1095,7 +1095,7 @@
  	  add_route_connected_v6_net(tt, es);
  	}
diff --git a/debian/patches/manpage_fixes.patch b/debian/patches/manpage_fixes.patch
index 2e0e48b..d3d2393 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	2014-09-02 12:22:58.938244125 +0200
-+++ openvpn/doc/openvpn.8	2014-09-02 12:22:58.934244125 +0200
+--- openvpn.orig/doc/openvpn.8	2014-10-30 11:31:18.398659172 +0100
++++ openvpn/doc/openvpn.8	2014-10-30 11:31:18.394659172 +0100
 @@ -21,13 +21,13 @@
  .\"  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  .\"
@@ -29,7 +29,7 @@ Index: openvpn/doc/openvpn.8
  a disconnect will always generate a SIGTERM.
  .\"*********************************************************
  .TP
-@@ -3949,7 +3949,7 @@
+@@ -3952,7 +3952,7 @@
  This option is only relevant in UDP mode, i.e.
  when either
  .B \-\-proto udp
@@ -38,7 +38,7 @@ Index: openvpn/doc/openvpn.8
  .B \-\-proto
  option is specified.
  
-@@ -5087,7 +5087,7 @@
+@@ -5122,7 +5122,7 @@
  
  This option have changed behaviour in OpenVPN 2.3.  Earlier you had to
  define
@@ -47,7 +47,7 @@ Index: openvpn/doc/openvpn.8
  to use the SystemRoot environment variable, otherwise it defaulted to C:\\WINDOWS.
  It is not needed to use the
  .B env
-@@ -5130,7 +5130,7 @@
+@@ -5165,7 +5165,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
@@ -56,7 +56,7 @@ Index: openvpn/doc/openvpn.8
  If offset is positive, the DHCP server will masquerade as the IP
  address at network address + offset.
  If offset is negative, the DHCP server will masquerade as the IP
-@@ -5426,26 +5426,26 @@
+@@ -5461,26 +5461,26 @@
  .B \-\-topology
  , which has no effect on IPv6).
  .TP
@@ -91,7 +91,7 @@ Index: openvpn/doc/openvpn.8
  Specify an IPv6 address pool for dynamic assignment to clients.  The
  pool starts at
  .B ipv6addr
-@@ -5454,20 +5454,20 @@
+@@ -5489,20 +5489,20 @@
  setting controls the size of the pool.  Due to implementation details,
  the pool size must be between /64 and /112.
  .TP
@@ -119,7 +119,7 @@ Index: openvpn/doc/openvpn.8
  interact.
  
  .\"*********************************************************
-@@ -5953,7 +5953,7 @@
+@@ -5988,7 +5988,7 @@
  .TP
  .B peer_cert
  Temporary file name containing the client certificate upon
diff --git a/debian/patches/openvpn-pkcs11warn.patch b/debian/patches/openvpn-pkcs11warn.patch
index e899dcb..3d238cb 100644
--- a/debian/patches/openvpn-pkcs11warn.patch
+++ b/debian/patches/openvpn-pkcs11warn.patch
@@ -3,9 +3,9 @@ Author: Florian Kulzer <florian.kulzer+debian@icfo.es>
 Bug-Debian: http://bugs.debian.org/475353
 Index: openvpn/src/openvpn/options.c
 ===================================================================
---- openvpn.orig/src/openvpn/options.c	2014-09-02 12:22:48.334244586 +0200
-+++ openvpn/src/openvpn/options.c	2014-09-02 12:22:48.334244586 +0200
-@@ -6244,6 +6244,20 @@
+--- openvpn.orig/src/openvpn/options.c	2014-10-30 11:31:06.334658772 +0100
++++ openvpn/src/openvpn/options.c	2014-10-30 11:31:06.330658772 +0100
+@@ -6247,6 +6247,20 @@
      {
        VERIFY_PERMISSION (OPT_P_ROUTE_EXTRAS);
      }
diff --git a/debian/patches/series b/debian/patches/series
index a6f52d3..f37465a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,5 +6,3 @@ route_default_nil.patch
 kfreebsd_support.patch
 accommodate_typo.patch
 manpage_fixes.patch
-better_systemd_detection.patch
-client_connect_tmp_files.patch