[debian-edu-commits] debian-edu/ 18/22: Import real 0.9.0~20161006+git132cc10-1

[Dominik George]

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

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

commit 18d230f76297aa0ee81574772e98271c4d1cc8aa
Author: Dominik George <nik at naturalnet.de>
Date:   Thu Oct 27 23:08:33 2016 +0200

    Import real 0.9.0~20161006+git132cc10-1
---
 debian/changelog        | 38 +++++++++++++++++++-------------------
 debian/control          |  4 ++--
 debian/socksetup        | 30 ++++++++++++++++++++++++------
 debian/xrdp.maintscript |  3 +--
 4 files changed, 46 insertions(+), 29 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index eb62829..9c75020 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,26 +1,26 @@
 xrdp (0.9.0~20161006+git132cc10-1) unstable; urgency=medium
 
-  * New upstream version.
-     + Improve many log messages.
-     + Fixes for build on kfreebsd.
-     + Fix typos and wording of docs and man pages.
-     + Fixes to memory allocation and related things.
-     + Fix in multi-monitor support in x11rdp.
-     + Fix a segfault in x11rdp.
-     + Better region rendring code with pixman.
-     + Fix for issues with non-ASCII characters in clipboard.
-     + Add advanced SSL options in xrdp.ini
-       + Disable SSLv2 by default.
-     + Some keyboard fixes in x11rdp.
-       + Add en-gb keyboard mapping.
-     + Fixes to socket handling.
+  [ Dominik George ]
+  * New upstream version 0.9.0~20161006+git132cc10
+     - Improve many log messages.
+     - Fixes for build on kfreebsd.
+     - Fix typos and wording of docs and man pages.
+     - Fixes to memory allocation and related things.
+     - Fix in multi-monitor support in x11rdp.
+     - Fix a segfault in x11rdp.
+     - Better region rendring code with pixman.
+     - Fix for issues with non-ASCII characters in clipboard.
+     - Add advanced SSL options in xrdp.ini
+       - Disable SSLv2 by default.
+     - Some keyboard fixes in x11rdp.
+       - 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)
-  * Move old, duplicate pam config to new name.
-     + Fixes upgrade path from 0.6.1. (Closes: #836583)
+  * Refresh patches
+  * Update copyright.
+  * Move to team maintenance (Debian Edu Packaging Team).
 
- -- Dominik George <nik at naturalnet.de>  Fri, 07 Oct 2016 01:12:21 +0200
+ -- Mike Gabriel <sunweaver at debian.org>  Fri, 07 Oct 2016 12:50:16 +0200
 
 xrdp (0.9.0~20160601+git703fedd-3) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index bf2e56b..fae3f82 100644
--- a/debian/control
+++ b/debian/control
@@ -25,8 +25,8 @@ Build-Depends:
  systemd [linux-any],
  xserver-xorg-dev,
 Standards-Version: 3.9.8
-Vcs-Browser: https://anonscm.debian.org/cgit/debian-edu/pkg-team/xrdp.git
-Vcs-Git: https://anonscm.debian.org/git/debian-edu/pkg-team/xrdp.git
+Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/xrdp.git
+Vcs-Git: https://anonscm.debian.org/git/collab-maint/xrdp.git
 Homepage: http://xrdp.sourceforge.net
 
 Package: xrdp
diff --git a/debian/socksetup b/debian/socksetup
index 313e72f..9ceef98 100644
--- a/debian/socksetup
+++ b/debian/socksetup
@@ -12,12 +12,30 @@ case $(id -u) in
 	;;
 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; 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/sockdir || exit 1
-chown root:xrdp /var/run/xrdp/sockdir || exit 1
-chmod 3777 /var/run/xrdp/sockdir || 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
 
 :
diff --git a/debian/xrdp.maintscript b/debian/xrdp.maintscript
index 2fac223..731f6e2 100644
--- a/debian/xrdp.maintscript
+++ b/debian/xrdp.maintscript
@@ -1,2 +1 @@
-rm_conffile /etc/pam.d/xrdp-sesman 0.9~
-mv_conffile /etc/pam.d/sesman /etc/pam.d/xrdp-sesman 0.9~
+rm_conffile /etc/pam.d/sesman 0.9~

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