SHA256
1
0
forked from pool/tigervnc

Compare commits

...

17 Commits

Author SHA256 Message Date
Ana Guerrero
bf0d316f70 Accepting request 1243191 from X11:XOrg
Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/1243191
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/tigervnc?expand=0&rev=110
2025-02-05 11:40:00 +00:00
0be6639696 - Only add selinux on %suse_version >= 1600
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/tigervnc?expand=0&rev=275
2025-01-28 16:46:32 +00:00
Ana Guerrero
669f5f76fc Accepting request 1240537 from X11:XOrg
OBS-URL: https://build.opensuse.org/request/show/1240537
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/tigervnc?expand=0&rev=109
2025-01-27 19:50:30 +00:00
7ed1523477 - Remove wrong %selinux_requires from the main package, it's already
in the -selinux subpackage

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/tigervnc?expand=0&rev=273
2025-01-27 13:36:39 +00:00
56c3414097 - Fix and clarify suse_version macros.
* %suse_version only defines major versions, e.g. 1500, 1600...
    using %suse_version < 1550 might look like for version 15.4 
    is true but it isn't.
  * Use %sle_version when targeting minor releases.

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/tigervnc?expand=0&rev=272
2025-01-24 15:50:30 +00:00
Ana Guerrero
6f4a0d5f97 Accepting request 1239506 from X11:XOrg
OBS-URL: https://build.opensuse.org/request/show/1239506
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/tigervnc?expand=0&rev=108
2025-01-23 16:56:47 +00:00
4a22d11a96 - Include SELinux module.
* Fixes bsc#1235671.

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/tigervnc?expand=0&rev=270
2025-01-22 11:55:45 +00:00
Ana Guerrero
6f9276eb06 Accepting request 1220569 from X11:XOrg
OBS-URL: https://build.opensuse.org/request/show/1220569
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/tigervnc?expand=0&rev=107
2024-11-05 14:40:37 +00:00
543e26d9be - Update to tigervnc 1.14.1
* Default installation of native viewer can once again handle VncAuth
  * Graphic acceleration now can now be disabled through the vncserver config file the same way as other features
  * Command vncpasswd can again correctly update passwords
  * Native viewer once again consider passwd file that contain more than one password valid
  * Native viewer can once again connect to RealVNC servers
  * Users of x0vncserver should no longer experience the mouse cursor moving to the upper left corner
  * H264 encoding no longer causes crashing
- Removed patches (no longer needed):
  * u_tigervnc-Change-button-layout-in-ServerDialog.patch
- Refreshed patches:
  * n_tigervnc-Date-time.patch
  * n_tigervnc-Dont-sign-java-client.patch
  * n_tigervnc-reproducible-jar-mtime.patch
  * u_tigervnc-Add-autoaccept-parameter.patch
  * u_tigervnc-Build-libXvnc-as-separate-library.patch
  * u_tigervnc-Ignore-epipe-on-write.patch
