update tigervnc to 1.13.1
This commit is contained in:
sherlock2010
parent
0450ffa69d
commit
e23232dcf5
@ -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;
|
||||
@ -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 @@ Source6: HOWTO.md
|
||||
|
||||
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 @@ X session.
|
||||
%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 @@ If you want to use web browser in clients, please install this package.
|
||||
%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 @@ for all in `find . -type f -perm -001`; do
|
||||
done
|
||||
popd
|
||||
%patch0002 -p1
|
||||
%patch0003 -p1
|
||||
|
||||
%build
|
||||
export CFLAGS="$RPM_OPT_FLAGS -fpic"
|
||||
@ -250,6 +247,12 @@ popd
|
||||
%{_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
|
||||
|
||||
BIN
v1.13.0.tar.gz
BIN
v1.13.0.tar.gz
Binary file not shown.
BIN
v1.13.1.tar.gz
Normal file
BIN
v1.13.1.tar.gz
Normal file
Binary file not shown.
@ -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
|
||||
Loading…
x
Reference in New Issue
Block a user