[arch-commits] Commit in tigervnc/trunk (4 files)

[Sergej Pupykin]

    Date: Friday, September 11, 2020 @ 16:02:30
  Author: spupykin
Revision: 702808

upgpkg: tigervnc 1.11.0-4

Added:
  tigervnc/trunk/remove-selinux.patch
Modified:
  tigervnc/trunk/PKGBUILD
Deleted:
  tigervnc/trunk/vncserver.service
  tigervnc/trunk/vncviewer.desktop

----------------------+
 PKGBUILD             |   22 ++++++++++++----------
 remove-selinux.patch |   25 +++++++++++++++++++++++++
 vncserver.service    |   29 -----------------------------
 vncviewer.desktop    |    9 ---------
 4 files changed, 37 insertions(+), 48 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-09-11 15:43:26 UTC (rev 702807)
+++ PKGBUILD	2020-09-11 16:02:30 UTC (rev 702808)
@@ -3,7 +3,7 @@
 
 pkgname=tigervnc
 pkgver=1.11.0
-pkgrel=3
+pkgrel=4
 _xorgver=1.20.8
 pkgdesc="Suite of VNC servers and clients. Based on the VNC 4 branch of TightVNC."
 arch=('x86_64')
@@ -11,26 +11,30 @@
 license=('GPL')
 depends=('fltk' 'pam' 'gnutls' 'libjpeg-turbo' 'libxtst' 'pixman'
 	 'xorg-xauth' 'xorg-xsetroot' 'xkeyboard-config' 'xorg-xkbcomp'
-	 'libgl' 'libgcrypt' 'perl' 'libxdamage' 'libxfont2' 'libdrm')
+	 'libgl' 'libgcrypt' 'perl' 'libxdamage' 'libxfont2' 'libdrm'
+	 'xorg-xinit')
 makedepends=('cmake' 'nasm' 'xorg-font-util' 'xorg-util-macros'
 	     'xtrans' 'xorgproto'
 	     'mesa' 'imagemagick' 'java-environment=8')
 optdepends=('mesa: for OpenGL functionality in Xvnc')
 conflicts=('tightvnc')
+backup=(etc/pam.d/tigervnc
+	etc/tigervnc/vncserver-config-defaults
+	etc/tigervnc/vncserver-config-mandatory
+	etc/tigervnc/vncserver.users)
 source=($pkgname-$pkgver.tar.gz::https://github.com/TigerVNC/tigervnc/archive/v${pkgver}.tar.gz
 	ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${_xorgver}.tar.bz2
-	vncserver.service
-	vncviewer.desktop
-	more-xsessions.patch)
+	more-xsessions.patch
+	remove-selinux.patch)
 sha256sums=('3648eca472a92a4e8fe55b27cd397b1bf16bad0b24a3a1988661f44553f5e2c3'
             'd17b646bee4ba0fb7850c1cc55b18e3e8513ed5c02bdf38da7e107f84e2d0146'
-            '80f8fc7598d05e645ae73bc3371bbdededf07136a9f024ce6ebbfe469335b16e'
-            '2ada7da1a926d78f11d2dd8ec376ac5877d2ce2bbb57a99526c13d8fcae6ddd7'
-            '5606c12553b9891e295bacede6c58f726527ec3eb916efa0c436bb156067ff41')
+            '5606c12553b9891e295bacede6c58f726527ec3eb916efa0c436bb156067ff41'
+            '71efc3bedd5be49089f4ca93517fb7fb6fadf002319cd9c8b3ac032ff3cadab0')
 
 prepare() {
   cd "$srcdir"/${pkgname}-${pkgver}
   patch -p1 -i "$srcdir"/more-xsessions.patch
+  patch -p1 -i "$srcdir"/remove-selinux.patch
 
   cd unix/xserver
   cp -r "$srcdir"/xorg-server-${_xorgver}/* .
@@ -67,6 +71,4 @@
   make DESTDIR="$pkgdir" install
   install -Dm0644 "$srcdir"/${pkgname}-${pkgver}/unix/vncserver/vncserver at .service \
     "$pkgdir"/usr/lib/systemd/user/vncserver at .service
-  install -Dm0644 "$srcdir"/vncserver.service "$pkgdir"/usr/lib/systemd/system/vncserver.service
-  install -Dm0644 "$srcdir"/vncviewer.desktop "$pkgdir"/usr/share/applications/vncviewer.desktop
 }

Added: remove-selinux.patch
===================================================================
--- remove-selinux.patch	                        (rev 0)
+++ remove-selinux.patch	2020-09-11 16:02:30 UTC (rev 702808)
@@ -0,0 +1,25 @@
+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 at .service.in tigervnc-1.11.0.my/unix/vncserver/vncserver at .service.in
+--- tigervnc-1.11.0/unix/vncserver/vncserver at .service.in	2020-09-08 15:16:08.000000000 +0300
++++ tigervnc-1.11.0.my/unix/vncserver/vncserver at .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=/var/run/vncsession-%i.pid
+-SELinuxContext=system_u:system_r:vnc_session_t:s0
++PIDFile=/run/vncsession-%i.pid
+ 
+ [Install]
+ WantedBy=multi-user.target

Deleted: vncserver.service
===================================================================
--- vncserver.service	2020-09-11 15:43:26 UTC (rev 702807)
+++ vncserver.service	2020-09-11 16:02:30 UTC (rev 702808)
@@ -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

Deleted: vncviewer.desktop
===================================================================
--- vncviewer.desktop	2020-09-11 15:43:26 UTC (rev 702807)
+++ vncviewer.desktop	2020-09-11 16:02:30 UTC (rev 702808)
@@ -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;