[debian-edu-commits] debian-edu/ 01/03: Be more aggressive creating /var/run directories.

[Dominik George]

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

natureshadow-guest pushed a commit to branch master
in repository xrdp.

commit 14aa14bc4bedf0a90da3fb62c867d11259c18633
Author: Dominik George <nik at naturalnet.de>
Date:   Fri Oct 7 01:02:41 2016 +0200

    Be more aggressive creating /var/run directories.
---
 debian/changelog |  4 +++-
 debian/socksetup | 30 ++++++------------------------
 2 files changed, 9 insertions(+), 25 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fe900e2..91ddcd5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,8 +15,10 @@ xrdp (0.9.0~20161006+git132cc10-1) UNRELEASED; urgency=medium
        + Add en-gb keyboard mapping.
      + Fixes to socket handling.
   * Refresh quilt patches.
+  * Be more aggressive when creating /var/run directories.
+     + Fixes upgrade path from 0.6.1. (Closes: #828868)
 
- -- Dominik George <nik at naturalnet.de>  Mon, 03 Oct 2016 16:43:36 +0200
+ -- Dominik George <nik at naturalnet.de>  Fri, 07 Oct 2016 01:01:40 +0200
 
 xrdp (0.9.0~20160601+git703fedd-3) unstable; urgency=medium
 
diff --git a/debian/socksetup b/debian/socksetup
index 9ceef98..313e72f 100644
--- a/debian/socksetup
+++ b/debian/socksetup
@@ -12,30 +12,12 @@ case $(id -u) in
 	;;
 esac
 
-if ! test -d /var/run/xrdp; then
-	mkdir /var/run/xrdp || exit 1
-	chown root:xrdp /var/run/xrdp || exit 1
-	chmod 2775 /var/run/xrdp || exit 1
-fi
-case $(stat -c '%a,%u,%G,%F' /var/run/xrdp) in
-(2775,0,xrdp,directory) ;;
-(*)
-	echo >&2 "E: /var/run/xrdp has wrong permissions"
-	exit 1
-	;;
-esac
+mkdir -p /var/run/xrdp || exit 1
+chown root:xrdp /var/run/xrdp || exit 1
+chmod 2775 /var/run/xrdp || exit 1
 
-if ! test -d /var/run/xrdp/sockdir; then
-	mkdir /var/run/xrdp/sockdir || exit 1
-	chown root:xrdp /var/run/xrdp/sockdir || exit 1
-	chmod 3777 /var/run/xrdp/sockdir || exit 1
-fi
-case $(stat -c '%a,%u,%G,%F' /var/run/xrdp/sockdir) in
-(3777,0,xrdp,directory) ;;
-(*)
-	echo >&2 "E: /var/run/xrdp/sockdir has wrong permissions"
-	exit 1
-	;;
-esac
+mkdir -p /var/run/xrdp/sockdir || exit 1
+chown root:xrdp /var/run/xrdp/sockdir || exit 1
+chmod 3777 /var/run/xrdp/sockdir || exit 1
 
 :

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/xrdp.git