From c884cb0a70171e84750298a20c6f738772e8916ccd4c35e67778e7487f32b36f Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.com>
Date: Wed, 11 Feb 2015 09:35:59 +0000
Subject: [PATCH] Accepting request 285474 from home:tobijk:X11:XOrg

- Update to version 1.17.1:
  Fixes for CVE 2015-0255.
  + xkb: Don't swap XkbSetGeometry data in the input buffer
  + xkb: Check strings length against request size

OBS-URL: https://build.opensuse.org/request/show/285474
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=559
---
 xorg-server-1.17.0.tar.bz2 | 3 ---
 xorg-server-1.17.1.tar.bz2 | 3 +++
 xorg-x11-server.changes    | 8 ++++++++
 xorg-x11-server.spec       | 5 +++--
 4 files changed, 14 insertions(+), 5 deletions(-)
 delete mode 100644 xorg-server-1.17.0.tar.bz2
 create mode 100644 xorg-server-1.17.1.tar.bz2

diff --git a/xorg-server-1.17.0.tar.bz2 b/xorg-server-1.17.0.tar.bz2
deleted file mode 100644
index 884c518..0000000
--- a/xorg-server-1.17.0.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4e8548bae163129d2fc8f8e1f3b6071fe9d62821e3d5617507ccd2f589526166
-size 5852312
diff --git a/xorg-server-1.17.1.tar.bz2 b/xorg-server-1.17.1.tar.bz2
new file mode 100644
index 0000000..37ca7c4
--- /dev/null
+++ b/xorg-server-1.17.1.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2bf8e9f6f0a710dec1d2472467bff1f4e247cb6dcd76eb469aafdc8a2d7db2ab
+size 5852385
diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes
index 35c8ea8..135fd1b 100644
--- a/xorg-x11-server.changes
+++ b/xorg-x11-server.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Feb 10 23:27:48 UTC 2015 - tobias.johannes.klausmann@mni.thm.de
+
+- Update to version 1.17.1:
+  Fixes for CVE 2015-0255. 
+  + xkb: Don't swap XkbSetGeometry data in the input buffer
+  + xkb: Check strings length against request size
+
 -------------------------------------------------------------------
 Fri Feb  6 14:39:07 UTC 2015 - eich@suse.com
 
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 2895eee..cc0b446 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package xorg-x11-server
 #
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +18,7 @@
 
 Name:           xorg-x11-server
 
-%define dirsuffix 1.17.0
+%define dirsuffix 1.17.1
 
 Summary:        X
 License:        MIT
@@ -485,6 +485,7 @@ fi
 %{_sysconfdir}/rpm/macros.xorg-server
 
 %files source
+%defattr(-,root,root)
 /usr/src/xserver
 
 %changelog