Update to r4641.eff7fdd8-1

Sync up with [community] package and update

7 files changed, 160 insertions, 68 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f2c1e70c9f43..a1fee944a1fb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,20 @@
 pkgbase = tigervnc-git
 	pkgdesc = Suite of VNC servers and clients. Based on the VNC 4 branch of TightVNC.
-	pkgver = r3764.3a37af3
+	pkgver = r4641.eff7fdd8
 	pkgrel = 1
 	url = http://www.tigervnc.org
-	arch = i686
 	arch = x86_64
 	license = GPL
 	makedepends = cmake
 	makedepends = nasm
 	makedepends = xorg-font-util
 	makedepends = xorg-util-macros
-	makedepends = xorgproto
+	makedepends = git
 	makedepends = xtrans
+	makedepends = xorgproto
 	makedepends = mesa
-	makedepends = git
+	makedepends = imagemagick
+	makedepends = java-environment=8
 	depends = fltk
 	depends = pam
 	depends = gnutls
@@ -29,18 +30,25 @@ pkgbase = tigervnc-git
 	depends = perl
 	depends = libxdamage
 	depends = libxfont2
+	depends = libdrm
+	depends = xorg-xinit
 	optdepends = mesa: for OpenGL functionality in Xvnc
 	provides = tigervnc
 	conflicts = tigervnc
 	conflicts = tightvnc
+	backup = etc/pam.d/tigervnc
+	backup = etc/tigervnc/vncserver-config-defaults
+	backup = etc/tigervnc/vncserver-config-mandatory
+	backup = etc/tigervnc/vncserver.users
 	source = git+https://github.com/TigerVNC/tigervnc.git
-	source = ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-1.20.0.tar.bz2
-	source = vncserver.service
-	source = vncviewer.desktop
+	source = https://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.20.9.tar.bz2
+	source = Xsession
+	source = more-xsessions.patch
+	source = remove-selinux.patch
 	sha256sums = SKIP
-	sha256sums = 9d967d185f05709274ee0c4f861a4672463986e550ca05725ce27974f550d3e6
-	sha256sums = 80f8fc7598d05e645ae73bc3371bbdededf07136a9f024ce6ebbfe469335b16e
-	sha256sums = 2ada7da1a926d78f11d2dd8ec376ac5877d2ce2bbb57a99526c13d8fcae6ddd7
+	sha256sums = e219f2e0dfe455467939149d7cd2ee53b79b512cc1d2094ae4f5c9ed9ccd3571
+	sha256sums = c9276f6ea277cf9654fb2cc3bc9dadbb2e596b5cf8ca867ee906c0080cf7f810
+	sha256sums = cb57dece026b29d7019a3e1e42fd2fb201d37fc60a70c885d2a50acffb808c06
+	sha256sums = fb8bb5bd3ec990720580a664326a70fd178ce94b97c2130462df9b1e3a3925c3
 
 pkgname = tigervnc-git
-
diff --git a/PKGBUILD b/PKGBUILD
index 6aae9bdcca0b..cc3e26353176 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,29 +1,38 @@
-# Maintainer: Uroš Vampl <mobile.leecher at gmail dot com>
+# Contributor: graysky <therealgraysky AT proton DOT me>
+# Contributor: Uroš Vampl <mobile.leecher at gmail dot com>
 
 pkgname=tigervnc-git
-pkgver=r3764.3a37af39
+pkgver=r4641.eff7fdd8
 pkgrel=1
-_xorgver=1.20.0
+_xorgver=1.20.9
 pkgdesc="Suite of VNC servers and clients. Based on the VNC 4 branch of TightVNC."
