[X2Go-Commits] x2goserver.git - master (branch) updated: 3.1.1.3-212-gf7f414b

[X2Go dev team]

The branch, master has been updated
       via  f7f414b7b87e13e89e9eb9109e00562fa6aecc86 (commit)
      from  5223f882a4ad051a3fdaedf0340cda67c1cd473f (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 f7f414b7b87e13e89e9eb9109e00562fa6aecc86
Author: Mike Gabriel <mike.gabriel at 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).
    
    Conflicts (resolved by Mike Gabriel):
    	debian/x2goserver.install
    	debian/x2goserver.postrm
    	x2goserver/Makefile

-----------------------------------------------------------------------

Summary of changes:
 INSTALL                             |    1 +
 debian/changelog                    |    2 ++
 debian/x2goserver.install           |    1 +
 debian/x2goserver.postinst          |    6 ++++++
 debian/x2goserver.postrm            |    6 +++++-
 x2goserver/Makefile                 |    5 ++++-
 x2goserver/etc/sudoers.d/x2goserver |    1 +
 7 files changed, 20 insertions(+), 2 deletions(-)
 create mode 100644 x2goserver/etc/sudoers.d/x2goserver

The diff of changes is:
diff --git a/INSTALL b/INSTALL
index 7a0d689..d71e20a 100644
--- a/INSTALL
+++ b/INSTALL
@@ -42,6 +42,7 @@ libx2go-server-db-sqlite3-wrapper and x2goprint:
  $ 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 42f36f1..2b362eb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -68,6 +68,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 6427950..d8405dd 100644
--- a/debian/x2goserver.install
+++ b/debian/x2goserver.install
@@ -3,5 +3,6 @@ x2goserver/sbin/x2go*                   /usr/sbin/
 x2goserver/lib/x2go*                    /usr/lib/x2go/
 x2goserver/etc/x2go_logout*             /etc/x2go/
 x2goserver/etc/x2goagent.options        /etc/x2go/
+x2goserver/etc/sudoers.d/x2goserver     /etc/sudoers.d/
 x2goserver/VERSION.x2goserver           /usr/share/x2go/versions/
 x2goserver/share/x2gofeature.d          /usr/share/x2go/
diff --git a/debian/x2goserver.postinst b/debian/x2goserver.postinst
index d7d6952..b4fe116 100755
--- a/debian/x2goserver.postinst
+++ b/debian/x2goserver.postinst
@@ -47,6 +47,12 @@ case "$1" in
 		    dpkg-statoverride --remove /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 d563665..7b1b3a4 100755
--- a/debian/x2goserver.postrm
+++ b/debian/x2goserver.postrm
@@ -18,6 +18,10 @@ set -e
 
 case "$1" in
 	purge)
+		if dpkg-statoverride --list /etc/sudoers.d/x2goserver >/dev/null; then
+			dpkg-statoverride --remove /etc/sudoers.d/x2goserver
+		fi
+
 		rm -Rf /etc/x2go/applications
 		rm -Rf /etc/x2go/x2go_logout.d
 		rmdir --ignore-fail-on-non-empty /etc/x2go
@@ -35,4 +39,4 @@ esac
 
 #DEBHELPER#
 
-exit 0
\ No newline at end of file
+exit 0
diff --git a/x2goserver/Makefile b/x2goserver/Makefile
index c7ced06..d0ba7e9 100755
--- a/x2goserver/Makefile
+++ b/x2goserver/Makefile
@@ -70,7 +70,8 @@ install_config:
 	$(INSTALL_FILE) etc/x2goagent.options $(DESTDIR)$(ETCDIR)/
 	$(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)
@@ -99,6 +100,8 @@ uninstall_config:
 	$(RM_FILE) $(DESTDIR)$(ETCDIR)/x2go_logout
 	$(RM_DIR)  $(DESTDIR)$(ETCDIR)/x2go_logout.d || true
 	$(RM_DIR)  $(DESTDIR)$(ETCDIR) || 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).