summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorAlberto Gonzalez Iniesta <agi@inittab.org>2016-05-10 17:48:40 +0200
committerAlberto Gonzalez Iniesta <agi@inittab.org>2016-05-10 17:48:40 +0200
commitedfd4ea966413dbd8a8d0e9614cf3479cbf22576 (patch)
treec7a694eb3a47d94be2e1c22e9afeb9c26f7950cd /debian
parentfe643c6090a059b16b0618a85c12e0a434044617 (diff)
Fix FTBFS in kfreebsd (Closes: #815283)
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog2
-rw-r--r--debian/patches/kfreebsd_support.patch17
2 files changed, 15 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog
index 2af6c8d..6a09e2d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
openvpn (2.3.11-1) unstable; urgency=medium
* New upstream release.
+ * tun.c: patch to fix FTBFS in kfreebsd. (Closes: #815283)
+ Thanks Steven Chamberlain for the patch.
-- Alberto Gonzalez Iniesta <agi@inittab.org> Tue, 10 May 2016 17:41:53 +0200
diff --git a/debian/patches/kfreebsd_support.patch b/debian/patches/kfreebsd_support.patch
index ba3665f..0e72c12 100644
--- a/debian/patches/kfreebsd_support.patch
+++ b/debian/patches/kfreebsd_support.patch
@@ -3,8 +3,8 @@ 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 2016-01-20 12:02:41.441269913 +0100
-+++ openvpn/src/openvpn/route.c 2016-01-20 12:02:41.437269956 +0100
+--- openvpn.orig/src/openvpn/route.c 2016-05-10 17:46:23.708838589 +0200
++++ openvpn/src/openvpn/route.c 2016-05-10 17:46:23.704838624 +0200
@@ -1421,7 +1421,7 @@
argv_msg (D_ROUTE, &argv);
status = openvpn_execve_check (&argv, es, 0, "ERROR: Solaris route add command failed");
@@ -16,8 +16,17 @@ Index: openvpn/src/openvpn/route.c
ROUTE_PATH);
Index: openvpn/src/openvpn/tun.c
===================================================================
---- openvpn.orig/src/openvpn/tun.c 2016-01-20 12:02:41.441269913 +0100
-+++ openvpn/src/openvpn/tun.c 2016-01-20 12:02:41.437269956 +0100
+--- openvpn.orig/src/openvpn/tun.c 2016-05-10 17:46:23.708838589 +0200
++++ openvpn/src/openvpn/tun.c 2016-05-10 17:46:39.656696603 +0200
+@@ -625,7 +625,7 @@
+ }
+ #endif
+
+-#if defined(TARGET_FREEBSD)||defined(TARGET_DRAGONFLY)
++#if defined(TARGET_FREEBSD)||defined(__FreeBSD_kernel__)||defined(TARGET_DRAGONFLY)
+ /* we can't use true subnet mode on tun on all platforms, as that
+ * conflicts with IPv6 (wants to use ND then, which we don't do),
+ * but the OSes want "a remote address that is different from ours"
@@ -1124,7 +1124,7 @@
add_route_connected_v6_net(tt, es);
}