Re: [PR PATCH] [Updated] x2goserver and nx-libs fixed

[eoli3n <eoli3n@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 350 bytes --]

There is an updated pull request by eoli3n against master on the void-packages repository

https://github.com/eoli3n/void-packages x2goserver
https://github.com/void-linux/void-packages/pull/30805

x2goserver and nx-libs fixed
Fixes #30781 :partying_face: 


A patch file from https://github.com/void-linux/void-packages/pull/30805.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-x2goserver-30805.patch --]
[-- Type: text/x-diff, Size: 9846 bytes --]

From dfb7d1fe58d157bf28e257db37b283b1376ae27e Mon Sep 17 00:00:00 2001
From: eoli3n <jonathan.kirszling@runbox.com>
Date: Mon, 10 May 2021 21:27:15 +0200
Subject: [PATCH 1/4] x2goserver: fix non working package

---
 srcpkgs/x2goserver/INSTALL                    |  6 ++
 .../x2goserver/files/x2gocleansessions/run    |  2 +
 .../patches/x2gocleansessions-nofork.patch    | 71 +++++++++++++++++++
 srcpkgs/x2goserver/template                   | 23 +++---
 4 files changed, 90 insertions(+), 12 deletions(-)
 create mode 100644 srcpkgs/x2goserver/INSTALL
 create mode 100755 srcpkgs/x2goserver/files/x2gocleansessions/run
 create mode 100644 srcpkgs/x2goserver/patches/x2gocleansessions-nofork.patch

