initial stretch branch release 2.4.0-6

1 files changed, 22 insertions, 22 deletions

diff --git a/debian/patches/kfreebsd_support.patch b/debian/patches/kfreebsd_support.patch
index 4445e0d..0c8165b 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	2017-06-22 13:17:05.754630908 +0200
-+++ openvpn/src/openvpn/route.c	2017-06-22 13:17:05.750630880 +0200
-@@ -1689,7 +1689,7 @@
+--- openvpn.orig/src/openvpn/route.c	2016-12-27 19:01:52.704942715 +0100
++++ openvpn/src/openvpn/route.c	2016-12-27 19:08:24.717996310 +0100
+@@ -1670,7 +1670,7 @@
      argv_msg(D_ROUTE, &argv);
      status = openvpn_execve_check(&argv, es, 0, "ERROR: Solaris route add command failed");
  
@@ -14,7 +14,7 @@ Index: openvpn/src/openvpn/route.c
  
      argv_printf(&argv, "%s add",
                  ROUTE_PATH);
-@@ -1875,7 +1875,7 @@
+@@ -1856,7 +1856,7 @@
      network = print_in6_addr( r6->network, 0, &gc);
      gateway = print_in6_addr( r6->gateway, 0, &gc);
  
@@ -23,7 +23,7 @@ Index: openvpn/src/openvpn/route.c
      || defined(TARGET_FREEBSD) || defined(TARGET_DRAGONFLY)    \
      || defined(TARGET_OPENBSD) || defined(TARGET_NETBSD)
  
-@@ -2043,7 +2043,7 @@
+@@ -2032,7 +2032,7 @@
      argv_msg(D_ROUTE, &argv);
      status = openvpn_execve_check(&argv, es, 0, "ERROR: Solaris route add -inet6 command failed");
  
@@ -32,7 +32,7 @@ Index: openvpn/src/openvpn/route.c
  
      argv_printf(&argv, "%s add -inet6 %s/%d",
                  ROUTE_PATH,
-@@ -2227,7 +2227,7 @@
+@@ -2216,7 +2216,7 @@
      argv_msg(D_ROUTE, &argv);
      openvpn_execve_check(&argv, es, 0, "ERROR: Solaris route delete command failed");
  
@@ -41,7 +41,7 @@ Index: openvpn/src/openvpn/route.c
  
      argv_printf(&argv, "%s delete -net %s %s %s",
                  ROUTE_PATH,
-@@ -2334,7 +2334,7 @@
+@@ -2323,7 +2323,7 @@
      network = print_in6_addr( r6->network, 0, &gc);
      gateway = print_in6_addr( r6->gateway, 0, &gc);
  
@@ -50,7 +50,7 @@ Index: openvpn/src/openvpn/route.c
      || defined(TARGET_FREEBSD) || defined(TARGET_DRAGONFLY)    \
      || defined(TARGET_OPENBSD) || defined(TARGET_NETBSD)
  
-@@ -2469,7 +2469,7 @@
+@@ -2458,7 +2458,7 @@
      argv_msg(D_ROUTE, &argv);
      openvpn_execve_check(&argv, es, 0, "ERROR: Solaris route delete -inet6 command failed");
  
@@ -59,7 +59,7 @@ Index: openvpn/src/openvpn/route.c
  
      argv_printf(&argv, "%s delete -inet6 %s/%d",
                  ROUTE_PATH,
-@@ -3514,7 +3514,8 @@
+@@ -3499,7 +3499,8 @@
  
  #elif defined(TARGET_DARWIN) || defined(TARGET_SOLARIS)    \
      || defined(TARGET_FREEBSD) || defined(TARGET_DRAGONFLY)    \
@@ -71,9 +71,9 @@ Index: openvpn/src/openvpn/route.c
  #include <sys/socket.h>
 Index: openvpn/src/openvpn/tun.c
 ===================================================================
---- openvpn.orig/src/openvpn/tun.c	2017-06-22 13:17:05.754630908 +0200
-+++ openvpn/src/openvpn/tun.c	2017-06-22 13:17:05.750630880 +0200
-@@ -843,7 +843,7 @@
+--- openvpn.orig/src/openvpn/tun.c	2016-12-27 19:01:52.704942715 +0100
++++ openvpn/src/openvpn/tun.c	2016-12-27 19:05:14.585486719 +0100
+@@ -840,7 +840,7 @@
  #endif /* if defined(_WIN32) || defined(TARGET_DARWIN) || defined(TARGET_NETBSD) || defined(TARGET_OPENBSD) */
  
  #if defined(TARGET_FREEBSD) || defined(TARGET_DRAGONFLY)  \
@@ -82,7 +82,7 @@ Index: openvpn/src/openvpn/tun.c
  /* 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"
-@@ -1412,7 +1412,7 @@
+@@ -1408,7 +1408,7 @@
              add_route_connected_v6_net(tt, es);
          }
  
@@ -91,7 +91,7 @@ Index: openvpn/src/openvpn/tun.c
  
          in_addr_t remote_end;           /* for "virtual" subnet topology */
  
-@@ -2770,7 +2770,7 @@
+@@ -2762,7 +2762,7 @@
      }
  }
  
@@ -102,8 +102,8 @@ Index: openvpn/src/openvpn/tun.c
  freebsd_modify_read_write_return(int len)
 Index: openvpn/src/openvpn/lladdr.c
 ===================================================================
---- openvpn.orig/src/openvpn/lladdr.c	2017-06-22 13:17:05.754630908 +0200
-+++ openvpn/src/openvpn/lladdr.c	2017-06-22 13:17:05.750630880 +0200
+--- openvpn.orig/src/openvpn/lladdr.c	2016-12-27 19:01:52.704942715 +0100
++++ openvpn/src/openvpn/lladdr.c	2016-12-27 19:09:07.286110127 +0100
 @@ -50,7 +50,7 @@
                  "%s %s lladdr %s",
                  IFCONFIG_PATH,
@@ -115,9 +115,9 @@ Index: openvpn/src/openvpn/lladdr.c
                  IFCONFIG_PATH,
 Index: openvpn/src/openvpn/syshead.h
 ===================================================================
---- openvpn.orig/src/openvpn/syshead.h	2017-06-22 13:17:05.754630908 +0200
-+++ openvpn/src/openvpn/syshead.h	2017-06-22 13:17:05.750630880 +0200
-@@ -297,7 +297,7 @@
+--- openvpn.orig/src/openvpn/syshead.h	2016-12-27 19:01:52.704942715 +0100
++++ openvpn/src/openvpn/syshead.h	2016-12-27 19:01:52.700942705 +0100
+@@ -294,7 +294,7 @@
  
  #endif /* TARGET_OPENBSD */
  
@@ -128,9 +128,9 @@ Index: openvpn/src/openvpn/syshead.h
  #include <sys/uio.h>
 Index: openvpn/src/openvpn/ssl.c
 ===================================================================
---- openvpn.orig/src/openvpn/ssl.c	2017-06-22 13:17:05.754630908 +0200
-+++ openvpn/src/openvpn/ssl.c	2017-06-22 13:17:05.750630880 +0200
-@@ -2269,7 +2269,7 @@
+--- openvpn.orig/src/openvpn/ssl.c	2016-12-27 19:01:52.704942715 +0100
++++ openvpn/src/openvpn/ssl.c	2016-12-27 19:03:13.433160691 +0100
+@@ -2247,7 +2247,7 @@
          buf_printf(&out, "IV_PLAT=mac\n");
  #elif defined(TARGET_NETBSD)
          buf_printf(&out, "IV_PLAT=netbsd\n");