Refresh patches for 2.3.4

parent cd0c780a
......@@ -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-05-14 12:59:02.201184539 +0200
+++ openvpn/doc/openvpn.8 2014-05-14 12:59:02.197184539 +0200
--- 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
@@ -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
@@ -2568,7 +2568,7 @@
@@ -2573,7 +2573,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
@@ -3944,7 +3944,7 @@
@@ -3949,7 +3949,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.
@@ -5076,7 +5076,7 @@
@@ -5087,7 +5087,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
@@ -5119,7 +5119,7 @@
@@ -5130,7 +5130,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,9 +56,9 @@ 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
@@ -5413,26 +5413,26 @@
documentation of the IPv6-related options. More documentation can be
found on http://www.greenie.net/ipv6/openvpn.html.
@@ -5426,26 +5426,26 @@
.B \-\-topology
, which has no effect on IPv6).
.TP
-.B --ifconfig-ipv6 ipv6addr/bits ipv6remote
+.B \-\-ifconfig-ipv6 ipv6addr/bits ipv6remote
......@@ -91,9 +91,9 @@ Index: openvpn/doc/openvpn.8
Specify an IPv6 address pool for dynamic assignment to clients. The
pool starts at
.B ipv6addr
@@ -5440,20 +5440,20 @@
.B /bits
setting controls the size of the pool.
@@ -5454,20 +5454,20 @@
setting controls the size of the pool. Due to implementation details,
the pool size must be between /64 and /112.
.TP
-.B --ifconfig-ipv6-push ipv6addr/bits ipv6remote
+.B \-\-ifconfig-ipv6-push ipv6addr/bits ipv6remote
......@@ -119,7 +119,7 @@ Index: openvpn/doc/openvpn.8
interact.
.\"*********************************************************
@@ -5939,7 +5939,7 @@
@@ -5953,7 +5953,7 @@
.TP
.B peer_cert
Temporary file name containing the client certificate upon
......
......@@ -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-05-14 12:58:50.557184365 +0200
+++ openvpn/src/openvpn/options.c 2014-05-14 12:58:50.557184365 +0200
@@ -6226,6 +6226,20 @@
--- 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 @@
{
VERIFY_PERMISSION (OPT_P_ROUTE_EXTRAS);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment