Update to 1.17.2

2 files changed, 9 insertions, 70 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1767201a220b..6c7d0835ec3b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = xorg-server-hwcursor-gamma
 	pkgdesc = Xorg X server with patch to apply gamma ramps on hardware cursors
-	pkgver = 1.17.1
-	pkgrel = 7
+	pkgver = 1.17.2
+	pkgrel = 1
 	url = http://xorg.freedesktop.org
 	arch = i686
 	arch = x86_64
@@ -65,7 +65,7 @@ pkgbase = xorg-server-hwcursor-gamma
 	depends = xf86-input-evdev
 	depends = libxshmfence
 	depends = libgl
-	provides = xorg-server=1.17.1
+	provides = xorg-server=1.17.2
 	provides = X-ABI-VIDEODRV_VERSION=19
 	provides = X-ABI-XINPUT_VERSION=21.1
 	provides = X-ABI-EXTENSION_VERSION=9.0
@@ -76,39 +76,21 @@ pkgbase = xorg-server-hwcursor-gamma
 	conflicts = xf86-video-modesetting
 	replaces = glamor-egl
 	replaces = xf86-video-modesetting
-	source = http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.17.1.tar.bz2
+	source = http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.17.2.tar.bz2
 	source = nvidia-drm-outputclass.conf
 	source = xvfb-run
 	source = xvfb-run.1
-	source = os-access-fix-regression-in-server-interpreted-auth.patch
-	source = v2-xserver-Fix-a-crash-with-XDMCP-error-handler.patch
-	source = 0001-int10-Fix-error-check-for-pci_device_map_legacy.patch
-	source = 0001-mi-Partial-pie-slice-filled-arcs-may-need-more-space.patch
-	source = 0001-sdksyms.sh-Make-sdksyms.sh-work-with-gcc5.patch
 	source = 0001-dix-Add-unaccelerated-valuators-to-the-ValuatorMask.patch
 	source = 0002-dix-hook-up-the-unaccelerated-valuator-masks.patch
-	source = fix-CVE-2015-3164.patch
-	source = systemd-logind-dont-second-guess-D-Bus-default-tim.patch
-	source = systemd-logind-filter-out-non-signal-messages-from.patch
-	source = 0001-modesetting-Fix-software-cursor-fallback.patch
 	source = 0001-When-an-cursor-is-set-it-is-adjusted-to-use-the.patch
 	source = 0002-Fix-for-full-and-semi-transparency-under-negative-im.patch
 	source = 0003-Use-Harms-s-suggest-do-not-use-inline-if.-And-fix-si.patch
-	sha256sums = 2bf8e9f6f0a710dec1d2472467bff1f4e247cb6dcd76eb469aafdc8a2d7db2ab
+	sha256sums = f61120612728f2c5034671d0ca3e2273438c60aba93b3dda4a8aa40e6a257993
 	sha256sums = af1c3d2ea5de7f6a6b5f7c60951a189a4749d1495e5462f3157ae7ac8fe1dc56
 	sha256sums = ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9
 	sha256sums = 2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776
-	sha256sums = 8a9d76eecf8795ca645fb1ce261733965578e953f6606153ce001a0e15d036e8
-	sha256sums = a73e33644682d9f430db987c192da0f7193907af50539669ebd59614a5ebd0f9
-	sha256sums = 2ea82cdbd695f21c935710847913ed58e22d3d5c0c18c96175a4a6cc1142c071
-	sha256sums = ca89cc013844c5b50abfde4cc5e852ecdf4368f8b069ffd069a7100843c46e90
-	sha256sums = b4a4fbddebfa614d1a97e77dde98748682ee331fbf7be394480050670d6203aa
 	sha256sums = 3dc795002b8763a7d29db94f0af200131da9ce5ffc233bfd8916060f83a8fad7
 	sha256sums = 416a1422eed71efcebb1d893de74e7f27e408323a56c4df003db37f5673b3f96
-	sha256sums = bc6ac3e686e16f0357fd3b939c1c1f2845fdb444d5ec9c8c37fb69167cc54a28
-	sha256sums = a8b9670844d784e9a0d6880f5689bbc107e071518acdbaa8c3ce5debca6b663b
-	sha256sums = 97e4d5a6cfcf916889c493e232aec6f16d9447eb641bafb6e0afa9b27cfdc47e
-	sha256sums = a0c0dbf5fe27994d52d5892c9c7cecf72792c5fa35db57b112ee7b17980faa75
 	sha256sums = bea348631dedd66475d84ac2cfe0840f22a80a642b4680d73fead4749e47f055
 	sha256sums = be9169b937b5d0b44f7f05d7c08aaa5f0c1092e128ce261d9cb350f09dfe1fb0
 	sha256sums = 0a643ae83e03faee0f4db669a33c5b3c99edbba5c86cde2c83962ae536d31081
diff --git a/PKGBUILD b/PKGBUILD
index 6c331ec9f84e..753ad3938ed3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,8 +4,8 @@
 
 _pkgname=xorg-server
 pkgname=xorg-server-hwcursor-gamma
