Date: Saturday, April 14, 2018 @ 11:59:46
  Author: andyrtr
Revision: 321795

archrelease: copy trunk to extra-x86_64

Added:
  x2goserver/repos/extra-x86_64/PKGBUILD
    (from rev 321794, x2goserver/trunk/PKGBUILD)
  x2goserver/repos/extra-x86_64/sysusers.d
    (from rev 321794, x2goserver/trunk/sysusers.d)
  x2goserver/repos/extra-x86_64/tmpfiles.d
    (from rev 321794, x2goserver/trunk/tmpfiles.d)
  x2goserver/repos/extra-x86_64/x2goserver.install
    (from rev 321794, x2goserver/trunk/x2goserver.install)
Deleted:
  x2goserver/repos/extra-x86_64/PKGBUILD
  x2goserver/repos/extra-x86_64/sysusers.d
  x2goserver/repos/extra-x86_64/tmpfiles.d
  x2goserver/repos/extra-x86_64/x2goserver.install

--------------------+
 PKGBUILD           |  299 +++++++++++++++++++++++++--------------------------
 sysusers.d         |    4 
 tmpfiles.d         |    4 
 x2goserver.install |   12 +-
 4 files changed, 160 insertions(+), 159 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD    2018-04-14 11:59:33 UTC (rev 321794)
+++ PKGBUILD    2018-04-14 11:59:46 UTC (rev 321795)
@@ -1,149 +0,0 @@
-# $Id$
-# Maintainer: AndyRTR <andy...@archlinux.org>
-
-# Contributor: Gerhard Brauer <ger...@archlinux.de>
-# Contributor: Richard Murri <ad...@richardmurri.com>
-# Contributor: Markus Opitz <mastero23 at gmail dot com>
-# Contributor: Milan Knížek <kni...@volny.cz>
-
-pkgname=x2goserver
-pkgver=4.1.0.0
-pkgrel=1
-pkgdesc="Open source graphical Remote Desktop and terminal server based on NX 
technology"
-arch=('x86_64')
-url="http://www.x2go.org/";
-license=('GPL2')
-# http://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=(#'python' 
-
-         # For x2goruncommand - for now
-         'bc'
-         # For netstat in x2goresume-session
-         'net-tools'
-         'openssh'
-         'perl-file-readbackwards'
-         # We need a database
-         'perl-dbd-sqlite' 
-         # For killall in x2gosuspend-session
-         'psmisc'
-         # For x2goshowblocks
-         'lsof'
-         # For x2godbadmin
-         'pwgen' # in community
-         # For printing, file-sharing
-         'sshfs'
-         # For /etc/sudoers.d
-         'sudo'
-         'nxagent'
-         # For /etc/X11/Xresources
-         'xorg-xinit'
-         'xorg-fonts-misc'
-         'xorg-xauth'
-         'shadow'
-         
-         # for post install actions
-         'desktop-file-utils'
-         'shared-mime-info'
-         
-         'perl-capture-tiny'
-         'perl-config-simple'
-         'perl-file-basedir' # FS#38551
-         'perl-file-which' # FS#44125
-         'perl-switch'
-
-         'xorg-xwininfo' # FS#38558
-         'xorg-setxkbmap' # FS#53345
-
-         'dbus'
-
-         #x2goserver-extensions
-         #x2goserver-xsession
-         #x2goserver-fmbindings
-         #x2goserver-printing
-)
-makedepends=('man2html' 'perl-extutils-makemaker' 'systemd')
-#optdepends=('cups-x2go: printing support')
-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/x2gosql/sql')
-        # from old x2go-agent pkg now provided here
-        etc/x2go/{keystrokes.cfg,rgb,x2goagent.keyboard,x2goagent.options}
-)
-# no https due to invalid certificate
-source=(http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc}
-       tmpfiles.d
-       sysusers.d)
-sha256sums=('17f61fb7901a53d4309d7a873e27272809f8cd1188cbeaffd6a0248e53d6d374'
-            'SKIP'
-            '548d48925171aeca198494236cfba7232921a25a1c4c81f5d004a734d83d1350'
-            '04d429e8d8fe02c8078d75ba63ba57774274df877b2c6ec942621312b7bf9118')
-validpgpkeys=('1AD23D1B8F087A35AB74BDE9F4A7678C9C6B0B2B') # X2go Git 
Administrator <git-ad...@x2go.org>
-
-build() {
-  cd "${srcdir}/${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
-  
-  make PREFIX=/usr SBINDIR=/usr/bin DESTDIR="$pkgdir" PERL_INSTALLDIRS=vendor
-}
-
-package() {
-  cd "${srcdir}/${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"
-  install -Dm644 ../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
-
-  # these files are part of x2go-agent (pkgbase "nx")
-#  rm ${pkgdir}/etc/x2go/keystrokes.cfg
-#  rm ${pkgdir}/etc/x2go/rgb
-#  rm ${pkgdir}/etc/x2go/x2goagent.keyboard
-#  rm ${pkgdir}/etc/x2go/x2goagent.options
-#  rm ${pkgdir}/usr/bin/x2goagent
-#  rm ${pkgdir}/usr/share/man/man1/x2goagent.1.gz
-#  rm ${pkgdir}/usr/share/pixmaps/x2go.xpm
-#  rm ${pkgdir}/usr/share/x2go/rgb
-
-}
-
-
-
-

