]> git.ipfire.org Git - thirdparty/openvpn.git/commitdiff
vcpkg-ports/pkcs11-helper: reference upstream PRs in patches
authorFrank Lichtenheld <frank@lichtenheld.com>
Fri, 31 Mar 2023 15:42:14 +0000 (17:42 +0200)
committerGert Doering <gert@greenie.muc.de>
Mon, 8 May 2023 15:32:48 +0000 (17:32 +0200)
So it is easier to check the merge status.

Change-Id: Ia1f8a8d26d4752a7dda1a20521c59ded06bc7c52
Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com>
Acked-by: Lev Stipakov <lstipakov@gmail.com>
Message-Id: <20230331154214.613245-4-frank@lichtenheld.com>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg26569.html
Signed-off-by: Gert Doering <gert@greenie.muc.de>
contrib/vcpkg-ports/pkcs11-helper/0001-Allow-the-build-to-succeed-if-configured-with-disabl.patch
contrib/vcpkg-ports/pkcs11-helper/pkcs11-helper-001-RFC7512.patch
contrib/vcpkg-ports/pkcs11-helper/pkcs11-helper-002-dynamic_loader_flags.patch

index 102be4ecbabf0d26d8b2b8b2208f6b4025a78d05..16fa7042831213a8b50941991481ee39cd2a264a 100644 (file)
@@ -12,6 +12,8 @@ Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com>
  lib/Makefile.am | 2 ++
  2 files changed, 3 insertions(+)
 
+upstream PR: https://github.com/OpenSC/pkcs11-helper/pull/62
+
 diff --git a/configure.ac b/configure.ac
 index a7e9760..f154ae3 100644
 --- a/configure.ac
index 84fba0809a1e2db492e2177c68780e91884e99f8..56e3486e1ded116fd0aa4ad60bfd5a41d1a42ec2 100644 (file)
@@ -1,3 +1,5 @@
+upstream PR: https://github.com/OpenSC/pkcs11-helper/pull/4
+
 commit 90590b02085edc3830bdfe0942a46c4e7bf3f1ab (HEAD -> master)
 Author: David Woodhouse <David.Woodhouse@intel.com>
 Date:   Thu Apr 30 14:58:24 2015 +0100
index 325dea8b8ef110bd7513e1bd4fa37a79a7f80413..6d674581bda15ccbb4a0f0fb4a6cb3c4a76dbb82 100644 (file)
@@ -11,6 +11,8 @@ set original values as defaults, use verbatim (user-supplied) value
  lib/pkcs11h-core.c                       | 13 +++++++++++--
  3 files changed, 23 insertions(+), 3 deletions(-)
 
+upstream PR: https://github.com/OpenSC/pkcs11-helper/pull/59
+
 diff --git a/include/pkcs11-helper-1.0/pkcs11h-core.h b/include/pkcs11-helper-1.0/pkcs11h-core.h
 index 9028c277..56f87718 100644
 --- a/include/pkcs11-helper-1.0/pkcs11h-core.h