From 3159c3c55e1b66e76732340340f6380f0345333fe8cc179a836b4196bd3e7808 Mon Sep 17 00:00:00 2001
From: Michal Srb <michalsrb@please-enter-an-email-address>
Date: Fri, 16 May 2014 14:00:26 +0000
Subject: [PATCH] Accepting request 234316 from
 home:michalsrb:branches:X11:XOrg

- Update to version 1.3.1
  * Security release (CVE-2014-0011).

OBS-URL: https://build.opensuse.org/request/show/234316
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/tigervnc?expand=0&rev=26
---
 tigervnc-1.3.0.tar.bz2     |  3 ---
 tigervnc-1.3.1.tar.bz2     |  3 +++
 tigervnc.changes           |  6 ++++++
 tigervnc.spec              | 10 +++++-----
 u_aarch64-support.patch    | 18 ------------------
 xorg-server-1.13.0.tar.bz2 |  3 ---
 xorg-server-1.14.0.tar.bz2 |  3 +++
 7 files changed, 17 insertions(+), 29 deletions(-)
 delete mode 100644 tigervnc-1.3.0.tar.bz2
 create mode 100644 tigervnc-1.3.1.tar.bz2
 delete mode 100644 xorg-server-1.13.0.tar.bz2
 create mode 100644 xorg-server-1.14.0.tar.bz2

diff --git a/tigervnc-1.3.0.tar.bz2 b/tigervnc-1.3.0.tar.bz2
deleted file mode 100644
index 1970f14..0000000
--- a/tigervnc-1.3.0.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:61e5a78118c3a4adbc3b3026615a1068aed43839c2ad62815832bbc780f38c5a
-size 1069481
diff --git a/tigervnc-1.3.1.tar.bz2 b/tigervnc-1.3.1.tar.bz2
new file mode 100644
index 0000000..28b3dcc
--- /dev/null
+++ b/tigervnc-1.3.1.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a5fca05898394847f2d2876d471622443acb7c648a896978d195e41f010ded51
+size 1077474
diff --git a/tigervnc.changes b/tigervnc.changes
index 9d4d38d..42963da 100644
--- a/tigervnc.changes
+++ b/tigervnc.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri May 16 13:52:19 UTC 2014 - msrb@suse.com
+
+- Update to version 1.3.1
+  * Security release (CVE-2014-0011).
+
 -------------------------------------------------------------------
 Mon Apr 28 01:00:39 UTC 2014 - sndirsch@suse.com
 
diff --git a/tigervnc.spec b/tigervnc.spec
index 5a91e24..feb129e 100644
--- a/tigervnc.spec
+++ b/tigervnc.spec
@@ -17,7 +17,7 @@
 
 
 Name:           tigervnc
-Version:        1.3.0
+Version:        1.3.1
 Release:        0
 Conflicts:      tightvnc
 BuildRequires:  Mesa-devel
@@ -84,8 +84,8 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Summary:        A high-performance, platform-neutral implementation of VNC
 License:        GPL-2.0 and MIT
 Group:          System/X11/Servers/XF86_4
-Source1:        tigervnc-1.3.0.tar.bz2
-Source2:        xorg-server-1.13.0.tar.bz2
+Source1:        tigervnc-1.3.1.tar.bz2
+Source2:        xorg-server-1.14.0.tar.bz2
 Source3:        vnc.xinetd
 Source4:        10-libvnc.conf
 Source5:        vnc-server.firewall
@@ -143,7 +143,7 @@ fi
 %patch6 -p0
 
 pushd unix/xserver
-patch -p1 < ../xserver113.patch
+patch -p1 < ../xserver114.patch
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
@@ -212,7 +212,7 @@ install -D -m 644 %{SOURCE10} $RPM_BUILD_ROOT%{_datadir}/vnc/classes
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %{_bindir}/vncviewer
-%exclude /usr/share/doc/tigervnc-1.3.0
+%exclude /usr/share/doc/tigervnc-1.3.1
 %doc LICENCE.TXT
 %doc README.txt
 %{_mandir}/man1/vncviewer.1*
diff --git a/u_aarch64-support.patch b/u_aarch64-support.patch
index 3b3d410..b628883 100644
--- a/u_aarch64-support.patch
+++ b/u_aarch64-support.patch
@@ -15,24 +15,6 @@ Index: xorg-server-1.13.2/hw/xfree86/os-support/linux/lnx_video.c
  
  /*
   * Due to conflicts with "compiler.h", don't rely on <sys/io.h> to declare
-@@ -511,7 +512,7 @@ xf86EnableIO(void)
- #endif
-     }
-     close(fd);
--#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__arm__) && !defined(__m32r__) && !defined(__nds32__)
-+#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__arm__) && !defined(__m32r__) && !defined(__nds32__) && !defined(__aarch64__)
-     if (ioperm(0, 1024, 1) || iopl(3)) {
-         if (errno == ENODEV)
-             ErrorF("xf86EnableIOPorts: no I/O ports found\n");
-@@ -540,7 +541,7 @@ xf86DisableIO(void)
- #if defined(__powerpc__)
-     munmap(ioBase, 0x20000);
-     ioBase = NULL;
--#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__arm__) && !defined(__s390__) && !defined(__m32r__) && !defined(__nds32__)
-+#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__arm__) && !defined(__s390__) && !defined(__m32r__) && !defined(__nds32__) && !defined(__aarch64__)
-     iopl(0);
-     ioperm(0, 1024, 0);
- #endif
 Index: xorg-server-1.13.2/include/servermd.h
 ===================================================================
 --- xorg-server-1.13.2.orig/include/servermd.h
diff --git a/xorg-server-1.13.0.tar.bz2 b/xorg-server-1.13.0.tar.bz2
deleted file mode 100644
index 6192017..0000000
--- a/xorg-server-1.13.0.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d5dfd6cda0597a6aafb16e08d18bc052e841b31e332839974e3211283f52e970
-size 3750165
diff --git a/xorg-server-1.14.0.tar.bz2 b/xorg-server-1.14.0.tar.bz2
new file mode 100644
index 0000000..2afbf2a
--- /dev/null
+++ b/xorg-server-1.14.0.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f7adfa5c1dd5cf228bb54794016d9e11ef389c1a70f91c33d72691c52e8a0f2b
+size 5530988