From 8643b24ca3c740fc17384a41125be80d0c5a369a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Fri, 10 Apr 2020 23:32:00 +0200 Subject: Refresh d/p/openvpn-pkcs11warn.patch: Remove d/p/fix-pkcs11-helper-hang.patch --- debian/changelog | 8 ++++++++ debian/patches/fix-pkcs11-helper-hang.patch | 13 ------------- debian/patches/openvpn-pkcs11warn.patch | 2 +- debian/patches/series | 1 - 4 files changed, 9 insertions(+), 15 deletions(-) delete mode 100644 debian/patches/fix-pkcs11-helper-hang.patch diff --git a/debian/changelog b/debian/changelog index f676f8d..88b1347 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +openvpn (2.4.8-1) UNRELEASED; urgency=medium + + * New upstream release. + * Refresh debian/patches/openvpn-pkcs11warn.patch. + * Remove upstream applied fix-pkcs11-helper-hang.patch. + + -- Jörg Frings-Fürst Fri, 10 Apr 2020 23:10:22 +0200 + openvpn (2.4.7-1) unstable; urgency=medium [ Bernhard Schmidt ] diff --git a/debian/patches/fix-pkcs11-helper-hang.patch b/debian/patches/fix-pkcs11-helper-hang.patch deleted file mode 100644 index 41d9be1..0000000 --- a/debian/patches/fix-pkcs11-helper-hang.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: openvpn/src/openvpn/pkcs11.c -=================================================================== ---- openvpn.orig/src/openvpn/pkcs11.c -+++ openvpn/src/openvpn/pkcs11.c -@@ -312,7 +312,7 @@ pkcs11_initialize( - - pkcs11h_setLogLevel(_pkcs11_msg_openvpn2pkcs11(get_debug_level())); - -- if ((rv = pkcs11h_setForkMode(TRUE)) != CKR_OK) -+ if ((rv = pkcs11h_setForkMode(FALSE)) != CKR_OK) - { - msg(M_FATAL, "PKCS#11: Cannot set fork mode %ld-'%s'", rv, pkcs11h_getMessage(rv)); - goto cleanup; diff --git a/debian/patches/openvpn-pkcs11warn.patch b/debian/patches/openvpn-pkcs11warn.patch index 71b2ac8..b5a255a 100644 --- a/debian/patches/openvpn-pkcs11warn.patch +++ b/debian/patches/openvpn-pkcs11warn.patch @@ -5,7 +5,7 @@ Index: trunk/src/openvpn/options.c =================================================================== --- trunk.orig/src/openvpn/options.c +++ trunk/src/openvpn/options.c -@@ -6861,6 +6861,20 @@ add_option(struct options *options, +@@ -6824,6 +6824,20 @@ add_option(struct options *options, options->port_share_port = p[2]; options->port_share_journal_dir = p[3]; } diff --git a/debian/patches/series b/debian/patches/series index 8b19c3d..a903d3d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -6,4 +6,3 @@ kfreebsd_support.patch match-manpage-and-command-help.patch spelling_errors.patch systemd.patch -fix-pkcs11-helper-hang.patch -- cgit v1.2.3