[arch-commits] Commit in x2goserver/trunk (PKGBUILD)

[Andreas Radke]

    Date: Tuesday, June 9, 2020 @ 09:52:18
  Author: andyrtr
Revision: 388510

upgpkg: x2goserver 4.1.0.3-6: drop logcheck support that Arch doesn't offer; minor dependencies updates; fade out old provides/conflict/replaces

Modified:
  x2goserver/trunk/PKGBUILD

----------+
 PKGBUILD |   68 ++++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 38 insertions(+), 30 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-06-09 02:33:56 UTC (rev 388509)
+++ PKGBUILD	2020-06-09 09:52:18 UTC (rev 388510)
@@ -7,7 +7,7 @@
 
 pkgname=x2goserver
 pkgver=4.1.0.3
-pkgrel=5
+pkgrel=6
 pkgdesc="Open source graphical Remote Desktop and terminal server based on NX technology"
 arch=('x86_64')
 url="https://www.x2go.org/"
@@ -16,37 +16,44 @@
 
 # from 4.0.1.20 changelog there could be new deps on bash, xkeyboard-config, perl-cwd-guard
 
-depends=(#'python' 
-
-         # For x2goruncommand - for now
+depends=(
+         'openssh'
+         # certain shell script hardcode bash
+         'bash'
+         # for x2goruncommand - for now
          'bc'
-         # For netstat in x2goresume-session
-         'net-tools'
-         'openssh'
-         'perl-file-readbackwards'
-         # We need a database
-         'perl-dbd-sqlite' 
+         # for ss in x2gogetfreeport 
+        'iproute'
+         # for x2goshowblocks
+         'lsof'
          # For killall in x2gosuspend-session
          'psmisc'
-         # For x2goshowblocks
-         'lsof'
          # For x2godbadmin
          'pwgen' # in community
          # For printing, file-sharing
          'sshfs'
-         # For /etc/sudoers.d
+	 # for /etc/sudoers.d
          'sudo'
-         'nxagent'
+         '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 post install actions
+
+         # 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
@@ -53,23 +60,21 @@
          'perl-file-which' # FS#44125
          'perl-switch'
          'perl-try-tiny' # FS#58226
+ #        'perl-file-readbackwards' ?
 
-         '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')
+#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')
+#conflicts=('x2go-agent')
+#replaces=('x2go-agent')
+#provides=('x2go-agent' 'x2goagent')
 options=('emptydirs')
 install=x2goserver.install
 backup=('etc/x2go/x2goserver.conf'
@@ -140,5 +145,8 @@
   
   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
 }