Skip to contentSkip to conversation

vcpkg-ports/pkcs11-helper: bump to release 1.28

PATCH In review Lev Stipakov 2 participants 2 messages Jan 11, 2022 – Jan 21, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 vcpkg-ports/pkcs11-helper: bump to release 1.28

From: Lev Stipakov <[email protected]...>

This release has merged openssl 1.1.1 support patch, so our own patch could be removed from the port.

Remove unconditional /release flag, which is added by vcpkg for release builds. Having this flag unconditionally breaks vcpkg debug builds.

---
 ...make-compatibility-with-vcpkg-nmake.patch} |  8 +-
 .../0001-nmake-openssl-1.1.1-support.patch    | 88 -------------------
 ...-pkcs11.h-rename-interface-parameter.patch | 32 +++++++
 contrib/vcpkg-ports/pkcs11-helper/CONTROL     |  2 +-
 .../vcpkg-ports/pkcs11-helper/portfile.cmake  |  8 +-
 5 files changed, 41 insertions(+), 97 deletions(-)
 rename contrib/vcpkg-ports/pkcs11-helper/{0002-nmake-compatibility-with-vcpkg-nmake.patch => 0001-nmake-compatibility-with-vcpkg-nmake.patch} (81%)
 delete mode 100644 contrib/vcpkg-ports/pkcs11-helper/0001-nmake-openssl-1.1.1-support.patch
 create mode 100644 contrib/vcpkg-ports/pkcs11-helper/0002-pkcs11.h-rename-interface-parameter.patch
contrib/vcpkg-ports/pkcs11-helper/0001-nmake-compatibility-with-vcpkg-nmake.patch renamed from contrib/vcpkg-ports/pkcs11-helper/0002-nmake-compatibility-with-vcpkg-nmake.patch +4 -4
similarity index 81%
rename from contrib/vcpkg-ports/pkcs11-helper/0002-nmake-compatibility-with-vcpkg-nmake.patch
rename to contrib/vcpkg-ports/pkcs11-helper/0001-nmake-compatibility-with-vcpkg-nmake.patch
index a6034f7e..add47093 100644
@@ -1,6 +1,6 @@
-From 68d12f3e955cc9df435e9289b1244a4c1f24b96b Mon Sep 17 00:00:00 2001
+From 2d3a2c05383f653544b9c7194dd1349c6d5f3067 Mon Sep 17 00:00:00 2001
 From: Lev Stipakov <[email protected]...>
-Date: Wed, 24 Nov 2021 11:21:36 +0200
+Date: Tue, 11 Jan 2022 13:24:51 +0200
 Subject: [PATCH] nmake: compatibility with vcpkg nmake
 
 Remove options which contradict or already set
@@ -12,7 +12,7 @@ Signed-off-by: Lev Stipakov <[email protected]...>
  1 file changed, 2 insertions(+), 6 deletions(-)
 
 diff --git a/lib/Makefile.w32-vc b/lib/Makefile.w32-vc
-index 0e64f42..18af03b 100644
+index 96f1f89..be68a00 100644
 --- a/lib/Makefile.w32-vc
 +++ b/lib/Makefile.w32-vc
 @@ -75,15 +75,11 @@ OPENSSL_LIBS=-LIBPATH:$(OPENSSL_LIB) user32.lib advapi32.lib $(OPENSSL_STATIC)
@@ -27,7 +27,7 @@ index 0e64f42..18af03b 100644
  
  LINK32=link.exe
  LIB32=lib.exe
--LINK32_FLAGS=/nologo /subsystem:windows /dll /incremental:no
+-LINK32_FLAGS=/nologo /subsystem:windows /dll /incremental:no /release
 -LIB32_FLAGS=/nologo
 +LINK32_FLAGS=/dll
  
contrib/vcpkg-ports/pkcs11-helper/0001-nmake-openssl-1.1.1-support.patch deleted +0 -88

88 lines not on this page · raw message

