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>
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
+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
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