Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] x2goserver and nx-libs fixed
@ 2021-05-11 18:54 eoli3n
  2021-05-11 18:59 ` eoli3n
                   ` (51 more replies)
  0 siblings, 52 replies; 53+ messages in thread
From: eoli3n @ 2021-05-11 18:54 UTC (permalink / raw)
  To: ml

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

There is a new 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: 7889 bytes --]

From 6290879ceb9a0c1f575baaa8719928930c5355f4 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  |  7 +++++++
 srcpkgs/x2goserver/template | 22 +++++++++++-----------
 2 files changed, 18 insertions(+), 11 deletions(-)
 create mode 100644 srcpkgs/x2goserver/INSTALL

diff --git a/srcpkgs/x2goserver/INSTALL b/srcpkgs/x2goserver/INSTALL
new file mode 100644
index 000000000000..8a14ce3c7a4e
--- /dev/null
+++ b/srcpkgs/x2goserver/INSTALL
@@ -0,0 +1,7 @@
+case "${ACTION}" in
+post)
+    chown root:x2gouser usr/lib/x2go/libx2go-server-db-sqlite3-wrapper
+    chmod 2755 usr/lib/x2go/libx2go-server-db-sqlite3-wrapper
+    chown 0440 etc/sudoers.d/x2goserver
+	;;
+esac
diff --git a/srcpkgs/x2goserver/template b/srcpkgs/x2goserver/template
index 158130a96717..0193238bfa61 100644
--- a/srcpkgs/x2goserver/template
+++ b/srcpkgs/x2goserver/template
@@ -1,28 +1,28 @@
 # Template file for 'x2goserver'
 pkgname=x2goserver
 version=4.1.0.3
-revision=1
+revision=2
 build_style=gnu-makefile
-hostmakedepends="pkg-config perl"
+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 pwgen psmisc xkeyboard-config perl 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"
 checksum=6776aaa354f5a44e349f0b3c176d4988c88a618c2edf46c98a37ae89c069dcd0
 system_groups="x2gouser"
-system_accounts="x2gouser"
 x2gouser_homedir="/var/lib/x2go"
 x2gouser_shell="/bin/false"
 
-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"
+post_patch() {
+    # Replace hard-coded /usr/local
+	for _file in Makefile x2goserver-desktopsharing/Makefile x2goserver-desktopsharing/bin/x2goterminate-desktopsharing libx2go-server-db-perl/Makefile x2goserver-fmbindings/Makefile x2goserver-xsession/Makefile x2goserver-x2goagent/Makefile x2goserver-common/Makefile x2goserver/Makefile x2goserver-extensions/Makefile x2goserver-printing/Makefile x2goserver/man/man8/x2gobasepath.8 x2goserver/man/man8/x2gopath.8; do
+		vsed -e 's,/usr/local,/usr,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"
+	# Replace hard-coded /sbin and /usr/sbin
+	for _file in x2goserver-printing/Makefile x2goserver/Makefile x2goserver-xsession/Makefile libx2go-server-db-perl/Makefile x2goserver-common/Makefile x2goserver-desktopsharing/bin/x2goterminate-desktopsharing x2goserver/bin/x2golistdesktops x2goserver/bin/x2goresume-session x2goserver/bin/x2gostartagent x2goserver/sbin/x2gocleansessions; do
+		vsed -e 's,/sbin,/bin,g' -i "$_file"
 	done
 }

From cf5a85cd8173720a79af9f624cceede413a9822d 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..10e2636eab0c
--- /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>=5.5"
+short_desc="A switch statement for Perl, do not use if you can use given/when"
+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 a69aec9b23c3a2c6dd4cfb6bded6f0f8ecc3774c 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 8c9303b81e95162d9fc57b1053cf25176a8305dd 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"

^ permalink raw reply	[flat|nested] 53+ messages in thread

* Re: x2goserver and nx-libs fixed
  2021-05-11 18:54 [PR PATCH] x2goserver and nx-libs fixed eoli3n
@ 2021-05-11 18:59 ` eoli3n
  2021-05-11 19:01 ` eoli3n
                   ` (50 subsequent siblings)
  51 siblings, 0 replies; 53+ messages in thread
From: eoli3n @ 2021-05-11 18:59 UTC (permalink / raw)
  To: ml

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

New comment by eoli3n on void-packages repository

https://github.com/void-linux/void-packages/pull/30805#issuecomment-839005162

Comment:
It misses the runit service.
I submitted a bug report to submit@bugs.x2go.org about forking problem for x2gocleansessions.
https://bugs.x2go.org/cgi-bin/bugreport.cgi?bug=1545

^ permalink raw reply	[flat|nested] 53+ messages in thread

* Re: x2goserver and nx-libs fixed
  2021-05-11 18:54 [PR PATCH] x2goserver and nx-libs fixed eoli3n
  2021-05-11 18:59 ` eoli3n
@ 2021-05-11 19:01 ` eoli3n
  2021-05-11 19:14 ` [PR PATCH] [Updated] " eoli3n
                   ` (49 subsequent siblings)
  51 siblings, 0 replies; 53+ messages in thread
From: eoli3n @ 2021-05-11 19:01 UTC (permalink / raw)
  To: ml

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

New comment by eoli3n on void-packages repository

https://github.com/void-linux/void-packages/pull/30805#issuecomment-839005162

Comment:
It misses the runit service.
I submitted a bug report to submit@bugs.x2go.org about forking problem for x2gocleansessions.
https://bugs.x2go.org/cgi-bin/bugreport.cgi?bug=1545

@ahesford suggested to use proper patches instead of vsed in x2goserver template. It will wait for revision 3, i'm done for now.

^ permalink raw reply	[flat|nested] 53+ messages in thread

* Re: [PR PATCH] [Updated] x2goserver and nx-libs fixed
  2021-05-11 18:54 [PR PATCH] x2goserver and nx-libs fixed eoli3n
  2021-05-11 18:59 ` eoli3n
  2021-05-11 19:01 ` eoli3n
@ 2021-05-11 19:14 ` eoli3n
  2021-05-11 19:52 ` [PR REVIEW] " ahesford
                   ` (48 subsequent siblings)
  51 siblings, 0 replies; 53+ messages in thread
From: eoli3n @ 2021-05-11 19:14 UTC (permalink / raw)
  To: ml

[-- 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: 8079 bytes --]

From 93823098176e6d359f76ee7d00adef2d407caf18 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  |  7 ++++++
 srcpkgs/x2goserver/template | 47 ++++++++++++++++++++++++++++---------
 2 files changed, 43 insertions(+), 11 deletions(-)
 create mode 100644 srcpkgs/x2goserver/INSTALL

diff --git a/srcpkgs/x2goserver/INSTALL b/srcpkgs/x2goserver/INSTALL
new file mode 100644
index 000000000000..8a14ce3c7a4e
--- /dev/null
+++ b/srcpkgs/x2goserver/INSTALL
@@ -0,0 +1,7 @@
+case "${ACTION}" in
+post)
+    chown root:x2gouser usr/lib/x2go/libx2go-server-db-sqlite3-wrapper
+    chmod 2755 usr/lib/x2go/libx2go-server-db-sqlite3-wrapper
+    chown 0440 etc/sudoers.d/x2goserver
+	;;
+esac
diff --git a/srcpkgs/x2goserver/template b/srcpkgs/x2goserver/template
index 158130a96717..5ff20c99e089 100644
--- a/srcpkgs/x2goserver/template
+++ b/srcpkgs/x2goserver/template
@@ -1,28 +1,53 @@
 # Template file for 'x2goserver'
 pkgname=x2goserver
 version=4.1.0.3
-revision=1
+revision=2
 build_style=gnu-makefile
-hostmakedepends="pkg-config perl"
+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 pwgen psmisc xkeyboard-config
+ perl 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"
 checksum=6776aaa354f5a44e349f0b3c176d4988c88a618c2edf46c98a37ae89c069dcd0
 system_groups="x2gouser"
-system_accounts="x2gouser"
 x2gouser_homedir="/var/lib/x2go"
 x2gouser_shell="/bin/false"
 
