[pkg-remote-commits] [xrdp] 02/04: Merge branch 'master' of git+ssh://git.debian.org/git/pkg-remote/xrdp

[Thorsten Glaser]

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

tg pushed a commit to branch master
in repository xrdp.

commit 06bec9da8e6bdaccdac790ce06f23c38ca329159
Merge: 33cf0bb a45858b
Author: mirabilos <t.glaser at tarent.de>
Date:   Wed Jan 25 16:33:18 2017 +0100

    Merge branch 'master' of git+ssh://git.debian.org/git/pkg-remote/xrdp

 debian/changelog             | 11 ++++++++---
 debian/patches/kfreebsd.diff |  2 +-
 debian/patches/series        |  2 +-
 debian/patches/sockpath.diff | 16 +++++++++++++++-
 debian/patches/systemd.diff  | 38 ++++++++++++++++----------------------
 5 files changed, 41 insertions(+), 28 deletions(-)

diff --cc debian/changelog
index 69e7610,75e3cb4..c39939d
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,17 +1,18 @@@
  xrdp (0.9.1-4) unstable; urgency=high
  
+   [ Thorsten Glaser ]
    * Fix up PAM conffile handling for upgrades from jessie{,-backports}.
-   * Don’t use FUSE on the Hurd, it does not support enough of it yet.
-   * Add GNU/kFreeBSD support to NASM format detection autoconfigury.
+   * Fix build on non-linux architectures. (Closes: #831663)
+     + Don’t use FUSE on the Hurd, it does not support enough of it yet.
+     + Add GNU/kFreeBSD support to NASM format detection autoconfigury.
    * Remove patch to make stack not executable in *.asm files; upstrem
      fixed this already.
 +  * Enable Large File Support, as pointed out by lintian.
  
-  -- Thorsten Glaser <tg at mirbsd.de>  Wed, 25 Jan 2017 13:42:12 +0100
+   [ Dominik George ]
+   * Update/minimise systemd service file patch.
+ 
+  -- Dominik George <nik at naturalnet.de>  Wed, 25 Jan 2017 15:39:19 +0100
  
  xrdp (0.9.1-3) unstable; urgency=medium
  
diff --cc debian/patches/series
index 72a82f3,cd218cf..e508bb6
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -6,4 -5,4 +5,5 @@@ fix_perms.dif
  shutup-daemon.diff
  sockpath.diff
  kfreebsd.diff
+ systemd.diff
 +lfs.diff
diff --cc debian/patches/sockpath.diff
index 4b72bcb,1ea6ba0..341629c
--- a/debian/patches/sockpath.diff
+++ b/debian/patches/sockpath.diff
@@@ -81,6 -81,6 +81,20 @@@ Subject: change location of the socket 
   UNIX socket used to communicate with the \fBxrdp\fP(8) session manager.
   
   .SH KNOWN ISSUES
++--- a/instfiles/xrdp.service
+++++ b/instfiles/xrdp.service
++@@ -8,8 +8,11 @@ Type=forking
++ PIDFile=/var/run/xrdp.pid
++ EnvironmentFile=-/etc/sysconfig/xrdp
++ EnvironmentFile=-/etc/default/xrdp
+++PermissionsStartOnly=true
+++ExecStartPre=/bin/sh /usr/share/xrdp/socksetup
++ ExecStart=/usr/sbin/xrdp $XRDP_OPTIONS
++ ExecStop=/usr/sbin/xrdp $XRDP_OPTIONS --kill
+++ExecStopPost=/bin/rm -rf /var/run/xrdp/sockdir
++ 
++ [Install]
++ WantedBy=multi-user.target
  --- a/sesman/chansrv/pulse/module-xrdp-sink.c
  +++ b/sesman/chansrv/pulse/module-xrdp-sink.c
  @@ -84,7 +84,7 @@ PA_MODULE_USAGE(

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