* update pkcs11-helper to 1.28.0-1

This commit is contained in:
Alexander Baldeck 2022-03-28 18:43:00 +02:00
parent c47b400ff4
commit 4ada0cab67
2 changed files with 66 additions and 7 deletions

View File

@ -0,0 +1,58 @@
From 083a3a62f2e631deec2fb2799d10660a41c50294 Mon Sep 17 00:00:00 2001
From: Alon Bar-Lev <alon.barlev@gmail.com>
Date: Fri, 30 Jul 2021 20:06:36 +0300
Subject: [PATCH] nss: use nss pkcs11.h
make nss happy with its own extensions and non-standard behavior.
---
lib/_pkcs11h-crypto-nss.c | 14 ++++++++++----
lib/common.h | 7 +++++++
2 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/lib/_pkcs11h-crypto-nss.c b/lib/_pkcs11h-crypto-nss.c
index 4b70e826..f57f9e6b 100644
--- a/lib/_pkcs11h-crypto-nss.c
+++ b/lib/_pkcs11h-crypto-nss.c
@@ -48,15 +48,21 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include "common.h"
-
-#include "_pkcs11h-crypto.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#if defined(ENABLE_PKCS11H_ENGINE_NSS)
-#define _PKCS11T_H_ /* required so no conflict with ours */
#include <nss.h>
#include <cert.h>
+/* Use PKCS#11 of nss to avoid conflicts and make nss happy with its own extensions */
+#define PKCS11_H 1
+
+#include "common.h"
+
+#include "_pkcs11h-crypto.h"
+
static
int
__pkcs11h_crypto_nss_initialize (
diff --git a/lib/common.h b/lib/common.h
index 61a958af..2499e9c5 100644
--- a/lib/common.h
+++ b/lib/common.h
@@ -72,5 +72,12 @@
#define _PKCS11H_ASSERT assert
+#ifndef FALSE
+#define FALSE 0
+#endif
+#ifndef TRUE
+#define TRUE 1
+#endif
+
#endif

View File

@ -5,19 +5,20 @@
# Contributor: Martin Perner <martin dot perner at gmail dot com>
pkgname=pkcs11-helper
pkgver=1.26.0
pkgrel=2
pkgdesc="A library that simplifies the interaction with PKCS11 providers for end-user applications using a simple API and optional OpenSSL engine"
arch=( x86_64 powerpc64le powerpc )
pkgver=1.28.0
pkgrel=1
pkgdesc='A library that simplifies the interaction with PKCS11 providers for end-user applications using a simple API and optional OpenSSL engine'
arch=(x86_64 powerpc64le powerpc riscv64)
url='https://github.com/OpenSC/pkcs11-helper'
license=(GPL BSD)
depends=('gnutls' 'nss' 'openssl')
provides=('libpkcs11-helper.so')
source=("https://github.com/OpenSC/${pkgname}/releases/download/${pkgname}-${pkgver%.0}/${pkgname}-${pkgver}.tar.bz2")
sha256sums=('e886ec3ad17667a3694b11a71317c584839562f74b29c609d54c002973b387be')
source=("https://github.com/OpenSC/${pkgname}/releases/download/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.gz")
sha256sums=('e9ba4820c4c340658fea2ccb1ed56a9b63d5bf700772b58e2f559eb24b2f6fcf')
build() {
cd pkcs11-helper-$pkgver
libtoolize
aclocal
autoheader
@ -29,8 +30,8 @@ build() {
package() {
cd pkcs11-helper-$pkgver
make DESTDIR="$pkgdir" install
mkdir -p "$pkgdir"/usr/share/licenses/$pkgname/
install -D -m0644 COPYING* "$pkgdir"/usr/share/licenses/$pkgname/
}