diff mbox series

[Openvpn-devel,2/3] vcpkg-ports/pkcs11-helper: Convert CONTROL to vcpkg.json

Message ID 20230331154214.613245-3-frank@lichtenheld.com
State Accepted
Headers
Series Cleanup the pkcs11-helper vcpkg port |

Commit Message

Frank Lichtenheld March 31, 2023, 3:42 p.m. UTC 
  To be in line with current vcpkg packaging policies.

Change-Id: Ifad0965a2b724b0b278783ba9c0ad5a82274445d
Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com>
---
 .github/workflows/build.yaml                 | 1 +
 contrib/vcpkg-ports/pkcs11-helper/CONTROL    | 4 ----
 contrib/vcpkg-ports/pkcs11-helper/vcpkg.json | 7 +++++++
 3 files changed, 8 insertions(+), 4 deletions(-)
 delete mode 100644 contrib/vcpkg-ports/pkcs11-helper/CONTROL
 create mode 100644 contrib/vcpkg-ports/pkcs11-helper/vcpkg.json

Comments

Lev Stipakov March 31, 2023, 3:54 p.m. UTC | #1 
Reviewed in Gerrit.

Acked-by: Lev Stipakov <lstipakov@gmail.com>

pe 31. maalisk. 2023 klo 18.43 Frank Lichtenheld
(frank@lichtenheld.com) kirjoitti:
>
> To be in line with current vcpkg packaging policies.
>
> Change-Id: Ifad0965a2b724b0b278783ba9c0ad5a82274445d
> Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com>
> ---
>  .github/workflows/build.yaml                 | 1 +
>  contrib/vcpkg-ports/pkcs11-helper/CONTROL    | 4 ----
>  contrib/vcpkg-ports/pkcs11-helper/vcpkg.json | 7 +++++++
>  3 files changed, 8 insertions(+), 4 deletions(-)
>  delete mode 100644 contrib/vcpkg-ports/pkcs11-helper/CONTROL
>  create mode 100644 contrib/vcpkg-ports/pkcs11-helper/vcpkg.json
>
> diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
> index 0f352dcd..0c16d379 100644
> --- a/.github/workflows/build.yaml
> +++ b/.github/workflows/build.yaml
> @@ -445,6 +445,7 @@ jobs:
>          uses: lukka/run-vcpkg@v10
>          with:
>            vcpkgGitCommitId: 'd10d511f25620ca0f315cd83dcef6485efc63010'
> +          vcpkgJsonGlob: '**/openvpn/vcpkg.json'
>            appendedCacheKey: '${{matrix.triplet}}'
>
>        - name: Run MSBuild consuming vcpkg.json
> diff --git a/contrib/vcpkg-ports/pkcs11-helper/CONTROL b/contrib/vcpkg-ports/pkcs11-helper/CONTROL
> deleted file mode 100644
> index 1ead697e..00000000
> --- a/contrib/vcpkg-ports/pkcs11-helper/CONTROL
> +++ /dev/null
> @@ -1,4 +0,0 @@
> -Source: pkcs11-helper
> -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/vcpkg.json b/contrib/vcpkg-ports/pkcs11-helper/vcpkg.json
> new file mode 100644
> index 00000000..12f918b7
> --- /dev/null
> +++ b/contrib/vcpkg-ports/pkcs11-helper/vcpkg.json
> @@ -0,0 +1,7 @@
> +{
> +    "name": "pkcs11-helper",
> +    "version": "1.29.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"
> +}
> --
> 2.34.1
>
>
>
> _______________________________________________
> Openvpn-devel mailing list
> Openvpn-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/openvpn-devel
Gert Doering May 8, 2023, 3:32 p.m. UTC | #2 
I have no idea what this does, but if Lev says it's The Way...

It doesn't contain code changes, and I have verified that it doesn't
break MinGW or GH building, so fine with me.

Your patch has been applied to the master branch.

commit a2160d3e42a1eff59aee3d984fd3354907f4379f
Author: Frank Lichtenheld
Date:   Fri Mar 31 17:42:13 2023 +0200

     vcpkg-ports/pkcs11-helper: Convert CONTROL to vcpkg.json

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


--
kind regards,

Gert Doering
diff mbox series

Patch

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 0f352dcd..0c16d379 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -445,6 +445,7 @@  jobs:
         uses: lukka/run-vcpkg@v10
         with:
           vcpkgGitCommitId: 'd10d511f25620ca0f315cd83dcef6485efc63010'
+          vcpkgJsonGlob: '**/openvpn/vcpkg.json'
           appendedCacheKey: '${{matrix.triplet}}'
 
       - name: Run MSBuild consuming vcpkg.json
diff --git a/contrib/vcpkg-ports/pkcs11-helper/CONTROL b/contrib/vcpkg-ports/pkcs11-helper/CONTROL
deleted file mode 100644
index 1ead697e..00000000
--- a/contrib/vcpkg-ports/pkcs11-helper/CONTROL
+++ /dev/null
@@ -1,4 +0,0 @@ 
-Source: pkcs11-helper
-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/vcpkg.json b/contrib/vcpkg-ports/pkcs11-helper/vcpkg.json
new file mode 100644
index 00000000..12f918b7
--- /dev/null
+++ b/contrib/vcpkg-ports/pkcs11-helper/vcpkg.json
@@ -0,0 +1,7 @@ 
+{
+    "name": "pkcs11-helper",
+    "version": "1.29.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"
+}