Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/1] package/pkcs11-helper: bump to version 1.29.0
@ 2022-09-17 17:15 Fabrice Fontaine
  2022-09-17 19:50 ` Thomas Petazzoni
  0 siblings, 1 reply; 2+ messages in thread
From: Fabrice Fontaine @ 2022-09-17 17:15 UTC (permalink / raw)
  To: buildroot; +Cc: Fabrice Fontaine

Drop first pacth (already in version)

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

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 ...h-core.c-fix-build-without-slotevent.patch | 37 -------------------
 ...-0-does-not-have-DSA_meth_set1_name.patch} |  0
 package/pkcs11-helper/pkcs11-helper.hash      |  2 +-
 package/pkcs11-helper/pkcs11-helper.mk        |  4 +-
 4 files changed, 3 insertions(+), 40 deletions(-)
 delete mode 100644 package/pkcs11-helper/0001-lib-pkcs11h-core.c-fix-build-without-slotevent.patch
 rename package/pkcs11-helper/{0002-openssl-libressl-3-5-0-does-not-have-DSA_meth_set1_name.patch => 0001-openssl-libressl-3-5-0-does-not-have-DSA_meth_set1_name.patch} (100%)

diff --git a/package/pkcs11-helper/0001-lib-pkcs11h-core.c-fix-build-without-slotevent.patch b/package/pkcs11-helper/0001-lib-pkcs11h-core.c-fix-build-without-slotevent.patch
deleted file mode 100644
index 5b2829c5ca..0000000000
--- a/package/pkcs11-helper/0001-lib-pkcs11h-core.c-fix-build-without-slotevent.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 754911f553414a77d5b52001f5ef6e3a1314c4d5 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Date: Sun, 20 Mar 2022 08:50:15 +0100
-Subject: [PATCH] lib/pkcs11h-core.c: fix build without slotevent
-
-Fix the following build failure with --disable-slotevent:
-
-/home/giuliobenetti/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabihf/9.3.0/../../../../arm-buildroot-linux-uclibcgnueabihf/bin/ld: /home/giuliobenetti/autobuild/run/instance-0/output-1/host/arm-buildroot-linux-uclibcgnueabihf/sysroot/usr/lib/libpkcs11-helper.so: undefined reference to `_pkcs11h_slotevent_init'
-
-Fixes:
- - http://autobuild.buildroot.org/results/fcaa70cc035d6f9d35dfa8d564e9948c7e1cfd9e
-
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-[Upstream status: https://github.com/OpenSC/pkcs11-helper/pull/50]
----
- lib/pkcs11h-core.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/lib/pkcs11h-core.c b/lib/pkcs11h-core.c
-index d7bb4cd..0bf11e8 100644
---- a/lib/pkcs11h-core.c
-+++ b/lib/pkcs11h-core.c
-@@ -726,9 +726,11 @@ pkcs11h_setProperty (
- 
- 	switch (property) {
- 		case PKCS11H_PROPERTY_SLOT_EVENT_HOOK:
-+#if defined(ENABLE_PKCS11H_SLOTEVENT)
- 			if ((rv = _pkcs11h_slotevent_init ()) != CKR_OK) {
- 				goto cleanup;
- 			}
-+#endif
- 		break;
- 	}
- cleanup:
--- 
-2.35.1
-
diff --git a/package/pkcs11-helper/0002-openssl-libressl-3-5-0-does-not-have-DSA_meth_set1_name.patch b/package/pkcs11-helper/0001-openssl-libressl-3-5-0-does-not-have-DSA_meth_set1_name.patch
similarity index 100%
rename from package/pkcs11-helper/0002-openssl-libressl-3-5-0-does-not-have-DSA_meth_set1_name.patch
rename to package/pkcs11-helper/0001-openssl-libressl-3-5-0-does-not-have-DSA_meth_set1_name.patch
diff --git a/package/pkcs11-helper/pkcs11-helper.hash b/package/pkcs11-helper/pkcs11-helper.hash
index 4114378ab8..0614e8aed4 100644
--- a/package/pkcs11-helper/pkcs11-helper.hash
+++ b/package/pkcs11-helper/pkcs11-helper.hash
@@ -1,5 +1,5 @@
 # Locally computed
-sha256  5bd55adafdbb708e096070dd0a910f23e1d5fd6291922398c1a15f00fff2b5ec  pkcs11-helper-1.28.0.tar.bz2
+sha256  996846a3c8395e03d8c0515111dc84d82e6e3648d44ba28cb2dbbbca2d4db7d6  pkcs11-helper-1.29.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 f8fe54ecf5..d1a1e38d4e 100644
--- a/package/pkcs11-helper/pkcs11-helper.mk
+++ b/package/pkcs11-helper/pkcs11-helper.mk
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-PKCS11_HELPER_VERSION = 1.28
-PKCS11_HELPER_SOURCE = pkcs11-helper-$(PKCS11_HELPER_VERSION).0.tar.bz2
+PKCS11_HELPER_VERSION = 1.29.0
+PKCS11_HELPER_SOURCE = pkcs11-helper-$(PKCS11_HELPER_VERSION).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
 PKCS11_HELPER_LICENSE_FILES = COPYING COPYING.BSD COPYING.GPL
-- 
2.35.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [Buildroot] [PATCH 1/1] package/pkcs11-helper: bump to version 1.29.0
  2022-09-17 17:15 [Buildroot] [PATCH 1/1] package/pkcs11-helper: bump to version 1.29.0 Fabrice Fontaine
@ 2022-09-17 19:50 ` Thomas Petazzoni
  0 siblings, 0 replies; 2+ messages in thread
From: Thomas Petazzoni @ 2022-09-17 19:50 UTC (permalink / raw)
  To: Fabrice Fontaine; +Cc: buildroot

On Sat, 17 Sep 2022 19:15:45 +0200
Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:

> Drop first pacth (already in version)
> 
> https://github.com/OpenSC/pkcs11-helper/releases/tag/pkcs11-helper-1.29.0
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
>  ...h-core.c-fix-build-without-slotevent.patch | 37 -------------------
>  ...-0-does-not-have-DSA_meth_set1_name.patch} |  0
>  package/pkcs11-helper/pkcs11-helper.hash      |  2 +-
>  package/pkcs11-helper/pkcs11-helper.mk        |  4 +-
>  4 files changed, 3 insertions(+), 40 deletions(-)
>  delete mode 100644 package/pkcs11-helper/0001-lib-pkcs11h-core.c-fix-build-without-slotevent.patch
>  rename package/pkcs11-helper/{0002-openssl-libressl-3-5-0-does-not-have-DSA_meth_set1_name.patch => 0001-openssl-libressl-3-5-0-does-not-have-DSA_meth_set1_name.patch} (100%)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2022-09-17 19:50 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-09-17 17:15 [Buildroot] [PATCH 1/1] package/pkcs11-helper: bump to version 1.29.0 Fabrice Fontaine
2022-09-17 19:50 ` Thomas Petazzoni

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox