From 1aaf6c6f47f79d989550bec9fcfddd0aa38505ee Mon Sep 17 00:00:00 2001 From: Alberto Gonzalez Iniesta Date: Wed, 14 May 2014 13:06:35 +0200 Subject: Add patch to fix #747265, refresh patches --- debian/changelog | 2 ++ debian/patches/accommodate_typo.patch | 4 ++-- debian/patches/better_systemd_detection.patch | 25 ++++++++++++++++++++++++ debian/patches/close_socket_before_scripts.patch | 8 ++++---- debian/patches/kfreebsd_support.patch | 10 +++++----- debian/patches/manpage_fixes.patch | 18 ++++++++--------- debian/patches/openvpn-pkcs11warn.patch | 6 +++--- debian/patches/route_default_nil.patch | 6 +++--- debian/patches/series | 1 + 9 files changed, 54 insertions(+), 26 deletions(-) create mode 100644 debian/patches/better_systemd_detection.patch diff --git a/debian/changelog b/debian/changelog index 75aaa21..f9627cb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,8 @@ openvpn (2.3.3-1) experimental; urgency=medium * New upstream release * New openvpn.service to override LSB script when running systemd. (Closes: #700888) + * Apply patch from upstream's BTS to improve systemd detection. + (Closes: #747265) -- Alberto Gonzalez Iniesta Mon, 17 Mar 2014 19:40:12 +0100 diff --git a/debian/patches/accommodate_typo.patch b/debian/patches/accommodate_typo.patch index f3ffeaa..ac6be64 100644 --- a/debian/patches/accommodate_typo.patch +++ b/debian/patches/accommodate_typo.patch @@ -2,8 +2,8 @@ Description: Simple spelling fix Author: Alberto Gonzalez Iniesta Index: openvpn/src/openvpn/occ.c =================================================================== ---- openvpn.orig/src/openvpn/occ.c 2012-11-05 16:29:30.284804762 +0100 -+++ openvpn/src/openvpn/occ.c 2012-11-05 16:49:06.630637944 +0100 +--- openvpn.orig/src/openvpn/occ.c 2014-05-14 12:58:59.805184504 +0200 ++++ openvpn/src/openvpn/occ.c 2014-05-14 12:58:59.805184504 +0200 @@ -379,7 +379,7 @@ && c->c2.max_send_size_local > TUN_MTU_MIN && (c->c2.max_recv_size_remote < c->c2.max_send_size_local diff --git a/debian/patches/better_systemd_detection.patch b/debian/patches/better_systemd_detection.patch new file mode 100644 index 0000000..0270075 --- /dev/null +++ b/debian/patches/better_systemd_detection.patch @@ -0,0 +1,25 @@ +Description: Improved systemd detection for password prompt +Author: Martin Pitt +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/close_socket_before_scripts.patch b/debian/patches/close_socket_before_scripts.patch index dac7c91..571b86d 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 2012-11-05 16:29:30.292804798 +0100 -+++ openvpn/src/openvpn/socket.c 2012-11-05 16:42:09.072567383 +0100 -@@ -1491,6 +1491,10 @@ +--- 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 @@ resolve_bind_local (sock); resolve_remote (sock, 1, NULL, NULL); } @@ -19,7 +19,7 @@ Index: openvpn/src/openvpn/socket.c } /* finalize socket initialization */ -@@ -1721,10 +1725,6 @@ +@@ -1723,10 +1727,6 @@ /* set socket to non-blocking mode */ set_nonblock (sock->sd); diff --git a/debian/patches/kfreebsd_support.patch b/debian/patches/kfreebsd_support.patch index 40403c7..03b5dd7 100644 --- a/debian/patches/kfreebsd_support.patch +++ b/debian/patches/kfreebsd_support.patch @@ -3,8 +3,8 @@ Author: Gonéri Le Bouder Bug-Debian: http://bugs.debian.org/626062 Index: openvpn/src/openvpn/route.c =================================================================== ---- 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 +--- 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 @@ argv_msg (D_ROUTE, &argv); status = openvpn_execve_check (&argv, es, 0, "ERROR: Solaris route add command failed"); @@ -16,9 +16,9 @@ Index: openvpn/src/openvpn/route.c ROUTE_PATH); Index: openvpn/src/openvpn/tun.c =================================================================== ---- 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 @@ +--- 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 +@@ -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 0a8f677..f895759 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 Index: openvpn/doc/openvpn.8 =================================================================== ---- openvpn.orig/doc/openvpn.8 2013-05-17 12:04:17.678140187 +0200 -+++ openvpn/doc/openvpn.8 2013-05-17 12:04:17.674140147 +0200 +--- openvpn.orig/doc/openvpn.8 2014-05-14 12:59:02.201184539 +0200 ++++ openvpn/doc/openvpn.8 2014-05-14 12:59:02.197184539 +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 -@@ -2513,7 +2513,7 @@ +@@ -2568,7 +2568,7 @@ .B \-\-management-signal Send SIGUSR1 signal to OpenVPN if management session disconnects. This is useful when you wish to disconnect an OpenVPN session on @@ -29,7 +29,7 @@ Index: openvpn/doc/openvpn.8 a disconnect will always generate a SIGTERM. .\"********************************************************* .TP -@@ -3889,7 +3889,7 @@ +@@ -3944,7 +3944,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. -@@ -5012,7 +5012,7 @@ +@@ -5076,7 +5076,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 -@@ -5055,7 +5055,7 @@ +@@ -5119,7 +5119,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 -@@ -5349,26 +5349,26 @@ +@@ -5413,26 +5413,26 @@ documentation of the IPv6-related options. More documentation can be found on http://www.greenie.net/ipv6/openvpn.html. .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 -@@ -5376,20 +5376,20 @@ +@@ -5440,20 +5440,20 @@ .B /bits setting controls the size of the pool. .TP @@ -119,7 +119,7 @@ Index: openvpn/doc/openvpn.8 interact. .\"********************************************************* -@@ -5875,7 +5875,7 @@ +@@ -5939,7 +5939,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 1a1b50c..20bb0f0 100644 --- a/debian/patches/openvpn-pkcs11warn.patch +++ b/debian/patches/openvpn-pkcs11warn.patch @@ -3,9 +3,9 @@ Author: Florian Kulzer Bug-Debian: http://bugs.debian.org/475353 Index: openvpn/src/openvpn/options.c =================================================================== ---- openvpn.orig/src/openvpn/options.c 2013-05-17 12:03:56.574035519 +0200 -+++ openvpn/src/openvpn/options.c 2013-05-17 12:03:56.570035501 +0200 -@@ -6119,6 +6119,20 @@ +--- openvpn.orig/src/openvpn/options.c 2014-05-14 12:58:50.557184365 +0200 ++++ openvpn/src/openvpn/options.c 2014-05-14 12:58:50.557184365 +0200 +@@ -6226,6 +6226,20 @@ { VERIFY_PERMISSION (OPT_P_ROUTE_EXTRAS); } diff --git a/debian/patches/route_default_nil.patch b/debian/patches/route_default_nil.patch index bd7c4b2..e8572b5 100644 --- a/debian/patches/route_default_nil.patch +++ b/debian/patches/route_default_nil.patch @@ -2,9 +2,9 @@ Description: Fix small wording in man page. Author: Alberto Gonzalez Iniesta Index: openvpn/doc/openvpn.8 =================================================================== ---- openvpn.orig/doc/openvpn.8 2013-05-17 12:04:01.742061149 +0200 -+++ openvpn/doc/openvpn.8 2013-05-17 12:04:01.738061129 +0200 -@@ -952,7 +952,7 @@ +--- openvpn.orig/doc/openvpn.8 2014-05-14 12:58:55.637184441 +0200 ++++ openvpn/doc/openvpn.8 2014-05-14 12:58:55.633184441 +0200 +@@ -966,7 +966,7 @@ otherwise 0. The default can be specified by leaving an option blank or setting diff --git a/debian/patches/series b/debian/patches/series index f37465a..d9cae0f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -6,3 +6,4 @@ route_default_nil.patch kfreebsd_support.patch accommodate_typo.patch manpage_fixes.patch +better_systemd_detection.patch -- cgit v1.2.3