Skip to contentSkip to conversation

Patch review

PATCH In review Steve Sakoman 3 participants 39 messages Jul 29, 2022 – Aug 2, 2022 1 message not in the archive

lore
Share & tools
lore
#0 lore raw

cover Patch review

Please review this set of patches for kirkstone and have comments back by end of day Tuesday.

I've added change logs to the commits for version updates to make it easier to review those.

Passed a-full on autobuilder:

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

The following changes since commit 2bc86c029fb82ae572f6a89407ccfe332972568c:

gcc-runtime: Pass -nostartfiles when building dummy libstdc++.so (2022-07-26 05:34:59 -1000)

are available in the Git repository at:

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

Alex Kiernan (1):
bind: Remove legacy python3 PACKAGECONFIG code

Alexander Kanavin (14):
xev: update 1.2.4 -> 1.2.5
xmodmap: update 1.0.10 -> 1.0.11
xf86-input-synaptics: update 1.9.1 -> 1.9.2
encodings: update 1.0.5 -> 1.0.6
font-util: update 1.3.2 -> 1.3.3
xserver-xorg: update 21.1.3 -> 21.1.4
linux-firmware: update 20220610 -> 20220708
libuv: upgrade 1.44.1 -> 1.44.2
log4cplus: upgrade 2.0.7 -> 2.0.8
vala: upgrade 0.56.0 -> 0.56.1
vala: upgrade 0.56.1 -> 0.56.2
webkitgtk: upgrade 2.36.3 -> 2.36.4
xwayland: upgrade 22.1.2 -> 22.1.3
epiphany: upgrade 42.2 -> 42.3

Hitendra Prajapati (2):
qemu: CVE-2022-35414 can perform an uninitialized read on the
translate_fail path, leading to an io_readx or io_writex crash
libtirpc: CVE-2021-46828 DoS vulnerability with lots of connections

Mihai Lindner (1):
wic/plugins/rootfs: Fix NameError for 'orig_path'

Ming Liu (1):
udev-extraconf:mount.sh: fix a umount issue

Richard Purdie (3):
xorg-app: Tweak handling of compression changes in SRC_URI
xwayland: upgrade 22.1.1 -> 22.1.2 base/reproducible: Change Source Date Epoch generation methods

Ross Burton (2):
oeqa/runtime: add test that the kernel has CONFIG_PREEMPT_RT enabled
perf: fix reproduciblity in older releases of Linux

Shruthi Ravichandran (1):
initscripts: run umountnfs as a KILL script

gr embeter (1):
efivar: fix import functionality

leimaohui (1):
systemd: Added base_bindir into pkg_postinst:udev-hwdb.

wangmy (2):
mkfontscale: upgrade 1.2.1 -> 1.2.2
xdpyinfo: upgrade 1.3.2 -> 1.3.3

 meta/classes/base.bbclass                     |   1 +
 meta/lib/oe/reproducible.py                   |   1 -
 meta/lib/oeqa/runtime/cases/rt.py             |  17 ++
 .../0001-Fix-invalid-free-in-main.patch       |  30 ++++
 meta/recipes-bsp/efivar/efivar_38.bb          |   1 +
 meta/recipes-connectivity/bind/bind_9.18.4.bb |  13 --
 .../{libuv_1.44.1.bb => libuv_1.44.2.bb}      |   2 +-
 .../initscripts/initscripts_1.0.bb            |   2 +-
 meta/recipes-core/systemd/systemd_250.5.bb    |   2 +-
 .../recipes-core/udev/udev-extraconf/mount.sh |   2 +-
 ...{log4cplus_2.0.7.bb => log4cplus_2.0.8.bb} |   2 +-
 meta/recipes-devtools/qemu/qemu.inc           |   1 +
 .../qemu/qemu/CVE-2022-35414.patch            |  53 ++++++
 meta/recipes-devtools/vala/vala_0.56.0.bb     |   3 -
 meta/recipes-devtools/vala/vala_0.56.2.bb     |   3 +
 .../libtirpc/libtirpc/CVE-2021-46828.patch    | 155 ++++++++++++++++++
 .../libtirpc/libtirpc_1.3.2.bb                |   4 +-
 .../{epiphany_42.2.bb => epiphany_42.3.bb}    |   2 +-
 ...ontscale_1.2.1.bb => mkfontscale_1.2.2.bb} |   4 +-
 .../{xdpyinfo_1.3.2.bb => xdpyinfo_1.3.3.bb}  |   4 +-
 .../xorg-app/{xev_1.2.4.bb => xev_1.2.5.bb}   |   4 +-
 .../{xmodmap_1.0.10.bb => xmodmap_1.0.11.bb}  |   5 +-
 .../xorg-app/xorg-app-common.inc              |   3 +-
 .../recipes-graphics/xorg-app/xrandr_1.5.1.bb |   3 +-
 .../64bit_time_t_support.patch                |  51 ------
 ...1.9.1.bb => xf86-input-synaptics_1.9.2.bb} |   7 +-
 .../xorg-font/encodings/nocompiler.patch      |   8 +-
 ...{encodings_1.0.5.bb => encodings_1.0.6.bb} |   6 +-
 ...{font-util_1.3.2.bb => font-util_1.3.3.bb} |   5 +-
 .../xorg-font/xorg-font-common.inc            |   3 +-
 .../0001-render-Fix-build-with-gcc-12.patch   |  90 ----------
 ...-xorg_21.1.3.bb => xserver-xorg_21.1.4.bb} |   7 +-
 ...{xwayland_22.1.1.bb => xwayland_22.1.3.bb} |   2 +-
 ...20220610.bb => linux-firmware_20220708.bb} |  13 +-
 meta/recipes-kernel/perf/perf.bb              |   3 +
 ...ebkitgtk_2.36.3.bb => webkitgtk_2.36.4.bb} |   2 +-
 scripts/lib/wic/plugins/source/rootfs.py      |   2 +-
 37 files changed, 309 insertions(+), 207 deletions(-)
 create mode 100644 meta/lib/oeqa/runtime/cases/rt.py
 create mode 100644 meta/recipes-bsp/efivar/efivar/0001-Fix-invalid-free-in-main.patch
 rename meta/recipes-connectivity/libuv/{libuv_1.44.1.bb => libuv_1.44.2.bb} (93%)
 rename meta/recipes-devtools/log4cplus/{log4cplus_2.0.7.bb => log4cplus_2.0.8.bb} (90%)
 create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2022-35414.patch
 delete mode 100644 meta/recipes-devtools/vala/vala_0.56.0.bb
 create mode 100644 meta/recipes-devtools/vala/vala_0.56.2.bb
 create mode 100644 meta/recipes-extended/libtirpc/libtirpc/CVE-2021-46828.patch
 rename meta/recipes-gnome/epiphany/{epiphany_42.2.bb => epiphany_42.3.bb} (94%)
 rename meta/recipes-graphics/xorg-app/{mkfontscale_1.2.1.bb => mkfontscale_1.2.2.bb} (82%)
 rename meta/recipes-graphics/xorg-app/{xdpyinfo_1.3.2.bb => xdpyinfo_1.3.3.bb} (81%)
 rename meta/recipes-graphics/xorg-app/{xev_1.2.4.bb => xev_1.2.5.bb} (81%)
 rename meta/recipes-graphics/xorg-app/{xmodmap_1.0.10.bb => xmodmap_1.0.11.bb} (78%)
 delete mode 100644 meta/recipes-graphics/xorg-driver/xf86-input-synaptics/64bit_time_t_support.patch
 rename meta/recipes-graphics/xorg-driver/{xf86-input-synaptics_1.9.1.bb => xf86-input-synaptics_1.9.2.bb} (74%)
 rename meta/recipes-graphics/xorg-font/{encodings_1.0.5.bb => encodings_1.0.6.bb} (78%)
 rename meta/recipes-graphics/xorg-font/{font-util_1.3.2.bb => font-util_1.3.3.bb} (84%)
 delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-render-Fix-build-with-gcc-12.patch
 rename meta/recipes-graphics/xorg-xserver/{xserver-xorg_21.1.3.bb => xserver-xorg_21.1.4.bb} (79%)
 rename meta/recipes-graphics/xwayland/{xwayland_22.1.1.bb => xwayland_22.1.3.bb} (95%)
 rename meta/recipes-kernel/linux-firmware/{linux-firmware_20220610.bb => linux-firmware_20220708.bb} (98%)
 rename meta/recipes-sato/webkit/{webkitgtk_2.36.3.bb => webkitgtk_2.36.4.bb} (98%)
Signature · 1 line
2.25.1
#1 lore raw

PATCH 1/29 qemu: CVE-2022-35414 can perform an uninitialized read on the translate_fail path, leading to an io_readx or io_writex crash

From: Hitendra Prajapati <[email protected]>

Source: https://github.com/qemu/qemu
MR: 119830
Type: Security Fix
Disposition: Backport from https://github.com/qemu/qemu/commit/418ade7849ce7641c0f7333718caf5091a02fd4c
ChangeID: 41d6646e06319e629da574b9b2e8a3a197a73441
Description:
CVE-2022-35414 qemu: can perform an uninitialized read on the translate_fail path, leading to an io_readx or io_writex crash.

---
 meta/recipes-devtools/qemu/qemu.inc           |  1 +
 .../qemu/qemu/CVE-2022-35414.patch            | 53 +++++++++++++++++++
 2 files changed, 54 insertions(+)
 create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2022-35414.patch
meta/recipes-devtools/qemu/qemu.inc +1 -0
index 63f0569d06..54a68e1730 100644
@@ -35,6 +35,7 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \
            file://pvrdma.patch \
            file://CVE-2021-4206.patch \
            file://CVE-2021-4207.patch \
+           file://CVE-2022-35414.patch \
            "
 UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar"
 
meta/recipes-devtools/qemu/qemu/CVE-2022-35414.patch new file +53 -0

53 lines not on this page · raw message

Signature · 1 line
2.25.1
#2 lore raw

Re: [OE-core][kirkstone 01/29] qemu: CVE-2022-35414 can perform an uninitialized read on the translate_fail path, leading to an io_readx or io_writex crash

Quoted 10 lines · Steve Sakoman

From: Hitendra Prajapati <[email protected]>

Source: https://github.com/qemu/qemu
MR: 119830
Type: Security Fix
Disposition: Backport from https://github.com/qemu/qemu/commit/418ade7849ce7641c0f7333718caf5091a02fd4c
ChangeID: 41d6646e06319e629da574b9b2e8a3a197a73441
Description:
CVE-2022-35414 qemu: can perform an uninitialized read on the translate_fail path, leading to an io_readx or io_writex crash.

Quoted 7 lines
---
 meta/recipes-devtools/qemu/qemu.inc           |  1 +
 .../qemu/qemu/CVE-2022-35414.patch            | 53 +++++++++++++++++++
 2 files changed, 54 insertions(+)
 create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2022-35414.patch

This isn't fixed in master yet?

Cheers,

Richard

#3 lore raw

Re: [OE-core][kirkstone 01/29] qemu: CVE-2022-35414 can perform an uninitialized read on the translate_fail path, leading to an io_readx or io_writex crash

Quoted 20 lines · Richard Purdie
Quoted 10 lines · Steve Sakoman

From: Hitendra Prajapati <[email protected]>

Source: https://github.com/qemu/qemu
MR: 119830
Type: Security Fix
Disposition: Backport from https://github.com/qemu/qemu/commit/418ade7849ce7641c0f7333718caf5091a02fd4c
ChangeID: 41d6646e06319e629da574b9b2e8a3a197a73441
Description:
CVE-2022-35414 qemu: can perform an uninitialized read on the translate_fail path, leading to an io_readx or io_writex crash.

Quoted 7 lines
---
 meta/recipes-devtools/qemu/qemu.inc           |  1 +
 .../qemu/qemu/CVE-2022-35414.patch            | 53 +++++++++++++++++++
 2 files changed, 54 insertions(+)
 create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2022-35414.patch
Quoted 1 line

This isn't fixed in master yet?

Hi Hitendra,

Have you tried this patch on master branch? CVE-2022-35414 is the sole open CVE on master so it would be great to get this fixed there too!

Steve

#4 lore raw

PATCH 2/29 libtirpc: CVE-2021-46828 DoS vulnerability with lots of connections

In reply to Steve Sakoman

From: Hitendra Prajapati <[email protected]>

Source: http://git.linux-nfs.org/?p=steved/libtirpc.git;
MR: 120225
Type: Security Fix
Disposition: Backport from http://git.linux-nfs.org/?p=steved/libtirpc.git;a=commit;h=86529758570cef4c73fb9b9c4104fdc510f701ed
ChangeID: 29c32ee171a6a47e06c788e5c608fac9bb3a64b2
Description:
CVE-2021-46828 libtirpc: DoS vulnerability with lots of connections.

---
 .../libtirpc/libtirpc/CVE-2021-46828.patch    | 155 ++++++++++++++++++
 .../libtirpc/libtirpc_1.3.2.bb                |   4 +-
 2 files changed, 158 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-extended/libtirpc/libtirpc/CVE-2021-46828.patch
