This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch release/4.0.1.x in repository x2goserver. from e3243ff x2goserver.spec: install new files x2go{checkport,get{free,random}port,queryconfig} into the lib dir. new 0c9ccab x2goserver/etc: add new tmpfiles.d/x2goserver.conf file, protecting session directories from systemd's tmpfiles deletion. new 5ccab95 x2goserver/Makefile: install and uninstall etc/tmpfiles.d/x2goserver.conf. new 7b394c0 x2goserver.spec: fix logic when checking for "distro version lower than X". new c58ac3d x2goserver.spec: add new conffile /etc/tmpfiles.d/x2goserver.conf on systems that actually use/have systemd. new 92675d1 debian/x2goserver.install: install new /etc/tmpfiles.d/x2goserver.conf conffile. The 5 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 | 9 +++++++++ debian/x2goserver.install | 1 + x2goserver.spec | 15 ++++++++++++--- x2goserver/Makefile | 4 ++++ x2goserver/etc/tmpfiles.d/x2goserver.conf | 1 + 5 files changed, 27 insertions(+), 3 deletions(-) create mode 100644 x2goserver/etc/tmpfiles.d/x2goserver.conf -- 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 release/4.0.1.x in repository x2goserver. commit 0c9ccabdc79e6a7979e4b9bf1041ba009c520faf Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Jan 24 10:07:21 2018 +0100 x2goserver/etc: add new tmpfiles.d/x2goserver.conf file, protecting session directories from systemd's tmpfiles deletion. --- debian/changelog | 2 ++ x2goserver/etc/tmpfiles.d/x2goserver.conf | 1 + 2 files changed, 3 insertions(+) diff --git a/debian/changelog b/debian/changelog index 4b23807..291a7a5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -79,6 +79,8 @@ x2goserver (4.0.1.23-0x2go1) UNRELEASED; urgency=medium have been refurbished within the system and reassign them. - x2goserver/bin/x2goresume-ression: whitespace fix only. - 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.spec: - RPMify x2goserver-xsession description. - Remove qt4 stuff, we're not using the framework here. diff --git a/x2goserver/etc/tmpfiles.d/x2goserver.conf b/x2goserver/etc/tmpfiles.d/x2goserver.conf new file mode 100644 index 0000000..81fcb39 --- /dev/null +++ b/x2goserver/etc/tmpfiles.d/x2goserver.conf @@ -0,0 +1 @@ +x /tmp/.x2go-* -- 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 release/4.0.1.x in repository x2goserver. commit 5ccab95a114aa7033bef20d0a930b0fffc23463d 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. --- debian/changelog | 2 ++ x2goserver/Makefile | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 291a7a5..36a0ec5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -81,6 +81,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/Makefile b/x2goserver/Makefile index 9487df4..e7b9698 100755 --- a/x2goserver/Makefile +++ b/x2goserver/Makefile @@ -89,6 +89,8 @@ install_config: $(INSTALL_FILE) etc/sudoers.d/x2goserver $(DESTDIR)/etc/sudoers.d/ $(INSTALL_DIR) $(DESTDIR)/etc/logcheck/ignore.d.server || true $(INSTALL_FILE) etc/logcheck/ignore.d.server/x2goserver $(DESTDIR)/etc/logcheck/ignore.d.server/ + $(INSTALL_DIR) $(DESTDIR)/etc/tmpfiles.d || true + $(INSTALL_FILE) etc/tmpfiles.d/x2goserver.conf $(DESTDIR)/etc/tmpfiles.d/ install_man: $(INSTALL_DIR) $(DESTDIR)$(MANDIR) @@ -127,6 +129,8 @@ uninstall_config: $(RM_FILE) $(DESTDIR)/etc/logcheck/ignore.d.server/x2goserver $(RM_DIR) $(DESTDIR)/etc/logcheck/ignore.d.server || true $(RM_DIR) $(DESTDIR)/etc/logcheck || 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)/man8/$$file.8.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 release/4.0.1.x in repository x2goserver. commit 7b394c0ab8bd342640ca1f4746ce87db05c59e26 Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Jan 24 10:52:12 2018 +0100 x2goserver.spec: fix logic when checking for "distro version lower than X". --- debian/changelog | 1 + x2goserver.spec | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 36a0ec5..d38cc2f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -93,6 +93,7 @@ x2goserver (4.0.1.23-0x2go1) UNRELEASED; urgency=medium - Add correct Group: to x2goserver-logcheck package. - Install new files x2go{checkport,get{free,random}port,queryconfig} into the lib dir. + - Fix logic when checking for "distro version lower than X". -- X2Go Release Manager <git-admin@x2go.org> Sat, 11 Nov 2017 13:01:29 +0100 diff --git a/x2goserver.spec b/x2goserver.spec index ded857b..d551fd8 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -472,7 +472,7 @@ EOF # We move the file to the doc dir, add a README.sudo # and also references this in our wiki on # https://wiki.x2go.org/doku.php/doc:installation:x2goserver#workaround_for_qt... -%if 0%{?suse_version} < 1210 +%if 0%{?suse_version} && 0%{?suse_version} < 1210 rm -f "%{buildroot}/etc/sudoers.d/x2goserver" %endif @@ -633,7 +633,7 @@ fi %doc debian/copyright %doc debian/changelog # Workaround for sudoers on OpenSUSE 11/SLE{S,D} 11. -%if 0%{?suse_version} < 1210 +%if 0%{?suse_version} && 0%{?suse_version} < 1210 %doc x2goserver/doc/README.sudoers %doc x2goserver/etc/sudoers.d/x2goserver %endif @@ -756,7 +756,7 @@ fi %doc debian/changelog # logcheck is not available on OpenSUSE, SLES/SLED, FC19 and RHEL. # Please re-check this periodically. -%if 0%{?suse_version} || 0%{?fedora} < 20 || 0%{?rhel} +%if 0%{?suse_version} || ( 0%{?fedora} && 0%{?fedora} < 20 ) || 0%{?rhel} %dir %{_sysconfdir}/logcheck %dir %{_sysconfdir}/logcheck/ignore.d.server %endif -- 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 release/4.0.1.x in repository x2goserver. commit c58ac3dfee38c5e1dc397b6844a814ba11745c63 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. --- debian/changelog | 2 ++ x2goserver.spec | 9 +++++++++ 2 files changed, 11 insertions(+) diff --git a/debian/changelog b/debian/changelog index d38cc2f..4513312 100644 --- a/debian/changelog +++ b/debian/changelog @@ -94,6 +94,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 d551fd8..47c3345 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -476,6 +476,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 if ! getent group x2gouser 1>/dev/null; then groupadd -r x2gouser @@ -645,6 +651,9 @@ fi %endif %dir %{_sysconfdir}/x2go/ %config(noreplace) %{_sysconfdir}/x2go/x2go* +%if 0%{?fedora} || 0%{?rhel} >= 7 || 0%{?suse_version} >= 1210 +%config(noreplace) %{_sysconfdir}/tmpfiles.d/x2goserver.conf +%endif %{_bindir}/x2go* %exclude %{_bindir}/x2goserver-run-extensions %exclude %{_bindir}/x2gofm -- 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 release/4.0.1.x in repository x2goserver. commit 92675d19b995a34591b97ecac4a8ecbc113a39b8 Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Jan 24 10:58:23 2018 +0100 debian/x2goserver.install: install new /etc/tmpfiles.d/x2goserver.conf conffile. --- debian/changelog | 2 ++ debian/x2goserver.install | 1 + 2 files changed, 3 insertions(+) diff --git a/debian/changelog b/debian/changelog index 4513312..596cfac 100644 --- a/debian/changelog +++ b/debian/changelog @@ -96,6 +96,8 @@ x2goserver (4.0.1.23-0x2go1) UNRELEASED; urgency=medium - 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. + * debian/x2goserver.install: + - Install new /etc/tmpfiles.d/x2goserver.conf conffile. -- X2Go Release Manager <git-admin@x2go.org> Sat, 11 Nov 2017 13:01:29 +0100 diff --git a/debian/x2goserver.install b/debian/x2goserver.install index 08ba586..919d412 100644 --- a/debian/x2goserver.install +++ b/debian/x2goserver.install @@ -4,6 +4,7 @@ x2goserver/lib/x2go* /usr/lib/x2go/ x2goserver/etc/x2go* /etc/x2go/ x2goserver/etc/sudoers.d/x2goserver /etc/sudoers.d x2goserver/etc/logcheck/ignore.d.server/x2goserver /etc/logcheck/ignore.d.server/ +x2goserver/etc/tmpfiles.d/x2go* /etc/tmpfiles.d/ x2goserver/VERSION.x2goserver /usr/share/x2go/versions/ x2goserver/x2gosqlitewrapper /usr/lib/x2go/ x2goserver/share/x2gofeature.d /usr/share/x2go/ -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
-
git-admin＠x2go.org