contrib/vcpkg-ports/pkcs11-helper/0002-pkcs11.h-rename-interface-parameter.patch new file +32 -0
new file mode 100644
index 00000000..13c60d9d
@@ -0,0 +1,32 @@
+From 0c2f862fe23dc6d2c0ca8432d1f6027c922c5a04 Mon Sep 17 00:00:00 2001
+From: Lev Stipakov <[email protected]...>
+Date: Tue, 11 Jan 2022 14:24:45 +0200
+Subject: [PATCH] pkcs11.h: rename "interface" parameter
+
+"interface" is defined in cobaseapi.h as
+
+  #define interface __STRUCT__
+
+so use different name.
+
+Signed-off-by: Lev Stipakov <[email protected]...>
+---
+ include/pkcs11-helper-1.0/pkcs11.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/pkcs11-helper-1.0/pkcs11.h b/include/pkcs11-helper-1.0/pkcs11.h
+index 85aa98e..7a7b958 100644
+--- a/include/pkcs11-helper-1.0/pkcs11.h
++++ b/include/pkcs11-helper-1.0/pkcs11.h
+@@ -1210,7 +1210,7 @@ _CK_DECLARE_FUNCTION (C_GetInterfaceList,
+ _CK_DECLARE_FUNCTION (C_GetInterface,
+ 		      (unsigned char *interface_name,
+ 		       struct ck_version *version,
+-		       struct ck_interface **interface,
++		       struct ck_interface **iface,
+ 		       ck_flags_t flags));
+ 
+ _CK_DECLARE_FUNCTION (C_LoginUser,
+-- 
+2.23.0.windows.1
+
contrib/vcpkg-ports/pkcs11-helper/CONTROL +1 -1
index 01831802..372d420a 100644
@@ -1,4 +1,4 @@
 Source: pkcs11-helper
-Version: 1.27-1
+Version: 1.28-1
 Homepage: https://github.com/OpenSC/pkcs11-helper
 Description: pkcs11-helper is a library that simplifies the interaction with PKCS#11 providers for end-user applications.
contrib/vcpkg-ports/pkcs11-helper/portfile.cmake +4 -4
index ad19fccb..d8dee3f6 100644
@@ -1,9 +1,9 @@
-set(VERSION 1.27)
+set(VERSION 1.28)
 
 vcpkg_download_distfile(ARCHIVE
     URLS "https://github.com/OpenSC/pkcs11-helper/releases/download/pkcs11-helper-${VERSION}/pkcs11-helper-${VERSION}.0.tar.bz2"
     FILENAME "pkcs11-helper-${VERSION}.tar.bz2"
-    SHA512 5799342cb755dae8b7ba0880d652e9d4b4f1e52a74043015e1185e1e059326cb2689bb51957db98060ac2257dee34e2f047dcf3d52ad59fd49b91fedcfc5332b
+    SHA512 11b8e554d9223ab9305a3ad7e2b6a9bbece1c09ca8d49276618dec31eefdccf6a32b0db85a28a90334ea42fe809beec83514a31930b79bdbefa368ed4658945b
 )
 
 vcpkg_extract_source_archive_ex(
@@ -11,8 +11,8 @@ vcpkg_extract_source_archive_ex(
     ARCHIVE ${ARCHIVE}
     REF ${VERSION}
     PATCHES
-        0001-nmake-openssl-1.1.1-support.patch
-        0002-nmake-compatibility-with-vcpkg-nmake.patch
+        0001-nmake-compatibility-with-vcpkg-nmake.patch
+        0002-pkcs11.h-rename-interface-parameter.patch
         pkcs11-helper-001-RFC7512.patch
 )
 
Signature · 1 line
2.23.0.windows.1
#1 lore raw

I have no idea what this does, but I understand that it's related to MSVC building and that we generally want/need to bump pkcs11-helper to version 1.28 -> so, this is what it does :-)

Since this does not touch anything code or mingw-build-related I have not tested it beyond "does 'git show' look reasonable?".

Your patch has been applied to the master and release/2.5 branch.

commit bced08530c011fc9ea2b736938e0ca2199a45e1b (master) commit f71ae77ad7e44d7983606dfd79bfaf988daf0432 (release/2.5)

Author: Lev Stipakov 
Date:   Tue Jan 11 17:06:05 2022 +0200
     vcpkg-ports/pkcs11-helper: bump to release 1.28

     Signed-off-by: Lev Stipakov <[email protected]...>
     Acked-by: Gert Doering <[email protected]...>
     Message-Id: <[email protected]...>
     URL: https://www.mail-archive.com/[email protected]/msg23526.html
     Signed-off-by: Gert Doering <[email protected]...>

--
kind regards,

Gert Doering