From d22204fd6fe729322756a518ec9fb0d613731f57 Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Mon, 10 Apr 2023 17:34:14 +0800 Subject: xserver-xorg: upgrade 21.1.7 -> 21.1.8 This release contains the fix for CVE-2023-1393 in today's security advisory: https://lists.x.org/archives/xorg-announce/2023-March/003374.html Benno Schulenberg (1): xkbUtils: use existing symbol names instead of deleted deprecated ones Olivier Fourdan (2): composite: Fix use-after-free of the COW xserver 21.1.8 git tag: xorg-server-21.1.8 (From OE-Core rev: 9d5a512da3b81680d20cf8c557757a31cd48efba) Signed-off-by: Wang Mingyu Signed-off-by: Alexandre Belloni (cherry picked from commit 7b08dff8f46bcaa05f7fbffbe27d524579af4faf) Signed-off-by: Steve Sakoman --- .../xorg-xserver/xserver-xorg_21.1.7.bb | 28 ---------------------- .../xorg-xserver/xserver-xorg_21.1.8.bb | 28 ++++++++++++++++++++++ 2 files changed, 28 insertions(+), 28 deletions(-) delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.7.bb create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.8.bb (limited to 'meta') diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.7.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.7.bb deleted file mode 100644 index 212c7d39c2..0000000000 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.7.bb +++ /dev/null @@ -1,28 +0,0 @@ -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 \ - " -SRC_URI[sha256sum] = "d9c60b2dd0ec52326ca6ab20db0e490b1ff4f566f59ca742d6532e92795877bb" - -# These extensions are now integrated into the server, so declare the migration -# path for in-place upgrades. - -RREPLACES:${PN} = "${PN}-extension-dri \ - ${PN}-extension-dri2 \ - ${PN}-extension-record \ - ${PN}-extension-extmod \ - ${PN}-extension-dbe \ - " -RPROVIDES:${PN} = "${PN}-extension-dri \ - ${PN}-extension-dri2 \ - ${PN}-extension-record \ - ${PN}-extension-extmod \ - ${PN}-extension-dbe \ - " -RCONFLICTS:${PN} = "${PN}-extension-dri \ - ${PN}-extension-dri2 \ - ${PN}-extension-record \ - ${PN}-extension-extmod \ - ${PN}-extension-dbe \ - " diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.8.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.8.bb new file mode 100644 index 0000000000..19db7ea434 --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.8.bb @@ -0,0 +1,28 @@ +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 \ + " +SRC_URI[sha256sum] = "38aadb735650c8024ee25211c190bf8aad844c5f59632761ab1ef4c4d5aeb152" + +# These extensions are now integrated into the server, so declare the migration +# path for in-place upgrades. + +RREPLACES:${PN} = "${PN}-extension-dri \ + ${PN}-extension-dri2 \ + ${PN}-extension-record \ + ${PN}-extension-extmod \ + ${PN}-extension-dbe \ + " +RPROVIDES:${PN} = "${PN}-extension-dri \ + ${PN}-extension-dri2 \ + ${PN}-extension-record \ + ${PN}-extension-extmod \ + ${PN}-extension-dbe \ + " +RCONFLICTS:${PN} = "${PN}-extension-dri \ + ${PN}-extension-dri2 \ + ${PN}-extension-record \ + ${PN}-extension-extmod \ + ${PN}-extension-dbe \ + " -- cgit v1.2.3-54-g00ecf