meta/recipes-extended/libtirpc/libtirpc/CVE-2021-46828.patch new file +155 -0
new file mode 100644
index 0000000000..3d5e5b8db9
@@ -0,0 +1,155 @@
+From 3ee23a0a5a8c2261e788acbee67722fcbecbea28 Mon Sep 17 00:00:00 2001
+From: Hitendra Prajapati <[email protected]>
+Date: Wed, 27 Jul 2022 17:34:21 +0530
+Subject: [PATCH] CVE-2021-46828
+
+Upstream-Status: Backport [http://git.linux-nfs.org/?p=steved/libtirpc.git;a=commit;h=86529758570cef4c73fb9b9c4104fdc510f701ed}
+CVE: CVE-2021-46828
+Signed-off-by: Hitendra Prajapati <[email protected]>
+---
+ src/svc.c    | 17 +++++++++++++-
+ src/svc_vc.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++-
+ 2 files changed, 77 insertions(+), 2 deletions(-)
+
+diff --git a/src/svc.c b/src/svc.c
+index 6db164b..3a8709f 100644
+--- a/src/svc.c
++++ b/src/svc.c
+@@ -57,7 +57,7 @@
+ 
+ #define max(a, b) (a > b ? a : b)
+ 
+-static SVCXPRT **__svc_xports;
++SVCXPRT **__svc_xports;
+ int __svc_maxrec;
+ 
+ /*
+@@ -194,6 +194,21 @@ __xprt_do_unregister (xprt, dolock)
+     rwlock_unlock (&svc_fd_lock);
+ }
+ 
++int
++svc_open_fds()
++{
++	int ix;
++	int nfds = 0;
++
++	rwlock_rdlock (&svc_fd_lock);
++	for (ix = 0; ix < svc_max_pollfd; ++ix) {
++		if (svc_pollfd[ix].fd != -1)
++			nfds++;
++	}
++	rwlock_unlock (&svc_fd_lock);
++	return (nfds);
++}
++
+ /*
+  * Add a service program to the callout list.
+  * The dispatch routine will be called when a rpc request for this
+diff --git a/src/svc_vc.c b/src/svc_vc.c
+index f1d9f00..3dc8a75 100644
+--- a/src/svc_vc.c
++++ b/src/svc_vc.c
+@@ -64,6 +64,8 @@
+ 
+ 
+ extern rwlock_t svc_fd_lock;
++extern SVCXPRT **__svc_xports;
++extern int svc_open_fds();
+ 
+ static SVCXPRT *makefd_xprt(int, u_int, u_int);
+ static bool_t rendezvous_request(SVCXPRT *, struct rpc_msg *);
+@@ -82,6 +84,7 @@ static void svc_vc_ops(SVCXPRT *);
+ static bool_t svc_vc_control(SVCXPRT *xprt, const u_int rq, void *in);
+ static bool_t svc_vc_rendezvous_control (SVCXPRT *xprt, const u_int rq,
+ 				   	     void *in);
++static int __svc_destroy_idle(int timeout);
+ 
+ struct cf_rendezvous { /* kept in xprt->xp_p1 for rendezvouser */
+ 	u_int sendsize;
+@@ -313,13 +316,14 @@ done:
+ 	return (xprt);
+ }
+ 
++
+ /*ARGSUSED*/
+ static bool_t
+ rendezvous_request(xprt, msg)
+ 	SVCXPRT *xprt;
+ 	struct rpc_msg *msg;
+ {
+-	int sock, flags;
++	int sock, flags, nfds, cnt;
+ 	struct cf_rendezvous *r;
+ 	struct cf_conn *cd;
+ 	struct sockaddr_storage addr;
+@@ -379,6 +383,16 @@ again:
+ 
+ 	gettimeofday(&cd->last_recv_time, NULL);
+ 
++	nfds = svc_open_fds();
++	if (nfds >= (_rpc_dtablesize() / 5) * 4) {
++		/* destroy idle connections */
++		cnt = __svc_destroy_idle(15);
++		if (cnt == 0) {
++			/* destroy least active */
++			__svc_destroy_idle(0);
++		}
++	}
++
+ 	return (FALSE); /* there is never an rpc msg to be processed */
+ }
+ 
+@@ -820,3 +834,49 @@ __svc_clean_idle(fd_set *fds, int timeout, bool_t cleanblock)
+ {
+ 	return FALSE;
+ }
++
++static int
++__svc_destroy_idle(int timeout)
++{
++	int i, ncleaned = 0;
++	SVCXPRT *xprt, *least_active;
++	struct timeval tv, tdiff, tmax;
++	struct cf_conn *cd;
++
++	gettimeofday(&tv, NULL);
++	tmax.tv_sec = tmax.tv_usec = 0;
++	least_active = NULL;
++	rwlock_wrlock(&svc_fd_lock);
++
++	for (i = 0; i <= svc_max_pollfd; i++) {
++		if (svc_pollfd[i].fd == -1)
++			continue;
++		xprt = __svc_xports[i];
++		if (xprt == NULL || xprt->xp_ops == NULL ||
++			xprt->xp_ops->xp_recv != svc_vc_recv)
++			continue;
++		cd = (struct cf_conn *)xprt->xp_p1;
++		if (!cd->nonblock)
++			continue;
++		if (timeout == 0) {
++			timersub(&tv, &cd->last_recv_time, &tdiff);
++			if (timercmp(&tdiff, &tmax, >)) {
++				tmax = tdiff;
++				least_active = xprt;
++			}
++			continue;
++		}
++		if (tv.tv_sec - cd->last_recv_time.tv_sec > timeout) {
++			__xprt_unregister_unlocked(xprt);
++			__svc_vc_dodestroy(xprt);
++			ncleaned++;
++		}
++	}
++	if (timeout == 0 && least_active != NULL) {
++		__xprt_unregister_unlocked(least_active);
++		__svc_vc_dodestroy(least_active);
++		ncleaned++;
++	}
++	rwlock_unlock(&svc_fd_lock);
++	return (ncleaned);
++}
+-- 
+2.25.1
+
meta/recipes-extended/libtirpc/libtirpc_1.3.2.bb +3 -1
index 45b3d2befc..66bc4ecdd1 100644
@@ -9,7 +9,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=f835cce8852481e4b2bbbdd23b5e47f3 \
 
 PROVIDES = "virtual/librpc"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.bz2"
+SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.bz2 \
+	   file://CVE-2021-46828.patch \
+	  "
 UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/libtirpc/files/libtirpc/"
 UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)/"
 SRC_URI[sha256sum] = "e24eb88b8ce7db3b7ca6eb80115dd1284abc5ec32a8deccfed2224fc2532b9fd"
Signature · 1 line
2.25.1
#5 lore raw

PATCH 3/29 mkfontscale: upgrade 1.2.1 -> 1.2.2

In reply to Steve Sakoman

From: wangmy <[email protected]>

CHanges:

Fix spelling/wording issues
gitlab CI: add a basic build test
Build xz tarballs instead of bzip2
Use case insensitive comparison for T1 font weight Add "ExtraBold" as a valid T1 font weight.

temporarily override SRC_URI which is hard-coded in xorg-app-common.inc since new versions of packages use a new compression format - .tar.xz

(cherry picked from commit 7ac5e224fe55db17651988435a569a8a25b6b09f)
---
 .../xorg-app/{mkfontscale_1.2.1.bb => mkfontscale_1.2.2.bb}  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
 rename meta/recipes-graphics/xorg-app/{mkfontscale_1.2.1.bb => mkfontscale_1.2.2.bb} (81%)
meta/recipes-graphics/xorg-app/mkfontscale_1.2.2.bb renamed from meta/recipes-graphics/xorg-app/mkfontscale_1.2.1.bb +3 -2
similarity index 81%
rename from meta/recipes-graphics/xorg-app/mkfontscale_1.2.1.bb
rename to meta/recipes-graphics/xorg-app/mkfontscale_1.2.2.bb
index 2d0c51a423..573b05128e 100644
@@ -15,7 +15,8 @@ RPROVIDES:${PN} += "mkfontdir"
 
 BBCLASSEXTEND = "native"
 
+SRC_URI = "${XORG_MIRROR}/individual/app/${BPN}-${PV}.tar.xz"
+
 LIC_FILES_CHKSUM = "file://COPYING;md5=99b1e1269aba5179139b9e4380fc0934"
 
-SRC_URI[md5sum] = "215940de158b1a3d8b3f8b442c606e2f"
-SRC_URI[sha256sum] = "ca0495eb974a179dd742bfa6199d561bda1c8da4a0c5a667f21fd82aaab6bac7"
+SRC_URI[sha256sum] = "8ae3fb5b1fe7436e1f565060acaa3e2918fe745b0e4979b5593968914fe2d5c4"
Signature · 1 line
2.25.1
#6 lore raw

PATCH 4/29 xdpyinfo: upgrade 1.3.2 -> 1.3.3

In reply to Steve Sakoman

From: wangmy <[email protected]>

Changes:

xdpyinfo: Fix printing the X.Org release version for xserver >= 21 Update README for gitlab migration
Update configure.ac bug URL for gitlab migration
Only check for XFree86 if vendor string doesn't match X.Org Add explicit casts to clear implicit conversion warnings Disable DMX support by default, leave --with-dmx to enable it gitlab CI: add a basic build test
Build xz tarballs instead of bzip2
Fix spelling/wording issues
gitlab CI: stop requiring Signed-off-by in commits autogen.sh: use quoted string variables
autogen: add default patch prefix
autogen.sh: use exec instead of waiting for configure to finish fix -Wunused-[...] compiler warnings

temporarily override SRC_URI which is hard-coded in xorg-app-common.inc since new versions of packages use a new compression format - .tar.xz

(cherry picked from commit 712552b5cc427d7be1258c45886de9b57f7272c9)
---
 .../xorg-app/{xdpyinfo_1.3.2.bb => xdpyinfo_1.3.3.bb}        | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
 rename meta/recipes-graphics/xorg-app/{xdpyinfo_1.3.2.bb => xdpyinfo_1.3.3.bb} (80%)
meta/recipes-graphics/xorg-app/xdpyinfo_1.3.3.bb renamed from meta/recipes-graphics/xorg-app/xdpyinfo_1.3.2.bb +3 -2
similarity index 80%
rename from meta/recipes-graphics/xorg-app/xdpyinfo_1.3.2.bb
rename to meta/recipes-graphics/xorg-app/xdpyinfo_1.3.3.bb
index 2d10b7acca..fa0fe36451 100644
@@ -8,13 +8,14 @@ predefined values for various parameters used in communicating between \
 clients and the server, and the different types of screens and visuals \
 that are available."
 
+SRC_URI = "${XORG_MIRROR}/individual/app/${BPN}-${PV}.tar.xz"
+
 LIC_FILES_CHKSUM = "file://COPYING;md5=f3d09e6b9e203a1af489e16c708f4fb3"
 DEPENDS += "libxtst libxext libxxf86vm libxi libxrender libxinerama libdmx libxau libxcomposite"
 PE = "1"
 
 SRC_URI += "file://disable-xkb.patch"
 
-SRC_URI[md5sum] = "8809037bd48599af55dad81c508b6b39"
-SRC_URI[sha256sum] = "30238ed915619e06ceb41721e5f747d67320555cc38d459e954839c189ccaf51"
+SRC_URI[sha256sum] = "356d5fd62f3e98ee36d6becf1b32d4ab6112d618339fb4b592ccffbd9e0fc206"
 
 EXTRA_OECONF = "--disable-xkb"
Signature · 1 line
2.25.1
#7 lore raw

PATCH 5/29 xorg-app: Tweak handling of compression changes in SRC_URI

In reply to Steve Sakoman

From: Richard Purdie <[email protected]>

Rather than duplicating SRC_URI, change the compression to a variable.

(cherry picked from commit 21547dd5319f27a8f7f20a80e39478f816b4bbe0)
---
 meta/recipes-graphics/xorg-app/mkfontscale_1.2.2.bb | 3 +--
 meta/recipes-graphics/xorg-app/xdpyinfo_1.3.3.bb    | 3 +--
 meta/recipes-graphics/xorg-app/xorg-app-common.inc  | 3 ++-
 meta/recipes-graphics/xorg-app/xrandr_1.5.1.bb      | 3 +--
 4 files changed, 5 insertions(+), 7 deletions(-)
meta/recipes-graphics/xorg-app/mkfontscale_1.2.2.bb +1 -2
index 573b05128e..cd658ab219 100644
@@ -15,8 +15,7 @@ RPROVIDES:${PN} += "mkfontdir"
 
 BBCLASSEXTEND = "native"
 
-SRC_URI = "${XORG_MIRROR}/individual/app/${BPN}-${PV}.tar.xz"
-
 LIC_FILES_CHKSUM = "file://COPYING;md5=99b1e1269aba5179139b9e4380fc0934"
 
+SRC_URI_EXT = "xz"
 SRC_URI[sha256sum] = "8ae3fb5b1fe7436e1f565060acaa3e2918fe745b0e4979b5593968914fe2d5c4"
meta/recipes-graphics/xorg-app/xdpyinfo_1.3.3.bb +1 -2
index fa0fe36451..e75a840b7d 100644
@@ -8,14 +8,13 @@ predefined values for various parameters used in communicating between \
 clients and the server, and the different types of screens and visuals \
 that are available."
 
-SRC_URI = "${XORG_MIRROR}/individual/app/${BPN}-${PV}.tar.xz"
-
 LIC_FILES_CHKSUM = "file://COPYING;md5=f3d09e6b9e203a1af489e16c708f4fb3"
 DEPENDS += "libxtst libxext libxxf86vm libxi libxrender libxinerama libdmx libxau libxcomposite"
 PE = "1"
 
 SRC_URI += "file://disable-xkb.patch"
 
+SRC_URI_EXT = "xz"
 SRC_URI[sha256sum] = "356d5fd62f3e98ee36d6becf1b32d4ab6112d618339fb4b592ccffbd9e0fc206"
 
 EXTRA_OECONF = "--disable-xkb"
meta/recipes-graphics/xorg-app/xorg-app-common.inc +2 -1
index 1c64e20aac..5dbe8abe86 100644
@@ -8,7 +8,8 @@ DEPENDS = "util-macros-native virtual/libx11"
 # depends on virtual/libx11
 REQUIRED_DISTRO_FEATURES = "x11"
 
-SRC_URI = "${XORG_MIRROR}/individual/app/${BPN}-${PV}.tar.bz2"
+SRC_URI_EXT = "bz2"
+SRC_URI = "${XORG_MIRROR}/individual/app/${BPN}-${PV}.tar.${SRC_URI_EXT}"
 
 inherit autotools pkgconfig features_check
 
meta/recipes-graphics/xorg-app/xrandr_1.5.1.bb +1 -2
index 57b43ff28c..0e0347f768 100644
@@ -11,8 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fe1608bdb33cf8c62a4438f7d34679b3"
 DEPENDS += "libxrandr libxrender"
 PE = "1"
 
-SRC_URI = "${XORG_MIRROR}/individual/app/${BPN}-${PV}.tar.xz"
-
+SRC_URI_EXT = "xz"
 SRC_URI[md5sum] = "fe40f7a4fd39dd3a02248d3e0b1972e4"
 SRC_URI[sha256sum] = "7bc76daf9d72f8aff885efad04ce06b90488a1a169d118dea8a2b661832e8762"
 
Signature · 1 line
2.25.1
#8 lore raw

PATCH 6/29 xev: update 1.2.4 -> 1.2.5

In reply to Steve Sakoman

From: Alexander Kanavin <[email protected]>

Changes:

gitlab CI: add a basic build test Build xz tarballs instead of bzip2
man page: remove out-of-date reference to X(7)
xev: fix KeymapNotify event printing

