xorg-server-1.17.1-6.parabola1: fix FS#45245 (https://bugs.archlinux.org/task/45245), FS#45229 (https://bugs.archlinux.org/task/45229), CVE-2015-3164

1 files changed, 25 insertions, 10 deletions

diff --git a/libre/xorg-server/PKGBUILD b/libre/xorg-server/PKGBUILD
index 1c1c62690..a539ebbd4 100644
--- a/libre/xorg-server/PKGBUILD
+++ b/libre/xorg-server/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 236527 2015-04-14 10:41:30Z lcarlier $
-# Maintainer: AndyRTR <andyrtr@archlinux.org>
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Maintainer (Parabola): Márcio Silva <coadde@parabola.nu>
+# $Id: PKGBUILD 240425 2015-06-08 19:29:45Z lcarlier $
+# Maintainer (Arch): AndyRTR <andyrtr@archlinux.org>
+# Maintainer (Arch): Jan de Groot <jgc@archlinux.org>
+# Maintainer: Márcio Silva <coadde@parabola.nu>
 
 pkgbase=xorg-server
 pkgname=('xorg-server')
 pkgver=1.17.1
-pkgrel=5.parabola1 # build first with 0.1 and then rebuild it after xf86-input-evdev rebuild
+pkgrel=6.parabola1 # build first with 0.1 and then rebuild it after xf86-input-evdev rebuild
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 url="http://xorg.freedesktop.org"
@@ -23,7 +23,11 @@ source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2{,.sig}
         os-access-fix-regression-in-server-interpreted-auth.patch
         v2-xserver-Fix-a-crash-with-XDMCP-error-handler.patch
         0001-int10-Fix-error-check-for-pci_device_map_legacy.patch
-        0001-mi-Partial-pie-slice-filled-arcs-may-need-more-space.patch)
+        0001-mi-Partial-pie-slice-filled-arcs-may-need-more-space.patch
+        0001-sdksyms.sh-Make-sdksyms.sh-work-with-gcc5.patch
+        0001-dix-Add-unaccelerated-valuators-to-the-ValuatorMask.patch
+        0002-dix-hook-up-the-unaccelerated-valuator-masks.patch
+        fix-CVE-2015-3164.patch)
 validpgpkeys=('7B27A3F1A6E18CD9588B4AE8310180050905E40C'
               'C383B778255613DFDB409D91DB221A6900000011')
 sha256sums=('2bf8e9f6f0a710dec1d2472467bff1f4e247cb6dcd76eb469aafdc8a2d7db2ab'
@@ -33,18 +37,29 @@ sha256sums=('2bf8e9f6f0a710dec1d2472467bff1f4e247cb6dcd76eb469aafdc8a2d7db2ab'
             '8a9d76eecf8795ca645fb1ce261733965578e953f6606153ce001a0e15d036e8'
             'a73e33644682d9f430db987c192da0f7193907af50539669ebd59614a5ebd0f9'
             '2ea82cdbd695f21c935710847913ed58e22d3d5c0c18c96175a4a6cc1142c071'
-            'ca89cc013844c5b50abfde4cc5e852ecdf4368f8b069ffd069a7100843c46e90')
+            'ca89cc013844c5b50abfde4cc5e852ecdf4368f8b069ffd069a7100843c46e90'
+            'b4a4fbddebfa614d1a97e77dde98748682ee331fbf7be394480050670d6203aa'
+            '3dc795002b8763a7d29db94f0af200131da9ce5ffc233bfd8916060f83a8fad7'
+            '416a1422eed71efcebb1d893de74e7f27e408323a56c4df003db37f5673b3f96'
+            'bc6ac3e686e16f0357fd3b939c1c1f2845fdb444d5ec9c8c37fb69167cc54a28')
 
 prepare() {
   cd "${pkgbase}-${pkgver}"
-  # fix FS#43884, not yet upstream
+  # fix FS#43884, merged upstream
   patch -Np1 -i ../os-access-fix-regression-in-server-interpreted-auth.patch
-  # partially fix FS#43867, not yet upstream
+  # partially fix FS#43867, merged upstream
   patch -Np1 -i ../v2-xserver-Fix-a-crash-with-XDMCP-error-handler.patch
   # fix FS#43924, merged upstream
   patch -Np1 -i ../0001-int10-Fix-error-check-for-pci_device_map_legacy.patch
   # fix FS#43937, merged upstream
   patch -Np1 -i ../0001-mi-Partial-pie-slice-filled-arcs-may-need-more-space.patch
+  # fix FS#45245, merged upstream
+  patch -Np1 -i ../0001-sdksyms.sh-Make-sdksyms.sh-work-with-gcc5.patch
+  # fix FS#45229, merged upstream
+  patch -Np1 -i ../0001-dix-Add-unaccelerated-valuators-to-the-ValuatorMask.patch
+  patch -Np1 -i ../0002-dix-hook-up-the-unaccelerated-valuator-masks.patch
+  # fix CVE-2015-3164, merged upstream
+  patch -Np1 -i ../fix-CVE-2015-3164.patch
 
   # fix os name:
   #Build Operating System = OSNAME="--kernel-name --kernel-release --machine" OSVENDOR=""
@@ -124,7 +139,7 @@ package_xorg-server() {
   depends=(libepoxy libxdmcp libxfont libpciaccess libdrm pixman libgcrypt libxau "xorg-server-common=$pkgver" xf86-input-evdev libxshmfence libgl)
   # see xorg-server-*/hw/xfree86/common/xf86Module.h for ABI versions - we provide major numbers that drivers can depend on
   # and /usr/lib/pkgconfig/xorg-server.pc in xorg-server-devel pkg
-  provides=('X-ABI-VIDEODRV_VERSION=19' 'X-ABI-XINPUT_VERSION=21' 'X-ABI-EXTENSION_VERSION=9.0' 'x-server')
+  provides=('X-ABI-VIDEODRV_VERSION=19' 'X-ABI-XINPUT_VERSION=21.1' 'X-ABI-EXTENSION_VERSION=9.0' 'x-server')
   groups=('xorg')
   conflicts=('nvidia-utils' 'glamor-egl' 'xf86-video-modesetting' "${pkgbase}-libre" "${pkgbase}-parabola")
   replaces=('nvidia-utils' 'glamor-egl' 'xf86-video-modesetting' "${pkgbase}-libre" "${pkgbase}-parabola")