开源软件构建与测试

_service:tar_scm:tigervnc.spec Changed

@@ -3,15 +3,14 @@
 %global modulename vncsession
 
 Name:           tigervnc
-Version:        1.13.0
-Release:        2
+Version:        1.13.1
+Release:        1
 Summary:        A TigerVNC remote display system
 
 License:        GPLv2+
-URL:            http://github.com/TigerVNC/tigervnc/
+URL:            https://tigervnc.org
 
-Source0:        https://github.com/TigerVNC/tigervnc/archive/v1.13.0.tar.gz
-Source1:        vncserver.service
+Source0:        https://github.com/TigerVNC/tigervnc/archive/v1.13.1.tar.gz
 Source2:        vncserver
 Source3:        10-libvnc.conf
 Source4:        xvnc.service
@@ -20,14 +19,13 @@
 
 Patch0001:      tigervnc-xserver120.patch
 Patch0002:      0001-Fix-some-translations-of-start-menu.patch
-Patch0003:      backport-tigervnc-sanity-check-when-cleaning-up-keymap-changes.patch
 
-BuildRequires:  gcc-c++ systemd cmake automake autoconf gettext gettext-autopoint pixman-devel fltk-devel >= 1.3.3
+BuildRequires:  make gcc-c++ systemd cmake automake autoconf gettext gettext-autopoint pixman-devel fltk-devel >= 1.3.3
 BuildRequires:  libX11-devel libtool libxkbfile-devel libpciaccess-devel libXinerama-devel libXfont2-devel
 BuildRequires:  libXext-devel xorg-x11-server-source libXi-devel libXdmcp-devel libxshmfence-devel
 BuildRequires:  xorg-x11-xtrans-devel xorg-x11-util-macros xorg-x11-server-devel libXtst-devel libdrm-devel libXt-devel
 BuildRequires:  openssl-devel mesa-libGL-devel freetype-devel desktop-file-utils java-devel jpackage-utils pam-devel gnutls-devel libjpeg-turbo-devel selinux-policy-devel
-BuildRequires:  xorg-x11-font-utils
+BuildRequires:  xorg-x11-font-utils libselinux-devel libXdamage-devel libXfixes-devel libXrandr-devel libXrender-devel zlib-devel
 
 Requires(post): coreutils
 Requires(postun):coreutils
@@ -54,7 +52,7 @@
 %package server-minimal
 Summary:        A minimal installation of TigerVNC server
 
-Requires:       mesa-dri-drivers, xkeyboard-config, %{name}-license xkbcomp
+Requires:       mesa-dri-drivers, xkeyboard-config, %{name}-license xkbcomp dbus-x11
 
 %description server-minimal
 This package provides minimal installation of TigerVNC, with which
@@ -79,7 +77,7 @@
 %package selinux
 Summary:        SElinux module for TigerVNC
 BuildRequires:  selinux-policy-devel
-Requires:       selinux-policy-targeted
+Requires:       selinux-policy-%{selinuxtype}
 BuildArch:      noarch
 
 %description selinux
@@ -106,7 +104,6 @@
 done
 popd
 %patch0002 -p1