Copied: x2goserver/repos/extra-x86_64/PKGBUILD (from rev 321794, 
x2goserver/trunk/PKGBUILD)
===================================================================
--- PKGBUILD                            (rev 0)
+++ PKGBUILD    2018-04-14 11:59:46 UTC (rev 321795)
@@ -0,0 +1,150 @@
+# $Id$
+# Maintainer: AndyRTR <andy...@archlinux.org>
+
+# Contributor: Gerhard Brauer <ger...@archlinux.de>
+# Contributor: Richard Murri <ad...@richardmurri.com>
+# Contributor: Markus Opitz <mastero23 at gmail dot com>
+# Contributor: Milan Knížek <kni...@volny.cz>
+
+pkgname=x2goserver
+pkgver=4.1.0.0
+pkgrel=2
+pkgdesc="Open source graphical Remote Desktop and terminal server based on NX 
technology"
+arch=('x86_64')
+url="http://www.x2go.org/";
+license=('GPL2')
+# http://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=(#'python' 
+
+         # For x2goruncommand - for now
+         'bc'
+         # For netstat in x2goresume-session
+         'net-tools'
+         'openssh'
+         'perl-file-readbackwards'
+         # We need a database
+         'perl-dbd-sqlite' 
+         # For killall in x2gosuspend-session
+         'psmisc'
+         # For x2goshowblocks
+         'lsof'
+         # For x2godbadmin
+         'pwgen' # in community
+         # For printing, file-sharing
+         'sshfs'
+         # For /etc/sudoers.d
+         'sudo'
+         'nxagent'
+         # For /etc/X11/Xresources
+         'xorg-xinit'
+         'xorg-fonts-misc'
+         'xorg-xauth'
+         'shadow'
+         
+         # for post install actions
+         'desktop-file-utils'
+         'shared-mime-info'
+         
+         'perl-capture-tiny'
+         'perl-config-simple'
+         'perl-file-basedir' # FS#38551
+         'perl-file-which' # FS#44125
+         'perl-switch'
+         'perl-try-tiny' # FS#58226
+
+         'xorg-xwininfo' # FS#38558
+         'xorg-setxkbmap' # FS#53345
+
+         'dbus'
+
+         #x2goserver-extensions
+         #x2goserver-xsession
+         #x2goserver-fmbindings
+         #x2goserver-printing
+)
+makedepends=('man2html' 'perl-extutils-makemaker' 'systemd')
+#optdepends=('cups-x2go: printing support')
+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/x2gosql/sql')
+        # from old x2go-agent pkg now provided here
+        etc/x2go/{keystrokes.cfg,rgb,x2goagent.keyboard,x2goagent.options}
+)
+# no https due to invalid certificate
+source=(http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc}
+       tmpfiles.d
+       sysusers.d)
+sha256sums=('17f61fb7901a53d4309d7a873e27272809f8cd1188cbeaffd6a0248e53d6d374'
+            'SKIP'
+            '548d48925171aeca198494236cfba7232921a25a1c4c81f5d004a734d83d1350'
+            '04d429e8d8fe02c8078d75ba63ba57774274df877b2c6ec942621312b7bf9118')
+validpgpkeys=('1AD23D1B8F087A35AB74BDE9F4A7678C9C6B0B2B') # X2go Git 
Administrator <git-ad...@x2go.org>
+
+build() {
+  cd "${srcdir}/${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
+  
+  make PREFIX=/usr SBINDIR=/usr/bin DESTDIR="$pkgdir" PERL_INSTALLDIRS=vendor
+}
+
+package() {
+  cd "${srcdir}/${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"
+  install -Dm644 ../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
+
+  # these files are part of x2go-agent (pkgbase "nx")
+#  rm ${pkgdir}/etc/x2go/keystrokes.cfg
+#  rm ${pkgdir}/etc/x2go/rgb
+#  rm ${pkgdir}/etc/x2go/x2goagent.keyboard
+#  rm ${pkgdir}/etc/x2go/x2goagent.options
+#  rm ${pkgdir}/usr/bin/x2goagent
+#  rm ${pkgdir}/usr/share/man/man1/x2goagent.1.gz
+#  rm ${pkgdir}/usr/share/pixmaps/x2go.xpm
+#  rm ${pkgdir}/usr/share/x2go/rgb
+
+}
+
+
+
+

