Hello community, here is the log from the commit of package tigervnc for openSUSE:Factory checked in at 2016-01-13 22:42:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2015-12-20 10:52:32.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.tigervnc.new/tigervnc.changes 2016-01-13 22:42:49.000000000 +0100 @@ -1,0 +2,16 @@ +Tue Jan 12 12:14:27 UTC 2016 - [email protected] + +- Updated to tigervnc 1.6.0. +- Removed patches: + * N_tigervnc_revert_fltk_1_3_3_requirements.patch + * U_tigervnc-fix-reversed-logic-in-vncIsTCPPortUsed.patch + * u_tigervnc-display-SHA-1-fingerprint-of-untrusted-certificate.patch + * u_tigervnc-use-default-trust-manager-in-java-viewer-if-custom.patch + * u_tigervnc-use_preferred_mode.patch + * u_tigervnc-vncserver-clean-pid-files.patch +- Updated patches: + * n_tigervnc-date-time.patch + * u_tigervnc-add-autoaccept-parameter.patch + * u_tigervnc_update_default_vncxstartup.patch + +------------------------------------------------------------------- Old: ---- N_tigervnc_revert_fltk_1_3_3_requirements.patch U_tigervnc-fix-reversed-logic-in-vncIsTCPPortUsed.patch u_tigervnc-display-SHA-1-fingerprint-of-untrusted-certificate.patch u_tigervnc-use-default-trust-manager-in-java-viewer-if-custom.patch u_tigervnc-use_preferred_mode.patch u_tigervnc-vncserver-clean-pid-files.patch v1.5.0.tar.gz New: ---- v1.6.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tigervnc.spec ++++++ --- /var/tmp/diff_new_pack.CT9boK/_old 2016-01-13 22:42:50.000000000 +0100 +++ /var/tmp/diff_new_pack.CT9boK/_new 2016-01-13 22:42:50.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package tigervnc # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 @@ -23,7 +23,7 @@ %define tlscert %{_sysconfdir}/vnc/tls.cert Name: tigervnc -Version: 1.5.0 +Version: 1.6.0 Release: 0 Provides: tightvnc = 1.3.9 Obsoletes: tightvnc < 1.3.9 @@ -112,16 +112,10 @@ Patch3: u_tigervnc-ignore-epipe-on-write.patch Patch4: n_tigervnc-date-time.patch Patch5: U_include-vencrypt-only-if-any-subtype-present.patch -Patch6: u_tigervnc-use_preferred_mode.patch -Patch7: u_tigervnc-cve-2014-8240.patch -Patch8: u_tigervnc-use-default-trust-manager-in-java-viewer-if-custom.patch -Patch9: u_tigervnc-display-SHA-1-fingerprint-of-untrusted-certificate.patch -Patch10: u_tigervnc-add-autoaccept-parameter.patch -Patch11: N_tigervnc_revert_fltk_1_3_3_requirements.patch -Patch12: U_tigervnc-fix-reversed-logic-in-vncIsTCPPortUsed.patch -Patch13: u_tigervnc-vncserver-clean-pid-files.patch -Patch14: u_xserver118.patch -Patch15: u_tigervnc_update_default_vncxstartup.patch +Patch6: u_tigervnc-cve-2014-8240.patch +Patch7: u_tigervnc-add-autoaccept-parameter.patch +Patch8: u_xserver118.patch +Patch9: u_tigervnc_update_default_vncxstartup.patch %description TigerVNC is a high-performance, platform-neutral implementation of VNC (Virtual Network Computing), @@ -159,16 +153,10 @@ %patch3 -p0 %patch4 -p1 %patch5 -p0 -%patch6 -p0 +%patch6 -p1 %patch7 -p1 %patch8 -p1 %patch9 -p1 -%patch10 -p1 -%patch11 -p1 -%patch12 -p1 -%patch13 -p1 -%patch14 -p1 -%patch15 -p1 pushd unix/xserver patch -p1 < ../xserver117.patch @@ -178,7 +166,7 @@ export CXXFLAGS="%optflags -fPIC" export CFLAGS="%optflags -fPIC" # Build all tigervnc -cmake -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} -DCMAKE_BUILD_TYPE=RelWithDebInfo +cmake -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_TIMESTAMP="??-??-?? ??:??" make %{?_smp_mflags} # Build Xvnc server ++++++ n_tigervnc-date-time.patch ++++++ --- /var/tmp/diff_new_pack.CT9boK/_old 2016-01-13 22:42:50.000000000 +0100 +++ /var/tmp/diff_new_pack.CT9boK/_new 2016-01-13 22:42:50.000000000 +0100 @@ -39,16 +39,3 @@ -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-newfbsize.patch ++++++ --- /var/tmp/diff_new_pack.CT9boK/_old 2016-01-13 22:42:50.000000000 +0100 +++ /var/tmp/diff_new_pack.CT9boK/_new 2016-01-13 22:42:50.000000000 +0100 @@ -1,8 +1,8 @@ -Index: tigervnc-1.5.0/vncviewer/CConn.cxx +Index: tigervnc-1.6.0/vncviewer/CConn.cxx =================================================================== ---- tigervnc-1.5.0.orig/vncviewer/CConn.cxx -+++ tigervnc-1.5.0/vncviewer/CConn.cxx -@@ -427,6 +427,8 @@ void CConn::dataRect(const Rect& r, int +--- 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 if (encoding != encodingCopyRect) lastServerEncoding = encoding; ++++++ u_tigervnc-add-autoaccept-parameter.patch ++++++ --- /var/tmp/diff_new_pack.CT9boK/_old 2016-01-13 22:42:50.000000000 +0100 +++ /var/tmp/diff_new_pack.CT9boK/_new 2016-01-13 22:42:50.000000000 +0100 @@ -1,8 +1,8 @@ -diff --git a/java/com/tigervnc/rfb/CSecurityTLS.java b/java/com/tigervnc/rfb/CSecurityTLS.java -index 6014502..9b886b5 100644 ---- a/java/com/tigervnc/rfb/CSecurityTLS.java -+++ b/java/com/tigervnc/rfb/CSecurityTLS.java -@@ -47,6 +47,9 @@ public class CSecurityTLS extends CSecurity { +Index: tigervnc-1.6.0/java/com/tigervnc/rfb/CSecurityTLS.java +=================================================================== +--- tigervnc-1.6.0.orig/java/com/tigervnc/rfb/CSecurityTLS.java ++++ tigervnc-1.6.0/java/com/tigervnc/rfb/CSecurityTLS.java +@@ -64,6 +64,9 @@ public class CSecurityTLS extends CSecur public static StringParameter x509crl = new StringParameter("x509crl", "X509 CRL file", "", Configuration.ConfigurationObject.ConfViewer); @@ -12,7 +12,7 @@ private void initGlobal() { -@@ -71,6 +74,7 @@ public class CSecurityTLS extends CSecurity { +@@ -82,6 +85,7 @@ public class CSecurityTLS extends CSecur setDefaults(); cafile = x509ca.getData(); crlfile = x509crl.getData(); @@ -20,71 +20,19 @@ } public static String getDefaultCA() { -@@ -247,34 +251,46 @@ public class CSecurityTLS extends CSecurity { - try { - tm.checkServerTrusted(chain, authType); - } catch (CertificateException e) { -- Object[] answer = {"Proceed", "Exit"}; -- -- StringBuilder message = new StringBuilder(); -- message.append(e.getCause().getLocalizedMessage()); -- message.append("\nContinue connecting to this host?"); -+ String fingerprint = null; - - try { -+ StringBuilder fingerprintBuilder = new StringBuilder(); -+ - MessageDigest sha1 = MessageDigest.getInstance("SHA1"); - sha1.update(chain[0].getEncoded()); - -- message.append("\nSHA-1 fingerprint: "); -- - for(byte B : sha1.digest()) { -- message.append(Integer.toHexString(0xff & B)); -- message.append(':'); -+ fingerprintBuilder.append(String.format("%02x", /*0xff & */B)); -+ fingerprintBuilder.append(':'); - } -- message.deleteCharAt(message.length() - 1); -+ fingerprintBuilder.deleteCharAt(fingerprintBuilder.length() - 1); -+ -+ fingerprint = fingerprintBuilder.toString(); - } catch (NoSuchAlgorithmException noSuchAlgorithmException) { - // No fingerprint then... - } - -- int ret = JOptionPane.showOptionDialog(null, -- message.toString(), -- "Confirm certificate exception?", -- JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE, -- null, answer, answer[0]); -- if (ret == JOptionPane.NO_OPTION) -- System.exit(1); -+ if(fingerprint == null || certautoaccept == null || !fingerprint.equalsIgnoreCase(certautoaccept)) { -+ Object[] answer = {"Proceed", "Exit"}; +@@ -277,6 +281,11 @@ public class CSecurityTLS extends CSecur + String thumbprint = + DatatypeConverter.printHexBinary(md.digest()); + thumbprint = thumbprint.replaceAll("..(?!$)", "$0 "); + -+ StringBuilder message = new StringBuilder(); -+ message.append(e.getCause().getLocalizedMessage()); -+ message.append("\nContinue connecting to this host?"); -+ if(fingerprint != null) { -+ message.append("\nSHA-1 fingerprint: "); -+ message.append(fingerprint); -+ message.append("\nBle: "); -+ message.append(certautoaccept); ++ if (certautoaccept != null && thumbprint.equalsIgnoreCase(certautoaccept)) { ++ return; + } + -+ int ret = JOptionPane.showOptionDialog(null, -+ message.toString(), -+ "Confirm certificate exception?", -+ JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE, -+ null, answer, answer[0]); -+ if (ret == JOptionPane.NO_OPTION) -+ System.exit(1); -+ } - } catch (java.lang.Exception e) { - throw new Exception(e.toString()); - } -@@ -301,7 +317,7 @@ public class CSecurityTLS extends CSecurity { + int ret = JOptionPane.showOptionDialog(null, + "This certificate has been signed by an unknown authority\n"+ + "\n"+ +@@ -466,7 +475,7 @@ public class CSecurityTLS extends CSecur private SSLEngineManager manager; private boolean anon; @@ -93,11 +41,11 @@ private FdInStream is; private FdOutStream os; -diff --git a/java/com/tigervnc/vncviewer/VncViewer.java b/java/com/tigervnc/vncviewer/VncViewer.java -index cc21c2e..6786636 100644 ---- a/java/com/tigervnc/vncviewer/VncViewer.java -+++ b/java/com/tigervnc/vncviewer/VncViewer.java -@@ -354,6 +354,8 @@ public class VncViewer extends javax.swing.JApplet +Index: tigervnc-1.6.0/java/com/tigervnc/vncviewer/VncViewer.java +=================================================================== +--- tigervnc-1.6.0.orig/java/com/tigervnc/vncviewer/VncViewer.java ++++ tigervnc-1.6.0/java/com/tigervnc/vncviewer/VncViewer.java +@@ -353,6 +353,8 @@ public class VncViewer extends javax.swi parent.setFocusTraversalKeysEnabled(false); setLookAndFeel(); setBackground(Color.white); @@ -106,7 +54,7 @@ } private void getTimestamp() { -@@ -375,6 +377,7 @@ public class VncViewer extends javax.swing.JApplet +@@ -374,6 +376,7 @@ public class VncViewer extends javax.swi if (embed.getValue() && nViewers == 0) { alwaysShowServerDialog.setParam(false); Configuration.global().readAppletParams(this); ++++++ u_tigervnc_update_default_vncxstartup.patch ++++++ --- /var/tmp/diff_new_pack.CT9boK/_old 2016-01-13 22:42:50.000000000 +0100 +++ /var/tmp/diff_new_pack.CT9boK/_new 2016-01-13 22:42:50.000000000 +0100 @@ -2,11 +2,11 @@ References: bnc#956537 Subject: Update default vnc xstartup script. -Index: tigervnc-1.5.0/unix/vncserver +Index: tigervnc-1.6.0/unix/vncserver =================================================================== ---- tigervnc-1.5.0.orig/unix/vncserver -+++ tigervnc-1.5.0/unix/vncserver -@@ -59,27 +59,31 @@ $defaultXStartup +--- tigervnc-1.6.0.orig/unix/vncserver ++++ tigervnc-1.6.0/unix/vncserver +@@ -61,27 +61,31 @@ $defaultXStartup = ("#!/bin/sh\n\n". "unset SESSION_MANAGER\n". "unset DBUS_SESSION_BUS_ADDRESS\n". @@ -51,5 +51,5 @@ + " echo \"No window manager found. You should install a window manager to get properly working VNC session.\"\n". + "fi\n"); - chop($host = `uname -n`); - + $defaultConfig + = ("## Supported server options to pass to vncserver upon invocation can be listed\n". ++++++ v1.5.0.tar.gz -> v1.6.0.tar.gz ++++++ ++++ 13272 lines of diff (skipped)