(cherry picked from commit 83c9b5aead195d933a43a4782428fdfa3eb51967)
---
 meta/recipes-graphics/xorg-app/{xev_1.2.4.bb => xev_1.2.5.bb} | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
 rename meta/recipes-graphics/xorg-app/{xev_1.2.4.bb => xev_1.2.5.bb} (81%)
meta/recipes-graphics/xorg-app/xev_1.2.5.bb renamed from meta/recipes-graphics/xorg-app/xev_1.2.4.bb +3 -1
similarity index 81%
rename from meta/recipes-graphics/xorg-app/xev_1.2.4.bb
rename to meta/recipes-graphics/xorg-app/xev_1.2.5.bb
index 9407fa65f1..0e3def6eee 100644
@@ -14,4 +14,6 @@ DEPENDS += "libxrandr xorgproto"
 
 SRC_URI += "file://diet-x11.patch"
 
-SRC_URI[sha256sum] = "d700e08bfe751ed2dbf802baa204b056d0e49348b6eb3c6f9cb035d8ae4885e2"
+SRC_URI[sha256sum] = "c9461a4389714e0f33974f9e75934bdc38d836a0f059b8dc089c7cbf2ce36ec1"
+
+SRC_URI_EXT = "xz"
Signature · 1 line
2.25.1
#9 lore raw

PATCH 7/29 xmodmap: update 1.0.10 -> 1.0.11

In reply to Steve Sakoman

From: Alexander Kanavin <[email protected]>

Changes:

gitlab CI: add a basic build test
Build xz tarballs instead of bzip2
handle.c: avoid leaks when realloc() fails
PrintModifierMapping: stop leaking the map returned by XGetKeyboardMapping Fix warning about number of mouse buttons

(cherry picked from commit 162f117428be2da12f2599870e980cbbc12ac2c4)
---
 .../xorg-app/{xmodmap_1.0.10.bb => xmodmap_1.0.11.bb}        | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
 rename meta/recipes-graphics/xorg-app/{xmodmap_1.0.10.bb => xmodmap_1.0.11.bb} (78%)
meta/recipes-graphics/xorg-app/xmodmap_1.0.11.bb renamed from meta/recipes-graphics/xorg-app/xmodmap_1.0.10.bb +3 -2
similarity index 78%
rename from meta/recipes-graphics/xorg-app/xmodmap_1.0.10.bb
rename to meta/recipes-graphics/xorg-app/xmodmap_1.0.11.bb
index 7dedb03a2b..dc955aa977 100644
@@ -12,5 +12,6 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=272c17e96370e1e74773fa22d9989621"
 
 PE = "1"
-SRC_URI[md5sum] = "51f1d30a525e9903280ffeea2744b1f6"
-SRC_URI[sha256sum] = "473f0941d7439d501bb895ff358832b936ec34c749b9704c37a15e11c318487c"
+SRC_URI[sha256sum] = "9a2f8168f7b0bc382828847403902cb6bf175e17658b36189eac87edda877e81"
+
+SRC_URI_EXT = "xz"
Signature · 1 line
2.25.1
#10 lore raw

PATCH 8/29 xf86-input-synaptics: update 1.9.1 -> 1.9.2

In reply to Steve Sakoman

From: Alexander Kanavin <[email protected]>

Changes:

Convert remaining source files from ISO-8859-1 to UTF-8 gitlab CI: add a basic build test
Fix spelling/wording issues
Build xz tarballs instead of bzip2
synclient: allow negative/large values for AreaLeftEdge etc.
eventcomm: fix compile with pre-time64 kernels
eventcomm: use 64-bit time safe accessors instead of timeval directly Use fabs() instead of abs() on double values.
Update configure.ac bug URL for gitlab migration
Update README for gitlab migration

Drop 64bit_time_t_support.patch as issue fixed upstream:
https://github.com/freedesktop/xorg-xf86-input-synaptics/commit/073b1b40bde9935928758c3452176c0d8dc67370

(cherry picked from commit 9d4d2c176cf33ced4d7d5c20178066abe1e9c4d3)
---
 .../64bit_time_t_support.patch                | 51 -------------------
 ...1.9.1.bb => xf86-input-synaptics_1.9.2.bb} |  7 ++-
 2 files changed, 3 insertions(+), 55 deletions(-)
 delete mode 100644 meta/recipes-graphics/xorg-driver/xf86-input-synaptics/64bit_time_t_support.patch
 rename meta/recipes-graphics/xorg-driver/{xf86-input-synaptics_1.9.1.bb => xf86-input-synaptics_1.9.2.bb} (74%)
