Skip to contentSkip to conversation

Patch review

PATCH New Steve Sakoman 1 participant 25 messages Jun 16, 2023

lore
Share & tools
lore
#0 lore raw

cover Patch review

Please review this set of changes for mickledore and have comments back by end of day Tuesday.

Passed a-full on autobuilder:

https://autobuilder.yoctoproject.org/typhoon/#/builders/83/builds/5474

except for the meta-virtualization test, which failed due to the busybox bug fix version update in this patch series. A version update to a bbappend recipe will be required and the maintainer has been notified.

The following changes since commit a24b257189e83ce4cd073acb3e31591d31dfa5b1:

uninative: Upgrade to 4.0 to include latest gcc 13.1.1 (2023-06-08 16:22:12 -1000)

are available in the Git repository at:

https://git.openembedded.org/openembedded-core-contrib stable/mickledore-nut
http://cgit.openembedded.org/openembedded-core-contrib/log/?h=stable/mickledore-nut

Alexander Kanavin (4):
maintaines.inc: unassign Richard Weinberger from erofs-utils entry maintainers.inc: unassign Andreas Müller from itstool entry maintainers.inc: unassign Pascal Bach from cmake entry maintainers.inc: correct unassigned entries

Andrej Valek (1):
busybox: 1.36.0 -> 1.36.1

Chen Qi (1):
cmake.bbclass: do not search host paths for find_program()

Frieder Schrempf (1):
psmisc: Set ALTERNATIVE for pstree to resolve conflict with busybox

Ian Ray (1):
systemd-systemctl: support instance expansion in WantedBy

Kai Kang (1):
pm-utils: fix multilib conflictions

Khem Raj (2):
systemd: Drop a backport
perf: Make built-in libtraceevent plugins cohabit with external
libtraceevent

Marc Ferland (1):
connman: fix warning by specifying runstatedir at configure time

Markus Volk (1):
ell: upgrade 0.56 -> 0.57

Martin Jansa (6):
libx11: remove unused patch and FILESEXTRAPATHS
qemu: remove unused qemu-7.0.0-glibc-2.36.patch
minicom: remove unused patch files
inetutils: remove unused patch files
libgloss: remove unused patch file
kmod: remove unused ptest.patch

Mingli Yu (1):
curl: fix CVE-2023-28319 through CVE-2023-28322

Natasha Bailey (1):
tiff: backport a fix for CVE-2023-2731

Richard Purdie (1):
selftest/license: Exclude from world

Tim Orling (1):
openssl: upgrade 3.1.0 -> 3.1.1

Trevor Gamblin (1):
bind: upgrade 9.18.13 -> 9.18.14

 .../license/incompatible-license-alias.bb     |   2 +
 .../license/incompatible-license.bb           |   2 +
 .../license/incompatible-licenses.bb          |   2 +
 .../license/incompatible-nonspdx-license.bb   |   2 +
 meta/classes-recipe/cmake.bbclass             |   1 -
 meta/conf/distro/include/maintainers.inc      |  16 +-
 meta/recipes-bsp/pm-utils/pm-utils_1.4.1.bb   |   5 +-
 ...1-avoid-start-failure-with-bind-user.patch |   0
 ...d-V-and-start-log-hide-build-options.patch |   0
 ...ching-for-json-headers-searches-sysr.patch |   0
 .../bind/{bind-9.18.13 => bind-9.18.14}/bind9 |   0
 .../{bind-9.18.13 => bind-9.18.14}/conf.patch |   0
 .../generate-rndc-key.sh                      |   0
 ...t.d-add-support-for-read-only-rootfs.patch |   0
 .../make-etc-initd-bind-stop-work.patch       |   0
 .../named.service                             |   0
 .../bind/{bind_9.18.13.bb => bind_9.18.14.bb} |   2 +-
 meta/recipes-connectivity/connman/connman.inc |   1 +
 ...-multiple-definitions-of-errcatch-an.patch |  58 ---
 .../inetutils/fix-buffer-fortify-tfpt.patch   |  25 -
 ...1-Configure-do-not-tweak-mips-cflags.patch |  19 +-
 .../openssl/openssl/CVE-2023-0464.patch       | 226 ---------
 .../{openssl_3.1.0.bb => openssl_3.1.1.bb}    |   3 +-
 ...ab_1.36.0.bb => busybox-inittab_1.36.1.bb} |   0
 .../{busybox_1.36.0.bb => busybox_1.36.1.bb}  |   2 +-
 .../ell/{ell_0.56.bb => ell_0.57.bb}          |   2 +-
 .../libgloss/fix_makefile_include_arm_h.patch |  30 --
 .../systemd/systemd-systemctl/systemctl       |   9 +-
 .../0007-Add-sys-stat.h-for-S_IFDIR.patch     |  29 --
 meta/recipes-core/systemd/systemd_253.1.bb    |   1 -
 .../qemu/qemu/qemu-7.0.0-glibc-2.36.patch     |  46 --
 ...erfluous-global-variable-definitions.patch |  35 --
 ...erfluous-global-variable-definitions.patch |  37 --
 ...erfluous-global-variable-definitions.patch |  42 --
 meta/recipes-extended/psmisc/psmisc.inc       |   2 +
 ...ak-in-XRegisterIMInstantiateCallback.patch |  57 ---
 .../recipes-graphics/xorg-lib/libx11_1.8.4.bb |   6 +-
 meta/recipes-kernel/kmod/kmod/ptest.patch     |  25 -
 meta/recipes-kernel/perf/perf.bb              |   6 +-
 .../libtiff/files/CVE-2023-2731.patch         |  39 ++
 meta/recipes-multimedia/libtiff/tiff_4.5.0.bb |   4 +-
 .../curl/curl/CVE-2023-28319.patch            |  38 ++
 .../curl/curl/CVE-2023-28320.patch            |  88 ++++
 .../curl/curl/CVE-2023-28321.patch            | 111 +++++
 .../curl/curl/CVE-2023-28322.patch            | 441 ++++++++++++++++++
 meta/recipes-support/curl/curl_8.0.1.bb       |   4 +
 46 files changed, 771 insertions(+), 647 deletions(-)
 rename meta/recipes-connectivity/bind/{bind-9.18.13 => bind-9.18.14}/0001-avoid-start-failure-with-bind-user.patch (100%)
 rename meta/recipes-connectivity/bind/{bind-9.18.13 => bind-9.18.14}/0001-named-lwresd-V-and-start-log-hide-build-options.patch (100%)
 rename meta/recipes-connectivity/bind/{bind-9.18.13 => bind-9.18.14}/bind-ensure-searching-for-json-headers-searches-sysr.patch (100%)
 rename meta/recipes-connectivity/bind/{bind-9.18.13 => bind-9.18.14}/bind9 (100%)
 rename meta/recipes-connectivity/bind/{bind-9.18.13 => bind-9.18.14}/conf.patch (100%)
 rename meta/recipes-connectivity/bind/{bind-9.18.13 => bind-9.18.14}/generate-rndc-key.sh (100%)
 rename meta/recipes-connectivity/bind/{bind-9.18.13 => bind-9.18.14}/init.d-add-support-for-read-only-rootfs.patch (100%)
 rename meta/recipes-connectivity/bind/{bind-9.18.13 => bind-9.18.14}/make-etc-initd-bind-stop-work.patch (100%)
 rename meta/recipes-connectivity/bind/{bind-9.18.13 => bind-9.18.14}/named.service (100%)
 rename meta/recipes-connectivity/bind/{bind_9.18.13.bb => bind_9.18.14.bb} (97%)
 delete mode 100644 meta/recipes-connectivity/inetutils/inetutils/0001-ftpd-telnetd-Fix-multiple-definitions-of-errcatch-an.patch
 delete mode 100644 meta/recipes-connectivity/inetutils/inetutils/fix-buffer-fortify-tfpt.patch
 delete mode 100644 meta/recipes-connectivity/openssl/openssl/CVE-2023-0464.patch
 rename meta/recipes-connectivity/openssl/{openssl_3.1.0.bb => openssl_3.1.1.bb} (98%)
 rename meta/recipes-core/busybox/{busybox-inittab_1.36.0.bb => busybox-inittab_1.36.1.bb} (100%)
 rename meta/recipes-core/busybox/{busybox_1.36.0.bb => busybox_1.36.1.bb} (96%)
 rename meta/recipes-core/ell/{ell_0.56.bb => ell_0.57.bb} (89%)
 delete mode 100644 meta/recipes-core/newlib/libgloss/fix_makefile_include_arm_h.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/0007-Add-sys-stat.h-for-S_IFDIR.patch
 delete mode 100644 meta/recipes-devtools/qemu/qemu/qemu-7.0.0-glibc-2.36.patch
 delete mode 100644 meta/recipes-extended/minicom/minicom/0001-Drop-superfluous-global-variable-definitions.patch
 delete mode 100644 meta/recipes-extended/minicom/minicom/0002-Drop-superfluous-global-variable-definitions.patch
 delete mode 100644 meta/recipes-extended/minicom/minicom/0003-Drop-superfluous-global-variable-definitions.patch
 delete mode 100644 meta/recipes-graphics/xorg-lib/libx11/0001-fix-a-memory-leak-in-XRegisterIMInstantiateCallback.patch
 delete mode 100644 meta/recipes-kernel/kmod/kmod/ptest.patch
 create mode 100644 meta/recipes-multimedia/libtiff/files/CVE-2023-2731.patch
 create mode 100644 meta/recipes-support/curl/curl/CVE-2023-28319.patch
 create mode 100644 meta/recipes-support/curl/curl/CVE-2023-28320.patch
 create mode 100644 meta/recipes-support/curl/curl/CVE-2023-28321.patch
 create mode 100644 meta/recipes-support/curl/curl/CVE-2023-28322.patch
Signature · 1 line
2.34.1
#1 lore raw

PATCH 1/24 curl: fix CVE-2023-28319 through CVE-2023-28322

From: Mingli Yu <[email protected]>

Backport patches to fix the below CVEs:
CVE-2023-28319
CVE-2023-28320
CVE-2023-28321
CVE-2023-28322

