summaryrefslogtreecommitdiff
path: root/debian/patches/openvpn-pkcs11warn.patch
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches/openvpn-pkcs11warn.patch')
-rw-r--r--debian/patches/openvpn-pkcs11warn.patch16
1 files changed, 8 insertions, 8 deletions
diff --git a/debian/patches/openvpn-pkcs11warn.patch b/debian/patches/openvpn-pkcs11warn.patch
index e7900a4..04325f8 100644
--- a/debian/patches/openvpn-pkcs11warn.patch
+++ b/debian/patches/openvpn-pkcs11warn.patch
@@ -1,13 +1,13 @@
Description: Warn users about deprecated pkcs11 options
Author: Florian Kulzer <florian.kulzer+debian@icfo.es>
Bug-Debian: http://bugs.debian.org/475353
-Index: openvpn-2.2.1/options.c
+Index: openvpn/src/openvpn/options.c
===================================================================
---- openvpn-2.2.1.orig/options.c 2011-12-13 12:41:58.510939026 +0100
-+++ openvpn-2.2.1/options.c 2011-12-13 12:42:07.882821863 +0100
-@@ -5993,6 +5993,20 @@
- VERIFY_PERMISSION (OPT_P_GENERAL);
- options->pkcs11_id_management = true;
+--- openvpn.orig/src/openvpn/options.c 2012-11-05 16:29:30.284804762 +0100
++++ openvpn/src/openvpn/options.c 2012-11-05 16:44:12.873181274 +0100
+@@ -6098,6 +6098,20 @@
+ {
+ VERIFY_PERMISSION (OPT_P_ROUTE_EXTRAS);
}
+ else if (streq (p[0], "pkcs11-id-type") ||
+ streq (p[0], "pkcs11-sign-mode") ||
@@ -24,5 +24,5 @@ Index: openvpn-2.2.1/options.c
+ p[0], PACKAGE_VERSION);
+ }
#endif
- #ifdef TUNSETPERSIST
- else if (streq (p[0], "rmtun"))
+ #if PASSTOS_CAPABILITY
+ else if (streq (p[0], "passtos"))