diff --git a/SOURCES/tigervnc-add-new-keycodes-for-unknown-keysyms.patch b/SOURCES/tigervnc-add-new-keycodes-for-unknown-keysyms.patch
new file mode 100644
index 0000000..d4fd2b3
--- /dev/null
+++ b/SOURCES/tigervnc-add-new-keycodes-for-unknown-keysyms.patch
@@ -0,0 +1,199 @@
+From ccbd491fa48f1c43daeb1a6c5ee91a1a8fa3db88 Mon Sep 17 00:00:00 2001
+From: Jan Grulich <jgrulich@redhat.com>
+Date: Tue, 9 Aug 2022 14:31:07 +0200
+Subject: [PATCH] x0vncserver: add new keysym in case we don't find a matching
+ keycode
+
+We might often fail to find a matching X11 keycode when the client has
+a different keyboard layout and end up with no key event. To avoid a
+failure we add it as a new keysym/keycode pair so the next time a keysym
+from the client that is unknown to the server is send, we will find a
+match and proceed with key event. This is same behavior used in Xvnc or
+x11vnc, although Xvnc has more advanced mapping from keysym to keycode.
+---
+ unix/x0vncserver/XDesktop.cxx | 121 +++++++++++++++++++++++++++++++++-
+ unix/x0vncserver/XDesktop.h | 4 ++
+ 2 files changed, 122 insertions(+), 3 deletions(-)
+
+diff --git a/unix/x0vncserver/XDesktop.cxx b/unix/x0vncserver/XDesktop.cxx
+index f2046e43e..933998f05 100644
+--- a/unix/x0vncserver/XDesktop.cxx
++++ b/unix/x0vncserver/XDesktop.cxx
+@@ -31,6 +31,7 @@
+ #include <x0vncserver/XDesktop.h>
+
+ #include <X11/XKBlib.h>
++#include <X11/Xutil.h>
+ #ifdef HAVE_XTEST
+ #include <X11/extensions/XTest.h>
+ #endif
+@@ -50,6 +51,7 @@ void vncSetGlueContext(Display *dpy, void *res);
+ #include <x0vncserver/Geometry.h>
+ #include <x0vncserver/XPixelBuffer.h>
+
++using namespace std;
+ using namespace rfb;
+
+ extern const unsigned short code_map_qnum_to_xorgevdev[];
+@@ -264,6 +266,9 @@ void XDesktop::start(VNCServer* vs) {
+ void XDesktop::stop() {
+ running = false;
+
++ // Delete added keycodes
++ deleteAddedKeysyms(dpy);
++
+ #ifdef HAVE_XDAMAGE
+ if (haveDamage)
+ XDamageDestroy(dpy, damage);
+@@ -383,6 +388,118 @@ KeyCode XDesktop::XkbKeysymToKeycode(Display* dpy, KeySym keysym) {
+ }
+ #endif
+
++KeyCode XDesktop::addKeysym(Display* dpy, KeySym keysym)
++{
++ int types[1];
++ unsigned int key;
++ XkbDescPtr xkb;
++ XkbMapChangesRec changes;
++ KeySym *syms;
++ KeySym upper, lower;
++
++ xkb = XkbGetMap(dpy, XkbAllComponentsMask, XkbUseCoreKbd);
++
++ if (!xkb)
++ return 0;
++
++ for (key = xkb->max_key_code; key >= xkb->min_key_code; key--) {
++ if (XkbKeyNumGroups(xkb, key) == 0)
++ break;
++ }
++
++ if (key < xkb->min_key_code)
++ return 0;
++
++ memset(&changes, 0, sizeof(changes));
++
++ XConvertCase(keysym, &lower, &upper);
++
++ if (upper == lower)
++ types[XkbGroup1Index] = XkbOneLevelIndex;
++ else
++ types[XkbGroup1Index] = XkbAlphabeticIndex;
++
++ XkbChangeTypesOfKey(xkb, key, 1, XkbGroup1Mask, types, &changes);
++
++ syms = XkbKeySymsPtr(xkb,key);
++ if (upper == lower)
++ syms[0] = keysym;
++ else {
++ syms[0] = lower;
++ syms[1] = upper;
++ }
++
++ changes.changed |= XkbKeySymsMask;
++ changes.first_key_sym = key;
++ changes.num_key_syms = 1;
++
++ if (XkbChangeMap(dpy, xkb, &changes)) {
++ vlog.info("Added unknown keysym %s to keycode %d", XKeysymToString(keysym), key);
++ addedKeysyms[keysym] = key;
++ return key;
++ }
++
++ return 0;
++}
++
++void XDesktop::deleteAddedKeysyms(Display* dpy) {
++ XkbDescPtr xkb;
++ xkb = XkbGetMap(dpy, XkbAllComponentsMask, XkbUseCoreKbd);
++
++ if (!xkb)
++ return;
++
++ XkbMapChangesRec changes;
++ memset(&changes, 0, sizeof(changes));
++
++ KeyCode lowestKeyCode = xkb->max_key_code;
++ KeyCode highestKeyCode = xkb->min_key_code;
++ std::map<KeySym, KeyCode>::iterator it;
++ for (it = addedKeysyms.begin(); it != addedKeysyms.end(); it++) {
++ if (XkbKeyNumGroups(xkb, it->second) != 0) {
++ // Check if we are removing keysym we added ourself
++ if (XkbKeysymToKeycode(dpy, it->first) != it->second)
++ continue;
++
++ XkbChangeTypesOfKey(xkb, it->second, 0, XkbGroup1Mask, NULL, &changes);
++
++ if (it->second < lowestKeyCode)
++ lowestKeyCode = it->second;
++
++ if (it->second > highestKeyCode)
++ highestKeyCode = it->second;
++ }
++ }
++
++ changes.changed |= XkbKeySymsMask;
++ changes.first_key_sym = lowestKeyCode;
++ changes.num_key_syms = highestKeyCode - lowestKeyCode + 1;
++ XkbChangeMap(dpy, xkb, &changes);
++
++ addedKeysyms.clear();
++}
++
++KeyCode XDesktop::keysymToKeycode(Display* dpy, KeySym keysym) {
++ int keycode = 0;
++
++ // XKeysymToKeycode() doesn't respect state, so we have to use
++ // something slightly more complex
++ keycode = XkbKeysymToKeycode(dpy, keysym);
++
++ if (keycode != 0)
++ return keycode;
++
++ // TODO: try to further guess keycode with all possible mods as Xvnc does
++
++ keycode = addKeysym(dpy, keysym);
++
++ if (keycode == 0)
++ vlog.error("Failure adding new keysym 0x%lx", keysym);
++
++ return keycode;
++}
++
++
+ void XDesktop::keyEvent(rdr::U32 keysym, rdr::U32 xtcode, bool down) {
+ #ifdef HAVE_XTEST
+ int keycode = 0;
+@@ -398,9 +515,7 @@ void XDesktop::keyEvent(rdr::U32 keysym, rdr::U32 xtcode, bool down) {
+ if (pressedKeys.find(keysym) != pressedKeys.end())
+ keycode = pressedKeys[keysym];
+ else {
+- // XKeysymToKeycode() doesn't respect state, so we have to use
+- // something slightly more complex
+- keycode = XkbKeysymToKeycode(dpy, keysym);
++ keycode = keysymToKeycode(dpy, keysym);
+ }
+ }
+
+diff --git a/unix/x0vncserver/XDesktop.h b/unix/x0vncserver/XDesktop.h
+index 840d43316..6ebcd9f8a 100644
+--- a/unix/x0vncserver/XDesktop.h
++++ b/unix/x0vncserver/XDesktop.h
+@@ -55,6 +55,9 @@ class XDesktop : public rfb::SDesktop,
+ const char* userName);
+ virtual void pointerEvent(const rfb::Point& pos, int buttonMask);
+ KeyCode XkbKeysymToKeycode(Display* dpy, KeySym keysym);
++ KeyCode addKeysym(Display* dpy, KeySym keysym);
++ void deleteAddedKeysyms(Display* dpy);
++ KeyCode keysymToKeycode(Display* dpy, KeySym keysym);
+ virtual void keyEvent(rdr::U32 keysym, rdr::U32 xtcode, bool down);
+ virtual void clientCutText(const char* str);
+ virtual unsigned int setScreenLayout(int fb_width, int fb_height,
+@@ -78,6 +81,7 @@ class XDesktop : public rfb::SDesktop,
+ bool haveXtest;
+ bool haveDamage;
+ int maxButtons;
++ std::map<KeySym, KeyCode> addedKeysyms;
+ std::map<KeySym, KeyCode> pressedKeys;
+ bool running;
+ #ifdef HAVE_XDAMAGE
diff --git a/SOURCES/tigervnc-sanity-check-when-cleaning-up-keymap-changes.patch b/SOURCES/tigervnc-sanity-check-when-cleaning-up-keymap-changes.patch
new file mode 100644
index 0000000..012a741
--- /dev/null
+++ b/SOURCES/tigervnc-sanity-check-when-cleaning-up-keymap-changes.patch
@@ -0,0 +1,28 @@
+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;
diff --git a/SOURCES/tigervnc-selinux-allow-vncsession-create-vnc-directory.patch b/SOURCES/tigervnc-selinux-allow-vncsession-create-vnc-directory.patch
new file mode 100644
index 0000000..d6bc61b
--- /dev/null
+++ b/SOURCES/tigervnc-selinux-allow-vncsession-create-vnc-directory.patch
@@ -0,0 +1,31 @@
+From 717d787de8f913070446444e37d552b51f05515e Mon Sep 17 00:00:00 2001
+From: Zdenek Pytela <zpytela@redhat.com>
+Date: Mon, 16 Jan 2023 12:35:40 +0100
+Subject: [PATCH] SELinux: Allow vncsession create ~/.vnc directory
+
+Addresses the following AVC denial:
+
+type=PROCTITLE msg=audit(01/12/2023 02:58:12.648:696) : proctitle=/usr/sbin/vncsession fedora :1
+type=PATH msg=audit(01/12/2023 02:58:12.648:696) : item=1 name=/home/fedora/.vnc nametype=CREATE cap_fp=none cap_fi=none cap_fe=0 cap_fver=0 cap_frootid=0
+type=PATH msg=audit(01/12/2023 02:58:12.648:696) : item=0 name=/home/fedora/ inode=262145 dev=fc:02 mode=dir,700 ouid=fedora ogid=fedora rdev=00:00 obj=unconfined_u:object_r:user_home_dir_t:s0 nametype=PARENT cap_fp=none cap_fi=none cap_fe=0 cap_fver=0 cap_frootid=0
+type=CWD msg=audit(01/12/2023 02:58:12.648:696) : cwd=/home/fedora
+type=SYSCALL msg=audit(01/12/2023 02:58:12.648:696) : arch=x86_64 syscall=mkdir success=no exit=EACCES(Permission denied) a0=0x7fff47d52540 a1=0755 a2=0x0 a3=0x0 items=2 ppid=2869 pid=2880 auid=fedora uid=fedora gid=fedora euid=fedora suid=fedora fsuid=fedora egid=fedora sgid=fedora fsgid=fedora tty=(none) ses=8 comm=vncsession exe=/usr/sbin/vncsession subj=system_u:system_r:vnc_session_t:s0 key=(null)
+type=AVC msg=audit(01/12/2023 02:58:12.648:696) : avc: denied { create } for pid=2880 comm=vncsession name=.vnc scontext=system_u:system_r:vnc_session_t:s0 tcontext=system_u:object_r:vnc_home_t:s0 tclass=dir permissive=0
+
+Resolves: rhbz#2143704
+---
+ unix/vncserver/selinux/vncsession.te | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/unix/vncserver/selinux/vncsession.te b/unix/vncserver/selinux/vncsession.te
+index fb966c14b..680be8ea1 100644
+--- a/unix/vncserver/selinux/vncsession.te
++++ b/unix/vncserver/selinux/vncsession.te
+@@ -37,6 +37,7 @@ allow vnc_session_t self:fifo_file rw_fifo_file_perms;
+ allow vnc_session_t vnc_session_var_run_t:file manage_file_perms;
+ files_pid_filetrans(vnc_session_t, vnc_session_var_run_t, file)
+
++create_dirs_pattern(vnc_session_t, vnc_home_t, vnc_home_t)
+ manage_files_pattern(vnc_session_t, vnc_home_t, vnc_home_t)
+ manage_fifo_files_pattern(vnc_session_t, vnc_home_t, vnc_home_t)
+ manage_sock_files_pattern(vnc_session_t, vnc_home_t, vnc_home_t)
diff --git a/SPECS/tigervnc.spec b/SPECS/tigervnc.spec
index 813e0f5..9648a7e 100644
--- a/SPECS/tigervnc.spec
+++ b/SPECS/tigervnc.spec
@@ -5,7 +5,7 @@
Name: tigervnc
Version: 1.12.0
-Release: 7%{?dist}
+Release: 14%{?dist}
Summary: A TigerVNC remote display system
%global _hardened_build 1
@@ -28,16 +28,18 @@ Patch50: tigervnc-selinux-restore-context-in-case-of-different-policies.p
Patch51: tigervnc-fix-typo-in-mirror-monitor-detection.patch
Patch52: tigervnc-root-user-selinux-context.patch
Patch53: tigervnc-vncsession-restore-script-systemd-service.patch
+# https://github.com/TigerVNC/tigervnc/pull/1513
Patch54: tigervnc-fix-ghost-cursor-in-zaphod-mode.patch
+# https://github.com/TigerVNC/tigervnc/pull/1510
+Patch55: tigervnc-add-new-keycodes-for-unknown-keysyms.patch
+Patch56: tigervnc-sanity-check-when-cleaning-up-keymap-changes.patch
+Patch57: tigervnc-selinux-allow-vncsession-create-vnc-directory.patch
# This is tigervnc-%%{version}/unix/xserver116.patch rebased on the latest xorg
Patch100: tigervnc-xserver120.patch
# 1326867 - [RHEL7.3] GLX applications in an Xvnc session fails to start
Patch101: 0001-rpath-hack.patch
-# Upstreamable patches
-# https://github.com/TigerVNC/tigervnc/pull/1513
-
BuildRequires: gcc-c++
BuildRequires: libX11-devel, automake, autoconf, libtool, gettext, gettext-autopoint
BuildRequires: libXext-devel, xorg-x11-server-source, libXi-devel
@@ -169,6 +171,9 @@ popd
%patch52 -p1 -b .root-user-selinux-context
%patch53 -p1 -b .vncsession-restore-script-systemd-service
%patch54 -p1 -b .fix-ghost-cursor-in-zaphod-mode
+%patch55 -p1 -b .add-new-keycodes-for-unknown-keysyms
+%patch56 -p1 -b .sanity-check-when-cleaning-up-keymap-changes
+%patch57 -p1 -b .selinux-allow-vncsession-create-vnc-directory
%build
%ifarch sparcv9 sparc64 s390 s390x
@@ -323,6 +328,38 @@ fi
%ghost %verify(not md5 size mtime) %{_sharedstatedir}/selinux/%{selinuxtype}/active/modules/200/%{modulename}
%changelog
+* Tue Feb 21 2023 Jan Grulich <jgrulich@redhat.com> - 1.12.0-14
+- SELinux: allow vncsession create .vnc directory
+ Resolves: bz#2164704
+
+* Wed Feb 15 2023 Jan Grulich <jgrulich@redhat.com> - 1.12.0-13
+- Add sanity check when cleaning up keymap changes
+ Resolves: bz#2169960
+
+* Mon Feb 06 2023 Jan Grulich <jgrulich@redhat.com> - 1.12.0-12
+- xorg-x11-server: DeepCopyPointerClasses use-after-free leads to privilege elevation
+ Resolves: bz#2167058
+
+* Tue Dec 20 2022 Tomas Popela <tpopela@redhat.com> - 1.12.0-11
+- Rebuild for xorg-x11-server CVE-2022-46340 follow up fix
+
+* Fri Dec 16 2022 Jan Grulich <jgrulich@redhat.com> - 1.12.0-10
+- Rebuild for xorg-x11-server CVEs
+ Resolves: CVE-2022-4283 (bz#2154233)
+ Resolves: CVE-2022-46340 (bz#2154220)
+ Resolves: CVE-2022-46341 (bz#2154223)
+ Resolves: CVE-2022-46342 (bz#2154225)
+ Resolves: CVE-2022-46343 (bz#2154227)
+ Resolves: CVE-2022-46344 (bz#2154229)
+
+* Thu Dec 08 2022 Jan Grulich <jgrulich@redhat.com> - 1.12.0-9
+- Bump build version to fix upgrade path
+ Resolves: bz#1437569
+
+* Fri Nov 18 2022 Jan Grulich <jgrulich@redhat.com> - 1.12.0-8
+- x0vncserver: add new keysym in case we don't find matching keycode
+ Resolves: bz#1437569
+
* Wed Aug 24 2022 Jan Grulich <jgrulich@redhat.com> - 1.12.0-7
- x0vncserver: fix ghost cursor in zaphod mode (better version)
Resolves: bz#2109679