meta/recipes-graphics/xorg-driver/xf86-input-synaptics/64bit_time_t_support.patch deleted +0 -51
deleted file mode 100644
index 4bb7fb3e23..0000000000
@@ -1,51 +0,0 @@
-This patch avoids using time field of input_event structure which is not available
-on 32bit arches supporting 64bit time_t structs, Patch makes it compatible with new
-and keeps old input.h implementation functional as well.
-
-See https://sourceware.org/glibc/wiki/Y2038ProofnessDesign
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <[email protected]>
-
---- a/src/eventcomm.c
-+++ b/src/eventcomm.c
-@@ -575,10 +575,12 @@ SynapticsReadEvent(InputInfoPtr pInfo, s
-         ev->type = EV_SYN;
-         ev->code = SYN_REPORT;
-         ev->value = 0;
--        ev->time = last_event_time;
--    } else if (ev->type == EV_SYN)
--        last_event_time = ev->time;
--
-+	ev->input_event_sec = last_event_time.tv_sec;
-+	ev->input_event_usec = last_event_time.tv_usec;
-+    } else if (ev->type == EV_SYN) {
-+        last_event_time.tv_sec = ev->input_event_sec;
-+        last_event_time.tv_usec = ev->input_event_usec;
-+    }
-     return TRUE;
- }
- 
-@@ -725,7 +727,7 @@ EventReadHwState(InputInfoPtr pInfo,
-             case SYN_REPORT:
-                 hw->numFingers = count_fingers(pInfo, comm);
-                 if (proto_data->have_monotonic_clock)
--                    hw->millis = 1000 * ev.time.tv_sec + ev.time.tv_usec / 1000;
-+                    hw->millis = 1000 * ev.input_event_sec + ev.input_event_usec / 1000;
-                 else
-                     hw->millis = GetTimeInMillis();
-                 SynapticsCopyHwState(hwRet, hw);
---- a/src/eventcomm.h
-+++ b/src/eventcomm.h
-@@ -34,6 +34,11 @@
- #include <xf86Xinput.h>
- #include "synproto.h"
- 
-+#ifndef input_event_sec
-+#define input_event_sec time.tv_sec
-+#define input_event_usec time.tv_usec
-+#endif
-+
- /* for auto-dev: */
- #define DEV_INPUT_EVENT "/dev/input"
- #define EVENT_DEV_NAME "event"
meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.9.2.bb renamed from meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.9.1.bb +3 -4
similarity index 74%
rename from meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.9.1.bb
rename to meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.9.2.bb
index 388350c96e..8e446290b2 100644
@@ -10,9 +10,8 @@ advanced features of the touchpad to become available."
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=55aacd3535a741824955c5eb8f061398"
 
-SRC_URI += "file://64bit_time_t_support.patch"
-
-SRC_URI[md5sum] = "cfb79d3c975151f9bbf30b727c260cb9"
-SRC_URI[sha256sum] = "7af83526eff1c76e8b9e1553b34245c203d029028d8044dd9dcf71eef1001576"
+SRC_URI[sha256sum] = "b8fa4aab913fc63754bbd6439e020658c412743a055201ddf212760593962c38"
 
 DEPENDS += "libxi mtdev libxtst libevdev"
+
+XORG_DRIVER_COMPRESSOR = ".tar.xz"
Signature · 1 line
2.25.1
#11 lore raw

PATCH 9/29 encodings: update 1.0.5 -> 1.0.6

In reply to Steve Sakoman

From: Alexander Kanavin <[email protected]>

CHanges:

gitlab CI: add a basic build test
Build xz tarballs instead of bzip2
adjust descriptions for the Unicode mapping to match the Unicode.org data file. add mapping for 0x80-0x9f, as per Unicode.org data files.
use descriptions from UnicodeData.txt except for two obsolete or incorrect maps correct a typo (in original), and use appropriate description
use Armenian eternity symbol from Unicode 6.
whitespace-only changes for consistency, using luit's annotate-enc script add descriptions from UnicodeData.txt, using annotate-enc
add descriptions from UnicodeData.txt, using annotate-enc
add descriptions from UnicodeData.txt, using annotate-enc
add descriptions from UnicodeData.txt, with annotate-enc
add descriptions from UnicodeData.txt, with annotate-enc whitespace-only, reformat with annotate-enc

Add ability to tweak compressor suffix in filenames, similar to xorg apps and drivers.

(cherry picked from commit b1fb0fbfbf0bcf50906a26421435d7165be64281)
---
 .../recipes-graphics/xorg-font/encodings/nocompiler.patch | 8 ++++----
 .../xorg-font/{encodings_1.0.5.bb => encodings_1.0.6.bb}  | 6 +++---
 meta/recipes-graphics/xorg-font/xorg-font-common.inc      | 3 ++-
 3 files changed, 9 insertions(+), 8 deletions(-)
 rename meta/recipes-graphics/xorg-font/{encodings_1.0.5.bb => encodings_1.0.6.bb} (78%)
meta/recipes-graphics/xorg-font/encodings/nocompiler.patch +4 -4
index ec7c7d80c1..9ee7abe775 100644
@@ -1,4 +1,4 @@
-From b08c43a0842076e0a94e88ad6456a9326cd7ffc9 Mon Sep 17 00:00:00 2001
+From 0c0790e90a68bf8290da5c0e57142bf7c620f039 Mon Sep 17 00:00:00 2001
 From: Richard Purdie <[email protected]>
 Date: Tue, 17 May 2011 23:03:02 +0000
 Subject: [PATCH] Improve handling of 'all' architecture recipes and their
@@ -21,12 +21,12 @@ RP 17/5/2011
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 622c27b..5ee84ed 100644
+index b80e3de..80208bb 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -3,12 +3,12 @@ AC_INIT([encodings], [1.0.5],
+@@ -3,12 +3,12 @@ AC_INIT([encodings], [1.0.6],
          [https://gitlab.freedesktop.org/xorg/font/encodings/issues])
- AM_INIT_AUTOMAKE([foreign dist-bzip2])
+ AM_INIT_AUTOMAKE([foreign dist-xz])
  
 -# Require xorg-macros: XORG_DEFAULT_OPTIONS
  m4_ifndef([XORG_MACROS_VERSION],
meta/recipes-graphics/xorg-font/encodings_1.0.6.bb renamed from meta/recipes-graphics/xorg-font/encodings_1.0.5.bb +3 -3
similarity index 78%
rename from meta/recipes-graphics/xorg-font/encodings_1.0.5.bb
rename to meta/recipes-graphics/xorg-font/encodings_1.0.6.bb
index 8ddbaf24dd..be82414eef 100644
@@ -7,14 +7,14 @@ require xorg-font-common.inc
 LICENSE = "PD"
 LIC_FILES_CHKSUM = "file://COPYING;md5=9da93f2daf2d5572faa2bfaf0dbd9e76"
 PE = "1"
-PR = "r3"
 
 DEPENDS = "mkfontscale-native mkfontdir-native font-util-native"
 RDEPENDS:${PN} = ""
 
 SRC_URI += "file://nocompiler.patch"
-SRC_URI[md5sum] = "bbae4f247b88ccde0e85ed6a403da22a"
-SRC_URI[sha256sum] = "bd96e16143a044b19e87f217cf6a3763a70c561d1076aad6f6d862ec41774a31"
+SRC_URI[sha256sum] = "77e301de661f35a622b18f60b555a7e7d8c4d5f43ed41410e830d5ac9084fc26"
+
+SRC_URI_EXT = "xz"
 
 inherit allarch
 
meta/recipes-graphics/xorg-font/xorg-font-common.inc +2 -1
index 2df23efed4..edf7cf7642 100644
@@ -9,7 +9,8 @@ RDEPENDS:${PN} = "encodings font-util font-alias"
 
 XORG_PN = "${BPN}"
 
-SRC_URI = "${XORG_MIRROR}/individual/font/${XORG_PN}-${PV}.tar.bz2"
+SRC_URI_EXT = "bz2"
+SRC_URI = "${XORG_MIRROR}/individual/font/${XORG_PN}-${PV}.tar.${SRC_URI_EXT}"
 S = "${WORKDIR}/${XORG_PN}-${PV}"
 
 inherit autotools pkgconfig features_check
Signature · 1 line
2.25.1
#12 lore raw

PATCH 10/29 font-util: update 1.3.2 -> 1.3.3

In reply to Steve Sakoman

From: Alexander Kanavin <[email protected]>

Changes:

ucs2any: avoid segfaults if SLANT property is missing
ucs2any: handle NULL returns from zquotedcpy() gitlab CI: add a basic build test
Build xz tarballs instead of bzip2
Fix spelling/wording issues

(cherry picked from commit 461b464eafa14719e1dbc087aad8cfbc8d1cf62e)
---
 .../xorg-font/{font-util_1.3.2.bb => font-util_1.3.3.bb}     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
 rename meta/recipes-graphics/xorg-font/{font-util_1.3.2.bb => font-util_1.3.3.bb} (84%)
meta/recipes-graphics/xorg-font/font-util_1.3.3.bb renamed from meta/recipes-graphics/xorg-font/font-util_1.3.2.bb +3 -2
similarity index 84%
rename from meta/recipes-graphics/xorg-font/font-util_1.3.2.bb
rename to meta/recipes-graphics/xorg-font/font-util_1.3.3.bb
index b3e832756b..64c705770d 100644
@@ -16,7 +16,8 @@ RDEPENDS:${PN}:class-native = ""
 
 BBCLASSEXTEND = "native"
 
-SRC_URI[md5sum] = "3d6adb76fdd072db8c8fae41b40855e8"
-SRC_URI[sha256sum] = "3ad880444123ac06a7238546fa38a2a6ad7f7e0cc3614de7e103863616522282"
+SRC_URI[sha256sum] = "e791c890779c40056ab63aaed5e031bb6e2890a98418ca09c534e6261a2eebd2"
 
 SYSROOT_DIRS_IGNORE:remove = "${datadir}/fonts"
+
+SRC_URI_EXT = "xz"
Signature · 1 line
2.25.1
#13 lore raw

PATCH 11/29 xserver-xorg: update 21.1.3 -> 21.1.4

In reply to Steve Sakoman

From: Alexander Kanavin <[email protected]>

Security update

CVE fixed in this release:

CVE-2022-2319/ZDI-CAN-16062: X.Org Server ProcXkbSetGeometry Out-Of-Bounds Access CVE-2022-2320/ZDI-CAN-16070: X.Org Server ProcXkbSetDeviceInfo Out-Of-Bounds Access

Changes:

present: Check for NULL to prevent crash
rootless: Dead code removal (ROOTLESS_REDISPLAY_DELAY is already defined)
X11Application: Ensure TIS operations are done on the main thread
os/connection: Improve abstraction for launchd secure sockets
xquartz: Create a separate category for organizing user preferences
xquartz pbproxy: Adopt NSUserDefaults+XQuartzDefaults for preferences
xquartz: Fold spaces related preferences into NSUserDefaults+XQuartzDefaults
XQuartz: Ensure scroll events are delivered to a single window (not both X11 and AppKit)
meson: Bump requirement to meson-0.50.0
xquartz: Update Sparkle configuration to use SUPublicEDKey
xquartz: Update copyright for 2022
meson: Provide options to set CFBundleVersion and CFBundleVersionString in XQuartz Revert "meson: Bump requirement to meson-0.50.0"
xquartz: Update autotools-based builds of XQuartz to account for recent changes
print_edid: Fix a format string error
xf86-input-inputtest: Fix build on systems without SOCK_NONBLOCK
tests: Fix build failure from missing micmap.c
meson: Support building Xnest and Xorg on darwin
XQuartz: Build the bundle trampoline when using meson
XQuartz: Add TCC reason keys to Info.plist
xquartz: Use correct defines when building to support Sparkle updates
xquartz: Fix a possible crash when editing the Application menu due to mutaing immutable arrays
XQuartz: Improve type safety for X11Controller's application menu editor
xquartz: Add missing files to distribution tarball
render: Fix build with gcc 12
xkb: switch to array index loops to moving pointers
xkb: swap XkbSetDeviceInfo and XkbSetDeviceInfoCheck
xkb: add request length validation for XkbSetGeometry
Revert "os: Try to discover the current seat with the XDG_SEAT var first"
dix: Correctly save replayed event into GrabInfoRec
dix: Don't send touch end to clients that do async grab without touches
xfree86: Fix event data alignment in inputtest driver
xkb: fix XkbSetMap when changing a keysym without changing a keytype

(cherry picked from commit d683f2a1fbe65b52d82f55a2e38aa75fc105a338)
---
 .../0001-render-Fix-build-with-gcc-12.patch   | 90 -------------------
 ...-xorg_21.1.3.bb => xserver-xorg_21.1.4.bb} |  7 +-
 2 files changed, 3 insertions(+), 94 deletions(-)
 delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-render-Fix-build-with-gcc-12.patch
 rename meta/recipes-graphics/xorg-xserver/{xserver-xorg_21.1.3.bb => xserver-xorg_21.1.4.bb} (79%)
meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-render-Fix-build-with-gcc-12.patch deleted +0 -90
deleted file mode 100644
index df9332fae7..0000000000
@@ -1,90 +0,0 @@
-From 12041ad0610f1345d6b9994c32943fd4dd01f65d Mon Sep 17 00:00:00 2001
-From: Olivier Fourdan <[email protected]>
-Date: Thu, 20 Jan 2022 10:20:38 +0100
-Subject: [PATCH] render: Fix build with gcc 12
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The xserver fails to compile with the latest gcc 12:
-
- render/picture.c: In function ‘CreateSolidPicture’:
- render/picture.c:874:26: error: array subscript ‘union _SourcePict[0]’ is partly outside array bounds of ‘unsigned char[16]’ [-Werror=array-bounds]
-  874 |     pPicture->pSourcePict->type = SourcePictTypeSolidFill;
-      |                          ^~
- render/picture.c:868:45: note: object of size 16 allocated by ‘malloc’
-  868 |     pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(PictSolidFill));
-      |                                             ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- render/picture.c: In function ‘CreateLinearGradientPicture’:
- render/picture.c:906:26: error: array subscript ‘union _SourcePict[0]’ is partly outside array bounds of ‘unsigned char[32]’ [-Werror=array-bounds]
-  906 |     pPicture->pSourcePict->linear.type = SourcePictTypeLinear;
-      |                          ^~
- render/picture.c:899:45: note: object of size 32 allocated by ‘malloc’
-  899 |     pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(PictLinearGradient));
-      |                                             ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- render/picture.c: In function ‘CreateConicalGradientPicture’:
- render/picture.c:989:26: error: array subscript ‘union _SourcePict[0]’ is partly outside array bounds of ‘unsigned char[32]’ [-Werror=array-bounds]
-  989 |     pPicture->pSourcePict->conical.type = SourcePictTypeConical;
-      |                          ^~
- render/picture.c:982:45: note: object of size 32 allocated by ‘malloc’
-  982 |     pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(PictConicalGradient));
-      |                                             ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- cc1: some warnings being treated as errors
- ninja: build stopped: subcommand failed.
-
-This is because gcc 12 has become stricter and raises a warning now.
-
-Fix the warning/error by allocating enough memory to store the union
-struct.
-
-Upstream-Status: Backport [https://gitlab.freedesktop.org/xorg/xserver/-/commit/c6b0dcb82d4db07a2f32c09a8c09c85a5f57248e]
-Signed-off-by: Olivier Fourdan <[email protected]>
-Acked-by: Michel Dänzer <[email protected]>
-Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1256
----
- render/picture.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/render/picture.c b/render/picture.c
-index afa0d25..2be4b19 100644
---- a/render/picture.c
-+++ b/render/picture.c
-@@ -865,7 +865,7 @@ CreateSolidPicture(Picture pid, xRenderColor * color, int *error)
-     }
- 
-     pPicture->id = pid;
--    pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(PictSolidFill));
-+    pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(SourcePict));
-     if (!pPicture->pSourcePict) {
-         *error = BadAlloc;
-         free(pPicture);
-@@ -896,7 +896,7 @@ CreateLinearGradientPicture(Picture pid, xPointFixed * p1, xPointFixed * p2,
-     }
- 
-     pPicture->id = pid;
--    pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(PictLinearGradient));
-+    pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(SourcePict));
-     if (!pPicture->pSourcePict) {
-         *error = BadAlloc;
-         free(pPicture);
-@@ -936,7 +936,7 @@ CreateRadialGradientPicture(Picture pid, xPointFixed * inner,
-     }
- 
-     pPicture->id = pid;
--    pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(PictRadialGradient));
-+    pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(SourcePict));
-     if (!pPicture->pSourcePict) {
-         *error = BadAlloc;
-         free(pPicture);
-@@ -979,7 +979,7 @@ CreateConicalGradientPicture(Picture pid, xPointFixed * center, xFixed angle,
-     }
- 
-     pPicture->id = pid;
--    pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(PictConicalGradient));
-+    pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(SourcePict));
-     if (!pPicture->pSourcePict) {
-         *error = BadAlloc;
-         free(pPicture);
--- 
-2.35.1
-
meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.4.bb renamed from meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.3.bb +3 -4
similarity index 79%
rename from meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.3.bb
rename to meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.4.bb
index 1f53ab5177..b9cbc9989e 100644
@@ -1,10 +1,9 @@
 require xserver-xorg.inc
 
 SRC_URI += "file://0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.patch \
-            file://0001-Avoid-duplicate-definitions-of-IOPortBase.patch \
-            file://0001-render-Fix-build-with-gcc-12.patch \
-            "
-SRC_URI[sha256sum] = "61d6aad5b6b47a116b960bd7f0cba4ee7e6da95d6bb0b127bde75d7d1acdebe5"
+           file://0001-Avoid-duplicate-definitions-of-IOPortBase.patch \
+           "
+SRC_URI[sha256sum] = "5cc4be8ee47edb58d4a90e603a59d56b40291ad38371b0bd2471fc3cbee1c587"
 
 # These extensions are now integrated into the server, so declare the migration
 # path for in-place upgrades.
Signature · 1 line
2.25.1
#14 lore raw

Re: [OE-core][kirkstone 11/29] xserver-xorg: update 21.1.3 -> 21.1.4

Quoted 5 lines · Steve Sakoman

From: Alexander Kanavin <[email protected]>

Security update

With this update we're getting:

Parsing recipes...WARNING:
/tmp/workspace.Pvlp4fXTtK/oe-core/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.4.bb:
Exception during build_dependencies for AUTOREV
WARNING: /tmp/workspace.Pvlp4fXTtK/oe-core/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.4.bb:
Error during finalise of /tmp/workspace.Pvlp4fXTtK/oe-core/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.4.bb
ERROR: ExpansionError during parsing /tmp/workspace.Pvlp4fXTtK/oe-core/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.4.bb Traceback (most recent call last):
File "/tmp/workspace.Pvlp4fXTtK/bitbake/lib/bb/fetch2/git.py", line
249, in Git.urldata_init(ud=<bb.fetch2.FetchData object at
0x7fc0cb054970>, d=<bb.data_smart.DataSmart object at
0x7fc0cafbd0d0>):

Quoted 1 line

ud.setup_revisions(d)

File "/tmp/workspace.Pvlp4fXTtK/bitbake/lib/bb/fetch2/__init__.py", line 1347, in FetchData.setup_revisions(d=<bb.data_smart.DataSmart object at 0x7fc0cafbd0d0>):
for name in self.names:

Quoted 1 line

self.revisions[name] = srcrev_internal_helper(self, d, name)

File "/tmp/workspace.Pvlp4fXTtK/bitbake/lib/bb/fetch2/__init__.py", line 1212, in srcrev_internal_helper(ud=<bb.fetch2.FetchData object at 0x7fc0cb054970>, d=<bb.data_smart.DataSmart object at 0x7fc0cafbd0d0>, name='default'):
if srcrev == "AUTOINC":

Quoted 1 line

srcrev = ud.method.latest_revision(ud, d, name)

File "/tmp/workspace.Pvlp4fXTtK/bitbake/lib/bb/fetch2/__init__.py", line 1624, in Git.latest_revision(ud=<bb.fetch2.FetchData object at 0x7fc0cb054970>, d=<bb.data_smart.DataSmart object at 0x7fc0cafbd0d0>, name='default'):
except KeyError:

Quoted 1 line

revs[key] = rev = self._latest_revision(ud, d, name)

return rev
File "/tmp/workspace.Pvlp4fXTtK/bitbake/lib/bb/fetch2/git.py", line 752, in Git._latest_revision(ud=<bb.fetch2.FetchData object at 0x7fc0cb054970>, d=<bb.data_smart.DataSmart object at 0x7fc0cafbd0d0>, name='default'):
return sha1

Quoted 1 line

raise bb.fetch2.FetchError("Unable to resolve '%s' in upstream git repository in git ls-remote output for %s" % \

(ud.unresolvedrev[name], ud.host+ud.path)) bb.data_smart.ExpansionError: Failure expanding variable SRCPV, expression was ${@bb.fetch2.get_srcrev(d)} which triggered exception
FetchError: Fetcher failure: Unable to resolve '21.1.4_2022_05_23' in upstream git repository in git ls-remote output for github.com/JeffyCN/xorg-xserver
The variable dependency chain for the failure is: SRCPV -> AUTOREV[vardepvalue]

Kind regards,
Marta

#15 lore raw

Re: [OE-core][kirkstone 11/29] xserver-xorg: update 21.1.3 -> 21.1.4

Quoted 47 lines · Marta Rybczynska
Quoted 5 lines · Steve Sakoman

From: Alexander Kanavin <[email protected]>

Security update

With this update we're getting:

Parsing recipes...WARNING:
/tmp/workspace.Pvlp4fXTtK/oe-core/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.4.bb:
Exception during build_dependencies for AUTOREV
WARNING: /tmp/workspace.Pvlp4fXTtK/oe-core/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.4.bb:
Error during finalise of /tmp/workspace.Pvlp4fXTtK/oe-core/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.4.bb
ERROR: ExpansionError during parsing /tmp/workspace.Pvlp4fXTtK/oe-core/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.4.bb Traceback (most recent call last):
File "/tmp/workspace.Pvlp4fXTtK/bitbake/lib/bb/fetch2/git.py", line
249, in Git.urldata_init(ud=<bb.fetch2.FetchData object at
0x7fc0cb054970>, d=<bb.data_smart.DataSmart object at
0x7fc0cafbd0d0>):

Quoted 1 line

ud.setup_revisions(d)

File "/tmp/workspace.Pvlp4fXTtK/bitbake/lib/bb/fetch2/__init__.py", line 1347, in FetchData.setup_revisions(d=<bb.data_smart.DataSmart object at 0x7fc0cafbd0d0>):
for name in self.names:

Quoted 1 line

self.revisions[name] = srcrev_internal_helper(self, d, name)

File "/tmp/workspace.Pvlp4fXTtK/bitbake/lib/bb/fetch2/__init__.py", line 1212, in srcrev_internal_helper(ud=<bb.fetch2.FetchData object at 0x7fc0cb054970>, d=<bb.data_smart.DataSmart object at 0x7fc0cafbd0d0>, name='default'):
if srcrev == "AUTOINC":

Quoted 1 line

srcrev = ud.method.latest_revision(ud, d, name)

File "/tmp/workspace.Pvlp4fXTtK/bitbake/lib/bb/fetch2/__init__.py", line 1624, in Git.latest_revision(ud=<bb.fetch2.FetchData object at 0x7fc0cb054970>, d=<bb.data_smart.DataSmart object at 0x7fc0cafbd0d0>, name='default'):
except KeyError:

Quoted 1 line

revs[key] = rev = self._latest_revision(ud, d, name)

return rev
File "/tmp/workspace.Pvlp4fXTtK/bitbake/lib/bb/fetch2/git.py", line 752, in Git._latest_revision(ud=<bb.fetch2.FetchData object at 0x7fc0cb054970>, d=<bb.data_smart.DataSmart object at 0x7fc0cafbd0d0>, name='default'):
return sha1

Quoted 9 lines
Quoted 1 line

raise bb.fetch2.FetchError("Unable to resolve '%s' in upstream git repository in git ls-remote output for %s" % \

(ud.unresolvedrev[name], ud.host+ud.path)) bb.data_smart.ExpansionError: Failure expanding variable SRCPV, expression was ${@bb.fetch2.get_srcrev(d)} which triggered exception
FetchError: Fetcher failure: Unable to resolve '21.1.4_2022_05_23' in upstream git repository in git ls-remote output for github.com/JeffyCN/xorg-xserver
The variable dependency chain for the failure is: SRCPV -> AUTOREV[vardepvalue]

Additional information: it happens on zephyr and freertos builds.

Regards,
Marta

#16 lore raw

Re: [OE-core][kirkstone 11/29] xserver-xorg: update 21.1.3 -> 21.1.4

Quoted 58 lines · Marta Rybczynska
Quoted 47 lines · Marta Rybczynska
Quoted 5 lines · Steve Sakoman

From: Alexander Kanavin <[email protected]>

Security update

With this update we're getting:

Parsing recipes...WARNING:
/tmp/workspace.Pvlp4fXTtK/oe-core/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.4.bb:
Exception during build_dependencies for AUTOREV
WARNING: /tmp/workspace.Pvlp4fXTtK/oe-core/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.4.bb:
Error during finalise of /tmp/workspace.Pvlp4fXTtK/oe-core/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.4.bb
ERROR: ExpansionError during parsing /tmp/workspace.Pvlp4fXTtK/oe-core/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.4.bb Traceback (most recent call last):
File "/tmp/workspace.Pvlp4fXTtK/bitbake/lib/bb/fetch2/git.py", line
249, in Git.urldata_init(ud=<bb.fetch2.FetchData object at
0x7fc0cb054970>, d=<bb.data_smart.DataSmart object at
0x7fc0cafbd0d0>):

Quoted 1 line

ud.setup_revisions(d)

File "/tmp/workspace.Pvlp4fXTtK/bitbake/lib/bb/fetch2/__init__.py", line 1347, in FetchData.setup_revisions(d=<bb.data_smart.DataSmart object at 0x7fc0cafbd0d0>):
for name in self.names:

Quoted 1 line

self.revisions[name] = srcrev_internal_helper(self, d, name)

File "/tmp/workspace.Pvlp4fXTtK/bitbake/lib/bb/fetch2/__init__.py", line 1212, in srcrev_internal_helper(ud=<bb.fetch2.FetchData object at 0x7fc0cb054970>, d=<bb.data_smart.DataSmart object at 0x7fc0cafbd0d0>, name='default'):
if srcrev == "AUTOINC":

Quoted 1 line

srcrev = ud.method.latest_revision(ud, d, name)

File "/tmp/workspace.Pvlp4fXTtK/bitbake/lib/bb/fetch2/__init__.py", line 1624, in Git.latest_revision(ud=<bb.fetch2.FetchData object at 0x7fc0cb054970>, d=<bb.data_smart.DataSmart object at 0x7fc0cafbd0d0>, name='default'):
except KeyError:

Quoted 1 line

revs[key] = rev = self._latest_revision(ud, d, name)

return rev
File "/tmp/workspace.Pvlp4fXTtK/bitbake/lib/bb/fetch2/git.py", line 752, in Git._latest_revision(ud=<bb.fetch2.FetchData object at 0x7fc0cb054970>, d=<bb.data_smart.DataSmart object at 0x7fc0cafbd0d0>, name='default'):
return sha1

Quoted 9 lines
Quoted 1 line

raise bb.fetch2.FetchError("Unable to resolve '%s' in upstream git repository in git ls-remote output for %s" % \

(ud.unresolvedrev[name], ud.host+ud.path)) bb.data_smart.ExpansionError: Failure expanding variable SRCPV, expression was ${@bb.fetch2.get_srcrev(d)} which triggered exception
FetchError: Fetcher failure: Unable to resolve '21.1.4_2022_05_23' in upstream git repository in git ls-remote output for github.com/JeffyCN/xorg-xserver
The variable dependency chain for the failure is: SRCPV -> AUTOREV[vardepvalue]

Quoted 1 line

Additional information: it happens on zephyr and freertos builds.

Do you see this on master too? Since this is a backport it would be interesting to see if it fails there too.

Steve

#17 lore raw

Re: [OE-core][kirkstone 11/29] xserver-xorg: update 21.1.3 -> 21.1.4

In reply to Marta Rybczynska
Quoted 47 lines · Marta Rybczynska
Quoted 5 lines · Steve Sakoman

From: Alexander Kanavin <[email protected]>

Security update

With this update we're getting:

Parsing recipes...WARNING:
/tmp/workspace.Pvlp4fXTtK/oe-core/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.4.bb:
Exception during build_dependencies for AUTOREV
WARNING: /tmp/workspace.Pvlp4fXTtK/oe-core/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.4.bb:
Error during finalise of /tmp/workspace.Pvlp4fXTtK/oe-core/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.4.bb
ERROR: ExpansionError during parsing /tmp/workspace.Pvlp4fXTtK/oe-core/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.4.bb Traceback (most recent call last):
File "/tmp/workspace.Pvlp4fXTtK/bitbake/lib/bb/fetch2/git.py", line
249, in Git.urldata_init(ud=<bb.fetch2.FetchData object at
0x7fc0cb054970>, d=<bb.data_smart.DataSmart object at
0x7fc0cafbd0d0>):

Quoted 1 line

ud.setup_revisions(d)

File "/tmp/workspace.Pvlp4fXTtK/bitbake/lib/bb/fetch2/__init__.py", line 1347, in FetchData.setup_revisions(d=<bb.data_smart.DataSmart object at 0x7fc0cafbd0d0>):
for name in self.names:

Quoted 1 line

self.revisions[name] = srcrev_internal_helper(self, d, name)

File "/tmp/workspace.Pvlp4fXTtK/bitbake/lib/bb/fetch2/__init__.py", line 1212, in srcrev_internal_helper(ud=<bb.fetch2.FetchData object at 0x7fc0cb054970>, d=<bb.data_smart.DataSmart object at 0x7fc0cafbd0d0>, name='default'):
if srcrev == "AUTOINC":

Quoted 1 line

srcrev = ud.method.latest_revision(ud, d, name)

File "/tmp/workspace.Pvlp4fXTtK/bitbake/lib/bb/fetch2/__init__.py", line 1624, in Git.latest_revision(ud=<bb.fetch2.FetchData object at 0x7fc0cb054970>, d=<bb.data_smart.DataSmart object at 0x7fc0cafbd0d0>, name='default'):
except KeyError:

Quoted 1 line

revs[key] = rev = self._latest_revision(ud, d, name)

return rev
File "/tmp/workspace.Pvlp4fXTtK/bitbake/lib/bb/fetch2/git.py", line 752, in Git._latest_revision(ud=<bb.fetch2.FetchData object at 0x7fc0cb054970>, d=<bb.data_smart.DataSmart object at 0x7fc0cafbd0d0>, name='default'):
return sha1

Quoted 7 lines
Quoted 1 line

raise bb.fetch2.FetchError("Unable to resolve '%s' in upstream git repository in git ls-remote output for %s" % \

(ud.unresolvedrev[name], ud.host+ud.path)) bb.data_smart.ExpansionError: Failure expanding variable SRCPV, expression was ${@bb.fetch2.get_srcrev(d)} which triggered exception
FetchError: Fetcher failure: Unable to resolve '21.1.4_2022_05_23' in upstream git repository in git ls-remote output for github.com/JeffyCN/xorg-xserver

Is there a bbappend to xserver-xorg somewhere in your layers?

The recipe in core is building from a tarball fetched from
https://www.x.org/releases/

It appears that a bbappend is changing this to look in github.com/JeffyCN/xorg-xserver, which doesn't have 21.1.4

So my best guess is that the issue is with a bbappend in some other layer, not with this patch in oe-core.

Steve

Quoted 1 line

The variable dependency chain for the failure is: SRCPV -> AUTOREV[vardepvalue]

A message that is not in the archive (sent off-list or not yet received): [email protected]

#19 lore raw

Re: [OE-core][kirkstone 11/29] xserver-xorg: update 21.1.3 -> 21.1.4

Quoted 59 lines · Steve Sakoman via lists.openembedded.org
Quoted 47 lines · Marta Rybczynska
Quoted 5 lines · Steve Sakoman

From: Alexander Kanavin <[email protected]>

Security update

With this update we're getting:

Parsing recipes...WARNING:
/tmp/workspace.Pvlp4fXTtK/oe-core/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.4.bb:
Exception during build_dependencies for AUTOREV
WARNING: /tmp/workspace.Pvlp4fXTtK/oe-core/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.4.bb:
Error during finalise of /tmp/workspace.Pvlp4fXTtK/oe-core/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.4.bb
ERROR: ExpansionError during parsing /tmp/workspace.Pvlp4fXTtK/oe-core/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.4.bb Traceback (most recent call last):
File "/tmp/workspace.Pvlp4fXTtK/bitbake/lib/bb/fetch2/git.py", line
249, in Git.urldata_init(ud=<bb.fetch2.FetchData object at
0x7fc0cb054970>, d=<bb.data_smart.DataSmart object at
0x7fc0cafbd0d0>):

Quoted 1 line

ud.setup_revisions(d)

File "/tmp/workspace.Pvlp4fXTtK/bitbake/lib/bb/fetch2/__init__.py", line 1347, in FetchData.setup_revisions(d=<bb.data_smart.DataSmart object at 0x7fc0cafbd0d0>):
for name in self.names:

Quoted 1 line

self.revisions[name] = srcrev_internal_helper(self, d, name)

File "/tmp/workspace.Pvlp4fXTtK/bitbake/lib/bb/fetch2/__init__.py", line 1212, in srcrev_internal_helper(ud=<bb.fetch2.FetchData object at 0x7fc0cb054970>, d=<bb.data_smart.DataSmart object at 0x7fc0cafbd0d0>, name='default'):
if srcrev == "AUTOINC":

Quoted 1 line

srcrev = ud.method.latest_revision(ud, d, name)

File "/tmp/workspace.Pvlp4fXTtK/bitbake/lib/bb/fetch2/__init__.py", line 1624, in Git.latest_revision(ud=<bb.fetch2.FetchData object at 0x7fc0cb054970>, d=<bb.data_smart.DataSmart object at 0x7fc0cafbd0d0>, name='default'):
except KeyError:

Quoted 1 line

revs[key] = rev = self._latest_revision(ud, d, name)

return rev
File "/tmp/workspace.Pvlp4fXTtK/bitbake/lib/bb/fetch2/git.py", line 752, in Git._latest_revision(ud=<bb.fetch2.FetchData object at 0x7fc0cb054970>, d=<bb.data_smart.DataSmart object at 0x7fc0cafbd0d0>, name='default'):
return sha1

Quoted 7 lines
Quoted 1 line

raise bb.fetch2.FetchError("Unable to resolve '%s' in upstream git repository in git ls-remote output for %s" % \

(ud.unresolvedrev[name], ud.host+ud.path)) bb.data_smart.ExpansionError: Failure expanding variable SRCPV, expression was ${@bb.fetch2.get_srcrev(d)} which triggered exception
FetchError: Fetcher failure: Unable to resolve '21.1.4_2022_05_23' in upstream git repository in git ls-remote output for github.com/JeffyCN/xorg-xserver

Is there a bbappend to xserver-xorg somewhere in your layers?

Quoted 8 lines

The recipe in core is building from a tarball fetched from
https://www.x.org/releases/

It appears that a bbappend is changing this to look in github.com/JeffyCN/xorg-xserver, which doesn't have 21.1.4

So my best guess is that the issue is with a bbappend in some other layer, not with this patch in oe-core.

I'm going to guess you've included meta-rockchip in your build which does include this bbappend:

https://github.com/JeffyCN/meta-rockchip/blob/master/recipes-graphics/xorg-xserver/xserver-xorg_%25.bbappend

That's where github.com/JeffyCN/xorg-xserver and the AUTOREV are coming from.

Steve

#20 lore raw

Re: [OE-core][kirkstone 11/29] xserver-xorg: update 21.1.3 -> 21.1.4

Quoted 72 lines · Steve Sakoman
Quoted 59 lines · Steve Sakoman via lists.openembedded.org
Quoted 47 lines · Marta Rybczynska
Quoted 5 lines · Steve Sakoman

From: Alexander Kanavin <[email protected]>

Security update

With this update we're getting:

Parsing recipes...WARNING:
/tmp/workspace.Pvlp4fXTtK/oe-core/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.4.bb:
Exception during build_dependencies for AUTOREV
WARNING: /tmp/workspace.Pvlp4fXTtK/oe-core/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.4.bb:
Error during finalise of /tmp/workspace.Pvlp4fXTtK/oe-core/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.4.bb
ERROR: ExpansionError during parsing /tmp/workspace.Pvlp4fXTtK/oe-core/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.4.bb Traceback (most recent call last):
File "/tmp/workspace.Pvlp4fXTtK/bitbake/lib/bb/fetch2/git.py", line
249, in Git.urldata_init(ud=<bb.fetch2.FetchData object at
0x7fc0cb054970>, d=<bb.data_smart.DataSmart object at
0x7fc0cafbd0d0>):

Quoted 1 line

ud.setup_revisions(d)

File "/tmp/workspace.Pvlp4fXTtK/bitbake/lib/bb/fetch2/__init__.py", line 1347, in FetchData.setup_revisions(d=<bb.data_smart.DataSmart object at 0x7fc0cafbd0d0>):
for name in self.names:

Quoted 1 line

self.revisions[name] = srcrev_internal_helper(self, d, name)

File "/tmp/workspace.Pvlp4fXTtK/bitbake/lib/bb/fetch2/__init__.py", line 1212, in srcrev_internal_helper(ud=<bb.fetch2.FetchData object at 0x7fc0cb054970>, d=<bb.data_smart.DataSmart object at 0x7fc0cafbd0d0>, name='default'):
if srcrev == "AUTOINC":

Quoted 1 line

srcrev = ud.method.latest_revision(ud, d, name)

File "/tmp/workspace.Pvlp4fXTtK/bitbake/lib/bb/fetch2/__init__.py", line 1624, in Git.latest_revision(ud=<bb.fetch2.FetchData object at 0x7fc0cb054970>, d=<bb.data_smart.DataSmart object at 0x7fc0cafbd0d0>, name='default'):
except KeyError:

Quoted 1 line

revs[key] = rev = self._latest_revision(ud, d, name)

return rev
File "/tmp/workspace.Pvlp4fXTtK/bitbake/lib/bb/fetch2/git.py", line 752, in Git._latest_revision(ud=<bb.fetch2.FetchData object at 0x7fc0cb054970>, d=<bb.data_smart.DataSmart object at 0x7fc0cafbd0d0>, name='default'):
return sha1

Quoted 7 lines
Quoted 1 line

raise bb.fetch2.FetchError("Unable to resolve '%s' in upstream git repository in git ls-remote output for %s" % \

(ud.unresolvedrev[name], ud.host+ud.path)) bb.data_smart.ExpansionError: Failure expanding variable SRCPV, expression was ${@bb.fetch2.get_srcrev(d)} which triggered exception
FetchError: Fetcher failure: Unable to resolve '21.1.4_2022_05_23' in upstream git repository in git ls-remote output for github.com/JeffyCN/xorg-xserver

Is there a bbappend to xserver-xorg somewhere in your layers?

Quoted 8 lines

The recipe in core is building from a tarball fetched from
https://www.x.org/releases/

It appears that a bbappend is changing this to look in github.com/JeffyCN/xorg-xserver, which doesn't have 21.1.4

So my best guess is that the issue is with a bbappend in some other layer, not with this patch in oe-core.

Quoted 7 lines

I'm going to guess you've included meta-rockchip in your build which does include this bbappend:

https://github.com/JeffyCN/meta-rockchip/blob/master/recipes-graphics/xorg-xserver/xserver-xorg_%25.bbappend

That's where github.com/JeffyCN/xorg-xserver and the AUTOREV are coming from.

Oh my yes. I was grepping around in meta-zephyr as it fails only there.

Marta

#21 lore raw

Re: [OE-core][kirkstone 11/29] xserver-xorg: update 21.1.3 -> 21.1.4

Quoted 77 lines · Marta Rybczynska
Quoted 75 lines · Steve Sakoman
Quoted 59 lines · Steve Sakoman via lists.openembedded.org
Quoted 47 lines · Marta Rybczynska
Quoted 5 lines · Steve Sakoman

From: Alexander Kanavin <[email protected]>

Security update

With this update we're getting:

Parsing recipes...WARNING:
/tmp/workspace.Pvlp4fXTtK/oe-core/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.4.bb:
Exception during build_dependencies for AUTOREV
WARNING: /tmp/workspace.Pvlp4fXTtK/oe-core/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.4.bb:
Error during finalise of /tmp/workspace.Pvlp4fXTtK/oe-core/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.4.bb
ERROR: ExpansionError during parsing /tmp/workspace.Pvlp4fXTtK/oe-core/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.4.bb Traceback (most recent call last):
File "/tmp/workspace.Pvlp4fXTtK/bitbake/lib/bb/fetch2/git.py", line
249, in Git.urldata_init(ud=<bb.fetch2.FetchData object at
0x7fc0cb054970>, d=<bb.data_smart.DataSmart object at
0x7fc0cafbd0d0>):

Quoted 1 line

ud.setup_revisions(d)

File "/tmp/workspace.Pvlp4fXTtK/bitbake/lib/bb/fetch2/__init__.py", line 1347, in FetchData.setup_revisions(d=<bb.data_smart.DataSmart object at 0x7fc0cafbd0d0>):
for name in self.names:

Quoted 1 line

self.revisions[name] = srcrev_internal_helper(self, d, name)

File "/tmp/workspace.Pvlp4fXTtK/bitbake/lib/bb/fetch2/__init__.py", line 1212, in srcrev_internal_helper(ud=<bb.fetch2.FetchData object at 0x7fc0cb054970>, d=<bb.data_smart.DataSmart object at 0x7fc0cafbd0d0>, name='default'):
if srcrev == "AUTOINC":

Quoted 1 line

srcrev = ud.method.latest_revision(ud, d, name)

File "/tmp/workspace.Pvlp4fXTtK/bitbake/lib/bb/fetch2/__init__.py", line 1624, in Git.latest_revision(ud=<bb.fetch2.FetchData object at 0x7fc0cb054970>, d=<bb.data_smart.DataSmart object at 0x7fc0cafbd0d0>, name='default'):
except KeyError:

Quoted 1 line

revs[key] = rev = self._latest_revision(ud, d, name)

return rev
File "/tmp/workspace.Pvlp4fXTtK/bitbake/lib/bb/fetch2/git.py", line 752, in Git._latest_revision(ud=<bb.fetch2.FetchData object at 0x7fc0cb054970>, d=<bb.data_smart.DataSmart object at 0x7fc0cafbd0d0>, name='default'):
return sha1

Quoted 7 lines
Quoted 1 line

raise bb.fetch2.FetchError("Unable to resolve '%s' in upstream git repository in git ls-remote output for %s" % \

(ud.unresolvedrev[name], ud.host+ud.path)) bb.data_smart.ExpansionError: Failure expanding variable SRCPV, expression was ${@bb.fetch2.get_srcrev(d)} which triggered exception
FetchError: Fetcher failure: Unable to resolve '21.1.4_2022_05_23' in upstream git repository in git ls-remote output for github.com/JeffyCN/xorg-xserver

Is there a bbappend to xserver-xorg somewhere in your layers?

Quoted 8 lines

The recipe in core is building from a tarball fetched from
https://www.x.org/releases/

It appears that a bbappend is changing this to look in github.com/JeffyCN/xorg-xserver, which doesn't have 21.1.4

So my best guess is that the issue is with a bbappend in some other layer, not with this patch in oe-core.

I'm going to guess you've included meta-rockchip in your build which does include this bbappend:

Quoted 6 lines
Quoted 4 lines

https://github.com/JeffyCN/meta-rockchip/blob/master/recipes-graphics/xorg-xserver/xserver-xorg_%25.bbappend

That's where github.com/JeffyCN/xorg-xserver and the AUTOREV are coming from.

Oh my yes. I was grepping around in meta-zephyr as it fails only there.

I'm not going to hold up this patch based on the meta-rockchip bbappend. IMHO the use of a fork of xserver-xorg and an AUTOREV is beyond the scope of what the LTS should deal with!

Steve

#22 lore raw

PATCH 12/29 linux-firmware: update 20220610 -> 20220708

In reply to Steve Sakoman

From: Alexander Kanavin <[email protected]>

License-Update: a few obsolete firmware were dropped (particularly i2400m and tda7706), file list updates.

(cherry picked from commit e89fb37e13fcb832ee7d35e7d92d45eaca20689e)
---
 ...mware_20220610.bb => linux-firmware_20220708.bb} | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)
 rename meta/recipes-kernel/linux-firmware/{linux-firmware_20220610.bb => linux-firmware_20220708.bb} (98%)
