[tigervnc/f21: 4/4] Merge branch 'f20' into f21

[Tim Waugh]

commit d1c6b0770d3e8609218a946aac11634c9b347279
Merge: 16645cc 4cc2b0e
Author: Tim Waugh <twaugh at redhat.com>
Date:   Tue Jul 15 10:34:09 2014 +0100

    Merge branch 'f20' into f21

 tigervnc-ext-init.patch     |   20 +++
 tigervnc-inputreset.patch   |  383 +++++++++++++++++++++++++++++++++++++++++++
 tigervnc-pointersync.patch  |   21 ++-
 tigervnc-undo-fc23895.patch |   48 ++++++
 tigervnc.spec               |    9 +-
 5 files changed, 472 insertions(+), 9 deletions(-)
---
diff --cc tigervnc.spec
index 9fd1c7d,23cb62f..fdedb10
--- a/tigervnc.spec
+++ b/tigervnc.spec
@@@ -55,12 -50,9 +55,13 @@@ Patch10:	tigervnc-1.3.0-xserver-1.15.pa
  Patch11:	tigervnc-format-security.patch
  Patch12:	tigervnc-zrle-crash.patch
  Patch13:	tigervnc-cursor.patch
 -Patch14:	tigervnc-CVE-2014-0011.patch
 -Patch15:	tigervnc-inputreset.patch
 -Patch16:	tigervnc-pointersync.patch
 +Patch14:	tigervnc-xstartup.patch
 +Patch15:        tigervnc-1.3.1-xserver-1.16.patch
- Patch16:	tigervnc-pointersync.patch
++Patch16:	tigervnc-inputreset.patch
++Patch17:	tigervnc-pointersync.patch
 +
 +# This is tigervnc-%{version}/unix/xserver114.patch rebased on the latest xorg
 +Patch100:       tigervnc-xserver-1.14-rebased.patch
  
  %description
  Virtual Network Computing (VNC) is a remote display system which
@@@ -194,13 -186,14 +195,16 @@@ pop
  # Fixed viewer crash when cursor has not been set (bug #1038701).
  %patch13 -p1 -b .cursor
  
 -# Fixed heap-based buffer overflow (CVE-2014-0011, bug #1050928).
 -%patch14 -p1 -b .CVE-2014-0011
 +# Clearer xstartup file (bug #923655).
 +%patch14 -p1 -b .xstartup
 +
 +%patch15 -p1 -b .116
  
+ # Input reset fixes from upstream (bug #1116956).
 -%patch15 -p1 -b .input-reset
++%patch16 -p1 -b .input-reset
+ 
  # Keep pointer in sync when using module (upstream bug #152).
--%patch16 -p1 -b .pointersync
++%patch17 -p1 -b .pointersync
  
  %build
  %ifarch sparcv9 sparc64 s390 s390x
@@@ -372,39 -367,15 +376,40 @@@ f
  %{_datadir}/icons/hicolor/*/apps/*
  
  %changelog
 -* Mon Jul 14 2014 Tim Waugh <twaugh at redhat.com> 1.3.0-16
 +* Tue Jul 15 2014 Tim Waugh <twaugh at redhat.com> - 1.3.1-8
+ - Input reset fixes from upstream (bug #1116956).
 +- No longer need ppc64le patch as it's now in xorg-x11-server.
 +- Rebased xserver114.patch again.
 +
 +* Fri Jun 20 2014 Hans de Goede <hdegoede at redhat.com> - 1.3.1-7
 +- xserver 1.15.99.903 ABI rebuild
  
 -* Thu May 22 2014 Tim Waugh <twaugh at redhat.com> 1.3.0-15
 +* Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.1-6
 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 +
 +* Thu May 22 2014 Tim Waugh <twaugh at redhat.com> 1.3.1-5
  - Keep pointer in sync when using module (upstream bug #152).
  
 -* Wed Mar 19 2014 Tim Waugh <twaugh at redhat.com> 1.3.0-14
 +* Mon Apr 28 2014 Adam Jackson <ajax at redhat.com> 1.3.1-4
 +- Add version interlocks for -server-module
 +
 +* Mon Apr 28 2014 Hans de Goede <hdegoede at redhat.com> - 1.3.1-3
 +- xserver 1.15.99-20140428 git snapshot ABI rebuild
 +
 +* Mon Apr  7 2014 Tim Waugh <twaugh at redhat.com> 1.3.1-2
 +- Allow build with dri3 and present extensions (bug #1063392).
 +
 +* Thu Mar 27 2014 Tim Waugh <twaugh at redhat.com> 1.3.1-1
 +- 1.3.1 (bug #1078806).
 +- Add ppc64le support (bug #1078495).
 +
 +* Wed Mar 19 2014 Tim Waugh <twaugh at redhat.com> 1.3.0-15
 +- Disable dri3 to enable building (bug #1063392).
  - Fixed heap-based buffer overflow (CVE-2014-0011, bug #1050928).
  
 +* Fri Feb 21 2014 Tim Waugh <twaugh at redhat.com> 1.3.0-14
 +- Enabled hardened build (bug #955206).
 +
  * Mon Feb 10 2014 Tim Waugh <twaugh at redhat.com> 1.3.0-13
  - Clearer xstartup file (bug #923655).