From c4f87eda9e8f64d6d34ccc6414bd9c542c18b865 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Mon, 27 Nov 2023 11:17:47 +0100 Subject: p11-kit: upgrade 0.25.0 -> 0.25.2 Switch to gitsm:// to fetch https://github.com/p11-glue/pkcs11-json.git as a submodule (otherwise meson will try to do that in do_configure). (From OE-Core rev: 4331f57a45f144e6c156390d024c0e2d8bc9a991) Signed-off-by: Alexander Kanavin Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- .../recipes-support/p11-kit/files/strerror-1.patch | 76 ---------------------- .../recipes-support/p11-kit/files/strerror-2.patch | 30 --------- meta/recipes-support/p11-kit/p11-kit_0.25.0.bb | 34 ---------- meta/recipes-support/p11-kit/p11-kit_0.25.2.bb | 32 +++++++++ 4 files changed, 32 insertions(+), 140 deletions(-) delete mode 100644 meta/recipes-support/p11-kit/files/strerror-1.patch delete mode 100644 meta/recipes-support/p11-kit/files/strerror-2.patch delete mode 100644 meta/recipes-support/p11-kit/p11-kit_0.25.0.bb create mode 100644 meta/recipes-support/p11-kit/p11-kit_0.25.2.bb (limited to 'meta/recipes-support/p11-kit') diff --git a/meta/recipes-support/p11-kit/files/strerror-1.patch b/meta/recipes-support/p11-kit/files/strerror-1.patch deleted file mode 100644 index 6af4fee724..0000000000 --- a/meta/recipes-support/p11-kit/files/strerror-1.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 3ba2c55dfdc8ff20de369f07f6c57d08718d3add Mon Sep 17 00:00:00 2001 -From: Adam Sampson -Date: Sun, 2 Jul 2023 15:22:49 +0100 -Subject: [PATCH] Check for GNU strerror_r using the compiler only - -The new test that was added to distinguish GNU/XSI strerror_r ran a -compiled program, which doesn't work when cross-compiling. The only -difference at compile time is that the GNU version returns char * and -the XSI version returns int, so detect it by compiling a program that -dereferences the return value. - -Signed-off-by: Adam Sampson - -Upstream-Status: Backport -Signed-off-by: Ross Burton ---- - configure.ac | 19 +++++++------------ - meson.build | 10 +++++----- - 2 files changed, 12 insertions(+), 17 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 40f5a583..29890622 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -146,19 +146,14 @@ if test "$os_unix" = "yes"; then - - AC_CHECK_FUNC( - [strerror_r], -- [AC_RUN_IFELSE( -- [AC_LANG_SOURCE([[ -- #include -- #include -- -- int main (void) -- { -- char buf[32]; -- return strerror_r (EINVAL, buf, 32); -- } -- ]])], -- [AC_DEFINE([HAVE_XSI_STRERROR_R], 1, [Whether XSI-compliant strerror_r() is available])], -+ [AC_COMPILE_IFELSE( -+ [AC_LANG_PROGRAM([[#include -+ #include ]], -+ [[/* GNU strerror_r returns char *, XSI returns int */ -+ char buf[32]; -+ return *strerror_r (EINVAL, buf, 32);]])], - [AC_DEFINE([HAVE_GNU_STRERROR_R], 1, [Whether GNU-specific strerror_r() is available])], -+ [AC_DEFINE([HAVE_XSI_STRERROR_R], 1, [Whether XSI-compliant strerror_r() is available])], - [])], - []) - -diff --git a/meson.build b/meson.build -index 0f8c8da0..4cc3f89a 100644 ---- a/meson.build -+++ b/meson.build -@@ -306,15 +306,15 @@ if cc.has_function('strerror_r', prefix: '#include ') - - int main (void) - { -+ /* GNU strerror_r returns char *, XSI returns int */ - char buf[32]; -- return strerror_r (EINVAL, buf, 32); -+ return *strerror_r (EINVAL, buf, 32); - } - ''' -- strerror_r_check = cc.run(strerror_r_code, name : 'strerror_r check') -- if strerror_r_check.returncode() == 0 -- conf.set('HAVE_XSI_STRERROR_R', 1) -- else -+ if cc.compiles(strerror_r_code, name : 'GNU strerror_r check') - conf.set('HAVE_GNU_STRERROR_R', 1) -+ else -+ conf.set('HAVE_XSI_STRERROR_R', 1) - endif - endif - diff --git a/meta/recipes-support/p11-kit/files/strerror-2.patch b/meta/recipes-support/p11-kit/files/strerror-2.patch deleted file mode 100644 index 1a9180b508..0000000000 --- a/meta/recipes-support/p11-kit/files/strerror-2.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 7aa6251bf4ce36d027d53c9c96bb05f90ef7eb5b Mon Sep 17 00:00:00 2001 -From: Adam Sampson -Date: Sun, 2 Jul 2023 15:44:06 +0100 -Subject: [PATCH] Define _GNU_SOURCE when testing for strerror_r - -The Meson check for GNU/XSI strerror_r didn't inherit the project -options that include _GNU_SOURCE (unlike the autoconf version), so the -result didn't match how the code that uses it will be compiled. Add -_GNU_SOURCE explicitly as with the following checks. - -Signed-off-by: Adam Sampson - -Upstream-Status: Backport -Signed-off-by: Ross Burton ---- - meson.build | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/meson.build b/meson.build -index 4cc3f89a..9a72e148 100644 ---- a/meson.build -+++ b/meson.build -@@ -301,6 +301,7 @@ endforeach - - if cc.has_function('strerror_r', prefix: '#include ') - strerror_r_code = ''' -+#define _GNU_SOURCE - #include - #include - diff --git a/meta/recipes-support/p11-kit/p11-kit_0.25.0.bb b/meta/recipes-support/p11-kit/p11-kit_0.25.0.bb deleted file mode 100644 index ad1fda3f3b..0000000000 --- a/meta/recipes-support/p11-kit/p11-kit_0.25.0.bb +++ /dev/null @@ -1,34 +0,0 @@ -SUMMARY = "Provides a way to load and enumerate PKCS#11 modules" -DESCRIPTION = " Provides a standard configuration setup for installing PKCS#11 modules in such a way that they're discoverable. Also solves problems with coordinating the use of PKCS#11 by different components or libraries living in the same process." -HOMEPAGE = "https://p11-glue.github.io/p11-glue/p11-kit.html" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=02933887f609807fbb57aa4237d14a50" - -inherit meson gettext pkgconfig gtk-doc bash-completion manpages - -DEPENDS = "libtasn1 libtasn1-native libffi" - -DEPENDS:append = "${@' glib-2.0' if d.getVar('GTKDOC_ENABLED') == 'True' else ''}" - -SRC_URI = "git://github.com/p11-glue/p11-kit;branch=master;protocol=https \ - file://strerror-1.patch \ - file://strerror-2.patch" -SRCREV = "a8cce8bd8065bbf80bd47219f85f0cd9cf27dd0c" -S = "${WORKDIR}/git" - -PACKAGECONFIG ??= "" -PACKAGECONFIG[manpages] = "-Dman=true,-Dman=false,libxslt-native" -PACKAGECONFIG[trust-paths] = "-Dtrust_paths=/etc/ssl/certs/ca-certificates.crt,,,ca-certificates" - -GTKDOC_MESON_OPTION = 'gtk_doc' - -FILES:${PN} += " \ - ${libdir}/p11-kit-proxy.so \ - ${libdir}/pkcs11/*.so \ - ${libdir}/pkcs11/*.la \ - ${systemd_user_unitdir}/*" - -# PN contains p11-kit-proxy.so, a symlink to a loadable module -INSANE_SKIP:${PN} = "dev-so" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-support/p11-kit/p11-kit_0.25.2.bb b/meta/recipes-support/p11-kit/p11-kit_0.25.2.bb new file mode 100644 index 0000000000..d00ef2daf5 --- /dev/null +++ b/meta/recipes-support/p11-kit/p11-kit_0.25.2.bb @@ -0,0 +1,32 @@ +SUMMARY = "Provides a way to load and enumerate PKCS#11 modules" +DESCRIPTION = " Provides a standard configuration setup for installing PKCS#11 modules in such a way that they're discoverable. Also solves problems with coordinating the use of PKCS#11 by different components or libraries living in the same process." +HOMEPAGE = "https://p11-glue.github.io/p11-glue/p11-kit.html" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=02933887f609807fbb57aa4237d14a50" + +inherit meson gettext pkgconfig gtk-doc bash-completion manpages + +DEPENDS = "libtasn1 libtasn1-native libffi" + +DEPENDS:append = "${@' glib-2.0' if d.getVar('GTKDOC_ENABLED') == 'True' else ''}" + +SRC_URI = "gitsm://github.com/p11-glue/p11-kit;branch=master;protocol=https" +SRCREV = "66d6b42ef8dd84fcd8e199ac9f23f822f1a058c9" +S = "${WORKDIR}/git" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[manpages] = "-Dman=true,-Dman=false,libxslt-native" +PACKAGECONFIG[trust-paths] = "-Dtrust_paths=/etc/ssl/certs/ca-certificates.crt,,,ca-certificates" + +GTKDOC_MESON_OPTION = 'gtk_doc' + +FILES:${PN} += " \ + ${libdir}/p11-kit-proxy.so \ + ${libdir}/pkcs11/*.so \ + ${libdir}/pkcs11/*.la \ + ${systemd_user_unitdir}/*" + +# PN contains p11-kit-proxy.so, a symlink to a loadable module +INSANE_SKIP:${PN} = "dev-so" + +BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3-54-g00ecf