-pkgver=1.17.1
-pkgrel=7
+pkgver=1.17.2
+pkgrel=1
 pkgdesc="Xorg X server with patch to apply gamma ramps on hardware cursors"
 depends=(libepoxy libxdmcp libxfont libpciaccess libdrm pixman libgcrypt libxau xorg-server-common xf86-input-evdev libxshmfence libgl)
 provides=("xorg-server=${pkgver}" 'X-ABI-VIDEODRV_VERSION=19' 'X-ABI-XINPUT_VERSION=21.1' 'X-ABI-EXTENSION_VERSION=9.0' 'x-server')
@@ -25,35 +25,17 @@ source=(${url}/releases/individual/xserver/${_pkgname}-${pkgver}.tar.bz2
 	nvidia-drm-outputclass.conf
         xvfb-run
         xvfb-run.1
-	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-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
-        systemd-logind-dont-second-guess-D-Bus-default-tim.patch
-        systemd-logind-filter-out-non-signal-messages-from.patch
-        0001-modesetting-Fix-software-cursor-fallback.patch
 	0001-When-an-cursor-is-set-it-is-adjusted-to-use-the.patch
 	0002-Fix-for-full-and-semi-transparency-under-negative-im.patch
 	0003-Use-Harms-s-suggest-do-not-use-inline-if.-And-fix-si.patch)
-sha256sums=('2bf8e9f6f0a710dec1d2472467bff1f4e247cb6dcd76eb469aafdc8a2d7db2ab'
+sha256sums=('f61120612728f2c5034671d0ca3e2273438c60aba93b3dda4a8aa40e6a257993'
             'af1c3d2ea5de7f6a6b5f7c60951a189a4749d1495e5462f3157ae7ac8fe1dc56'
             'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9'
             '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776'
-	    '8a9d76eecf8795ca645fb1ce261733965578e953f6606153ce001a0e15d036e8'
-	    'a73e33644682d9f430db987c192da0f7193907af50539669ebd59614a5ebd0f9'
-	    '2ea82cdbd695f21c935710847913ed58e22d3d5c0c18c96175a4a6cc1142c071'
-	    'ca89cc013844c5b50abfde4cc5e852ecdf4368f8b069ffd069a7100843c46e90'
-	    'b4a4fbddebfa614d1a97e77dde98748682ee331fbf7be394480050670d6203aa'
             '3dc795002b8763a7d29db94f0af200131da9ce5ffc233bfd8916060f83a8fad7'
             '416a1422eed71efcebb1d893de74e7f27e408323a56c4df003db37f5673b3f96'
-            'bc6ac3e686e16f0357fd3b939c1c1f2845fdb444d5ec9c8c37fb69167cc54a28'
-            'a8b9670844d784e9a0d6880f5689bbc107e071518acdbaa8c3ce5debca6b663b'
-            '97e4d5a6cfcf916889c493e232aec6f16d9447eb641bafb6e0afa9b27cfdc47e'
-            'a0c0dbf5fe27994d52d5892c9c7cecf72792c5fa35db57b112ee7b17980faa75'
 	    'bea348631dedd66475d84ac2cfe0840f22a80a642b4680d73fead4749e47f055'
 	    'be9169b937b5d0b44f7f05d7c08aaa5f0c1092e128ce261d9cb350f09dfe1fb0'
 	    '0a643ae83e03faee0f4db669a33c5b3c99edbba5c86cde2c83962ae536d31081')
@@ -65,35 +47,10 @@ prepare() {
   patch -Np1 -i ../0001-When-an-cursor-is-set-it-is-adjusted-to-use-the.patch
   patch -Np1 -i ../0002-Fix-for-full-and-semi-transparency-under-negative-im.patch
   patch -Np1 -i ../0003-Use-Harms-s-suggest-do-not-use-inline-if.-And-fix-si.patch
-  
-  msg2 'fix FS#43884, merged upstream'
-  patch -Np1 -i ../os-access-fix-regression-in-server-interpreted-auth.patch
 
-  msg2 'partially fix FS#43867, merged upstream'
-  patch -Np1 -i ../v2-xserver-Fix-a-crash-with-XDMCP-error-handler.patch
-
-  msg2 'fix FS#43924, merged upstream'
-  patch -Np1 -i ../0001-int10-Fix-error-check-for-pci_device_map_legacy.patch
-
-  msg2 'fix FS#43937, merged upstream'
-  patch -Np1 -i ../0001-mi-Partial-pie-slice-filled-arcs-may-need-more-space.patch
-
-  msg2 'fix FS#45245, merged upstream'
-  patch -Np1 -i ../0001-sdksyms.sh-Make-sdksyms.sh-work-with-gcc5.patch
-
-  msg2 'fix FS#45229, merged upstream'
+  msg2 '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
-
-  msg2 'fix CVE-2015-3164, merged upstream'
-  patch -Np1 -i ../fix-CVE-2015-3164.patch
-
-  msg2 'Fix FS#44304, merged upstream'
-  patch -Np1 -i ../systemd-logind-filter-out-non-signal-messages-from.patch
-  patch -Np1 -i ../systemd-logind-dont-second-guess-D-Bus-default-tim.patch
-
-  msg2 'Fix software cursor fallback (possible fix for FS#44602)'
-  patch -Np1 -i ../0001-modesetting-Fix-software-cursor-fallback.patch
 }
 
 build() {