meta/recipes-kernel/linux-firmware/linux-firmware_20220708.bb renamed from meta/recipes-kernel/linux-firmware/linux-firmware_20220610.bb +2 -11
similarity index 98%
rename from meta/recipes-kernel/linux-firmware/linux-firmware_20220610.bb
rename to meta/recipes-kernel/linux-firmware/linux-firmware_20220708.bb
index 78b38df461..bde7178164 100644
@@ -27,7 +27,6 @@ LICENSE = "\
     & Firmware-go7007 \
     & Firmware-GPLv2 \
     & Firmware-hfi1_firmware \
-    & Firmware-i2400m \
     & Firmware-i915 \
     & Firmware-ibt_firmware \
     & Firmware-ice \
@@ -57,7 +56,6 @@ LICENSE = "\
     & Firmware-rtlwifi_firmware \
     & Firmware-imx-sdma_firmware \
     & Firmware-siano \
-    & Firmware-tda7706-firmware \
     & Firmware-ti-connectivity \
     & Firmware-ti-keystone \
     & Firmware-ueagle-atm4-firmware \
@@ -69,7 +67,6 @@ LICENSE = "\
     & WHENCE \
 "
 
-WHENCE_CHKSUM = "385947b278a6646ae4c3d39ba8c9b1bb"
 LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \
                     file://LICENCE.adsp_sst;md5=615c45b91a5a4a9fe046d6ab9a2df728 \
                     file://LICENCE.agere;md5=af0133de6b4a9b2522defd5f188afd31 \
