new upstream

1 files changed, 9 insertions, 18 deletions

diff --git a/debian/patches/manpage_fixes.patch b/debian/patches/manpage_fixes.patch
index f228f4d..0a8f677 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 <agi@inittab.org>
 Index: openvpn/doc/openvpn.8
 ===================================================================
---- openvpn.orig/doc/openvpn.8	2012-11-05 16:46:31.765870008 +0100
-+++ openvpn/doc/openvpn.8	2012-11-05 16:51:54.803471868 +0100
+--- 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
 @@ -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
-@@ -2506,7 +2506,7 @@
+@@ -2513,7 +2513,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
-@@ -3865,7 +3865,7 @@
+@@ -3889,7 +3889,7 @@
  This option is only relevant in UDP mode, i.e.
  when either
  .B \-\-proto udp
@@ -38,16 +38,7 @@ Index: openvpn/doc/openvpn.8
  .B \-\-proto
  option is specified.
  
-@@ -4650,7 +4650,7 @@
- Field in x509 certificate subject to be used as username (default=CN).
- .B Fieldname
- will be uppercased before matching. When this option is used, the
----tls-remote option will match against the chosen fieldname instead
-+\-\-tls-remote option will match against the chosen fieldname instead
- of the CN.
- .\"*********************************************************
- .TP
-@@ -4935,7 +4935,7 @@
+@@ -5012,7 +5012,7 @@
  
  This option have changed behaviour in OpenVPN 2.3.  Earlier you had to
  define
@@ -56,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
-@@ -4978,7 +4978,7 @@
+@@ -5055,7 +5055,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
@@ -65,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
-@@ -5272,26 +5272,26 @@
+@@ -5349,26 +5349,26 @@
  documentation of the IPv6-related options. More documentation can be
  found on http://www.greenie.net/ipv6/openvpn.html.
  .TP
@@ -100,7 +91,7 @@ Index: openvpn/doc/openvpn.8
  Specify an IPv6 address pool for dynamic assignment to clients.  The
  pool starts at
  .B ipv6addr
-@@ -5299,20 +5299,20 @@
+@@ -5376,20 +5376,20 @@
  .B /bits
  setting controls the size of the pool.
  .TP
@@ -128,7 +119,7 @@ Index: openvpn/doc/openvpn.8
  interact.
  
  .\"*********************************************************
-@@ -5798,7 +5798,7 @@
+@@ -5875,7 +5875,7 @@
  .TP
  .B peer_cert
  Temporary file name containing the client certificate upon