---
 .../curl/curl/CVE-2023-28319.patch            |  38 ++
 .../curl/curl/CVE-2023-28320.patch            |  88 ++++
 .../curl/curl/CVE-2023-28321.patch            | 111 +++++
 .../curl/curl/CVE-2023-28322.patch            | 441 ++++++++++++++++++
 meta/recipes-support/curl/curl_8.0.1.bb       |   4 +
 5 files changed, 682 insertions(+)
 create mode 100644 meta/recipes-support/curl/curl/CVE-2023-28319.patch
 create mode 100644 meta/recipes-support/curl/curl/CVE-2023-28320.patch
 create mode 100644 meta/recipes-support/curl/curl/CVE-2023-28321.patch
 create mode 100644 meta/recipes-support/curl/curl/CVE-2023-28322.patch
meta/recipes-support/curl/curl/CVE-2023-28319.patch new file +38 -0
new file mode 100644
index 0000000000..c843a18174
@@ -0,0 +1,38 @@
+From 8e21b1a05f3c0ee098dbcb6c3d84cb61f102a122 Mon Sep 17 00:00:00 2001
+From: Daniel Stenberg <[email protected]>
+Date: Mon, 8 May 2023 14:33:54 +0200
+Subject: [PATCH] libssh2: free fingerprint better
+
+Reported-by: Wei Chong Tan
+Closes #11088
+
+CVE: CVE-2023-28319
+
+Upstream-Status: Backport [https://github.com/curl/curl/commit/8e21b1a05f3c0ee098dbcb6c]
+
+Signed-off-by: Mingli Yu <[email protected]>
+
+---
+ lib/vssh/libssh2.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/lib/vssh/libssh2.c b/lib/vssh/libssh2.c
+index bfcc94e16..dd39a844c 100644
+--- a/lib/vssh/libssh2.c
++++ b/lib/vssh/libssh2.c
+@@ -728,11 +728,10 @@ static CURLcode ssh_check_fingerprint(struct Curl_easy *data)
+      */
+     if((pub_pos != b64_pos) ||
+        strncmp(fingerprint_b64, pubkey_sha256, pub_pos)) {
+-      free(fingerprint_b64);
+-
+       failf(data,
+             "Denied establishing ssh session: mismatch sha256 fingerprint. "
+             "Remote %s is not equal to %s", fingerprint_b64, pubkey_sha256);
++      free(fingerprint_b64);
+       state(data, SSH_SESSION_FREE);
+       sshc->actualcode = CURLE_PEER_FAILED_VERIFICATION;
+       return sshc->actualcode;
+-- 
+2.25.1
+
meta/recipes-support/curl/curl/CVE-2023-28320.patch new file +88 -0

88 lines not on this page · raw message

meta/recipes-support/curl/curl/CVE-2023-28321.patch new file +111 -0

111 lines not on this page · raw message

meta/recipes-support/curl/curl/CVE-2023-28322.patch new file +441 -0

441 lines not on this page · raw message

meta/recipes-support/curl/curl_8.0.1.bb +4 -0
index 5cf044615f..ecef173df2 100644
@@ -13,6 +13,10 @@ SRC_URI = " \
     https://curl.se/download/${BP}.tar.xz \
     file://run-ptest \
     file://disable-tests \
+    file://CVE-2023-28322.patch \
+    file://CVE-2023-28319.patch \
+    file://CVE-2023-28320.patch \
+    file://CVE-2023-28321.patch \
 "
 SRC_URI[sha256sum] = "0a381cd82f4d00a9a334438b8ca239afea5bfefcfa9a1025f2bf118e79e0b5f0"
 
Signature · 1 line
2.34.1
#2 lore raw

PATCH 2/24 tiff: backport a fix for CVE-2023-2731

In reply to Steve Sakoman

From: Natasha Bailey <[email protected]>

This patch fixes an issue in libtiff's LZWDecode function which could cause a null pointer dereference.

(cherry picked from commit 7da5abf23232f61bf8009b4b8e97632768867e07)
---
 .../libtiff/files/CVE-2023-2731.patch         | 39 +++++++++++++++++++
 meta/recipes-multimedia/libtiff/tiff_4.5.0.bb |  4 +-
 2 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-multimedia/libtiff/files/CVE-2023-2731.patch
meta/recipes-multimedia/libtiff/files/CVE-2023-2731.patch new file +39 -0
new file mode 100644
index 0000000000..7db0a35f72
@@ -0,0 +1,39 @@
+From 9be22b639ea69e102d3847dca4c53ef025e9527b Mon Sep 17 00:00:00 2001
+From: Even Rouault <[email protected]>
+Date: Sat, 29 Apr 2023 12:20:46 +0200
+Subject: [PATCH] LZWDecode(): avoid crash when trying to read again from a
+ strip whith a missing end-of-information marker (fixes #548)
+
+CVE: CVE-2023-2731
+Upstream-Status: Backport [https://gitlab.com/libtiff/libtiff/-/commit/9be22b639ea69e102d3847dca4c53ef025e9527b]
+
+---
+ libtiff/tif_lzw.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/libtiff/tif_lzw.c b/libtiff/tif_lzw.c
+index ba75a07e..d631fa10 100644
+--- a/libtiff/tif_lzw.c
++++ b/libtiff/tif_lzw.c
+@@ -423,6 +423,10 @@ static int LZWDecode(TIFF *tif, uint8_t *op0, tmsize_t occ0, uint16_t s)
+ 
+     if (sp->read_error)
+     {
++        TIFFErrorExtR(tif, module,
++                      "LZWDecode: Scanline %" PRIu32 " cannot be read due to "
++                      "previous error",
++                      tif->tif_row);
+         return 0;
+     }
+ 
+@@ -742,6 +746,7 @@ after_loop:
+     return (1);
+ 
+ no_eoi:
++    sp->read_error = 1;
+     TIFFErrorExtR(tif, module,
+                   "LZWDecode: Strip %" PRIu32 " not terminated with EOI code",
+                   tif->tif_curstrip);
+-- 
+2.34.1
+
meta/recipes-multimedia/libtiff/tiff_4.5.0.bb +3 -1
index f8a2482a84..ca4a3eff91 100644
@@ -9,7 +9,9 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=a3e32d664d6db1386b4689c8121531c3"
 CVE_PRODUCT = "libtiff"
 
 SRC_URI = "http://download.osgeo.org/libtiff/tiff-${PV}.tar.gz \
-           file://CVE-2022-48281.patch"
+           file://CVE-2022-48281.patch \
+           file://CVE-2023-2731.patch \
+"
 
 SRC_URI[sha256sum] = "c7a1d9296649233979fa3eacffef3fa024d73d05d589cb622727b5b08c423464"
 
Signature · 1 line
2.34.1
#3 lore raw

PATCH 3/24 ell: upgrade 0.56 -> 0.57

In reply to Steve Sakoman

From: Markus Volk <[email protected]>

ver 0.57:
Fix issue with handling Generic Netlink cancel requests.

ell 0.57 is required for iwd 2.5

(cherry picked from commit f13fe33403f077802640e70a84596546d555c3b9)
---
 meta/recipes-core/ell/{ell_0.56.bb => ell_0.57.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-core/ell/{ell_0.56.bb => ell_0.57.bb} (89%)
meta/recipes-core/ell/ell_0.57.bb renamed from meta/recipes-core/ell/ell_0.56.bb +1 -1
similarity index 89%
rename from meta/recipes-core/ell/ell_0.56.bb
rename to meta/recipes-core/ell/ell_0.57.bb
index 0ace622835..09a0831fbe 100644
@@ -15,7 +15,7 @@ DEPENDS = "dbus"
 inherit autotools pkgconfig
 
 SRC_URI = "https://mirrors.edge.kernel.org/pub/linux/libs/${BPN}/${BPN}-${PV}.tar.xz"
-SRC_URI[sha256sum] = "58eb8b2b64087f7479d5db6a830a0656c536d93e5f11d4c9a4443ce8760a1b63"
+SRC_URI[sha256sum] = "7603928ee584b758ca27c67e4dc513049a09b038d7d28459a9440f8443c91018"
 
 do_configure:prepend () {
     mkdir -p ${S}/build-aux
Signature · 1 line
2.34.1
#4 lore raw

PATCH 4/24 busybox: 1.36.0 -> 1.36.1

In reply to Steve Sakoman

From: Andrej Valek <[email protected]>

Bug fix release. 1.36.1 has fixes for line editing, detection of hardware sha1/sha256 support, unzip (do not create suid/sgid files unless -K), shell (printf and sleep with no args, handing of SIGINT in sleep), ed.

- regression on x86 is still in place

(cherry picked from commit 09c5499f5885662a55a8810078e7208a1696b29f)
---
 .../{busybox-inittab_1.36.0.bb => busybox-inittab_1.36.1.bb}    | 0
 .../busybox/{busybox_1.36.0.bb => busybox_1.36.1.bb}            | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-core/busybox/{busybox-inittab_1.36.0.bb => busybox-inittab_1.36.1.bb} (100%)
 rename meta/recipes-core/busybox/{busybox_1.36.0.bb => busybox_1.36.1.bb} (96%)
meta/recipes-core/busybox/busybox-inittab_1.36.1.bb renamed from meta/recipes-core/busybox/busybox-inittab_1.36.0.bb +0 -0
similarity index 100%
rename from meta/recipes-core/busybox/busybox-inittab_1.36.0.bb
rename to meta/recipes-core/busybox/busybox-inittab_1.36.1.bb
meta/recipes-core/busybox/busybox_1.36.1.bb renamed from meta/recipes-core/busybox/busybox_1.36.0.bb +1 -1
similarity index 96%
rename from meta/recipes-core/busybox/busybox_1.36.0.bb
rename to meta/recipes-core/busybox/busybox_1.36.1.bb
index 8014a5c7bf..968dce65e4 100644
@@ -53,4 +53,4 @@ SRC_URI = "https://busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
 SRC_URI:append:libc-musl = " file://musl.cfg "
 # TODO http://lists.busybox.net/pipermail/busybox/2023-January/090078.html
 SRC_URI:append:x86 = " file://sha_accel.cfg"
-SRC_URI[tarball.sha256sum] = "542750c8af7cb2630e201780b4f99f3dcceeb06f505b479ec68241c1e6af61a5"
+SRC_URI[tarball.sha256sum] = "b8cc24c9574d809e7279c3be349795c5d5ceb6fdf19ca709f80cde50e47de314"
Signature · 1 line
2.34.1
#5 lore raw

PATCH 5/24 bind: upgrade 9.18.13 -> 9.18.14

In reply to Steve Sakoman

From: Trevor Gamblin <[email protected]>

Stable branch update

(cherry picked from commit 43c97c6e64c554f41a3a45241a7547bce21533e7)
---
 .../0001-avoid-start-failure-with-bind-user.patch               | 0
 .../0001-named-lwresd-V-and-start-log-hide-build-options.patch  | 0
 .../bind-ensure-searching-for-json-headers-searches-sysr.patch  | 0
 .../bind/{bind-9.18.13 => bind-9.18.14}/bind9                   | 0
 .../bind/{bind-9.18.13 => bind-9.18.14}/conf.patch              | 0
 .../bind/{bind-9.18.13 => bind-9.18.14}/generate-rndc-key.sh    | 0
 .../init.d-add-support-for-read-only-rootfs.patch               | 0
 .../make-etc-initd-bind-stop-work.patch                         | 0
 .../bind/{bind-9.18.13 => bind-9.18.14}/named.service           | 0
 .../bind/{bind_9.18.13.bb => bind_9.18.14.bb}                   | 2 +-
 10 files changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-connectivity/bind/{bind-9.18.13 => bind-9.18.14}/0001-avoid-start-failure-with-bind-user.patch (100%)
 rename meta/recipes-connectivity/bind/{bind-9.18.13 => bind-9.18.14}/0001-named-lwresd-V-and-start-log-hide-build-options.patch (100%)
 rename meta/recipes-connectivity/bind/{bind-9.18.13 => bind-9.18.14}/bind-ensure-searching-for-json-headers-searches-sysr.patch (100%)
 rename meta/recipes-connectivity/bind/{bind-9.18.13 => bind-9.18.14}/bind9 (100%)
 rename meta/recipes-connectivity/bind/{bind-9.18.13 => bind-9.18.14}/conf.patch (100%)
 rename meta/recipes-connectivity/bind/{bind-9.18.13 => bind-9.18.14}/generate-rndc-key.sh (100%)
 rename meta/recipes-connectivity/bind/{bind-9.18.13 => bind-9.18.14}/init.d-add-support-for-read-only-rootfs.patch (100%)
 rename meta/recipes-connectivity/bind/{bind-9.18.13 => bind-9.18.14}/make-etc-initd-bind-stop-work.patch (100%)
 rename meta/recipes-connectivity/bind/{bind-9.18.13 => bind-9.18.14}/named.service (100%)
 rename meta/recipes-connectivity/bind/{bind_9.18.13.bb => bind_9.18.14.bb} (97%)
meta/recipes-connectivity/bind/bind-9.18.14/0001-avoid-start-failure-with-bind-user.patch renamed from meta/recipes-connectivity/bind/bind-9.18.13/0001-avoid-start-failure-with-bind-user.patch +0 -0
similarity index 100%
rename from meta/recipes-connectivity/bind/bind-9.18.13/0001-avoid-start-failure-with-bind-user.patch
rename to meta/recipes-connectivity/bind/bind-9.18.14/0001-avoid-start-failure-with-bind-user.patch
meta/recipes-connectivity/bind/bind-9.18.14/0001-named-lwresd-V-and-start-log-hide-build-options.patch renamed from meta/recipes-connectivity/bind/bind-9.18.13/0001-named-lwresd-V-and-start-log-hide-build-options.patch +0 -0
similarity index 100%
rename from meta/recipes-connectivity/bind/bind-9.18.13/0001-named-lwresd-V-and-start-log-hide-build-options.patch
rename to meta/recipes-connectivity/bind/bind-9.18.14/0001-named-lwresd-V-and-start-log-hide-build-options.patch
meta/recipes-connectivity/bind/bind-9.18.14/bind-ensure-searching-for-json-headers-searches-sysr.patch renamed from meta/recipes-connectivity/bind/bind-9.18.13/bind-ensure-searching-for-json-headers-searches-sysr.patch +0 -0
similarity index 100%
rename from meta/recipes-connectivity/bind/bind-9.18.13/bind-ensure-searching-for-json-headers-searches-sysr.patch
rename to meta/recipes-connectivity/bind/bind-9.18.14/bind-ensure-searching-for-json-headers-searches-sysr.patch
meta/recipes-connectivity/bind/bind-9.18.14/bind9 renamed from meta/recipes-connectivity/bind/bind-9.18.13/bind9 +0 -0
similarity index 100%
rename from meta/recipes-connectivity/bind/bind-9.18.13/bind9
rename to meta/recipes-connectivity/bind/bind-9.18.14/bind9
meta/recipes-connectivity/bind/bind-9.18.14/conf.patch renamed from meta/recipes-connectivity/bind/bind-9.18.13/conf.patch +0 -0
similarity index 100%
rename from meta/recipes-connectivity/bind/bind-9.18.13/conf.patch
rename to meta/recipes-connectivity/bind/bind-9.18.14/conf.patch
meta/recipes-connectivity/bind/bind-9.18.14/generate-rndc-key.sh renamed from meta/recipes-connectivity/bind/bind-9.18.13/generate-rndc-key.sh +0 -0
similarity index 100%
rename from meta/recipes-connectivity/bind/bind-9.18.13/generate-rndc-key.sh
rename to meta/recipes-connectivity/bind/bind-9.18.14/generate-rndc-key.sh
meta/recipes-connectivity/bind/bind-9.18.14/init.d-add-support-for-read-only-rootfs.patch renamed from meta/recipes-connectivity/bind/bind-9.18.13/init.d-add-support-for-read-only-rootfs.patch +0 -0
similarity index 100%
rename from meta/recipes-connectivity/bind/bind-9.18.13/init.d-add-support-for-read-only-rootfs.patch
rename to meta/recipes-connectivity/bind/bind-9.18.14/init.d-add-support-for-read-only-rootfs.patch
meta/recipes-connectivity/bind/bind-9.18.14/make-etc-initd-bind-stop-work.patch renamed from meta/recipes-connectivity/bind/bind-9.18.13/make-etc-initd-bind-stop-work.patch +0 -0
similarity index 100%
rename from meta/recipes-connectivity/bind/bind-9.18.13/make-etc-initd-bind-stop-work.patch
rename to meta/recipes-connectivity/bind/bind-9.18.14/make-etc-initd-bind-stop-work.patch
meta/recipes-connectivity/bind/bind-9.18.14/named.service renamed from meta/recipes-connectivity/bind/bind-9.18.13/named.service +0 -0
similarity index 100%
rename from meta/recipes-connectivity/bind/bind-9.18.13/named.service
rename to meta/recipes-connectivity/bind/bind-9.18.14/named.service
meta/recipes-connectivity/bind/bind_9.18.14.bb renamed from meta/recipes-connectivity/bind/bind_9.18.13.bb +1 -1
similarity index 97%
rename from meta/recipes-connectivity/bind/bind_9.18.13.bb
rename to meta/recipes-connectivity/bind/bind_9.18.14.bb
index 8617137e87..c513cbc8b6 100644
@@ -20,7 +20,7 @@ SRC_URI = "https://ftp.isc.org/isc/bind9/${PV}/${BPN}-${PV}.tar.xz \
            file://0001-avoid-start-failure-with-bind-user.patch \
            "
 
-SRC_URI[sha256sum] = "3b06b6390c1012dd3956b1479c73b2097c0b22207817e2e8aae352fd20e578c7"
+SRC_URI[sha256sum] = "9ae12edf6ac3c430b33ecd1a7c0c0c60875d255185eb87850fa9a5e794a64a09"
 
 UPSTREAM_CHECK_URI = "https://ftp.isc.org/isc/bind9/"
 # follow the ESV versions divisible by 2
Signature · 1 line
2.34.1
#6 lore raw

PATCH 6/24 openssl: upgrade 3.1.0 -> 3.1.1

In reply to Steve Sakoman

From: Tim Orling <[email protected]>

* Drop CVE-2023-0464.patch (merged upstream).
* Refresh 0001-Configure-do-not-tweak-mips-cflags.patch

https://github.com/openssl/openssl/blob/openssl-3.1.1/NEWS.md

Major changes between OpenSSL 3.1.0 and OpenSSL 3.1.1 [30 May 2023]

* Mitigate for very slow OBJ_obj2txt() performance with gigantic OBJECT IDENTIFIER sub-identities. (CVE-2023-2650)
* Fixed buffer overread in AES-XTS decryption on ARM 64 bit platforms (CVE-2023-1255)
* Fixed documentation of X509_VERIFY_PARAM_add0_policy() (CVE-2023-0466)
* Fixed handling of invalid certificate policies in leaf certificates (CVE-2023-0465)
* Limited the number of nodes created in a policy tree (CVE-2023-0464)

Security Advisory:
https://www.openssl.org/news/secadv/20230530.txt

CVE: CVE-2023-2650
CVE: CVE-2023-1255
CVE: CVE-2023-0466
CVE: CVE-2023-0465
CVE: CVE-2023-0464

(cherry picked from commit 26ce9a5fd31c27812ce8784a398b600cc0e9aa80)
---
 ...1-Configure-do-not-tweak-mips-cflags.patch |  19 +-
 .../openssl/openssl/CVE-2023-0464.patch       | 226 ------------------
 .../{openssl_3.1.0.bb => openssl_3.1.1.bb}    |   3 +-
 3 files changed, 12 insertions(+), 236 deletions(-)
 delete mode 100644 meta/recipes-connectivity/openssl/openssl/CVE-2023-0464.patch
 rename meta/recipes-connectivity/openssl/{openssl_3.1.0.bb => openssl_3.1.1.bb} (98%)
meta/recipes-connectivity/openssl/openssl/0001-Configure-do-not-tweak-mips-cflags.patch +11 -8
index 0b7abc3a11..502a7aaf32 100644
@@ -1,6 +1,6 @@
-From 326909baf81a638d51fa8be1d8227518784f5cc4 Mon Sep 17 00:00:00 2001
+From 0377f0d5b5c1079e3b9a80881f4dcc891cbe9f9a Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <[email protected]>
-Date: Tue, 14 Sep 2021 12:18:25 +0200
+Date: Tue, 30 May 2023 09:11:27 -0700
 Subject: [PATCH] Configure: do not tweak mips cflags
 
 This conflicts with mips machine definitons from yocto,
@@ -9,20 +9,23 @@ e.g.
 
 Upstream-Status: Inappropriate [oe-core specific]
 Signed-off-by: Alexander Kanavin <[email protected]>
+
+Refreshed for openssl-3.1.1
+Signed-off-by: Tim Orling <[email protected]>
 ---
  Configure | 10 ----------
  1 file changed, 10 deletions(-)
 
-Index: openssl-3.0.4/Configure
-===================================================================
---- openssl-3.0.4.orig/Configure
-+++ openssl-3.0.4/Configure
-@@ -1423,16 +1423,6 @@ if ($target =~ /^mingw/ && `$config{CC}
+diff --git a/Configure b/Configure
+index 4569952..adf019b 100755
+--- a/Configure
++++ b/Configure
+@@ -1422,16 +1422,6 @@ if ($target =~ /^mingw/ && `$config{CC} --target-help 2>&1` =~ m/-mno-cygwin/m)
          push @{$config{shared_ldflag}}, "-mno-cygwin";
          }
  
 -if ($target =~ /linux.*-mips/ && !$disabled{asm}
--        && !grep { $_ !~ /-m(ips|arch=)/ } (@{$config{CFLAGS}})) {
+-        && !grep { $_ =~ /-m(ips|arch=)/ } (@{$config{CFLAGS}})) {
 -        # minimally required architecture flags for assembly modules
 -        my $value;
 -        $value = '-mips2' if ($target =~ /mips32/);
meta/recipes-connectivity/openssl/openssl/CVE-2023-0464.patch deleted +0 -226

226 lines not on this page · raw message

meta/recipes-connectivity/openssl/openssl_3.1.1.bb renamed from meta/recipes-connectivity/openssl/openssl_3.1.0.bb +1 -2
similarity index 98%
rename from meta/recipes-connectivity/openssl/openssl_3.1.0.bb
rename to meta/recipes-connectivity/openssl/openssl_3.1.1.bb
index b319c66044..dca6f18e74 100644
@@ -12,14 +12,13 @@ SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \
            file://0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch \
            file://0001-Configure-do-not-tweak-mips-cflags.patch \
            file://fix_random_labels.patch \
-           file://CVE-2023-0464.patch \
            "
 
 SRC_URI:append:class-nativesdk = " \
            file://environment.d-openssl.sh \
            "
 
-SRC_URI[sha256sum] = "aaa925ad9828745c4cad9d9efeb273deca820f2cdcf2c3ac7d7c1212b7c497b4"
+SRC_URI[sha256sum] = "b3aa61334233b852b63ddb048df181177c2c659eb9d4376008118f9c08d07674"
 
 inherit lib_package multilib_header multilib_script ptest perlnative
 MULTILIB_SCRIPTS = "${PN}-bin:${bindir}/c_rehash"
Signature · 1 line
2.34.1
#7 lore raw

PATCH 7/24 psmisc: Set ALTERNATIVE for pstree to resolve conflict with busybox

In reply to Steve Sakoman

From: Frieder Schrempf <[email protected]>

If pstree in busybox is enabled there is a conflict with pstree from psmisc resulting in:

do_rootfs: Postinstall scriptlets of ['busybox'] have failed. If the intention is to defer them to first boot, then please place them into pkg_postinst_ontarget:${PN} ().
Deferring to first boot via 'exit 1' is no longer supported.

And more detailed in do_rootfs.log:

update-alternatives: Error: not linking [...]/rootfs/usr/bin/pstree to /bin/busybox.nosuid since [...]/rootfs/usr/bin/pstree exists and is not a link

On order to fix this set ALTERNATIVE:pstree accordingly.

(cherry picked from commit deb2176df76dcb16c0d90072ad63d308a0ab1158)
---
 meta/recipes-extended/psmisc/psmisc.inc | 2 ++
 1 file changed, 2 insertions(+)
meta/recipes-extended/psmisc/psmisc.inc +2 -0
index a429c2ee96..23e98d21be 100644
@@ -55,3 +55,5 @@ ALTERNATIVE_PRIORITY = "90"
 ALTERNATIVE:killall = "killall"
 
 ALTERNATIVE:fuser = "fuser"
+
+ALTERNATIVE:pstree = "pstree"
Signature · 1 line
2.34.1
#8 lore raw

PATCH 8/24 systemd: Drop a backport

In reply to Steve Sakoman

From: Khem Raj <[email protected]>

This patch should have been dropped when upgrading to 253 since its already available upstream since then

(cherry picked from commit 5b677b766280b39e8bf507d5aec4f08e49fd72a9)
---
 .../0007-Add-sys-stat.h-for-S_IFDIR.patch     | 29 -------------------
 meta/recipes-core/systemd/systemd_253.1.bb    |  1 -
 2 files changed, 30 deletions(-)
 delete mode 100644 meta/recipes-core/systemd/systemd/0007-Add-sys-stat.h-for-S_IFDIR.patch
meta/recipes-core/systemd/systemd/0007-Add-sys-stat.h-for-S_IFDIR.patch deleted +0 -29
deleted file mode 100644
index 479b9a1ca1..0000000000
@@ -1,29 +0,0 @@
-From 1480ef4ea9f71befbc22272c219b62ee5cd71d43 Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Fri, 21 Jan 2022 15:17:37 -0800
-Subject: [PATCH] Add sys/stat.h for S_IFDIR
-
-../git/src/shared/mkdir-label.c:13:61: error: use of undeclared identifier 'S_IFDIR'
-        r = mac_selinux_create_file_prepare_at(dirfd, path, S_IFDIR);
-
-Upstream-Status: Backport [29b7114c5d9624002aa7c17748d960cd1e45362d]
-Signed-off-by: Khem Raj <[email protected]>
----
- src/shared/mkdir-label.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/shared/mkdir-label.c b/src/shared/mkdir-label.c
-index e3afc2b666..f1df778966 100644
---- a/src/shared/mkdir-label.c
-+++ b/src/shared/mkdir-label.c
-@@ -7,6 +7,7 @@
- #include "selinux-util.h"
- #include "smack-util.h"
- #include "user-util.h"
-+#include <sys/stat.h>
- 
- int mkdirat_label(int dirfd, const char *path, mode_t mode) {
-         int r;
--- 
-2.39.2
-
meta/recipes-core/systemd/systemd_253.1.bb +0 -1
index 9c2b96d3c1..f306765168 100644
@@ -47,7 +47,6 @@ SRC_URI_MUSL = "\
                file://0023-Handle-missing-gshadow.patch \
                file://0024-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch \
                file://0005-pass-correct-parameters-to-getdents64.patch \
-               file://0007-Add-sys-stat.h-for-S_IFDIR.patch \
                file://0001-Adjust-for-musl-headers.patch \
                file://0006-test-bus-error-strerror-is-assumed-to-be-GNU-specifi.patch \
                file://0003-errno-util-Make-STRERROR-portable-for-musl.patch \
Signature · 1 line
2.34.1
#9 lore raw

PATCH 9/24 libx11: remove unused patch and FILESEXTRAPATHS

In reply to Steve Sakoman

From: Martin Jansa <[email protected]>

* 0001-fix-a-memory-leak-in-XRegisterIMInstantiateCallback.patch was removed from SRC_URI in:
https://git.openembedded.org/openembedded-core/commit/?id=e13f651f73db0f26f4645447ab5fa17e36d1903b

(cherry picked from commit ee37d9f05c047e1dd68e0cb47b809240d2f33835)
---
 ...ak-in-XRegisterIMInstantiateCallback.patch | 57 -------------------
 .../recipes-graphics/xorg-lib/libx11_1.8.4.bb |  6 +-
 2 files changed, 2 insertions(+), 61 deletions(-)
 delete mode 100644 meta/recipes-graphics/xorg-lib/libx11/0001-fix-a-memory-leak-in-XRegisterIMInstantiateCallback.patch
meta/recipes-graphics/xorg-lib/libx11/0001-fix-a-memory-leak-in-XRegisterIMInstantiateCallback.patch deleted +0 -57
deleted file mode 100644
index 722116c07e..0000000000
@@ -1,57 +0,0 @@
-CVE: CVE-2022-3554
-Upstream-Status: Backport
-Signed-off-by: Ross Burton <[email protected]>
-
-From 1d11822601fd24a396b354fa616b04ed3df8b4ef Mon Sep 17 00:00:00 2001
-From: "Thomas E. Dickey" <[email protected]>
-Date: Tue, 4 Oct 2022 18:26:17 -0400
-Subject: [PATCH] fix a memory leak in XRegisterIMInstantiateCallback
-
-Analysis:
-
-    _XimRegisterIMInstantiateCallback() opens an XIM and closes it using
-    the internal function pointers, but the internal close function does
-    not free the pointer to the XIM (this would be done in XCloseIM()).
-
-Report/patch:
-
-    Date: Mon, 03 Oct 2022 18:47:32 +0800
-    From: Po Lu <[email protected]>
-    To: [email protected]
-    Subject: Re: Yet another leak in Xlib
-
-    For reference, here's how I'm calling XRegisterIMInstantiateCallback:
-
-    XSetLocaleModifiers ("");
-    XRegisterIMInstantiateCallback (compositor.display,
-                                    XrmGetDatabase (compositor.display),
-                                    (char *) compositor.resource_name,
-                                    (char *) compositor.app_name,
-                                    IMInstantiateCallback, NULL);
-
-    and XMODIFIERS is:
-
-        @im=ibus
-
-Signed-off-by: Thomas E. Dickey <[email protected]>
----
- modules/im/ximcp/imInsClbk.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/modules/im/ximcp/imInsClbk.c b/modules/im/ximcp/imInsClbk.c
-index 95b379cb..c10e347f 100644
---- a/modules/im/ximcp/imInsClbk.c
-+++ b/modules/im/ximcp/imInsClbk.c
-@@ -212,6 +212,9 @@ _XimRegisterIMInstantiateCallback(
-     if( xim ) {
- 	lock = True;
- 	xim->methods->close( (XIM)xim );
-+	/* XIMs must be freed manually after being opened; close just
-+	   does the protocol to deinitialize the IM.  */
-+	XFree( xim );
- 	lock = False;
- 	icb->call = True;
- 	callback( display, client_data, NULL );
--- 
-2.34.1
-
meta/recipes-graphics/xorg-lib/libx11_1.8.4.bb +2 -4
index 7831b4986a..9058c1844e 100644
@@ -18,14 +18,12 @@ DEPENDS += "xorgproto \
 
 PROVIDES = "virtual/libx11"
 
-FILESEXTRAPATHS =. "${FILE_DIRNAME}/libx11:"
-
 PE = "1"
 
 XORG_PN = "libX11"
 
-SRC_URI += "file://disable_tests.patch \
-            "
+SRC_URI += "file://disable_tests.patch"
+
 SRC_URI[sha256sum] = "c9a287a5aefa9804ce3cfafcf516fe96ed3f7e8e45c0e2ee59e84c86757df518"
 
 inherit gettext
Signature · 1 line
2.34.1
#10 lore raw

PATCH 10/24 qemu: remove unused qemu-7.0.0-glibc-2.36.patch

In reply to Steve Sakoman

From: Martin Jansa <[email protected]>

* it was removed from SRC_URI in:
https://git.openembedded.org/openembedded-core/commit/?id=e94d182889ca3c02df913c59f0b66b228ffe588c

(cherry picked from commit 351c461859df02118e9fadb57320120dfbcd97eb)
---
 .../qemu/qemu/qemu-7.0.0-glibc-2.36.patch     | 46 -------------------
 1 file changed, 46 deletions(-)
 delete mode 100644 meta/recipes-devtools/qemu/qemu/qemu-7.0.0-glibc-2.36.patch
meta/recipes-devtools/qemu/qemu/qemu-7.0.0-glibc-2.36.patch deleted +0 -46
deleted file mode 100644
index abad1cfeeb..0000000000
@@ -1,46 +0,0 @@
-Avoid conflicts between sys/mount.h and linux/mount.h that are seen
-with glibc 2.36
-
-Source: https://github.com/archlinux/svntogit-packages/blob/packages/qemu/trunk/qemu-7.0.0-glibc-2.36.patch
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <[email protected]>
---- a/linux-user/syscall.c
-+++ b/linux-user/syscall.c
-@@ -95,7 +95,25 @@
- #include <linux/soundcard.h>
- #include <linux/kd.h>
- #include <linux/mtio.h>
-+
-+#ifdef HAVE_SYS_MOUNT_FSCONFIG
-+/*
-+ * glibc >= 2.36 linux/mount.h conflicts with sys/mount.h,
-+ * which in turn prevents use of linux/fs.h. So we have to
-+ * define the constants ourselves for now.
-+ */
-+#define FS_IOC_GETFLAGS                _IOR('f', 1, long)
-+#define FS_IOC_SETFLAGS                _IOW('f', 2, long)
-+#define FS_IOC_GETVERSION              _IOR('v', 1, long)
-+#define FS_IOC_SETVERSION              _IOW('v', 2, long)
-+#define FS_IOC_FIEMAP                  _IOWR('f', 11, struct fiemap)
-+#define FS_IOC32_GETFLAGS              _IOR('f', 1, int)
-+#define FS_IOC32_SETFLAGS              _IOW('f', 2, int)
-+#define FS_IOC32_GETVERSION            _IOR('v', 1, int)
-+#define FS_IOC32_SETVERSION            _IOW('v', 2, int)
-+#else
- #include <linux/fs.h>
-+#endif
- #include <linux/fd.h>
- #if defined(CONFIG_FIEMAP)
- #include <linux/fiemap.h>
---- a/meson.build
-+++ b/meson.build
-@@ -1686,6 +1686,8 @@ config_host_data.set('HAVE_OPTRESET',
-                      cc.has_header_symbol('getopt.h', 'optreset'))
- config_host_data.set('HAVE_IPPROTO_MPTCP',
-                      cc.has_header_symbol('netinet/in.h', 'IPPROTO_MPTCP'))
-+config_host_data.set('HAVE_SYS_MOUNT_FSCONFIG',
-+                     cc.has_header_symbol('sys/mount.h', 'FSCONFIG_SET_FLAG'))
- 
- # has_member
- config_host_data.set('HAVE_SIGEV_NOTIFY_THREAD_ID',
Signature · 1 line
2.34.1
#11 lore raw

PATCH 11/24 minicom: remove unused patch files

In reply to Steve Sakoman

From: Martin Jansa <[email protected]>

* they were removed from SRC_URI in:
https://git.openembedded.org/openembedded-core/commit/?id=41f8760dd8a8ac388389bc17dbc5e0ae0f64bf57

(cherry picked from commit a0f28cd8d01f4faeedc1089e5d1e2dacc5b046f9)
---
 ...erfluous-global-variable-definitions.patch | 35 ----------------
 ...erfluous-global-variable-definitions.patch | 37 ----------------
 ...erfluous-global-variable-definitions.patch | 42 -------------------
 3 files changed, 114 deletions(-)
 delete mode 100644 meta/recipes-extended/minicom/minicom/0001-Drop-superfluous-global-variable-definitions.patch
 delete mode 100644 meta/recipes-extended/minicom/minicom/0002-Drop-superfluous-global-variable-definitions.patch
 delete mode 100644 meta/recipes-extended/minicom/minicom/0003-Drop-superfluous-global-variable-definitions.patch
meta/recipes-extended/minicom/minicom/0001-Drop-superfluous-global-variable-definitions.patch deleted +0 -35
deleted file mode 100644
index 01b23898e7..0000000000
@@ -1,35 +0,0 @@
-From b65152ebc03832972115e6d98e50cb6190d01793 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ond=C5=99ej=20Lyson=C4=9Bk?= <[email protected]>
-Date: Mon, 3 Feb 2020 13:18:13 +0100
-Subject: [PATCH 1/3] Drop superfluous global variable definitions
-
-The file minicom.c, by including the minicom.h header, already defines
-the global variables 'dial_user' and 'dial_pass'. The object file
-minicom.o is always linked to dial.o. Thus the definitions in dial.c
-can be dropped.
-
-This fixes linking with gcc 10 which uses -fno-common by default,
-disallowing multiple global variable definitions.
-
-Upstream-Status: Backport [https://salsa.debian.org/minicom-team/minicom/-/commit/db269bba2a68fde03f5df45ac8372a8f1248ca96]
-Signed-off-by: Khem Raj <[email protected]>
----
- src/dial.c | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/src/dial.c b/src/dial.c
-index eada5ee..d9d481f 100644
---- a/src/dial.c
-+++ b/src/dial.c
-@@ -146,8 +146,6 @@ static int newtype;
- /* Access to ".dialdir" denied? */
- static int dendd = 0;
- static char *tagged;
--char *dial_user;
--char *dial_pass;
- 
- /* Change the baud rate.  Treat all characters in the given array as if
-  * they were key presses within the comm parameters dialog (C-A P) and
--- 
-2.24.1
-
meta/recipes-extended/minicom/minicom/0002-Drop-superfluous-global-variable-definitions.patch deleted +0 -37
deleted file mode 100644
index e86b470b7e..0000000000
@@ -1,37 +0,0 @@
-From 924bd2da3a00e030e29d82b74ef82900bd50b475 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ond=C5=99ej=20Lyson=C4=9Bk?= <[email protected]>
-Date: Mon, 3 Feb 2020 13:18:33 +0100
-Subject: [PATCH 2/3] Drop superfluous global variable definitions
-
-The only place where the EXTERN macro mechanism is used to define the
-global variables 'vt_outmap' and 'vt_inmap' is minicom.c (by defining
-an empty EXTERN macro and including the minicom.h header). The file
-vt100.c already defines these variables. The vt100.o object file is
-always linked to minicom.o. Thus it is safe not to define the
-variables in minicom.c and only declare them in the minicom.h header.
-
-This fixes linking with gcc 10 which uses -fno-common by default,
-disallowing multiple global variable definitions.
-
-Upstream-Status: Backport [https://salsa.debian.org/minicom-team/minicom/-/commit/c69cad5b5dda85d361a3a0c1fddc65e933f26d11]
-Signed-off-by: Khem Raj <[email protected]>
----
- src/minicom.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/minicom.h b/src/minicom.h
-index 061c013..0f9693b 100644
---- a/src/minicom.h
-+++ b/src/minicom.h
-@@ -141,7 +141,7 @@ EXTERN int sbcolor;     /* Status Bar Background Color */
- EXTERN int st_attr;	/* Status Bar attributes. */
- 
- /* jl 04.09.97 conversion tables */
--EXTERN unsigned char vt_outmap[256], vt_inmap[256];
-+extern unsigned char vt_outmap[256], vt_inmap[256];
- 
- /* MARK updated 02/17/95 - history buffer */
- EXTERN int num_hist_lines;  /* History buffer size */
--- 
-2.24.1
-
meta/recipes-extended/minicom/minicom/0003-Drop-superfluous-global-variable-definitions.patch deleted +0 -42

42 lines not on this page · raw message

Signature · 1 line
2.34.1
#12 lore raw

PATCH 12/24 inetutils: remove unused patch files

In reply to Steve Sakoman

From: Martin Jansa <[email protected]>

* they were removed from SRC_URI in:
https://git.openembedded.org/openembedded-core/commit/?id=a21e8fdf1b66961ddae5929d393daa08800bb748

(cherry picked from commit e2030f2a651920435787b4a580dd18894c1bc02c)
---
 ...-multiple-definitions-of-errcatch-an.patch | 58 -------------------
 .../inetutils/fix-buffer-fortify-tfpt.patch   | 25 --------
 2 files changed, 83 deletions(-)
 delete mode 100644 meta/recipes-connectivity/inetutils/inetutils/0001-ftpd-telnetd-Fix-multiple-definitions-of-errcatch-an.patch
 delete mode 100644 meta/recipes-connectivity/inetutils/inetutils/fix-buffer-fortify-tfpt.patch
meta/recipes-connectivity/inetutils/inetutils/0001-ftpd-telnetd-Fix-multiple-definitions-of-errcatch-an.patch deleted +0 -58
deleted file mode 100644
index 49d319f59d..0000000000
@@ -1,58 +0,0 @@
-From 7d39930468e272c740b0eed3c7e5b7fb3abf29e8 Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Wed, 5 Aug 2020 10:36:22 -0700
-Subject: [PATCH] ftpd,telnetd: Fix multiple definitions of errcatch and not42
-
-This helps fix build failures when -fno-common option is used
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <[email protected]>
-
-Signed-off-by: Khem Raj <[email protected]>
----
- ftpd/extern.h     | 2 +-
- ftpd/ftpcmd.c     | 1 +
- telnetd/utility.c | 2 +-
- 3 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/ftpd/extern.h b/ftpd/extern.h
-index ab33cf3..91dbbee 100644
---- a/ftpd/extern.h
-+++ b/ftpd/extern.h
-@@ -90,7 +90,7 @@ extern void user (const char *);
- extern char *sgetsave (const char *);
- 
- /* Exported from ftpd.c.  */
--jmp_buf errcatch;
-+extern jmp_buf errcatch;
- extern struct sockaddr_storage data_dest;
- extern socklen_t data_dest_len;
- extern struct sockaddr_storage his_addr;
-diff --git a/ftpd/ftpcmd.c b/ftpd/ftpcmd.c
-index beb1f06..d272e9d 100644
---- a/ftpd/ftpcmd.c
-+++ b/ftpd/ftpcmd.c
-@@ -106,6 +106,7 @@
- #endif
- 
- off_t restart_point;
-+jmp_buf errcatch;
- 
- static char cbuf[512];           /* Command Buffer.  */
- static char *fromname;
-diff --git a/telnetd/utility.c b/telnetd/utility.c
-index e7ffb8e..46bf91e 100644
---- a/telnetd/utility.c
-+++ b/telnetd/utility.c
-@@ -63,7 +63,7 @@ static int ncc;
- static char ptyibuf[BUFSIZ], *ptyip;
- static int pcc;
- 
--int not42;
-+extern int not42;
- 
- static int
- readstream (int p, char *ibuf, int bufsize)
--- 
-2.28.0
-
meta/recipes-connectivity/inetutils/inetutils/fix-buffer-fortify-tfpt.patch deleted +0 -25
deleted file mode 100644
index a91913cb51..0000000000
@@ -1,25 +0,0 @@
-tftpd: Fix abort on error path
-
-When trying to fetch a non existent file, the app crashes with:
-
-*** buffer overflow detected ***: 
-Aborted
-
-
-Upstream-Status: Submitted [https://www.mail-archive.com/[email protected]/msg03036.html https://gcc.gnu.org/bugzilla/show_bug.cgi?id=91205]
-Signed-off-by: Ricardo Ribalda Delgado <[email protected]>
-diff --git a/src/tftpd.c b/src/tftpd.c
-index 56002a0..144012f 100644
---- a/src/tftpd.c
-+++ b/src/tftpd.c
-@@ -864,9 +864,8 @@ nak (int error)
-       pe->e_msg = strerror (error - 100);
-       tp->th_code = EUNDEF;	/* set 'undef' errorcode */
-     }
--  strcpy (tp->th_msg, pe->e_msg);
-   length = strlen (pe->e_msg);
--  tp->th_msg[length] = '\0';
-+  memcpy(tp->th_msg, pe->e_msg, length + 1);
-   length += 5;
-   if (sendto (peer, buf, length, 0, (struct sockaddr *) &from, fromlen) != length)
-     syslog (LOG_ERR, "nak: %m\n");
Signature · 1 line
2.34.1
#13 lore raw

PATCH 13/24 libgloss: remove unused patch file

In reply to Steve Sakoman

From: Martin Jansa <[email protected]>

* it was removed from SRC_URI in:
https://git.openembedded.org/openembedded-core/commit/?id=1c9cbb27dfe37ca4574c4285fb03ce394dee5ed1

(cherry picked from commit c78439a8048c30ef96e11ae698c32f4e088787d3)
---
 .../libgloss/fix_makefile_include_arm_h.patch | 30 -------------------
 1 file changed, 30 deletions(-)
 delete mode 100644 meta/recipes-core/newlib/libgloss/fix_makefile_include_arm_h.patch
meta/recipes-core/newlib/libgloss/fix_makefile_include_arm_h.patch deleted +0 -30
deleted file mode 100644
index 7645be7314..0000000000
@@ -1,30 +0,0 @@
-Upstream-Status: Inappropriate  [OE-Specific]
-
-When trying to build libgloss for an arm target, the build system
-complains about missing some include files:
-
-| fatal error: acle-compiat.h: No such file or directory
-|  #include "acle-compat.h"
-|           ^~~~~~~~~~~~~~~
-| compilation terminated.
-
-These include files come from the newlib source, but since we
-are building libgloss separately from newlib, libgloss is unaware
-of where they are, this patch fixes the INCLUDES so the build system
-can find such files.
-
-Signed-off-by: Alejandro Enedino Hernandez Samaniego <[email protected]>
-
-Index: newlib-3.0.0/libgloss/config/default.mh
-===================================================================
---- newlib-3.0.0.orig/libgloss/config/default.mh
-+++ newlib-3.0.0/libgloss/config/default.mh
-@@ -1,7 +1,7 @@
- NEWLIB_CFLAGS = `if [ -d ${objroot}/newlib ]; then echo -I${objroot}/newlib/targ-include -I${srcroot}/newlib/libc/include; fi`
- NEWLIB_LDFLAGS = `if [ -d ${objroot}/newlib ]; then echo -B${objroot}/newlib/ -L${objroot}/newlib/; fi`
- 
--INCLUDES = -I. -I$(srcdir)/..
-+INCLUDES = -I. -I$(srcdir)/.. -I$(srcdir)/../newlib/libc/machine/arm
- # Note that when building the library, ${MULTILIB} is not the way multilib
- # options are passed; they're passed in $(CFLAGS).
- CFLAGS_FOR_TARGET = -O2 -g ${MULTILIB} ${INCLUDES} ${NEWLIB_CFLAGS}
Signature · 1 line
2.34.1
#14 lore raw

PATCH 14/24 kmod: remove unused ptest.patch

In reply to Steve Sakoman

From: Martin Jansa <[email protected]>

* it was removed from SRC_URI in 2015:
https://git.openembedded.org/openembedded-core/commit/?id=f80d136bdd578468035a88125fa1b84973fd912b

(cherry picked from commit cfc4586b4bf080a3a4aa419dffc76c5da2a95b74)
---
 meta/recipes-kernel/kmod/kmod/ptest.patch | 25 -----------------------
 1 file changed, 25 deletions(-)
 delete mode 100644 meta/recipes-kernel/kmod/kmod/ptest.patch
meta/recipes-kernel/kmod/kmod/ptest.patch deleted +0 -25
deleted file mode 100644
index 831dbcb909..0000000000
@@ -1,25 +0,0 @@
-Add 'install-ptest' rule.
-
-Signed-off-by: Tudor Florea <[email protected]>
-Upstream-Status: Pending
-
-diff -ruN a/Makefile.am b/Makefile.am
---- a/Makefile.am	2013-07-12 17:11:05.278331557 +0200
-+++ b/Makefile.am	2013-07-12 17:14:27.033788016 +0200
-@@ -204,6 +204,16 @@
- 
- distclean-local: $(DISTCLEAN_LOCAL_HOOKS)
- 
-+install-ptest:
-+	@$(MKDIR_P) $(DESTDIR)/testsuite
-+	@for file in $(TESTSUITE); do \
-+		install $$file $(DESTDIR)/testsuite; \
-+	done;
-+	@sed -e 's/^Makefile/_Makefile/' < Makefile > $(DESTDIR)/Makefile
-+	@$(MKDIR_P) $(DESTDIR)/tools
-+	@cp $(noinst_SCRIPTS) $(noinst_PROGRAMS) $(DESTDIR)/tools
-+	@cp -r testsuite/rootfs testsuite/.libs $(DESTDIR)/testsuite
-+
- # ------------------------------------------------------------------------------
- # custom release helpers
- # ------------------------------------------------------------------------------
Signature · 1 line
2.34.1
#15 lore raw

PATCH 15/24 pm-utils: fix multilib conflictions

In reply to Steve Sakoman

From: Kai Kang <[email protected]>

It fails to instal pm-utils and lib32-pm-utils at same time:

Error: Transaction test error:
file /usr/bin/pm-is-supported conflicts between attempted installs of lib32-pm-utils-1.4.1-r1.corei7_32 and pm-utils-1.4.1-r1.corei7_64 file /usr/sbin/pm-hibernate conflicts between attempted installs of lib32-pm-utils-1.4.1-r1.corei7_32 and pm-utils-1.4.1-r1.corei7_64 file /usr/sbin/pm-powersave conflicts between attempted installs of lib32-pm-utils-1.4.1-r1.corei7_32 and pm-utils-1.4.1-r1.corei7_64 file /usr/sbin/pm-suspend conflicts between attempted installs of lib32-pm-utils-1.4.1-r1.corei7_32 and pm-utils-1.4.1-r1.corei7_64 file /usr/sbin/pm-suspend-hybrid conflicts between attempted installs of lib32-pm-utils-1.4.1-r1.corei7_32 and pm-utils-1.4.1-r1.corei7_64

All of the conflicted files either is script which source a file in ${libdir}, or a link file to some file in ${libdir}. Compare the content of installed files in ${libdir} exclude binaries, only the paths of ${libdir} diff. So re-define libdir with ${nonarch_libdir} to fix the conflicts.

(cherry picked from commit f836541bcfdbf033a37537530b4e3b87b0a7f003)
---
 meta/recipes-bsp/pm-utils/pm-utils_1.4.1.bb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
meta/recipes-bsp/pm-utils/pm-utils_1.4.1.bb +4 -1
index c6a4bc4932..dcc09f279e 100644
@@ -19,9 +19,12 @@ PACKAGECONFIG[manpages] = "--enable-doc, --disable-doc, libxslt-native xmlto-nat
 
 RDEPENDS:${PN} = "grep bash"
 
+EXTRA_OECONF = "--libdir=${nonarch_libdir}"
+
 do_configure:prepend () {
 	( cd ${S}; autoreconf -f -i -s )
 }
 
-FILES:${PN} += "${libdir}/${BPN}/*"
+FILES:${PN} += "${nonarch_libdir}/${BPN}/*"
 FILES:${PN}-dbg += "${datadir}/doc/pm-utils/README.debugging"
+FILES:${PN}-dev += "${nonarch_libdir}/pkgconfig/pm-utils.pc"
Signature · 1 line
2.34.1
#16 lore raw

PATCH 16/24 perf: Make built-in libtraceevent plugins cohabit with external libtraceevent

In reply to Steve Sakoman

From: Khem Raj <[email protected]>

This will package the plugins built by perf into kernel specific dir under libdir, so it does not conflict with plugins from newly added libtraceevent recipe

Fixes
do_sdk_depends: The file /usr/lib/traceevent/plugins/plugin_cfg80211.so is installed by both perf and libtraceevent, aborting

Cc Max Krummenacher <[email protected]>
(cherry picked from commit 28f39769c27d257a60ff0152acc0c76f0276fa6a)
---
 meta/recipes-kernel/perf/perf.bb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
meta/recipes-kernel/perf/perf.bb +5 -1
index e41fcc4798..420286e1ab 100644
@@ -135,6 +135,10 @@ PERF_EXTRA_LDFLAGS:mipsarchn64el = "-m elf64ltsmip"
 do_compile() {
 	# Linux kernel build system is expected to do the right thing
 	unset CFLAGS
+        test -e ${S}/tools/lib/traceevent/plugins/Makefile && \
+            sed -i -e 's|\$(libdir)/traceevent/plugins|\$(libdir)/traceevent_${KERNEL_VERSION}/plugins|g' ${S}/tools/lib/traceevent/plugins/Makefile
+	test -e ${S}/tools/perf/Makefile.config && \
+            sed -i -e 's|\$(libdir)/traceevent/plugins|\$(libdir)/traceevent_${KERNEL_VERSION}/plugins|g' ${S}/tools/perf/Makefile.config
 	oe_runmake all
 }
 
@@ -361,7 +365,7 @@ RSUGGESTS_SCRIPTING = "${@bb.utils.contains('PACKAGECONFIG', 'scripting', '${PN}
 RSUGGESTS:${PN} += "${PN}-archive ${PN}-tests ${RSUGGESTS_SCRIPTING}"
 
 FILES_SOLIBSDEV = ""
-FILES:${PN} += "${libexecdir}/perf-core ${exec_prefix}/libexec/perf-core ${libdir}/traceevent ${libdir}/libperf-jvmti.so"
+FILES:${PN} += "${libexecdir}/perf-core ${exec_prefix}/libexec/perf-core ${libdir}/traceevent* ${libdir}/libperf-jvmti.so"
 FILES:${PN}-archive = "${libdir}/perf/perf-core/perf-archive"
 FILES:${PN}-tests = "${libdir}/perf/perf-core/tests ${libexecdir}/perf-core/tests"
 FILES:${PN}-python = " \
Signature · 1 line
2.34.1
#17 lore raw

PATCH 17/24 maintaines.inc: unassign Richard Weinberger from erofs-utils entry

In reply to Steve Sakoman

From: Alexander Kanavin <[email protected]>

This was confirmed via private email.

(cherry picked from commit 834519933fcd6e4ff54f24d0cf671ea9ce24398a)
---
 meta/conf/distro/include/maintainers.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/conf/distro/include/maintainers.inc +1 -1
index b4ce618ca0..db0563810d 100644
@@ -165,7 +165,7 @@ RECIPE_MAINTAINER:pn-ell = "Zang Ruochen <[email protected]>"
 RECIPE_MAINTAINER:pn-enchant2 = "Anuj Mittal <[email protected]>"
 RECIPE_MAINTAINER:pn-encodings = "Unassigned <[email protected]>"
 RECIPE_MAINTAINER:pn-epiphany = "Alexander Kanavin <[email protected]>"
-RECIPE_MAINTAINER:pn-erofs-utils = "Richard Weinberger <[email protected]>"
+RECIPE_MAINTAINER:pn-erofs-utils = "Unassigned <[email protected]>"
 RECIPE_MAINTAINER:pn-ethtool = "Changhyeok Bae <[email protected]>"
 RECIPE_MAINTAINER:pn-eudev = "Anuj Mittal <[email protected]>"
 RECIPE_MAINTAINER:pn-expat = "Yi Zhao <[email protected]>"
Signature · 1 line
2.34.1
#18 lore raw

PATCH 18/24 maintainers.inc: unassign Andreas Müller from itstool entry

In reply to Steve Sakoman

From: Alexander Kanavin <[email protected]>

This was confirmed via private email.

(cherry picked from commit cc8bb0da24419424989548ced27b2e76030340d9)
---
 meta/conf/distro/include/maintainers.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/conf/distro/include/maintainers.inc +1 -1
index db0563810d..733d40ce58 100644
@@ -288,7 +288,7 @@ RECIPE_MAINTAINER:pn-iproute2 = "Changhyeok Bae <[email protected]>"
 RECIPE_MAINTAINER:pn-iptables = "Changhyeok Bae <[email protected]>"
 RECIPE_MAINTAINER:pn-iputils = "Changhyeok Bae <[email protected]>"
 RECIPE_MAINTAINER:pn-iso-codes = "Wang Mingyu <[email protected]>"
-RECIPE_MAINTAINER:pn-itstool = "Andreas Müller <[email protected]>"
+RECIPE_MAINTAINER:pn-itstool = "Unassigned <[email protected]>"
 RECIPE_MAINTAINER:pn-iw = "Changhyeok Bae <[email protected]>"
 RECIPE_MAINTAINER:pn-libjpeg-turbo = "Anuj Mittal <[email protected]>"
 RECIPE_MAINTAINER:pn-json-c = "Yi Zhao <[email protected]>"
Signature · 1 line
2.34.1
#19 lore raw

PATCH 19/24 maintainers.inc: unassign Pascal Bach from cmake entry

In reply to Steve Sakoman

From: Alexander Kanavin <[email protected]>

This was confirmed via private email.

(cherry picked from commit c30e9f1972a3e1d4099f39fd6d0dfb37acb73ce1)
---
 meta/conf/distro/include/maintainers.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta/conf/distro/include/maintainers.inc +2 -2
index 733d40ce58..098bd96c28 100644
@@ -93,8 +93,8 @@ RECIPE_MAINTAINER:pn-cantarell-fonts = "Alexander Kanavin <[email protected]
 RECIPE_MAINTAINER:pn-ccache = "Robert Yang <[email protected]>"
 RECIPE_MAINTAINER:pn-cdrtools-native = "Yi Zhao <[email protected]>"
 RECIPE_MAINTAINER:pn-chrpath = "Yi Zhao <[email protected]>"
-RECIPE_MAINTAINER:pn-cmake = "Pascal Bach <[email protected]>"
-RECIPE_MAINTAINER:pn-cmake-native = "Pascal Bach <[email protected]>"
+RECIPE_MAINTAINER:pn-cmake = "Unassigned <[email protected]>"
+RECIPE_MAINTAINER:pn-cmake-native = "Unassigned <[email protected]>"
 RECIPE_MAINTAINER:pn-connman = "Changhyeok Bae <[email protected]>"
 RECIPE_MAINTAINER:pn-connman-conf = "Ross Burton <[email protected]>"
 RECIPE_MAINTAINER:pn-connman-gnome = "Ross Burton <[email protected]>"
Signature · 1 line
2.34.1
#20 lore raw

PATCH 20/24 maintainers.inc: correct unassigned entries

In reply to Steve Sakoman

From: Alexander Kanavin <[email protected]>

Modify packages to unassigned where appropriate

(cherry picked from commit ab37ddf53607111bf5c49c4f2388224999c4a5a9)
---
 meta/conf/distro/include/maintainers.inc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
meta/conf/distro/include/maintainers.inc +4 -4
index 098bd96c28..d9e00bcdac 100644
@@ -41,7 +41,7 @@ RECIPE_MAINTAINER:pn-alsa-utils = "Michael Opdenacker <michael.opdenacker@bootli
 RECIPE_MAINTAINER:pn-apmd = "Anuj Mittal <[email protected]>"
 RECIPE_MAINTAINER:pn-apr = "Hongxu Jia <[email protected]>"
 RECIPE_MAINTAINER:pn-apr-util = "Hongxu Jia <[email protected]>"
-RECIPE_MAINTAINER:pn-apt = "Aníbal Limón <[email protected]>"
+RECIPE_MAINTAINER:pn-apt = "Unassigned <[email protected]>"
 RECIPE_MAINTAINER:pn-argp-standalone = "Khem Raj <[email protected]>"
 RECIPE_MAINTAINER:pn-asciidoc = "Yi Zhao <[email protected]>"
 RECIPE_MAINTAINER:pn-aspell = "Anuj Mittal <[email protected]>"
@@ -60,7 +60,7 @@ RECIPE_MAINTAINER:pn-base-passwd = "Anuj Mittal <[email protected]>"
 RECIPE_MAINTAINER:pn-bash = "Hongxu Jia <[email protected]>"
 RECIPE_MAINTAINER:pn-bash-completion = "Alexander Kanavin <[email protected]>"
 RECIPE_MAINTAINER:pn-bc = "Anuj Mittal <[email protected]>"
-RECIPE_MAINTAINER:pn-bind = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER:pn-bind = "Unassigned <[email protected]>"
 RECIPE_MAINTAINER:pn-binutils = "Khem Raj <[email protected]>"
 RECIPE_MAINTAINER:pn-binutils-cross-${TARGET_ARCH} = "Khem Raj <[email protected]>"
 RECIPE_MAINTAINER:pn-binutils-cross-canadian-${TRANSLATED_TARGET_ARCH} = "Khem Raj <[email protected]>"
@@ -152,7 +152,7 @@ RECIPE_MAINTAINER:pn-docbook-xml-dtd4 = "Yi Zhao <[email protected]>"
 RECIPE_MAINTAINER:pn-docbook-xsl-stylesheets = "Yi Zhao <[email protected]>"
 RECIPE_MAINTAINER:pn-dos2unix = "Khem Raj <[email protected]>"
 RECIPE_MAINTAINER:pn-dosfstools = "Yi Zhao <[email protected]>"
-RECIPE_MAINTAINER:pn-dpkg = "Aníbal Limón <[email protected]>"
+RECIPE_MAINTAINER:pn-dpkg = "Unassigned <[email protected]>"
 RECIPE_MAINTAINER:pn-dropbear = "Yi Zhao <[email protected]>"
 RECIPE_MAINTAINER:pn-dtc = "Wang Mingyu <[email protected]>"
 RECIPE_MAINTAINER:pn-dwarfsrcfiles = "Alexander Kanavin <[email protected]>"
@@ -415,7 +415,7 @@ RECIPE_MAINTAINER:pn-liburcu = "Wang Mingyu <[email protected]>"
 RECIPE_MAINTAINER:pn-liburi-perl = "Tim Orling <[email protected]>"
 RECIPE_MAINTAINER:pn-libusb1 = "Anuj Mittal <[email protected]>"
 RECIPE_MAINTAINER:pn-libubootenv = "Stefano Babic <[email protected]>"
-RECIPE_MAINTAINER:pn-libuv = "Armin Kuster <[email protected]>"
+RECIPE_MAINTAINER:pn-libuv = "Unassigned <[email protected]>"
 RECIPE_MAINTAINER:pn-libva = "Anuj Mittal <[email protected]>"
 RECIPE_MAINTAINER:pn-libva-initial = "Anuj Mittal <[email protected]>"
 RECIPE_MAINTAINER:pn-libva-utils = "Anuj Mittal <[email protected]>"
Signature · 1 line
2.34.1
#21 lore raw

PATCH 21/24 connman: fix warning by specifying runstatedir at configure time

In reply to Steve Sakoman

From: Marc Ferland <[email protected]>

Without this patch, systemd complains on startup with messages similar to:

systemd-tmpfiles[128]: /etc/tmpfiles.d/connman_resolvconf.conf:1: Line references path below legacy directory /var/run/, updating /var/run/connman → /run/connman; please update the tmpfiles.d/ drop-in file accordingly. systemd-tmpfiles[172]: /etc/tmpfiles.d/connman_resolvconf.conf:1: Line references path below legacy directory /var/run/, updating /var/run/connman → /run/connman; please update the tmpfiles.d/ drop-in file accordingly.

By default, connman will use "/var/run/connman" for runstatedir instead of the now recommended "/run/connman".

(cherry picked from commit 8d17776765a99a4ae327797206ef2a8a735ce87b)
---
 meta/recipes-connectivity/connman/connman.inc | 1 +
 1 file changed, 1 insertion(+)
meta/recipes-connectivity/connman/connman.inc +1 -0
index d7af94f792..7487ca0d0c 100644
@@ -27,6 +27,7 @@ EXTRA_OECONF += "\
     --enable-ethernet \
     --enable-tools \
     --disable-polkit \
+    --runstatedir=/run \
 "
 # For smooth operation it would be best to start only one wireless daemon at a time.
 # If wpa-supplicant is running, connman will use it preferentially.
Signature · 1 line
2.34.1
#22 lore raw

PATCH 22/24 selftest/license: Exclude from world

In reply to Steve Sakoman

From: Richard Purdie <[email protected]>

These test recipes shouldn't be built as part of world builds. Some recent changes are exposing issues from this so exclude them.

(cherry picked from commit 80d3f5586cd060ae69fbc6dec2e8978d87da10ba)
---
 .../recipes-test/license/incompatible-license-alias.bb          | 2 ++
 meta-selftest/recipes-test/license/incompatible-license.bb      | 2 ++
 meta-selftest/recipes-test/license/incompatible-licenses.bb     | 2 ++
 .../recipes-test/license/incompatible-nonspdx-license.bb        | 2 ++
 4 files changed, 8 insertions(+)
meta-selftest/recipes-test/license/incompatible-license-alias.bb +2 -0
index e0b4e13c26..1af99e7809 100644
@@ -1,3 +1,5 @@
 SUMMARY = "Recipe with an alias of an SPDX license"
 DESCRIPTION = "Is licensed with an alias of an SPDX license to be used for testing"
 LICENSE = "GPLv3"
+
+EXCLUDE_FROM_WORLD = "1"
meta-selftest/recipes-test/license/incompatible-license.bb +2 -0
index 282f5c2875..6fdc58fd30 100644
@@ -1,3 +1,5 @@
 SUMMARY = "Recipe with an SPDX license"
 DESCRIPTION = "Is licensed with an SPDX license to be used for testing"
 LICENSE = "GPL-3.0-only"
+
+EXCLUDE_FROM_WORLD = "1"
meta-selftest/recipes-test/license/incompatible-licenses.bb +2 -0
index 9709892644..47bd8d7c00 100644
@@ -1,3 +1,5 @@
 SUMMARY = "Recipe with multiple SPDX licenses"
 DESCRIPTION = "Is licensed with multiple SPDX licenses to be used for testing"
 LICENSE = "GPL-2.0-only & GPL-3.0-only & LGPL-3.0-only"
+
+EXCLUDE_FROM_WORLD = "1"
meta-selftest/recipes-test/license/incompatible-nonspdx-license.bb +2 -0
index 35af0966ef..142d73158e 100644
@@ -1,3 +1,5 @@
 SUMMARY = "Recipe with a non-SPDX license"
 DESCRIPTION = "Is licensed with a non-SPDX license to be used for testing"
 LICENSE = "FooLicense"
+
+EXCLUDE_FROM_WORLD = "1"
Signature · 1 line
2.34.1
#23 lore raw

PATCH 23/24 cmake.bbclass: do not search host paths for find_program()

In reply to Steve Sakoman

From: Chen Qi <[email protected]>

OECMAKE_FIND_ROOT_PATH_MODE_PROGRAM[1] controls the search behavior of find_program(). When this variable's value was first used in OE, it was deliberately set to BOTH to allow searching of host tools. This is to ensure the necessary tools from host could be used. The downside is that the configure behavior may differ on different host environments.

Later, this cmake.bbclass was added the ability to search tools under the HOSTTOOLS_DIR. This means we no longer needs cmake to search the host paths. So we remove the class-native setting of BOTH.

[1] https://cmake.org/cmake/help/latest/variable/CMAKE_FIND_ROOT_PATH_MODE_PROGRAM.html

(cherry picked from commit f4ea12f6635125ee793f4dd801c538c0186f9dc3)
---
 meta/classes-recipe/cmake.bbclass | 1 -
 1 file changed, 1 deletion(-)
meta/classes-recipe/cmake.bbclass +0 -1
index 554b948c32..2f5114b6b5 100644
@@ -61,7 +61,6 @@ OECMAKE_PERLNATIVE_DIR ??= ""
 OECMAKE_EXTRA_ROOT_PATH ?= ""
 
 OECMAKE_FIND_ROOT_PATH_MODE_PROGRAM = "ONLY"
-OECMAKE_FIND_ROOT_PATH_MODE_PROGRAM:class-native = "BOTH"
 
 EXTRA_OECMAKE:append = " ${PACKAGECONFIG_CONFARGS}"
 
Signature · 1 line
2.34.1
#24 lore raw

PATCH 24/24 systemd-systemctl: support instance expansion in WantedBy

In reply to Steve Sakoman

From: Ian Ray <[email protected]>

Refactor _process_deps to expand systemd instance specifier "%i" to the template instance.

This change expands on prior commit e510222b57 ("systemd-systemctl: fix instance template WantedBy symlink construction") by substituting every "%i" pattern-match with the instance name.

The regexp handles the following cases:

* svc-wants@%i.service

* sys-subsystem-net-devices-%i.device

(cherry picked from commit 9356276137267a29ae2289d796a2940918375308)
---
 meta/recipes-core/systemd/systemd-systemctl/systemctl | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)
meta/recipes-core/systemd/systemd-systemctl/systemctl +2 -7
index b45a2dc2f7..514f747fe6 100755
@@ -201,13 +201,8 @@ class SystemdUnit():
         target = ROOT / location.relative_to(self.root)
         try:
             for dependent in config.get('Install', prop):
-                # determine whether or not dependent is a template with an actual
-                # instance (i.e. a '@%i')
-                dependent_is_template = re.match(r"[^@]+@(?P<instance>[^\.]*)\.", dependent)
-                if dependent_is_template:
-                    # if so, replace with the actual instance to achieve
-                    # [email protected]/[email protected]
-                    dependent = re.sub(dependent_is_template.group('instance'), instance, dependent, 1)
+                # expand any %i to instance (ignoring escape sequence %%)
+                dependent = re.sub("([^%](%%)*)%i", "\\1{}".format(instance), dependent)
                 wants = systemdir / "{}.{}".format(dependent, dirstem) / service
                 add_link(wants, target)
 
Signature · 1 line
2.34.1