From patchwork Mon Dec 4 15:33:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marc Becker X-Patchwork-Id: 3501 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7300:8d12:b0:fc:24ac:f0cb with SMTP id i18csp821836dys; Mon, 4 Dec 2023 07:50:35 -0800 (PST) X-Google-Smtp-Source: AGHT+IG+Sa5/tPzIf/4UxWiuZx4Ky4VXCyaztU+yO8Ci4djhobXWI6rxuLiBGWBcoQXMozZjz3zp X-Received: by 2002:a17:902:d34b:b0:1d0:80db:a841 with SMTP id l11-20020a170902d34b00b001d080dba841mr6013497plk.3.1701705035615; Mon, 04 Dec 2023 07:50:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701705035; cv=none; d=google.com; s=arc-20160816; b=fYwShs15HKrQ/eQcpHqO5zHBuk8IwymShOFJrj1rqe5fK47UOn9819u9Xrazd3dApy Tn76ls8iQ4gZZKmKHRvuoW82ML1C/ylr9b8t2voeAZg0IoPxXDNF6aEhZVnuCSdMOgLH kqsr6Iev109rF/0GAr+9boMRXEUFJmf8pu6zE4i36Y3y0MRrzELsXaZFhxsH2j1Pk46J rmC3Cibzg52BQc1oTL6vaeMKXg76501CSqaCQUaH+0HfqRGZO+x2C8Bw59eT2VuJpxTw YUI+tONKPDDxbv9X/tN5L7RcNXt4mIVKvNTOVwz4cu8zdBXaI8gdRxDAl8Zn+CqWT/3E Hmzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:content-transfer-encoding:reply-to:from:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:dkim-signature :dkim-signature:dkim-signature; bh=c/R067c96y3UIlLa1q9+10XLzP3lHFRetR8W/PO9jUM=; fh=4NbAC/LsuMLI0S0hprUlLSLCiHwg6SCAifhH718Jh0Q=; b=1Bhi1EAOdJceqq0XxA9iEh4BLEVKwoCqDyKLJ5KVktt2COUxFKZAwN7hmGAmuKN3F5 UWVWpV2gga0eb6RNE8A00g6K6W1vKcnU45ap8SBCj1hTq5zWEMr8ujasHp9aMKSRsLoH NKDhb1CKGpyIWKvOAlIWoo5C1D5EM1F+rFR2E8LYuSootJnZPtDLnphJo3uFOrF0Z3kH 3kTwNUxeQJQjSapMDGny7B3qqYOX5fCLVENDfiSKtVP14G/xTLX45ELhlLT2BCV7SxxL Zpw5HcJNnzAvr9P6JuJLojtOPaIV2DZXJ2ETaMH/2yk2oPmSLhj3hjapBrbeA0rrUIbF Kw+A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=Km1urqGG; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=YlxpDaT0; dkim=neutral (body hash did not verify) header.i=@astos.de header.s=astos-dkim-2020 header.b=TYniacCF; spf=pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) smtp.mailfrom=openvpn-devel-bounces@lists.sourceforge.net; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=sourceforge.net Received: from lists.sourceforge.net (lists.sourceforge.net. [216.105.38.7]) by mx.google.com with ESMTPS id c1-20020a170902d48100b001d09c96ba09si2064913plg.424.2023.12.04.07.50.35 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Dec 2023 07:50:35 -0800 (PST) Received-SPF: pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) client-ip=216.105.38.7; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=Km1urqGG; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=YlxpDaT0; dkim=neutral (body hash did not verify) header.i=@astos.de header.s=astos-dkim-2020 header.b=TYniacCF; spf=pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) smtp.mailfrom=openvpn-devel-bounces@lists.sourceforge.net; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=sourceforge.net Received: from [127.0.0.1] (helo=sfs-ml-2.v29.lw.sourceforge.com) by sfs-ml-2.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1rABCT-0002Ik-37; Mon, 04 Dec 2023 15:49:37 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-2.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1rABCR-0002IU-5N for openvpn-devel@lists.sourceforge.net; Mon, 04 Dec 2023 15:49:35 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:MIME-Version:Message-ID: Date:Subject:To:From:Sender:Reply-To:Cc:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=3YtQpoQ+SlxjBDWP7d/P7XsprFUPKzfI0pBKzoYQU/U=; b=Km1urqGGPNGedS4sVirvWYeO5l orhANmNwnzn8Wen9rSl2g/sJwqlDNitIdkaEPDsy8imdA+tF7/unUq46btwOfXbkKNZ+mxrHkoXKr 00SFQFGzFHQWjzovzbr6R7K75piU5UkJOpbwFQMnrKeZE153JRUw+bn3zGf2Z6gL7lEk=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version:Message-ID:Date:Subject:To:From: Sender:Reply-To:Cc:Content-Type:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post: List-Owner:List-Archive; bh=3YtQpoQ+SlxjBDWP7d/P7XsprFUPKzfI0pBKzoYQU/U=; b=Y lxpDaT0fzeeGbFLDuNtAl1P9Euwmwe/0rJca0vBIpQu3qJYK2GiBL6jGN/roPpPxTSuMap9Wiggyo AqYKdZjxbtXMufsaD0Sz8h8klukqITozjCA9vmHLRHAGTNVrAGHc2U5eMXy8WTgfRqMoJ+u9AJLWW 7nqiiQX5CVTidhlA=; Received: from mail.astos.de ([217.110.68.46]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:DHE-RSA-AES256-GCM-SHA384:256) (Exim 4.95) id 1rABCN-0002E2-PJ for openvpn-devel@lists.sourceforge.net; Mon, 04 Dec 2023 15:49:35 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=astos.de; s=astos-dkim-2020; t=1701704029; bh=3YtQpoQ+SlxjBDWP7d/P7XsprFUPKzfI0pBKzoYQU/U=; h=From:To:Subject:Date; b=TYniacCFVyY+dyebaKf65eBtEsLzM4Q6jmT9S2J2oeCJAfkz85UjSVKRRqe+t7AKw uZQAeXos6VQmWikIRFPqiF1/SxWTRPWSSe9MfWZgSaaHRDJKejMQyt7qu1RyYA/xZ8 KP04l1LtUewd41kXDqhMuczEJeLota/jnwXtP5Y8RSB/NnAwSVdwN26Pm+vdBnRkoI 98CcbDetjY3E2wNxlWKA1ybwoa0PdrUzbL8OoIec8E4ybcPOiKiRgh16ju07s89a8t J6R/k0pS7XBcZXDyUZUPyeBxlmTcj+ApShc4McV0GcvmnqUAqydBmxvPmMaC3b5eJk LCLpzFDLYi7yw== To: openvpn-devel@lists.sourceforge.net Date: Mon, 4 Dec 2023 16:33:45 +0100 Message-ID: <20231204153345.1146-1-marc.becker@astos.de> MIME-Version: 1.0 X-Spam-Score: -0.2 (/) X-Spam-Report: Spam detection software, running on the system "util-spamd-1.v13.lw.sourceforge.com", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: update metadata references for pkcs11-helper v1.30 remove local patches incorporated in new upstream --- .../Fix-build-with-disable-shared.patch | 48 -------- ...cs11-helper-002-dynamic_loader_flags.p [...] Content analysis details: (-0.2 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.0 T_SCC_BODY_TEXT_LINE No description available. X-Headers-End: 1rABCN-0002E2-PJ Subject: [Openvpn-devel] [Openvpn-Devel] [PATCH] vcpkg-ports/pkcs11-helper: bump to version 1.30 X-BeenThere: openvpn-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Marc Becker via Openvpn-devel From: Marc Becker Reply-To: Marc Becker Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox X-GMAIL-THRID: =?utf-8?q?1784367059420124965?= X-GMAIL-MSGID: =?utf-8?q?1784367059420124965?= update metadata references for pkcs11-helper v1.30 remove local patches incorporated in new upstream Acked-By: Frank Lichtenheld --- .../Fix-build-with-disable-shared.patch | 48 -------- ...cs11-helper-002-dynamic_loader_flags.patch | 104 ------------------ .../vcpkg-ports/pkcs11-helper/portfile.cmake | 6 +- contrib/vcpkg-ports/pkcs11-helper/vcpkg.json | 2 +- 4 files changed, 3 insertions(+), 157 deletions(-) delete mode 100644 contrib/vcpkg-ports/pkcs11-helper/Fix-build-with-disable-shared.patch delete mode 100644 contrib/vcpkg-ports/pkcs11-helper/pkcs11-helper-002-dynamic_loader_flags.patch diff --git a/contrib/vcpkg-ports/pkcs11-helper/Fix-build-with-disable-shared.patch b/contrib/vcpkg-ports/pkcs11-helper/Fix-build-with-disable-shared.patch deleted file mode 100644 index 16fa7042..00000000 --- a/contrib/vcpkg-ports/pkcs11-helper/Fix-build-with-disable-shared.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 7171396a151a2edb3474c7a321b7ae4ff7e171fc Mon Sep 17 00:00:00 2001 -From: Frank Lichtenheld -Date: Wed, 29 Mar 2023 12:44:44 +0200 -Subject: [PATCH] Allow the build to succeed if configured with - --disable-shared - -Do not try to install a file that does not exist. - -Signed-off-by: Frank Lichtenheld ---- - configure.ac | 1 + - 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 -+++ b/configure.ac -@@ -581,6 +581,7 @@ AC_SUBST([LIBPKCS11_HELPER_LT_AGE]) - AC_SUBST([LIBPKCS11_HELPER_LT_OLDEST]) - AC_SUBST([WIN_LIBPREFIX]) - AC_SUBST([PKCS11H_FEATURES]) -+AM_CONDITIONAL([ENABLE_SHARED], [test "${enable_shared}" = "yes" ]) - AM_CONDITIONAL([WIN32], [test "${WIN32}" = "yes"]) - AM_CONDITIONAL([CYGWIN], [test "${CYGWIN}" = "yes"]) - AM_CONDITIONAL([ENABLE_DOC], [test "${enable_doc}" = "yes"]) -diff --git a/lib/Makefile.am b/lib/Makefile.am -index 31b928f..3cba32f 100644 ---- a/lib/Makefile.am -+++ b/lib/Makefile.am -@@ -128,10 +128,12 @@ if ENABLE_PKCS11H_TOKEN - endif - - if WIN32 -+if ENABLE_SHARED - mylibdir=$(libdir) - mylib_DATA=.libs/@WIN_LIBPREFIX@pkcs11-helper-@LIBPKCS11_HELPER_LT_OLDEST@.dll.def - .libs/@WIN_LIBPREFIX@pkcs11-helper-@LIBPKCS11_HELPER_LT_OLDEST@.dll.def: libpkcs11-helper.la - endif -+endif - - RCCOMPILE = $(RC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) --- -2.34.1 - diff --git a/contrib/vcpkg-ports/pkcs11-helper/pkcs11-helper-002-dynamic_loader_flags.patch b/contrib/vcpkg-ports/pkcs11-helper/pkcs11-helper-002-dynamic_loader_flags.patch deleted file mode 100644 index 6d674581..00000000 --- a/contrib/vcpkg-ports/pkcs11-helper/pkcs11-helper-002-dynamic_loader_flags.patch +++ /dev/null @@ -1,104 +0,0 @@ -From 934197611dd1260d17ae0f11ae81c1d2e85612d2 Mon Sep 17 00:00:00 2001 -From: Marc Becker -Date: Fri, 22 Jul 2022 10:33:05 +0200 -Subject: [PATCH] core: add provider property for loader flags - -support flags for dynamic loader via provider property -set original values as defaults, use verbatim (user-supplied) value ---- - include/pkcs11-helper-1.0/pkcs11h-core.h | 11 ++++++++++- - lib/_pkcs11h-core.h | 2 ++ - 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 -+++ b/include/pkcs11-helper-1.0/pkcs11h-core.h -@@ -384,8 +384,17 @@ extern "C" { - */ - #define PKCS11H_PROVIDER_PROPERTY_PROVIDER_DESTRUCT_HOOK_DATA 8 - -+/** -+ * @brief Provider loader flags for platform. -+ * Value type is unsigned. -+ * Default value is platform dependent: -+ * win32 -> 0 -+ * dlopen -> RTLD_NOW | RTLD_LOCAL -+ */ -+#define PKCS11H_PROVIDER_PROPERTY_LOADER_FLAGS 9 -+ - /** @private */ --#define _PKCS11H_PROVIDER_PROPERTY_LAST 9 -+#define _PKCS11H_PROVIDER_PROPERTY_LAST 10 - - /** @} */ - -diff --git a/lib/_pkcs11h-core.h b/lib/_pkcs11h-core.h -index f879c0e8..1c02e35d 100644 ---- a/lib/_pkcs11h-core.h -+++ b/lib/_pkcs11h-core.h -@@ -134,6 +134,8 @@ struct _pkcs11h_provider_s { - #if defined(ENABLE_PKCS11H_SLOTEVENT) - _pkcs11h_thread_t slotevent_thread; - #endif -+ -+ unsigned loader_flags; - }; - - struct _pkcs11h_session_s { -diff --git a/lib/pkcs11h-core.c b/lib/pkcs11h-core.c -index 0bf11e87..409ad9e2 100644 ---- a/lib/pkcs11h-core.c -+++ b/lib/pkcs11h-core.c -@@ -138,6 +138,7 @@ static const char * __pkcs11h_provider_preperty_names[] = { - "init_args", - "provider_destruct_hook", - "provider_destruct_hook_data", -+ "provider_loader_flags", - NULL - }; - -@@ -916,6 +917,10 @@ pkcs11h_registerProvider ( - reference - ); - -+#if !defined(_WIN32) -+ provider->loader_flags = RTLD_NOW | RTLD_LOCAL; -+#endif -+ - _PKCS11H_DEBUG ( - PKCS11H_LOG_DEBUG2, - "PKCS#11: pkcs11h_registerProvider Provider '%s'", -@@ -1001,6 +1006,7 @@ pkcs11h_setProviderPropertyByName ( - case PKCS11H_PROVIDER_PROPERTY_SLOT_EVENT_METHOD: - case PKCS11H_PROVIDER_PROPERTY_MASK_PRIVATE_MODE: - case PKCS11H_PROVIDER_PROPERTY_SLOT_POLL_INTERVAL: -+ case PKCS11H_PROVIDER_PROPERTY_LOADER_FLAGS: - *(unsigned *)value = (unsigned)strtol(value_str, 0, 0); - value_size = sizeof(unsigned); - break; -@@ -1084,6 +1090,9 @@ __pkcs11h_providerPropertyAddress( - case PKCS11H_PROVIDER_PROPERTY_PROVIDER_DESTRUCT_HOOK_DATA: - *value = &provider->destruct_hook_data; - *value_size = sizeof(provider->destruct_hook_data); -+ case PKCS11H_PROVIDER_PROPERTY_LOADER_FLAGS: -+ *value = &provider->loader_flags; -+ *value_size = sizeof(provider->loader_flags); - break; - } - rv = CKR_OK; -@@ -1254,9 +1263,9 @@ pkcs11h_initializeProvider ( - } - - #if defined(_WIN32) -- provider->handle = LoadLibraryA (provider->provider_location); -+ provider->handle = LoadLibraryExA (provider->provider_location, NULL, provider->loader_flags); - #else -- provider->handle = dlopen (provider->provider_location, RTLD_NOW | RTLD_LOCAL); -+ provider->handle = dlopen (provider->provider_location, provider->loader_flags); - #endif - - if (provider->handle == NULL) { diff --git a/contrib/vcpkg-ports/pkcs11-helper/portfile.cmake b/contrib/vcpkg-ports/pkcs11-helper/portfile.cmake index f8da979e..db9a5ab8 100644 --- a/contrib/vcpkg-ports/pkcs11-helper/portfile.cmake +++ b/contrib/vcpkg-ports/pkcs11-helper/portfile.cmake @@ -1,9 +1,9 @@ -set(VERSION 1.29.0) +set(VERSION 1.30.0) vcpkg_download_distfile(ARCHIVE URLS "https://github.com/OpenSC/pkcs11-helper/releases/download/pkcs11-helper-${VERSION}/pkcs11-helper-${VERSION}.tar.bz2" FILENAME "pkcs11-helper-${VERSION}.tar.bz2" - SHA512 c530f5a4b5826a02bfe787a1293a7595d5a0d6348daa16675bd10c6d6734b1f24a3cc73b5b89433cf1edf8815f8b7298fdfd1ed686f096bb5edfb425e9430eb2 + SHA512 19fba76e41210cc17f9efa4501d0214d4a5c777ab7b2671888fd280b150bae4a6b190c7f47fb783015f9aa40d409fd6087264e531d6f28d0bed4293dcbf8bdd5 ) vcpkg_extract_source_archive_ex( @@ -13,9 +13,7 @@ vcpkg_extract_source_archive_ex( PATCHES nmake-compatibility-with-vcpkg-nmake.patch config-w32-vc.h.in-indicate-OpenSSL.patch - Fix-build-with-disable-shared.patch pkcs11-helper-001-RFC7512.patch - pkcs11-helper-002-dynamic_loader_flags.patch ) if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) diff --git a/contrib/vcpkg-ports/pkcs11-helper/vcpkg.json b/contrib/vcpkg-ports/pkcs11-helper/vcpkg.json index 12f918b7..521f7547 100644 --- a/contrib/vcpkg-ports/pkcs11-helper/vcpkg.json +++ b/contrib/vcpkg-ports/pkcs11-helper/vcpkg.json @@ -1,6 +1,6 @@ { "name": "pkcs11-helper", - "version": "1.29.0", + "version": "1.30.0", "description": "pkcs11-helper is a library that simplifies the interaction with PKCS#11 providers for end-user applications.", "homepage": "https://github.com/OpenSC/pkcs11-helper", "license": "BSD-3-Clause OR GPL-2.0-only"