Hello community, here is the log from the commit of package tigervnc for openSUSE:Factory checked in at 2019-04-22 12:25:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tigervnc (Old) and /work/SRC/openSUSE:Factory/.tigervnc.new.5536 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tigervnc" Mon Apr 22 12:25:15 2019 rev:59 rq:696394 version:1.9.0 Changes: -------- --- /work/SRC/openSUSE:Factory/tigervnc/tigervnc.changes 2019-03-26 22:30:19.869736065 +0100 +++ /work/SRC/openSUSE:Factory/.tigervnc.new.5536/tigervnc.changes 2019-04-22 12:25:17.396978903 +0200 @@ -1,0 +2,6 @@ +Sat Apr 20 09:54:02 UTC 2019 - Stefan Dirsch <sndir...@suse.com> + +- tigervnc-1.9.0-199-005db35 + * update to current git master in order to fix boo#1132901 + +------------------------------------------------------------------- Old: ---- v1.9.0.tar.gz New: ---- tigervnc-1.9.0-199-005db35.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tigervnc.spec ++++++ --- /var/tmp/diff_new_pack.ec172R/_old 2019-04-22 12:25:18.308980136 +0200 +++ /var/tmp/diff_new_pack.ec172R/_new 2019-04-22 12:25:18.312980142 +0200 @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -108,9 +108,10 @@ Url: http://tigervnc.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: An implementation of VNC +#Source1: https://github.com/TigerVNC/tigervnc/archive/v%{version}.tar.gz License: GPL-2.0-only AND MIT Group: System/X11/Servers/XF86_4 -Source1: https://github.com/TigerVNC/tigervnc/archive/v%{version}.tar.gz +Source1: tigervnc-1.9.0-199-005db35.tar.gz Source4: 10-libvnc.conf Source5: vnc-server.susefirewall Source6: vnc-httpd.susefirewall @@ -182,8 +183,8 @@ %package -n xorg-x11-Xvnc-module Requires: xorg-x11-Xvnc Summary: VNC module for X server +#%%{x11_abi_extension_req} Group: System/X11/Servers/XF86_4 -%{x11_abi_extension_req} %description -n xorg-x11-Xvnc-module This module allows to share content of X server's screen over VNC. @@ -243,7 +244,7 @@ It maps common x11vnc arguments to x0vncserver arguments. %prep -%setup -T -b1 -q +%setup -T -b1 -q -n tigervnc cp -r /usr/src/xserver/* unix/xserver/ %patch1 -p1 ++++++ U_viewer-reset-ctrl-alt-to-menu-state-on-focus.patch ++++++ --- /var/tmp/diff_new_pack.ec172R/_old 2019-04-22 12:25:18.352980196 +0200 +++ /var/tmp/diff_new_pack.ec172R/_new 2019-04-22 12:25:18.352980196 +0200 @@ -10,13 +10,13 @@ vncviewer/Viewport.cxx | 6 ++++++ 1 file changed, 6 insertions(+) -diff --git a/vncviewer/Viewport.cxx b/vncviewer/Viewport.cxx -index 4e23dc8c..317f06b2 100644 +Index: b/vncviewer/Viewport.cxx +=================================================================== --- a/vncviewer/Viewport.cxx +++ b/vncviewer/Viewport.cxx -@@ -635,6 +635,12 @@ int Viewport::handle(int event) - exit_vncviewer(e.str()); - } +@@ -655,6 +655,12 @@ int Viewport::handle(int event) + if (menuAltKey) + handleKeyPress(0x38, XK_Alt_L); + // Resend Ctrl/Alt if needed + if (menuCtrlKey) @@ -27,6 +27,3 @@ // Yes, we would like some focus please! return 1; --- -2.16.4 - ++++++ n_tigervnc-date-time.patch ++++++ --- /var/tmp/diff_new_pack.ec172R/_old 2019-04-22 12:25:18.372980223 +0200 +++ /var/tmp/diff_new_pack.ec172R/_new 2019-04-22 12:25:18.372980223 +0200 @@ -1,74 +1,72 @@ -Index: tigervnc-1.9.0/unix/xserver/hw/vnc/buildtime.c +Index: b/unix/xserver/hw/vnc/buildtime.c =================================================================== ---- tigervnc-1.9.0.orig/unix/xserver/hw/vnc/buildtime.c -+++ tigervnc-1.9.0/unix/xserver/hw/vnc/buildtime.c +--- a/unix/xserver/hw/vnc/buildtime.c ++++ b/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[] = "??? ?? ???? ??:??:??"; -Index: tigervnc-1.9.0/unix/vncconfig/buildtime.c +Index: b/unix/vncconfig/buildtime.c =================================================================== ---- tigervnc-1.9.0.orig/unix/vncconfig/buildtime.c -+++ tigervnc-1.9.0/unix/vncconfig/buildtime.c +--- a/unix/vncconfig/buildtime.c ++++ b/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[] = "??? ?? ???? ??:??:??"; -Index: tigervnc-1.9.0/unix/x0vncserver/buildtime.c +Index: b/unix/x0vncserver/buildtime.c =================================================================== ---- tigervnc-1.9.0.orig/unix/x0vncserver/buildtime.c -+++ tigervnc-1.9.0/unix/x0vncserver/buildtime.c +--- a/unix/x0vncserver/buildtime.c ++++ b/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[] = "??? ?? ???? ??:??:??"; -Index: tigervnc-1.9.0/win/winvnc/buildTime.cxx +Index: b/win/winvnc/buildTime.cxx =================================================================== ---- tigervnc-1.9.0.orig/win/winvnc/buildTime.cxx -+++ tigervnc-1.9.0/win/winvnc/buildTime.cxx +--- a/win/winvnc/buildTime.cxx ++++ b/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.9.0/CMakeLists.txt +Index: b/CMakeLists.txt =================================================================== ---- tigervnc-1.9.0.orig/CMakeLists.txt -+++ tigervnc-1.9.0/CMakeLists.txt -@@ -42,12 +42,6 @@ if(MSVC) +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -42,10 +42,6 @@ if(MSVC) message(FATAL_ERROR "TigerVNC cannot be built with Visual Studio. Please use MinGW") endif() -if(NOT BUILD_TIMESTAMP) -- set(BUILD_TIMESTAMP "") -- execute_process(COMMAND "date" "+%Y-%m-%d %H:%M" OUTPUT_VARIABLE BUILD_TIMESTAMP) -- string(REGEX REPLACE "\n" "" BUILD_TIMESTAMP ${BUILD_TIMESTAMP}) +- STRING(TIMESTAMP BUILD_TIMESTAMP "%Y-%m-%d %H:%M" UTC) -endif() - # Default to optimised builds instead of debug ones. Our code has no bugs ;) # (CMake makes it fairly easy to toggle this back to Debug if needed) if(NOT CMAKE_BUILD_TYPE) -Index: tigervnc-1.9.0/vncviewer/vncviewer.cxx +Index: b/vncviewer/vncviewer.cxx =================================================================== ---- tigervnc-1.9.0.orig/vncviewer/vncviewer.cxx -+++ tigervnc-1.9.0/vncviewer/vncviewer.cxx +--- a/vncviewer/vncviewer.cxx ++++ b/vncviewer/vncviewer.cxx @@ -98,11 +98,9 @@ static const char *about_text() // time. snprintf(buffer, sizeof(buffer), _("TigerVNC Viewer %d-bit v%s\n" - "Built on: %s\n" "Copyright (C) 1999-%d TigerVNC Team and many others (see README.rst)\n" - "See http://www.tigervnc.org for information on TigerVNC."), + "See https://www.tigervnc.org for information on TigerVNC."), - (int)sizeof(size_t)*8, PACKAGE_VERSION, -- BUILD_TIMESTAMP, 2018); -+ (int)sizeof(size_t)*8, PACKAGE_VERSION, 2018); +- BUILD_TIMESTAMP, 2019); ++ (int)sizeof(size_t)*8, PACKAGE_VERSION, 2019); return buffer; } ++++++ tigervnc-clean-pressed-key-on-exit.patch ++++++ --- /var/tmp/diff_new_pack.ec172R/_old 2019-04-22 12:25:18.380980234 +0200 +++ /var/tmp/diff_new_pack.ec172R/_new 2019-04-22 12:25:18.380980234 +0200 @@ -1,7 +1,7 @@ -Index: tigervnc-1.9.0/vncviewer/DesktopWindow.cxx +Index: b/vncviewer/DesktopWindow.cxx =================================================================== ---- tigervnc-1.9.0.orig/vncviewer/DesktopWindow.cxx -+++ tigervnc-1.9.0/vncviewer/DesktopWindow.cxx +--- a/vncviewer/DesktopWindow.cxx ++++ b/vncviewer/DesktopWindow.cxx @@ -207,6 +207,8 @@ DesktopWindow::~DesktopWindow() delete statsGraph; @@ -11,10 +11,10 @@ // FLTK automatically deletes all child widgets, so we shouldn't touch // them ourselves here } -Index: tigervnc-1.9.0/vncviewer/Viewport.cxx +Index: b/vncviewer/Viewport.cxx =================================================================== ---- tigervnc-1.9.0.orig/vncviewer/Viewport.cxx -+++ tigervnc-1.9.0/vncviewer/Viewport.cxx +--- a/vncviewer/Viewport.cxx ++++ b/vncviewer/Viewport.cxx @@ -189,6 +189,18 @@ Viewport::Viewport(int w, int h, const r Viewport::~Viewport() @@ -34,10 +34,10 @@ // Unregister all timeouts in case they get a change tro trigger // again later when this object is already gone. Fl::remove_timeout(handlePointerTimeout, this); -Index: tigervnc-1.9.0/vncviewer/vncviewer.cxx +Index: b/vncviewer/vncviewer.cxx =================================================================== ---- tigervnc-1.9.0.orig/vncviewer/vncviewer.cxx -+++ tigervnc-1.9.0/vncviewer/vncviewer.cxx +--- a/vncviewer/vncviewer.cxx ++++ b/vncviewer/vncviewer.cxx @@ -107,6 +107,8 @@ static const char *about_text() return buffer; } @@ -64,7 +64,7 @@ exit(1); } -@@ -566,6 +578,9 @@ int main(int argc, char** argv) +@@ -587,6 +599,9 @@ int main(int argc, char** argv) XkbSetDetectableAutoRepeat(fl_display, True, NULL); #endif @@ -74,7 +74,7 @@ CSecurity::upg = &dlg; #ifdef HAVE_GNUTLS CSecurityTLS::msg = &dlg; -@@ -651,7 +666,7 @@ int main(int argc, char** argv) +@@ -672,7 +687,7 @@ int main(int argc, char** argv) #endif } ++++++ tigervnc-newfbsize.patch ++++++ --- /var/tmp/diff_new_pack.ec172R/_old 2019-04-22 12:25:18.388980245 +0200 +++ /var/tmp/diff_new_pack.ec172R/_new 2019-04-22 12:25:18.392980250 +0200 @@ -1,8 +1,8 @@ -Index: tigervnc-1.6.0/vncviewer/CConn.cxx +Index: b/vncviewer/CConn.cxx =================================================================== ---- tigervnc-1.6.0.orig/vncviewer/CConn.cxx -+++ tigervnc-1.6.0/vncviewer/CConn.cxx -@@ -438,6 +438,8 @@ void CConn::dataRect(const Rect& r, int +--- a/vncviewer/CConn.cxx ++++ b/vncviewer/CConn.cxx +@@ -388,6 +388,8 @@ void CConn::dataRect(const Rect& r, int if (encoding != encodingCopyRect) lastServerEncoding = encoding; ++++++ u_build_libXvnc_as_separate_library.patch ++++++ --- /var/tmp/diff_new_pack.ec172R/_old 2019-04-22 12:25:18.404980266 +0200 +++ /var/tmp/diff_new_pack.ec172R/_new 2019-04-22 12:25:18.404980266 +0200 @@ -4,8 +4,8 @@ So it can be used by others, not only vncconfig. -diff --git a/unix/vncconfig/CMakeLists.txt b/unix/vncconfig/CMakeLists.txt -index 959681f..5fe1fb8 100644 +Index: b/unix/vncconfig/CMakeLists.txt +=================================================================== --- a/unix/vncconfig/CMakeLists.txt +++ b/unix/vncconfig/CMakeLists.txt @@ -3,13 +3,25 @@ include_directories(${X11_INCLUDE_DIR}) ++++++ u_tigervnc-cve-2014-8240.patch ++++++ --- /var/tmp/diff_new_pack.ec172R/_old 2019-04-22 12:25:18.416980282 +0200 +++ /var/tmp/diff_new_pack.ec172R/_new 2019-04-22 12:25:18.416980282 +0200 @@ -2,11 +2,11 @@ References: bnc#900896 CVE-2014-8240 Signed-off-by: Michal Srb <m...@suse.com> -Index: tigervnc-1.8.0/unix/x0vncserver/Image.cxx +Index: b/unix/x0vncserver/Image.cxx =================================================================== ---- tigervnc-1.8.0.orig/unix/x0vncserver/Image.cxx -+++ tigervnc-1.8.0/unix/x0vncserver/Image.cxx -@@ -80,6 +80,14 @@ void Image::Init(int width, int height) +--- a/unix/x0vncserver/Image.cxx ++++ b/unix/x0vncserver/Image.cxx +@@ -82,6 +82,14 @@ void Image::Init(int width, int height) xim = XCreateImage(dpy, vis, DefaultDepth(dpy, DefaultScreen(dpy)), ZPixmap, 0, 0, width, height, BitmapPad(dpy), 0); @@ -21,7 +21,7 @@ xim->data = (char *)malloc(xim->bytes_per_line * xim->height); if (xim->data == NULL) { vlog.error("malloc() failed"); -@@ -254,6 +262,17 @@ void ShmImage::Init(int width, int heigh +@@ -257,6 +265,17 @@ void ShmImage::Init(int width, int heigh delete shminfo; shminfo = NULL; return; ++++++ u_tigervnc_update_default_vncxstartup.patch ++++++ --- /var/tmp/diff_new_pack.ec172R/_old 2019-04-22 12:25:18.428980298 +0200 +++ /var/tmp/diff_new_pack.ec172R/_new 2019-04-22 12:25:18.428980298 +0200 @@ -2,11 +2,11 @@ References: bnc#956537 Subject: Update default vnc xstartup script. -Index: tigervnc-1.6.0/unix/vncserver +Index: b/unix/vncserver =================================================================== ---- tigervnc-1.6.0.orig/unix/vncserver -+++ tigervnc-1.6.0/unix/vncserver -@@ -61,27 +61,31 @@ $defaultXStartup +--- a/unix/vncserver ++++ b/unix/vncserver +@@ -58,27 +58,31 @@ $defaultXStartup = ("#!/bin/sh\n\n". "unset SESSION_MANAGER\n". "unset DBUS_SESSION_BUS_ADDRESS\n".