diff --git a/srcpkgs/x2goserver/INSTALL b/srcpkgs/x2goserver/INSTALL
new file mode 100644
index 000000000000..31ae1da07f7f
--- /dev/null
+++ b/srcpkgs/x2goserver/INSTALL
@@ -0,0 +1,6 @@
+case "${ACTION}" in
+post)
+	chgrp x2gouser usr/lib/x2go/libx2go-server-db-sqlite3-wrapper
+	chmod g+s usr/lib/x2go/libx2go-server-db-sqlite3-wrapper
+	;;
+esac
diff --git a/srcpkgs/x2goserver/files/x2gocleansessions/run b/srcpkgs/x2goserver/files/x2gocleansessions/run
new file mode 100755
index 000000000000..f40d8b1f2b35
--- /dev/null
+++ b/srcpkgs/x2goserver/files/x2gocleansessions/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec /usr/bin/x2gocleansessions --nofork
diff --git a/srcpkgs/x2goserver/patches/x2gocleansessions-nofork.patch b/srcpkgs/x2goserver/patches/x2gocleansessions-nofork.patch
new file mode 100644
index 000000000000..cd3af1a7193f
--- /dev/null
+++ b/srcpkgs/x2goserver/patches/x2gocleansessions-nofork.patch
@@ -0,0 +1,71 @@
+diff --git a/x2goserver/sbin/x2gocleansessions b/x2goserver/sbin/x2gocleansessions
+index e78f677..8e2ba43 100755
+--- a/x2goserver/sbin/x2gocleansessions
++++ b/x2goserver/sbin/x2gocleansessions
+@@ -40,15 +40,17 @@ use Pod::Usage;
+ Getopt::Long::Configure("gnu_getopt", "no_auto_abbrev");
+ 
+ my $debug = 0;
++my $nofork = 0;
+ my $help = 0;
+ my $man = 0;
+-GetOptions('debug|d' => \$debug, 'help|?|h' => \$help, 'man' => \$man) or pod2usage(2);
++GetOptions('debug|d' => \$debug, 'nofork|n' => \$nofork, 'help|?|h' => \$help, 'man' => \$man) or pod2usage(2);
+ pod2usage(1) if $help;
+ pod2usage(-verbose => 2, -exitval => 0) if $man;
+ 
+ openlog($0,'cons,pid','user');
+ if ($debug)
+ {
++	$nofork = 1;
+ 	setlogmask( LOG_UPTO (LOG_DEBUG) );
+ }
+ else
+@@ -99,12 +101,12 @@ my $uname;
+ my $serv = hostname;
+ my $pid;
+ 
+-if (! $debug)
++if (! $nofork)
+ {
+ 	$pid = fork();
+ }
+ 
+-if ((!$debug) && (not defined $pid))
++if ((!$nofork) && (not defined $pid))
+ {
+ 	print "resources not avilable.\n";
+ }
+@@ -128,7 +130,7 @@ elsif ($pid == 0 )
+ 	my $superenice_idle=$Config->param("superenicer.idle-nice-level");
+ 	my $superenice_ignoredusers=$Config->param("superenicer.ignored-users");
+ 
+-	if ( ! $debug )
++	if ( ! $nofork )
+ 	{
+ 		# close any open file descriptor left open by our parent before the fork
+ 		my $fd;
+@@ -377,7 +379,8 @@ x2gocleansessions [options]
+   Options:
+     --help|-h|-?            brief help message
+     --man                   full documentation
+-    --debug|-d              enable debugging and don't daemonize
++    --debug|-d              enable debugging; implies --nofork
++    --nofork|-n             don't daemonize
+ 
+ =head1 OPTIONS
+ 
+@@ -393,8 +396,11 @@ Prints the manual page and exits.
+ 
+ =item B<--debug>|B<-d>
+ 
+-Override debugging setting in global config and keep application in foreground
+-instead of daemonizing.
++Override debugging setting in global config; implies B<--nofork>.
++
++=item B<--nofork>|B<-n>
++
++Keep application in foreground instead of daemonizing.
+ 
+ =back
+ 
diff --git a/srcpkgs/x2goserver/template b/srcpkgs/x2goserver/template
index 158130a96717..b9e376ab4eaa 100644
--- a/srcpkgs/x2goserver/template
+++ b/srcpkgs/x2goserver/template
@@ -1,13 +1,17 @@
 # Template file for 'x2goserver'
 pkgname=x2goserver
 version=4.1.0.3
-revision=1
+revision=2
 build_style=gnu-makefile
-hostmakedepends="pkg-config perl"
+make_install_args="SBINDIR=/usr/bin"
+make_build_args="PREFIX=/usr"
+hostmakedepends="pkg-config perl which"
 makedepends="libssh2-devel"
-depends="perl perl-Config-Simple perl-DBI perl-Capture-Tiny perl-DBD-SQLite bash iproute2 makepasswd openssh lsof xauth perl-File-BaseDir nx-libs perl-File-Which"
+depends="bash iproute2 openssh lsof xauth xhost xwininfo psmisc xkeyboard-config
+ perl-Config-Simple perl-DBI perl-Capture-Tiny perl-DBD-SQLite perl-File-BaseDir
+ perl-File-Which perl-Try-Tiny perl-Switch nx-libs"
 short_desc="Open source graphical Remote Desktop based on NX technology"
-maintainer="eoli3n <jkirsz@gmail.com>"
+maintainer="eoli3n <jonathan.kirszling@runbox.com>"
 license="GPL-2.0-or-later"
 homepage="http://www.x2go.org"
 distfiles="http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${version}.tar.gz"
@@ -16,13 +20,8 @@ system_groups="x2gouser"
 system_accounts="x2gouser"
 x2gouser_homedir="/var/lib/x2go"
 x2gouser_shell="/bin/false"
+patch_args="-Np1"
 
-post_extract() {
-	# Replace hard-coded /usr/sbin
-	for _file in x2goserver-printing/Makefile x2goserver/Makefile x2goserver-xsession/Makefile libx2go-server-db-perl/Makefile x2goserver-common/Makefile; do
-		vsed -e 's,/sbin,/bin,g' -i "$_file"
-	done
-	for _file in bin/x2golistdesktops bin/x2goresume-session bin/x2gostartagent sbin/x2gocleansessions; do
-		vsed -e 's,/usr/sbin,/usr/bin,g' -i x2goserver/"$_file"
-	done
+post_install() {
+	vsv x2gocleansessions
 }

From 39875acabf9c694db657bfc2eb86dd01d30f4d82 Mon Sep 17 00:00:00 2001
From: eoli3n <jonathan.kirszling@runbox.com>
Date: Mon, 10 May 2021 23:45:00 +0200
Subject: [PATCH 2/4] New Package: perl-Switch-2.17

---
 srcpkgs/perl-Switch/template | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 srcpkgs/perl-Switch/template

diff --git a/srcpkgs/perl-Switch/template b/srcpkgs/perl-Switch/template
new file mode 100644
index 000000000000..36bac68a661d
--- /dev/null
+++ b/srcpkgs/perl-Switch/template
@@ -0,0 +1,15 @@
+# Template file for 'perl-Switch'
+pkgname=perl-Switch
+version=2.17
+revision=1
+wrksrc="Switch-${version}"
+build_style=perl-module
+hostmakedepends="pkg-config perl"
+makedepends="perl"
+depends="perl"
+short_desc="Switch statement for Perl"
+maintainer="eoli3n <jonathan.kirszling@runbox.com>"
+license="Artistic-1.0-Perl, GPL-1.0-or-later"
+homepage="https://metacpan.org/pod/Switch"
+distfiles="${CPAN_SITE}/File/CHORNY/Switch-${version}.tar.gz"
+checksum=31354975140fe6235ac130a109496491ad33dd42f9c62189e23f49f75f936d75

From 2e8c1b4fd6151ab8be468f2767b106d7db3a4949 Mon Sep 17 00:00:00 2001
From: eoli3n <jonathan.kirszling@runbox.com>
Date: Tue, 11 May 2021 14:51:09 +0200
Subject: [PATCH 3/4] nx-libs: fix nxagent

---
 srcpkgs/nx-libs-devel    |  1 +
 srcpkgs/nx-libs/template | 13 ++++++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)
 create mode 120000 srcpkgs/nx-libs-devel

diff --git a/srcpkgs/nx-libs-devel b/srcpkgs/nx-libs-devel
new file mode 120000
index 000000000000..3aefdeffb22b
--- /dev/null
+++ b/srcpkgs/nx-libs-devel
@@ -0,0 +1 @@
+nx-libs
\ No newline at end of file
diff --git a/srcpkgs/nx-libs/template b/srcpkgs/nx-libs/template
index e0b01308bc97..eb9d2e05e5c5 100644
--- a/srcpkgs/nx-libs/template
+++ b/srcpkgs/nx-libs/template
@@ -1,9 +1,12 @@
 # Template file for 'nx-libs'
 pkgname=nx-libs
 version=3.5.99.26
-revision=1
+revision=2
 build_style=gnu-configure
-make_build_args="CONFIGURE=echo IMAKE_DEFINES=-DUseTIRPC=YES"
+# The rpath for nxagent is USRLIBDIRPATH, which must be where this package
+# provides a symlink to the custom libX11 with NX features
+make_build_args='CONFIGURE=echo IMAKE_DEFINES=-DUseTIRPC=YES
+ USRLIBDIRPATH=\$$ORIGIN/../lib/nx/X11'
 make_install_args="PREFIX=/usr"
 hostmakedepends="autoconf automake libtool pkg-config which imake xkbcomp gccmakedep"
 makedepends="xorgproto zlib-devel libjpeg-turbo-devel libpng-devel
@@ -11,10 +14,10 @@ makedepends="xorgproto zlib-devel libjpeg-turbo-devel libpng-devel
  libXfont2-devel libxml2-devel libXcomposite-devel libXinerama-devel
  libtirpc-devel libXpm-devel font-util xkbcomp"
 short_desc="NX X11 protocol compression libraries"
-maintainer="eoli3n <jkirsz@gmail.com>"
+maintainer="eoli3n <jonathan.kirszling@runbox.com>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/ArcticaProject/nx-libs"
-distfiles="https://github.com/ArcticaProject/nx-libs/archive/$version/$pkgname-$version.tar.gz"
+distfiles="${homepage}/archive/$version/$pkgname-$version.tar.gz"
 checksum=3ce7ca4e6b57b3a2d7588b2d0f4009036d2566a8925ca2c62f08a8dc0df50357
 python_version=3
 nocross="imake attempts to run target executables on host"
@@ -50,7 +53,7 @@ post_install() {
 	rm -rf ${DESTDIR}/usr/include/GL
 }
 
-nx-libs-devel_install() {
+nx-libs-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {

From b616d3253021470ffa4f2a72ac8d3ec17c736ca4 Mon Sep 17 00:00:00 2001
From: eoli3n <jonathan.kirszling@runbox.com>
Date: Tue, 11 May 2021 14:51:33 +0200
Subject: [PATCH 4/4] x2goclient: updated maintainer email address

---
 srcpkgs/x2goclient/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/x2goclient/template b/srcpkgs/x2goclient/template
index 76dbc1e2f258..d0bcfecc0ad8 100644
--- a/srcpkgs/x2goclient/template
+++ b/srcpkgs/x2goclient/template
@@ -13,7 +13,7 @@ makedepends="qt5-svg-devel qt5-x11extras-devel libldap-devel
  libssh-devel libXpm-devel cups-devel"
 depends="nx-libs"
 short_desc="Graphical Qt5 client for X2Go"
-maintainer="eoli3n <jkirsz@gmail.com>"
+maintainer="eoli3n <jonathan.kirszling@runbox.com>"
 license="GPL-2.0-or-later"
 homepage="http://www.x2go.org"
 distfiles="http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${version}.tar.gz"