summaryrefslogtreecommitdiff
path: root/debian/patches/openvpn-pkcs11warn.patch
diff options
context:
space:
mode:
authorAlberto Gonzalez Iniesta <agi@inittab.org>2011-12-13 11:04:22 +0100
committerAlberto Gonzalez Iniesta <agi@inittab.org>2012-02-21 15:53:41 +0100
commit3cedd1dd9877a0bae3e69d27c3d1a2fcd98787c0 (patch)
treea1af6e31567b9a7a992bc90d6106a7cfb0c67b37 /debian/patches/openvpn-pkcs11warn.patch
parent349cfa7acb95abe865209a28e417ec74b56f9bba (diff)
Imported Debian patch 2.2.1-1debian/2.2.1-1
Diffstat (limited to 'debian/patches/openvpn-pkcs11warn.patch')
-rw-r--r--debian/patches/openvpn-pkcs11warn.patch28
1 files changed, 28 insertions, 0 deletions
diff --git a/debian/patches/openvpn-pkcs11warn.patch b/debian/patches/openvpn-pkcs11warn.patch
new file mode 100644
index 0000000..e7900a4
--- /dev/null
+++ b/debian/patches/openvpn-pkcs11warn.patch
@@ -0,0 +1,28 @@
+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
+===================================================================
+--- 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;
+ }
++ else if (streq (p[0], "pkcs11-id-type") ||
++ streq (p[0], "pkcs11-sign-mode") ||
++ streq (p[0], "pkcs11-slot") ||
++ streq (p[0], "pkcs11-slot-type") ||
++ streq (p[0], "show-pkcs11-objects") ||
++ streq (p[0], "show-pkcs11-slots"))
++ {
++ if (file)
++ msg (msglevel, "You are using an obsolete parameter in %s:%d: %s (%s).\nPlease see /usr/share/doc/openvpn/NEWS.Debian.gz for details.",
++ file, line, p[0], PACKAGE_VERSION);
++ else
++ msg (msglevel, "You are using an obsolete parameter: --%s (%s).\nPlease see /usr/share/doc/openvpn/NEWS.Debian.gz for details.",
++ p[0], PACKAGE_VERSION);
++ }
+ #endif
+ #ifdef TUNSETPERSIST
+ else if (streq (p[0], "rmtun"))