sqlite3: upgrade 3.44.0 -> 3.44.2
PATCH 1/9 sqlite3: upgrade 3.44.0 -> 3.44.2
---
.../sqlite/{sqlite3_3.44.0.bb => sqlite3_3.44.2.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-support/sqlite/{sqlite3_3.44.0.bb => sqlite3_3.44.2.bb} (78%)meta/recipes-support/sqlite/sqlite3_3.44.2.bb renamed from meta/recipes-support/sqlite/sqlite3_3.44.0.bb +1 -1
@@ -4,7 +4,7 @@ LICENSE = "PD" LIC_FILES_CHKSUM = "file://sqlite3.h;endline=11;md5=786d3dc581eff03f4fd9e4a77ed00c66" SRC_URI = "http://www.sqlite.org/2023/sqlite-autoconf-${SQLITE_PV}.tar.gz" -SRC_URI[sha256sum] = "b9cd386e7cd22af6e0d2a0f06d0404951e1bef109e42ea06cc0450e10cd15550" +SRC_URI[sha256sum] = "1c6719a148bc41cf0f2bbbe3926d7ce3f5ca09d878f1246fcc20767b175bb407" CVE_STATUS[CVE-2023-36191] = "disputed: The error is a bug. It has been fixed upstream. But it is not a vulnerability"
Signature · 1 line
2.43.0
PATCH 2/9 base-passwd: upgrade 3.6.2 -> 3.6.3
---
.../base-passwd/{base-passwd_3.6.2.bb => base-passwd_3.6.3.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-core/base-passwd/{base-passwd_3.6.2.bb => base-passwd_3.6.3.bb} (98%)meta/recipes-core/base-passwd/base-passwd_3.6.3.bb renamed from meta/recipes-core/base-passwd/base-passwd_3.6.2.bb +1 -1
@@ -15,7 +15,7 @@ SRC_URI = "https://launchpad.net/debian/+archive/primary/+files/${BPN}_${PV}.tar file://0001-base-passwd-Add-the-sgx-group.patch \ " -SRC_URI[sha256sum] = "06dc78352bf38a8df76ff295e15ab5654cdefe41e62368b15bfcbbab8e4ec2a0" +SRC_URI[sha256sum] = "83575327d8318a419caf2d543341215c046044073d1afec2acc0ac4d8095ff39" # the package is taken from launchpad; that source is static and goes stale # so we check the latest upstream from a directory that does get updated
Signature · 1 line
2.43.0
PATCH 3/9 bluez5: upgrade 5.70 -> 5.71
In reply to Anuj Mittal---
meta/recipes-connectivity/bluez5/bluez5.inc | 2 -
.../0001-test-gatt-Fix-hung-issue.patch | 2 +-
...et-for-building-tests-without-runnin.patch | 6 +-
...e_probe-failing-if-SDP-record-is-not.patch | 313 ------------------
...shared-util.c-include-linux-limits.h.patch | 7 +-
.../bluez5/bluez5/CVE-2023-45866.patch | 56 ----
.../bluez5/{bluez5_5.70.bb => bluez5_5.71.bb} | 2 +-
7 files changed, 9 insertions(+), 379 deletions(-)
delete mode 100644 meta/recipes-connectivity/bluez5/bluez5/0002-input-Fix-.device_probe-failing-if-SDP-record-is-not.patch
delete mode 100644 meta/recipes-connectivity/bluez5/bluez5/CVE-2023-45866.patch
rename meta/recipes-connectivity/bluez5/{bluez5_5.70.bb => bluez5_5.71.bb} (94%)meta/recipes-connectivity/bluez5/bluez5.inc +0 -2
@@ -55,8 +55,6 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.xz \ file://0001-tests-add-a-target-for-building-tests-without-runnin.patch \ file://0001-test-gatt-Fix-hung-issue.patch \ file://0004-src-shared-util.c-include-linux-limits.h.patch \ - file://0002-input-Fix-.device_probe-failing-if-SDP-record-is-not.patch \ - file://CVE-2023-45866.patch \ " S = "${WORKDIR}/bluez-${PV}"
meta/recipes-connectivity/bluez5/bluez5/0001-test-gatt-Fix-hung-issue.patch +1 -1
@@ -1,4 +1,4 @@ -From 7dcc5f46a31ac4eaa67c0ab3aaae38005db7458f Mon Sep 17 00:00:00 2001 +From e8808a2f5e17d375411c7409eaffb17e72f65022 Mon Sep 17 00:00:00 2001 From: Mingli Yu <[email protected]> Date: Fri, 24 Aug 2018 12:04:03 +0800 Subject: [PATCH] test-gatt: Fix hung issue
meta/recipes-connectivity/bluez5/bluez5/0001-tests-add-a-target-for-building-tests-without-runnin.patch +3 -3
@@ -1,4 +1,4 @@ -From a657fddd13a2e756b0af315301f1c44081e2f668 Mon Sep 17 00:00:00 2001 +From 3724958858b0ee430f37fb83388c3737d2039a3a Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Fri, 1 Apr 2016 17:07:34 +0300 Subject: [PATCH] tests: add a target for building tests without running them
@@ -11,10 +11,10 @@ Signed-off-by: Alexander Kanavin <[email protected]> 1 file changed, 3 insertions(+) diff --git a/Makefile.am b/Makefile.am -index 7041f8e..25966cd 100644 +index e7221bd..9595fd1 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -594,6 +594,9 @@ endif +@@ -710,6 +710,9 @@ endif TESTS = $(unit_tests) AM_TESTS_ENVIRONMENT = MALLOC_CHECK_=3 MALLOC_PERTURB_=69
meta/recipes-connectivity/bluez5/bluez5/0002-input-Fix-.device_probe-failing-if-SDP-record-is-not.patch deleted +0 -313
313 lines not on this page · raw message
meta/recipes-connectivity/bluez5/bluez5/0004-src-shared-util.c-include-linux-limits.h.patch +4 -3
@@ -1,4 +1,4 @@ -From 51584158b9a2e58f3790f8a7387b5cf167eca88b Mon Sep 17 00:00:00 2001 +From ad069fadfcce2cf70f45b1c4a42665448675297e Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Mon, 12 Dec 2022 13:10:19 +0100 Subject: [PATCH] src/shared/util.c: include linux/limits.h
@@ -8,15 +8,16 @@ systems such as those using musl. Upstream-Status: Submitted [to [email protected],[email protected],[email protected]] Signed-off-by: Alexander Kanavin <[email protected]> + --- src/shared/util.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/shared/util.c b/src/shared/util.c -index 0a0308c..1f61314 100644 +index 34491f4..412f3ad 100644 --- a/src/shared/util.c +++ b/src/shared/util.c -@@ -22,6 +22,7 @@ +@@ -23,6 +23,7 @@ #include <unistd.h> #include <dirent.h> #include <limits.h>
meta/recipes-connectivity/bluez5/bluez5/CVE-2023-45866.patch deleted +0 -56
56 lines not on this page · raw message
meta/recipes-connectivity/bluez5/bluez5_5.71.bb renamed from meta/recipes-connectivity/bluez5/bluez5_5.70.bb +1 -1
@@ -1,6 +1,6 @@ require bluez5.inc -SRC_URI[sha256sum] = "37e372e916955e144cb882f888e4be40898f10ae3b7c213ddcdd55ee9c009278" +SRC_URI[sha256sum] = "b828d418c93ced1f55b616fb5482cf01537440bfb34fbda1a564f3ece94735d8" CVE_STATUS[CVE-2020-24490] = "cpe-incorrect: This issue has kernel fixes rather than bluez fixes"
Signature · 1 line
2.43.0
PATCH 4/9 glib-2.0: upgrade 2.78.1 -> 2.78.3
In reply to Anuj Mittal---
...ot-write-bindir-into-pkg-config-files.patch | 4 ++--
.../0001-Fix-DATADIRNAME-on-uclibc-Linux.patch | 3 +--
...l-gio-querymodules-as-libexec_PROGRAM.patch | 6 +++---
...ing-about-deprecated-paths-in-schemas.patch | 4 ++--
...e-correctly-when-building-with-mingw3.patch | 18 +++++++++---------
...rces.c-comment-out-a-build-host-only-.patch | 6 +++---
...son-Run-atomics-test-on-clang-as-well.patch | 6 +++---
...not-enable-pidfd-features-on-native-g.patch | 8 +++-----
...rdcode-python-path-into-various-tools.patch | 6 +++---
.../glib-2.0/glib-2.0/relocate-modules.patch | 2 +-
.../{glib-2.0_2.78.1.bb => glib-2.0_2.78.3.bb} | 2 +-
11 files changed, 31 insertions(+), 34 deletions(-)
rename meta/recipes-core/glib-2.0/{glib-2.0_2.78.1.bb => glib-2.0_2.78.3.bb} (96%)meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch +2 -2
@@ -1,4 +1,4 @@ -From 9ec4eedeb3f67db0bff09f5d859318d05ff47964 Mon Sep 17 00:00:00 2001 +From cf7df91cc8c3b4811235ef8aec144c5f0cf90bdb Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Fri, 15 Feb 2019 11:17:27 +0100 Subject: [PATCH] Do not write $bindir into pkg-config files
@@ -16,7 +16,7 @@ Signed-off-by: Alexander Kanavin <[email protected]> 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/gio/meson.build b/gio/meson.build -index a320c0f..86ce7c4 100644 +index 5f91586..1a95f4f 100644 --- a/gio/meson.build +++ b/gio/meson.build @@ -884,14 +884,14 @@ pkg.generate(libgio,
meta/recipes-core/glib-2.0/glib-2.0/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch +1 -2
@@ -1,4 +1,4 @@ -From c94e669de98a3892c699bd8d0d2b5164b2de747e Mon Sep 17 00:00:00 2001 +From b907a6681c4c24e5d3745538d9fcd471cf1c4c4a Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Sat, 15 Mar 2014 22:42:29 -0700 Subject: [PATCH] Fix DATADIRNAME on uclibc/Linux
@@ -9,7 +9,6 @@ based systems therefore lets set DATADIRNAME to "share". Signed-off-by: Khem Raj <[email protected]> Upstream-Status: Pending - --- m4macros/glib-gettext.m4 | 4 ++++ 1 file changed, 4 insertions(+)
meta/recipes-core/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch +3 -3
@@ -1,4 +1,4 @@ -From 0015db45cd1bfefc04959dffab5dabeead93136f Mon Sep 17 00:00:00 2001 +From 6e2ddcb5465d10618345b12e0b4471ead0f14304 Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen <[email protected]> Date: Tue, 22 Mar 2016 15:14:58 +0200 Subject: [PATCH] Install gio-querymodules as libexec_PROGRAM
@@ -14,10 +14,10 @@ Upstream-Status: Inappropriate [OE specific] 1 file changed, 1 insertion(+) diff --git a/gio/meson.build b/gio/meson.build -index 2ef60ed..532b086 100644 +index f9fdf6e..5f91586 100644 --- a/gio/meson.build +++ b/gio/meson.build -@@ -936,6 +936,7 @@ gio_querymodules = executable('gio-querymodules', 'gio-querymodules.c', 'giomodu +@@ -1005,6 +1005,7 @@ gio_querymodules = executable('gio-querymodules', 'gio-querymodules.c', 'giomodu c_args : gio_c_args, # intl.lib is not compatible with SAFESEH link_args : noseh_link_args,
meta/recipes-core/glib-2.0/glib-2.0/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch +2 -2
@@ -1,4 +1,4 @@ -From 4f47b8a8d650d185aa61aec2f56a283522a723c4 Mon Sep 17 00:00:00 2001 +From c8c223045821cac97f798cfa63f19853621a8a2a Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Fri, 12 Jun 2015 17:08:46 +0300 Subject: [PATCH] Remove the warning about deprecated paths in schemas
@@ -15,7 +15,7 @@ Signed-off-by: Alexander Kanavin <[email protected]> 1 file changed, 13 deletions(-) diff --git a/gio/glib-compile-schemas.c b/gio/glib-compile-schemas.c -index 7888120..7acbd5b 100644 +index 04ef404..e791ce2 100644 --- a/gio/glib-compile-schemas.c +++ b/gio/glib-compile-schemas.c @@ -1232,19 +1232,6 @@ parse_state_start_schema (ParseState *state,
meta/recipes-core/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch +9 -9
@@ -1,4 +1,4 @@ -From ba1728bc27c88597164957d000b70ec4be6edf28 Mon Sep 17 00:00:00 2001 +From bafde4eedc0a22b45e73ee6183b9a11393a1e400 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Wed, 13 Feb 2019 15:32:05 +0100 Subject: [PATCH] Set host_machine correctly when building with mingw32
@@ -13,7 +13,7 @@ Signed-off-by: Alexander Kanavin <[email protected]> 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/gio/tests/meson.build b/gio/tests/meson.build -index f644aa2..64a8684 100644 +index 4ef3343..e498e7e 100644 --- a/gio/tests/meson.build +++ b/gio/tests/meson.build @@ -29,7 +29,7 @@ endif
@@ -25,7 +25,7 @@ index f644aa2..64a8684 100644 common_gio_tests_deps += [iphlpapi_dep, winsock2, cc.find_library ('secur32')] endif -@@ -210,7 +210,7 @@ if have_dbus_daemon +@@ -230,7 +230,7 @@ if have_dbus_daemon endif # Test programs buildable on UNIX only
@@ -34,7 +34,7 @@ index f644aa2..64a8684 100644 gio_tests += { 'file' : {}, 'gdbus-peer-object-manager' : {}, -@@ -462,7 +462,7 @@ if host_machine.system() != 'windows' +@@ -562,7 +562,7 @@ if host_machine.system() != 'windows' endif # unix # Test programs buildable on Windows only
@@ -43,7 +43,7 @@ index f644aa2..64a8684 100644 gio_tests += {'win32-streams' : {}} endif -@@ -532,7 +532,7 @@ if cc.get_id() != 'msvc' and cc.get_id() != 'clang-cl' +@@ -632,7 +632,7 @@ if cc.get_id() != 'msvc' and cc.get_id() != 'clang-cl' } endif
@@ -53,10 +53,10 @@ index f644aa2..64a8684 100644 'gdbus-example-unix-fd-client' : { 'install' : false, diff --git a/glib/tests/meson.build b/glib/tests/meson.build -index db01b54..6950817 100644 +index d80c86e..5329cda 100644 --- a/glib/tests/meson.build +++ b/glib/tests/meson.build -@@ -188,7 +188,7 @@ if glib_conf.has('HAVE_EVENTFD') +@@ -216,7 +216,7 @@ if glib_conf.has('HAVE_EVENTFD') } endif
@@ -66,10 +66,10 @@ index db01b54..6950817 100644 glib_tests += { 'gpoll' : { diff --git a/meson.build b/meson.build -index 43bb468..5f9b59c 100644 +index f7e936e..122f8b5 100644 --- a/meson.build +++ b/meson.build -@@ -43,6 +43,9 @@ else +@@ -54,6 +54,9 @@ else endif host_system = host_machine.system()
meta/recipes-core/glib-2.0/glib-2.0/0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch +3 -3
@@ -1,4 +1,4 @@ -From 92de6c7eb30b961b24a2dce812d5276487b7d23d Mon Sep 17 00:00:00 2001 +From 3f05b9418c88bbb83c08b57cc5529b006f26fff4 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Wed, 8 Jan 2020 18:22:46 +0100 Subject: [PATCH] gio/tests/resources.c: comment out a build host-only test
@@ -14,10 +14,10 @@ Signed-off-by: Alexander Kanavin <[email protected]> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gio/tests/resources.c b/gio/tests/resources.c -index c44d214..e289a01 100644 +index f567914..b21b616 100644 --- a/gio/tests/resources.c +++ b/gio/tests/resources.c -@@ -993,7 +993,7 @@ main (int argc, +@@ -1068,7 +1068,7 @@ main (int argc, g_test_add_func ("/resource/automatic", test_resource_automatic); /* This only uses automatic resources too, so it tests the constructors and destructors */ g_test_add_func ("/resource/module", test_resource_module);
meta/recipes-core/glib-2.0/glib-2.0/0001-meson-Run-atomics-test-on-clang-as-well.patch +3 -3
@@ -1,4 +1,4 @@ -From 4b97f457b7b44117e27d2a218c4b68e7fe3fe4ce Mon Sep 17 00:00:00 2001 +From 17d718640ae6f953e5eea714c1bd64eeb6e4799f Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Sat, 12 Oct 2019 17:46:26 -0700 Subject: [PATCH] meson: Run atomics test on clang as well
@@ -15,10 +15,10 @@ Signed-off-by: Khem Raj <[email protected]> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build -index afb6eaa..6aa70f5 100644 +index 122f8b5..f055079 100644 --- a/meson.build +++ b/meson.build -@@ -1692,7 +1692,7 @@ atomicdefine = ''' +@@ -1938,7 +1938,7 @@ atomicdefine = ''' # We know that we can always use real ("lock free") atomic operations with MSVC if cc.get_id() == 'msvc' or cc.get_id() == 'clang-cl' or cc.links(atomictest, name : 'atomic ops') have_atomic_lock_free = true
meta/recipes-core/glib-2.0/glib-2.0/0001-meson.build-do-not-enable-pidfd-features-on-native-g.patch +3 -5
@@ -1,4 +1,4 @@ -From 9aa9574861fad39d0679025e35fe1e188345f685 Mon Sep 17 00:00:00 2001 +From 7865d698b5d392aac3a3d32e9ebd5fea45017d15 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Sat, 16 Sep 2023 22:28:27 +0200 Subject: [PATCH] meson.build: do not enable pidfd features on native glib
@@ -9,12 +9,13 @@ where these features are not implemented. Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Alexander Kanavin <[email protected]> + --- meson.build | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build -index 1c36993..bbf97fc 100644 +index f055079..77d78aa 100644 --- a/meson.build +++ b/meson.build @@ -981,7 +981,8 @@ if cc.links('''#include <sys/syscall.h>
@@ -27,6 +28,3 @@ index 1c36993..bbf97fc 100644 endif # Check for __uint128_t (gcc) by checking for 128-bit division --- -2.30.2 -
meta/recipes-core/glib-2.0/glib-2.0/0010-Do-not-hardcode-python-path-into-various-tools.patch +3 -3
@@ -1,4 +1,4 @@ -From 79ce7e545dd3a93f77d2146d50b6fa061fbceed9 Mon Sep 17 00:00:00 2001 +From 53bcd4b6cd3fe3fe4246914462e6724761eecf51 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Tue, 3 Oct 2017 10:45:55 +0300 Subject: [PATCH] Do not hardcode python path into various tools
@@ -23,7 +23,7 @@ index 67d3675..4e92a7a 100755 # GDBus - GLib D-Bus Library # diff --git a/gobject/glib-genmarshal.in b/gobject/glib-genmarshal.in -index 7380f24..c8abeaa 100755 +index aa5af43..56e8e2e 100755 --- a/gobject/glib-genmarshal.in +++ b/gobject/glib-genmarshal.in @@ -1,4 +1,4 @@
@@ -33,7 +33,7 @@ index 7380f24..c8abeaa 100755 # pylint: disable=too-many-lines, missing-docstring, invalid-name diff --git a/gobject/glib-mkenums.in b/gobject/glib-mkenums.in -index 91ad779..3ebef62 100755 +index 353e53a..8ed6c39 100755 --- a/gobject/glib-mkenums.in +++ b/gobject/glib-mkenums.in @@ -1,4 +1,4 @@
meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch +1 -1
@@ -1,4 +1,4 @@ -From b90d13900dd2777c2ab90c5b0be1a872c10a17da Mon Sep 17 00:00:00 2001 +From 03a069cb8066d3e8ef72a43f7b1db5c9625e9cc2 Mon Sep 17 00:00:00 2001 From: Ross Burton <[email protected]> Date: Fri, 11 Mar 2016 15:35:55 +0000 Subject: [PATCH] glib-2.0: relocate the GIO module directory for native builds
meta/recipes-core/glib-2.0/glib-2.0_2.78.3.bb renamed from meta/recipes-core/glib-2.0/glib-2.0_2.78.1.bb +1 -1
@@ -19,7 +19,7 @@ SRC_URI:append:class-native = " file://relocate-modules.patch \ file://0001-meson.build-do-not-enable-pidfd-features-on-native-g.patch \ " -SRC_URI[sha256sum] = "915bc3d0f8507d650ead3832e2f8fb670fce59aac4d7754a7dab6f1e6fed78b2" +SRC_URI[sha256sum] = "609801dd373796e515972bf95fc0b2daa44545481ee2f465c4f204d224b2bc21" # Find any meson cross files in FILESPATH that are relevant for the current # build (using siteinfo) and add them to EXTRA_OEMESON.
Signature · 1 line
2.43.0
PATCH 5/9 glib-networking: upgrade 2.76.1 -> 2.78.0
In reply to Anuj Mittal---
...sable-PKCS-11-tests-if-not-available.patch | 113 ------------------
.../glib-networking/eagain.patch | 20 +++-
...ng_2.76.1.bb => glib-networking_2.78.0.bb} | 3 +-
3 files changed, 15 insertions(+), 121 deletions(-)
delete mode 100644 meta/recipes-core/glib-networking/glib-networking/0001-tls-tests-disable-PKCS-11-tests-if-not-available.patch
rename meta/recipes-core/glib-networking/{glib-networking_2.76.1.bb => glib-networking_2.78.0.bb} (92%)meta/recipes-core/glib-networking/glib-networking/0001-tls-tests-disable-PKCS-11-tests-if-not-available.patch deleted +0 -113
@@ -1,113 +0,0 @@ -From 04728a5b73e870b4695c5e7ba42fa41c00471944 Mon Sep 17 00:00:00 2001 -From: Ross Burton <[email protected]> -Date: Fri, 12 May 2023 20:19:35 +0100 -Subject: [PATCH] tls/tests: disable PKCS#11 tests if not available - -GnuTLS can be built without PKCS#11, which means the symbols -gnutls_pkcs11_init and gnutls_pkcs11_add_provider are not part of the -library. - -If these symbols don't exist in GnuTLS then we can't add a mock pkcs#11 -provider for testing, and several tests which need the mock provider -will fail. - -Solve this by checking for the symbols at build time and disabling the -provider and tests which need it. - -Upstream-Status: Backport -Signed-off-by: Ross Burton <[email protected]> ---- - meson.build | 4 ++++ - tls/tests/certificate.c | 11 +++++++---- - tls/tests/connection.c | 4 +++- - 3 files changed, 14 insertions(+), 5 deletions(-) - -diff --git a/meson.build b/meson.build -index 0fa9027..d2a023a 100644 ---- a/meson.build -+++ b/meson.build -@@ -84,6 +84,10 @@ gnutls_dep = dependency('gnutls', version: '>= 3.7.4', required: get_option('gnu - - if gnutls_dep.found() - backends += ['gnutls'] -+ # test-specific, maybe move to tls/tests -+ if cc.has_function('gnutls_pkcs11_init', prefix: '#include <gnutls/pkcs11.h>', dependencies: gnutls_dep) -+ config_h.set10('HAVE_GNUTLS_PKCS11', true) -+ endif - endif - - # *** Checks for OpenSSL *** -diff --git a/tls/tests/certificate.c b/tls/tests/certificate.c -index e820ba1..dd2412b 100644 ---- a/tls/tests/certificate.c -+++ b/tls/tests/certificate.c -@@ -24,6 +24,7 @@ - * Author: Stef Walter <[email protected]> - */ - -+#include "config.h" - #include "certificate.h" - - #include <gio/gio.h> -@@ -911,7 +912,7 @@ int - main (int argc, - char *argv[]) - { --#ifdef BACKEND_IS_GNUTLS -+#if defined(BACKEND_IS_GNUTLS) && HAVE_GNUTLS_PKCS11 - char *module_path; - #endif - -@@ -921,7 +922,7 @@ main (int argc, - g_setenv ("GIO_USE_TLS", BACKEND, TRUE); - g_assert_cmpint (g_ascii_strcasecmp (G_OBJECT_TYPE_NAME (g_tls_backend_get_default ()), "GTlsBackend" BACKEND), ==, 0); - --#ifdef BACKEND_IS_GNUTLS -+#if defined(BACKEND_IS_GNUTLS) && HAVE_GNUTLS_PKCS11 - module_path = g_test_build_filename (G_TEST_BUILT, "mock-pkcs11.so", NULL); - g_assert_true (g_file_test (module_path, G_FILE_TEST_EXISTS)); - -@@ -942,12 +943,14 @@ main (int argc, - setup_certificate, test_create_certificate_with_issuer, teardown_certificate); - g_test_add ("/tls/" BACKEND "/certificate/create-with-garbage-input", TestCertificate, NULL, - setup_certificate, test_create_certificate_with_garbage_input, teardown_certificate); -- g_test_add ("/tls/" BACKEND "/certificate/pkcs11", TestCertificate, NULL, -- setup_certificate, test_create_certificate_pkcs11, teardown_certificate); - g_test_add ("/tls/" BACKEND "/certificate/private-key", TestCertificate, NULL, - setup_certificate, test_private_key, teardown_certificate); -+#if HAVE_GNUTLS_PKCS11 -+ g_test_add ("/tls/" BACKEND "/certificate/pkcs11", TestCertificate, NULL, -+ setup_certificate, test_create_certificate_pkcs11, teardown_certificate); - g_test_add ("/tls/" BACKEND "/certificate/private-key-pkcs11", TestCertificate, NULL, - setup_certificate, test_private_key_pkcs11, teardown_certificate); -+#endif - - g_test_add_func ("/tls/" BACKEND "/certificate/create-chain", test_create_certificate_chain); - g_test_add_func ("/tls/" BACKEND "/certificate/create-no-chain", test_create_certificate_no_chain); -diff --git a/tls/tests/connection.c b/tls/tests/connection.c -index 17efe1b..62a7fbb 100644 ---- a/tls/tests/connection.c -+++ b/tls/tests/connection.c -@@ -3376,7 +3376,7 @@ main (int argc, - - g_assert_true (g_ascii_strcasecmp (G_OBJECT_TYPE_NAME (g_tls_backend_get_default ()), "GTlsBackend" BACKEND) == 0); - --#ifdef BACKEND_IS_GNUTLS -+#if defined(BACKEND_IS_GNUTLS) && HAVE_GNUTLS_PKCS11 - module_path = g_test_build_filename (G_TEST_BUILT, "mock-pkcs11.so", NULL); - g_assert_true (g_file_test (module_path, G_FILE_TEST_EXISTS)); - -@@ -3438,8 +3438,10 @@ main (int argc, - setup_connection, test_client_auth_request_fail, teardown_connection); - g_test_add ("/tls/" BACKEND "/connection/client-auth-request-none", TestConnection, NULL, - setup_connection, test_client_auth_request_none, teardown_connection); -+#if HAVE_GNUTLS_PKCS11 - g_test_add ("/tls/" BACKEND "/connection/client-auth-pkcs11", TestConnection, NULL, - setup_connection, test_client_auth_pkcs11_connection, teardown_connection); -+#endif - g_test_add ("/tls/" BACKEND "/connection/no-database", TestConnection, NULL, - setup_connection, test_connection_no_database, teardown_connection); - g_test_add ("/tls/" BACKEND "/connection/failed", TestConnection, NULL, --- -2.34.1 -
meta/recipes-core/glib-networking/glib-networking/eagain.patch +14 -6
@@ -1,4 +1,8 @@ -In autobuilder testing we regularly see glib-networking ptest fail with: +From 025bb39dfdb81dd2852deaefea228b197ef3cd8d Mon Sep 17 00:00:00 2001 +From: Richard Purdie <[email protected]> +Date: Sat, 6 May 2023 12:18:50 +0100 +Subject: [PATCH] In autobuilder testing we regularly see glib-networking ptest + fail with: GLib-Net:ERROR:/usr/src/debug/glib-networking/2.74.0-r0/tls/tests/connection.c:1944:simul_read_thread: assertion failed (error == NULL): Resource temporarily unavailable (g-io-error-quark, 27) Bail out! GLib-Net:ERROR:/usr/src/debug/glib-networking/2.74.0-r0/tls/tests/connection.c:1944:simul_read_thread: assertion failed (error == NULL): Resource temporarily unavailable (g-io-error-quark, 27)
@@ -12,11 +16,15 @@ Upstream-Status: Pending [testing to see if patch resolves the issue] Signed-off-by: Richard Purdie <[email protected]> -Index: glib-networking-2.74.0/tls/tests/connection.c -=================================================================== ---- glib-networking-2.74.0.orig/tls/tests/connection.c -+++ glib-networking-2.74.0/tls/tests/connection.c -@@ -1941,6 +1941,10 @@ simul_read_thread (gpointer user_data) +--- + tls/tests/connection.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/tls/tests/connection.c b/tls/tests/connection.c +index 62a7fbb..3447c80 100644 +--- a/tls/tests/connection.c ++++ b/tls/tests/connection.c +@@ -2210,6 +2210,10 @@ simul_read_thread (gpointer user_data) test->buf + test->nread, MIN (TEST_DATA_LENGTH / 2, TEST_DATA_LENGTH - test->nread), NULL, &error);
meta/recipes-core/glib-networking/glib-networking_2.78.0.bb renamed from meta/recipes-core/glib-networking/glib-networking_2.76.1.bb +1 -2
@@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ SECTION = "libs" DEPENDS = "glib-2.0-native glib-2.0" -SRC_URI[archive.sha256sum] = "5c698a9994dde51efdfb1026a56698a221d6250e89dc50ebcddda7b81480a42b" +SRC_URI[archive.sha256sum] = "52fe4ce93f7dc51334b102894599858d23c8a65ac4a1110b30920565d68d3aba" # Upstream note that for the openssl backend, half the tests where this backend don't return # the expected error code or don't work as expected so default to gnutls
@@ -31,7 +31,6 @@ inherit gnomebase gettext upstream-version-is-even gio-module-cache ptest-gnome SRC_URI += "file://run-ptest" SRC_URI += "file://eagain.patch" -SRC_URI += "file://0001-tls-tests-disable-PKCS-11-tests-if-not-available.patch" FILES:${PN} += "\ ${libdir}/gio/modules/libgio*.so \
Signature · 1 line
2.43.0
PATCH 6/9 puzzles: upgrade to latest revision
In reply to Anuj Mittal--- meta/recipes-sato/puzzles/puzzles_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-sato/puzzles/puzzles_git.bb +1 -1
@@ -10,7 +10,7 @@ REQUIRED_DISTRO_FEATURES = "x11" SRC_URI = "git://git.tartarus.org/simon/puzzles.git;branch=main;protocol=https" UPSTREAM_CHECK_COMMITS = "1" -SRCREV = "96d65e852cea8a95001fa70e3ec2996d4ea5e2b4" +SRCREV = "08365fb260ae6e32442dd9f196e65d13facb4b33" PE = "2" PV = "0.0+git"
Signature · 1 line
2.43.0
PATCH 7/9 stress-ng: upgrade 0.17.01 -> 0.17.03
In reply to Anuj Mittal---
.../stress-ng/{stress-ng_0.17.01.bb => stress-ng_0.17.03.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-extended/stress-ng/{stress-ng_0.17.01.bb => stress-ng_0.17.03.bb} (94%)meta/recipes-extended/stress-ng/stress-ng_0.17.03.bb renamed from meta/recipes-extended/stress-ng/stress-ng_0.17.01.bb +1 -1
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "git://github.com/ColinIanKing/stress-ng.git;protocol=https;branch=master \ " -SRCREV = "c9669b041eff5905da191974ba0102208a59e04e" +SRCREV = "8c39f5a2d9b199189456f414afd9e536dae69d1b" S = "${WORKDIR}/git" DEPENDS = "coreutils-native libbsd"
Signature · 1 line
2.43.0
PATCH 8/9 libusb1: fix upstream version check
In reply to Anuj MittalFix regex to not match release candidates.
--- meta/recipes-support/libusb/libusb1_1.0.26.bb | 1 + 1 file changed, 1 insertion(+)
meta/recipes-support/libusb/libusb1_1.0.26.bb +1 -0
@@ -16,6 +16,7 @@ SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/libusb-${PV}.tar.bz2 \ " GITHUB_BASE_URI = "https://github.com/libusb/libusb/releases" +UPSTREAM_CHECK_REGEX = "releases/tag/v?(?P<pver>\d+(\.\d+)+)" SRC_URI[sha256sum] = "12ce7a61fc9854d1d2a1ffe095f7b5fac19ddba095c259e6067a46500381b5a5"
Signature · 1 line
2.43.0
PATCH 9/9 enchant2: upgrade 2.6.2 -> 2.6.4
In reply to Anuj Mittalpkgdatadir is a versioned directory by default now so we don't need to pass it to EXTRA_OEMAKE.
https://github.com/AbiWord/enchant/commit/6e4a8df5cbf80fd449f1857ac1065d3235f1139f
---
.../enchant/{enchant2_2.6.2.bb => enchant2_2.6.4.bb} | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
rename meta/recipes-support/enchant/{enchant2_2.6.2.bb => enchant2_2.6.4.bb} (87%)meta/recipes-support/enchant/enchant2_2.6.4.bb renamed from meta/recipes-support/enchant/enchant2_2.6.2.bb +1 -3
@@ -12,14 +12,12 @@ DEPENDS = "glib-2.0 groff-native" inherit autotools pkgconfig github-releases SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/enchant-${PV}.tar.gz" -SRC_URI[sha256sum] = "6686a728e56e760f8dee09a22f0fb53b46ee9dbe7d64cf9e5bb35a658bff7e1d" +SRC_URI[sha256sum] = "833b4d5600dbe9ac867e543aac6a7a40ad145351495ca41223d4499d3ddbbd2c" GITHUB_BASE_URI = "https://github.com/AbiWord/enchant/releases" S = "${WORKDIR}/enchant-${PV}" -EXTRA_OEMAKE = "pkgdatadir=${datadir}/enchant-2" - PACKAGECONFIG ??= "aspell" PACKAGECONFIG[aspell] = "--with-aspell,--without-aspell,aspell,aspell" PACKAGECONFIG[hunspell] = "--with-hunspell,--without-hunspell,hunspell,hunspell"
Signature · 1 line
2.43.0
PATCH v2 1/1 libusb1: fix upstream version check
In reply to Anuj MittalFix regex to not match release candidates.
--- meta/recipes-support/libusb/libusb1_1.0.26.bb | 1 + 1 file changed, 1 insertion(+)
meta/recipes-support/libusb/libusb1_1.0.26.bb +1 -0
@@ -16,6 +16,7 @@ SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/libusb-${PV}.tar.bz2 \ " GITHUB_BASE_URI = "https://github.com/libusb/libusb/releases" +UPSTREAM_CHECK_REGEX = "releases/tag/v?(?P<pver>\d+(\.\d+)+)$" SRC_URI[sha256sum] = "12ce7a61fc9854d1d2a1ffe095f7b5fac19ddba095c259e6067a46500381b5a5"
Signature · 1 line
2.43.0
A message that is not in the archive (sent off-list or not yet received): [email protected]
Re: [OE-core] [PATCH 8/9] libusb1: fix upstream version check
Quoted 14 lines · Anuj Mittal
Fix regex to not match release candidates.
Signed-off-by Anuj Mittal <[email protected]>---
meta/recipes-support/libusb/libusb1_1.0.26.bb | 1 +1 file changed, 1 insertion(+)meta/recipes-support/libusb/libusb1_1.0.26.bb +0
-0@@ -16,6 +16,7 @@ SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/libusb-${PV}.tar.bz2 \
Quoted 4 lines
"
GITHUB_BASE_URI = "https://github.com/libusb/libusb/releases" +UPSTREAM_CHECK_REGEX = "releases/tag/v?(?P<pver>\d+(\.\d+)+)"
I somehow missed including a local change here. It should have had $ at the end to match the version exactly. I will send v2.
Thanks,
Anuj