diff options
Diffstat (limited to 'main')
| -rw-r--r-- | main/xorg-server/APKBUILD | 30 | ||||
| -rw-r--r-- | main/xorg-server/modesetting-Set-correct-DRM-event-context-version.patch | 38 |
2 files changed, 22 insertions, 46 deletions
diff --git a/main/xorg-server/APKBUILD b/main/xorg-server/APKBUILD index 89deb8b45d..7aee597f56 100644 --- a/main/xorg-server/APKBUILD +++ b/main/xorg-server/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Łukasz Jendrysik <scadu@yandex.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xorg-server -pkgver=1.19.3 -pkgrel=4 +pkgver=1.19.5 +pkgrel=0 pkgdesc="X.Org X servers" url="http://xorg.freedesktop.org" arch="all" @@ -76,16 +76,31 @@ makedepends=" xtrans zlib-dev " - source="http://www.x.org/releases/individual/xserver/$pkgname-$pkgver.tar.bz2 autoconfig-nvidia.patch autoconfig-sis.patch fix-musl-arm.patch - modesetting-Set-correct-DRM-event-context-version.patch 20-modules.conf " - builddir="$srcdir"/$pkgname-$pkgver + +# secfixes: +# 1.19.5-r0: +# - CVE-2017-12176 +# - CVE-2017-12177 +# - CVE-2017-12178 +# - CVE-2017-12179 +# - CVE-2017-12180 +# - CVE-2017-12181 +# - CVE-2017-12182 +# - CVE-2017-12183 +# - CVE-2017-12184 +# - CVE-2017-12185 +# - CVE-2017-12186 +# - CVE-2017-12187 +# - CVE-2017-13721 +# - CVE-2017-13723 + prepare() { cd "$builddir" default_prepare @@ -96,7 +111,7 @@ prepare() { } build() { - cd "$_builddir" + cd "$builddir" # xorg modules does not work with the -z now and it seems like we # cannot pass over the linker flag to .so files. so we tweak the # gcc specs. @@ -193,9 +208,8 @@ xwayland() { mv "$pkgdir"/usr/bin/Xwayland "$subpkgdir"/usr/bin/ } -sha512sums="b988897418399e1361fdcca9465a781f55f8f6fbfdc5a59edfaee9046a0c6ad7a76f348d88b6004ce3d3fb3966b4c5af0b854f6549c32b2b8d7a43758809f669 xorg-server-1.19.3.tar.bz2 +sha512sums="928dea5850b98cd815004cfa133eca23cfa9521920c934c68a92787f2cae13cca1534eee772a4fb74b8ae8cb92662b5d68b95b834c8aa8ec57cd57cb4e5dd45c xorg-server-1.19.5.tar.bz2 4dcaa60fbfc61636e7220a24a72bba19984a6dc752061cb40b1bd566c0e614d08927b6c223ffaaaa05636765fddacdc3113fde55d25fd09cd0c786ff44f51447 autoconfig-nvidia.patch 30a78f4278edd535c45ee3f80933427cb029a13abaa4b041f816515fdd8f64f00b9c6aef50d4eba2aaf0d4f333e730399864fd97fa18891273601c77a6637200 autoconfig-sis.patch b799e757a22a61ac283adbd7a8df1ad4eccce0bb6cac38a0c962ba8438bba3cf6637a65bb64859e7b32399fca672283a49960207e186c271ba574580de360d09 fix-musl-arm.patch -f66f11255aa8a98c89763cb213f08628c937cb13e7ab4bd399a246e0b630316343f35e191d92e55b0fa68e601c243220a3258bbfc5d50e74ccadfe6cb27310f5 modesetting-Set-correct-DRM-event-context-version.patch 95036f2452732cc31f6b646da9f46b7be30f4c9392724386b02f67fece1f506b00e15d14cbd8cf0ce75ca1fd144b4bea7e59288d4aaf4d6c1e06e5168931eb67 20-modules.conf" diff --git a/main/xorg-server/modesetting-Set-correct-DRM-event-context-version.patch b/main/xorg-server/modesetting-Set-correct-DRM-event-context-version.patch deleted file mode 100644 index 51563fec59..0000000000 --- a/main/xorg-server/modesetting-Set-correct-DRM-event-context-version.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 0c8e6ed85810e96d84173a52d628863802a78d82 Mon Sep 17 00:00:00 2001 -From: Daniel Stone <daniels@collabora.com> -Date: Fri, 7 Apr 2017 14:27:58 +0100 -Subject: [PATCH] modesetting: Set correct DRM event context version - -DRM_EVENT_CONTEXT_VERSION is the latest context version supported by -whatever version of libdrm is present. modesetting was blindly asserting -it supported whatever version that may be, even if it actually didn't. - -With libdrm 2.4.78, setting a higher context version than 2 will attempt -to call the page_flip_handler2 vfunc if it was non-NULL, which being a -random chunk of stack memory, it might well have been. - -Set the version as 2, which should be bumped only with the appropriate -version checks. - -Reviewed-by: Adam Jackson <ajax@redhat.com> -Signed-off-by: Daniel Stone <daniels@collabora.com> ---- - hw/xfree86/drivers/modesetting/vblank.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/hw/xfree86/drivers/modesetting/vblank.c b/hw/xfree86/drivers/modesetting/vblank.c -index 04a8952..8682f4d 100644 ---- a/hw/xfree86/drivers/modesetting/vblank.c -+++ b/hw/xfree86/drivers/modesetting/vblank.c -@@ -402,7 +402,7 @@ ms_vblank_screen_init(ScreenPtr screen) - modesettingEntPtr ms_ent = ms_ent_priv(scrn); - xorg_list_init(&ms_drm_queue); - -- ms->event_context.version = DRM_EVENT_CONTEXT_VERSION; -+ ms->event_context.version = 2; - ms->event_context.vblank_handler = ms_drm_handler; - ms->event_context.page_flip_handler = ms_drm_handler; - --- -2.12.2 - |