-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"
+post_patch() {
+    # Replace hard-coded /usr/local
+	for _file in \
+	  	Makefile \
+	  	x2goserver-desktopsharing/Makefile \
+	  	x2goserver-desktopsharing/bin/x2goterminate-desktopsharing \
+	  	libx2go-server-db-perl/Makefile \
+	  	x2goserver-fmbindings/Makefile \
+	  	x2goserver-xsession/Makefile \
+	  	x2goserver-x2goagent/Makefile \
+	  	x2goserver-common/Makefile \
+	  	x2goserver/Makefile \
+	  	x2goserver-extensions/Makefile \
+	  	x2goserver-printing/Makefile \
+	  	x2goserver/man/man8/x2gobasepath.8 \
+	  	x2goserver/man/man8/x2gopath.8; do
+	    vsed -e 's,/usr/local,/usr,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"
+	# Replace hard-coded /sbin and /usr/sbin
+	for _file in \
+	    x2goserver-printing/Makefile \
+	    x2goserver/Makefile \
+	    x2goserver-xsession/Makefile \
+	    libx2go-server-db-perl/Makefile \
+	    x2goserver-common/Makefile \
+	    x2goserver-desktopsharing/bin/x2goterminate-desktopsharing \
+	    x2goserver/bin/x2golistdesktops \
+	    x2goserver/bin/x2goresume-session \
+	    x2goserver/bin/x2gostartagent \
+	    x2goserver/sbin/x2gocleansessions; do
+		vsed -e 's,/sbin,/bin,g' -i "$_file"
 	done
 }

From 6b13feccfd627b3d032abab5dd61420cd4f07c80 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..ed215f3e1304
--- /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>=5.5"
+short_desc="Switch statement for Perl, do not use if you can use given/when"
+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 7aa71f39e9acd2afcf482ee0146d2b1026d9ac84 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 254626cc736477dbad2b1931970b622f38fda7c3 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"

^ permalink raw reply	[flat|nested] 53+ messages in thread

* Re: [PR REVIEW] x2goserver and nx-libs fixed
  2021-05-11 18:54 [PR PATCH] x2goserver and nx-libs fixed eoli3n
                   ` (2 preceding siblings ...)
  2021-05-11 19:14 ` [PR PATCH] [Updated] " eoli3n
@ 2021-05-11 19:52 ` ahesford
  2021-05-11 19:52 ` ahesford
                   ` (47 subsequent siblings)
  51 siblings, 0 replies; 53+ messages in thread
From: ahesford @ 2021-05-11 19:52 UTC (permalink / raw)
  To: ml

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

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/30805#discussion_r630454549

Comment:
Just "Switch statement for Perl". Advice against it in favor of `given` and `when` does not apply to Perl 5.

^ permalink raw reply	[flat|nested] 53+ messages in thread

* Re: [PR REVIEW] x2goserver and nx-libs fixed
  2021-05-11 18:54 [PR PATCH] x2goserver and nx-libs fixed eoli3n
                   ` (3 preceding siblings ...)
  2021-05-11 19:52 ` [PR REVIEW] " ahesford
@ 2021-05-11 19:52 ` ahesford
  2021-05-11 19:52 ` ahesford
                   ` (46 subsequent siblings)
  51 siblings, 0 replies; 53+ messages in thread
From: ahesford @ 2021-05-11 19:52 UTC (permalink / raw)
  To: ml

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

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/30805#discussion_r630460308

Comment:
No need to include `perl`, it is pulled in by all of the other `perl-*` dependencies.

^ permalink raw reply	[flat|nested] 53+ messages in thread

* Re: [PR REVIEW] x2goserver and nx-libs fixed
  2021-05-11 18:54 [PR PATCH] x2goserver and nx-libs fixed eoli3n
                   ` (4 preceding siblings ...)
  2021-05-11 19:52 ` ahesford
@ 2021-05-11 19:52 ` ahesford
  2021-05-11 19:52 ` ahesford
                   ` (45 subsequent siblings)
  51 siblings, 0 replies; 53+ messages in thread
From: ahesford @ 2021-05-11 19:52 UTC (permalink / raw)
  To: ml

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

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/30805#discussion_r630454678

Comment:
No need for version qualifiers here.

^ permalink raw reply	[flat|nested] 53+ messages in thread

* Re: [PR REVIEW] x2goserver and nx-libs fixed
  2021-05-11 18:54 [PR PATCH] x2goserver and nx-libs fixed eoli3n
                   ` (6 preceding siblings ...)
  2021-05-11 19:52 ` ahesford
@ 2021-05-11 19:52 ` ahesford
  2021-05-11 19:52 ` ahesford
                   ` (43 subsequent siblings)
  51 siblings, 0 replies; 53+ messages in thread
From: ahesford @ 2021-05-11 19:52 UTC (permalink / raw)
  To: ml

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

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/30805#discussion_r630459239

Comment:
I think you meant for the second one to be `chmod`, but drop both of these lines. XBPS preserves permissions and you don't have to keep restoring them. The `chgrp` line is necessary because XBPS will not preserve the group ownership.

^ permalink raw reply	[flat|nested] 53+ messages in thread

* Re: [PR REVIEW] x2goserver and nx-libs fixed
  2021-05-11 18:54 [PR PATCH] x2goserver and nx-libs fixed eoli3n
                   ` (5 preceding siblings ...)
  2021-05-11 19:52 ` ahesford
@ 2021-05-11 19:52 ` ahesford
  2021-05-11 19:52 ` ahesford
                   ` (44 subsequent siblings)
  51 siblings, 0 replies; 53+ messages in thread
From: ahesford @ 2021-05-11 19:52 UTC (permalink / raw)
  To: ml

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

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/30805#discussion_r630457407

Comment:
Maybe just `chgrp x2gouser`, no need to overwrite the owner.

^ permalink raw reply	[flat|nested] 53+ messages in thread

* Re: [PR REVIEW] x2goserver and nx-libs fixed
  2021-05-11 18:54 [PR PATCH] x2goserver and nx-libs fixed eoli3n
                   ` (7 preceding siblings ...)
  2021-05-11 19:52 ` ahesford
@ 2021-05-11 19:52 ` ahesford
  2021-05-11 19:52 ` ahesford
                   ` (42 subsequent siblings)
  51 siblings, 0 replies; 53+ messages in thread
From: ahesford @ 2021-05-11 19:52 UTC (permalink / raw)
  To: ml

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

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/30805#discussion_r630460133

Comment:
I think `pwgen` is only used with Postgres or MySQL database backends, which is not configured by default. Please confirm that this is true and, if so, drop the `pwgen` dependency.

^ permalink raw reply	[flat|nested] 53+ messages in thread

* Re: [PR REVIEW] x2goserver and nx-libs fixed
  2021-05-11 18:54 [PR PATCH] x2goserver and nx-libs fixed eoli3n
                   ` (8 preceding siblings ...)
  2021-05-11 19:52 ` ahesford
@ 2021-05-11 19:52 ` ahesford
  2021-05-11 19:52 ` ahesford
                   ` (41 subsequent siblings)
  51 siblings, 0 replies; 53+ messages in thread
From: ahesford @ 2021-05-11 19:52 UTC (permalink / raw)
  To: ml

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

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/30805#discussion_r630461584

Comment:
After defining the system group, add
```bash
make_dirs="/var/lib/x2go 0770 root x2gouser"
```
to make the directory at package installation time.

^ permalink raw reply	[flat|nested] 53+ messages in thread

* Re: [PR REVIEW] x2goserver and nx-libs fixed
  2021-05-11 18:54 [PR PATCH] x2goserver and nx-libs fixed eoli3n
                   ` (9 preceding siblings ...)
  2021-05-11 19:52 ` ahesford
@ 2021-05-11 19:52 ` ahesford
  2021-05-11 19:52 ` ahesford
                   ` (40 subsequent siblings)
  51 siblings, 0 replies; 53+ messages in thread
From: ahesford @ 2021-05-11 19:52 UTC (permalink / raw)
  To: ml

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

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/30805#discussion_r630472252

Comment:
This whole block can be removed:
1. Patching the Makefiles is probably not necessary, since the only reference is `PREFIX ?= /usr/local`. This is probably only used during install time, and the build style already sets `PREFIX=/usr` for you.
2. If some of the variables (`BINDIR`, `SBINDIR`, `LIBDIR`, `MANDIR` or `SHAREDIR`) in these makefiles are used at build time, then you should just do `make_build_args="PREFIX=/usr"`. Build first without patching or setting this variable and see if any of the products contain references to `/usr/local`. If so, use `make_build_args`.
3. `x2goterminate-desktopsharing` does not need to be patched, since the script uses `type -p` to find `pidof` first, which will do the right thing provided that `pidof` exists.
4. Do not patch the manual pages, they reference possible paths rather than refer incorrectly to `/usr/local`.

