summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/patches/match-manpage-and-command-help.patch25
-rw-r--r--debian/patches/route_default_nil.patch15
-rw-r--r--debian/patches/series2
3 files changed, 26 insertions, 16 deletions
diff --git a/debian/patches/match-manpage-and-command-help.patch b/debian/patches/match-manpage-and-command-help.patch
new file mode 100644
index 0000000..34ed3cd
--- /dev/null
+++ b/debian/patches/match-manpage-and-command-help.patch
@@ -0,0 +1,25 @@
+From a88d8ba3e81ca34fc2675805a273cd85875c8973 Mon Sep 17 00:00:00 2001
+From: Arne Schwabe <arne@rfc2549.org>
+Date: Wed, 4 Jan 2017 19:18:46 +0100
+Subject: [PATCH] Change command help to match man page and implementation
+
+---
+ src/openvpn/options.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/openvpn/options.c b/src/openvpn/options.c
+index bfedb6a..80143e6 100644
+--- a/src/openvpn/options.c
++++ b/src/openvpn/options.c
+@@ -198,7 +198,7 @@ static const char usage_message[] =
+ " is established. Multiple routes can be specified.\n"
+ " netmask default: 255.255.255.255\n"
+ " gateway default: taken from --route-gateway or --ifconfig\n"
+- " Specify default by leaving blank or setting to \"nil\".\n"
++ " Specify default by leaving blank or setting to \"default\".\n"
+ "--route-ipv6 network/bits [gateway] [metric] :\n"
+ " Add IPv6 route to routing table after connection\n"
+ " is established. Multiple routes can be specified.\n"
+--
+2.10.1 (Apple Git-78)
+
diff --git a/debian/patches/route_default_nil.patch b/debian/patches/route_default_nil.patch
deleted file mode 100644
index adda9be..0000000
--- a/debian/patches/route_default_nil.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Fix small wording in man page.
-Author: Alberto Gonzalez Iniesta <agi@inittab.org>
-Index: openvpn/doc/openvpn.8
-===================================================================
---- openvpn.orig/doc/openvpn.8 2016-11-21 09:54:04.404957249 +0100
-+++ openvpn/doc/openvpn.8 2016-11-21 09:54:04.400957231 +0100
-@@ -973,7 +973,7 @@
- otherwise 0.
-
- The default can be specified by leaving an option blank or setting
--it to "default".
-+it to "nil".
-
- The
- .B network
diff --git a/debian/patches/series b/debian/patches/series
index ff865c2..50b527d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,5 @@
auth-pam_libpam_so_filename.patch
debian_nogroup_for_sample_files.patch
openvpn-pkcs11warn.patch
-route_default_nil.patch
kfreebsd_support.patch
+match-manpage-and-command-help.patch