[winpr,ncrypt] bundle pkcs11.h and drop pkcs11-helper dependency

The ncrypt implementation currently relies on the pkcs11-helper library.
That is not available on RHEL for example. Let's bundle the standardized
header file from https://github.com/latchset/pkcs11-headers to avoid the
need for extra dependency.

Related: https://github.com/FreeRDP/FreeRDP/discussions/9982
This commit is contained in:
Ondrej Holy
2024-04-16 13:38:02 +02:00
committed by akallabeth
parent cef3d5e9d4
commit 5a28b046d5
15 changed files with 2418 additions and 88 deletions

View File

@@ -50,7 +50,6 @@ Build-Depends:
libsdl2-ttf-dev,
libsdl2-image-dev,
libsystemd-dev,
libpkcs11-helper1-dev,
libwebkit2gtk-4.0-dev,
liburiparser-dev,
libopus-dev,

View File

@@ -53,7 +53,6 @@
"modules/cJSON.json",
"modules/xprop.json",
"modules/pcsc.json",
"modules/pkcs11-helper.json",
"modules/krb5.json",
"modules/opensc.json",
{

View File

@@ -1,21 +0,0 @@
{
"name": "pkcs11-helper",
"buildsystem": "autotools",
"cleanup": [],
"config-opts": [],
"sources": [
{
"type": "git",
"url": "https://github.com/OpenSC/pkcs11-helper.git",
"tag": "pkcs11-helper-1.30.0",
"commit": "8bed16034f629a0361fa8ff89deed2b43dc45d8b"
},
{
"type": "script",
"dest-filename": "autogen.sh",
"commands": [
"autoreconf -vfi"
]
}
]
}

View File

@@ -49,7 +49,6 @@ BuildRequires: uriparser-devel
BuildRequires: libpng-devel
BuildRequires: libwebp-devel
BuildRequires: fuse3-devel
BuildRequires: pkcs11-helper-devel
BuildRequires: pam-devel
BuildRequires: libicu-devel