-%patch0003 -p1
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -fpic"
@@ -250,6 +247,12 @@
 %{_mandir}/man8/*
 
 %changelog
+* Thu Jul 27 2023 zhouyihang <zhouyihang3@h-partners.com> - 1.13.1-1
+- Type:requirements
+- ID:NA
+- SUG:NA
+- DESC:update tigervnc to 1.13.1
+
 * Mon Mar 13 2023 zhouyihang <zhouyihang3@h-partners.com> - 1.13.0-2
 - Type:bugfix
 - ID:NA

_service:tar_scm:backport-tigervnc-sanity-check-when-cleaning-up-keymap-changes.patch Deleted

@@ -1,28 +0,0 @@
-From 774c6bcf33b5c9b94c1ff12895775e77c555decc Mon Sep 17 00:00:00 2001
-From: Pierre Ossman <ossman@cendio.se>
-Date: Thu, 9 Feb 2023 11:30:37 +0100
-Subject: PATCH Sanity check when cleaning up keymap changes
-
-Make sure we don't send a bogus request to the X server in the (common)
-case that we don't actually have anything to restore.
-
-(cherry picked from commit 1e3484f2017f038dd5149cd50741feaf39a680e4)
----
- unix/x0vncserver/XDesktop.cxx | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/unix/x0vncserver/XDesktop.cxx b/unix/x0vncserver/XDesktop.cxx
-index d5c6b2db9..f9c810968 100644
---- a/unix/x0vncserver/XDesktop.cxx
-+++ b/unix/x0vncserver/XDesktop.cxx
-@@ -481,6 +481,10 @@ void XDesktop::deleteAddedKeysyms(Display* dpy) {
-     }
-   }
-
-+  // Did we actually find something to remove?
-+  if (highestKeyCode < lowestKeyCode)
-+    return;
-+
-   changes.changed |= XkbKeySymsMask;
-   changes.first_key_sym = lowestKeyCode;
-   changes.num_key_syms = highestKeyCode - lowestKeyCode + 1;

_service:tar_scm:v1.13.0.tar.gz/CMakeLists.txt -> _service:tar_scm:v1.13.1.tar.gz/CMakeLists.txt Changed

_service:tar_scm:v1.13.0.tar.gz/common/rfb/SConnection.cxx -> _service:tar_scm:v1.13.1.tar.gz/common/rfb/SConnection.cxx Changed

_service:tar_scm:v1.13.0.tar.gz/common/rfb/VNCSConnectionST.cxx -> _service:tar_scm:v1.13.1.tar.gz/common/rfb/VNCSConnectionST.cxx Changed

@@ -313,9 +313,9 @@
 void VNCSConnectionST::requestClipboardOrClose()
 {
   try {
+    if (state() != RFBSTATE_NORMAL) return;
     if (!accessCheck(AccessCutText)) return;
     if (!rfb::Server::acceptCutText) return;
-    if (state() != RFBSTATE_NORMAL) return;
     requestClipboard();
   } catch(rdr::Exception& e) {
     close(e.str());
@@ -325,9 +325,9 @@
 void VNCSConnectionST::announceClipboardOrClose(bool available)
 {
   try {
+    if (state() != RFBSTATE_NORMAL) return;
     if (!accessCheck(AccessCutText)) return;
     if (!rfb::Server::sendCutText) return;
-    if (state() != RFBSTATE_NORMAL) return;
     announceClipboard(available);
   } catch(rdr::Exception& e) {
     close(e.str());
@@ -337,9 +337,9 @@
 void VNCSConnectionST::sendClipboardDataOrClose(const char* data)
 {
   try {
+    if (state() != RFBSTATE_NORMAL) return;
     if (!accessCheck(AccessCutText)) return;
     if (!rfb::Server::sendCutText) return;
-    if (state() != RFBSTATE_NORMAL) return;
     sendClipboardData(data);
   } catch(rdr::Exception& e) {
     close(e.str());

_service:tar_scm:v1.13.0.tar.gz/java/CMakeLists.txt -> _service:tar_scm:v1.13.1.tar.gz/java/CMakeLists.txt Changed

_service:tar_scm:v1.13.0.tar.gz/po/sr.po -> _service:tar_scm:v1.13.1.tar.gz/po/sr.po Changed

@@ -1,13 +1,14 @@
 # Serbian translation for tigervnc.
 # Copyright © 2020 the TigerVNC Team (msgids)
 # This file is distributed under the same license as the tigervnc package.
-# Мирослав Николић <miroslavnikolic@rocketmail.com>, 2016–2021.
+# Мирослав Николић <miroslavnikolic@rocketmail.com>, 2016–2023.
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: tigervnc-1.11.90\n"
+"Project-Id-Version: tigervnc-1.12.90\n"
 "Report-Msgid-Bugs-To: tigervnc-devel@googlegroups.com\n"
-"POT-Creation-Date: 2021-09-08 09:19+0200\n"
-"PO-Revision-Date: 2021-12-13 18:27+0200\n"
+"POT-Creation-Date: 2022-12-15 16:35+0100\n"
+"PO-Revision-Date: 2023-02-26 12:27+0100\n"
 "Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian <(nothing)>\n"
 "Language: sr\n"
@@ -16,6 +17,7 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Bugs: Report translation errors to the Language-Team address.\n"
+"X-Generator: Gtranslator 41.0\n"
 
 #: vncviewer/CConn.cxx:103
 #, c-format
@@ -88,73 +90,62 @@
 msgid "Security method: %s"
 msgstr "Метода безбедности: %s"
 
-#: vncviewer/CConn.cxx:271 vncviewer/CConn.cxx:273
+#: vncviewer/CConn.cxx:270 vncviewer/CConn.cxx:272
 msgid "The connection was dropped by the server before the session could be established."
 msgstr "Сервер је одбацио везу пре него ли је сесија могла да се успостави."
 
-#: vncviewer/CConn.cxx:280 vncviewer/Viewport.cxx:575
-#: vncviewer/Viewport.cxx:673 vncviewer/Viewport.cxx:776
-#: vncviewer/Viewport.cxx:791 vncviewer/Viewport.cxx:802
-#: vncviewer/Viewport.cxx:830 vncviewer/Viewport.cxx:901
-#: vncviewer/Viewport.cxx:937
-#, c-format
-msgid ""
-"An unexpected error occurred when communicating with the server:\n"
-"\n"
-"%s"
-msgstr ""
-"Дошло је до неочекиване грешке приликом комуницирања са сервером:\n"
-"\n"
-"%s"
-
-#: vncviewer/CConn.cxx:333
+#: vncviewer/CConn.cxx:332
 #, c-format
 msgid "SetDesktopSize failed: %d"
 msgstr "Неуспело подешавање величине радне површи: %d"
 
-#: vncviewer/CConn.cxx:405
+#: vncviewer/CConn.cxx:404
 msgid "Invalid SetColourMapEntries from server!"
 msgstr "Неисправни уноси подешавања мапе боје са сервера!"
 
-#: vncviewer/CConn.cxx:513
+#: vncviewer/CConn.cxx:512
 #, c-format
 msgid "Throughput %d kbit/s - changing to quality %d"
 msgstr "Пропусност је %d kbit/s — мењам на квалитет %d"
 
-#: vncviewer/CConn.cxx:535
+#: vncviewer/CConn.cxx:534
 #, c-format
 msgid "Throughput %d kbit/s - full color is now enabled"
 msgstr "Пропусност је %d kbit/s — пуна боја је сада омогућена"
 
-#: vncviewer/CConn.cxx:538
+#: vncviewer/CConn.cxx:537
 #, c-format
 msgid "Throughput %d kbit/s - full color is now disabled"
 msgstr "Пропусност је %d kbit/s — пуна боја је сада онемогућена"
 
-#: vncviewer/CConn.cxx:564
+#: vncviewer/CConn.cxx:563
 #, c-format
 msgid "Using pixel format %s"
 msgstr "Користим формат пиксела %s"
 
-#: vncviewer/DesktopWindow.cxx:143
+#: vncviewer/DesktopWindow.cxx:145
 msgid "Invalid geometry specified!"
 msgstr "Наведена је неисправна геометрија!"
 
-#: vncviewer/DesktopWindow.cxx:616
-msgid "Adjusting window size to avoid accidental full screen request"
+#: vncviewer/DesktopWindow.cxx:166
+msgid "Reducing window size to fit on current monitor"
+msgstr "Смањујем величину прозора да стане на текући монитор"
+
+#: vncviewer/DesktopWindow.cxx:648
+msgid "Adjusting window size to avoid accidental full-screen request"
 msgstr "Прилагођавам величину прозора да би се избегли случајни захтеви за целим екраном"
 
-#: vncviewer/DesktopWindow.cxx:667
+#: vncviewer/DesktopWindow.cxx:696
 #, c-format
 msgid "Press %s to open the context menu"
 msgstr "Притисните „%s“ да отворите приручни изборник"
 
-#: vncviewer/DesktopWindow.cxx:1030 vncviewer/DesktopWindow.cxx:1038
-#: vncviewer/DesktopWindow.cxx:1058
+#: vncviewer/DesktopWindow.cxx:1083 vncviewer/DesktopWindow.cxx:1091
+#: vncviewer/DesktopWindow.cxx:1111
 msgid "Failure grabbing keyboard"
 msgstr "Неуспех хватања тастатуре"
 
-#: vncviewer/DesktopWindow.cxx:1352
+#: vncviewer/DesktopWindow.cxx:1401
 msgid "Invalid screen layout computed for resize request!"
 msgstr "Прорачунат је неодговарајући распоред екрана за захтев промене величине!"
 
@@ -162,258 +153,251 @@
 msgid "Invalid state for 3 button emulation"
 msgstr "Неисправно стање за опонашање 3 дугмета"
 
-#: vncviewer/MonitorArrangement.cxx:403
-msgid "Failed to get monitor name because X11 RandR could not be found"
-msgstr "Нисам успео да добавим назив монитора јер не могу наћи „X11 RandR“"
-
-#: vncviewer/MonitorArrangement.cxx:409
-#: vncviewer/MonitorIndicesParameter.cxx:47
-#: vncviewer/MonitorIndicesParameter.cxx:100
+#: vncviewer/MonitorIndicesParameter.cxx:52
+#: vncviewer/MonitorIndicesParameter.cxx:105
 msgid "Failed to get system monitor configuration"
 msgstr "Нисам успео да добавим подешавање монитора система"
 
-#: vncviewer/MonitorArrangement.cxx:417
-#, c-format
-msgid "Failed to get information about CRTC %d"
-msgstr "Нисам успео да добавим информације о „CRTC %d“"
-
-#: vncviewer/MonitorArrangement.cxx:430
-#, c-format
-msgid "Failed to get information about output %d for CRTC %d"
-msgstr "Нисам успео да добавим информације о излазу %d за „CRTC %d“"
-
-#: vncviewer/MonitorIndicesParameter.cxx:78
+#: vncviewer/MonitorIndicesParameter.cxx:83
 #, c-format
 msgid "Invalid configuration specified for %s"
 msgstr "Неисправно подешавање је наведено за „%s“"
 
-#: vncviewer/MonitorIndicesParameter.cxx:86
+#: vncviewer/MonitorIndicesParameter.cxx:91
 #, c-format
 msgid "Monitor index %d does not exist"
 msgstr "Индекс монитора %d не постоји"
 
-#: vncviewer/MonitorIndicesParameter.cxx:164
-#: vncviewer/MonitorIndicesParameter.cxx:184
+#: vncviewer/MonitorIndicesParameter.cxx:169
+#: vncviewer/MonitorIndicesParameter.cxx:189
 #, c-format
 msgid "Invalid monitor index '%s'"
 msgstr "Неисправан индекс монитора „%s“"
 
-#: vncviewer/MonitorIndicesParameter.cxx:172
+#: vncviewer/MonitorIndicesParameter.cxx:177
 #, c-format
 msgid "Unexpected character '%c'"
 msgstr "Неочекивани знак „%c“"
 
-#: vncviewer/OptionsDialog.cxx:58
+#: vncviewer/OptionsDialog.cxx:63
 msgid "VNC Viewer: Connection Options"
 msgstr "ВНЦ прегледач: Могућности повезивања"
 
-#: vncviewer/OptionsDialog.cxx:84 vncviewer/ServerDialog.cxx:109
-#: vncviewer/vncviewer.cxx:418
+#: vncviewer/OptionsDialog.cxx:89 vncviewer/ServerDialog.cxx:108
+#: vncviewer/vncviewer.cxx:417
 msgid "Cancel"
 msgstr "Откажи"
 
-#: vncviewer/OptionsDialog.cxx:89 vncviewer/vncviewer.cxx:417
+#: vncviewer/OptionsDialog.cxx:94 vncviewer/vncviewer.cxx:416
 msgid "OK"
 msgstr "У реду"
 
-#: vncviewer/OptionsDialog.cxx:447
+#: vncviewer/OptionsDialog.cxx:484
 msgid "Compression"
 msgstr "Сажимање"
 
-#: vncviewer/OptionsDialog.cxx:463
+#: vncviewer/OptionsDialog.cxx:501
 msgid "Auto select"
 msgstr "Сам изабери"
 
-#: vncviewer/OptionsDialog.cxx:475
+#: vncviewer/OptionsDialog.cxx:516

_service:tar_scm:v1.13.0.tar.gz/unix/vncserver/selinux/vncsession.te -> _service:tar_scm:v1.13.1.tar.gz/unix/vncserver/selinux/vncsession.te Changed

_service:tar_scm:v1.13.0.tar.gz/unix/x0vncserver/XDesktop.cxx -> _service:tar_scm:v1.13.1.tar.gz/unix/x0vncserver/XDesktop.cxx Changed

_service:tar_scm:v1.13.0.tar.gz/unix/xserver/hw/vnc/xvnc.c -> _service:tar_scm:v1.13.1.tar.gz/unix/xserver/hw/vnc/xvnc.c Changed

_service:tar_scm:vncserver.service Deleted

@@ -1,52 +0,0 @@
-# The vncserver service unit file
-#
-# Quick HowTo:
-# 1. Copy this file to /etc/systemd/system/vncserver@.service
-# 2. Replace <USER> with the actual user name and edit vncserver
-#    parameters appropriately
-# 3. Run `systemctl daemon-reload`
-# 4. Run `systemctl enable vncserver@:<display>.service`
-#
-# DO NOT RUN THIS SERVICE if your local area network is
-# untrusted!  For a secure way of using VNC, you should
-# limit connections to the local host and then tunnel from
-# the machine you want to view VNC on (host A) to the machine
-# whose VNC output you want to view (host B)
-#
-# user@hostA ~$ ssh -v -C -L 590N:localhost:590M hostB
-#
-# this will open a connection on port 590N of your hostA to hostB's port 590M
-# (in fact, it ssh-connects to hostB and then connects to localhost (on hostB).
-# See the ssh man page for details on port forwarding)
-#
-# You can then point a VNC client on hostA at vncdisplay N of localhost and with
-# the help of ssh, you end up seeing what hostB makes available on port 590M
-#
-# Use "-nolisten tcp" to prevent X connections to your VNC server via TCP.
-#
-# Use "-localhost" to prevent remote VNC clients connecting except when
-# doing so through a secure tunnel.  See the "-via" option in the
-# `man vncviewer' manual page.
-
-
-Unit
-Description=Remote desktop service (VNC)
-After=syslog.target network.target
-
-Service
-Type=forking
-WorkingDirectory=/home/<USER>
-User=<USER>
-Group=<USER>
-
-PIDFile=/home/<USER>/.vnc/%H%i.pid
-
-ExecStartPre=/bin/sh -c '/usr/bin/vncserver -kill %i > /dev/null 2>&1 || :'
-ExecStart=/usr/bin/vncserver -autokill %i
-ExecStop=/usr/bin/vncserver -kill %i
-
-Restart=on-success
-RestartSec=15
-
-Install
-WantedBy=multi-user.target

Changes of Revision 10