diff mbox series

[2/2] package/pkcs11-helper: bump to version 1.28

Message ID 20220128215013.2997212-2-fontaine.fabrice@gmail.com
State Accepted
Headers show
Series [1/2] package/pkcs11-helper: drop autoreconf | expand

Commit Message

Fabrice Fontaine Jan. 28, 2022, 9:50 p.m. UTC 
Drop patch (already in version)

https://github.com/OpenSC/pkcs11-helper/releases/tag/pkcs11-helper-1.28

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 .../0001-nss-use-nss-pkcs11-h.patch           | 62 -------------------
 package/pkcs11-helper/pkcs11-helper.hash      |  2 +-
 package/pkcs11-helper/pkcs11-helper.mk        |  2 +-
 3 files changed, 2 insertions(+), 64 deletions(-)
 delete mode 100644 package/pkcs11-helper/0001-nss-use-nss-pkcs11-h.patch
diff mbox series

Patch

diff --git a/package/pkcs11-helper/0001-nss-use-nss-pkcs11-h.patch b/package/pkcs11-helper/0001-nss-use-nss-pkcs11-h.patch
deleted file mode 100644
index d0b573446f..0000000000
--- a/package/pkcs11-helper/0001-nss-use-nss-pkcs11-h.patch
+++ /dev/null
@@ -1,62 +0,0 @@ 
-From d159a5c59c80552c3e8ea75d9bcf29b3a8e8289d 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.
-[Retrieved (and updated to remove ChangeLog update) from:
-https://github.com/OpenSC/pkcs11-helper/pull/39]
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
----
- ChangeLog                 |  1 +
- lib/_pkcs11h-crypto-nss.c | 14 ++++++++++----
- lib/common.h              |  7 +++++++
- 3 files changed, 18 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
- 
diff --git a/package/pkcs11-helper/pkcs11-helper.hash b/package/pkcs11-helper/pkcs11-helper.hash
index d707bcf914..4114378ab8 100644
--- a/package/pkcs11-helper/pkcs11-helper.hash
+++ b/package/pkcs11-helper/pkcs11-helper.hash
@@ -1,5 +1,5 @@ 
 # Locally computed
-sha256  653730f0c561bbf5941754c0783976113589b2dc64a0661c908dc878bfa4e58b  pkcs11-helper-1.27.0.tar.bz2
+sha256  5bd55adafdbb708e096070dd0a910f23e1d5fd6291922398c1a15f00fff2b5ec  pkcs11-helper-1.28.0.tar.bz2
 sha256  808705ac1daafe07a76431929575c5712a8693977a39ec9102aed25f030754d9  COPYING
 sha256  865496cf23a6c792739ff2f9ea11e95ac99db89cfe3780a295b4e1495a9c19fe  COPYING.BSD
 sha256  cd2e7d63a11058f19c58b06fb8c759140ce70788369dce6e6e9db40d3475021e  COPYING.GPL
diff --git a/package/pkcs11-helper/pkcs11-helper.mk b/package/pkcs11-helper/pkcs11-helper.mk
index 90929404be..4fc3e21e5a 100644
--- a/package/pkcs11-helper/pkcs11-helper.mk
+++ b/package/pkcs11-helper/pkcs11-helper.mk
@@ -4,7 +4,7 @@ 
 #
 ################################################################################
 
-PKCS11_HELPER_VERSION = 1.27
+PKCS11_HELPER_VERSION = 1.28
 PKCS11_HELPER_SOURCE = pkcs11-helper-$(PKCS11_HELPER_VERSION).0.tar.bz2
 PKCS11_HELPER_SITE = https://github.com/OpenSC/pkcs11-helper/releases/download/pkcs11-helper-$(PKCS11_HELPER_VERSION)
 PKCS11_HELPER_LICENSE = GPL-2.0 or BSD-3-Clause