From patchwork Sat Apr 23 03:57:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marc Becker X-Patchwork-Id: 2412 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director10.mail.ord1d.rsapps.net ([172.27.255.59]) by backend41.mail.ord1d.rsapps.net with LMTP id OJd/ASAGZGK4EgAAqwncew (envelope-from ) for ; Sat, 23 Apr 2022 09:58:56 -0400 Received: from proxy9.mail.iad3a.rsapps.net ([172.27.255.59]) by director10.mail.ord1d.rsapps.net with LMTP id QCRnByAGZGKaOQAApN4f7A (envelope-from ) for ; Sat, 23 Apr 2022 09:58:56 -0400 Received: from smtp7.gate.iad3a ([172.27.255.59]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy9.mail.iad3a.rsapps.net with LMTPS id KC6rOh8GZGJ4aAAAGuSQww (envelope-from ) for ; Sat, 23 Apr 2022 09:58:55 -0400 X-Spam-Threshold: 95 X-Spam-Score: 0 X-Spam-Flag: NO X-Virus-Scanned: OK X-Orig-To: openvpnslackdevel@openvpn.net X-Originating-Ip: [216.105.38.7] Authentication-Results: smtp7.gate.iad3a.rsapps.net; iprev=pass policy.iprev="216.105.38.7"; spf=pass smtp.mailfrom="openvpn-devel-bounces@lists.sourceforge.net" smtp.helo="lists.sourceforge.net"; dkim=fail (signature verification failed) header.d=sourceforge.net; dkim=fail (signature verification failed) header.d=sf.net; dkim=fail (signature verification failed) header.d=gmx.net; dmarc=fail (p=none; dis=none) header.from=gmx.de X-Suspicious-Flag: YES X-Classification-ID: 838842ac-c30d-11ec-aac7-525400bbebb8-1-1 Received: from [216.105.38.7] ([216.105.38.7:57382] helo=lists.sourceforge.net) by smtp7.gate.iad3a.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id EF/04-07933-F1604626; Sat, 23 Apr 2022 09:58:55 -0400 Received: from [127.0.0.1] (helo=sfs-ml-4.v29.lw.sourceforge.com) by sfs-ml-4.v29.lw.sourceforge.com with esmtp (Exim 4.94.2) (envelope-from ) id 1niGGR-00026C-U3; Sat, 23 Apr 2022 13:57:30 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-4.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1niGGJ-000265-Ds for openvpn-devel@lists.sourceforge.net; Sat, 23 Apr 2022 13:57:22 +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=5SfF+Vz+cmuMo0Rqefh53vvAjiHtigm7PyxqQ5ru/t8=; b=cwXl3anktBy/Dffn19imYtKe13 32U3KGYmuUjtp+7WXFvcvzmnFQUE+ywszcK9NistQICY4R6if1e5jL2Qw6uS8s9XXEDkZU5h3jk6G nu8cfn5nkX9OjOpAQAggXgvNF2vZ4OW4q9yx2Lyh7/RF4YwX2kXmjfPeD4nc9Jo0TIJQ=; 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=5SfF+Vz+cmuMo0Rqefh53vvAjiHtigm7PyxqQ5ru/t8=; b=C +uHD/zjROWP9S4M68Non61I4I9OEFWxfTZNA0pwr+zdadryRr1GBnBKIBEuGlal/F5qa6+b5KSsPe CI4xEEMil2GAqbv56dR6kDx31ZS0rDwiuh5Myl6cmvo1zbsD1lhaqyq/XE5cBOACaaCV6Ry7NS4+T c1DCmd4c+kt3Fr34=; Received: from mout.gmx.net ([212.227.15.18]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.94.2) id 1niGGG-0002XG-1Z for openvpn-devel@lists.sourceforge.net; Sat, 23 Apr 2022 13:57:21 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1650722232; bh=HEVqYWQM1I1qwvm4iuxw5Q8ruiYIqZCwjNzgKvR62h4=; h=X-UI-Sender-Class:From:To:Subject:Date; b=i7oTFPhhQMV+VYLlWQzA3AmyehqFZNDghaOJ0/6nuM5Nd4RJB4W3zCiw5RYY7RXWI A8MhqgR1NNrsZhRhHmpLWJlRdRL3rlh3bBtPW4/HRnh0agDDkMUsLynbrnK5X5Cd8n 1xkAI77VTfCupD3NHpn4s7LxCQn6Qq7xhLzPgE9c= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from moro ([85.212.228.138]) by mail.gmx.net (mrgmx005 [212.227.17.190]) with ESMTPSA (Nemesis) id 1M3DJv-1njdhd1WEn-003aKs for ; Sat, 23 Apr 2022 15:57:12 +0200 From: Marc Becker To: openvpn-devel@lists.sourceforge.net Date: Sat, 23 Apr 2022 15:57:04 +0200 Message-Id: <20220423135704.88164-1-becm@gmx.de> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-Provags-ID: V03:K1:pk4UE9yc53oXDUassb+1gPXfsXCNniTujJHZoEyZx+jjXC/pPcZ KUZyWvNagn7nGjRHJv3bAe/5o58P8zUi2zMIdRAo8wo5asIK6qBXZC+ShqjyuQHS8VCtJ82 Nb6y5EISpMrnV4AbnhfMAlhqkuEzpB1lzIJ+OBggS/YwfqbckEVsbpswIdIsNfFxzUmbjHV LSU1VityOSvMGtN9x+lOg== X-UI-Out-Filterresults: notjunk:1;V03:K0:GfqsVZrt5C8=:FIbZZU/kHRGkYs4Whqu3uj CpVI8QVQbkWW/EAbv6D+BlWnmXBqPQDj485QjuQfutqufjNuTE2SJJxXYZ7ly4ofCFlClTaB+ xncQXFZKQkwIiWyRH0BOEenvDnY0b5j1KD5t4B0t4Pvu4+FsqJ6vM0IDx89adEtNMmqpq4YpF ii4ikTMAejt2mzILsctuBY+ntQfbxqcYZaahPZ5Vj2MPsW4Z64C+IoBGgUaBOQziq6OJbcf67 4xLTKB32B9TE4QEvtGUWkSVkMyclUCzUacvgtHMjo2glm20cnfpG3MOWBGURY1jo7UCKH3H0n OHlt8lBQQnvcIRdKp5ln8eHuKMm8IzcAljQvabKq5QdafsDWx04Lmq+zNMUJxIOGEVrM0H4qV Y8F83iBWOhvavFyD7aAFnm8wFVtwpn+rpircZcHbDACsoE0kTQHsWsv8LDanPIA7od7ME2sjg z/TbuoGKN9I0jmbkigJzt0Qo3QchsI8muViLcmDK8WyV59VBLvTOWvsKmozCNZTQj6RTrc/D2 oFMwdm8RGeK6tW296xoRMVCPlxQQEqW52YqfZnbKuiOs8qLQ6YSgeI6YfRZeXVHQbFpP4ZT6t DdZMEmEOTNz/RJsgyd0Yc2pY0L6mHCNugVYovsh41aePKOWGd5NmCCNKkUD9JNmgArvYUVlFj jUWL+H/7hgyRi/CXSyR5qAqKnKmGY76xAL1zVZStTz4M6rE2pKqyAx2Zt4FQuRymoo70RWEnW gm9PEdQdl/K0jaAHluGJ7LbPFusAUypyNL+ixT1lHtOESGL6VuwLvL9ohu6zfzDFreVpu/6rz XzPFHgJIkkvZ2wGoU25vaVv/JcJCfoAVaVlXbJXlQIKhI2+hqZ1nxQ1jbmUT1THs2JxFvNoS/ oP2tST4GIZ4Ad66EOqt74TT3KW3KHFXFi/fLnyLCWkEA2N31BFdN6f0G7iHCzU4YohOP6JkJB QK9QczzWxA5nwPKYaZbz5I+SZgVBfWDCdXkqiW2T7PEfG3zC2B1lg2ImwpalRBL1eMsJTCu4r 7RSSq3rHf4g4yXzkALvmlkvOwDEOn87CM8H8/yQHFSLb+XoXEvXnq2YspXr1yCSJkA== 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: This release has merged win32 support patch, so our own patch could be removed from the port. Upstream archive format changed back to BZIP2. Signed-off-by: Marc Becker --- ...config-w32-vc.h.in-indicate-OpenSSL.patch} | 0 ...-pkcs11.h-rename-interface-parameter.patch | 32 contrib/vcpkg-ports/pkcs11-helper/CONTROL | 2 [...] Content analysis details: (-0.7 points, 6.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/, low trust [212.227.15.18 listed in list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [becm[at]gmx.de] -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid X-Headers-End: 1niGGG-0002XG-1Z Subject: [Openvpn-devel] [PATCH] vcpkg-ports/pkcs11-helper: bump to release 1.29 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: , Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox This release has merged win32 support patch, so our own patch could be removed from the port. Upstream archive format changed back to BZIP2. Signed-off-by: Marc Becker Acked-by: Lev Stipakov --- ...config-w32-vc.h.in-indicate-OpenSSL.patch} | 0 ...-pkcs11.h-rename-interface-parameter.patch | 32 ------------------- contrib/vcpkg-ports/pkcs11-helper/CONTROL | 2 +- .../vcpkg-ports/pkcs11-helper/portfile.cmake | 11 +++---- 4 files changed, 6 insertions(+), 39 deletions(-) rename contrib/vcpkg-ports/pkcs11-helper/{0003-config-w32-vc.h.in-indicate-OpenSSL.patch => 0002-config-w32-vc.h.in-indicate-OpenSSL.patch} (100%) delete mode 100644 contrib/vcpkg-ports/pkcs11-helper/0002-pkcs11.h-rename-interface-parameter.patch -- 2.30.2 diff --git a/contrib/vcpkg-ports/pkcs11-helper/0003-config-w32-vc.h.in-indicate-OpenSSL.patch b/contrib/vcpkg-ports/pkcs11-helper/0002-config-w32-vc.h.in-indicate-OpenSSL.patch similarity index 100% rename from contrib/vcpkg-ports/pkcs11-helper/0003-config-w32-vc.h.in-indicate-OpenSSL.patch rename to contrib/vcpkg-ports/pkcs11-helper/0002-config-w32-vc.h.in-indicate-OpenSSL.patch diff --git a/contrib/vcpkg-ports/pkcs11-helper/0002-pkcs11.h-rename-interface-parameter.patch b/contrib/vcpkg-ports/pkcs11-helper/0002-pkcs11.h-rename-interface-parameter.patch deleted file mode 100644 index 13c60d9d..00000000 --- a/contrib/vcpkg-ports/pkcs11-helper/0002-pkcs11.h-rename-interface-parameter.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 0c2f862fe23dc6d2c0ca8432d1f6027c922c5a04 Mon Sep 17 00:00:00 2001 -From: Lev Stipakov -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 ---- - 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 - diff --git a/contrib/vcpkg-ports/pkcs11-helper/CONTROL b/contrib/vcpkg-ports/pkcs11-helper/CONTROL index ff116364..1ead697e 100644 --- a/contrib/vcpkg-ports/pkcs11-helper/CONTROL +++ b/contrib/vcpkg-ports/pkcs11-helper/CONTROL @@ -1,4 +1,4 @@ Source: pkcs11-helper -Version: 1.28-4 +Version: 1.29-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. diff --git a/contrib/vcpkg-ports/pkcs11-helper/portfile.cmake b/contrib/vcpkg-ports/pkcs11-helper/portfile.cmake index 6008f615..a19ea254 100644 --- a/contrib/vcpkg-ports/pkcs11-helper/portfile.cmake +++ b/contrib/vcpkg-ports/pkcs11-helper/portfile.cmake @@ -1,9 +1,9 @@ -set(VERSION 1.28.0) +set(VERSION 1.29.0) vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/OpenSC/pkcs11-helper/releases/download/pkcs11-helper-${VERSION}/pkcs11-helper-${VERSION}.tar.gz" - FILENAME "pkcs11-helper-${VERSION}.tar.gz" - SHA512 1c1cc7f83ed360fabdcfa68d0eafa7d25be03e68c6a202e7ad2907feb472663bb34e12b9e162344ec221a4298abc02acdc75f0f45d9a89657aa7ac55e59badd5 + 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 ) vcpkg_extract_source_archive_ex( @@ -12,8 +12,7 @@ vcpkg_extract_source_archive_ex( REF ${VERSION} PATCHES 0001-nmake-compatibility-with-vcpkg-nmake.patch - 0002-pkcs11.h-rename-interface-parameter.patch - 0003-config-w32-vc.h.in-indicate-OpenSSL.patch + 0002-config-w32-vc.h.in-indicate-OpenSSL.patch pkcs11-helper-001-RFC7512.patch )