-arch=('i686' 'x86_64')
+arch=('x86_64')
 url="http://www.tigervnc.org"
 license=('GPL')
 depends=('fltk' 'pam' 'gnutls' 'libjpeg-turbo' 'libxtst' 'pixman'
 	 'xorg-xauth' 'xorg-xsetroot' 'xkeyboard-config' 'xorg-xkbcomp'
-	 'libgl' 'libgcrypt' 'perl' 'libxdamage' 'libxfont2')
-makedepends=('cmake' 'nasm' 'xorg-font-util' 'xorg-util-macros' 'xorgproto'
-	     'xtrans' 'mesa' 'git')
+	 'libgl' 'libgcrypt' 'perl' 'libxdamage' 'libxfont2' 'libdrm'
+	 'xorg-xinit')
+makedepends=('cmake' 'nasm' 'xorg-font-util' 'xorg-util-macros' 'git'
+	     'xtrans' 'xorgproto'
+	     'mesa' 'imagemagick' 'java-environment=8')
 optdepends=('mesa: for OpenGL functionality in Xvnc')
 conflicts=('tigervnc' 'tightvnc')
 provides=('tigervnc')
+backup=(etc/pam.d/tigervnc
+  etc/tigervnc/vncserver-config-defaults
+  etc/tigervnc/vncserver-config-mandatory
+  etc/tigervnc/vncserver.users)
 source=(git+https://github.com/TigerVNC/tigervnc.git
-	ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${_xorgver}.tar.bz2
-	vncserver.service
-	vncviewer.desktop)
+  https://xorg.freedesktop.org/releases/individual/xserver/xorg-server-${_xorgver}.tar.bz2
+  Xsession
+  more-xsessions.patch
+  remove-selinux.patch)
 sha256sums=('SKIP'
-            '9d967d185f05709274ee0c4f861a4672463986e550ca05725ce27974f550d3e6'
-            '80f8fc7598d05e645ae73bc3371bbdededf07136a9f024ce6ebbfe469335b16e'
-            '2ada7da1a926d78f11d2dd8ec376ac5877d2ce2bbb57a99526c13d8fcae6ddd7')
+            'e219f2e0dfe455467939149d7cd2ee53b79b512cc1d2094ae4f5c9ed9ccd3571'
+            'c9276f6ea277cf9654fb2cc3bc9dadbb2e596b5cf8ca867ee906c0080cf7f810'
+            'cb57dece026b29d7019a3e1e42fd2fb201d37fc60a70c885d2a50acffb808c06'
+            'fb8bb5bd3ec990720580a664326a70fd178ce94b97c2130462df9b1e3a3925c3')
 
 pkgver() {
   cd tigervnc
@@ -32,6 +41,9 @@ pkgver() {
 
 prepare() {
   cd tigervnc
+  patch -p1 -i "$srcdir"/more-xsessions.patch
+  patch -p1 -i "$srcdir"/remove-selinux.patch
+
   cd unix/xserver
   cp -r "$srcdir"/xorg-server-${_xorgver}/* .
   patch -Np1 -i ../xserver120.patch
@@ -42,12 +54,14 @@ build() {
 
   cmake -G "Unix Makefiles" \
     -DCMAKE_INSTALL_PREFIX=/usr \
-
+    -DCMAKE_INSTALL_SBINDIR=/usr/bin \
+    -DCMAKE_INSTALL_LIBEXECDIR=/usr/bin \
+    -DBUILD_JAVA=TRUE
   make
 
   cd unix/xserver
   autoreconf -fiv
-  ./configure --prefix=/usr \
+  CFLAGS="$CFLAGS -I/usr/include/libdrm" ./configure --prefix=/usr \
 	--disable-static --without-dtrace \
 	--disable-xorg --disable-xnest --disable-xvfb --disable-dmx \
 	--disable-xwin --disable-xephyr --disable-kdrive --disable-xwayland \
@@ -60,10 +74,10 @@ build() {
 package() {
   cd tigervnc
   make DESTDIR="$pkgdir" install
+  install -Dm0644 java/VncViewer.jar "${pkgdir}"/usr/share/vnc/classes/VncViewer.jar
   cd unix/xserver/hw/vnc
   make DESTDIR="$pkgdir" install
-  install -Dm0644 "$srcdir"/tigervnc/contrib/systemd/user/vncserver@.service \
-    "$pkgdir"/usr/lib/systemd/user/vncserver@.service
-  install -Dm0644 "$srcdir"/vncserver.service "$pkgdir"/usr/lib/systemd/system/vncserver.service
-  install -Dm0644 "$srcdir"/vncviewer.desktop "$pkgdir"/usr/share/applications/vncviewer.desktop
+  install -Dm0755 "$srcdir"/Xsession "$pkgdir"/etc/X11/tigervnc/Xsession
+#  install -Dm0644 "$srcdir"/${pkgname}-${pkgver}/unix/vncserver/vncserver@.service \
+#    "$pkgdir"/usr/lib/systemd/user/vncserver@.service
 }
diff --git a/Xsession b/Xsession
new file mode 100644
index 000000000000..b4c6f4ef0b55
--- /dev/null
+++ b/Xsession
@@ -0,0 +1,66 @@
+#!/bin/sh
+#
+# Wrapper to run around X sessions.
+# Based on lightdm
+#
+
+echo "Running X session wrapper"
+
+# Load profile
+for file in "/etc/profile" "$HOME/.profile" "/etc/xprofile" "$HOME/.xprofile"; do
+    if [ -f "$file" ]; then
+        echo "Loading profile from $file";
+        . "$file"
+    fi
+done
+
+# Load resources
+for file in "/etc/X11/Xresources" "$HOME/.Xresources"; do
+    if [ -f "$file" ]; then
+        echo "Loading resource: $file"
+        xrdb -merge "$file"
+    fi
+done
+
+# Load keymaps
+for file in "/etc/X11/Xkbmap" "$HOME/.Xkbmap"; do
+    if [ -f "$file" ]; then
+        echo "Loading keymap: $file"
+        setxkbmap `cat "$file"`
+        XKB_IN_USE=yes
+    fi
+done
+
+# Load xmodmap if not using XKB
+if [ -z "$XKB_IN_USE" ]; then
+    for file in "/etc/X11/Xmodmap" "$HOME/.Xmodmap"; do
+        if [ -f "$file" ]; then
+           echo "Loading modmap: $file"
+           xmodmap "$file"
+        fi
+    done
+fi
+
+unset XKB_IN_USE
+
+# Run all system xinitrc shell scripts
+xinitdir="/etc/X11/xinit/xinitrc.d"
+if [ -d "$xinitdir" ]; then
+    for script in $xinitdir/*; do
+        echo "Loading xinit script $script"
+        if [ -x "$script" -a ! -d "$script" ]; then
+            . "$script"
+        fi
+    done
+fi
+
+# Run user xsession shell script
+script="$HOME/.xsession"
+if [ -x "$script" -a ! -d "$script" ]; then
+    echo "Loading xsession script $script"
+    . "$script"
+fi
+
+echo "X session wrapper complete, running session $@"
+
+exec $@
diff --git a/more-xsessions.patch b/more-xsessions.patch
new file mode 100644
index 000000000000..5ca990b51690
--- /dev/null
+++ b/more-xsessions.patch
@@ -0,0 +1,18 @@
+diff -wbBur tigervnc-1.11.0/unix/vncserver/vncserver.in tigervnc-1.11.0.my/unix/vncserver/vncserver.in
+--- tigervnc-1.11.0/unix/vncserver/vncserver.in	2020-09-08 15:16:08.000000000 +0300
++++ tigervnc-1.11.0.my/unix/vncserver/vncserver.in	2020-09-11 15:39:59.980775388 +0300
+@@ -438,7 +438,13 @@
+ 	die "$prog: couldn't find \"$cmd\" on your PATH.\n";
+     }
+ 
+-    foreach $cmd ("/etc/X11/xinit/Xsession", "/etc/X11/Xsession") {
++    foreach $cmd ("/etc/X11/xinit/Xsession", "/etc/X11/Xsession",
++        "/etc/X11/xdm/Xsession",
++        "/usr/share/sddm/scripts/Xsession",
++        "/etc/gdm/Xsession",
++        "/etc/lightdm/Xsession",
++        "/etc/lxdm/Xsession",
++        "/etc/X11/tigervnc/Xsession") {
+         if (-x "$cmd") {
+             $Xsession = $cmd;
+             last;
diff --git a/remove-selinux.patch b/remove-selinux.patch
new file mode 100644
index 000000000000..8c8601c213c9
--- /dev/null
+++ b/remove-selinux.patch
@@ -0,0 +1,24 @@
+diff -wbBur tigervnc-1.11.0/unix/vncserver/tigervnc.pam tigervnc-1.11.0.my/unix/vncserver/tigervnc.pam
+--- tigervnc-1.11.0/unix/vncserver/tigervnc.pam	2020-09-08 15:16:08.000000000 +0300
++++ tigervnc-1.11.0.my/unix/vncserver/tigervnc.pam	2020-09-11 18:42:35.160649140 +0300
+@@ -1,8 +1,5 @@
+ #%PAM-1.0
+-# pam_selinux.so close should be the first session rule
+--session   required     pam_selinux.so close
+ session    required     pam_loginuid.so
+--session   required     pam_selinux.so open
+ session    required     pam_namespace.so
+ session    optional     pam_keyinit.so force revoke
+ session    required     pam_limits.so
+diff -wbBur tigervnc-1.11.0/unix/vncserver/vncserver@.service.in tigervnc-1.11.0.my/unix/vncserver/vncserver@.service.in
+--- tigervnc-1.11.0/unix/vncserver/vncserver@.service.in	2020-09-08 15:16:08.000000000 +0300
++++ tigervnc-1.11.0.my/unix/vncserver/vncserver@.service.in	2020-09-11 18:42:45.223982346 +0300
+@@ -36,8 +36,7 @@
+ [Service]
+ Type=forking
+ ExecStart=@CMAKE_INSTALL_FULL_LIBEXECDIR@/vncsession-start %i
+ PIDFile=/run/vncsession-%i.pid
+-SELinuxContext=system_u:system_r:vnc_session_t:s0
+ 
+ [Install]
+ WantedBy=multi-user.target
diff --git a/vncserver.service b/vncserver.service
deleted file mode 100644
index 40151ac80913..000000000000
--- a/vncserver.service
+++ /dev/null
@@ -1,29 +0,0 @@
-# The vncserver service unit file
-#
-# 1. Copy this file to /etc/systemd/system/vncserver@:<display>.service
-# 2. Edit User=
-#   ("User=foo")
-# 3. Edit  and vncserver parameters appropriately
-#   ("/usr/bin/vncserver %i -arg1 -arg2 -argn")
-# 4. Run `systemctl --system daemon-reload`
-# 5. Run `systemctl enable vncserver@:<display>.service`
-#
-# DO NOT RUN THIS SERVICE if your local area network is untrusted! 
-#
-# See the wiki page for more on security
-# https://wiki.archlinux.org/index.php/Vncserver
-
-[Unit]
-Description=Remote desktop service (VNC)
-After=syslog.target network.target
-
-[Service]
-Type=simple
-User=
-
-ExecStartPre=/bin/sh -c '/usr/bin/vncserver -kill %i >/dev/null 2>&1 || true'
-ExecStart=/usr/bin/vncserver -fg %i
-ExecStop=/usr/bin/vncserver -kill %i
-
-[Install]
-WantedBy=multi-user.target
diff --git a/vncviewer.desktop b/vncviewer.desktop
deleted file mode 100644
index d8005d30748c..000000000000
--- a/vncviewer.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=TigerVNC Viewer
-Comment=VNC client
-Exec=/usr/bin/vncviewer
-Icon=tigervnc
-Terminal=false
-StartupNotify=false
-Categories=Network;RemoteAccess;