This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goserver. from 8a7c9d76 Setting keyboard layout in rootless X2GoKdrive sessions. new 1f9a68b4 x2goserver-xsession: Port OPTIONS variable and has_option() function from recent version of /etc/X11/Xsession to X2Go's Xsession file. (Fixes: #1583). More porting is actually needed. new 071210d5 debian/x2goserver.manpages: Install x2goupdateoptionsstring.1* man pages into bin:pkg x2goserver. new aeae77de Makefile: Create symlink from /etc/x2go/Xsession.options.d/ to /etc/X11/Xsession.options.d on Debian-like systems. new 06299d52 x2goserver/man/man8/x2gocleansessions.8: Update man page. The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 11 +++++++++++ debian/x2goserver.manpages | 1 + x2goserver-xsession/Makefile | 2 ++ x2goserver-xsession/etc/Xsession | 18 ++++++++++++++++++ x2goserver/man/man8/x2gocleansessions.8 | 12 ++++++++---- 5 files changed, 40 insertions(+), 4 deletions(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 1f9a68b4d1d13f80073d888586b48999316d5907 Author: Hanno Foest <hurga-x2go@tigress.com> Date: Mon May 16 21:29:38 2022 +0200 x2goserver-xsession: Port OPTIONS variable and has_option() function from recent version of /etc/X11/Xsession to X2Go's Xsession file. (Fixes: #1583). More porting is actually needed. --- debian/changelog | 6 ++++++ x2goserver-xsession/etc/Xsession | 18 ++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/debian/changelog b/debian/changelog index 4d737e11..c0514892 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,12 @@ x2goserver (4.1.0.4-0x2go1.2) UNRELEASED; urgency=medium - x2gocleansessions: Separate non-forking behavior from --debug into --nofork. + [ Hanno Foest ] + * New upstream version (4.1.0.4): + - x2goserver-xsession: Port OPTIONS variable and has_option() function + from recent version of /etc/X11/Xsession to X2Go's Xsession file. (Fixes: + #1583). More porting is actually needed. + [ Mike Gabriel ] * New upstream version (4.1.0.4): - Fix version number in VERSION.x2goserver-desktopsharing. diff --git a/x2goserver-xsession/etc/Xsession b/x2goserver-xsession/etc/Xsession index 270a0b30..5df6101c 100755 --- a/x2goserver-xsession/etc/Xsession +++ b/x2goserver-xsession/etc/Xsession @@ -77,6 +77,24 @@ USERXSESSIONRC=$HOME/.xsessionrc-x2go ALTUSERXSESSION=$HOME/.Xsession-x2go ERRFILE="${HOME}/.xsession-x2go-${cur_hostname}-errors" +OPTIONS="$( + if [ -r "$OPTIONFILE" ]; then + cat "$OPTIONFILE" + fi + if [ -d /etc/x2go/Xsession.options.d ]; then + run-parts --list --regex '\.conf$' /etc/x2go/Xsession.options.d | xargs -d '\n' cat + fi +)" + +has_option() { + # Ensure that a later no-foo overrides an earlier foo + if [ "$(echo "$OPTIONS" | grep -Eo "^(no-)?$1\>" | tail -n 1)" = "$1" ]; then + return 0 + else + return 1 + fi +} + # Move the old error log file away. if [ -f "${ERRFILE}" ]; then if [ -L "${ERRFILE}" ]; then -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 071210d53f092a5d57bbfc8675bc50749e73ca41 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon May 16 21:41:03 2022 +0200 debian/x2goserver.manpages: Install x2goupdateoptionsstring.1* man pages into bin:pkg x2goserver. --- debian/changelog | 2 ++ debian/x2goserver.manpages | 1 + 2 files changed, 3 insertions(+) diff --git a/debian/changelog b/debian/changelog index c0514892..04d1a3de 100644 --- a/debian/changelog +++ b/debian/changelog @@ -41,6 +41,8 @@ x2goserver (4.1.0.4-0x2go1.2) UNRELEASED; urgency=medium * Drop base64 from D (x2goserver): A bin:pkg does not exist, the bas64 executable is shipped as part of coreutils (which is an essential package and thus does not need a dependency). + * debian/x2goserver.manpages: + + Install x2goupdateoptionsstring.1* man pages into bin:pkg x2goserver. * x2goserver.spec: + Update (LONG_)DESCRIPTION of bin:pkg x2goserver-x2goagent. + Fix up files section for x2gokdrive (wrong pkg name). diff --git a/debian/x2goserver.manpages b/debian/x2goserver.manpages index b58465f1..e7717408 100644 --- a/debian/x2goserver.manpages +++ b/debian/x2goserver.manpages @@ -23,5 +23,6 @@ debian/tmp/usr/share/man/man8/x2gosuspend-session.8* debian/tmp/usr/share/man/man8/x2goterminate-session.8* debian/tmp/usr/share/man/man8/x2goumount-session.8* debian/tmp/usr/share/man/man8/x2goumount_session.8* +debian/tmp/usr/share/man/man1/x2goupdateoptionsstring.1* debian/tmp/usr/share/man/man1/x2gooptionsstring.1* debian/tmp/usr/share/man/man8/x2goversion.8* -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 06299d529c40948006608f4bb5a54047a06a89a3 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon May 16 21:44:35 2022 +0200 x2goserver/man/man8/x2gocleansessions.8: Update man page. --- debian/changelog | 1 + x2goserver/man/man8/x2gocleansessions.8 | 12 ++++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index c3594381..a9cc40af 100644 --- a/debian/changelog +++ b/debian/changelog @@ -32,6 +32,7 @@ x2goserver (4.1.0.4-0x2go1.2) UNRELEASED; urgency=medium are holding back newer versions for unknown reason). - Makefile: Create symlink from /etc/x2go/Xsession.options.d/ to /etc/X11/Xsession.options.d on Debian-like systems. + - x2goserver/man/man8/x2gocleansessions.8: Update man page. * debian/x2goserver.postinst: + Drop duplicate sourcing of debconf includes. + Add Dutch debconf translation. Thanks to Frans Spiesschaert. diff --git a/x2goserver/man/man8/x2gocleansessions.8 b/x2goserver/man/man8/x2gocleansessions.8 index f5948b80..9e701206 100644 --- a/x2goserver/man/man8/x2gocleansessions.8 +++ b/x2goserver/man/man8/x2gocleansessions.8 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 4.10 (Pod::Simple 3.35) +.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.40) .\" .\" Standard preamble: .\" ======================================================================== @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "X2GOCLEANSESSIONS 8" -.TH X2GOCLEANSESSIONS 8 "2019-01-14" "Version 4.1.0.4" "Unknown - X2Go Server Bug!" +.TH X2GOCLEANSESSIONS 8 "2019-07-19" "Version 4.1.0.4" "Unknown - X2Go Server Bug!" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -149,6 +149,8 @@ x2gocleansessions \- X2Go Server Cleanup Daemon .IX Item "x2gocleansessions --man" .IP "\fBx2gocleansessions\fR [\fB\-\-debug\fR|\fB\-d\fR]" 4 .IX Item "x2gocleansessions [--debug|-d]" +.IP "\fBx2gocleansessions\fR [\fB\-\-nofork\fR|\fB\-d\fR]" 4 +.IX Item "x2gocleansessions [--nofork|-d]" .PD .SH "DESCRIPTION" .IX Header "DESCRIPTION" @@ -166,8 +168,10 @@ Print a brief help message and exits. Prints the manual page and exits. .IP "\fB\-\-debug\fR|\fB\-d\fR" 8 .IX Item "--debug|-d" -Override debugging setting in global config and keep application in foreground -instead of daemonizing. +Override debugging setting in global config; implies \fB\-\-nofork\fR. +.IP "\fB\-\-nofork\fR|\fB\-n\fR" 8 +.IX Item "--nofork|-n" +Keep application in foreground instead of daemonizing. .SH "AUTHOR" .IX Header "AUTHOR" This manual has been written by Mike Gabriel <mike.gabriel@das\-netzwerkteam.de> -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit aeae77dee85b1b5dfbf75f394b4e2ea0ee793055 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon May 16 21:44:15 2022 +0200 Makefile: Create symlink from /etc/x2go/Xsession.options.d/ to /etc/X11/Xsession.options.d on Debian-like systems. --- debian/changelog | 2 ++ x2goserver-xsession/Makefile | 2 ++ 2 files changed, 4 insertions(+) diff --git a/debian/changelog b/debian/changelog index 04d1a3de..c3594381 100644 --- a/debian/changelog +++ b/debian/changelog @@ -30,6 +30,8 @@ x2goserver (4.1.0.4-0x2go1.2) UNRELEASED; urgency=medium This change only gets activated for Debian for now and focuses on policykit-1 (<= 0.105). (Debian maintainers of policykit-1 are holding back newer versions for unknown reason). + - Makefile: Create symlink from /etc/x2go/Xsession.options.d/ to + /etc/X11/Xsession.options.d on Debian-like systems. * debian/x2goserver.postinst: + Drop duplicate sourcing of debconf includes. + Add Dutch debconf translation. Thanks to Frans Spiesschaert. diff --git a/x2goserver-xsession/Makefile b/x2goserver-xsession/Makefile index 163e9c51..ea15a314 100755 --- a/x2goserver-xsession/Makefile +++ b/x2goserver-xsession/Makefile @@ -21,6 +21,7 @@ MANDIR ?= $(PREFIX)/share/man SHAREDIR ?= $(PREFIX)/share/x2go XSESSIONDIR ?= /etc/X11/Xsession.d +XSESSIONOPTIONSDIR ?= /etc/X11/Xsession.options.d XSESSIONOPTIONFILE ?= /etc/X11/Xsession.options XINITRCDIR ?= /etc/X11/xinit/xinitrc.d XCLIENTSDIR ?= /etc/X11/xinit/Xclients.d @@ -56,6 +57,7 @@ install_config: $(INSTALL_SYMLINK) /etc/X11/Xresources $(DESTDIR)$(ETCDIR)/ if [ -e /etc/debian_version ] || [ -e /etc/devuan_version ]; then if [ -e $(XSESSIONOPTIONFILE) ]; then $(INSTALL_SYMLINK) $(XSESSIONOPTIONFILE) $(DESTDIR)$(ETCDIR)/Xsession.options; else touch $(DESTDIR)$(ETCDIR)/Xsession.options; fi; fi if [ -e /etc/debian_version ] || [ -e /etc/devuan_version ]; then if [ -d $(XSESSIONDIR) ]; then $(RM_FILE) $(DESTDIR)$(ETCDIR)/Xsession.d; $(INSTALL_SYMLINK) $(XSESSIONDIR) $(DESTDIR)$(ETCDIR)/Xsession.d; else $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/Xsession.d; fi; fi + if [ -e /etc/debian_version ] || [ -e /etc/devuan_version ]; then if [ -d $(XSESSIONOPTIONSDIR) ]; then $(RM_FILE) $(DESTDIR)$(ETCDIR)/Xsession.options.d; $(INSTALL_SYMLINK) $(XSESSIONOPTIONSDIR) $(DESTDIR)$(ETCDIR)/Xsession.options.d; else $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/Xsession.options.d; fi; fi if [ -e /etc/redhat-release ] || [ -e /etc/gentoo-release ] || [ -e /etc/rt-os-release ] || [ -e /etc/slackware-version ]; then if [ -d $(XINITRCDIR) ]; then $(INSTALL_SYMLINK) $(XINITRCDIR) $(DESTDIR)$(ETCDIR)/xinitrc.d; else $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/xinitrc.d; fi; fi if [ -e /etc/redhat-release ] || [ -e /etc/gentoo-release ] || [ -e /etc/rt-os-release ] || [ -e /etc/slackware-version ]; then if [ -d $(XCLIENTSDIR) ]; then $(INSTALL_SYMLINK) $(XCLIENTSDIR) $(DESTDIR)$(ETCDIR)/Xclients.d; else $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/Xclients.d; fi; fi if [ -e /etc/os-release ] && cat /etc/os-release | grep "suse" 1>/dev/null || [ -d /usr/share/doc/packages/brp-check-suse ]; then if [ -d $(XINITRCDIR) ]; then $(INSTALL_SYMLINK) $(XINITRCDIR) $(DESTDIR)$(ETCDIR)/xinitrc.d; else $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/xinitrc.d; fi; fi -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
-
git-admin＠x2go.org