- Fix path on vncviewer desktop file. Use %use_update_alternative

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/tigervnc?expand=0&rev=268
2024-11-04 12:29:12 +00:00
Ana Guerrero
3e89ebe5be Accepting request 1218802 from X11:XOrg
OBS-URL: https://build.opensuse.org/request/show/1218802
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/tigervnc?expand=0&rev=106
2024-10-29 13:32:07 +00:00
067705f55d - Require /usr/bin/dbus-launch insted of dbus-1-x11: Do not rely on
legacy dbus-1-x11 package, which is going away after moving to
  dbus-broker.

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/tigervnc?expand=0&rev=266
2024-10-28 12:05:08 +00:00
Ana Guerrero
ad3d57f718 Accepting request 1216810 from X11:XOrg
OBS-URL: https://build.opensuse.org/request/show/1216810
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/tigervnc?expand=0&rev=105
2024-10-22 12:50:59 +00:00
e91be542a2 - Do not ship rcFOO symlinks for CODE 16 (PED-266).
- No longer use update alternatives on CODE 16: there are no
  alternatives for vncviewer present.

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/tigervnc?expand=0&rev=264
2024-10-21 18:34:43 +00:00
Ana Guerrero
4236f10bd7 Accepting request 1204086 from X11:XOrg
OBS-URL: https://build.opensuse.org/request/show/1204086
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/tigervnc?expand=0&rev=104
2024-09-29 16:09:20 +00:00
03edee3617 Use SOURCE_DATE_EPOCH for reproducible jar mtime
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/tigervnc?expand=0&rev=262
2024-09-27 08:23:58 +00:00
Ana Guerrero
db0da2a81b Accepting request 1202922 from X11:XOrg
- added conflicts to patterns-wsl-tmpfiles as this patterns package
  creates a symlink from /tmp/.X11-unix to /mnt/wslg/.X11-unix and
  therefore prevents Xvnc from creating this needed directory
  (bsc#1230755)

OBS-URL: https://build.opensuse.org/request/show/1202922
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/tigervnc?expand=0&rev=103
2024-09-25 19:52:48 +00:00
463444d854 - added conflicts to patterns-wsl-tmpfiles as this patterns package
creates a symlink from /tmp/.X11-unix to /mnt/wslg/.X11-unix and
  therefore prevents Xvnc from creating this needed directory
  (bsc#1230755)

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/tigervnc?expand=0&rev=260
2024-09-24 11:34:15 +00:00
11 changed files with 254 additions and 89 deletions

View File

@ -64,8 +64,8 @@ Index: tigervnc-1.13.1/vncviewer/vncviewer.cxx
- "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);
- PACKAGE_VERSION, BUILD_TIMESTAMP, 2024);
+ PACKAGE_VERSION, 2024);
return buffer;
}
@ -73,9 +73,9 @@ 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")
@@ -25,12 +25,6 @@ set(JAVA_PKCS11_PROVIDER_ARG NOTFOUND CACHE STRING "Path to the PKCS11 security
set(JAVA_TSA_URL NOTFOUND CACHE STRING "URL of Time Stamping Authority (TSA)")
set(JAVA_CERT_CHAIN NOTFOUND CACHE STRING "Path to CA certificate chain file")
-if(NOT BUILD)
- STRING(TIMESTAMP BUILD "%Y%m%d" UTC)

View File

@ -11,7 +11,7 @@ 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
@@ -163,18 +163,6 @@ add_custom_command(OUTPUT VncViewer.jar
com/jcraft/jsch/jce/*.class
com/jcraft/jsch/*.class
com/tigervnc/vncviewer/*.png
@ -21,9 +21,12 @@ Index: tigervnc-1.13.1/java/CMakeLists.txt
- -DJAVA_KEYSTORE=${JAVA_KEYSTORE}
- -DJAVA_KEYSTORE_TYPE=${JAVA_KEYSTORE_TYPE}
- -DJAVA_STOREPASS=${JAVA_STOREPASS}
- -DJAVA_PKCS11_PROVIDER_CLASS=${JAVA_PKCS11_PROVIDER_CLASS}
- -DJAVA_PKCS11_PROVIDER_ARG=${JAVA_PKCS11_PROVIDER_ARG}
- -DJAVA_KEYPASS=${JAVA_KEYPASS}
- -DJAVA_KEY_ALIAS=${JAVA_KEY_ALIAS}
- -DJAVA_TSA_URL=${JAVA_TSA_URL}
- -DJAVA_CERT_CHAIN=${JAVA_CERT_CHAIN}
- -P ${SRCDIR}/cmake/SignJar.cmake)
+ com/tigervnc/vncviewer/tigervnc.ico)

View File

@ -0,0 +1,32 @@
diff -urEbwB tigervnc-1.13.1.orig/java/CMakeLists.txt tigervnc-1.13.1/java/CMakeLists.txt
--- tigervnc-1.13.1.orig/java/CMakeLists.txt 2024-09-26 22:41:57.677131737 +0200
+++ tigervnc-1.13.1/java/CMakeLists.txt 2024-09-26 22:46:01.029014276 +0200
@@ -139,6 +139,15 @@
string(REGEX REPLACE "jar" "" Java_PATH ${Java_JAR_EXECUTABLE})
string(REGEX REPLACE ".exe" "" Java_PATH ${Java_PATH})
+if (DEFINED ENV{SOURCE_DATE_EPOCH})
+ execute_process(
+ COMMAND "date" "-u" "-d" "@$ENV{SOURCE_DATE_EPOCH}" "+%Y-%m-%dT%H:%M:%SZ"
+ OUTPUT_VARIABLE COMPILATION_DATE
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+else ()
+ STRING(TIMESTAMP COMPILATION_DATE "+%Y-%m-%dT%H:%M:%SZ")
+endif ()
+
add_custom_command(OUTPUT VncViewer.jar
DEPENDS ${JAVA_CLASSES}
${SRCDIR}/${CLASSPATH}/MANIFEST.MF
@@ -148,8 +157,10 @@
${BINDIR}/${CLASSPATH}/insecure.png
${BINDIR}/${CLASSPATH}/secure.png
COMMAND ${JAVA_ARCHIVE}
- ARGS cfm VncViewer.jar
- ${SRCDIR}/${CLASSPATH}/MANIFEST.MF
+ ARGS --create
+ --date=${COMPILATION_DATE}
+ --file=VncViewer.jar
+ --manifest=${SRCDIR}/${CLASSPATH}/MANIFEST.MF
${CLASSPATH}/timestamp
${CLASSPATH}/*.class
com/tigervnc/rfb/*.class

BIN
tigervnc-1.13.1.tar.gz (Stored with Git LFS)

Binary file not shown.

BIN
tigervnc-1.14.1.tar.gz (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -1,3 +1,87 @@
-------------------------------------------------------------------
Tue Jan 28 16:43:25 UTC 2025 - Joan Torres <joan.torres@suse.com>
- Only add selinux on %suse_version >= 1600
-------------------------------------------------------------------
Mon Jan 27 10:33:08 UTC 2025 - Fabian Vogt <fvogt@suse.com>
- Remove wrong %selinux_requires from the main package, it's already
in the -selinux subpackage
-------------------------------------------------------------------
Fri Jan 24 15:39:03 UTC 2025 - Joan Torres <joan.torres@suse.com>
- Fix and clarify suse_version macros.
* %suse_version only defines major versions, e.g. 1500, 1600...
using %suse_version < 1550 might look like for version 15.4
is true but it isn't.
* Use %sle_version when targeting minor releases.
-------------------------------------------------------------------
Tue Jan 21 13:08:53 UTC 2025 - Joan Torres <joan.torres@suse.com>
- Include SELinux module.
* Fixes bsc#1235671.
-------------------------------------------------------------------
Mon Nov 4 11:25:41 UTC 2024 - Joan Torres <joan.torres@suse.com>
- Update to tigervnc 1.14.1
* Default installation of native viewer can once again handle VncAuth
* Graphic acceleration now can now be disabled through the vncserver config file the same way as other features
* Command vncpasswd can again correctly update passwords
* Native viewer once again consider passwd file that contain more than one password valid
* Native viewer can once again connect to RealVNC servers
* Users of x0vncserver should no longer experience the mouse cursor moving to the upper left corner
* H264 encoding no longer causes crashing
- Removed patches (no longer needed):
* u_tigervnc-Change-button-layout-in-ServerDialog.patch
- Refreshed patches:
* n_tigervnc-Date-time.patch
* n_tigervnc-Dont-sign-java-client.patch
* n_tigervnc-reproducible-jar-mtime.patch
* u_tigervnc-Add-autoaccept-parameter.patch
* u_tigervnc-Build-libXvnc-as-separate-library.patch
* u_tigervnc-Ignore-epipe-on-write.patch
-------------------------------------------------------------------
Mon Nov 4 11:24:45 UTC 2024 - Joan Torres <joan.torres@suse.com>
- Fix path on vncviewer desktop file. Use %use_update_alternative
-------------------------------------------------------------------
Mon Oct 28 08:49:56 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
- Require /usr/bin/dbus-launch insted of dbus-1-x11: Do not rely on
legacy dbus-1-x11 package, which is going away after moving to
dbus-broker.
-------------------------------------------------------------------
Fri Oct 18 12:10:51 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
- Do not ship rcFOO symlinks for CODE 16 (PED-266).
- No longer use update alternatives on CODE 16: there are no
alternatives for vncviewer present.
-------------------------------------------------------------------
Thu Sep 26 20:58:00 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- Added patch:
* n_tigervnc-reproducible-jar-mtime.patch
+ Use SOURCE_DATE_EPOCH for reproducible jar mtime
+ Applied if building with Java >= 17
-------------------------------------------------------------------
Tue Sep 24 11:27:02 UTC 2024 - Stefan Dirsch <sndirsch@suse.com>
- added conflicts to patterns-wsl-tmpfiles as this patterns package
creates a symlink from /tmp/.X11-unix to /mnt/wslg/.X11-unix and
therefore prevents Xvnc from creating this needed directory
(bsc#1230755)
-------------------------------------------------------------------
Mon Feb 26 11:29:31 UTC 2024 - pgajdos@suse.com

View File

@ -1,7 +1,7 @@
#
# spec file for package tigervnc
#
# Copyright (c) 2024 SUSE LLC
# Copyright (c) 2025 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -16,6 +16,8 @@
#
%global selinuxtype targeted
%global modulename vncsession
%define vncgroup vnc
%define vncuser vnc
%define tlskey %{_sysconfdir}/vnc/tls.key
@ -25,11 +27,18 @@
%else
%define use_firewalld 0
%endif
%if 0%{?suse_version} < 1550
%define use_update_alternative 0%{?suse_version} >= 1315 && 0%{?suse_version} < 1600
%define with_rc_service_symlink 0%{?suse_version} && 0%{?suse_version} < 1600
%if 0%{?suse_version} < 1600
%define _pam_vendordir %{_sysconfdir}/pam.d
%endif
%if 0%{?suse_version} >= 1600
%bcond_without selinux
%else
%bcond_with selinux
%endif
Name: tigervnc
Version: 1.13.1
Version: 1.14.1
Release: 0
Summary: An implementation of VNC
License: GPL-2.0-only AND MIT
@ -56,11 +65,16 @@ 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
Patch4: n_tigervnc-Date-time.patch
%if %use_update_alternative
Patch5: n_tigervnc-Correct-path-in-desktop-file.patch
%endif
Patch6: n_tigervnc-Vncserver.patch
Patch7: n_tigervnc-Dont-sign-java-client.patch
# The "--date" option was added into jar in OpenJDK 17
%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 17}%{!?pkg_vcmp:0}
Patch8: n_tigervnc-reproducible-jar-mtime.patch
%endif
Provides: tightvnc = 1.5.0
Obsoletes: tightvnc < 1.5.0
Provides: vnc
@ -130,10 +144,14 @@ BuildRequires: pkgconfig(xorg-macros) >= 1.14
BuildRequires: pkgconfig(xproto) >= 7.0.17
BuildRequires: pkgconfig(xtrans) >= 1.2.2
BuildRequires: pkgconfig(zlib)
%if 0%{?suse_version} >= 1315
%if %use_update_alternative
Requires(post): update-alternatives
Requires(postun): update-alternatives
%endif
%if %{with selinux}
BuildRequires: selinux-policy-%{selinuxtype}
BuildRequires: selinux-policy-devel
%endif
%description
TigerVNC is an implementation of VNC (Virtual Network Computing), a
@ -154,13 +172,16 @@ BuildRequires: firewall-macros
%endif
# Needed to generate certificates
Requires: windowmanager
Requires: dbus-1-x11
Requires: /usr/bin/dbus-launch
Requires: xauth
Requires: xinit
Requires: xkbcomp
Requires: xkeyboard-config
Requires: xorg-x11-fonts-core
Requires: openssl(cli)
%if %{with selinux}
Requires: (%{name}-selinux if selinux-policy-base)
%endif
# For the with-vnc-key.sh script
Requires: /bin/hostname
%{?systemd_requires}
@ -170,6 +191,7 @@ Recommends: xorg-x11-Xvnc-module
Provides: tightvnc = 1.5.0
Obsoletes: tightvnc < 1.5.0
Provides: xorg-x11-Xvnc:/usr/lib/vnc/with-vnc-key.sh
Conflicts: patterns-wsl-tmpfiles
%description -n xorg-x11-Xvnc
This is the TigerVNC implementation of Xvnc.
@ -234,12 +256,23 @@ BuildArch: noarch
This is a wrapper that looks like x11vnc, but starts x0vncserver instead.
It maps common x11vnc arguments to x0vncserver arguments.
%if %{with selinux}
%package selinux
Summary: SELinux module for TigerVNC
BuildArch: noarch
%{selinux_requires}
%description selinux
This package provides the SELinux policy module to ensure TigerVNC
runs properly under an environment with SELinux enabled.
%endif
%prep
%autosetup -p1
cp -r %{_prefix}/src/xserver/* unix/xserver/
pushd unix/xserver
patch -p1 < ../xserver21.1.1.patch
patch -p1 < ../xserver21.patch
popd
%build
@ -284,12 +317,21 @@ cmake -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} .
%make_build
popd
# SELinux
%if %{with selinux}
pushd unix/vncserver/selinux
make
popd
%endif
%install
%make_install
%if %use_update_alternative
mv %{buildroot}%{_bindir}/vncviewer %{buildroot}%{_bindir}/vncviewer-tigervnc
mv %{buildroot}%{_datadir}/man/man1/vncviewer.1 %{buildroot}%{_datadir}/man/man1/vncviewer-tigervnc.1
%endif
pushd unix/xserver
%make_install
@ -300,6 +342,12 @@ mkdir -p %{buildroot}%{_datadir}/vnc/classes
install -m755 VncViewer.jar %{buildroot}%{_datadir}/vnc/classes
popd
%if %{with selinux}
pushd unix/vncserver/selinux
%make_install
popd
%endif
%ifnarch s390x
install -D -m 644 %{SOURCE1} %{buildroot}%{_datadir}/X11/xorg.conf.d/10-libvnc.conf
%endif
@ -316,18 +364,20 @@ install -D -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.
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
%if 0%{?suse_version} >= 1600
mv %{buildroot}%{_sysconfdir}/pam.d/tigervnc %{buildroot}%{_pam_vendordir}
%endif
install -D -m 644 %{SOURCE8} %{buildroot}%{_datadir}/vnc/classes
%if 0%{?suse_version} >= 1315
%if %use_update_alternative
ln -s -f %{_sysconfdir}/alternatives/vncviewer %{buildroot}%{_bindir}/vncviewer
ln -s -f %{_sysconfdir}/alternatives/vncviewer.1.gz %{buildroot}%{_mandir}/man1/vncviewer.1.gz
%endif
%if %with_rc_service_symlink
mkdir -p %{buildroot}%{_sbindir}
ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rcxvnc
ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rcxvnc-novnc
%endif
mkdir -p %{buildroot}%{_sysconfdir}/vnc
@ -349,15 +399,15 @@ rm -rf %{buildroot}%{_datadir}/doc/tigervnc*
%find_lang '%{name}'
%python3_fix_shebang
%if %use_update_alternative
%post
%if 0%{?suse_version} >= 1315
%_sbindir/update-alternatives \
--install %{_bindir}/vncviewer vncviewer %{_bindir}/vncviewer-tigervnc 20 \
--slave %{_mandir}/man1/vncviewer.1.gz vncviewer.1.gz %{_mandir}/man1/vncviewer-tigervnc.1.gz
%endif
%if %use_update_alternative
%postun
%if 0%{?suse_version} >= 1315
if [ "$1" = 0 ] ; then
"%{_sbindir}/update-alternatives" --remove vncviewer %{_bindir}/vncviewer-tigervnc
fi
@ -365,7 +415,7 @@ fi
%pre -n xorg-x11-Xvnc -f xorg-x11-Xvnc.pre
%service_add_pre xvnc.socket xvnc.target
%if 0%{?suse_version} >= 1550
%if 0%{?suse_version} >= 1600
# Prepare for migration to /usr/lib; save any old .rpmsave
for i in pam.d/vnc pam.d/tigervnc ; do
test -f %{_sysconfdir}/${i}.rpmsave && mv -v %{_sysconfdir}/${i}.rpmsave %{_sysconfdir}/${i}.rpmsave.old ||:
@ -420,18 +470,35 @@ fi
%post -n libXvnc1 -p /sbin/ldconfig
%postun -n libXvnc1 -p /sbin/ldconfig
%files -f %{name}.lang
%ghost %{_bindir}/vncviewer
%{_bindir}/vncviewer-tigervnc
%license LICENCE.TXT
%doc README.rst
%ghost %{_mandir}/man1/vncviewer.1.gz
%{_mandir}/man1/vncviewer-tigervnc.1%{?ext_man}
%if 0%{?suse_version} >= 1315
%ghost %{_sysconfdir}/alternatives/vncviewer
%ghost %{_sysconfdir}/alternatives/vncviewer.1.gz
%if %{with selinux}
%pre selinux
%selinux_relabel_pre -s %{selinuxtype}
%post selinux
%selinux_modules_install -s %{selinuxtype} %{_datadir}/selinux/packages/%{selinuxtype}/%{modulename}.pp.bz2
%selinux_relabel_post -s %{selinuxtype}
%postun selinux
if [ $1 -eq 0 ]; then
%selinux_modules_uninstall -s %{selinuxtype} %{modulename}
%selinux_relabel_post -s %{selinuxtype}
fi
%endif
%files -f %{name}.lang
%license LICENCE.TXT
%doc README.rst
%if %use_update_alternative
%ghost %{_bindir}/vncviewer
%{_bindir}/vncviewer-tigervnc
%ghost %{_mandir}/man1/vncviewer.1.gz
%{_mandir}/man1/vncviewer-tigervnc.1%{?ext_man}
%ghost %{_sysconfdir}/alternatives/vncviewer
%ghost %{_sysconfdir}/alternatives/vncviewer.1.gz
%else
%{_bindir}/vncviewer
%{_mandir}/man1/vncviewer.1%{?ext_man}
%endif
%dir %{_datadir}/icons/hicolor/16x16
%dir %{_datadir}/icons/hicolor/16x16/apps
%dir %{_datadir}/icons/hicolor/22x22
@ -483,7 +550,9 @@ fi
%{_unitdir}/xvnc.socket
%{_unitdir}/xvnc.target
%{_sysusersdir}/vnc.conf
%if %with_rc_service_symlink
%{_sbindir}/rcxvnc
%endif
%dir %{_sysconfdir}/tigervnc
%config(noreplace) %{_sysconfdir}/tigervnc/vncserver*
@ -500,7 +569,7 @@ fi
%config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/vnc-httpd
%endif
%if 0%{?suse_version} < 1550
%if 0%{?suse_version} < 1600
%config %{_sysconfdir}/pam.d/vnc
%config(noreplace) %{_sysconfdir}/pam.d/tigervnc
%else
@ -532,7 +601,9 @@ fi
%files -n xorg-x11-Xvnc-novnc
%{_unitdir}/xvnc-novnc.service
%{_unitdir}/xvnc-novnc.socket
%if %with_rc_service_symlink
%{_sbindir}/rcxvnc-novnc
%endif
%files -n xorg-x11-Xvnc-java
%doc java/com/tigervnc/vncviewer/README
@ -548,4 +619,10 @@ fi
%files x11vnc
%{_bindir}/x11vnc
%if %{with selinux}
%files selinux
%{_datadir}/selinux/packages/%{selinuxtype}/%{modulename}.pp.bz2
%ghost %verify(not md5 size mtime) %{_sharedstatedir}/selinux/%{selinuxtype}/active/modules/200/%{modulename}
%endif
%changelog

View File

@ -2,17 +2,17 @@ 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
@@ -66,6 +66,9 @@ public class CSecurityTLS extends CSecurity {
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
{
@@ -84,6 +87,7 @@ public class CSecurityTLS extends CSecurity {
setDefaults();
cafile = X509CA.getData();
crlfile = X509CRL.getData();
@ -20,15 +20,15 @@ Index: tigervnc-1.12.0/java/com/tigervnc/rfb/CSecurityTLS.java
}
public static String getDefaultCA() {
@@ -278,6 +282,7 @@ public class CSecurityTLS extends CSecur
@@ -277,6 +281,7 @@ public class CSecurityTLS extends CSecurity {
"do you want to continue?"))
throw new AuthFailureException("server certificate has expired");
}
+ String thumbprint = getThumbprint(cert);
File vncDir = new File(FileUtils.getVncHomeDir());
File vncDir = new File(FileUtils.getVncStateDir());
if (!vncDir.exists()) {
try {
@@ -337,6 +342,9 @@ public class CSecurityTLS extends CSecur
@@ -336,6 +341,9 @@ public class CSecurityTLS extends CSecurity {
store_pubkey(dbPath, client.getServerName().toLowerCase(), pk);
} catch (java.lang.Exception e) {
if (e.getCause() instanceof CertPathBuilderException) {
@ -38,7 +38,7 @@ Index: tigervnc-1.12.0/java/com/tigervnc/rfb/CSecurityTLS.java
vlog.debug("Server host not previously known");
vlog.debug(info);
String text =
@@ -524,7 +532,7 @@ public class CSecurityTLS extends CSecur
@@ -522,7 +530,7 @@ public class CSecurityTLS extends CSecurity {
private SSLEngineManager manager;
private boolean anon;

View File

@ -8,10 +8,18 @@ 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)
@@ -1,6 +1,5 @@
add_executable(vncconfig
buildtime.c
- vncExt.c
vncconfig.cxx
QueryConnectDialog.cxx)
@@ -9,7 +8,20 @@ target_include_directories(vncconfig SYSTEM PUBLIC ${X11_INCLUDE_DIR})
target_include_directories(vncconfig PUBLIC ${CMAKE_SOURCE_DIR}/common)
target_include_directories(vncconfig PUBLIC ${CMAKE_SOURCE_DIR}/unix/tx)
-target_link_libraries(vncconfig tx rfb network rdr ${X11_LIBRARIES})
+include(GNUInstallDirs)
+
+add_library(Xvnc SHARED
@ -23,13 +31,6 @@ Index: tigervnc-1.12.0/unix/vncconfig/CMakeLists.txt
+ 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})

View File

@ -1,32 +0,0 @@
Patch-mainline: To be upstreamed
References: bnc#1084865
Author: Michal Srb <msrb@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);

View File

@ -9,17 +9,17 @@ 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*
@@ -133,8 +133,12 @@ size_t FdOutStream::writeFd(const uint8_t* data, size_t length)
#endif
} while (n < 0 && (errno == EINTR));
} while (n < 0 && (errorNumber == EINTR));
- if (n < 0)
- throw SystemException("write", errno);
- throw SystemException("write", errorNumber);
+ if (n < 0) {
+ if(errno == EPIPE)
+ if (errorNumber == 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);
+ throw SystemException("write", errorNumber);
+ }
gettimeofday(&lastWrite, NULL);