^ permalink raw reply	[flat|nested] 53+ messages in thread

* Re: [PR REVIEW] x2goserver and nx-libs fixed
  2021-05-11 18:54 [PR PATCH] x2goserver and nx-libs fixed eoli3n
                   ` (12 preceding siblings ...)
  2021-05-11 19:52 ` ahesford
@ 2021-05-11 19:52 ` ahesford
  2021-05-11 19:58 ` eoli3n
                   ` (37 subsequent siblings)
  51 siblings, 0 replies; 53+ messages in thread
From: ahesford @ 2021-05-11 19:52 UTC (permalink / raw)
  To: ml

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

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/30805#discussion_r630463793

Comment:
Fix indentation in this function. Tabs only, no spaces.

^ permalink raw reply	[flat|nested] 53+ messages in thread

* Re: [PR REVIEW] x2goserver and nx-libs fixed
  2021-05-11 18:54 [PR PATCH] x2goserver and nx-libs fixed eoli3n
                   ` (10 preceding siblings ...)
  2021-05-11 19:52 ` ahesford
@ 2021-05-11 19:52 ` ahesford
  2021-05-11 19:52 ` ahesford
                   ` (39 subsequent siblings)
  51 siblings, 0 replies; 53+ messages in thread
From: ahesford @ 2021-05-11 19:52 UTC (permalink / raw)
  To: ml

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

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/30805#discussion_r630460597

Comment:
If you drop the `x2gouser`, you need to drop these two as well.

^ permalink raw reply	[flat|nested] 53+ messages in thread

* Re: [PR REVIEW] x2goserver and nx-libs fixed
  2021-05-11 18:54 [PR PATCH] x2goserver and nx-libs fixed eoli3n
                   ` (11 preceding siblings ...)
  2021-05-11 19:52 ` ahesford
@ 2021-05-11 19:52 ` ahesford
  2021-05-11 19:52 ` ahesford
                   ` (38 subsequent siblings)
  51 siblings, 0 replies; 53+ messages in thread
From: ahesford @ 2021-05-11 19:52 UTC (permalink / raw)
  To: ml

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

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/30805#discussion_r630481162

Comment:
This whole block can be removed:
1. `x2goterminate-desktopsharing` again only uses `sbin` in its search for `pidof`, which it will find at the top of the `if-else` ladder with `type -p pidof`.
2. Don't patch the makefiles, either set `make_install_args="SBINDIR=/usr/bin"` or, if somehow the `SBINDIR` definition creeps into build products, add it to `make_build_args` instead.
3. The `x2goserver/{bin,sbin}` scripts are only using `sbin` to add to the default `$PATH`, so there is no harm leaving them intact.

^ permalink raw reply	[flat|nested] 53+ messages in thread

* Re: [PR REVIEW] x2goserver and nx-libs fixed
  2021-05-11 18:54 [PR PATCH] x2goserver and nx-libs fixed eoli3n
                   ` (13 preceding siblings ...)
  2021-05-11 19:52 ` ahesford
@ 2021-05-11 19:58 ` eoli3n
  2021-05-11 20:01 ` eoli3n
                   ` (36 subsequent siblings)
  51 siblings, 0 replies; 53+ messages in thread
From: eoli3n @ 2021-05-11 19:58 UTC (permalink / raw)
  To: ml

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

New review comment by eoli3n on void-packages repository

https://github.com/void-linux/void-packages/pull/30805#discussion_r630492630

Comment:
I readded chmod because when i use chown, setgid was dropped

^ permalink raw reply	[flat|nested] 53+ messages in thread

* Re: [PR REVIEW] x2goserver and nx-libs fixed
  2021-05-11 18:54 [PR PATCH] x2goserver and nx-libs fixed eoli3n
                   ` (14 preceding siblings ...)
  2021-05-11 19:58 ` eoli3n
@ 2021-05-11 20:01 ` eoli3n
  2021-05-11 20:09 ` eoli3n
                   ` (35 subsequent siblings)
  51 siblings, 0 replies; 53+ messages in thread
From: eoli3n @ 2021-05-11 20:01 UTC (permalink / raw)
  To: ml

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

New review comment by eoli3n on void-packages repository

https://github.com/void-linux/void-packages/pull/30805#discussion_r630497650

Comment:
Just tried, same with chgrp
```
root@voidlinux /u/l/x2go# chown root:root libx2go-server-db-sqlite3-wrapper
root@voidlinux /u/l/x2go# chmod 2755 libx2go-server-db-sqlite3-wrapper
root@voidlinux /u/l/x2go# ls -altr libx2go-server-db-sqlite3-wrapper
-rwxr-sr-x 1 root root 14304 11 mai   11:46 libx2go-server-db-sqlite3-wrapper
root@voidlinux /u/l/x2go# chgrp x2gouser libx2go-server-db-sqlite3-wrapper
root@voidlinux /u/l/x2go# ls -altr libx2go-server-db-sqlite3-wrapper
-rwxr-xr-x 1 root x2gouser 14304 11 mai   11:46 libx2go-server-db-sqlite3-wrapper
```

^ permalink raw reply	[flat|nested] 53+ messages in thread

* Re: [PR REVIEW] x2goserver and nx-libs fixed
  2021-05-11 18:54 [PR PATCH] x2goserver and nx-libs fixed eoli3n
                   ` (15 preceding siblings ...)
  2021-05-11 20:01 ` eoli3n
@ 2021-05-11 20:09 ` eoli3n
  2021-05-11 20:10 ` ahesford
                   ` (34 subsequent siblings)
  51 siblings, 0 replies; 53+ messages in thread
From: eoli3n @ 2021-05-11 20:09 UTC (permalink / raw)
  To: ml

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

New review comment by eoli3n on void-packages repository

https://github.com/void-linux/void-packages/pull/30805#discussion_r630506871

Comment:
i can't find this in the latest commit, i think i already fixed it, validated with xlint

^ permalink raw reply	[flat|nested] 53+ messages in thread

* Re: [PR REVIEW] x2goserver and nx-libs fixed
  2021-05-11 18:54 [PR PATCH] x2goserver and nx-libs fixed eoli3n
                   ` (16 preceding siblings ...)
  2021-05-11 20:09 ` eoli3n
@ 2021-05-11 20:10 ` ahesford
  2021-05-11 20:18 ` eoli3n
                   ` (33 subsequent siblings)
  51 siblings, 0 replies; 53+ messages in thread
From: ahesford @ 2021-05-11 20:10 UTC (permalink / raw)
  To: ml

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

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/30805#discussion_r630507869

Comment:
Ok, then do
```bash
chgrp x2gouser usr/lib/x2go/libx2go-server-db-sqlite3-wrapper
chmod g+s usr/lib/x2go/libx2go-server-db-sqlite3-wrapper
```
No need to override other permissions the user may change.

^ permalink raw reply	[flat|nested] 53+ messages in thread

* Re: [PR REVIEW] x2goserver and nx-libs fixed
  2021-05-11 18:54 [PR PATCH] x2goserver and nx-libs fixed eoli3n
                   ` (17 preceding siblings ...)
  2021-05-11 20:10 ` ahesford
@ 2021-05-11 20:18 ` eoli3n
  2021-05-11 20:18 ` eoli3n
                   ` (32 subsequent siblings)
  51 siblings, 0 replies; 53+ messages in thread
From: eoli3n @ 2021-05-11 20:18 UTC (permalink / raw)
  To: ml

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

New review comment by eoli3n on void-packages repository

https://github.com/void-linux/void-packages/pull/30805#discussion_r630512267

Comment:
> see if any of the products contain references to /usr/local
how ?

^ permalink raw reply	[flat|nested] 53+ messages in thread

* Re: [PR REVIEW] x2goserver and nx-libs fixed
  2021-05-11 18:54 [PR PATCH] x2goserver and nx-libs fixed eoli3n
                   ` (18 preceding siblings ...)
  2021-05-11 20:18 ` eoli3n