@@ -92,7 +89,6 @@ LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \
                     file://LICENCE.go7007;md5=c0bb9f6aaaba55b0529ee9b30aa66beb \
                     file://GPL-2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
                     file://LICENSE.hfi1_firmware;md5=5e7b6e586ce7339d12689e49931ad444 \
-                    file://LICENCE.i2400m;md5=14b901969e23c41881327c0d9e4b7d36 \
                     file://LICENSE.i915;md5=2b0b2e0d20984affd4490ba2cba02570 \
                     file://LICENCE.ibt_firmware;md5=fdbee1ddfe0fb7ab0b2fcd6b454a366b \
                     file://LICENSE.ice;md5=742ab4850f2670792940e6d15c974b2f \
@@ -124,7 +120,6 @@ LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \
                     file://LICENCE.rtlwifi_firmware.txt;md5=00d06cfd3eddd5a2698948ead2ad54a5 \
                     file://LICENSE.sdma_firmware;md5=51e8c19ecc2270f4b8ea30341ad63ce9 \
                     file://LICENCE.siano;md5=4556c1bf830067f12ca151ad953ec2a5 \
-                    file://LICENCE.tda7706-firmware.txt;md5=835997cf5e3c131d0dddd695c7d9103e \
                     file://LICENCE.ti-connectivity;md5=c5e02be633f1499c109d1652514d85ec \
                     file://LICENCE.ti-keystone;md5=3a86335d32864b0bef996bee26cc0f2c \
                     file://LICENCE.ueagle-atm4-firmware;md5=4ed7ea6b507ccc583b9d594417714118 \
@@ -133,7 +128,7 @@ LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \
                     file://LICENCE.xc4000;md5=0ff51d2dc49fce04814c9155081092f0 \
                     file://LICENCE.xc5000;md5=1e170c13175323c32c7f4d0998d53f66 \
                     file://LICENCE.xc5000c;md5=12b02efa3049db65d524aeb418dd87ca \
-                    file://WHENCE;md5=${WHENCE_CHKSUM} \
+                    file://WHENCE;md5=def08711eb23ba967fb7e1f8cff66178 \
                     "
 
 # These are not common licenses, set NO_GENERIC_LICENSE for them
@@ -160,7 +155,6 @@ NO_GENERIC_LICENSE[Firmware-fw_sst_0f28] = "LICENCE.fw_sst_0f28"
 NO_GENERIC_LICENSE[Firmware-go7007] = "LICENCE.go7007"
 NO_GENERIC_LICENSE[Firmware-GPLv2] = "GPL-2"
 NO_GENERIC_LICENSE[Firmware-hfi1_firmware] = "LICENSE.hfi1_firmware"
-NO_GENERIC_LICENSE[Firmware-i2400m] = "LICENCE.i2400m"
 NO_GENERIC_LICENSE[Firmware-i915] = "LICENSE.i915"
 NO_GENERIC_LICENSE[Firmware-ibt_firmware] = "LICENCE.ibt_firmware"
 NO_GENERIC_LICENSE[Firmware-ice] = "LICENSE.ice"
@@ -191,7 +185,6 @@ NO_GENERIC_LICENSE[Firmware-ralink-firmware] = "LICENCE.ralink-firmware.txt"
 NO_GENERIC_LICENSE[Firmware-rtlwifi_firmware] = "LICENCE.rtlwifi_firmware.txt"
 NO_GENERIC_LICENSE[Firmware-siano] = "LICENCE.siano"
 NO_GENERIC_LICENSE[Firmware-imx-sdma_firmware] = "LICENSE.sdma_firmware"
-NO_GENERIC_LICENSE[Firmware-tda7706-firmware] = "LICENCE.tda7706-firmware.txt"
 NO_GENERIC_LICENSE[Firmware-ti-connectivity] = "LICENCE.ti-connectivity"
 NO_GENERIC_LICENSE[Firmware-ti-keystone] = "LICENCE.ti-keystone"
 NO_GENERIC_LICENSE[Firmware-ueagle-atm4-firmware] = "LICENCE.ueagle-atm4-firmware"
@@ -213,7 +206,7 @@ SRC_URI:class-devupstream = "git://git.kernel.org/pub/scm/linux/kernel/git/firmw
 # Pin this to the 20220509 release, override this in local.conf
 SRCREV:class-devupstream ?= "b19cbdca78ab2adfd210c91be15a22568e8b8cae"
 
-SRC_URI[sha256sum] = "faf3aedf89530e61f4fa1e8c7303dead9127cc24416945647797d079feb12837"
+SRC_URI[sha256sum] = "0abec827a035c82bdcabdf82aa37ded247bc682ef05861bd409ea6f477bab81d"
 
 inherit allarch
 
@@ -1033,7 +1026,6 @@ LICENSE:${PN} = "\
     & Firmware-fw_sst_0f28 \
     & Firmware-go7007 \
     & Firmware-hfi1_firmware \
-    & Firmware-i2400m \
     & Firmware-ibt_firmware \
     & Firmware-it913x \
     & Firmware-IntcSST2 \
@@ -1054,7 +1046,6 @@ LICENSE:${PN} = "\
     & Firmware-ralink-firmware \
     & Firmware-imx-sdma_firmware \
     & Firmware-siano \
-    & Firmware-tda7706-firmware \
     & Firmware-ti-connectivity \
     & Firmware-ti-keystone \
     & Firmware-ueagle-atm4-firmware \
Signature · 1 line
2.25.1
#23 lore raw

PATCH 13/29 libuv: upgrade 1.44.1 -> 1.44.2

In reply to Steve Sakoman

From: Alexander Kanavin <[email protected]>

Important bugs fixed

loop: better align order-of-events behavior between platforms #3598
zos: fix fs event not fired if the watched file is moved/removed/recreated #3540
win: Fix pipe resource leak if closed during connect (and other bugs) #3611
zos: don't error when killing a zombie process #3625

Regressions fixed

macos: avoid posix_spawnp() cwd bug #3597
kqueue: skip EVFILT_PROC events when invalidating events for an fd. #3629

(cherry picked from commit ccd589604c2d7648dcd3541c61a2b48e692ca258)
---
 .../libuv/{libuv_1.44.1.bb => libuv_1.44.2.bb}                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-connectivity/libuv/{libuv_1.44.1.bb => libuv_1.44.2.bb} (93%)
