Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package tigervnc for openSUSE:Factory checked in at 2022-02-18 23:02:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tigervnc (Old) and /work/SRC/openSUSE:Factory/.tigervnc.new.1958 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tigervnc" Fri Feb 18 23:02:42 2022 rev:87 rq:955672 version:1.12.0 Changes: -------- --- /work/SRC/openSUSE:Factory/tigervnc/tigervnc.changes 2022-02-11 23:08:26.418777778 +0100 +++ /work/SRC/openSUSE:Factory/.tigervnc.new.1958/tigervnc.changes 2022-02-18 23:02:55.989412888 +0100 @@ -1,0 +2,56 @@ +Thu Feb 17 14:14:13 UTC 2022 - Stefan Dirsch <sndir...@suse.com> + +- n_vncserver.patch + * fix location of Xsession script +- vncserver usage has radically changed; please check this: + https://github.com/TigerVNC/tigervnc/blob/master/unix/vncserver/HOWTO.md + +------------------------------------------------------------------- +Thu Feb 17 09:22:52 UTC 2022 - Joan Torres <joan.tor...@suse.com> + +- Update to tigervnc 1.12.0 + * The native viewer now supports full screen over a subset of monitors (e.g. 2 out of 3), and reacts properly to monitors being added or removed + * Recent server history in the native viewer + * The native viewer now has an option to reconnect if the connection is dropped + * Translations are now enabled on Windows and macOS for the native viewer + * The native viewer now respects the system security policy + * Better handling of accented keys in the Java viewer + * The Unix servers can now listen to both a Unix socket and a TCP port at the same time + * The network code in both the servers and the native viewer has been restructured to give a more responsive experience + * The vncserver service now correctly handles settings set to "0" + * Fixed the clipboard Unicode handling in both the native viewer and the servers + * Support for pointer "warping" in Xvnc and the native viewer, enabling e.g. FPS games +- Update to tigervnc 1.11.0 + * A security issue has been fixed in how the viewers handle TLS certificate exceptions + * vncserver has gotten a major redesign to be compatible with modern distributions + * The native viewer now has touch gestures to handle certain mouse actions (e.g. scroll wheel) + * Middle mouse button emulation in the native viewer, for devices with only two mouse buttons + * The Java viewer now supports Java 9+, but also now requires Java 8+ + * Support for alpha cursors in the Java viewer (a feature already supported in the native viewer) + * The password and username can now be specified via the environment for the native viewer + * Support for building Xvnc/libvnc.so with Xorg 1.20.7+ and deprecate support for Xorg older than 1.16 + * The official builds have been fixed to work on the upcoming macOS 11 + * The Windows server (WinVNC) is now packaged separately as it is unmaintained and buggy +- Removed patches (included in 1.12.0): + * U_viewer-reset-ctrl-alt-to-menu-state-on-focus.patch + * tigervnc-fix-saving-of-bad-server-certs.patch + * u_xorg-server-1.20.7-ddxInputThreadInit.patch + * U_0001-Properly-store-certificate-exceptions.patch + * U_0002-Properly-store-certificate-exceptions-in-Java-viewer.patch + * tigervnc-FIPS-use-RFC7919.patch + * u_Fix-non-functional-MaxDisconnectionTime.patch +- Removed patches (no longer needed): + * u_tigervnc-cve-2014-8240.patch (https://github.com/TigerVNC/tigervnc/pull/1258) + * u_tigervnc_update_default_vncxstartup.patch +- Refreshed patches: + * n_correct_path_in_desktop_file.patch + * n_tigervnc-date-time.patch + * n_utilize-system-crypto-policies.patch + * tigervnc-clean-pressed-key-on-exit.patch + * tigervnc-newfbsize.patch + * u_build_libXvnc_as_separate_library.patch + * u_change-button-layout-in-ServerDialog.patch + * u_tigervnc-add-autoaccept-parameter.patch + * u_tigervnc-211.patch + +------------------------------------------------------------------- Old: ---- U_0001-Properly-store-certificate-exceptions.patch U_0002-Properly-store-certificate-exceptions-in-Java-viewer.patch U_viewer-reset-ctrl-alt-to-menu-state-on-focus.patch tigervnc-1.10.1.tar.gz tigervnc-FIPS-use-RFC7919.patch tigervnc-fix-saving-of-bad-server-certs.patch u_Fix-non-functional-MaxDisconnectionTime.patch u_tigervnc-cve-2014-8240.patch u_tigervnc_update_default_vncxstartup.patch u_xorg-server-1.20.7-ddxInputThreadInit.patch New: ---- n_vncserver.patch tigervnc-1.12.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tigervnc.spec ++++++ --- /var/tmp/diff_new_pack.I81Wt9/_old 2022-02-18 23:02:57.841412743 +0100 +++ /var/tmp/diff_new_pack.I81Wt9/_new 2022-02-18 23:02:57.845412743 +0100 @@ -22,8 +22,6 @@ %define tlskey %{_sysconfdir}/vnc/tls.key %define tlscert %{_sysconfdir}/vnc/tls.cert -%define _unitdir %{_prefix}/lib/systemd/system - %if 0%{?suse_version} >= 1500 %define use_firewalld 1 %else @@ -35,7 +33,7 @@ %endif Name: tigervnc -Version: 1.10.1 +Version: 1.12.0 Release: 0 URL: http://tigervnc.org/ Summary: An implementation of VNC @@ -63,24 +61,16 @@ Patch2: tigervnc-clean-pressed-key-on-exit.patch Patch3: u_tigervnc-ignore-epipe-on-write.patch Patch4: n_tigervnc-date-time.patch -Patch5: u_tigervnc-cve-2014-8240.patch -Patch6: u_tigervnc_update_default_vncxstartup.patch -Patch7: u_build_libXvnc_as_separate_library.patch -Patch8: u_tigervnc-add-autoaccept-parameter.patch -Patch9: u_change-button-layout-in-ServerDialog.patch -Patch10: n_correct_path_in_desktop_file.patch -Patch11: U_viewer-reset-ctrl-alt-to-menu-state-on-focus.patch -Patch12: tigervnc-fix-saving-of-bad-server-certs.patch -Patch13: u_xorg-server-1.20.7-ddxInputThreadInit.patch -Patch21: U_0001-Properly-store-certificate-exceptions.patch -Patch22: U_0002-Properly-store-certificate-exceptions-in-Java-viewer.patch -Patch23: n_utilize-system-crypto-policies.patch -Patch24: tigervnc-FIPS-use-RFC7919.patch -Patch25: u_tigervnc-211.patch -Patch26: u_Fix-non-functional-MaxDisconnectionTime.patch -Patch27: xserver211.patch -Provides: tightvnc = 1.3.9 -Obsoletes: tightvnc < 1.3.9 +Patch5: u_build_libXvnc_as_separate_library.patch +Patch6: u_tigervnc-add-autoaccept-parameter.patch +Patch7: u_change-button-layout-in-ServerDialog.patch +Patch8: n_correct_path_in_desktop_file.patch +Patch9: n_utilize-system-crypto-policies.patch +Patch10: u_tigervnc-211.patch +Patch11: xserver211.patch +Patch12: n_vncserver.patch +Provides: tightvnc = 1.5.0 +Obsoletes: tightvnc < 1.5.0 Provides: vnc BuildRequires: autoconf BuildRequires: automake @@ -185,9 +175,9 @@ %ifnarch s390 s390x Recommends: xorg-x11-Xvnc-module %endif -Provides: tightvnc = 1.3.9 +Provides: tightvnc = 1.5.0 +Obsoletes: tightvnc < 1.5.0 Provides: xorg-x11-Xvnc:/usr/lib/vnc/with-vnc-key.sh -Obsoletes: tightvnc < 1.3.9 %description -n xorg-x11-Xvnc This is the TigerVNC implementation of Xvnc. @@ -262,25 +252,16 @@ %patch5 -p1 %patch6 -p1 %patch7 -p1 -%patch9 -p1 -%patch10 -p1 -%patch11 -p1 -%patch12 -p1 -%patch13 -p1 -%patch21 -p1 -%patch22 -p1 %patch8 -p1 %if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150400 -%patch23 -p1 +%patch9 -p1 %endif -%patch24 -p1 -%patch25 -p0 -%patch26 -p1 +%patch10 -p0 +%patch12 -p0 cp -r %{_prefix}/src/xserver/* unix/xserver/ pushd unix/xserver -#patch -p1 < ../xserver120.patch -%patch27 -p1 +%patch11 -p1 popd %build @@ -290,7 +271,10 @@ sed "s|@LIBEXECDIR@|%{_libexecdir}|g" %{SOURCE13} > xvnc@.service sed "s|@LIBEXECDIR@|%{_libexecdir}|g" %{SOURCE21} > xvnc-novnc.service # 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_INSTALL_LIBEXECDIR:PATH=%{_libexecdir} \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo . %make_build # Build Xvnc server @@ -319,7 +303,7 @@ # Build java client pushd java -cmake -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} -DJAVACFLAGS="-encoding utf8 -source 1.6 -target 1.6" . +cmake -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} . %make_build popd @@ -351,7 +335,7 @@ install -D -m 644 %{SOURCE6} %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/vnc-httpd %endif -# only package as %doc (boo#1173045) +# only package as %%doc (boo#1173045) cp %{SOURCE7} . install -D -m 755 %{SOURCE8} %{buildroot}%{_bindir}/vncpasswd.arg install -D -m 644 %{SOURCE9} %{buildroot}%{_distconfdir}/pam.d/vnc @@ -380,7 +364,7 @@ install -Dm0644 %{SOURCE22} %{buildroot}%{_sysusersdir}/vnc.conf -rm -rf %{buildroot}%{_datadir}/doc/tigervnc-* +rm -rf %{buildroot}%{_datadir}/doc/tigervnc* %find_lang '%{name}' @@ -475,27 +459,37 @@ %files -n xorg-x11-Xvnc %doc LICENCE.TXT README.rst vnc.reg +%doc unix/vncserver/HOWTO.md %{_bindir}/Xvnc %{_bindir}/vncconfig %{_bindir}/vncpasswd %{_bindir}/vncpasswd.arg -%{_bindir}/vncserver %{_bindir}/x0vncserver +%{_sbindir}/vncsession + +%{_libexecdir}/vncserver +%{_libexecdir}/vncsession-start %exclude %{_mandir}/man1/Xserver.1* %{_mandir}/man1/Xvnc.1* %{_mandir}/man1/vncconfig.1* %{_mandir}/man1/vncpasswd.1* -%{_mandir}/man1/vncserver.1* %{_mandir}/man1/x0vncserver.1* +%{_mandir}/man8/vncserver.8* +%{_mandir}/man8/vncsession.8* +%{_unitdir}/vncserver@.service %{_unitdir}/xvnc@.service %{_unitdir}/xvnc.socket %{_unitdir}/xvnc.target %{_sysusersdir}/vnc.conf %{_sbindir}/rcxvnc +%dir %{_sysconfdir}/tigervnc +%config(noreplace) %{_sysconfdir}/pam.d/tigervnc +%config(noreplace) %{_sysconfdir}/tigervnc/vncserver* + %exclude %{_sharedstatedir}/xkb/compiled/README.compiled %if %{use_firewalld} ++++++ n_correct_path_in_desktop_file.patch ++++++ --- /var/tmp/diff_new_pack.I81Wt9/_old 2022-02-18 23:02:57.921412737 +0100 +++ /var/tmp/diff_new_pack.I81Wt9/_new 2022-02-18 23:02:57.925412737 +0100 @@ -10,8 +10,8 @@ Name=TigerVNC Viewer GenericName=Remote Desktop Viewer Comment=Connect to VNC server and display remote desktop --Exec=@BIN_DIR@/vncviewer -+Exec=@BIN_DIR@/vncviewer-tigervnc +-Exec=@CMAKE_INSTALL_FULL_BINDIR@/vncviewer ++Exec=@CMAKE_INSTALL_FULL_BINDIR@/vncviewer-tigervnc Icon=tigervnc Terminal=false Type=Application ++++++ n_tigervnc-date-time.patch ++++++ --- /var/tmp/diff_new_pack.I81Wt9/_old 2022-02-18 23:02:57.937412736 +0100 +++ /var/tmp/diff_new_pack.I81Wt9/_new 2022-02-18 23:02:57.941412736 +0100 @@ -1,48 +1,48 @@ -Index: b/unix/xserver/hw/vnc/buildtime.c +Index: tigervnc-1.12.0/unix/xserver/hw/vnc/buildtime.c =================================================================== ---- a/unix/xserver/hw/vnc/buildtime.c -+++ b/unix/xserver/hw/vnc/buildtime.c +--- tigervnc-1.12.0.orig/unix/xserver/hw/vnc/buildtime.c ++++ tigervnc-1.12.0/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: b/unix/vncconfig/buildtime.c +Index: tigervnc-1.12.0/unix/vncconfig/buildtime.c =================================================================== ---- a/unix/vncconfig/buildtime.c -+++ b/unix/vncconfig/buildtime.c +--- tigervnc-1.12.0.orig/unix/vncconfig/buildtime.c ++++ tigervnc-1.12.0/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: b/unix/x0vncserver/buildtime.c +Index: tigervnc-1.12.0/unix/x0vncserver/buildtime.c =================================================================== ---- a/unix/x0vncserver/buildtime.c -+++ b/unix/x0vncserver/buildtime.c +--- tigervnc-1.12.0.orig/unix/x0vncserver/buildtime.c ++++ tigervnc-1.12.0/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: b/win/winvnc/buildTime.cxx +Index: tigervnc-1.12.0/win/winvnc/buildTime.cxx =================================================================== ---- a/win/winvnc/buildTime.cxx -+++ b/win/winvnc/buildTime.cxx +--- tigervnc-1.12.0.orig/win/winvnc/buildTime.cxx ++++ tigervnc-1.12.0/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: b/CMakeLists.txt +Index: tigervnc-1.12.0/CMakeLists.txt =================================================================== ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -42,10 +42,6 @@ if(MSVC) +--- tigervnc-1.12.0.orig/CMakeLists.txt ++++ tigervnc-1.12.0/CMakeLists.txt +@@ -44,10 +44,6 @@ if(MSVC) message(FATAL_ERROR "TigerVNC cannot be built with Visual Studio. Please use MinGW") endif() @@ -53,11 +53,11 @@ # 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: b/vncviewer/vncviewer.cxx +Index: tigervnc-1.12.0/vncviewer/vncviewer.cxx =================================================================== ---- a/vncviewer/vncviewer.cxx -+++ b/vncviewer/vncviewer.cxx -@@ -98,11 +98,9 @@ static const char *about_text() +--- tigervnc-1.12.0.orig/vncviewer/vncviewer.cxx ++++ tigervnc-1.12.0/vncviewer/vncviewer.cxx +@@ -104,11 +104,9 @@ static const char *about_text() // time. snprintf(buffer, sizeof(buffer), _("TigerVNC Viewer %d-bit v%s\n" @@ -65,8 +65,8 @@ "Copyright (C) 1999-%d TigerVNC Team and many others (see README.rst)\n" "See https://www.tigervnc.org for information on TigerVNC."), - (int)sizeof(size_t)*8, PACKAGE_VERSION, -- BUILD_TIMESTAMP, 2019); -+ (int)sizeof(size_t)*8, PACKAGE_VERSION, 2019); +- BUILD_TIMESTAMP, 2021); ++ (int)sizeof(size_t)*8, PACKAGE_VERSION, 2021); return buffer; } ++++++ n_utilize-system-crypto-policies.patch ++++++ --- /var/tmp/diff_new_pack.I81Wt9/_old 2022-02-18 23:02:57.953412735 +0100 +++ /var/tmp/diff_new_pack.I81Wt9/_new 2022-02-18 23:02:57.953412735 +0100 @@ -1,12 +1,12 @@ -Index: tigervnc-1.10.1/common/rfb/Security.cxx +Index: tigervnc-1.12.0/common/rfb/Security.cxx =================================================================== ---- tigervnc-1.10.1.orig/common/rfb/Security.cxx -+++ tigervnc-1.10.1/common/rfb/Security.cxx +--- tigervnc-1.12.0.orig/common/rfb/Security.cxx ++++ tigervnc-1.12.0/common/rfb/Security.cxx @@ -52,7 +52,7 @@ static LogWriter vlog("Security"); #ifdef HAVE_GNUTLS StringParameter Security::GnuTLSPriority("GnuTLSPriority", "GnuTLS priority string that controls the TLS session???s handshake algorithms", -- "NORMAL"); +- ""); + "@SYSTEM"); #endif ++++++ n_vncserver.patch ++++++ --- unix/vncserver/vncserver.in.orig 2022-02-17 15:06:23.333514000 +0100 +++ unix/vncserver/vncserver.in 2022-02-17 15:07:43.597755000 +0100 @@ -437,7 +437,7 @@ die "$prog: couldn't find \"$cmd\" on your PATH.\n"; } - foreach $cmd ("/etc/X11/xinit/Xsession", "/etc/X11/Xsession") { + foreach $cmd ("/usr/etc/X11/xdm/Xsession", "/etc/X11/xdm/Xsession", "/etc/X11/xinit/Xsession", "/etc/X11/Xsession") { if (-x "$cmd") { $Xsession = $cmd; last; ++++++ tigervnc-1.10.1.tar.gz -> tigervnc-1.12.0.tar.gz ++++++ ++++ 65634 lines of diff (skipped) ++++++ tigervnc-clean-pressed-key-on-exit.patch ++++++ --- /var/tmp/diff_new_pack.I81Wt9/_old 2022-02-18 23:02:58.321412706 +0100 +++ /var/tmp/diff_new_pack.I81Wt9/_new 2022-02-18 23:02:58.325412706 +0100 @@ -1,21 +1,21 @@ -Index: b/vncviewer/DesktopWindow.cxx +Index: tigervnc-1.12.0/vncviewer/DesktopWindow.cxx =================================================================== ---- a/vncviewer/DesktopWindow.cxx -+++ b/vncviewer/DesktopWindow.cxx -@@ -207,6 +207,8 @@ DesktopWindow::~DesktopWindow() +--- tigervnc-1.12.0.orig/vncviewer/DesktopWindow.cxx ++++ tigervnc-1.12.0/vncviewer/DesktopWindow.cxx +@@ -236,6 +236,8 @@ DesktopWindow::~DesktopWindow() delete statsGraph; + delete viewport; + - // FLTK automatically deletes all child widgets, so we shouldn't touch - // them ourselves here - } -Index: b/vncviewer/Viewport.cxx + instances.erase(this); + + if (instances.size() == 0) +Index: tigervnc-1.12.0/vncviewer/Viewport.cxx =================================================================== ---- a/vncviewer/Viewport.cxx -+++ b/vncviewer/Viewport.cxx -@@ -189,6 +189,18 @@ Viewport::Viewport(int w, int h, const r +--- tigervnc-1.12.0.orig/vncviewer/Viewport.cxx ++++ tigervnc-1.12.0/vncviewer/Viewport.cxx +@@ -192,6 +192,18 @@ Viewport::Viewport(int w, int h, const r Viewport::~Viewport() { @@ -34,20 +34,28 @@ // 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: b/vncviewer/vncviewer.cxx +Index: tigervnc-1.12.0/vncviewer/vncviewer.cxx =================================================================== ---- a/vncviewer/vncviewer.cxx -+++ b/vncviewer/vncviewer.cxx -@@ -107,6 +107,8 @@ static const char *about_text() +--- tigervnc-1.12.0.orig/vncviewer/vncviewer.cxx ++++ tigervnc-1.12.0/vncviewer/vncviewer.cxx +@@ -113,6 +113,7 @@ static const char *about_text() return buffer; } +static CConn *cc; -+ - void exit_vncviewer(const char *error) + + void abort_vncviewer(const char *error, ...) { - // Prioritise the first error we get as that is probably the most -@@ -177,6 +179,16 @@ static void CleanupSignalHandler(int sig +@@ -176,8 +177,6 @@ void about_vncviewer() + static void mainloop(const char* vncserver, network::Socket* sock) + { + while (true) { +- CConn *cc; +- + exitMainloop = false; + + cc = new CConn(vncServerName, sock); +@@ -262,6 +261,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(_("Termination signal %d has been received. TigerVNC Viewer will now exit."), sig); @@ -64,23 +72,14 @@ exit(1); } -@@ -587,6 +599,9 @@ int main(int argc, char** argv) +@@ -744,6 +753,9 @@ int main(int argc, char** argv) XkbSetDetectableAutoRepeat(fl_display, True, NULL); #endif + fl_open_display(); + XSetIOErrorHandler(CleanupXIOErrorHandler); + - CSecurity::upg = &dlg; - #ifdef HAVE_GNUTLS - CSecurityTLS::msg = &dlg; -@@ -672,7 +687,7 @@ int main(int argc, char** argv) - #endif - } - -- CConn *cc = new CConn(vncServerName, sock); -+ cc = new CConn(vncServerName, sock); + init_fltk(); + enable_touch(); - while (!exitMainloop) - run_mainloop(); ++++++ tigervnc-newfbsize.patch ++++++ --- /var/tmp/diff_new_pack.I81Wt9/_old 2022-02-18 23:02:58.357412703 +0100 +++ /var/tmp/diff_new_pack.I81Wt9/_new 2022-02-18 23:02:58.357412703 +0100 @@ -1,14 +1,14 @@ -Index: b/vncviewer/CConn.cxx +Index: tigervnc-1.12.0/vncviewer/CConn.cxx =================================================================== ---- a/vncviewer/CConn.cxx -+++ b/vncviewer/CConn.cxx -@@ -388,6 +388,8 @@ void CConn::dataRect(const Rect& r, int +--- tigervnc-1.12.0.orig/vncviewer/CConn.cxx ++++ tigervnc-1.12.0/vncviewer/CConn.cxx +@@ -416,6 +416,8 @@ bool CConn::dataRect(const Rect& r, int if (encoding != encodingCopyRect) lastServerEncoding = encoding; + if (encoding == pseudoEncodingDesktopSize) + setDesktopSize( r.width(), r.height() ); - CConnection::dataRect(r, encoding); + ret = CConnection::dataRect(r, encoding); ++++++ u_build_libXvnc_as_separate_library.patch ++++++ --- /var/tmp/diff_new_pack.I81Wt9/_old 2022-02-18 23:02:58.381412702 +0100 +++ /var/tmp/diff_new_pack.I81Wt9/_new 2022-02-18 23:02:58.381412702 +0100 @@ -4,10 +4,10 @@ So it can be used by others, not only vncconfig. -Index: b/unix/vncconfig/CMakeLists.txt +Index: tigervnc-1.12.0/unix/vncconfig/CMakeLists.txt =================================================================== ---- a/unix/vncconfig/CMakeLists.txt -+++ b/unix/vncconfig/CMakeLists.txt +--- tigervnc-1.12.0.orig/unix/vncconfig/CMakeLists.txt ++++ tigervnc-1.12.0/unix/vncconfig/CMakeLists.txt @@ -3,13 +3,25 @@ include_directories(${X11_INCLUDE_DIR}) include_directories(${CMAKE_SOURCE_DIR}/common) include_directories(${CMAKE_SOURCE_DIR}/unix/tx) @@ -32,8 +32,8 @@ -target_link_libraries(vncconfig tx rfb network rdr ${X11_LIBRARIES}) +target_link_libraries(vncconfig tx rfb network rdr Xvnc ${X11_LIBRARIES}) - install(TARGETS vncconfig DESTINATION ${BIN_DIR}) + install(TARGETS vncconfig DESTINATION ${CMAKE_INSTALL_FULL_BINDIR}) +install(TARGETS Xvnc LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} RENAME libXvnc.so) - install(FILES vncconfig.man DESTINATION ${MAN_DIR}/man1 RENAME vncconfig.1) + install(FILES vncconfig.man DESTINATION ${CMAKE_INSTALL_FULL_MANDIR}/man1 RENAME vncconfig.1) +install(FILES vncExt.h DESTINATION ${X11_INCLUDE_DIR}/X11/extensions RENAME Xvnc.h) ++++++ u_change-button-layout-in-ServerDialog.patch ++++++ --- /var/tmp/diff_new_pack.I81Wt9/_old 2022-02-18 23:02:58.397412700 +0100 +++ /var/tmp/diff_new_pack.I81Wt9/_new 2022-02-18 23:02:58.397412700 +0100 @@ -8,20 +8,20 @@ vncviewer/ServerDialog.cxx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -diff --git a/vncviewer/ServerDialog.cxx b/vncviewer/ServerDialog.cxx -index de67f87b..0a8aa775 100644 ---- a/vncviewer/ServerDialog.cxx -+++ b/vncviewer/ServerDialog.cxx -@@ -53,7 +53,7 @@ ServerDialog::ServerDialog() +Index: tigervnc-1.12.0/vncviewer/ServerDialog.cxx +=================================================================== +--- tigervnc-1.12.0.orig/vncviewer/ServerDialog.cxx ++++ tigervnc-1.12.0/vncviewer/ServerDialog.cxx +@@ -68,7 +68,7 @@ ServerDialog::ServerDialog() - serverName = new Fl_Input(x, y, w() - margin*2 - server_label_width, INPUT_HEIGHT, _("VNC server:")); + serverName = new Fl_Input_Choice(x, y, w() - margin*2 - server_label_width, INPUT_HEIGHT, _("VNC server:")); - int adjust = (w() - 20) / 4; + int adjust = (w() - 20) / 3; int button_width = adjust - margin/2; x = margin; -@@ -76,6 +76,8 @@ ServerDialog::ServerDialog() +@@ -91,6 +91,8 @@ ServerDialog::ServerDialog() x = 0; y += margin/2 + BUTTON_HEIGHT; @@ -30,7 +30,4 @@ divider = new Fl_Box(x, y, w(), 2); divider->box(FL_THIN_DOWN_FRAME); --- -2.13.6 - ++++++ u_tigervnc-211.patch ++++++ --- /var/tmp/diff_new_pack.I81Wt9/_old 2022-02-18 23:02:58.413412699 +0100 +++ /var/tmp/diff_new_pack.I81Wt9/_new 2022-02-18 23:02:58.413412699 +0100 @@ -1,12 +1,14 @@ ---- ./unix/xserver/hw/vnc/xorg-version.h.orig 2021-10-28 13:58:20.309981257 +0200 -+++ ./unix/xserver/hw/vnc/xorg-version.h 2021-10-28 13:59:33.179368585 +0200 -@@ -54,6 +54,8 @@ - #define XORG 119 - #elif XORG_VERSION_CURRENT < ((1 * 10000000) + (20 * 100000) + (99 * 1000)) - #define XORG 120 -+#elif XORG_VERSION_CURRENT < ((21 * 10000000) + (1 * 100000) + (99 * 1000)) -+#define XORG 211 - #else +Index: unix/xserver/hw/vnc/xorg-version.h +=================================================================== +--- unix/xserver/hw/vnc/xorg-version.h.orig ++++ unix/xserver/hw/vnc/xorg-version.h +@@ -33,7 +33,7 @@ + #error "X.Org older than 1.16 is not supported" + #endif + +-#if XORG_AT_LEAST(1, 21, 0) ++#if XORG_AT_LEAST(1, 22, 0) #error "X.Org newer than 1.20 is not supported" #endif + ++++++ u_tigervnc-add-autoaccept-parameter.patch ++++++ --- /var/tmp/diff_new_pack.I81Wt9/_old 2022-02-18 23:02:58.425412698 +0100 +++ /var/tmp/diff_new_pack.I81Wt9/_new 2022-02-18 23:02:58.429412698 +0100 @@ -1,7 +1,7 @@ -Index: tigervnc-1.10.1/java/com/tigervnc/rfb/CSecurityTLS.java +Index: tigervnc-1.12.0/java/com/tigervnc/rfb/CSecurityTLS.java =================================================================== ---- tigervnc-1.10.1.orig/java/com/tigervnc/rfb/CSecurityTLS.java -+++ tigervnc-1.10.1/java/com/tigervnc/rfb/CSecurityTLS.java +--- tigervnc-1.12.0.orig/java/com/tigervnc/rfb/CSecurityTLS.java ++++ tigervnc-1.12.0/java/com/tigervnc/rfb/CSecurityTLS.java @@ -66,6 +66,9 @@ public class CSecurityTLS extends CSecur public static StringParameter X509CRL = new StringParameter("X509CRL", @@ -26,9 +26,9 @@ } + String thumbprint = getThumbprint(cert); File vncDir = new File(FileUtils.getVncHomeDir()); - if (!vncDir.exists()) - throw new AuthFailureException("Could not obtain VNC home directory "+ -@@ -332,6 +337,9 @@ public class CSecurityTLS extends CSecur + if (!vncDir.exists()) { + try { +@@ -337,6 +342,9 @@ public class CSecurityTLS extends CSecur store_pubkey(dbPath, client.getServerName().toLowerCase(), pk); } catch (java.lang.Exception e) { if (e.getCause() instanceof CertPathBuilderException) { @@ -38,7 +38,7 @@ vlog.debug("Server host not previously known"); vlog.debug(info); String text = -@@ -519,7 +527,7 @@ public class CSecurityTLS extends CSecur +@@ -524,7 +532,7 @@ public class CSecurityTLS extends CSecur private SSLEngineManager manager; private boolean anon; @@ -47,17 +47,4 @@ private FdInStream is; private FdOutStream os; -Index: tigervnc-1.10.1/java/com/tigervnc/vncviewer/VncViewer.java -=================================================================== ---- tigervnc-1.10.1.orig/java/com/tigervnc/vncviewer/VncViewer.java -+++ tigervnc-1.10.1/java/com/tigervnc/vncviewer/VncViewer.java -@@ -393,6 +393,8 @@ public class VncViewer extends javax.swi - // Called right after zero-arg constructor in applet mode - setLookAndFeel(); - setBackground(Color.white); -+ -+ SecurityClient.setDefaults(); - applet = this; - vncServerName.put(loadAppletParameters(applet).toCharArray()).flip(); - if (embed.getValue()) { ++++++ u_tigervnc-ignore-epipe-on-write.patch ++++++ --- /var/tmp/diff_new_pack.I81Wt9/_old 2022-02-18 23:02:58.441412697 +0100 +++ /var/tmp/diff_new_pack.I81Wt9/_new 2022-02-18 23:02:58.445412696 +0100 @@ -9,7 +9,7 @@ =================================================================== --- common/rdr/FdOutStream.cxx.orig +++ common/rdr/FdOutStream.cxx -@@ -204,8 +204,12 @@ int FdOutStream::writeWithTimeout(const +@@ -128,8 +128,12 @@ size_t FdOutStream::writeFd(const void* #endif } while (n < 0 && (errno == EINTR)); ++++++ xserver211.patch ++++++ --- /var/tmp/diff_new_pack.I81Wt9/_old 2022-02-18 23:02:58.537412689 +0100 +++ /var/tmp/diff_new_pack.I81Wt9/_new 2022-02-18 23:02:58.541412689 +0100 @@ -1,7 +1,8 @@ -diff -u -r xserver.orig/configure.ac xserver/configure.ac ---- xserver.orig/configure.ac 2021-10-28 11:39:43.200727345 +0000 -+++ xserver/configure.ac 2021-10-28 11:39:57.993008591 +0000 -@@ -72,6 +72,7 @@ +Index: xserver/configure.ac +=================================================================== +--- xserver.orig/configure.ac ++++ xserver/configure.ac +@@ -72,6 +72,7 @@ dnl forcing an entire recompile.x AC_CONFIG_HEADERS(include/version-config.h) AM_PROG_AS @@ -9,7 +10,7 @@ AC_PROG_LN_S LT_PREREQ([2.2]) LT_INIT([disable-static win32-dll]) -@@ -1713,6 +1714,10 @@ +@@ -1713,6 +1714,10 @@ if test "x$XVFB" = xyes; then AC_SUBST([XVFB_SYS_LIBS]) fi @@ -20,7 +21,7 @@ dnl Xnest DDX -@@ -1748,6 +1753,8 @@ +@@ -1748,6 +1753,8 @@ if test "x$XORG" = xauto; then fi AC_MSG_RESULT([$XORG]) @@ -29,7 +30,7 @@ if test "x$XORG" = xyes; then PKG_CHECK_MODULES([LIBXCVT], $LIBXCVT) -@@ -1956,7 +1963,6 @@ +@@ -1956,7 +1963,6 @@ if test "x$XORG" = xyes; then AC_DEFINE(XORG_SERVER, 1, [Building Xorg server]) AC_DEFINE(XORGSERVER, 1, [Building Xorg server]) AC_DEFINE(XFree86Server, 1, [Building XFree86 server]) @@ -37,7 +38,7 @@ AC_DEFINE(NEED_XF86_TYPES, 1, [Need XFree86 typedefs]) AC_DEFINE(NEED_XF86_PROTOTYPES, 1, [Need XFree86 helper functions]) AC_DEFINE(__XSERVERNAME__, "Xorg", [Name of X server]) -@@ -2339,6 +2345,7 @@ +@@ -2339,6 +2345,7 @@ hw/xfree86/utils/man/Makefile hw/xfree86/utils/gtf/Makefile hw/vfb/Makefile hw/vfb/man/Makefile @@ -45,10 +46,11 @@ hw/xnest/Makefile hw/xnest/man/Makefile hw/xwin/Makefile -diff -u -r xserver.orig/hw/Makefile.am xserver/hw/Makefile.am ---- xserver.orig/hw/Makefile.am 2021-10-28 11:39:43.156726511 +0000 -+++ xserver/hw/Makefile.am 2021-10-28 11:41:02.890242547 +0000 -@@ -28,7 +28,8 @@ +Index: xserver/hw/Makefile.am +=================================================================== +--- xserver.orig/hw/Makefile.am ++++ xserver/hw/Makefile.am +@@ -28,7 +28,8 @@ SUBDIRS = \ $(XVFB_SUBDIRS) \ $(XNEST_SUBDIRS) \ $(KDRIVE_SUBDIRS) \ @@ -58,10 +60,11 @@ DIST_SUBDIRS = xfree86 vfb xnest xwin xquartz kdrive -diff -u -r xserver.orig/mi/miinitext.c xserver/mi/miinitext.c ---- xserver.orig/mi/miinitext.c 2021-10-28 11:39:43.232727953 +0000 -+++ xserver/mi/miinitext.c 2021-10-28 11:39:57.993008591 +0000 -@@ -106,8 +106,15 @@ +Index: xserver/mi/miinitext.c +=================================================================== +--- xserver.orig/mi/miinitext.c ++++ xserver/mi/miinitext.c +@@ -106,8 +106,15 @@ SOFTWARE. #include "miinitext.h" @@ -77,10 +80,11 @@ {GEExtensionInit, "Generic Event Extension", &noGEExtension}, {ShapeExtensionInit, "SHAPE", NULL}, #ifdef MITSHM -diff -u -r xserver.old/hw/vnc/xvnc.c xserver/hw/vnc/xvnc.c ---- xserver.old/hw/vnc/xvnc.c 2021-10-28 12:14:39.360628791 +0000 -+++ xserver/hw/vnc/xvnc.c 2021-10-28 12:30:56.599310018 +0000 -@@ -85,7 +85,18 @@ +Index: xserver/hw/vnc/xvnc.c +=================================================================== +--- xserver.orig/hw/vnc/xvnc.c ++++ xserver/hw/vnc/xvnc.c +@@ -69,7 +69,18 @@ extern char buildtime[]; #undef VENDOR_RELEASE #undef VENDOR_STRING #include "version-config.h" @@ -98,6 +102,6 @@ +#define DEFAULT_LOG_FILE_VERBOSITY 3 +#endif - #define XVNCVERSION "TigerVNC 1.10.0" - #define XVNCCOPYRIGHT ("Copyright (C) 1999-2019 TigerVNC Team and many others (see README.rst)\n" \ + #define XVNCVERSION "TigerVNC 1.12.0" + #define XVNCCOPYRIGHT ("Copyright (C) 1999-2021 TigerVNC Team and many others (see README.rst)\n" \