@ 2021-05-11 20:18 ` eoli3n
  2021-05-11 20:41 ` eoli3n
                   ` (31 subsequent siblings)
  51 siblings, 0 replies; 53+ messages in thread
From: eoli3n @ 2021-05-11 20:18 UTC (permalink / raw)
  To: ml

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

New review comment by eoli3n on void-packages repository

https://github.com/void-linux/void-packages/pull/30805#discussion_r630512267

Comment:
> see if any of the products contain references to /usr/local

how ?

^ permalink raw reply	[flat|nested] 53+ messages in thread

* Re: [PR REVIEW] x2goserver and nx-libs fixed
  2021-05-11 18:54 [PR PATCH] x2goserver and nx-libs fixed eoli3n
                   ` (19 preceding siblings ...)
  2021-05-11 20:18 ` eoli3n
@ 2021-05-11 20:41 ` eoli3n
  2021-05-11 21:05 ` eoli3n
                   ` (30 subsequent siblings)
  51 siblings, 0 replies; 53+ messages in thread
From: eoli3n @ 2021-05-11 20:41 UTC (permalink / raw)
  To: ml

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

New review comment by eoli3n on void-packages repository

https://github.com/void-linux/void-packages/pull/30805#discussion_r630526036

Comment:
Only perl and shell scripts in destdir/usr/{bin,lib} with no references to /usr/local when i remove vseds

^ permalink raw reply	[flat|nested] 53+ messages in thread

* Re: [PR REVIEW] x2goserver and nx-libs fixed
  2021-05-11 18:54 [PR PATCH] x2goserver and nx-libs fixed eoli3n
                   ` (20 preceding siblings ...)
  2021-05-11 20:41 ` eoli3n
@ 2021-05-11 21:05 ` eoli3n
  2021-05-11 21:07 ` eoli3n
                   ` (29 subsequent siblings)
  51 siblings, 0 replies; 53+ messages in thread
From: eoli3n @ 2021-05-11 21:05 UTC (permalink / raw)
  To: ml

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

New review comment by eoli3n on void-packages repository

https://github.com/void-linux/void-packages/pull/30805#discussion_r630540213

Comment:
Building/installing then test gives the first error reported
```
/usr/lib/x2go/x2gocheckport: ligne 131: '/usr/local/lib/x2go/libx2go-server-db-sqlite3-wrapper.pl'
```

^ permalink raw reply	[flat|nested] 53+ messages in thread

* Re: [PR REVIEW] x2goserver and nx-libs fixed
  2021-05-11 18:54 [PR PATCH] x2goserver and nx-libs fixed eoli3n
                   ` (21 preceding siblings ...)
  2021-05-11 21:05 ` eoli3n
@ 2021-05-11 21:07 ` eoli3n
  2021-05-11 21:13 ` eoli3n
                   ` (28 subsequent siblings)
  51 siblings, 0 replies; 53+ messages in thread
From: eoli3n @ 2021-05-11 21:07 UTC (permalink / raw)
  To: ml

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

New review comment by eoli3n on void-packages repository

https://github.com/void-linux/void-packages/pull/30805#discussion_r630541369

Comment:
```
➜ grep -ari '/usr/local' /usr/lib/x2go/
/usr/lib/x2go/libx2go-server-db-sqlite3-wrapper: @
H=<.DH=.H.H9tH^.HtTL:H  H=y.H5r.H)HH?HHHtH5.HfD=Q.u/UH=.HtHt5z/%|/@%z/h%r/h%j/h%b/h%Z/h%r/fHqUH=Hu]~H
                                                          H=.h).]{f.AWL=o+AVIAUIATAUH-`+SL)HtLLDAHH9u[]A\A]A^A_libx2go-server-db-sqlite3-wrapper.pl/usr/local/lib/x2go/libx2go-server-db-sqlite3-wrapper.plunable to execute script '': ;X0zRH+zR`FJ
            ?;*3$"D\8HT

```

^ permalink raw reply	[flat|nested] 53+ messages in thread

* Re: [PR REVIEW] x2goserver and nx-libs fixed
  2021-05-11 18:54 [PR PATCH] x2goserver and nx-libs fixed eoli3n
                   ` (22 preceding siblings ...)
  2021-05-11 21:07 ` eoli3n
@ 2021-05-11 21:13 ` eoli3n
  2021-05-11 21:41 ` ahesford
                   ` (27 subsequent siblings)
  51 siblings, 0 replies; 53+ messages in thread
From: eoli3n @ 2021-05-11 21:13 UTC (permalink / raw)
  To: ml

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

New review comment by eoli3n on void-packages repository

https://github.com/void-linux/void-packages/pull/30805#discussion_r630544810

Comment:
I think pwgen is used for both mysql and postgres
```
➜ grep -B2 pwgen ./x2goserver/sbin/x2godbadmin 
	my $dbadmin=$Config->param("postgres.dbadmin");
	my $x2goadmin="x2godbuser";
	my $x2goadminpass=`pwgen -s -c -n 32 1`;
--
	my $dbadmin=$Config->param("mysql.dbadmin");
	my $x2goadmin="x2godbuser";
	my $x2goadminpass=`pwgen 8 1`;
```

^ permalink raw reply	[flat|nested] 53+ messages in thread

* Re: [PR REVIEW] x2goserver and nx-libs fixed
  2021-05-11 18:54 [PR PATCH] x2goserver and nx-libs fixed eoli3n
                   ` (23 preceding siblings ...)
  2021-05-11 21:13 ` eoli3n
@ 2021-05-11 21:41 ` ahesford
  2021-05-11 21:41 ` eoli3n
                   ` (26 subsequent siblings)
  51 siblings, 0 replies; 53+ messages in thread
From: ahesford @ 2021-05-11 21:41 UTC (permalink / raw)
  To: ml

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

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/30805#discussion_r630559282

Comment:
Right, but this is atypical usage, so `pwgen` should only be installed by those who want it. Because XBPS doesn't provide for optional dependencies, it should be left out here.

^ permalink raw reply	[flat|nested] 53+ messages in thread

* Re: [PR REVIEW] x2goserver and nx-libs fixed
  2021-05-11 18:54 [PR PATCH] x2goserver and nx-libs fixed eoli3n
                   ` (24 preceding siblings ...)
  2021-05-11 21:41 ` ahesford
@ 2021-05-11 21:41 ` eoli3n
  2021-05-11 21:42 ` eoli3n
                   ` (25 subsequent siblings)
  51 siblings, 0 replies; 53+ messages in thread
From: eoli3n @ 2021-05-11 21:41 UTC (permalink / raw)
  To: ml

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

New review comment by eoli3n on void-packages repository

https://github.com/void-linux/void-packages/pull/30805#discussion_r630559531

Comment:
Adding ``make_build_args="PREFIX=/usr".`` doesn't solve it.

^ permalink raw reply	[flat|nested] 53+ messages in thread

* Re: [PR REVIEW] x2goserver and nx-libs fixed
  2021-05-11 18:54 [PR PATCH] x2goserver and nx-libs fixed eoli3n
                   ` (25 preceding siblings ...)
  2021-05-11 21:41 ` eoli3n
@ 2021-05-11 21:42 ` eoli3n
  2021-05-11 21:42 ` ahesford
                   ` (24 subsequent siblings)
  51 siblings, 0 replies; 53+ messages in thread
From: eoli3n @ 2021-05-11 21:42 UTC (permalink / raw)
  To: ml

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

New review comment by eoli3n on void-packages repository

https://github.com/void-linux/void-packages/pull/30805#discussion_r630559846

Comment:
Ok

^ permalink raw reply	[flat|nested] 53+ messages in thread

* Re: [PR REVIEW] x2goserver and nx-libs fixed
  2021-05-11 18:54 [PR PATCH] x2goserver and nx-libs fixed eoli3n
                   ` (26 preceding siblings ...)
  2021-05-11 21:42 ` eoli3n