meta/recipes-connectivity/libuv/libuv_1.44.2.bb renamed from meta/recipes-connectivity/libuv/libuv_1.44.1.bb +1 -1
similarity index 93%
rename from meta/recipes-connectivity/libuv/libuv_1.44.1.bb
rename to meta/recipes-connectivity/libuv/libuv_1.44.2.bb
index 4c96d80a65..4c1b8eed56 100644
@@ -5,7 +5,7 @@ BUGTRACKER = "https://github.com/libuv/libuv/issues"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=ad93ca1fffe931537fcf64f6fcce084d"
 
-SRCREV = "e8b7eb6908a847ffbe6ab2eec7428e43a0aa53a2"
+SRCREV = "0c1fa696aa502eb749c2c4735005f41ba00a27b8"
 SRC_URI = "git://github.com/libuv/libuv;branch=v1.x;protocol=https"
 UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
 
Signature · 1 line
2.25.1
#24 lore raw

PATCH 14/29 log4cplus: upgrade 2.0.7 -> 2.0.8

In reply to Steve Sakoman

From: Alexander Kanavin <[email protected]>

Changes:

Add CMake alias libraries
Add an option to disable tests to configure script Fix C++11 compatibility: C++11 does not have basic_string_view. Look for Android's log library
Fix handling of ,aux extension for FileAppender filename should not be empty for TimeBasedRollingFileAppender

(cherry picked from commit e09ffe4ec692329502165282ac80cf552113a4d5)
---
 .../log4cplus/{log4cplus_2.0.7.bb => log4cplus_2.0.8.bb}        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/log4cplus/{log4cplus_2.0.7.bb => log4cplus_2.0.8.bb} (90%)
meta/recipes-devtools/log4cplus/log4cplus_2.0.8.bb renamed from meta/recipes-devtools/log4cplus/log4cplus_2.0.7.bb +1 -1
similarity index 90%
rename from meta/recipes-devtools/log4cplus/log4cplus_2.0.7.bb
rename to meta/recipes-devtools/log4cplus/log4cplus_2.0.8.bb
index 3798b93f76..bbf4ce6218 100644
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=41e8e060c26822886b592ab4765c756b"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}-stable/${PV}/${BP}.tar.gz \
           "
-SRC_URI[sha256sum] = "086451c7e7c582862cbd6c60d87bb6d9d63c4b65321dba85fa71766382f7ec6d"
+SRC_URI[sha256sum] = "cdc3c738e00be84d8d03b580816b9f12628ecc1d71e1395080c802615d2d9ced"
 
 UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/log4cplus/files/log4cplus-stable/"
 UPSTREAM_CHECK_REGEX = "log4cplus-stable/(?P<pver>\d+(\.\d+)+)/"
Signature · 1 line
2.25.1
#25 lore raw

PATCH 15/29 vala: upgrade 0.56.0 -> 0.56.1

In reply to Steve Sakoman

From: Alexander Kanavin <[email protected]>

Changes in 0.56.1 LTS relase:

