diff mbox series

[meta-oe,7/15] libp11: upgrade 0.4.19 -> 0.4.20

Message ID 20260821043525.448011-7-ankur.tyagi85@gmail.com
State Under Review
Headers show
Series [meta-oe,1/15] cabextract: add UPSTREAM_CHECK variables | expand

Commit Message

Ankur Tyagi Aug. 21, 2026, 4:35 a.m. UTC 
From: Ankur Tyagi <ankur.tyagi85@gmail.com>

Drop patch that is part of the upstream version

Changelog:
https://github.com/OpenSC/libp11/releases/tag/libp11-0.4.20

Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com>
---
 ...-p11_ver.h-file-to-installed-headers.patch | 32 -------------------
 .../{libp11_0.4.19.bb => libp11_0.4.20.bb}    |  6 ++--
 2 files changed, 2 insertions(+), 36 deletions(-)
 delete mode 100644 meta-oe/recipes-support/libp11/libp11/0001-Add-missing-p11_ver.h-file-to-installed-headers.patch
 rename meta-oe/recipes-support/libp11/{libp11_0.4.19.bb => libp11_0.4.20.bb} (86%)
diff mbox series

Patch

diff --git a/meta-oe/recipes-support/libp11/libp11/0001-Add-missing-p11_ver.h-file-to-installed-headers.patch b/meta-oe/recipes-support/libp11/libp11/0001-Add-missing-p11_ver.h-file-to-installed-headers.patch
deleted file mode 100644
index a8276179a1..0000000000
--- a/meta-oe/recipes-support/libp11/libp11/0001-Add-missing-p11_ver.h-file-to-installed-headers.patch
+++ /dev/null
@@ -1,32 +0,0 @@ 
-From 007043d355a9f7f1cd3cb6e80d16cad609fdf2a1 Mon Sep 17 00:00:00 2001
-From: botantony <antonsm21@gmail.com>
-Date: Wed, 22 Jul 2026 02:50:28 +0200
-Subject: [PATCH] Add missing `p11_ver.h` file to installed headers
-
-Running `make install` does not install `p11_ver.h` header which is used
-by `p11_err.h`. This PR fixes it
-
-Found in https://github.com/Homebrew/homebrew-core/pull/294427
-
-Signed-off-by: botantony <antonsm21@gmail.com>
-
-Upstream-Status: Backport [https://github.com/OpenSC/libp11/commit/007043d355a9f7f1cd3cb6e80d16cad609fdf2a1]
----
- src/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 92d3fdb..549ac67 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -9,7 +9,7 @@ EXTRA_DIST = Makefile.mak libp11.rc.in pkcs11.rc.in
-
- # Headers
- noinst_HEADERS= libp11-int.h pkcs11.h p11_pthread.h provider_helpers.h util.h
--include_HEADERS= libp11.h p11_err.h
-+include_HEADERS= libp11.h p11_err.h p11_ver.h
-
- lib_LTLIBRARIES = libp11.la
- enginesexec_LTLIBRARIES =
---
-2.43.0
diff --git a/meta-oe/recipes-support/libp11/libp11_0.4.19.bb b/meta-oe/recipes-support/libp11/libp11_0.4.20.bb
similarity index 86%
rename from meta-oe/recipes-support/libp11/libp11_0.4.19.bb
rename to meta-oe/recipes-support/libp11/libp11_0.4.20.bb
index ea40e6d4b4..259ecb04b8 100644
--- a/meta-oe/recipes-support/libp11/libp11_0.4.19.bb
+++ b/meta-oe/recipes-support/libp11/libp11_0.4.20.bb
@@ -9,11 +9,9 @@  LICENSE = "LGPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://COPYING;md5=fad9b3332be894bab9bc501572864b29"
 DEPENDS = "libtool openssl"
 
-SRC_URI = "git://github.com/OpenSC/libp11.git;branch=master;protocol=https;tag=${BPN}-${PV} \
-           file://0001-Add-missing-p11_ver.h-file-to-installed-headers.patch \
-           "
+SRC_URI = "git://github.com/OpenSC/libp11.git;branch=master;protocol=https;tag=${BPN}-${PV}"
 
-SRCREV = "ae5756ccf5cb7929bb8edc986a9e6a65584406bd"
+SRCREV = "61dc3acf95b859c88844e000001a99948c0abb48"
 
 UPSTREAM_CHECK_GITTAGREGEX = "libp11-(?P<pver>\d+(\.\d+)+)"