- up to 1.17.2; fixes CVE-2015-3164 (xwayland)

diff --git a/xorg-xserver-server-export-GetMaster.patch b/xorg-xserver-server-export-GetMaster.patch
deleted file mode 100644 (file)
index a7b48b7..0000000
--- a/xorg-xserver-server-export-GetMaster.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/include/input.h b/include/input.h
-index 6ba1ab2..7c117b6 100644
---- a/include/input.h
-+++ b/include/input.h
-@@ -501,7 +501,7 @@ extern int AttachDevice(ClientPtr client,
-                         DeviceIntPtr master);
- 
- extern _X_EXPORT DeviceIntPtr GetPairedDevice(DeviceIntPtr kbd);
--extern DeviceIntPtr GetMaster(DeviceIntPtr dev, int type);
-+extern _X_EXPORT DeviceIntPtr GetMaster(DeviceIntPtr dev, int type);
- 
- extern _X_EXPORT int AllocDevicePair(ClientPtr client,
-                              char* name,

diff --git a/xorg-xserver-server.spec b/xorg-xserver-server.spec
index 59ab430f36d6dc50055273f9b4353a243a3304c3..a1a3e7d620641c0b281599053bd688d43ed61608 100644 (file)
--- a/xorg-xserver-server.spec
+++ b/xorg-xserver-server.spec
@@ -34,12 +34,12 @@
 Summary:       X.org server
 Summary(pl.UTF-8):     Serwer X.org
 Name:          xorg-xserver-server
-Version:       1.17.1
-Release:       3
+Version:       1.17.2
+Release:       1
 License:       MIT
 Group:         X11/Servers
 Source0:       http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-%{version}.tar.bz2
-# Source0-md5: 5986510d59e394a50126a8e2833e79d3
+# Source0-md5: 397e405566651150490ff493e463f1ad
 Source1:       10-quirks.conf
 Source2:       xserver.pamd
 Source10:      %{name}-Xvfb.init
@@ -51,7 +51,7 @@ Patch1:               %{name}-pic-libxf86config.patch
 Patch2:                dtrace-link.patch
 
 Patch4:                %{name}-builtin-SHA1.patch
-Patch5:                %{name}-export-GetMaster.patch
+
 Patch6:                110_nvidia_slowdow_fix.patch
 Patch7:                %{name}-include-defs.patch
 URL:           http://xorg.freedesktop.org/
@@ -433,7 +433,7 @@ Biblioteka rozszerzenia GLX dla serwera X.org.
 %patch2 -p1
 
 %patch4 -p1
-%patch5 -p1
+
 %patch6 -p1
 
 #unfortunately breaks build