Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package tigervnc for openSUSE:Factory
checked in at 2024-02-23 16:40:15
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/tigervnc (Old)
and /work/SRC/openSUSE:Factory/.tigervnc.new.1770 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tigervnc"
Fri Feb 23 16:40:15 2024 rev:101 rq:1148477 version:1.13.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/tigervnc/tigervnc.changes 2023-11-28
22:18:44.624328635 +0100
+++ /work/SRC/openSUSE:Factory/.tigervnc.new.1770/tigervnc.changes
2024-02-23 16:40:15.960324259 +0100
@@ -1,0 +2,41 @@
+Wed Feb 21 09:15:27 UTC 2024 - Joan Torres <joan.tor...@suse.com>
+
+- Set the URL at Source0.
+
+-------------------------------------------------------------------
+Tue Feb 20 16:12:44 UTC 2024 - Stefan Dirsch <sndir...@suse.com>
+
+- patches have been renamed
+ * u_build_libXvnc_as_separate_library.patch -->
+ u_tigervnc-Build-libXvnc-as-separate-library.patch
+ * n_vncserver.patch -->
+ n_tigervnc-Vncserver.patch
+ * n_correct_path_in_desktop_file.patch -->
+ n_tigervnc-Correct-path-in-desktop-file.patch
+ * n_tigervnc-date-time.patch -->
+ n_tigervnc-Date-time.patch
+ * u_change-button-layout-in-ServerDialog.patch -->
+ u_tigervnc-Change-button-layout-in-ServerDialog.patch
+ * n_dont_sign_java_client.patch -->
+ n_tigervnc-Dont-sign-java-client.patch
+ * u_tigervnc-add-autoaccept-parameter.patch -->
+ u_tigervnc-Add-autoaccept-parameter.patch
+ * u_tigervnc-ignore-epipe-on-write.patch
+ u_tigervnc-Ignore-epipe-on-write.patch
+
+-------------------------------------------------------------------
+Tue Feb 20 10:16:54 UTC 2024 - Joan Torres <joan.tor...@suse.com>
+
+- Cleanup specfile
+ * Use the same format for all the patches.
+ * Use autosetup to apply all the patches with -p1.
+ * Clean number of sources.
+
+-------------------------------------------------------------------
+Mon Feb 19 12:49:39 UTC 2024 - Stefan Dirsch <sndir...@suse.com>
+
+- buildrequire xorg-x11-server-source/-sdk >= 21.1.11 and trigger
+ rebuild with newer xorg-x11-server-source package (bsc#1219311,
+ bsc#1219205)
+
+-------------------------------------------------------------------
Old:
----
n_correct_path_in_desktop_file.patch
n_dont_sign_java_client.patch
n_tigervnc-date-time.patch
n_vncserver.patch
u_build_libXvnc_as_separate_library.patch
u_change-button-layout-in-ServerDialog.patch
u_tigervnc-add-autoaccept-parameter.patch
u_tigervnc-ignore-epipe-on-write.patch
New:
----
n_tigervnc-Correct-path-in-desktop-file.patch
n_tigervnc-Date-time.patch
n_tigervnc-Dont-sign-java-client.patch
n_tigervnc-Vncserver.patch
u_tigervnc-Add-autoaccept-parameter.patch
u_tigervnc-Build-libXvnc-as-separate-library.patch
u_tigervnc-Change-button-layout-in-ServerDialog.patch
u_tigervnc-Ignore-epipe-on-write.patch
BETA DEBUG BEGIN:
Old: n_tigervnc-Vncserver.patch
* n_correct_path_in_desktop_file.patch -->
n_tigervnc-Correct-path-in-desktop-file.patch
Old: u_tigervnc-Change-button-layout-in-ServerDialog.patch
* n_dont_sign_java_client.patch -->
n_tigervnc-Dont-sign-java-client.patch
Old: n_tigervnc-Correct-path-in-desktop-file.patch
* n_tigervnc-date-time.patch -->
n_tigervnc-Date-time.patch
Old: u_tigervnc-Build-libXvnc-as-separate-library.patch
* n_vncserver.patch -->
n_tigervnc-Vncserver.patch
Old:- patches have been renamed
* u_build_libXvnc_as_separate_library.patch -->
u_tigervnc-Build-libXvnc-as-separate-library.patch
Old: n_tigervnc-Date-time.patch
* u_change-button-layout-in-ServerDialog.patch -->
u_tigervnc-Change-button-layout-in-ServerDialog.patch
Old: n_tigervnc-Dont-sign-java-client.patch
* u_tigervnc-add-autoaccept-parameter.patch -->
u_tigervnc-Add-autoaccept-parameter.patch
Old: u_tigervnc-Add-autoaccept-parameter.patch
* u_tigervnc-ignore-epipe-on-write.patch
u_tigervnc-Ignore-epipe-on-write.patch
BETA DEBUG END:
BETA DEBUG BEGIN:
New: * n_correct_path_in_desktop_file.patch -->
n_tigervnc-Correct-path-in-desktop-file.patch
* n_tigervnc-date-time.patch -->
New: * n_tigervnc-date-time.patch -->
n_tigervnc-Date-time.patch
* u_change-button-layout-in-ServerDialog.patch -->
New: * n_dont_sign_java_client.patch -->
n_tigervnc-Dont-sign-java-client.patch
* u_tigervnc-add-autoaccept-parameter.patch -->
New: * n_vncserver.patch -->
n_tigervnc-Vncserver.patch
* n_correct_path_in_desktop_file.patch -->
New: * u_tigervnc-add-autoaccept-parameter.patch -->
u_tigervnc-Add-autoaccept-parameter.patch
* u_tigervnc-ignore-epipe-on-write.patch
New: * u_build_libXvnc_as_separate_library.patch -->
u_tigervnc-Build-libXvnc-as-separate-library.patch
* n_vncserver.patch -->
New: * u_change-button-layout-in-ServerDialog.patch -->
u_tigervnc-Change-button-layout-in-ServerDialog.patch
* n_dont_sign_java_client.patch -->
New: * u_tigervnc-ignore-epipe-on-write.patch
u_tigervnc-Ignore-epipe-on-write.patch
BETA DEBUG END:
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ tigervnc.spec ++++++
--- /var/tmp/diff_new_pack.jh7CnX/_old 2024-02-23 16:40:18.428413727 +0100
+++ /var/tmp/diff_new_pack.jh7CnX/_new 2024-02-23 16:40:18.436414017 +0100
@@ -1,7 +1,7 @@
#
# spec file for package tigervnc
#
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -35,32 +35,32 @@
License: GPL-2.0-only AND MIT
Group: System/X11/Servers/XF86_4
URL: https://tigervnc.org/
-Source1:
https://github.com/TigerVNC/tigervnc/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
-Source4: 10-libvnc.conf
-Source5: vnc-server.susefirewall
-Source6: vnc-httpd.susefirewall
-Source7: vnc.reg
-Source8: vncpasswd.arg
-Source9: vnc.pam
-Source10: with-vnc-key.sh
-Source11: index.vnc
-Source12: x11vnc
-Source13: x...@.service.in
-Source14: xvnc.socket
-Source16: xvnc-novnc.socket
-Source17: tigervnc.firewalld
-Source18: tigervnc-https.firewalld
-Source19: xvnc.target
-Source21: xvnc-novnc.service.in
-Source22: vnc.sysusers
-Patch1: u_tigervnc-ignore-epipe-on-write.patch
-Patch2: u_build_libXvnc_as_separate_library.patch
-Patch3: u_tigervnc-add-autoaccept-parameter.patch
-Patch4: u_change-button-layout-in-ServerDialog.patch
-Patch5: n_tigervnc-date-time.patch
-Patch6: n_correct_path_in_desktop_file.patch
-Patch7: n_vncserver.patch
-Patch8: n_dont_sign_java_client.patch
+Source0:
https://github.com/TigerVNC/tigervnc/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
+Source1: 10-libvnc.conf
+Source2: vnc-server.susefirewall
+Source3: vnc-httpd.susefirewall
+Source4: vnc.reg
+Source5: vncpasswd.arg
+Source6: vnc.pam
+Source7: with-vnc-key.sh
+Source8: index.vnc
+Source9: x11vnc
+Source10: x...@.service.in
+Source11: xvnc.socket
+Source12: xvnc-novnc.socket
+Source13: tigervnc.firewalld
+Source14: tigervnc-https.firewalld
+Source15: xvnc.target
+Source16: xvnc-novnc.service.in
+Source17: vnc.sysusers
+Patch1: u_tigervnc-Ignore-epipe-on-write.patch
+Patch2: u_tigervnc-Build-libXvnc-as-separate-library.patch
+Patch3: u_tigervnc-Add-autoaccept-parameter.patch
+Patch4: u_tigervnc-Change-button-layout-in-ServerDialog.patch
+Patch5: n_tigervnc-Date-time.patch
+Patch6: n_tigervnc-Correct-path-in-desktop-file.patch
+Patch7: n_tigervnc-Vncserver.patch
+Patch8: n_tigervnc-Dont-sign-java-client.patch
Provides: tightvnc = 1.5.0
Obsoletes: tightvnc < 1.5.0
Provides: vnc
@@ -74,8 +74,8 @@
BuildRequires: libjpeg-devel
BuildRequires: libopenssl-devel
BuildRequires: libtool
-BuildRequires: xorg-x11-server-sdk >= 21.1.0
-BuildRequires: xorg-x11-server-source >= 21.1.0
+BuildRequires: xorg-x11-server-sdk >= 21.1.11
+BuildRequires: xorg-x11-server-source >= 21.1.11
BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(xext)
BuildRequires: pkgconfig(xproto)
@@ -132,7 +132,7 @@
BuildRequires: pkgconfig(zlib)
%if 0%{?suse_version} >= 1315
Requires(post): update-alternatives
-Requires(postun):update-alternatives
+Requires(postun): update-alternatives
%endif
%description
@@ -235,15 +235,7 @@
It maps common x11vnc arguments to x0vncserver arguments.
%prep
-%setup -T -b1 -q -n tigervnc-%{version}
-%patch1 -p0
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p0
-%patch8 -p0
+%autosetup -p1
cp -r %{_prefix}/src/xserver/* unix/xserver/
pushd unix/xserver
@@ -251,11 +243,11 @@
popd
%build
-%sysusers_generate_pre %{SOURCE22} xorg-x11-Xvnc vnc.conf
+%sysusers_generate_pre %{SOURCE17} xorg-x11-Xvnc vnc.conf
export CXXFLAGS="%optflags"
export CFLAGS="%optflags"
-sed "s|@LIBEXECDIR@|%{_libexecdir}|g" %{SOURCE13} > xvnc@.service
-sed "s|@LIBEXECDIR@|%{_libexecdir}|g" %{SOURCE21} > xvnc-novnc.service
+sed "s|@LIBEXECDIR@|%{_libexecdir}|g" %{SOURCE10} > xvnc@.service
+sed "s|@LIBEXECDIR@|%{_libexecdir}|g" %{SOURCE16} > xvnc-novnc.service
# Build all tigervnc
cmake -DCMAKE_VERBOSE_MAKEFILE=ON \
-DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
@@ -309,25 +301,25 @@
popd
%ifnarch s390x
-install -D -m 644 %{SOURCE4}
%{buildroot}%{_datadir}/X11/xorg.conf.d/10-libvnc.conf
+install -D -m 644 %{SOURCE1}
%{buildroot}%{_datadir}/X11/xorg.conf.d/10-libvnc.conf
%endif
%if %{use_firewalld}
-install -D -m 644 %{SOURCE17}
%{buildroot}%{_prefix}/lib/firewalld/services/tigervnc.xml
-install -D -m 644 %{SOURCE18}
%{buildroot}%{_prefix}/lib/firewalld/services/tigervnc-https.xml
+install -D -m 644 %{SOURCE13}
%{buildroot}%{_prefix}/lib/firewalld/services/tigervnc.xml
+install -D -m 644 %{SOURCE14}
%{buildroot}%{_prefix}/lib/firewalld/services/tigervnc-https.xml
%else
-install -D -m 644 %{SOURCE5}
%{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/vnc-server
-install -D -m 644 %{SOURCE6}
%{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/vnc-httpd
+install -D -m 644 %{SOURCE2}
%{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/vnc-server
+install -D -m 644 %{SOURCE3}
%{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/vnc-httpd
%endif
# only package as %%doc (boo#1173045)
-cp %{SOURCE7} .
-install -D -m 755 %{SOURCE8} %{buildroot}%{_bindir}/vncpasswd.arg
-install -D -m 644 %{SOURCE9} %{buildroot}%{_pam_vendordir}/vnc
+cp %{SOURCE4} .
+install -D -m 755 %{SOURCE5} %{buildroot}%{_bindir}/vncpasswd.arg
+install -D -m 644 %{SOURCE6} %{buildroot}%{_pam_vendordir}/vnc
%if 0%{?suse_version} >= 1550
mv %{buildroot}%{_sysconfdir}/pam.d/tigervnc %{buildroot}%{_pam_vendordir}
%endif
-install -D -m 644 %{SOURCE11} %{buildroot}%{_datadir}/vnc/classes
+install -D -m 644 %{SOURCE8} %{buildroot}%{_datadir}/vnc/classes
%if 0%{?suse_version} >= 1315
ln -s -f %{_sysconfdir}/alternatives/vncviewer %{buildroot}%{_bindir}/vncviewer
ln -s -f %{_sysconfdir}/alternatives/vncviewer.1.gz
%{buildroot}%{_mandir}/man1/vncviewer.1.gz
@@ -340,17 +332,17 @@
mkdir -p %{buildroot}%{_sysconfdir}/vnc
mkdir -p %{buildroot}%{_libexecdir}/vnc
-install -D -m 755 %{SOURCE10} %{buildroot}%{_libexecdir}/vnc
+install -D -m 755 %{SOURCE7} %{buildroot}%{_libexecdir}/vnc
-install -D -m 755 %{SOURCE12} %{buildroot}%{_bindir}/x11vnc
+install -D -m 755 %{SOURCE9} %{buildroot}%{_bindir}/x11vnc
install -D xvnc@.service -m 0444 %{buildroot}%{_unitdir}/xvnc@.service
-install -D %{SOURCE14} -m 0444 %{buildroot}%{_unitdir}/xvnc.socket
-install -D %{SOURCE16} -m 0444 %{buildroot}%{_unitdir}/xvnc-novnc.socket
-install -D %{SOURCE19} -m 0444 %{buildroot}%{_unitdir}/xvnc.target
+install -D %{SOURCE11} -m 0444 %{buildroot}%{_unitdir}/xvnc.socket
+install -D %{SOURCE12} -m 0444 %{buildroot}%{_unitdir}/xvnc-novnc.socket
+install -D %{SOURCE15} -m 0444 %{buildroot}%{_unitdir}/xvnc.target
install -D xvnc-novnc.service -m 0444
%{buildroot}%{_unitdir}/xvnc-novnc.service
-install -Dm0644 %{SOURCE22} %{buildroot}%{_sysusersdir}/vnc.conf
+install -Dm0644 %{SOURCE17} %{buildroot}%{_sysusersdir}/vnc.conf
rm -rf %{buildroot}%{_datadir}/doc/tigervnc*
++++++ n_tigervnc-Correct-path-in-desktop-file.patch ++++++
Our /usr/bin/vncviewer is symlink to alternatives. This desktop file is named
specifically "TigerVNC Viewer", so lets start /usr/bin/vncviewer-tigervnc, no
matter what the currently selected alternative is.
Index: tigervnc-1.9.0/vncviewer/vncviewer.desktop.in.in
===================================================================
--- tigervnc-1.9.0.orig/vncviewer/vncviewer.desktop.in.in
+++ tigervnc-1.9.0/vncviewer/vncviewer.desktop.in.in
@@ -2,7 +2,7 @@
Name=TigerVNC Viewer
GenericName=Remote Desktop Viewer
Comment=Connect to VNC server and display remote desktop
-Exec=@CMAKE_INSTALL_FULL_BINDIR@/vncviewer
+Exec=@CMAKE_INSTALL_FULL_BINDIR@/vncviewer-tigervnc
Icon=tigervnc
Terminal=false
Type=Application
++++++ n_tigervnc-Date-time.patch ++++++
Index: tigervnc-1.13.1/unix/xserver/hw/vnc/buildtime.c
===================================================================
--- tigervnc-1.13.1.orig/unix/xserver/hw/vnc/buildtime.c
+++ tigervnc-1.13.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[] = "??? ?? ???? ??:??:??";
Index: tigervnc-1.13.1/unix/vncconfig/buildtime.c
===================================================================
--- tigervnc-1.13.1.orig/unix/vncconfig/buildtime.c
+++ tigervnc-1.13.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[] = "??? ?? ???? ??:??:??";
Index: tigervnc-1.13.1/unix/x0vncserver/buildtime.c
===================================================================
--- tigervnc-1.13.1.orig/unix/x0vncserver/buildtime.c
+++ tigervnc-1.13.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[] = "??? ?? ???? ??:??:??";
Index: tigervnc-1.13.1/win/winvnc/buildTime.cxx
===================================================================
--- tigervnc-1.13.1.orig/win/winvnc/buildTime.cxx
+++ tigervnc-1.13.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.13.1/CMakeLists.txt
===================================================================
--- tigervnc-1.13.1.orig/CMakeLists.txt
+++ tigervnc-1.13.1/CMakeLists.txt
@@ -40,10 +40,6 @@ if(MSVC)
message(FATAL_ERROR "TigerVNC cannot be built with Visual Studio. Please
use MinGW")
endif()
-if(NOT 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.13.1/vncviewer/vncviewer.cxx
===================================================================
--- tigervnc-1.13.1.orig/vncviewer/vncviewer.cxx
+++ tigervnc-1.13.1/vncviewer/vncviewer.cxx
@@ -105,10 +105,9 @@ static const char *about_text()
// time.
snprintf(buffer, sizeof(buffer),
_("TigerVNC Viewer v%s\n"
- "Built on: %s\n"
"Copyright (C) 1999-%d TigerVNC Team and many others (see
README.rst)\n"
"See https://www.tigervnc.org for information on TigerVNC."),
- PACKAGE_VERSION, BUILD_TIMESTAMP, 2022);
+ PACKAGE_VERSION, 2022);
return buffer;
}
Index: tigervnc-1.13.1/java/CMakeLists.txt
===================================================================
--- tigervnc-1.13.1.orig/java/CMakeLists.txt
+++ tigervnc-1.13.1/java/CMakeLists.txt
@@ -22,12 +22,6 @@ set(JAVA_STOREPASS NOTFOUND CACHE STRING
set(JAVA_KEYPASS NOTFOUND CACHE STRING "Password used to protect the private
key of the specified keystore entry")
set(JAVA_TSA_URL NOTFOUND CACHE STRING "URL of Time Stamping Authority (TSA)")
-if(NOT BUILD)
- STRING(TIMESTAMP BUILD "%Y%m%d" UTC)
-endif()
-STRING(TIMESTAMP JAVA_DATE "%Y-%m-%d" UTC)
-STRING(TIMESTAMP JAVA_TIME "%H:%M:%S" UTC)
-
set(JAVA_SOURCES "")
set(JAVA_CLASSES "")
++++++ n_tigervnc-Dont-sign-java-client.patch ++++++
References: bsc#1208478
Author: Joan Torres <joan.tor...@suse.com>
Subject: Don't sign the Java client
This avoids the addition of a signed file in the jar with a timestamp.
The signing was necessary for accessing the system clipboard
when the Java client runs as an applet.
(This shouldn't harm due to the deprecation of Java applets
was done in version 9).
Index: tigervnc-1.13.1/java/CMakeLists.txt
===================================================================
--- tigervnc-1.13.1.orig/java/CMakeLists.txt
+++ tigervnc-1.13.1/java/CMakeLists.txt
@@ -154,15 +154,6 @@ add_custom_command(OUTPUT VncViewer.jar
com/jcraft/jsch/jce/*.class
com/jcraft/jsch/*.class
com/tigervnc/vncviewer/*.png
- com/tigervnc/vncviewer/tigervnc.ico
- COMMAND ${CMAKE_COMMAND}
- ARGS -DJava_PATH=${Java_PATH} -DJAR_FILE=${BINDIR}/VncViewer.jar
- -DJAVA_KEYSTORE=${JAVA_KEYSTORE}
- -DJAVA_KEYSTORE_TYPE=${JAVA_KEYSTORE_TYPE}
- -DJAVA_STOREPASS=${JAVA_STOREPASS}
- -DJAVA_KEYPASS=${JAVA_KEYPASS}
- -DJAVA_KEY_ALIAS=${JAVA_KEY_ALIAS}
- -DJAVA_TSA_URL=${JAVA_TSA_URL}
- -P ${SRCDIR}/cmake/SignJar.cmake)
+ com/tigervnc/vncviewer/tigervnc.ico)
add_custom_target(java ALL DEPENDS VncViewer.jar)
++++++ n_tigervnc-Vncserver.patch ++++++
Index: tigervnc-1.13.1/unix/vncserver/vncserver.in
===================================================================
--- tigervnc-1.13.1.orig/unix/vncserver/vncserver.in
+++ tigervnc-1.13.1/unix/vncserver/vncserver.in
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl
+#!/usr/bin/perl
#
# Copyright (C) 2015-2019 Pierre Ossman for Cendio AB
# Copyright (C) 2009-2010 D. R. Commander. All Rights Reserved.
@@ -439,7 +439,7 @@ sub SanityCheck
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;
++++++ u_tigervnc-Add-autoaccept-parameter.patch ++++++
Index: tigervnc-1.12.0/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",
"X509 CRL file", "",
Configuration.ConfigurationObject.ConfViewer);
+ public static StringParameter x509autoaccept
+ = new StringParameter("x509autoaccept",
+ "X509 Certificate SHA-1 fingerprint", "",
Configuration.ConfigurationObject.ConfViewer);
public static UserMsgBox msg;
private void initGlobal()
@@ -85,6 +88,7 @@ public class CSecurityTLS extends CSecur
setDefaults();
cafile = X509CA.getData();
crlfile = X509CRL.getData();
+ certautoaccept = x509autoaccept.getData();
}
public static String getDefaultCA() {
@@ -278,6 +282,7 @@ public class CSecurityTLS extends CSecur
"do you want to continue?"))
throw new AuthFailureException("server certificate has expired");
}
+ String thumbprint = getThumbprint(cert);
File vncDir = new File(FileUtils.getVncHomeDir());
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) {
+ if (certautoaccept != null &&
thumbprint.equalsIgnoreCase(certautoaccept)) {
+ return;
+ }
vlog.debug("Server host not previously known");
vlog.debug(info);
String text =
@@ -524,7 +532,7 @@ public class CSecurityTLS extends CSecur
private SSLEngineManager manager;
private boolean anon;
- private String cafile, crlfile;
+ private String cafile, crlfile, certautoaccept;
private FdInStream is;
private FdOutStream os;
++++++ u_tigervnc-Build-libXvnc-as-separate-library.patch ++++++
Author: Michal Srb <michal...@gmail.com>
Patch-Mainline: To be upstreamed
Subject: [PATCH] Build libXvnc as separate library.
So it can be used by others, not only vncconfig.
Index: tigervnc-1.12.0/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)
+include(GNUInstallDirs)
+
+add_library(Xvnc SHARED
+ vncExt.c)
+
+set_target_properties(Xvnc
+ PROPERTIES
+ VERSION 1.0.0
+ SOVERSION 1
+)
+
add_executable(vncconfig
buildtime.c
- vncExt.c
vncconfig.cxx
QueryConnectDialog.cxx)
-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 ${CMAKE_INSTALL_FULL_BINDIR})
+install(TARGETS Xvnc LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} RENAME
libXvnc.so)
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_tigervnc-Change-button-layout-in-ServerDialog.patch ++++++
Patch-mainline: To be upstreamed
References: bnc#1084865
Author: Michal Srb <m...@suse.com>
Subject: Change button layout in ServerDialog.
To fit strings in languages with longer words...
---
vncviewer/ServerDialog.cxx | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
Index: tigervnc-1.13.0/vncviewer/ServerDialog.cxx
===================================================================
--- tigervnc-1.13.0.orig/vncviewer/ServerDialog.cxx
+++ tigervnc-1.13.0/vncviewer/ServerDialog.cxx
@@ -70,7 +70,7 @@ ServerDialog::ServerDialog()
serverName = new Fl_Input_Choice(x, y, w() - margin*2 - server_label_width,
INPUT_HEIGHT, _("VNC server:"));
usedDir = NULL;
- int adjust = (w() - 20) / 4;
+ int adjust = (w() - 20) / 3;
int button_width = adjust - margin/2;
x = margin;
@@ -93,6 +93,8 @@ ServerDialog::ServerDialog()
x = 0;
y += margin/2 + BUTTON_HEIGHT;
+ adjust = (w() - 20) / 4;
+ button_width = adjust - margin/2;
divider = new Fl_Box(x, y, w(), 2);
divider->box(FL_THIN_DOWN_FRAME);
++++++ u_tigervnc-Ignore-epipe-on-write.patch ++++++
Author: Michal Srb <m...@suse.com>
Subject: Ignore EPIPE on write.
Patch-Mainline: To be upstreamed
References: bnc#864676
If the VNC server closes connection after our last read and before this write,
we will report error message about EPIPE.
This situation is no error, however, we should quit normally same as when we
find out that connection was closed during read.
Index: tigervnc-1.13.1/common/rdr/FdOutStream.cxx
===================================================================
--- tigervnc-1.13.1.orig/common/rdr/FdOutStream.cxx
+++ tigervnc-1.13.1/common/rdr/FdOutStream.cxx
@@ -128,8 +128,12 @@ size_t FdOutStream::writeFd(const void*
#endif
} while (n < 0 && (errno == EINTR));
- if (n < 0)
- throw SystemException("write", errno);
+ if (n < 0) {
+ if(errno == EPIPE)
+ n = length; // Ignore EPIPE and fake successfull write, it doesn't
matter that we are writing to closed socket, we will find out once we try to
read from it.
+ else
+ throw SystemException("write", errno);
+ }
gettimeofday(&lastWrite, NULL);
