From patchwork Thu Feb 12 11:09:35 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Lichtenheld X-Patchwork-Id: 4758 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7000:1817:b0:80a:3855:ce6a with SMTP id p23csp748751max; Thu, 12 Feb 2026 03:10:02 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWpF8HNyUKhMzeCIJuFalA97NcU1WzM+eurFzq7be/n8lIUSbJv0e5OzXs8AF6aN7KZJz5UTyLv6iU=@openvpn.net X-Received: by 2002:a05:6820:188b:b0:672:a49f:1297 with SMTP id 006d021491bc7-67597f90b17mr1284193eaf.4.1770894601737; Thu, 12 Feb 2026 03:10:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1770894601; cv=none; d=google.com; s=arc-20240605; b=ZkWt9dsxD9Gat9ByVQVekmZACuPjkrJv9mUfZsGtmyoBW36CNuhNQp6+tF8dzOHZNC Ral82T4GfZoBlSDlIJHmxfbQaYAyMiHyNPS3uTJNX5o2pbr4h9Ums+/ufAUM+A1zrVZG 72DZFRtexyil5qywzml2vjr9sLFGJmOrHeilq3WrQ/N80q7k9yXP9uaZ+2l9DdweZH+9 gEs9mmC83kn21SWGwbWHgh3SbtpPRqpD0BlXbT3ligAZGBjQiIwwlYrzFpBMuG8wBxcz pdhN7u17SoXSSdB7xPsXm1sz8rfBCqwyjtqwvYDvrwMjUGA3wOl557MnOB0MTd5uI04D 8Uzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=errors-to:content-transfer-encoding:cc:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:dkim-signature:dkim-signature:dkim-signature; bh=K+X4B8gL4ZuC5rvizg12+R9FlIkmheb3CXgF+D0sYnA=; fh=SipEYX5S4C9flAQ9PajpSE6bO+d9zIqYY9I42vPrNlU=; b=AxnwuLc2D1juXQgPGLVZ4k6b7h9X78jqToUimtqi5GVQcbKufTq/Poc6MrfmIqfYmC 71czGZGS9/QeDOwCxYnpeI1MupuP6OF1MWZIyB0+6Bba8srmrBG52ppYx7ZSOw0E56ia 9ovdjyLzVQjmw3GomYILNKy5luyoyU1lIm1seMh9sZip0xoIYKk3+q7KDdawVb0FQDm/ pvfFCxzP4E0Gl/VgxTBtE4M6B9Lqyah1NKQE3+qDwuZhosOKU12piViQTFd16EVpku54 RNb9p1gzNLaB9SIhezSaW+/kTgcLtcVSEtEKLaWDHPmuCsoOqEjBqBNXRWch032GFI7I +teA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@lists.sourceforge.net header.s=beta header.b=Rd1DnqCd; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=Qw5VTKUO; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=fsd0NgEB; dkim=neutral (body hash did not verify) header.i=@lichtenheld.com header.s=MBO0001 header.b=UrsMhrnw; 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 Received: from lists.sourceforge.net (lists.sourceforge.net. [216.105.38.7]) by mx.google.com with ESMTPS id 006d021491bc7-67472844116si2742290eaf.3.2026.02.12.03.10.01 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Feb 2026 03:10:01 -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=pass header.i=@lists.sourceforge.net header.s=beta header.b=Rd1DnqCd; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b=Qw5VTKUO; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=fsd0NgEB; dkim=neutral (body hash did not verify) header.i=@lichtenheld.com header.s=MBO0001 header.b=UrsMhrnw; 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 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.sourceforge.net; s=beta; h=Content-Transfer-Encoding:Content-Type:Cc: List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: Subject:MIME-Version:References:In-Reply-To:Message-ID:Date:To:From:Sender: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=K+X4B8gL4ZuC5rvizg12+R9FlIkmheb3CXgF+D0sYnA=; b=Rd1DnqCdoSX70fY3jr/JotCy5p eW6RiyJgbLO4xv54lfwR/KHzUyr9zz2HxkqL68qO78hvzIxjsIWWIXexOWNVpqJIkNaEoVKI4GPWz KjZ4+sN+L0UHNzFSg01lU38hEfBWjjqKjYmAf45g3mOb1HEglWbxhYE224aHYTyxAkjg=; Received: from [127.0.0.1] (helo=sfs-ml-1.v29.lw.sourceforge.com) by sfs-ml-1.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1vqUZx-000448-0N; Thu, 12 Feb 2026 11:09:49 +0000 Received: from [172.30.29.66] (helo=mx.sourceforge.net) by sfs-ml-1.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1vqUZu-00043y-Fz for openvpn-devel@lists.sourceforge.net; Thu, 12 Feb 2026 11:09:46 +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:References: In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=Zyr+Aad1CgYcPFWtGBmMpiYiZblyRx/sv9DctFLgp0o=; b=Qw5VTKUOudNOZ/PoX64J3hwegs rL2JNBCQK87v8LGVDrWylQtip7jVMDd1FtuqwnEq9HCh35/ZBT52KDJEUdOJMVOxkOTqY5kMCu8K0 WbGUYxFYd4X5f6GQw74MPLzMnXULlBWdc6WwRPKJEHF2vcUVeFsv+2SYbHRp9Xod2rNo=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-ID: Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=Zyr+Aad1CgYcPFWtGBmMpiYiZblyRx/sv9DctFLgp0o=; b=fsd0NgEBxoeBStbXKzWDJU4exQ J+aklH7RVZLjcLK2LP5B7fRhIaNb4uuSaQp5LNNJgZt40WoRh6xE8ySHhS+LfEKn31ClOYbxz0jD5 3QYLxccndLc2rcoQ6ExSadmwCkqAtciUFpt3oTFW7MTy/ngKOjTy5Ig8h7oHrcJ7majE=; Received: from mout-p-202.mailbox.org ([80.241.56.172]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.95) id 1vqUZt-0000eb-BT for openvpn-devel@lists.sourceforge.net; Thu, 12 Feb 2026 11:09:46 +0000 Received: from smtp1.mailbox.org (smtp1.mailbox.org [IPv6:2001:67c:2050:b231:465::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-202.mailbox.org (Postfix) with ESMTPS id 4fBXcw6KQMz9tXR; Thu, 12 Feb 2026 12:09:36 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lichtenheld.com; s=MBO0001; t=1770894576; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Zyr+Aad1CgYcPFWtGBmMpiYiZblyRx/sv9DctFLgp0o=; b=UrsMhrnwkg4Ku13+Cv/h6dOpqqJuSLBE6NCrWS8xAXjwTfDUxr/npwmUf2jdzLjFFEJLV4 2iFNCb/jQYt2KZQvxJQv3aLT+V5nPhlhryIpLijfL8KeRrdpvz8zgrFMBdLp8zLdevoIXW 9WHOC1tUFjingwSg4o0940/StX66Lsz2DjSIwJ3olxZ2rSENu8DnpT858kzLPy1fphr1/F BH+7eBgeudpv+hVPj0a7IHNd8qLM3vS5gLBKdWhe01KIm9uO06x4HDW/ZB71Z2dWLQYRPX 48I/gcxT39rW1NT5mFP+f3LWr4ckmvKkXsqrjOSWE6ERHB1c9hBblcvA8Z2+VA== Authentication-Results: outgoing_mbo_mout; dkim=none; spf=pass (outgoing_mbo_mout: domain of frank@lichtenheld.com designates 2001:67c:2050:b231:465::1 as permitted sender) smtp.mailfrom=frank@lichtenheld.com From: Frank Lichtenheld To: openvpn-devel@lists.sourceforge.net Date: Thu, 12 Feb 2026 12:09:35 +0100 Message-ID: <20260212110935.19541-1-frank@lichtenheld.com> In-Reply-To: References: MIME-Version: 1.0 X-Rspamd-Queue-Id: 4fBXcw6KQMz9tXR X-Spam-Score: -0.2 (/) X-Spam-Report: Spam detection software, running on the system "sfi-spamd-2.hosts.colo.sdot.me", 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: - Replace deprecated functions with newer alternatives - Improve vcpkg.json by documenting openssl dependency - Remove unnecessary duplicated version number - Fix whitespaces Change-Id: I7462869a473a7afe2e9ed9474c69de0af96c011c Signed-off-by: Frank Lichtenheld Acked-by: Yuriy Darnobyt Gerrit URL: https://gerrit.openvpn.net/c/op [...] Content analysis details: (-0.2 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-Headers-End: 1vqUZt-0000eb-BT Subject: [Openvpn-devel] [PATCH v1] vcpkg-ports: Review pkcs11-helper port 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: , Cc: Yuriy Darnobyt Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox X-GMAIL-THRID: =?utf-8?q?1856917577755288129?= X-GMAIL-MSGID: =?utf-8?q?1856917577755288129?= - Replace deprecated functions with newer alternatives - Improve vcpkg.json by documenting openssl dependency - Remove unnecessary duplicated version number - Fix whitespaces Change-Id: I7462869a473a7afe2e9ed9474c69de0af96c011c Signed-off-by: Frank Lichtenheld Acked-by: Yuriy Darnobyt Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1518 --- This change was reviewed on Gerrit and approved by at least one developer. I request to merge it to master. Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1518 This mail reflects revision 1 of this Change. Acked-by according to Gerrit (reflected above): Yuriy Darnobyt diff --git a/contrib/vcpkg-ports/pkcs11-helper/portfile.cmake b/contrib/vcpkg-ports/pkcs11-helper/portfile.cmake index af19831..f5742a4 100644 --- a/contrib/vcpkg-ports/pkcs11-helper/portfile.cmake +++ b/contrib/vcpkg-ports/pkcs11-helper/portfile.cmake @@ -1,15 +1,12 @@ -set(VERSION 1.31.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 0833efc59e9093dd398a54640d858b01a830ef7adfb40321c1e0ed0afa004500fc1259cc66bc49c5263935adeda0a3bfe658de538eefd66888685a71f731c484 ) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH +vcpkg_extract_source_archive( + SOURCE_PATH ARCHIVE ${ARCHIVE} - REF ${VERSION} PATCHES nmake-compatibility-with-vcpkg-nmake.patch config-w32-vc.h.in-indicate-OpenSSL.patch @@ -33,20 +30,20 @@ file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lib/libpkcs11-helper-1.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) set(PACKAGE_VERSION "${VERSION}") - set(libdir [[${prefix}/lib]]) - set(exec_prefix [[${prefix}]]) - set(PKCS11H_FEATURES key_prompt openssl engine_crypto_cryptoapi engine_crypto_openssl debug threading token data certificate slotevent engine_crypto) - set(LIBS -lkernel32 -luser32 -lgdi32 -lwinspool -lshell32 -lole32 -loleaut32 -luuid -lcomdlg32 -ladvapi32) - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - set(includedir [[${prefix}/include]]) - set(outfile "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libpkcs11-helper-1.pc") - configure_file("${SOURCE_PATH}/lib/libpkcs11-helper-1.pc.in" "${outfile}" @ONLY) - endif() - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - set(includedir [[${prefix}/../include]]) - set(outfile "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libpkcs11-helper-1.pc") - configure_file("${SOURCE_PATH}/lib/libpkcs11-helper-1.pc.in" "${outfile}" @ONLY) - endif() + set(libdir [[${prefix}/lib]]) + set(exec_prefix [[${prefix}]]) + set(PKCS11H_FEATURES key_prompt openssl engine_crypto_cryptoapi engine_crypto_openssl debug threading token data certificate slotevent engine_crypto) + set(LIBS -lkernel32 -luser32 -lgdi32 -lwinspool -lshell32 -lole32 -loleaut32 -luuid -lcomdlg32 -ladvapi32) + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + set(includedir [[${prefix}/include]]) + set(outfile "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libpkcs11-helper-1.pc") + configure_file("${SOURCE_PATH}/lib/libpkcs11-helper-1.pc.in" "${outfile}" @ONLY) + endif() + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + set(includedir [[${prefix}/../include]]) + set(outfile "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libpkcs11-helper-1.pc") + configure_file("${SOURCE_PATH}/lib/libpkcs11-helper-1.pc.in" "${outfile}" @ONLY) + endif() file(INSTALL ${SOURCE_PATH}/include/pkcs11-helper-1.0 DESTINATION ${CURRENT_PACKAGES_DIR}/include/) @@ -66,4 +63,4 @@ vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") diff --git a/contrib/vcpkg-ports/pkcs11-helper/vcpkg.json b/contrib/vcpkg-ports/pkcs11-helper/vcpkg.json index 382a3d3..da54646 100644 --- a/contrib/vcpkg-ports/pkcs11-helper/vcpkg.json +++ b/contrib/vcpkg-ports/pkcs11-helper/vcpkg.json @@ -1,7 +1,11 @@ { - "name": "pkcs11-helper", - "version": "1.31.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" + "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg/master/scripts/vcpkg.schema.json", + "name": "pkcs11-helper", + "version": "1.31.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", + "dependencies": [ + "openssl" + ] }