The branch, release/4.0.1.x has been updated via eff2d25a50671382d578e3fc9a9f0a1e04f75bb1 (commit) from 057048d2f62841894c39a2ca00cd5a62a529d02f (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit eff2d25a50671382d578e3fc9a9f0a1e04f75bb1 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Sep 18 23:56:35 2013 +0200 Provide sudoers.d/x2goserver file that allows sudoed commands under KDE (by pertaining the env var QT_GRAPHICSSYSTEM. (Fixes: #276). ----------------------------------------------------------------------- Summary of changes: INSTALL | 1 + debian/changelog | 2 ++ debian/x2goserver.install | 3 ++- debian/x2goserver.postinst | 6 ++++++ debian/x2goserver.postrm | 3 +++ x2goserver/Makefile | 4 ++++ x2goserver/etc/sudoers.d/x2goserver | 1 + 7 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 x2goserver/etc/sudoers.d/x2goserver The diff of changes is: diff --git a/INSTALL b/INSTALL index 4bbf432..c006039 100644 --- a/INSTALL +++ b/INSTALL @@ -41,6 +41,7 @@ Configure ownership, permissions and setgid group bits of x2gosqlitewrapper and $ chown root:x2goprint /usr/bin/x2goprint $ chmod 2755 /usr/bin/x2goprint + $ chown 0440 /etc/sudoers.d/x2goserver 4.) INIT SCRIPT --------------- diff --git a/debian/changelog b/debian/changelog index 9ac7b64..ae4f45c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,8 @@ x2goserver (4.0.1.7-0~x2go1) UNRELEASED; urgency=low (Fixes: #278). - Fix automatic keyboard setup (via x2gosetkeyboard) while resuming a session. (Fixes: #285). + - Provide sudoers.d/x2goserver file that allows sudoed commands under + KDE (by pertaining the env var QT_GRAPHICSSYSTEM. (Fixes: #276). * /debian/control: - Update LONG_DESCRIPTIONS. - Move xfonts-base from Recommends: field to Depends: field (bin:package diff --git a/debian/x2goserver.install b/debian/x2goserver.install index 4ed8986..5cd66c7 100644 --- a/debian/x2goserver.install +++ b/debian/x2goserver.install @@ -1,7 +1,8 @@ x2goserver/bin/x2go* /usr/bin/ x2goserver/sbin/x2go* /usr/sbin/ x2goserver/lib/x2go* /usr/lib/x2go/ -x2goserver/etc/* /etc/x2go/ +x2goserver/etc/x2go* /etc/x2go/ +x2goserver/etc/sudoers.d/x2goserver /etc/sudoers.d x2goserver/VERSION.x2goserver /usr/share/x2go/versions/ x2goserver/x2gosqlitewrapper /usr/lib/x2go/ x2goserver/share/x2gofeature.d /usr/share/x2go/ diff --git a/debian/x2goserver.postinst b/debian/x2goserver.postinst index 2837629..5ef2357 100755 --- a/debian/x2goserver.postinst +++ b/debian/x2goserver.postinst @@ -98,6 +98,12 @@ case "$1" in dpkg-statoverride --add --update root x2gouser 2755 /usr/lib/x2go/x2gosqlitewrapper fi + # sudoers.d files have to be installed 0440:root:root + if ! dpkg-statoverride --list /etc/sudoers.d/x2goserver >/dev/null; then + dpkg-statoverride --add --update root root 0440 /etc/sudoers.d/x2goserver + fi + + # create /etc/x2go/applications symlink if not already there (as link or as dir) if ! test -e /etc/x2go/applications; then ln -s /usr/share/applications /etc/x2go/applications diff --git a/debian/x2goserver.postrm b/debian/x2goserver.postrm index 2d965cc..f3666b3 100755 --- a/debian/x2goserver.postrm +++ b/debian/x2goserver.postrm @@ -21,6 +21,9 @@ case "$1" in if dpkg-statoverride --list /usr/lib/x2go/x2gosqlitewrapper >/dev/null; then dpkg-statoverride --remove /usr/lib/x2go/x2gosqlitewrapper fi + if dpkg-statoverride --list /etc/sudoers.d/x2goserver >/dev/null; then + dpkg-statoverride --remove /etc/sudoers.d/x2goserver + fi echo "Removing x2go session database" >&2 rm -vf /var/lib/x2go/x2go_sessions rm -vf /etc/x2go/x2gosql/passwords/pgadmin diff --git a/x2goserver/Makefile b/x2goserver/Makefile index d324bc5..828ce1a 100755 --- a/x2goserver/Makefile +++ b/x2goserver/Makefile @@ -84,6 +84,8 @@ install_config: $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/x2go_logout.d $(INSTALL_FILE) etc/x2go_logout $(DESTDIR)$(ETCDIR)/ $(INSTALL_FILE) etc/x2go_logout.d/* $(DESTDIR)$(ETCDIR)/x2go_logout.d/ + $(INSTALL_DIR) $(DESTDIR)/etc/sudoers.d || true + $(INSTALL_FILE) etc/sudoers.d/x2goserver $(DESTDIR)/etc/sudoers.d/ install_man: $(INSTALL_DIR) $(DESTDIR)$(MANDIR) @@ -114,6 +116,8 @@ uninstall_config: $(RM_DIR) $(DESTDIR)$(ETCDIR) || true $(RM_DIR) $(DESTDIR)$(ETCDIR)/x2gosql/passwords || true $(RM_DIR) $(DESTDIR)$(ETCDIR)/x2gosql || true + $(RM_FILE) $(DESTDIR)/etc/sudoers.d/x2goserver + $(RM_DIR) $(DESTDIR)/etc/sudoers.d || true uninstall_man: for file in $(BIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(MANDIR)/man8/$$file.8.gz; done diff --git a/x2goserver/etc/sudoers.d/x2goserver b/x2goserver/etc/sudoers.d/x2goserver new file mode 100644 index 0000000..8d4cd73 --- /dev/null +++ b/x2goserver/etc/sudoers.d/x2goserver @@ -0,0 +1 @@ +Defaults env_keep +="QT_GRAPHICSSYSTEM" hooks/post-receive -- x2goserver.git (X2Go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2Go Server).