[arch-commits] Commit in x2goserver/repos (6 files)
Andreas Radke
andyrtr at archlinux.org
Tue Jun 9 09:52:31 UTC 2020
Date: Tuesday, June 9, 2020 @ 09:52:31
Author: andyrtr
Revision: 388511
archrelease: copy trunk to testing-x86_64
Added:
x2goserver/repos/testing-x86_64/
x2goserver/repos/testing-x86_64/PKGBUILD
(from rev 388510, x2goserver/trunk/PKGBUILD)
x2goserver/repos/testing-x86_64/reproducible-man-gzip.patch
(from rev 388510, x2goserver/trunk/reproducible-man-gzip.patch)
x2goserver/repos/testing-x86_64/sysusers.d
(from rev 388510, x2goserver/trunk/sysusers.d)
x2goserver/repos/testing-x86_64/tmpfiles.d
(from rev 388510, x2goserver/trunk/tmpfiles.d)
x2goserver/repos/testing-x86_64/x2goserver.install
(from rev 388510, x2goserver/trunk/x2goserver.install)
-----------------------------+
PKGBUILD | 152 ++++++++++++++++++++++++++++++++++++++++++
reproducible-man-gzip.patch | 81 ++++++++++++++++++++++
sysusers.d | 2
tmpfiles.d | 2
x2goserver.install | 6 +
5 files changed, 243 insertions(+)
Copied: x2goserver/repos/testing-x86_64/PKGBUILD (from rev 388510, x2goserver/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2020-06-09 09:52:31 UTC (rev 388511)
@@ -0,0 +1,152 @@
+# Maintainer: AndyRTR <andyrtr at archlinux.org>
+
+# Contributor: Gerhard Brauer <gerbra at archlinux.de>
+# Contributor: Richard Murri <admin at richardmurri.com>
+# Contributor: Markus Opitz <mastero23 at gmail dot com>
+# Contributor: Milan Knížek <knizek at volny.cz>
+
+pkgname=x2goserver
+pkgver=4.1.0.3
+pkgrel=6
+pkgdesc="Open source graphical Remote Desktop and terminal server based on NX technology"
+arch=('x86_64')
+url="https://www.x2go.org/"
+license=('GPL2')
+# https://code.x2go.org/gitweb?p=x2goserver.git;a=blob;f=x2goserver.spec
+
+# from 4.0.1.20 changelog there could be new deps on bash, xkeyboard-config, perl-cwd-guard
+
+depends=(
+ 'openssh'
+ # certain shell script hardcode bash
+ 'bash'
+ # for x2goruncommand - for now
+ 'bc'
+ # for ss in x2gogetfreeport
+ 'iproute'
+ # for x2goshowblocks
+ 'lsof'
+ # For killall in x2gosuspend-session
+ 'psmisc'
+ # For x2godbadmin
+ 'pwgen' # in community
+ # For printing, file-sharing
+ 'sshfs'
+ # for /etc/sudoers.d
+ 'sudo'
+ 'which'
+ # For /etc/X11/Xresources
+ 'xorg-xinit'
+ 'xorg-fonts-misc'
+ 'xorg-xauth'
+ 'xkeyboard-config'
+ 'xorg-xwininfo' # FS#38558
+ 'xorg-setxkbmap' # FS#53345
+
+ # for useradd/groupadd
+ 'shadow'
+
+ # for filemanager bindings
+ 'desktop-file-utils'
+ 'shared-mime-info'
+ 'xdg-utils'
+
+ # We need a database
+ 'perl-dbd-sqlite'
+
+ 'perl-capture-tiny'
+ 'perl-config-simple'
+ 'perl-file-basedir' # FS#38551
+ 'perl-file-which' # FS#44125
+ 'perl-switch'
+ 'perl-try-tiny' # FS#58226
+ # 'perl-file-readbackwards' ?
+
+ 'dbus'
+)
+#makedepends=('man2html' 'perl-extutils-makemaker' 'systemd')
+makedepends=('man2html' 'perl-extutils-makemaker' 'systemd'
+ # only needed for file system paths
+ 'sudo'
+ # for /usr/lib/nx/bin to be owned by some package
+ 'nxagent'
+)
+optdepends=('perl-dbd-pg: Postgres support')
+#conflicts=('x2go-agent')
+#replaces=('x2go-agent')
+#provides=('x2go-agent' 'x2goagent')
+options=('emptydirs')
+install=x2goserver.install
+backup=('etc/x2go/x2goserver.conf'
+ 'etc/x2go/desktopsharing/settings'
+ # from old x2go-agent pkg now provided here
+ etc/x2go/{keystrokes.cfg,x2goagent.keyboard,x2goagent.options}
+)
+# no https due to invalid certificate
+source=(https://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc}
+ tmpfiles.d
+ sysusers.d
+ reproducible-man-gzip.patch)
+sha256sums=('6776aaa354f5a44e349f0b3c176d4988c88a618c2edf46c98a37ae89c069dcd0'
+ 'SKIP'
+ '548d48925171aeca198494236cfba7232921a25a1c4c81f5d004a734d83d1350'
+ '04d429e8d8fe02c8078d75ba63ba57774274df877b2c6ec942621312b7bf9118'
+ '2d52a5ca28d5b65a9cc9bd8cdc74d030d7faddb6d727d2df520686934ea125fb')
+validpgpkeys=('1AD23D1B8F087A35AB74BDE9F4A7678C9C6B0B2B') # X2go Git Administrator <git-admin at x2go.org>
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+ # -r option does not exist in Arch linux
+ # (However, html man pages do not get installed anyway...)
+ for Makefile in $(find . -type f -name Makefile); do
+ sed -i 's@(MAN2HTML_BIN) -r @(MAN2HTML_BIN) < @g' $Makefile
+ sed -i 's@ \$(MAN2HTML_SRC)/@ < \$(MAN2HTML_SRC)/@g' $Makefile
+ done
+
+ # fix some Makefile permission options
+ for Makefile in $(find . -type f -name Makefile); do
+ sed -i "s:-o root -g root ::g" $Makefile
+ done
+ # Do not ship xsession - Debian specific
+ sed -i -e '/xsession/s/^/#/' Makefile
+
+ # remove timestamp to solve reproducible build
+ patch -Np1 -i ../reproducible-man-gzip.patch
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+ make PREFIX=/usr SBINDIR=/usr/bin DESTDIR="$pkgdir" PERL_INSTALLDIRS=vendor
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+ make -j1 PREFIX=/usr SBINDIR=/usr/bin DESTDIR="$pkgdir" install
+
+ # systemd files
+ install -Dm 644 "$srcdir/${pkgname}-${pkgver}/x2goserver.service" "$pkgdir/usr/lib/systemd/system/x2goserver.service"
+ # overwrite upstream systemd tmofile "x /tmp/.x2go-*" with ours
+ cat ../tmpfiles.d >> "${pkgdir}"/usr/lib/tmpfiles.d/x2goserver.conf
+ install -Dm644 ../sysusers.d "${pkgdir}"/usr/lib/sysusers.d/x2goserver.conf
+
+ # load fuse module at system start
+ install -dm755 "$pkgdir"/usr/lib/modules-load.d
+ echo "fuse" > "$pkgdir"/usr/lib/modules-load.d/x2goserver.conf
+
+ install -dm 755 "${pkgdir}/usr/share/doc/${pkgname}"
+ install -m 644 "ChangeLog" "${pkgdir}/usr/share/doc/${pkgname}/"
+
+ # fix permission - see INSTALL file
+ chown root:111 "${pkgdir}"/usr/lib/x2go/libx2go-server-db-sqlite3-wrapper
+ chmod 2755 "${pkgdir}"/usr/lib/x2go/libx2go-server-db-sqlite3-wrapper
+
+ chown root:112 "${pkgdir}"/usr/bin/x2goprint
+ chmod 2755 "${pkgdir}"/usr/bin/x2goprint
+
+ chmod 750 "${pkgdir}"/etc/sudoers.d
+ chmod 0440 "${pkgdir}"/etc/sudoers.d/x2goserver
+
+ # Arch offer logcheck package - http://logcheck.org/
+ rm -r "${pkgdir}"/etc/logcheck
+}
+
Copied: x2goserver/repos/testing-x86_64/reproducible-man-gzip.patch (from rev 388510, x2goserver/trunk/reproducible-man-gzip.patch)
===================================================================
--- testing-x86_64/reproducible-man-gzip.patch (rev 0)
+++ testing-x86_64/reproducible-man-gzip.patch 2020-06-09 09:52:31 UTC (rev 388511)
@@ -0,0 +1,81 @@
+--- x2goserver-4.1.0.3/x2goserver-common/Makefile 2020-05-29 13:47:22.000000000 +0200
++++ x2goserver-4.1.0.3/x2goserver-common/Makefile.new 2020-05-29 13:49:19.785916164 +0200
+@@ -70,7 +70,7 @@
+ install_man:
+ $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/man5
+ $(INSTALL_FILE) man/man5/*.5 $(DESTDIR)$(MANDIR)/man5
+- gzip -f $(DESTDIR)$(MANDIR)/man5/x2go*.5
++ gzip -f -n $(DESTDIR)$(MANDIR)/man5/x2go*.5
+
+ install_version:
+ $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)
+--- x2goserver-4.1.0.3/x2goserver/Makefile 2020-05-29 13:47:22.000000000 +0200
++++ x2goserver-4.1.0.3/x2goserver/Makefile.new 2020-05-29 13:50:51.578356020 +0200
+@@ -80,10 +80,10 @@
+ $(INSTALL_DIR) $(DESTDIR)$(MANDIR)
+ $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/man5
+ $(INSTALL_FILE) man/man5/*.5 $(DESTDIR)$(MANDIR)/man5
+- gzip -f $(DESTDIR)$(MANDIR)/man5/x2go*.5
++ gzip -f -n $(DESTDIR)$(MANDIR)/man5/x2go*.5
+ $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/man8
+ $(INSTALL_FILE) man/man8/*.8 $(DESTDIR)$(MANDIR)/man8
+- gzip -f $(DESTDIR)$(MANDIR)/man8/x2go*.8
++ gzip -f -n $(DESTDIR)$(MANDIR)/man8/x2go*.8
+
+ install_version:
+ $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)
+--- x2goserver-4.1.0.3/x2goserver-x2goagent/Makefile 2020-05-29 13:47:22.000000000 +0200
++++ x2goserver-4.1.0.3/x2goserver-x2goagent/Makefile.new 2020-05-29 13:52:31.241005436 +0200
+@@ -75,7 +75,7 @@
+ $(INSTALL_DIR) $(DESTDIR)$(MANDIR)
+ $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/man1
+ $(INSTALL_FILE) man/man1/*.1 $(DESTDIR)$(MANDIR)/man1
+- gzip -f $(DESTDIR)$(MANDIR)/man1/x2go*.1
++ gzip -f -n $(DESTDIR)$(MANDIR)/man1/x2go*.1
+
+ install_version:
+ $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)
+--- x2goserver-4.1.0.3/x2goserver-printing/Makefile 2020-05-29 13:47:22.000000000 +0200
++++ x2goserver-4.1.0.3/x2goserver-printing/Makefile.new 2020-05-29 13:58:14.460132349 +0200
+@@ -62,7 +62,7 @@
+ $(INSTALL_DIR) $(DESTDIR)$(MANDIR)
+ $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/man8
+ $(INSTALL_FILE) man/man8/*.8 $(DESTDIR)$(MANDIR)/man8
+- gzip -f $(DESTDIR)$(MANDIR)/man8/x2go*.8
++ gzip -f -n $(DESTDIR)$(MANDIR)/man8/x2go*.8
+
+ install_version:
+ $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)
+--- x2goserver-4.1.0.3/x2goserver-extensions/Makefile 2020-05-29 13:47:22.000000000 +0200
++++ x2goserver-4.1.0.3/x2goserver-extensions/Makefile.new 2020-05-29 13:59:21.731921736 +0200
+@@ -94,7 +94,7 @@
+ $(INSTALL_DIR) $(DESTDIR)$(MANDIR)
+ $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/man8
+ $(INSTALL_FILE) man/man8/*.8 $(DESTDIR)$(MANDIR)/man8
+- gzip -f $(DESTDIR)$(MANDIR)/man8/x2go*.8
++ gzip -f -n $(DESTDIR)$(MANDIR)/man8/x2go*.8
+
+ install_version:
+ $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)
+--- x2goserver-4.1.0.3/x2goserver-fmbindings/Makefile 2020-05-29 13:47:22.000000000 +0200
++++ x2goserver-4.1.0.3/x2goserver-fmbindings/Makefile.new 2020-05-29 14:02:45.167334027 +0200
+@@ -66,7 +66,7 @@
+ $(INSTALL_DIR) $(DESTDIR)$(MANDIR)
+ $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/man8
+ $(INSTALL_FILE) man/man8/*.8 $(DESTDIR)$(MANDIR)/man8
+- gzip -f $(DESTDIR)$(MANDIR)/man8/x2go*.8
++ gzip -f -n $(DESTDIR)$(MANDIR)/man8/x2go*.8
+
+ install_version:
+ $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)
+--- x2goserver-4.1.0.3/x2goserver-desktopsharing/Makefile 2020-05-29 13:47:22.000000000 +0200
++++ x2goserver-4.1.0.3/x2goserver-desktopsharing/Makefile.new 2020-05-29 14:03:36.378699088 +0200
+@@ -64,7 +64,7 @@
+ $(INSTALL_DIR) $(DESTDIR)$(MANDIR)
+ $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/man8
+ $(INSTALL_FILE) man/man8/*.8 $(DESTDIR)$(MANDIR)/man8
+- gzip -f $(DESTDIR)$(MANDIR)/man8/x2go*.8
++ gzip -f -n $(DESTDIR)$(MANDIR)/man8/x2go*.8
+
+ install_version:
+ $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)
Copied: x2goserver/repos/testing-x86_64/sysusers.d (from rev 388510, x2goserver/trunk/sysusers.d)
===================================================================
--- testing-x86_64/sysusers.d (rev 0)
+++ testing-x86_64/sysusers.d 2020-06-09 09:52:31 UTC (rev 388511)
@@ -0,0 +1,2 @@
+u x2gouser 111 "x2gouser" /var/lib/x2go
+u x2goprint 112 "x2goprint" /var/spool/x2go
Copied: x2goserver/repos/testing-x86_64/tmpfiles.d (from rev 388510, x2goserver/trunk/tmpfiles.d)
===================================================================
--- testing-x86_64/tmpfiles.d (rev 0)
+++ testing-x86_64/tmpfiles.d 2020-06-09 09:52:31 UTC (rev 388511)
@@ -0,0 +1,2 @@
+d /var/lib/x2go 0770 x2gouser x2gouser
+d /var/spool/x2go 0770 x2goprint x2goprint
Copied: x2goserver/repos/testing-x86_64/x2goserver.install (from rev 388510, x2goserver/trunk/x2goserver.install)
===================================================================
--- testing-x86_64/x2goserver.install (rev 0)
+++ testing-x86_64/x2goserver.install 2020-06-09 09:52:31 UTC (rev 388511)
@@ -0,0 +1,6 @@
+pre_install() {
+ cat << 'EOM'
+ ==> Use the following command to setup sqlite database:
+ ==> x2godbadmin --createdb
+EOM
+}
More information about the arch-commits
mailing list