From 50c25f65c276ad6c741f4afa22febff5de43145b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 17 Oct 2023 11:35:23 -0400
Subject: [PATCH] x2goserver: update to 4.1.0.6.

---
 .../patches/x2gocleansessions-nofork.patch    | 71 -------------------
 srcpkgs/x2goserver/template                   |  6 +-
 2 files changed, 3 insertions(+), 74 deletions(-)
 delete mode 100644 srcpkgs/x2goserver/patches/x2gocleansessions-nofork.patch

diff --git a/srcpkgs/x2goserver/patches/x2gocleansessions-nofork.patch b/srcpkgs/x2goserver/patches/x2gocleansessions-nofork.patch
deleted file mode 100644
index cd3af1a7193..00000000000
--- a/srcpkgs/x2goserver/patches/x2gocleansessions-nofork.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-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 0724ef53a2f..55c43f877e5 100644
--- a/srcpkgs/x2goserver/template
+++ b/srcpkgs/x2goserver/template
@@ -1,7 +1,7 @@
 # Template file for 'x2goserver'
 pkgname=x2goserver
-version=4.1.0.3
-revision=2
+version=4.1.0.6
+revision=1
 build_style=gnu-makefile
 make_install_args="SBINDIR=/usr/bin"
 hostmakedepends="pkg-config perl which"
@@ -14,7 +14,7 @@ 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
+checksum=9c585f683996f0670aad3b118a1d98783ec897ef32add9b4c9e4e63ecf7b7c24
 system_groups="x2gouser"
 system_accounts="x2gouser"
 x2gouser_homedir="/var/lib/x2go"