From 2fc72167a1dc84b526c197b21dbd4e6b77333d45 Mon Sep 17 00:00:00 2001
From: Bojan Smojver <bojan@rexursive.com>
Date: Sat, 30 Dec 2017 19:10:44 +1100
Subject: [PATCH] Bump up to 0.9.5.

---
 .gitignore                                    |  1 +
 sources                                       |  2 +-
 ....2-sesman.patch => xrdp-0.9.5-sesman.patch | 11 +++---
 ...rdp-ini.patch => xrdp-0.9.5-xrdp-ini.patch | 37 +++++++++----------
 xrdp.spec                                     | 12 +++---
 5 files changed, 33 insertions(+), 30 deletions(-)
 rename xrdp-0.9.2-sesman.patch => xrdp-0.9.5-sesman.patch (58%)
 rename xrdp-0.9.2-xrdp-ini.patch => xrdp-0.9.5-xrdp-ini.patch (78%)

diff --git a/.gitignore b/.gitignore
index cc5e865..6e7e867 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ xrdp-cvs-03-17-2010.tar.gz
 /xrdp-0.9.2.tar.gz
 /xrdp-0.9.3.tar.gz
 /xrdp-0.9.4.tar.gz
+/xrdp-0.9.5.tar.gz
diff --git a/sources b/sources
index 993460b..a2201d2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (xrdp-0.9.4.tar.gz) = 25da1bf3a49c2d7fad3791a98fdaef2d5eeb1c7ce8f01b925dfd07803cd2b01d1ee5a97b63014865cf43be362bee576b2b9468391876a7ef9c95ca1c9cbdea1c
+SHA512 (xrdp-0.9.5.tar.gz) = f5989e5fc1d43a066c0d3ad3a6e3d45712122706a2bf049d8396e42598427b3fb24cdd4c3a9aa7f4b8801f95a1659dd1f06ef08f8fa155bc7b72bb801644476a
diff --git a/xrdp-0.9.2-sesman.patch b/xrdp-0.9.5-sesman.patch
similarity index 58%
rename from xrdp-0.9.2-sesman.patch
rename to xrdp-0.9.5-sesman.patch
index 59f8deb..bdae908 100644
--- a/xrdp-0.9.2-sesman.patch
+++ b/xrdp-0.9.5-sesman.patch
@@ -1,5 +1,6 @@
---- xrdp-0.9.2-vanilla/sesman/sesman.ini	2017-02-20 18:11:37.000000000 +1100
-+++ xrdp-0.9.2/sesman/sesman.ini	2017-04-07 11:03:29.929069805 +1000
+diff -ruN xrdp-0.9.5-v/sesman/sesman.ini xrdp-0.9.5/sesman/sesman.ini
+--- xrdp-0.9.5-v/sesman/sesman.ini	2017-12-28 01:30:25.000000000 +1100
++++ xrdp-0.9.5/sesman/sesman.ini	2017-12-30 18:08:03.726887379 +1100
 @@ -3,7 +3,7 @@
  ListenPort=3350
  EnableUserWindowManager=true
@@ -9,9 +10,9 @@
  
  [Security]
  AllowRootLogin=true
-@@ -54,12 +54,12 @@
- EnableSyslog=1
- SyslogLevel=DEBUG
+@@ -78,12 +78,12 @@
+ param=-logfile
+ param=.xorgxrdp.%s.log
  
 -[X11rdp]
 -param=X11rdp
diff --git a/xrdp-0.9.2-xrdp-ini.patch b/xrdp-0.9.5-xrdp-ini.patch
similarity index 78%
rename from xrdp-0.9.2-xrdp-ini.patch
rename to xrdp-0.9.5-xrdp-ini.patch
index 7084d52..a9ec913 100644
--- a/xrdp-0.9.2-xrdp-ini.patch
+++ b/xrdp-0.9.5-xrdp-ini.patch
@@ -1,9 +1,10 @@
---- xrdp-0.9.2/xrdp/xrdp.ini.orig	2017-03-30 17:18:55.000000000 +1100
-+++ xrdp-0.9.2/xrdp/xrdp.ini	2017-03-31 10:19:59.977547714 +1100
-@@ -148,72 +148,72 @@
- ; Session types
- ;
- 
+diff -ruN xrdp-0.9.5-v/xrdp/xrdp.ini xrdp-0.9.5/xrdp/xrdp.ini
+--- xrdp-0.9.5-v/xrdp/xrdp.ini	2017-12-28 01:30:25.000000000 +1100
++++ xrdp-0.9.5/xrdp/xrdp.ini	2017-12-30 18:14:09.862621310 +1100
+@@ -153,72 +153,72 @@
+ ; Some session types such as Xorg, X11rdp and Xvnc start a display server.
+ ; Startup command-line parameters for the display server are configured
+ ; in sesman.ini. See and configure also sesman.ini.
 -[Xorg]
 -name=Xorg
 -lib=libxup.so
@@ -47,7 +48,8 @@
 +#port=-1
  #xserverbpp=24
 -#delay_ms=2000
--
++#code=10
+ 
 -[console]
 -name=console
 -lib=libvnc.so
@@ -55,16 +57,6 @@
 -port=5900
 -username=na
 -password=ask
--#delay_ms=2000
-+#code=10
- 
--[vnc-any]
--name=vnc-any
--lib=libvnc.so
--ip=ask
--port=ask5900
--username=na
--password=ask
 +#[console]
 +#name=console
 +#lib=libvnc.so
@@ -72,8 +64,15 @@
 +#port=5900
 +#username=na
 +#password=ask
-+##delay_ms=2000
-+
+ #delay_ms=2000
+ 
+-[vnc-any]
+-name=vnc-any
+-lib=libvnc.so
+-ip=ask
+-port=ask5900
+-username=na
+-password=ask
 +#[vnc-any]
 +#name=vnc-any
 +#lib=libvnc.so
diff --git a/xrdp.spec b/xrdp.spec
index 33f33f3..504165c 100644
--- a/xrdp.spec
+++ b/xrdp.spec
@@ -6,8 +6,8 @@
 Summary:   Open source remote desktop protocol (RDP) server
 Name:      xrdp
 Epoch:     1
-Version:   0.9.4
-Release:   2%{?dist}
+Version:   0.9.5
+Release:   1%{?dist}
 License:   ASL 2.0
 Group:     Applications/Internet
 URL:       http://www.xrdp.org/
@@ -18,12 +18,11 @@ Source3:   xrdp.logrotate
 Source4:   openssl.conf
 Source5:   README.Fedora
 Source6:   xrdp.te
-Patch0:    xrdp-0.9.2-sesman.patch
-Patch1:    xrdp-0.9.2-xrdp-ini.patch
+Patch0:    xrdp-0.9.5-sesman.patch
+Patch1:    xrdp-0.9.5-xrdp-ini.patch
 Patch2:    xrdp-0.9.4-service.patch
 Patch3:    xrdp-0.9.2-setpriv.patch
 Patch4:    xrdp-0.9.2-scripts-libexec.patch
-Patch5:    xrdp-0.9.4-CVE-2017-16927.patch
 
 BuildRequires: libX11-devel
 BuildRequires: libXfixes-devel
@@ -259,6 +258,9 @@ fi
 %{_datadir}/selinux/*/%{name}.pp
 
 %changelog
+* Sat Dec 30 2017 Bojan Smojver <bojan@rexurive.com> - 1:0.9.5-1
+- Bump up to 0.9.5
+
 * Fri Nov 24 2017 Bojan Smojver <bojan@rexurive.com> - 1:0.9.4-2
 - Patch CVE-2017-16927