[X2Go-Commits] [x2gothinclient] 01/01: improve support for gnupg and dbus.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2gothinclient.

commit cf5b9ea40760e975ffe7a8019dfe71ed11c02052
Author: Oleksandr Shneyder <o.shneyder at phoca-gmbh.de>
Date:   Thu Mar 1 17:35:03 2018 +0100

    improve support for gnupg and dbus.
---
 debian/changelog                                                    | 1 +
 debian/control                                                      | 6 +++++-
 displaymanager/sbin/x2gothinclientd                                 | 2 ++
 .../share/etc/x2gothinclient_init.d/010_x2gothinclient-fresh-home   | 2 ++
 4 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index e4420b9..77ff588 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -145,6 +145,7 @@ x2gothinclient (1.5.0.0-0x2go1) UNRELEASED; urgency=low
   * install chroot for amd64
   * fix x2gothinclient_update to create files needed by x2gothinclientd
   * let user choose architecture by setting TC_ARCH variable. Default amd64.
+  * improve support for gnupg and dbus.
 
   [ Martti Pitkänen ]
   * debian/po:
diff --git a/debian/control b/debian/control
index 4f79f6c..c60298c 100644
--- a/debian/control
+++ b/debian/control
@@ -79,15 +79,19 @@ Depends:
  plymouth,
  plymouth-themes-all,
  pulseaudio-x11 | pulseaudio,
+ dbus-x11,
+ dbus-user-session,
  syslinux,
  x2gothinclient-displaymanager | x2gothinclient-minidesktop,
  locales,
- dbus-x11,
  policykit-1,
 Recommends:
  acpid,
  gnupg-agent,
  pinentry-x2go,
+ pcscd,
+ pcsc-tools,
+ scdaemon,
  gpgsm,
  less,
  mc,
diff --git a/displaymanager/sbin/x2gothinclientd b/displaymanager/sbin/x2gothinclientd
index 3c48188..3096994 100755
--- a/displaymanager/sbin/x2gothinclientd
+++ b/displaymanager/sbin/x2gothinclientd
@@ -110,6 +110,8 @@ elsif ($pid == 0 )
 
 			# wait for X-Server to come up
 			sleep(3);
+			# execute Xsession file
+			qx(su - x2gothinclient -c \"export DISPLAY=:0; /etc/X11/Xsession 1>/dev/null 2>/dev/null\");
 
 			# Align displays next to each other in order of appearance in xrandr, unless touch
 			# devices are detected - in that case, clone displays so that touchable area and display
diff --git a/management/share/etc/x2gothinclient_init.d/010_x2gothinclient-fresh-home b/management/share/etc/x2gothinclient_init.d/010_x2gothinclient-fresh-home
index ba235f9..5375317 100755
--- a/management/share/etc/x2gothinclient_init.d/010_x2gothinclient-fresh-home
+++ b/management/share/etc/x2gothinclient_init.d/010_x2gothinclient-fresh-home
@@ -37,6 +37,8 @@ if [ -z "$X2GO_HANDLE_DAEMON" ]; then
 	mkdir -p ~x2gothinclient/.kde
 	mkdir -p ~x2gothinclient/.kde/socket-`hostname`
 	mkdir -p ~x2gothinclient/mounts
+	mkdir -p ~x2gothinclient/.gnupg
+	echo -e "pinentry-program /usr/bin/pinentry-x2go\nenable-ssh-support">~x2gothinclient/.gnupg/gpg-agent.conf
 	mkdir -p ~x2gothinclient/export
 	mkdir -p ~x2gothinclient/logins
 	mkdir -p ~x2gothinclient/.ssh

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gothinclient.git