@ 2021-05-11 21:42 ` ahesford
  2021-05-11 21:44 ` eoli3n
                   ` (23 subsequent siblings)
  51 siblings, 0 replies; 53+ messages in thread
From: ahesford @ 2021-05-11 21:42 UTC (permalink / raw)
  To: ml

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

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/30805#discussion_r630560216

Comment:
Ok, try rebuilding with `make_build_args="PREFIX=/usr"` to see if that fixes the problem. 

^ permalink raw reply	[flat|nested] 53+ messages in thread

* Re: [PR REVIEW] x2goserver and nx-libs fixed
  2021-05-11 18:54 [PR PATCH] x2goserver and nx-libs fixed eoli3n
                   ` (27 preceding siblings ...)
  2021-05-11 21:42 ` ahesford
@ 2021-05-11 21:44 ` eoli3n
  2021-05-11 21:45 ` eoli3n
                   ` (22 subsequent siblings)
  51 siblings, 0 replies; 53+ messages in thread
From: eoli3n @ 2021-05-11 21:44 UTC (permalink / raw)
  To: ml

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

New review comment by eoli3n on void-packages repository

https://github.com/void-linux/void-packages/pull/30805#discussion_r630561078

Comment:
Check the previous comment

^ permalink raw reply	[flat|nested] 53+ messages in thread

* Re: [PR REVIEW] x2goserver and nx-libs fixed
  2021-05-11 18:54 [PR PATCH] x2goserver and nx-libs fixed eoli3n
                   ` (28 preceding siblings ...)
  2021-05-11 21:44 ` eoli3n
@ 2021-05-11 21:45 ` eoli3n
  2021-05-11 22:15 ` [PR PATCH] [Updated] " eoli3n
                   ` (21 subsequent siblings)
  51 siblings, 0 replies; 53+ messages in thread
From: eoli3n @ 2021-05-11 21:45 UTC (permalink / raw)
  To: ml

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

New review comment by eoli3n on void-packages repository

https://github.com/void-linux/void-packages/pull/30805#discussion_r630561078

Comment:
Check the previous comment.
I'm trying to rebuild with the whole vsed to be sure that the error comes from this.

^ permalink raw reply	[flat|nested] 53+ messages in thread

* Re: [PR PATCH] [Updated] x2goserver and nx-libs fixed
  2021-05-11 18:54 [PR PATCH] x2goserver and nx-libs fixed eoli3n
                   ` (29 preceding siblings ...)
  2021-05-11 21:45 ` eoli3n
@ 2021-05-11 22:15 ` eoli3n
  2021-05-11 22:16 ` [PR REVIEW] " eoli3n
                   ` (20 subsequent siblings)
  51 siblings, 0 replies; 53+ messages in thread
From: eoli3n @ 2021-05-11 22:15 UTC (permalink / raw)
  To: ml

[-- 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: 7570 bytes --]

From 0d59862fe89e79b918b33babf3b6da7cdeef3de7 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 ++++++
 srcpkgs/x2goserver/template | 43 +++++++++++++++++++++++--------------
 2 files changed, 33 insertions(+), 16 deletions(-)
 create mode 100644 srcpkgs/x2goserver/INSTALL

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/template b/srcpkgs/x2goserver/template
index 158130a96717..819a2326325b 100644
--- a/srcpkgs/x2goserver/template
+++ b/srcpkgs/x2goserver/template
@@ -1,28 +1,39 @@
 # Template file for 'x2goserver'
 pkgname=x2goserver
 version=4.1.0.3
-revision=1
+revision=2
 build_style=gnu-makefile
-hostmakedepends="pkg-config perl"
+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"
+make_install_args="SBINDIR=/usr/bin"
+make_build_args="PREFIX=/usr"
+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"
 checksum=6776aaa354f5a44e349f0b3c176d4988c88a618c2edf46c98a37ae89c069dcd0
 system_groups="x2gouser"
-system_accounts="x2gouser"
-x2gouser_homedir="/var/lib/x2go"
-x2gouser_shell="/bin/false"
+make_dirs="/var/lib/x2go 0770 root x2gouser"
 
