Date: Saturday, November 13, 2021 @ 18:30:46 Author: spupykin Revision: 1045845
archrelease: copy trunk to community-x86_64 Added: tigervnc/repos/community-x86_64/PKGBUILD (from rev 1045843, tigervnc/trunk/PKGBUILD) tigervnc/repos/community-x86_64/Xsession (from rev 1045844, tigervnc/trunk/Xsession) tigervnc/repos/community-x86_64/more-xsessions.patch (from rev 1045844, tigervnc/trunk/more-xsessions.patch) tigervnc/repos/community-x86_64/remove-selinux.patch (from rev 1045844, tigervnc/trunk/remove-selinux.patch) Deleted: tigervnc/repos/community-x86_64/PKGBUILD tigervnc/repos/community-x86_64/Xsession tigervnc/repos/community-x86_64/more-xsessions.patch tigervnc/repos/community-x86_64/remove-selinux.patch ----------------------+ PKGBUILD | 154 ++++++++++++++++++++++++------------------------- Xsession | 132 +++++++++++++++++++++--------------------- more-xsessions.patch | 36 +++++------ remove-selinux.patch | 49 +++++++-------- 4 files changed, 185 insertions(+), 186 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2021-11-13 18:30:40 UTC (rev 1045844) +++ PKGBUILD 2021-11-13 18:30:46 UTC (rev 1045845) @@ -1,77 +0,0 @@ -# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com> -# Maintainer: Uroš Vampl <mobile.leecher at gmail dot com> - -pkgname=tigervnc -pkgver=1.11.0 -pkgrel=6 -_xorgver=1.20.9 -pkgdesc="Suite of VNC servers and clients. Based on the VNC 4 branch of TightVNC." -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' '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 - Xsession - more-xsessions.patch - remove-selinux.patch) -sha256sums=('3648eca472a92a4e8fe55b27cd397b1bf16bad0b24a3a1988661f44553f5e2c3' - 'e219f2e0dfe455467939149d7cd2ee53b79b512cc1d2094ae4f5c9ed9ccd3571' - 'c9276f6ea277cf9654fb2cc3bc9dadbb2e596b5cf8ca867ee906c0080cf7f810' - 'cb57dece026b29d7019a3e1e42fd2fb201d37fc60a70c885d2a50acffb808c06' - '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}/* . - patch -Np1 -i ../xserver120.patch -} - -build() { - cd "$srcdir"/${pkgname}-${pkgver} - - 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 - 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 \ - --disable-config-hal --disable-config-udev --with-pic \ - --disable-unit-tests --disable-devel-docs --disable-selective-werror \ - --disable-dri --enable-dri2 --enable-dri3 --enable-glx - make -} - -package() { - cd "$srcdir"/${pkgname}-${pkgver} - 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 -Dm0755 "$srcdir"/Xsession "$pkgdir"/etc/X11/tigervnc/Xsession -# install -Dm0644 "$srcdir"/${pkgname}-${pkgver}/unix/vncserver/vncserver@.service \ -# "$pkgdir"/usr/lib/systemd/user/vncserver@.service -} Copied: tigervnc/repos/community-x86_64/PKGBUILD (from rev 1045843, tigervnc/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2021-11-13 18:30:46 UTC (rev 1045845) @@ -0,0 +1,77 @@ +# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com> +# Maintainer: Uroš Vampl <mobile.leecher at gmail dot com> + +pkgname=tigervnc +pkgver=1.12.0 +pkgrel=1 +_xorgver=1.20.9 +pkgdesc="Suite of VNC servers and clients. Based on the VNC 4 branch of TightVNC." +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' '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 + https://xorg.freedesktop.org/releases/individual/xserver/xorg-server-${_xorgver}.tar.bz2 + Xsession + more-xsessions.patch + remove-selinux.patch) +sha256sums=('9ff3f3948f2a4e8cc06ee598ee4b1096beb62094c13e0b1462bff78587bed789' + 'e219f2e0dfe455467939149d7cd2ee53b79b512cc1d2094ae4f5c9ed9ccd3571' + 'c9276f6ea277cf9654fb2cc3bc9dadbb2e596b5cf8ca867ee906c0080cf7f810' + 'cb57dece026b29d7019a3e1e42fd2fb201d37fc60a70c885d2a50acffb808c06' + 'fb8bb5bd3ec990720580a664326a70fd178ce94b97c2130462df9b1e3a3925c3') + +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}/* . + patch -Np1 -i ../xserver120.patch +} + +build() { + cd "$srcdir"/${pkgname}-${pkgver} + + 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 + 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 \ + --disable-config-hal --disable-config-udev --with-pic \ + --disable-unit-tests --disable-devel-docs --disable-selective-werror \ + --disable-dri --enable-dri2 --enable-dri3 --enable-glx + make +} + +package() { + cd "$srcdir"/${pkgname}-${pkgver} + 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 -Dm0755 "$srcdir"/Xsession "$pkgdir"/etc/X11/tigervnc/Xsession +# install -Dm0644 "$srcdir"/${pkgname}-${pkgver}/unix/vncserver/vncserver@.service \ +# "$pkgdir"/usr/lib/systemd/user/vncserver@.service +} Deleted: Xsession =================================================================== --- Xsession 2021-11-13 18:30:40 UTC (rev 1045844) +++ Xsession 2021-11-13 18:30:46 UTC (rev 1045845) @@ -1,66 +0,0 @@ -#!/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 $@ Copied: tigervnc/repos/community-x86_64/Xsession (from rev 1045844, tigervnc/trunk/Xsession) =================================================================== --- Xsession (rev 0) +++ Xsession 2021-11-13 18:30:46 UTC (rev 1045845) @@ -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 $@ Deleted: more-xsessions.patch =================================================================== --- more-xsessions.patch 2021-11-13 18:30:40 UTC (rev 1045844) +++ more-xsessions.patch 2021-11-13 18:30:46 UTC (rev 1045845) @@ -1,18 +0,0 @@ -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; Copied: tigervnc/repos/community-x86_64/more-xsessions.patch (from rev 1045844, tigervnc/trunk/more-xsessions.patch) =================================================================== --- more-xsessions.patch (rev 0) +++ more-xsessions.patch 2021-11-13 18:30:46 UTC (rev 1045845) @@ -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; Deleted: remove-selinux.patch =================================================================== --- remove-selinux.patch 2021-11-13 18:30:40 UTC (rev 1045844) +++ remove-selinux.patch 2021-11-13 18:30:46 UTC (rev 1045845) @@ -1,25 +0,0 @@ -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/vncser...@.service.in tigervnc-1.11.0.my/unix/vncserver/vncser...@.service.in ---- tigervnc-1.11.0/unix/vncserver/vncser...@.service.in 2020-09-08 15:16:08.000000000 +0300 -+++ tigervnc-1.11.0.my/unix/vncserver/vncser...@.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 Copied: tigervnc/repos/community-x86_64/remove-selinux.patch (from rev 1045844, tigervnc/trunk/remove-selinux.patch) =================================================================== --- remove-selinux.patch (rev 0) +++ remove-selinux.patch 2021-11-13 18:30:46 UTC (rev 1045845) @@ -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/vncser...@.service.in tigervnc-1.11.0.my/unix/vncserver/vncser...@.service.in +--- tigervnc-1.11.0/unix/vncserver/vncser...@.service.in 2020-09-08 15:16:08.000000000 +0300 ++++ tigervnc-1.11.0.my/unix/vncserver/vncser...@.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