Hello community,
here is the log from the commit of package tigervnc for openSUSE:Factory checked in at 2015-01-15 15:58:11
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/tigervnc (Old)
and /work/SRC/openSUSE:Factory/.tigervnc.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tigervnc"
Changes:
--------
--- /work/SRC/openSUSE:Factory/tigervnc/tigervnc.changes 2014-11-24 11:17:30.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.tigervnc.new/tigervnc.changes 2015-01-15 15:58:12.000000000 +0100
@@ -1,0 +2,12 @@
+Fri Jan 9 12:50:45 UTC 2015 - msrb@suse.com
+
+- Update to tigervnc 1.4.1 on xorg-server 1.16.1.
+- Drop upstreamed or obsolete patches:
+ tigervnc-sf3492352.diff
+ u_aarch64-support.patch
+ u_tigervnc-check-shm-harder.patch
+ u_arch-Fix-image-and-bitmap-byte-order-for-ppc64le.patch
+ u_tigervnc-1.3.0-fix-use-after-free.patch
+ tigervnc-1.2.80-fix-int-to-pointer.patch
+
+-------------------------------------------------------------------
Old:
----
tigervnc-1.2.80-fix-int-to-pointer.patch
tigervnc-1.3.1.tar.bz2
tigervnc-sf3492352.diff
u_aarch64-support.patch
u_arch-Fix-image-and-bitmap-byte-order-for-ppc64le.patch
u_tigervnc-1.3.0-fix-use-after-free.patch
u_tigervnc-check-shm-harder.patch
xorg-server-1.14.0.tar.bz2
New:
----
tigervnc-1.4.1.tar.gz
xorg-server-1.16.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ tigervnc.spec ++++++
--- /var/tmp/diff_new_pack.SNjj9i/_old 2015-01-15 15:58:14.000000000 +0100
+++ /var/tmp/diff_new_pack.SNjj9i/_new 2015-01-15 15:58:14.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package tigervnc
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: tigervnc
-Version: 1.3.1
+Version: 1.4.1
Release: 0
Provides: tightvnc = 1.3.9
Obsoletes: tightvnc < 1.3.9
@@ -90,8 +90,8 @@
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.1.tar.bz2
-Source2: xorg-server-1.14.0.tar.bz2
+Source1: tigervnc-1.4.1.tar.gz
+Source2: xorg-server-1.16.1.tar.bz2
Source3: vnc.xinetd
Source4: 10-libvnc.conf
Source5: vnc-server.firewall
@@ -102,25 +102,19 @@
Source10: index.vnc
# Tiger vnc patches
-Patch1: u_tigervnc-1.3.0-fix-use-after-free.patch
-Patch2: tigervnc-newfbsize.patch
-Patch3: tigervnc-clean-pressed-key-on-exit.patch
-Patch4: tigervnc-sf3492352.diff
-Patch5: tigervnc-sf3495623.patch
-Patch6: u_tigervnc-dont-send-ascii-control-characters.patch
-Patch7: u_tigervnc-ignore-epipe-on-write.patch
-Patch8: n_tigervnc-date-time.patch
-Patch9: U_include-vencrypt-only-if-any-subtype-present.patch
-Patch10: u_tigervnc-check-shm-harder.patch
-Patch11: u_tigervnc-use_preferred_mode.patch
-Patch12: u_tigervnc-cve-2014-8240.patch
+Patch1: tigervnc-newfbsize.patch
+Patch2: tigervnc-clean-pressed-key-on-exit.patch
+Patch3: tigervnc-sf3495623.patch
+Patch4: u_tigervnc-dont-send-ascii-control-characters.patch
+Patch5: u_tigervnc-ignore-epipe-on-write.patch
+Patch6: n_tigervnc-date-time.patch
+Patch7: U_include-vencrypt-only-if-any-subtype-present.patch
+Patch8: u_tigervnc-use_preferred_mode.patch
+Patch9: u_tigervnc-cve-2014-8240.patch
# Xserver patches
-Patch20: tigervnc-1.2.80-fix-int-to-pointer.patch
-Patch21: u_aarch64-support.patch
-Patch22: N_xorg-server-xdmcp.patch
-Patch23: n_tigervnc-dont-build-gtf.patch
-Patch24: u_arch-Fix-image-and-bitmap-byte-order-for-ppc64le.patch
+Patch20: N_xorg-server-xdmcp.patch
+Patch21: n_tigervnc-dont-build-gtf.patch
%description
TigerVNC is a high-performance, platform-neutral implementation of VNC (Virtual Network Computing),
@@ -150,23 +144,17 @@
%patch1 -p1
%patch2 -p1
%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p0
+%patch4 -p0
+%patch5 -p0
+%patch6 -p1
%patch7 -p0
-%patch8 -p1
-%patch9 -p0
-%patch10 -p0
-%patch11 -p0
-%patch12 -p1
+%patch8 -p0
+%patch9 -p1
pushd unix/xserver
-patch -p1 < ../xserver114.patch
+patch -p1 < ../xserver116.patch
%patch20 -p1
%patch21 -p1
-%patch22 -p1
-%patch23 -p1
-%patch24 -p1
popd
%build
@@ -254,7 +242,7 @@
%defattr(-,root,root,-)
%ghost %{_bindir}/vncviewer
%{_bindir}/vncviewer-tigervnc
-%exclude /usr/share/doc/tigervnc-1.3.1
+%exclude /usr/share/doc/tigervnc-1.4.1
%doc LICENCE.TXT
%doc README.txt
%ghost %_mandir/man1/vncviewer.1.gz
++++++ n_tigervnc-date-time.patch ++++++
--- /var/tmp/diff_new_pack.SNjj9i/_old 2015-01-15 15:58:14.000000000 +0100
+++ /var/tmp/diff_new_pack.SNjj9i/_new 2015-01-15 15:58:14.000000000 +0100
@@ -1,40 +1,54 @@
---- tigervnc-1.3.1.orig/unix/xserver/hw/vnc/buildtime.c
-+++ tigervnc-1.3.1/unix/xserver/hw/vnc/buildtime.c
+Index: tigervnc-1.4.1/unix/xserver/hw/vnc/buildtime.c
+===================================================================
+--- tigervnc-1.4.1.orig/unix/xserver/hw/vnc/buildtime.c
++++ tigervnc-1.4.1/unix/xserver/hw/vnc/buildtime.c
@@ -15,4 +15,4 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
* USA.
*/
-char buildtime[] = __DATE__ " " __TIME__;
+char buildtime[] = "??? ?? ???? ??:??:??";
---- tigervnc-1.3.1.orig/unix/vncconfig/buildtime.c
-+++ tigervnc-1.3.1/unix/vncconfig/buildtime.c
+Index: tigervnc-1.4.1/unix/vncconfig/buildtime.c
+===================================================================
+--- tigervnc-1.4.1.orig/unix/vncconfig/buildtime.c
++++ tigervnc-1.4.1/unix/vncconfig/buildtime.c
@@ -15,4 +15,4 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
* USA.
*/
-char buildtime[] = __DATE__ " " __TIME__;
+char buildtime[] = "??? ?? ???? ??:??:??";
---- tigervnc-1.3.1.orig/unix/x0vncserver/buildtime.c
-+++ tigervnc-1.3.1/unix/x0vncserver/buildtime.c
+Index: tigervnc-1.4.1/unix/x0vncserver/buildtime.c
+===================================================================
+--- tigervnc-1.4.1.orig/unix/x0vncserver/buildtime.c
++++ tigervnc-1.4.1/unix/x0vncserver/buildtime.c
@@ -15,4 +15,4 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
* USA.
*/
-char buildtime[] = __DATE__ " " __TIME__;
+char buildtime[] = "??? ?? ???? ??:??:??";
---- tigervnc-1.3.1.orig/vncviewer/buildTime.cxx
-+++ tigervnc-1.3.1/vncviewer/buildTime.cxx
-@@ -15,4 +15,4 @@
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- * USA.
- */
--const char* buildTime = "Built on " __DATE__ " at " __TIME__;
-+const char* buildTime = "Built on ??? ?? ???? at ??:??:??";
---- tigervnc-1.3.1.orig/win/winvnc/buildTime.cxx
-+++ tigervnc-1.3.1/win/winvnc/buildTime.cxx
+Index: tigervnc-1.4.1/win/winvnc/buildTime.cxx
+===================================================================
+--- tigervnc-1.4.1.orig/win/winvnc/buildTime.cxx
++++ tigervnc-1.4.1/win/winvnc/buildTime.cxx
@@ -15,4 +15,4 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
* USA.
*/
-const char* buildTime = "Built on " __DATE__ " at " __TIME__;
+const char* buildTime = "Built on ??? ?? ???? at ??:??:??";
+Index: tigervnc-1.4.1/CMakeLists.txt
+===================================================================
+--- tigervnc-1.4.1.orig/CMakeLists.txt
++++ tigervnc-1.4.1/CMakeLists.txt
+@@ -39,8 +39,7 @@ if(MSVC)
+ message(FATAL_ERROR "TigerVNC cannot be built with Visual Studio. Please use MinGW")
+ endif()
+
+-set(BUILD_TIMESTAMP "")
+-execute_process(COMMAND "date" "+%Y-%m-%d %H:%M" OUTPUT_VARIABLE BUILD_TIMESTAMP)
++set(BUILD_TIMESTAMP "??-??-?? ??:??")
+
+ if(NOT BUILD_TIMESTAMP)
+ set(BUILD_TIMESTAMP "")
++++++ tigervnc-clean-pressed-key-on-exit.patch ++++++
--- /var/tmp/diff_new_pack.SNjj9i/_old 2015-01-15 15:58:14.000000000 +0100
+++ /var/tmp/diff_new_pack.SNjj9i/_new 2015-01-15 15:58:14.000000000 +0100
@@ -1,8 +1,8 @@
-diff --git a/vncviewer/DesktopWindow.cxx b/vncviewer/DesktopWindow.cxx
-index 40d08ae..7a571ec 100644
---- a/vncviewer/DesktopWindow.cxx
-+++ b/vncviewer/DesktopWindow.cxx
-@@ -186,6 +186,8 @@ DesktopWindow::~DesktopWindow()
+Index: tigervnc-1.4.1/vncviewer/DesktopWindow.cxx
+===================================================================
+--- tigervnc-1.4.1.orig/vncviewer/DesktopWindow.cxx
++++ tigervnc-1.4.1/vncviewer/DesktopWindow.cxx
+@@ -188,6 +188,8 @@ DesktopWindow::~DesktopWindow()
OptionsDialog::removeCallback(handleOptions);
@@ -11,11 +11,11 @@
// FLTK automatically deletes all child widgets, so we shouldn't touch
// them ourselves here
}
-diff --git a/vncviewer/Viewport.cxx b/vncviewer/Viewport.cxx
-index e308a63..41733f9 100644
---- a/vncviewer/Viewport.cxx
-+++ b/vncviewer/Viewport.cxx
-@@ -112,6 +112,11 @@ Viewport::Viewport(int w, int h, const rfb::PixelFormat& serverPF, CConn* cc_)
+Index: tigervnc-1.4.1/vncviewer/Viewport.cxx
+===================================================================
+--- tigervnc-1.4.1.orig/vncviewer/Viewport.cxx
++++ tigervnc-1.4.1/vncviewer/Viewport.cxx
+@@ -144,6 +144,11 @@ Viewport::Viewport(int w, int h, const r
Viewport::~Viewport()
{
@@ -26,12 +26,12 @@
+
// Unregister all timeouts in case they get a change tro trigger
// again later when this object is already gone.
- Fl::remove_timeout(handleUpdateTimeout, this);
-diff --git a/vncviewer/vncviewer.cxx b/vncviewer/vncviewer.cxx
-index 37d63a6..5bb811d 100644
---- a/vncviewer/vncviewer.cxx
-+++ b/vncviewer/vncviewer.cxx
-@@ -83,6 +83,8 @@ char vncServerName[VNCSERVERNAMELEN] = { '\0' };
+ Fl::remove_timeout(handlePointerTimeout, this);
+Index: tigervnc-1.4.1/vncviewer/vncviewer.cxx
+===================================================================
+--- tigervnc-1.4.1.orig/vncviewer/vncviewer.cxx
++++ tigervnc-1.4.1/vncviewer/vncviewer.cxx
+@@ -88,6 +88,8 @@ char vncServerName[VNCSERVERNAMELEN] = {
static bool exitMainloop = false;
static const char *exitError = NULL;
@@ -40,10 +40,10 @@
void exit_vncviewer(const char *error)
{
// Prioritise the first error we get as that is probably the most
-@@ -110,6 +112,16 @@ static void CleanupSignalHandler(int sig)
+@@ -114,6 +116,16 @@ static void CleanupSignalHandler(int sig
// CleanupSignalHandler allows C++ object cleanup to happen because it calls
// exit() rather than the default which is to abort.
- vlog.info("CleanupSignalHandler called");
+ vlog.info(_("CleanupSignalHandler called"));
+ delete cc;
+ exit(1);
+}
@@ -57,7 +57,7 @@
exit(1);
}
-@@ -384,6 +396,10 @@ int main(int argc, char** argv)
+@@ -392,11 +404,19 @@ int main(int argc, char** argv)
init_fltk();
@@ -65,10 +65,19 @@
+
+ XSetIOErrorHandler(CleanupXIOErrorHandler);
+
+ #if !defined(WIN32) && !defined(__APPLE__)
+ fl_open_display();
+ XkbSetDetectableAutoRepeat(fl_display, True, NULL);
+ #endif
+
++ fl_open_display();
++
++ XSetIOErrorHandler(CleanupXIOErrorHandler);
++
Configuration::enableViewerParams();
/* Load the default parameter settings */
-@@ -484,7 +500,7 @@ int main(int argc, char** argv)
+@@ -497,7 +517,7 @@ int main(int argc, char** argv)
#endif
}
++++++ tigervnc-newfbsize.patch ++++++
--- /var/tmp/diff_new_pack.SNjj9i/_old 2015-01-15 15:58:14.000000000 +0100
+++ /var/tmp/diff_new_pack.SNjj9i/_new 2015-01-15 15:58:14.000000000 +0100
@@ -1,12 +1,13 @@
-diff -up a/vncviewer/CConn.cxx.newfbsize b/vncviewer/CConn.cxx
---- a/vncviewer/CConn.cxx.newfbsize 2008-10-23 13:00:59.000000000 +0200
-+++ b/vncviewer/CConn.cxx 2008-10-23 13:01:11.000000000 +0200
-@@ -327,6 +327,8 @@ void CConn::beginRect(const Rect& r, uns
- if (encoding != encodingCopyRect) {
+Index: tigervnc-1.4.1/vncviewer/CConn.cxx
+===================================================================
+--- tigervnc-1.4.1.orig/vncviewer/CConn.cxx
++++ tigervnc-1.4.1/vncviewer/CConn.cxx
+@@ -424,6 +424,8 @@ void CConn::dataRect(const Rect& r, int
+
+ if (encoding != encodingCopyRect)
lastServerEncoding = encoding;
- }
+ if (encoding == pseudoEncodingDesktopSize)
+ setDesktopSize( r.width(), r.height() );
- }
- void CConn::endRect(const Rect& r, int encoding)
+ if (!Decoder::supported(encoding)) {
+ vlog.error(_("Unknown rect encoding %d"), encoding);
++++++ u_tigervnc-cve-2014-8240.patch ++++++
--- /var/tmp/diff_new_pack.SNjj9i/_old 2015-01-15 15:58:14.000000000 +0100
+++ /var/tmp/diff_new_pack.SNjj9i/_new 2015-01-15 15:58:14.000000000 +0100
@@ -2,9 +2,10 @@
References: bnc#900896 CVE-2014-8240
Signed-off-by: Michal Srb