-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_patch() {
+#	for _file in \
+#	  	Makefile \
+#	  	x2goserver-desktopsharing/Makefile \
+#	  	x2goserver-desktopsharing/bin/x2goterminate-desktopsharing \
+#	  	libx2go-server-db-perl/Makefile \
+#	  	x2goserver-fmbindings/Makefile \
+#	  	x2goserver-xsession/Makefile \
+#	  	x2goserver-x2goagent/Makefile \
+#	  	x2goserver-common/Makefile \
+#	  	x2goserver/Makefile \
+#	  	x2goserver-extensions/Makefile \
+#	  	x2goserver-printing/Makefile \
+#	  	x2goserver/man/man8/x2gobasepath.8 \
+#	  	x2goserver/man/man8/x2gopath.8; do
+#	    vsed -e 's,/usr/local,/usr,g' -i "$_file"
+#	done
+#}

From 2b63f29f783d711a9ed77c6715a9d5232515606e 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 95ccce365ba5c6b16f9c9b81685e49b0728b4553 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 c7d3e0256d22485009602e325f14139b88466564 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"

^ permalink raw reply	[flat|nested] 53+ messages in thread

* Re: [PR REVIEW] x2goserver and nx-libs fixed
  2021-05-11 18:54 [PR PATCH] x2goserver and nx-libs fixed eoli3n
                   ` (30 preceding siblings ...)
  2021-05-11 22:15 ` [PR PATCH] [Updated] " eoli3n
@ 2021-05-11 22:16 ` eoli3n
  2021-05-11 22:16 ` ahesford
                   ` (19 subsequent siblings)
  51 siblings, 0 replies; 53+ messages in thread
From: eoli3n @ 2021-05-11 22:16 UTC (permalink / raw)
  To: ml

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

New review comment by eoli3n on void-packages repository

https://github.com/void-linux/void-packages/pull/30805#discussion_r630575549

Comment:
I forgot to install my rebuilt package, i confirm that make_build_args fixes.

^ permalink raw reply	[flat|nested] 53+ messages in thread

* Re: [PR REVIEW] x2goserver and nx-libs fixed
  2021-05-11 18:54 [PR PATCH] x2goserver and nx-libs fixed eoli3n
                   ` (31 preceding siblings ...)
  2021-05-11 22:16 ` [PR REVIEW] " eoli3n
@ 2021-05-11 22:16 ` ahesford
  2021-05-11 22:18 ` ahesford
                   ` (18 subsequent siblings)
  51 siblings, 0 replies; 53+ messages in thread
From: ahesford @ 2021-05-11 22:16 UTC (permalink / raw)
  To: ml

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

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/30805#discussion_r630575931

Comment:
I'm not in front of the computer, but you can probably do
```bash
sed -i -e '/PREFIX/s,/usr/local,/usr,' */Makefile
```
to avoid enumerating all of the makefiles.

^ permalink raw reply	[flat|nested] 53+ messages in thread

* Re: [PR REVIEW] x2goserver and nx-libs fixed
  2021-05-11 18:54 [PR PATCH] x2goserver and nx-libs fixed eoli3n
                   ` (32 preceding siblings ...)
  2021-05-11 22:16 ` ahesford
@ 2021-05-11 22:18 ` ahesford
  2021-05-11 22:20 ` [PR PATCH] [Updated] " eoli3n
                   ` (17 subsequent siblings)
  51 siblings, 0 replies; 53+ messages in thread
From: ahesford @ 2021-05-11 22:18 UTC (permalink / raw)
  To: ml

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

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/30805#discussion_r630576395

Comment:
Ok, glad make_build_args solves it. 

^ permalink raw reply	[flat|nested] 53+ messages in thread

* Re: [PR PATCH] [Updated] x2goserver and nx-libs fixed
  2021-05-11 18:54 [PR PATCH] x2goserver and nx-libs fixed eoli3n
                   ` (33 preceding siblings ...)
  2021-05-11 22:18 ` ahesford
@ 2021-05-11 22:20 ` eoli3n
  2021-05-11 22:21 ` eoli3n
                   ` (16 subsequent siblings)
  51 siblings, 0 replies; 53+ messages in thread
From: eoli3n @ 2021-05-11 22:20 UTC (permalink / raw)
  To: ml

[-- 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: 7570 bytes --]

From 5d98011050c1304d4da4adc477cd5fe4217094ff 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 ++++++
 srcpkgs/x2goserver/template | 43 +++++++++++++++++++++++--------------
 2 files changed, 33 insertions(+), 16 deletions(-)
 create mode 100644 srcpkgs/x2goserver/INSTALL

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/template b/srcpkgs/x2goserver/template
index 158130a96717..06be480e9b44 100644
--- a/srcpkgs/x2goserver/template
+++ b/srcpkgs/x2goserver/template
@@ -1,28 +1,39 @@
 # 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"
 checksum=6776aaa354f5a44e349f0b3c176d4988c88a618c2edf46c98a37ae89c069dcd0
 system_groups="x2gouser"
-system_accounts="x2gouser"
-x2gouser_homedir="/var/lib/x2go"
-x2gouser_shell="/bin/false"
+make_dirs="/var/lib/x2go 0770 root x2gouser"
 
-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_patch() {
+#	for _file in \
+#	  	Makefile \
+#	  	x2goserver-desktopsharing/Makefile \
+#	  	x2goserver-desktopsharing/bin/x2goterminate-desktopsharing \
+#	  	libx2go-server-db-perl/Makefile \
+#	  	x2goserver-fmbindings/Makefile \
+#	  	x2goserver-xsession/Makefile \
+#	  	x2goserver-x2goagent/Makefile \
+#	  	x2goserver-common/Makefile \
+#	  	x2goserver/Makefile \
+#	  	x2goserver-extensions/Makefile \
+#	  	x2goserver-printing/Makefile \
+#	  	x2goserver/man/man8/x2gobasepath.8 \
+#	  	x2goserver/man/man8/x2gopath.8; do
+#	    vsed -e 's,/usr/local,/usr,g' -i "$_file"
+#	done
+#}

From f4a6f3b2bb7393a56f1d118dd946aa294ee14918 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 265b143fcdb5e77c0d2f731c73b6f27dfb77594a 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 c8ada9ac76cb615394b161b0fce396722e2afdfd 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"

^ permalink raw reply	[flat|nested] 53+ messages in thread

* Re: x2goserver and nx-libs fixed
  2021-05-11 18:54 [PR PATCH] x2goserver and nx-libs fixed eoli3n
                   ` (34 preceding siblings ...)
  2021-05-11 22:20 ` [PR PATCH] [Updated] " eoli3n
@ 2021-05-11 22:21 ` eoli3n
  2021-05-11 22:23 ` eoli3n
                   ` (15 subsequent siblings)
  51 siblings, 0 replies; 53+ messages in thread
From: eoli3n @ 2021-05-11 22:21 UTC (permalink / raw)
  To: ml

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

New comment by eoli3n on void-packages repository

https://github.com/void-linux/void-packages/pull/30805#issuecomment-839005162

Comment:
It misses the runit service.
I submitted a bug report to submit@bugs.x2go.org about forking problem for x2gocleansessions.
https://bugs.x2go.org/cgi-bin/bugreport.cgi?bug=1545

^ permalink raw reply	[flat|nested] 53+ messages in thread

* Re: x2goserver and nx-libs fixed
  2021-05-11 18:54 [PR PATCH] x2goserver and nx-libs fixed eoli3n
                   ` (35 preceding siblings ...)
  2021-05-11 22:21 ` eoli3n
@ 2021-05-11 22:23 ` eoli3n
  2021-05-11 22:28 ` [PR PATCH] [Updated] " eoli3n
                   ` (14 subsequent siblings)
  51 siblings, 0 replies; 53+ messages in thread
From: eoli3n @ 2021-05-11 22:23 UTC (permalink / raw)
  To: ml

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

New comment by eoli3n on void-packages repository

https://github.com/void-linux/void-packages/pull/30805#issuecomment-839233336

Comment:
@ahesford I think this is ok

^ permalink raw reply	[flat|nested] 53+ messages in thread

* Re: [PR PATCH] [Updated] x2goserver and nx-libs fixed
  2021-05-11 18:54 [PR PATCH] x2goserver and nx-libs fixed eoli3n
                   ` (36 preceding siblings ...)
  2021-05-11 22:23 ` eoli3n
@ 2021-05-11 22:28 ` eoli3n
  2021-05-11 23:48 ` ahesford
                   ` (13 subsequent siblings)
  51 siblings, 0 replies; 53+ messages in thread
From: eoli3n @ 2021-05-11 22:28 UTC (permalink / raw)
  To: ml

[-- 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: 6959 bytes --]

From 9bb226df338be3d0bdd489ae65e668965a357b5e 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 ++++++
 srcpkgs/x2goserver/template | 26 +++++++++-----------------
 2 files changed, 15 insertions(+), 17 deletions(-)
 create mode 100644 srcpkgs/x2goserver/INSTALL

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/template b/srcpkgs/x2goserver/template
index 158130a96717..04bb0ffced1c 100644
--- a/srcpkgs/x2goserver/template
+++ b/srcpkgs/x2goserver/template
@@ -1,28 +1,20 @@
 # 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"
 checksum=6776aaa354f5a44e349f0b3c176d4988c88a618c2edf46c98a37ae89c069dcd0
 system_groups="x2gouser"
-system_accounts="x2gouser"
-x2gouser_homedir="/var/lib/x2go"
-x2gouser_shell="/bin/false"
-
-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
-}
+make_dirs="/var/lib/x2go 0770 root x2gouser"

From 8617b162e2399cd77e2f9f7979cf7df7ca02ce43 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 d82c217a87afeacdae717e47f1703ec388470305 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 2f5c24285d9e5c783e1efa5524db2cb365327d5d 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"

^ permalink raw reply	[flat|nested] 53+ messages in thread

* Re: x2goserver and nx-libs fixed
  2021-05-11 18:54 [PR PATCH] x2goserver and nx-libs fixed eoli3n
                   ` (37 preceding siblings ...)
  2021-05-11 22:28 ` [PR PATCH] [Updated] " eoli3n
@ 2021-05-11 23:48 ` ahesford
  2021-05-11 23:55 ` ahesford
                   ` (12 subsequent siblings)
  51 siblings, 0 replies; 53+ messages in thread
From: ahesford @ 2021-05-11 23:48 UTC (permalink / raw)
  To: ml

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

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/30805#issuecomment-839293608

Comment:
Turns out the `x2gouser` user is required, because `x2godbadmin --createdb` will fail if the user doesn't exist. Drop the `make_dirs` and add back the `system_accounts` changes that you dropped.

Also, I'm working on a `--nofork` patch that I will attempt to upstream, we can add the patch and create an `x2gocleansessions` script.

^ permalink raw reply	[flat|nested] 53+ messages in thread

* Re: x2goserver and nx-libs fixed
  2021-05-11 18:54 [PR PATCH] x2goserver and nx-libs fixed eoli3n
                   ` (38 preceding siblings ...)
  2021-05-11 23:48 ` ahesford
@ 2021-05-11 23:55 ` ahesford
  2021-05-12  7:43 ` [PR PATCH] [Updated] " eoli3n
                   ` (11 subsequent siblings)
  51 siblings, 0 replies; 53+ messages in thread
From: ahesford @ 2021-05-11 23:55 UTC (permalink / raw)
  To: ml

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

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/30805#issuecomment-839297900

Comment:
The proposed patch is here: https://github.com/ahesford/x2goserver/compare/nofork.diff

^ permalink raw reply	[flat|nested] 53+ messages in thread

* Re: [PR PATCH] [Updated] x2goserver and nx-libs fixed
  2021-05-11 18:54 [PR PATCH] x2goserver and nx-libs fixed eoli3n
                   ` (39 preceding siblings ...)
  2021-05-11 23:55 ` ahesford
@ 2021-05-12  7:43 ` eoli3n
  2021-05-12  8:23 ` eoli3n
                   ` (10 subsequent siblings)
  51 siblings, 0 replies; 53+ messages in thread
From: eoli3n @ 2021-05-12  7:43 UTC (permalink / raw)
  To: ml

[-- 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: 6852 bytes --]

From 2e7b909604ab7b65d9e15034eef7c3eb7d53d81a 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 ++++++
 srcpkgs/x2goserver/template | 22 ++++++++--------------
 2 files changed, 14 insertions(+), 14 deletions(-)
 create mode 100644 srcpkgs/x2goserver/INSTALL

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/template b/srcpkgs/x2goserver/template
index 158130a96717..211b7daf884c 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,3 @@ system_groups="x2gouser"
 system_accounts="x2gouser"
 x2gouser_homedir="/var/lib/x2go"
 x2gouser_shell="/bin/false"
-
-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
-}

From d3f81ad2f0e0cad4eec397350f02f030bccaab97 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 dea7fb2887739f059d960528306543cb3fca41a1 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 02a3009a6c2f6e3d239f5474307afeb481a6957c 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"

^ permalink raw reply	[flat|nested] 53+ messages in thread

* Re: [PR PATCH] [Updated] x2goserver and nx-libs fixed
  2021-05-11 18:54 [PR PATCH] x2goserver and nx-libs fixed eoli3n
                   ` (40 preceding siblings ...)
  2021-05-12  7:43 ` [PR PATCH] [Updated] " eoli3n
@ 2021-05-12  8:23 ` eoli3n
  2021-05-12  8:24 ` eoli3n
                   ` (9 subsequent siblings)
  51 siblings, 0 replies; 53+ messages in thread
From: eoli3n @ 2021-05-12  8:23 UTC (permalink / raw)
  To: ml

[-- 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"

^ permalink raw reply	[flat|nested] 53+ messages in thread

* Re: x2goserver and nx-libs fixed
  2021-05-11 18:54 [PR PATCH] x2goserver and nx-libs fixed eoli3n
                   ` (41 preceding siblings ...)
  2021-05-12  8:23 ` eoli3n
@ 2021-05-12  8:24 ` eoli3n
  2021-05-12 13:58 ` [PR PATCH] [Updated] " ahesford
                   ` (8 subsequent siblings)
  51 siblings, 0 replies; 53+ messages in thread
From: eoli3n @ 2021-05-12  8:24 UTC (permalink / raw)
  To: ml

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

New comment by eoli3n on void-packages repository

https://github.com/void-linux/void-packages/pull/30805#issuecomment-839574052

Comment:
- [x] x2gouser readded
- [x] patch nofork
- [x] sv script 

^ permalink raw reply	[flat|nested] 53+ messages in thread

* Re: [PR PATCH] [Updated] x2goserver and nx-libs fixed
  2021-05-11 18:54 [PR PATCH] x2goserver and nx-libs fixed eoli3n
                   ` (42 preceding siblings ...)
  2021-05-12  8:24 ` eoli3n
@ 2021-05-12 13:58 ` ahesford
  2021-05-12 13:58 ` ahesford
                   ` (7 subsequent siblings)
  51 siblings, 0 replies; 53+ messages in thread
From: ahesford @ 2021-05-12 13:58 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by ahesford 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: 10897 bytes --]

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

---
 srcpkgs/x2goclient/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/x2goclient/template b/srcpkgs/x2goclient/template
index 76dbc1e2f258..ba2d57781c4d 100644
--- a/srcpkgs/x2goclient/template
+++ b/srcpkgs/x2goclient/template
@@ -1,7 +1,7 @@
 # Template file for 'x2goclient'
 pkgname=x2goclient
 version=4.1.2.2
-revision=1
+revision=2
 build_style=gnu-makefile
 build_helper=qmake
 make_build_args="QMAKE_BINARY=qmake-qt5 LRELEASE_BINARY=lrelease-qt5"
@@ -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"

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

---
 srcpkgs/nx-libs-devel    |  1 +
 srcpkgs/nx-libs/template | 14 +++++++++-----
 2 files changed, 10 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..f604983c82c9 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,13 +14,14 @@ 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"
+conf_files="/etc/nxagent/*"
 
 post_patch() {
 	# Replace hard-coded /usr/local ProjectRoot
@@ -50,7 +54,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 4160dd7a8f540da0a7e23d2a966b9cb12367e991 Mon Sep 17 00:00:00 2001
From: eoli3n <jonathan.kirszling@runbox.com>
Date: Mon, 10 May 2021 23:45:00 +0200
Subject: [PATCH 3/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 ab8ea4217a5c1bace49d08f23c39613d293b25c9 Mon Sep 17 00:00:00 2001
From: eoli3n <jonathan.kirszling@runbox.com>
Date: Mon, 10 May 2021 21:27:15 +0200
Subject: [PATCH 4/4] x2goserver: fix non working package

---
 srcpkgs/x2goserver/INSTALL                    |  6 ++
 .../files/x2gocleansessions/log/run           |  2 +
 .../x2goserver/files/x2gocleansessions/run    |  2 +
 .../patches/x2gocleansessions-nofork.patch    | 71 +++++++++++++++++++
 srcpkgs/x2goserver/template                   | 32 +++++----
 5 files changed, 100 insertions(+), 13 deletions(-)
 create mode 100644 srcpkgs/x2goserver/INSTALL
 create mode 100644 srcpkgs/x2goserver/files/x2gocleansessions/log/run
 create mode 100644 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/log/run b/srcpkgs/x2goserver/files/x2gocleansessions/log/run
new file mode 100644
index 000000000000..d5901d1fc65f
--- /dev/null
+++ b/srcpkgs/x2goserver/files/x2gocleansessions/log/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec logger -p daemon.info -t x2gocleansessions
diff --git a/srcpkgs/x2goserver/files/x2gocleansessions/run b/srcpkgs/x2goserver/files/x2gocleansessions/run
new file mode 100644
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..2774f84e960e 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"
@@ -15,14 +19,16 @@ checksum=6776aaa354f5a44e349f0b3c176d4988c88a618c2edf46c98a37ae89c069dcd0
 system_groups="x2gouser"
 system_accounts="x2gouser"
 x2gouser_homedir="/var/lib/x2go"
-x2gouser_shell="/bin/false"
+patch_args="-Np1"
+conf_files="
+ /etc/x2go/desktopsharing/*
+ /etc/x2go/x2gosql/*
+ /etc/x2go/keystrokes.cfg
+ /etc/x2go/x2goagent.*
+ /etc/x2go/x2goserver.*
+"
 
-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() {
+	rm -rf "${DESTDIR}/etc/logcheck"
+	vsv x2gocleansessions
 }

^ permalink raw reply	[flat|nested] 53+ messages in thread

* Re: x2goserver and nx-libs fixed
  2021-05-11 18:54 [PR PATCH] x2goserver and nx-libs fixed eoli3n
                   ` (43 preceding siblings ...)
  2021-05-12 13:58 ` [PR PATCH] [Updated] " ahesford
@ 2021-05-12 13:58 ` ahesford
  2021-05-12 20:16 ` eoli3n
                   ` (6 subsequent siblings)
  51 siblings, 0 replies; 53+ messages in thread
From: ahesford @ 2021-05-12 13:58 UTC (permalink / raw)
  To: ml

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

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/30805#issuecomment-839795423

Comment:
I'd like to get some feedback from upstream about the `x2gocleansessions` patch. I submitted a pull request on their mailing list last night and it's awaiting moderation. If they stall or reject that patch, we shouldn't maintain divergent behavior here. In that case, we need to decide whether `x2gocleansessions --debug >/dev/null` to ignore the log spam every two seconds, let it flood logs, or make it a configurable switch for the user.

In the meantime, I force-pushed to your branch to make a few changes:
1. Add `conf_files` directives to `nx-libs` and `x2goserver` so users can customize files in `/etc` without having updates overwrite them.
2. Add a log script for the `x2goserver` service.
3. Drop the `x2gouser_shell`, because the default is `nologin` already.
4. Remove the `/etc/logcheck` directory from `x2goserver`, because we don't provide `logcheck`.
5. Revbump `x2goclient` to update metadata in the built package.

^ permalink raw reply	[flat|nested] 53+ messages in thread

* Re: x2goserver and nx-libs fixed
  2021-05-11 18:54 [PR PATCH] x2goserver and nx-libs fixed eoli3n
                   ` (44 preceding siblings ...)
  2021-05-12 13:58 ` ahesford
@ 2021-05-12 20:16 ` eoli3n
  2021-05-24  2:30 ` ahesford
                   ` (5 subsequent siblings)
  51 siblings, 0 replies; 53+ messages in thread
From: eoli3n @ 2021-05-12 20:16 UTC (permalink / raw)
  To: ml

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

New comment by eoli3n on void-packages repository

https://github.com/void-linux/void-packages/pull/30805#issuecomment-840068200

Comment:
Does x2gocleansessions output anything without ``--debug`` ? If no, ``x2gocleansessions --debug >/dev/null`` is not so bad.

^ permalink raw reply	[flat|nested] 53+ messages in thread

* Re: x2goserver and nx-libs fixed
  2021-05-11 18:54 [PR PATCH] x2goserver and nx-libs fixed eoli3n
                   ` (45 preceding siblings ...)
  2021-05-12 20:16 ` eoli3n
@ 2021-05-24  2:30 ` ahesford
  2021-05-24  9:03 ` eoli3n
                   ` (4 subsequent siblings)
  51 siblings, 0 replies; 53+ messages in thread
From: ahesford @ 2021-05-24  2:30 UTC (permalink / raw)
  To: ml

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

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/30805#issuecomment-846689152

Comment:
Still nothing from upstream about `--nofork`. Given that the patch is minimal and the work has already been done, I'm inclined to keep it rather than try to abuse `--debug`.

@eoli3n are you still satisfied with the functionality of this PR?

^ permalink raw reply	[flat|nested] 53+ messages in thread

* Re: x2goserver and nx-libs fixed
  2021-05-11 18:54 [PR PATCH] x2goserver and nx-libs fixed eoli3n
                   ` (46 preceding siblings ...)
  2021-05-24  2:30 ` ahesford
@ 2021-05-24  9:03 ` eoli3n
  2021-05-27  9:01 ` eoli3n
                   ` (3 subsequent siblings)
  51 siblings, 0 replies; 53+ messages in thread
From: eoli3n @ 2021-05-24  9:03 UTC (permalink / raw)
  To: ml

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

New comment by eoli3n on void-packages repository

https://github.com/void-linux/void-packages/pull/30805#issuecomment-846897571

Comment:
I will take some time to retest in the week and I will ping you.
I had some random connection failures, I need to be sure that everything's ok.

^ permalink raw reply	[flat|nested] 53+ messages in thread

* Re: x2goserver and nx-libs fixed
  2021-05-11 18:54 [PR PATCH] x2goserver and nx-libs fixed eoli3n
                   ` (47 preceding siblings ...)
  2021-05-24  9:03 ` eoli3n
@ 2021-05-27  9:01 ` eoli3n
  2021-05-31 20:27 ` ahesford
                   ` (2 subsequent siblings)
  51 siblings, 0 replies; 53+ messages in thread
From: eoli3n @ 2021-05-27  9:01 UTC (permalink / raw)
  To: ml

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

New comment by eoli3n on void-packages repository

https://github.com/void-linux/void-packages/pull/30805#issuecomment-849465681

Comment:
On wayland, I get this after a connection with the client
![connection](https://user-images.githubusercontent.com/14223657/119796320-91e7cb80-bed9-11eb-8b4a-77ffc6c52e21.png)
Disabling wayland fix this.
```
QT_QPA_PLATFORM=xcb x2goclient
```
[Arch wiki : x2goclient](https://wiki.archlinux.org/title/X2Go#X2Go_client:_Cannot_connect_to_remote_X2Go_server_from_local_Wayland_session:_%22The_connection_with_the_remote_server_was_shut_down%22)
Should we patch x2goclient desktop file to force xcb to increase compatibility ?

Sometimes, connection is ok, everything seems working, but the xterm window doesn't pop up.
I noticed that if the name of the session contains ``_dp32`` it fails, but with ``_dp24``, it succeed.



^ permalink raw reply	[flat|nested] 53+ messages in thread

* Re: x2goserver and nx-libs fixed
  2021-05-11 18:54 [PR PATCH] x2goserver and nx-libs fixed eoli3n
                   ` (48 preceding siblings ...)
  2021-05-27  9:01 ` eoli3n
@ 2021-05-31 20:27 ` ahesford
  2021-05-31 22:19 ` eoli3n
  2021-05-31 23:01 ` [PR PATCH] [Closed]: " ahesford
  51 siblings, 0 replies; 53+ messages in thread
From: ahesford @ 2021-05-31 20:27 UTC (permalink / raw)
  To: ml

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

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/30805#issuecomment-851671673

Comment:
I'm not inclined to modify the desktop file. That's an issue that can be fixed upstream and doesn't really prevent people from launching the client properly. Are you satisfied with the status of everything else?

^ permalink raw reply	[flat|nested] 53+ messages in thread

* Re: x2goserver and nx-libs fixed
  2021-05-11 18:54 [PR PATCH] x2goserver and nx-libs fixed eoli3n
                   ` (49 preceding siblings ...)
  2021-05-31 20:27 ` ahesford
@ 2021-05-31 22:19 ` eoli3n
  2021-05-31 23:01 ` [PR PATCH] [Closed]: " ahesford
  51 siblings, 0 replies; 53+ messages in thread
From: eoli3n @ 2021-05-31 22:19 UTC (permalink / raw)
  To: ml

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

New comment by eoli3n on void-packages repository

https://github.com/void-linux/void-packages/pull/30805#issuecomment-851702156

Comment:
Yes I do, non pop up windows should be not related to the build.

^ permalink raw reply	[flat|nested] 53+ messages in thread

* Re: [PR PATCH] [Closed]: x2goserver and nx-libs fixed
  2021-05-11 18:54 [PR PATCH] x2goserver and nx-libs fixed eoli3n
                   ` (50 preceding siblings ...)
  2021-05-31 22:19 ` eoli3n
@ 2021-05-31 23:01 ` ahesford
  51 siblings, 0 replies; 53+ messages in thread
From: ahesford @ 2021-05-31 23:01 UTC (permalink / raw)
  To: ml

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

There's a closed pull request on the void-packages repository

x2goserver and nx-libs fixed
https://github.com/void-linux/void-packages/pull/30805

Description:
Fixes #30781 :partying_face: 


^ permalink raw reply	[flat|nested] 53+ messages in thread

end of thread, other threads:[~2021-05-31 23:01 UTC | newest]

Thread overview: 53+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-11 18:54 [PR PATCH] x2goserver and nx-libs fixed eoli3n
2021-05-11 18:59 ` eoli3n
2021-05-11 19:01 ` eoli3n
2021-05-11 19:14 ` [PR PATCH] [Updated] " eoli3n
2021-05-11 19:52 ` [PR REVIEW] " ahesford
2021-05-11 19:52 ` ahesford
2021-05-11 19:52 ` ahesford
2021-05-11 19:52 ` ahesford
2021-05-11 19:52 ` ahesford
2021-05-11 19:52 ` ahesford
2021-05-11 19:52 ` ahesford
2021-05-11 19:52 ` ahesford
2021-05-11 19:52 ` ahesford
2021-05-11 19:52 ` ahesford
2021-05-11 19:52 ` ahesford
2021-05-11 19:58 ` eoli3n
2021-05-11 20:01 ` eoli3n
2021-05-11 20:09 ` eoli3n
2021-05-11 20:10 ` ahesford
2021-05-11 20:18 ` eoli3n
2021-05-11 20:18 ` eoli3n
2021-05-11 20:41 ` eoli3n
2021-05-11 21:05 ` eoli3n
2021-05-11 21:07 ` eoli3n
2021-05-11 21:13 ` eoli3n
2021-05-11 21:41 ` ahesford
2021-05-11 21:41 ` eoli3n
2021-05-11 21:42 ` eoli3n
2021-05-11 21:42 ` ahesford
2021-05-11 21:44 ` eoli3n
2021-05-11 21:45 ` eoli3n
2021-05-11 22:15 ` [PR PATCH] [Updated] " eoli3n
2021-05-11 22:16 ` [PR REVIEW] " eoli3n
2021-05-11 22:16 ` ahesford
2021-05-11 22:18 ` ahesford
2021-05-11 22:20 ` [PR PATCH] [Updated] " eoli3n
2021-05-11 22:21 ` eoli3n
2021-05-11 22:23 ` eoli3n
2021-05-11 22:28 ` [PR PATCH] [Updated] " eoli3n
2021-05-11 23:48 ` ahesford
2021-05-11 23:55 ` ahesford
2021-05-12  7:43 ` [PR PATCH] [Updated] " eoli3n
2021-05-12  8:23 ` eoli3n
2021-05-12  8:24 ` eoli3n
2021-05-12 13:58 ` [PR PATCH] [Updated] " ahesford
2021-05-12 13:58 ` ahesford
2021-05-12 20:16 ` eoli3n
2021-05-24  2:30 ` ahesford
2021-05-24  9:03 ` eoli3n
2021-05-27  9:01 ` eoli3n
2021-05-31 20:27 ` ahesford
2021-05-31 22:19 ` eoli3n
2021-05-31 23:01 ` [PR PATCH] [Closed]: " ahesford

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).