- vala: Improve accessibility check inside member initializer [#1300]
- vala: Don't allow nullable enum value as real GObject property [#1074]
- valadoc: Include path to doclet in error message
- manual: Update from wiki.gnome.org
- gtk4: Fix GLib.Value parameter in ContentProvider.get_value()
- gtk4: Split out gtk4-wayland and gtk4-x11 into separate bindings [#1308]
- gstreamer: Update from 1.21+ git main
- vapi: Update GIR-based bindings

(cherry picked from commit 0d78d6d6122b776f9abac27e3a71a3196999bebd)
---
 meta/recipes-devtools/vala/vala_0.56.0.bb | 3 ---
 meta/recipes-devtools/vala/vala_0.56.1.bb | 3 +++
 2 files changed, 3 insertions(+), 3 deletions(-)
 delete mode 100644 meta/recipes-devtools/vala/vala_0.56.0.bb
 create mode 100644 meta/recipes-devtools/vala/vala_0.56.1.bb
meta/recipes-devtools/vala/vala_0.56.0.bb deleted +0 -3
deleted file mode 100644
index a4d6760f10..0000000000
@@ -1,3 +0,0 @@
-require ${BPN}.inc
-
-SRC_URI[sha256sum] = "d92bd13c5630905eeb6a983dcb702204da9731460c2a6e4e39f867996f371040"
meta/recipes-devtools/vala/vala_0.56.1.bb new file +3 -0
new file mode 100644
index 0000000000..48d21685e8
@@ -0,0 +1,3 @@
+require ${BPN}.inc
+
+SRC_URI[sha256sum] = "c518b81dfdda82d1cdf586b3f9b2323162cb96bd3cb5a2c03650cea025d91fb9"
Signature · 1 line
2.25.1
#26 lore raw

PATCH 16/29 vala: upgrade 0.56.1 -> 0.56.2

In reply to Steve Sakoman

From: Alexander Kanavin <[email protected]>

Changes in 0.56.2 LTS release:

- codegen: Correctly set array-length for NoAccessorMethods properties [#1316]
- codegen: Detect usage of static type-parameter in runtime context [#1326]
- vala: Avoid critical in SourceFile.get_mapped_length() [#1330]
- codegen: Make sure to initialize static collections
- codegen: Split reserved identifiers for C and Vala
- codegen: Check cname of fields and methods against reserved identfiers [#1329]
- glib2.0: Add abs() to int8/int16/int32/ssize_t [#1328]
- Add initial wayland-client binding
- Add geocode-glib-2.0 binding
- Add rest-1.0 bindings

(cherry picked from commit 21913b732953a1b85ae89721f8337eb9f75d1798)
---
 meta/recipes-devtools/vala/vala_0.56.1.bb | 3 ---
 meta/recipes-devtools/vala/vala_0.56.2.bb | 3 +++
 2 files changed, 3 insertions(+), 3 deletions(-)
 delete mode 100644 meta/recipes-devtools/vala/vala_0.56.1.bb
 create mode 100644 meta/recipes-devtools/vala/vala_0.56.2.bb
meta/recipes-devtools/vala/vala_0.56.1.bb deleted +0 -3
deleted file mode 100644
index 48d21685e8..0000000000
@@ -1,3 +0,0 @@
-require ${BPN}.inc
-
-SRC_URI[sha256sum] = "c518b81dfdda82d1cdf586b3f9b2323162cb96bd3cb5a2c03650cea025d91fb9"
meta/recipes-devtools/vala/vala_0.56.2.bb new file +3 -0
new file mode 100644
index 0000000000..08c8ccca1d
@@ -0,0 +1,3 @@
+require ${BPN}.inc
+
+SRC_URI[sha256sum] = "66c9619bb17859fd1ac3aba0a57970613e38fd2a1ee30541174260c9fb90124c"
Signature · 1 line
2.25.1
#27 lore raw

PATCH 17/29 webkitgtk: upgrade 2.36.3 -> 2.36.4

In reply to Steve Sakoman

From: Alexander Kanavin <[email protected]>

Changes:

Fix the new ATSPI accessibility implementation to add the missing Collection interface for the loaded document.
Fix the MediaSession implementation to make the MPRIS object names more sandbox friendly, which plays better with Flatpak and WebKit’s own Bubblwrap-based sandboxing. Fix leaked Web Processes in some particular situations.
Fix the build with media capture support enabled.
Fix cross-compilation when targeting 64-bit ARM.
Fix several crashes and rendering issues.

(cherry picked from commit 2396f8de9b6b9690dd70961084514da7d237f2ad)
---
 .../webkit/{webkitgtk_2.36.3.bb => webkitgtk_2.36.4.bb}         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-sato/webkit/{webkitgtk_2.36.3.bb => webkitgtk_2.36.4.bb} (98%)
meta/recipes-sato/webkit/webkitgtk_2.36.4.bb renamed from meta/recipes-sato/webkit/webkitgtk_2.36.3.bb +1 -1
similarity index 98%
rename from meta/recipes-sato/webkit/webkitgtk_2.36.3.bb
rename to meta/recipes-sato/webkit/webkitgtk_2.36.4.bb
index 83b6f8a6ee..df4ff63121 100644
@@ -17,7 +17,7 @@ SRC_URI = "https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \
            file://0001-When-building-introspection-files-do-not-quote-CFLAG.patch \
            "
 
-SRC_URI[sha256sum] = "732fcf8c4ec644b8ed28b46ebbd7c1ebab9d9e0afea9bdf5e5d12786afc478d1"
+SRC_URI[sha256sum] = "b6bebe1f85a479d968c19e44a4704622ef8cef61636ad1b2406b77d16ae2e2a8"
 
 inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gtk-doc
 
Signature · 1 line
2.25.1
#28 lore raw

PATCH 18/29 xwayland: upgrade 22.1.1 -> 22.1.2

In reply to Steve Sakoman

From: Richard Purdie <[email protected]>

Changes:

Olivier Fourdan (3):
randr: Add "RANDR Emulation" property
xwayland/output: Set the "RANDR Emulation" property
xwayland: Fix invalid pointer access in drm_lease_device_handle_released.

(cherry picked from commit 0fd8934f51080313f54326b634593d11385b3338)
---
 .../xwayland/{xwayland_22.1.1.bb => xwayland_22.1.2.bb}         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-graphics/xwayland/{xwayland_22.1.1.bb => xwayland_22.1.2.bb} (95%)
meta/recipes-graphics/xwayland/xwayland_22.1.2.bb renamed from meta/recipes-graphics/xwayland/xwayland_22.1.1.bb +1 -1
similarity index 95%
rename from meta/recipes-graphics/xwayland/xwayland_22.1.1.bb
rename to meta/recipes-graphics/xwayland/xwayland_22.1.2.bb
index b512b9932d..8c52613109 100644
@@ -10,7 +10,7 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=5df87950af51ac2c5822094553ea1880"
 
 SRC_URI = "https://www.x.org/archive/individual/xserver/xwayland-${PV}.tar.xz"
-SRC_URI[sha256sum] = "f5d0e0ba37e19bb87c62f61da5970bd204939f2120620964bed4cc8495baa657"
+SRC_URI[sha256sum] = "743c4d56cfc0818755e2281d625d51860b41a473c641e179649a4f41776d1fca"
 
 UPSTREAM_CHECK_REGEX = "xwayland-(?P<pver>\d+(\.(?!90\d)\d+)+)\.tar"
 
Signature · 1 line
2.25.1
#29 lore raw

PATCH 19/29 xwayland: upgrade 22.1.2 -> 22.1.3

In reply to Steve Sakoman

From: Alexander Kanavin <[email protected]>

Changes:

os: print <signal handler called> if unw_is_signal_frame()
os: print registers in the libunwind version of xorg_backtrace() xwayland/present: Do not send two idle notify events for flip pixmaps
xwayland: Fix check logic in sprite_check_lost_focus()
xkb: switch to array index loops to moving pointers
xkb: swap XkbSetDeviceInfo and XkbSetDeviceInfoCheck
xkb: add request length validation for XkbSetGeometry
xwayland: Change randr_output status when call xwl_output_remove()

(cherry picked from commit 229e3ad289a5e2c890b25497857140952acc3d67)
---
 .../xwayland/{xwayland_22.1.2.bb => xwayland_22.1.3.bb}         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-graphics/xwayland/{xwayland_22.1.2.bb => xwayland_22.1.3.bb} (95%)
meta/recipes-graphics/xwayland/xwayland_22.1.3.bb renamed from meta/recipes-graphics/xwayland/xwayland_22.1.2.bb +1 -1
similarity index 95%
rename from meta/recipes-graphics/xwayland/xwayland_22.1.2.bb
rename to meta/recipes-graphics/xwayland/xwayland_22.1.3.bb
index 8c52613109..da1b27525d 100644
@@ -10,7 +10,7 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=5df87950af51ac2c5822094553ea1880"
 
 SRC_URI = "https://www.x.org/archive/individual/xserver/xwayland-${PV}.tar.xz"
-SRC_URI[sha256sum] = "743c4d56cfc0818755e2281d625d51860b41a473c641e179649a4f41776d1fca"
+SRC_URI[sha256sum] = "a712eb7bce32cd934df36814b5dd046aa670899c16fe98f2afb003578f86a1c5"
 
 UPSTREAM_CHECK_REGEX = "xwayland-(?P<pver>\d+(\.(?!90\d)\d+)+)\.tar"
 
Signature · 1 line
2.25.1
#30 lore raw

PATCH 20/29 epiphany: upgrade 42.2 -> 42.3

In reply to Steve Sakoman

From: Alexander Kanavin <[email protected]>

Changes:

* Fix crash when deleting all passwords (#1773)
* Fix memory corruption caused by Sync failure (!1115)

(cherry picked from commit 34ebcfe23c065718be4e392673f6e1b489d2eb98)
---
 .../epiphany/{epiphany_42.2.bb => epiphany_42.3.bb}             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-gnome/epiphany/{epiphany_42.2.bb => epiphany_42.3.bb} (94%)
meta/recipes-gnome/epiphany/epiphany_42.3.bb renamed from meta/recipes-gnome/epiphany/epiphany_42.2.bb +1 -1
similarity index 94%
rename from meta/recipes-gnome/epiphany/epiphany_42.2.bb
rename to meta/recipes-gnome/epiphany/epiphany_42.3.bb
index dc1b34ac92..f9d60ff2a9 100644
@@ -28,7 +28,7 @@ SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@oe.utils.trim_version("${PV}", 1)}/${GN
            file://migrator.patch \
            file://distributor.patch \
            "
-SRC_URI[archive.sha256sum] = "92c02cf886d10d2ccff5de658e1a420eab31d20bb50e746d430e9535b485192d"
+SRC_URI[archive.sha256sum] = "7316d3c6500e825d8e57293fa58047c56727bee16cd6b6ac804ffe5d9b229560"
 
 PACKAGECONFIG_SOUP ?= "soup2"
 PACKAGECONFIG ??= "${PACKAGECONFIG_SOUP}"
Signature · 1 line
2.25.1
#31 lore raw

PATCH 21/29 oeqa/runtime: add test that the kernel has CONFIG_PREEMPT_RT enabled

In reply to Steve Sakoman

From: Ross Burton <[email protected]>

This is the absolute bare minimum for testing the RT patches, but it does mean we if we build and boot a RT kernel we can verify that it is what we expect.

(cherry picked from commit 0301d5845115d09299f87683b3efa46f3b4c7be9)
---
 meta/lib/oeqa/runtime/cases/rt.py | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 meta/lib/oeqa/runtime/cases/rt.py
meta/lib/oeqa/runtime/cases/rt.py new file +17 -0
new file mode 100644
index 0000000000..849ac1914e
@@ -0,0 +1,17 @@
+#
+# SPDX-License-Identifier: MIT
+#
+
+from oeqa.runtime.case import OERuntimeTestCase
+from oeqa.core.decorator.depends import OETestDepends
+
+class RtTest(OERuntimeTestCase):
+    @OETestDepends(['ssh.SSHTest.test_ssh'])
+    def test_is_rt(self):
+        """
+        Check that the kernel has CONFIG_PREEMPT_RT enabled.
+        """
+        status, output = self.target.run("uname -a")
+        self.assertEqual(status, 0, msg=output)
+        # Split so we don't get a substring false-positive
+        self.assertIn("PREEMPT_RT", output.split())
Signature · 1 line
2.25.1
#32 lore raw

PATCH 22/29 wic/plugins/rootfs: Fix NameError for 'orig_path'

In reply to Steve Sakoman

From: Mihai Lindner <[email protected]>

Fix "NameError: name 'orig_path' is not defined".
It's a typo from when this error was handled outside this function.

(cherry picked from commit 2124ec0d9f9de2da476f0024a0ccf70da987420f)
---
 scripts/lib/wic/plugins/source/rootfs.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
scripts/lib/wic/plugins/source/rootfs.py +1 -1
index 25bb41dd70..fc06312ee4 100644
@@ -35,7 +35,7 @@ class RootfsPlugin(SourcePlugin):
     @staticmethod
     def __validate_path(cmd, rootfs_dir, path):
         if os.path.isabs(path):
-            logger.error("%s: Must be relative: %s" % (cmd, orig_path))
+            logger.error("%s: Must be relative: %s" % (cmd, path))
             sys.exit(1)
 
         # Disallow climbing outside of parent directory using '..',
Signature · 1 line
2.25.1
#33 lore raw

PATCH 23/29 systemd: Added base_bindir into pkg_postinst:udev-hwdb.

In reply to Steve Sakoman

From: leimaohui <[email protected]>

Otherwise in sdk environment, the base_bindir is empty and the path of UDEVADM="${base_bindir}/udevadm" is not correct.

(cherry picked from commit 235b6fccd2a9ce4eb9bfb3be8ac271cff0ea5fea)
---
 meta/recipes-core/systemd/systemd_250.5.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-core/systemd/systemd_250.5.bb +1 -1
index 006b2f86ea..9923312830 100644
@@ -779,7 +779,7 @@ pkg_prerm:${PN}:libc-glibc () {
 PACKAGE_WRITE_DEPS += "qemu-native"
 pkg_postinst:udev-hwdb () {
 	if test -n "$D"; then
-		$INTERCEPT_DIR/postinst_intercept update_udev_hwdb ${PKG} mlprefix=${MLPREFIX} binprefix=${MLPREFIX} rootlibexecdir="${rootlibexecdir}" PREFERRED_PROVIDER_udev="${PREFERRED_PROVIDER_udev}"
+		$INTERCEPT_DIR/postinst_intercept update_udev_hwdb ${PKG} mlprefix=${MLPREFIX} binprefix=${MLPREFIX} rootlibexecdir="${rootlibexecdir}" PREFERRED_PROVIDER_udev="${PREFERRED_PROVIDER_udev}" base_bindir="${base_bindir}"
 	else
 		udevadm hwdb --update
 	fi
Signature · 1 line
2.25.1
#34 lore raw

PATCH 24/29 udev-extraconf:mount.sh: fix a umount issue

In reply to Steve Sakoman

From: Ming Liu <[email protected]>

Only touching /tmp/.automount-$name is not good enough, it must contain the mount name, otherwise umount could not get the path from it.

(cherry picked from commit ccea69032329f3ba43c727d9eb71b1d063b89824)
---
 meta/recipes-core/udev/udev-extraconf/mount.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-core/udev/udev-extraconf/mount.sh +1 -1
index 43acb3a7a0..b7e86dbc0e 100644
@@ -89,7 +89,7 @@ automount_systemd() {
         rm_dir "$MOUNT_BASE/$name"
     else
         logger "mount.sh/automount" "Auto-mount of [$MOUNT_BASE/$name] successful"
-        touch "/tmp/.automount-$name"
+        echo "$name" > "/tmp/.automount-$name"
     fi
 }
 
Signature · 1 line
2.25.1
#35 lore raw

PATCH 25/29 perf: fix reproduciblity in older releases of Linux

In reply to Steve Sakoman

From: Ross Burton <[email protected]>

If you build perf from Linux 5.4 it still contains buildpaths (pointing to the sysroot's Python) as the existing fixes don't apply to the lines in that old release.

Add further expressions to remove the final buildpaths.

(cherry picked from commit 6783c1e295e5afafd73a02fd986ca8956a89dda7)
---
 meta/recipes-kernel/perf/perf.bb | 3 +++
 1 file changed, 3 insertions(+)
meta/recipes-kernel/perf/perf.bb +3 -0
index 603d3f9eee..95e7eae9fe 100644
@@ -227,6 +227,9 @@ do_configure:prepend () {
         # reproducible.
         sed -i -e 's,$(call get-executable-or-default\,PYTHON\,$(PYTHON_AUTO)),$(notdir $(call get-executable-or-default\,PYTHON\,$(PYTHON_AUTO))),g' \
             ${S}/tools/perf/Makefile.config
+        # The same line is in older releases, but looking explicitly for Python 2
+        sed -i -e 's,$(call get-executable-or-default\,PYTHON\,$(PYTHON2)),$(notdir $(call get-executable-or-default\,PYTHON\,$(PYTHON2))),g' \
+            ${S}/tools/perf/Makefile.config
 
 	# likewise with this substitution. Kernels with commit 18f2967418d031a39
 	# [perf tools: Use Python devtools for version autodetection rather than runtime]
Signature · 1 line
2.25.1
#36 lore raw

PATCH 26/29 base/reproducible: Change Source Date Epoch generation methods

In reply to Steve Sakoman

From: Richard Purdie <[email protected]>

In bc, we found that there are files newer than Changelog (e.g. scan.l) which means after install runs, the timestamp is clamped to SDE which means "bitbake bc -C compile" would then try and regenerate generated files and complain flex was missing.

Rather than assuming Changelog/NEWS are magic for dates, drop that scan method and scan all unpacked files. This shouldn't be that slow as they'd be in the disk cache already after an unpack.

For bc, this changes SDE by about two minutes and avoids the problems rebuilding.

Add a version comment to the task definition as changes in python library code won't trigger a rebuild and we need one here.

(cherry picked from commit 32dda0ad91a9e7946351c897578b4c97ae142341)
---
 meta/classes/base.bbclass   | 1 +
 meta/lib/oe/reproducible.py | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)
meta/classes/base.bbclass +1 -0
index 0cf27fbb91..cb9da78ab6 100644
@@ -208,6 +208,7 @@ addtask do_deploy_source_date_epoch_setscene
 addtask do_deploy_source_date_epoch before do_configure after do_patch
 
 python create_source_date_epoch_stamp() {
+    # Version: 1
     source_date_epoch = oe.reproducible.get_source_date_epoch(d, d.getVar('S'))
     oe.reproducible.epochfile_write(source_date_epoch, d.getVar('SDE_FILE'), d)
 }
meta/lib/oe/reproducible.py +0 -1
index 35b8be6d08..2e815df190 100644
@@ -152,7 +152,6 @@ def fixed_source_date_epoch(d):
 def get_source_date_epoch(d, sourcedir):
     return (
         get_source_date_epoch_from_git(d, sourcedir) or
-        get_source_date_epoch_from_known_files(d, sourcedir) or
         get_source_date_epoch_from_youngest_file(d, sourcedir) or
         fixed_source_date_epoch(d)       # Last resort
     )
Signature · 1 line
2.25.1
#37 lore raw

PATCH 27/29 efivar: fix import functionality

In reply to Steve Sakoman

From: gr embeter <[email protected]>

"efivar --import" is broken in v38:

 # efivar -i /8be4df61-93ca-11d2-aa0d-00e098032b8c-Timeout
free(): invalid pointer
Aborted

Backport upstream patch to fix it.

Upstream issue:
https://github.com/rhboot/efivar/issues/173

(cherry picked from commit 27f263a9c69b711f39287c0dc8970ad41758fbb9)
---
 .../0001-Fix-invalid-free-in-main.patch       | 30 +++++++++++++++++++
 meta/recipes-bsp/efivar/efivar_38.bb          |  1 +
 2 files changed, 31 insertions(+)
 create mode 100644 meta/recipes-bsp/efivar/efivar/0001-Fix-invalid-free-in-main.patch
meta/recipes-bsp/efivar/efivar/0001-Fix-invalid-free-in-main.patch new file +30 -0
new file mode 100644
index 0000000000..7e63df578e
@@ -0,0 +1,30 @@
+From 085f027e9e9f1478f68ddda705f83b244ee3bd88 Mon Sep 17 00:00:00 2001
+From: Robbie Harwood <[email protected]>
+Date: Mon, 18 Apr 2022 13:08:18 -0400
+Subject: [PATCH] Fix invalid free in main()
+
+data is allocated by mmap() in prepare_data().
+
+Resolves: #173
+Signed-off-by: Robbie Harwood <[email protected]>
+Upstream-Status: Backport
+Link: https://github.com/rhboot/efivar/commit/6be2cb1c0139ac177e754b0767abf1ca1533847f
+Signed-off-by: Grygorii Tertychnyi <[email protected]>
+
+---
+ src/efivar.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/efivar.c b/src/efivar.c
+index 5cd1eb2bc73c..09f85edd0a38 100644
+--- a/src/efivar.c
++++ b/src/efivar.c
+@@ -633,7 +633,7 @@ int main(int argc, char *argv[])
+ 				if (sz < 0)
+ 					err(1, "Could not import data from \"%s\"", infile);
+ 
+-				free(data);
++				munmap(data, data_size);
+ 				data = NULL;
+ 				data_size = 0;
+ 
meta/recipes-bsp/efivar/efivar_38.bb +1 -0
index 53fe20a95b..42625fa041 100644
@@ -11,6 +11,7 @@ SRC_URI = "git://github.com/rhinstaller/efivar.git;branch=main;protocol=https \
            file://0001-docs-do-not-build-efisecdb-manpage.patch \
            file://0001-src-Makefile-build-util.c-separately-for-makeguids.patch \
            file://efisecdb-fix-build-with-musl-libc.patch \
+           file://0001-Fix-invalid-free-in-main.patch \
            "
 SRCREV = "1753149d4176ebfb2b135ac0aaf79340bf0e7a93"
 
Signature · 1 line
2.25.1
#38 lore raw

PATCH 28/29 bind: Remove legacy python3 PACKAGECONFIG code

In reply to Steve Sakoman

From: Alex Kiernan <[email protected]>

Python support was dropped upstream and removed in 8a9a5885995c ("bind:
update 9.16.26 -> 9.18.1"), clean up the remaining pieces of python3 in the recipe.

(cherry picked from commit ee4e4eb16a3729dcafad075c42aec1695b8ea15f)
---
 meta/recipes-connectivity/bind/bind_9.18.4.bb | 13 -------------
 1 file changed, 13 deletions(-)
meta/recipes-connectivity/bind/bind_9.18.4.bb +0 -13
index 5af2022129..c3efaffeda 100644
@@ -46,8 +46,6 @@ EXTRA_OECONF = " --disable-devpoll --disable-auto-validation --enable-epoll \
                "
 LDFLAGS:append = " -lz"
 
-inherit ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3native setuptools3-base', '', d)}
-
 # dhcp needs .la so keep them
 REMOVE_LIBTOOL_LA = "0"
 
@@ -67,12 +65,6 @@ do_install:append() {
 	install -d "${D}${sysconfdir}/init.d"
 	install -m 644 ${S}/conf/* "${D}${sysconfdir}/bind/"
 	install -m 755 "${S}/init.d" "${D}${sysconfdir}/init.d/bind"
-        if ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'true', 'false', d)}; then
-		sed -i -e '1s,#!.*python3,#! /usr/bin/python3,' \
-		${D}${sbindir}/dnssec-coverage \
-		${D}${sbindir}/dnssec-checkds \
-		${D}${sbindir}/dnssec-keymgr
-	fi
 
 	# Install systemd related files
 	install -d ${D}${sbindir}
@@ -119,9 +111,4 @@ FILES_SOLIBSDEV = "${libdir}/*[!0-9].so ${libdir}/libbind9.so"
 FILES:${PN}-libs = "${libdir}/named/*.so* ${libdir}/*-${PV}.so"
 FILES:${PN}-staticdev += "${libdir}/*.la"
 
-PACKAGE_BEFORE_PN += "${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3-bind', '', d)}"
-FILES:python3-bind = "${sbindir}/dnssec-coverage ${sbindir}/dnssec-checkds \
-                ${sbindir}/dnssec-keymgr ${PYTHON_SITEPACKAGES_DIR}"
-
 RDEPENDS:${PN}-dev = ""
-RDEPENDS:python3-bind = "python3-core python3-ply"
Signature · 1 line
2.25.1
#39 lore raw

PATCH 29/29 initscripts: run umountnfs as a KILL script

In reply to Steve Sakoman

From: Shruthi Ravichandran <[email protected]>

rc runs all the KILL scripts in a runlevel before the START scripts. The umountnfs script is currently configured as a START script, and runs after the networking KILL script. During shutdown, this causes a ~3 minute timeout after networking is shutdown when the system tries to connect to and unmount any mounted network shares.
Fix this by changing the script configuration to "stop" so that it can run before networking is stopped and unmount any network shares safely.

(cherry picked from commit c419bd4537756e9f6c2fe6da3a9b798526e27eca)
---
 meta/recipes-core/initscripts/initscripts_1.0.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-core/initscripts/initscripts_1.0.bb +1 -1
index 2244d1b292..7c9d9ca4f1 100644
@@ -130,7 +130,7 @@ do_install () {
 	update-rc.d -r ${D} rmnologin.sh start 99 2 3 4 5 .
 	update-rc.d -r ${D} sendsigs start 20 0 6 .
 	update-rc.d -r ${D} urandom start 38 S 0 6 .
-	update-rc.d -r ${D} umountnfs.sh start 31 0 1 6 .
+	update-rc.d -r ${D} umountnfs.sh stop 31 0 1 6 .
 	update-rc.d -r ${D} umountfs start 40 0 6 .
 	update-rc.d -r ${D} reboot start 90 6 .
 	update-rc.d -r ${D} halt start 90 0 .
Signature · 1 line
2.25.1