This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit b095393f62f5349e4ab5e265368ce5c0d6dc66fa Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Jan 24 09:15:02 2018 +0100 x2goserver/bin/x2goresume-session: handle missing xinerama parameter in options string gracefully, skipping that part (and the other optional geometry string) correctly. --- debian/changelog | 3 +++ x2goserver/bin/x2goresume-session | 28 ++++++++++++++++++++++++++-- 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 13d9c6f..eb8f964 100644 --- a/debian/changelog +++ b/debian/changelog @@ -237,6 +237,9 @@ x2goserver (4.1.0.0-0x2go1.2) UNRELEASED; urgency=low work around that gracefully. - x2goserver/lib/x2goistrue: use shift unconditionally and check the parameter to be defined instead. + - x2goserver/bin/x2goresume-session: handle missing xinerama parameter in + options string gracefully, skipping that part (and the other optional + geometry string) correctly. * x2goserver.spec: - Only create session DB in x2goserver's post install script. Do use proper Requires(post) statements to make sure perl-X2Go-Server-DB and diff --git a/x2goserver/bin/x2goresume-session b/x2goserver/bin/x2goresume-session index 9adbc11..2e1b905 100755 --- a/x2goserver/bin/x2goresume-session +++ b/x2goserver/bin/x2goresume-session @@ -259,16 +259,40 @@ PSTR="$(awk -F ',' '{print $3}' <<< "${OPTIONS}")" KTSTR="$(awk -F ',' '{print $12}' <<< "${OPTIONS}")" GSTR="$(awk -F ',' '{print $13}' <<< "${OPTIONS}")" typeset xinerama_orig='' -test_GSTR="$(sed 's/geometry=.*//' <<< "${GSTR}")" +test_GSTR="$(sed -e 's/geometry=.*//' <<< "${GSTR}")" if [[ -n "${test_GSTR}" ]]; then GSTR='geometry=' xinerama_orig="$(awk -F ',' '{print $13}' <<< "${OPTIONS}")" +else + xinerama_orig="$(awk -F ',' '{print $14}' <<< "${OPTIONS}")" +fi + +# Sessions started with older X2Go Server versions do not feature +# a xinerama option, so handle this gracefully. +# Note that Xinerama support defaulted to on and was handled by the client, +# so keep it like that. +typeset test_xinerama="$(sed -e 's/xinerama=.*//' <<< "${xinerama_orig}")" +if [[ -n "${test_xinerama}" ]]; then + # Will not actually be replaced by anything, so the value provided + # here does not matter. + xinerama_orig='xinerama=1' +fi + +# Only one component missing => either geometry or xinerama at position 13, +# everything else starts from position 14. +if { [[ -n "${test_GSTR}" ]] && [[ -z "${test_xinerama}" ]]; } || { [[ -z "${test_GSTR}" ]] && [[ -n "${test_xinerama}" ]]; }; then RSTR="$(awk -F ',' '{print $14}' <<< "${OPTIONS}")" FSTR="$(awk -F ',' '{print $15}' <<< "${OPTIONS}")" LISTSTR="$(awk -F ',' '{print $17}' <<< "${OPTIONS}")" CLIPBOARD="$(awk -F ',' '{print $18}' <<< "${OPTIONS}")" +# Neither geometry nor xinerama given, everything else starts at position 13. +elif [[ -n "${test_GSTR}" ]]; then + RSTR="$(awk -F ',' '{print $13}' <<< "${OPTIONS}")" + FSTR="$(awk -F ',' '{print $14}' <<< "${OPTIONS}")" + LISTSTR="$(awk -F ',' '{print $16}' <<< "${OPTIONS}")" + CLIPBOARD="$(awk -F ',' '{print $17}' <<< "${OPTIONS}")" +# Both geometry and xinerama given, everything else starts at position 15. else - xinerama_orig="$(awk -F ',' '{print $14}' <<< "${OPTIONS}")" RSTR="$(awk -F ',' '{print $15}' <<< "${OPTIONS}")" FSTR="$(awk -F ',' '{print $16}' <<< "${OPTIONS}")" LISTSTR="$(awk -F ',' '{print $18}' <<< "${OPTIONS}")" -- 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 f4ba504e814fbedce28c46a7620384e4bd43c04b Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Jan 24 10:09:36 2018 +0100 x2goserver/Makefile: install and uninstall etc/tmpfiles.d/x2goserver.conf. Cherry-picked from release/4.0.1.x branch. Moved into x2goserver-common package. --- debian/changelog | 2 ++ x2goserver-common/Makefile | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 20e8082..0f80d8d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -384,6 +384,8 @@ x2goserver (4.0.1.23-0x2go1) UNRELEASED; urgency=medium - x2goserver/bin/x2gostartagent: check and adapt exit codes. - x2goserver/etc: add new tmpfiles.d/x2goserver.conf file, protecting session directories from systemd's tmpfiles deletion. + - x2goserver/Makefile: install and uninstall + etc/tmpfiles.d/x2goserver.conf. * x2goserver.spec: - RPMify x2goserver-xsession description. - Remove qt4 stuff, we're not using the framework here. diff --git a/x2goserver-common/Makefile b/x2goserver-common/Makefile index 40b9dd9..c3c6565 100755 --- a/x2goserver-common/Makefile +++ b/x2goserver-common/Makefile @@ -64,6 +64,8 @@ install_config: $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/x2gosql $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/x2gosql/passwords $(INSTALL_FILE) etc/x2gosql/sql $(DESTDIR)$(ETCDIR)/x2gosql + $(INSTALL_DIR) $(DESTDIR)/etc/tmpfiles.d || true + $(INSTALL_FILE) etc/tmpfiles.d/x2goserver.conf $(DESTDIR)/etc/tmpfiles.d/ install_man: $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/man5 @@ -85,6 +87,8 @@ uninstall_config: $(RM_DIR) $(DESTDIR)$(ETCDIR)/x2gosql/passwords || true $(RM_DIR) $(DESTDIR)$(ETCDIR)/x2gosql || true $(RM_DIR) $(DESTDIR)$(ETCDIR) || true + $(RM_FILE) $(DESTDIR)/etc/tmpfiles.d/x2goserver.conf + $(RM_DIR) $(DESTDIR)/etc/tmpfiles.d || true uninstall_man: for file in $(BIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(MANDIR)/man5/$$file.5.gz; done -- 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 078fffcc88eef8c1ff0c0505bfe6208f257b9ce6 Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Jan 24 11:26:39 2018 +0100 x2goserver-common/Makefile: whitespace (lineup) only. --- debian/changelog | 1 + x2goserver-common/Makefile | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0f80d8d..7c7d88c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -240,6 +240,7 @@ x2goserver (4.1.0.0-0x2go1.2) UNRELEASED; urgency=low - x2goserver/bin/x2goresume-session: handle missing xinerama parameter in options string gracefully, skipping that part (and the other optional geometry string) correctly. + - x2goserver-common/Makefile: whitespace (lineup) only. * x2goserver.spec: - Only create session DB in x2goserver's post install script. Do use proper Requires(post) statements to make sure perl-X2Go-Server-DB and diff --git a/x2goserver-common/Makefile b/x2goserver-common/Makefile index c3c6565..559b1bc 100755 --- a/x2goserver-common/Makefile +++ b/x2goserver-common/Makefile @@ -59,12 +59,12 @@ install: install_scripts install_config install_man install_version install_scripts: install_config: - $(INSTALL_DIR) $(DESTDIR)$(ETCDIR) - $(INSTALL_FILE) etc/x2goserver.conf $(DESTDIR)$(ETCDIR)/ - $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/x2gosql - $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/x2gosql/passwords - $(INSTALL_FILE) etc/x2gosql/sql $(DESTDIR)$(ETCDIR)/x2gosql - $(INSTALL_DIR) $(DESTDIR)/etc/tmpfiles.d || true + $(INSTALL_DIR) $(DESTDIR)$(ETCDIR) + $(INSTALL_FILE) etc/x2goserver.conf $(DESTDIR)$(ETCDIR)/ + $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/x2gosql + $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/x2gosql/passwords + $(INSTALL_FILE) etc/x2gosql/sql $(DESTDIR)$(ETCDIR)/x2gosql + $(INSTALL_DIR) $(DESTDIR)/etc/tmpfiles.d || true $(INSTALL_FILE) etc/tmpfiles.d/x2goserver.conf $(DESTDIR)/etc/tmpfiles.d/ install_man: -- 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 ee8c1433a52832c5a57274f4a79ed81920e6d700 Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Jan 24 10:57:08 2018 +0100 x2goserver.spec: add new conffile /etc/tmpfiles.d/x2goserver.conf on systems that actually use/have systemd. Cherry-picked from release/4.0.1.x branch. Moved into x2goserver-common package. --- debian/changelog | 2 ++ x2goserver.spec | 9 +++++++++ 2 files changed, 11 insertions(+) diff --git a/debian/changelog b/debian/changelog index 194850a..38e2398 100644 --- a/debian/changelog +++ b/debian/changelog @@ -398,6 +398,8 @@ x2goserver (4.0.1.23-0x2go1) UNRELEASED; urgency=medium - Install new files x2go{checkport,get{free,random}port,queryconfig} into the lib dir. - Fix logic when checking for "distro version lower than X". + - Add new conffile /etc/tmpfiles.d/x2goserver.conf on systems that actually + use/have systemd. -- X2Go Release Manager <git-admin@x2go.org> Sat, 11 Nov 2017 13:01:29 +0100 diff --git a/x2goserver.spec b/x2goserver.spec index d7c7f44..88f9b72 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -624,6 +624,12 @@ EOF rm -f "%{buildroot}/etc/sudoers.d/x2goserver" %endif +# Delete tmpfiles.d configuration file on systems +# not using systemd. +%if ( ! 0%{?fedora} ) && ( ( 0%{?rhel} && 0%{?rhel} < 7 ) || ( 0%{?suse_version} && 0%{?suse_version} < 1210 ) ) +rm -f "%{buildroot}/etc/tmpfiles.d/x2goserver.conf" +%endif + %pre common if ! getent group x2gouser 1>/dev/null; then groupadd -r x2gouser @@ -892,6 +898,9 @@ fi %config(noreplace) %{_sysconfdir}/x2go/x2goserver.conf %config(noreplace) %{_sysconfdir}/x2go/x2gosql/sql %config(noreplace) %{_sysconfdir}/x2go/x2go_logout* +%if 0%{?fedora} || 0%{?rhel} >= 7 || 0%{?suse_version} >= 1210 +%config(noreplace) %{_sysconfdir}/tmpfiles.d/x2goserver.conf +%endif %{_mandir}/man5/x2goserver.conf.5.gz %dir %{_datadir}/x2go/versions %{_datadir}/x2go/versions/VERSION.x2goserver-common -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git