[pkg-remote-commits] [xrdp] 02/02: Merge branch 'sid'

[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 0a266e175df90a9870ca86f5557a3ea78a1d55c1
Merge: d3bdc3f 3f72c8e
Author: Dominik George <nik at naturalnet.de>
Date:   Wed Dec 20 19:57:20 2017 +0100

    Merge branch 'sid'

 debian/changelog                    | 12 ++++++++++--
 debian/patches/cve-2017-16927.patch | 16 ++++++++--------
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --cc debian/changelog
index 7be2ee2,4ee181e..83affce
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,10 +1,23 @@@
- xrdp (0.9.4-3) unstable; urgency=high
++xrdp (0.9.4-4) unstable; urgency=high
 +
 +  * Fix (possibly exploitable) high CPU load in ssl_tls_accept.
 +    (Closes: #884453)
 +  * Source /etc/profile in startwm. (Closes: #882246)
 +    + Thanks to Wolfgang Schweer!
 +  * Add package to build PulseAudio modules.
 +    + Thanks to Wolfgang Schweer for the initial idea!
 +  * Update README.Debian.
 +  * Update bug report instructions.
 +
-  -- Dominik George <nik at naturalnet.de>  Fri, 15 Dec 2017 18:53:28 +0100
++ -- Dominik George <nik at portux.lan.naturalnet.de>  Wed, 20 Dec 2017 19:57:05 +0100
++
+ xrdp (0.9.4-3) unstable; urgency=high
+ 
+   * Fix regression introduced by last upload. (Closes: #884702)
+     + Upstream's patch for CVE-2017-16927 turned out to be broken.
+       Thanks to Willem Mulder for reporting.
+ 
+  -- Dominik George <nik at naturalnet.de>  Wed, 20 Dec 2017 19:40:16 +0100
  
  xrdp (0.9.4-2) unstable; urgency=high
  

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