[Openvpn-devel,master+release/2.5] vcpkg-ports/pkcs11-helper: adapt to new upstream URL

Message ID 20220314120334.231-1-lstipakov@gmail.com
State Accepted
Headers show
Series
  • [Openvpn-devel,master+release/2.5] vcpkg-ports/pkcs11-helper: adapt to new upstream URL
Related show

Commit Message

Lev Stipakov March 14, 2022, 12:03 p.m.
From: Lev Stipakov <lev@openvpn.net>

Signed-off-by: Lev Stipakov <lev@openvpn.net>
---
 contrib/vcpkg-ports/pkcs11-helper/CONTROL        | 2 +-
 contrib/vcpkg-ports/pkcs11-helper/portfile.cmake | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

Comments

Frank Lichtenheld March 14, 2022, 5:06 p.m. | #1
Acked-by: Frank Lichtenheld <frank@lichtenheld.com>

Tested vcpkg upgrade/install on Windows 10 with VS 2019.

> Lev Stipakov <lstipakov@gmail.com> hat am 14.03.2022 13:03 geschrieben:
> 
>  
> From: Lev Stipakov <lev@openvpn.net>
> 
> Signed-off-by: Lev Stipakov <lev@openvpn.net>
> ---
>  contrib/vcpkg-ports/pkcs11-helper/CONTROL        | 2 +-
>  contrib/vcpkg-ports/pkcs11-helper/portfile.cmake | 8 ++++----
>  2 files changed, 5 insertions(+), 5 deletions(-)

Regards,
--
Frank Lichtenheld
Gert Doering March 14, 2022, 7:08 p.m. | #2
Thanks, Frank, for testing the windows build stuff.  I usually do trust
Lev's build patches (what else could I do?) but knowing them tested and
having an ACK is much better.

Lev, your patch has been applied to the master and release/2.5 branch.

commit fd567aa0ef71afc0788b97341e88f59406c8f7df (head)
commit 3ffe644638e40dd997cc87c24be3d2be4644ab6b (release/2.5)
Author: Lev Stipakov
Date:   Mon Mar 14 14:03:34 2022 +0200

     vcpkg-ports/pkcs11-helper: adapt to new upstream URL

     Signed-off-by: Lev Stipakov <lev@openvpn.net>
     Acked-by: Frank Lichtenheld <frank@lichtenheld.com>
     Message-Id: <20220314120334.231-1-lstipakov@gmail.com>
     URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg23940.html
     Signed-off-by: Gert Doering <gert@greenie.muc.de>


--
kind regards,

Gert Doering
Samuli Seppänen March 15, 2022, 8:04 a.m. | #3
Based on my testing this fixes the Windows build issues.

ACK.

Il 14.3.2022 14.03, Lev Stipakov ha scritto:
> From: Lev Stipakov <lev@openvpn.net>
> 
> Signed-off-by: Lev Stipakov <lev@openvpn.net>
> ---
>   contrib/vcpkg-ports/pkcs11-helper/CONTROL        | 2 +-
>   contrib/vcpkg-ports/pkcs11-helper/portfile.cmake | 8 ++++----
>   2 files changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/contrib/vcpkg-ports/pkcs11-helper/CONTROL b/contrib/vcpkg-ports/pkcs11-helper/CONTROL
> index 6a5077fd..ff116364 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-3
> +Version: 1.28-4
>   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 0723344e..4a9cd20c 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)
> +set(VERSION 1.28.0)
>   
>   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 11b8e554d9223ab9305a3ad7e2b6a9bbece1c09ca8d49276618dec31eefdccf6a32b0db85a28a90334ea42fe809beec83514a31930b79bdbefa368ed4658945b
> +    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
>   )
>   
>   vcpkg_extract_source_archive_ex(

Patch

diff --git a/contrib/vcpkg-ports/pkcs11-helper/CONTROL b/contrib/vcpkg-ports/pkcs11-helper/CONTROL
index 6a5077fd..ff116364 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-3
+Version: 1.28-4
 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 0723344e..4a9cd20c 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)
+set(VERSION 1.28.0)
 
 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 11b8e554d9223ab9305a3ad7e2b6a9bbece1c09ca8d49276618dec31eefdccf6a32b0db85a28a90334ea42fe809beec83514a31930b79bdbefa368ed4658945b
+    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
 )
 
 vcpkg_extract_source_archive_ex(