Deleted: sysusers.d
===================================================================
--- sysusers.d  2018-04-14 11:59:33 UTC (rev 321794)
+++ sysusers.d  2018-04-14 11:59:46 UTC (rev 321795)
@@ -1,2 +0,0 @@
-u x2gouser  111 "x2gouser"  /var/lib/x2go
-u x2goprint 112 "x2goprint" /var/spool/x2go

Copied: x2goserver/repos/extra-x86_64/sysusers.d (from rev 321794, 
x2goserver/trunk/sysusers.d)
===================================================================
--- sysusers.d                          (rev 0)
+++ sysusers.d  2018-04-14 11:59:46 UTC (rev 321795)
@@ -0,0 +1,2 @@
+u x2gouser  111 "x2gouser"  /var/lib/x2go
+u x2goprint 112 "x2goprint" /var/spool/x2go

Deleted: tmpfiles.d
===================================================================
--- tmpfiles.d  2018-04-14 11:59:33 UTC (rev 321794)
+++ tmpfiles.d  2018-04-14 11:59:46 UTC (rev 321795)
@@ -1,2 +0,0 @@
-d /var/lib/x2go   0770 x2gouser  x2gouser
-d /var/spool/x2go 0770 x2goprint x2goprint

Copied: x2goserver/repos/extra-x86_64/tmpfiles.d (from rev 321794, 
x2goserver/trunk/tmpfiles.d)
===================================================================
--- tmpfiles.d                          (rev 0)
+++ tmpfiles.d  2018-04-14 11:59:46 UTC (rev 321795)
@@ -0,0 +1,2 @@
+d /var/lib/x2go   0770 x2gouser  x2gouser
+d /var/spool/x2go 0770 x2goprint x2goprint

Deleted: x2goserver.install
===================================================================
--- x2goserver.install  2018-04-14 11:59:33 UTC (rev 321794)
+++ x2goserver.install  2018-04-14 11:59:46 UTC (rev 321795)
@@ -1,6 +0,0 @@
-pre_install() {
-  cat << 'EOM'
-  ==> Use the following command to setup sqlite database:
-  ==> x2godbadmin --createdb
-EOM
-}

Copied: x2goserver/repos/extra-x86_64/x2goserver.install (from rev 321794, 
x2goserver/trunk/x2goserver.install)
===================================================================
--- x2goserver.install                          (rev 0)
+++ x2goserver.install  2018-04-14 11:59:46 UTC (rev 321795)
@@ -0,0 +1,6 @@
+pre_install() {
+  cat << 'EOM'
+  ==> Use the following command to setup sqlite database:
+  ==> x2godbadmin --createdb
+EOM
+}

Reply via email to