version 0.9.3-1

3 files changed, 25 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 14803c3686a2..f9b10f07eed8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = xrdp
 	pkgdesc = An open source remote desktop protocol (RDP) server
-	pkgver = 0.9.2
+	pkgver = 0.9.3
 	pkgrel = 1
 	url = https://github.com/neutrinolabs/xrdp
 	install = xrdp.install
@@ -16,10 +16,10 @@ pkgbase = xrdp
 	depends = fuse
 	backup = etc/xrdp/sesman.ini
 	backup = etc/xrdp/xrdp.ini
-	source = https://github.com/neutrinolabs/xrdp/releases/download/v0.9.2/xrdp-0.9.2.tar.gz
+	source = https://github.com/neutrinolabs/xrdp/releases/download/v0.9.3/xrdp-0.9.3.tar.gz
 	source = arch-config.diff
-	md5sums = afe2f922d2912a19dab1f78c927c204b
-	md5sums = 4ffed594dcc6ca76553893a807c1645d
+	md5sums = 51167f1ca1f15a25b7ae82310dc6783c
+	md5sums = 50424a25558d08abff0575cb64ee3418
 
 pkgname = xrdp
 
diff --git a/PKGBUILD b/PKGBUILD
index faf5dd064dba..a3b9cce44fbb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 # Contributor: Mathias R. <pu154r@overlinux.org>
 
 pkgname=xrdp
-pkgver=0.9.2
+pkgver=0.9.3
 pkgrel=1
 pkgdesc="An open source remote desktop protocol (RDP) server"
 url="https://github.com/neutrinolabs/xrdp"
@@ -18,8 +18,8 @@ backup=('etc/xrdp/sesman.ini' 'etc/xrdp/xrdp.ini')
 install="${pkgname}.install"
 source=("https://github.com/neutrinolabs/xrdp/releases/download/v${pkgver}/xrdp-${pkgver}.tar.gz"
 	"arch-config.diff")
-md5sums=('afe2f922d2912a19dab1f78c927c204b'
-         '4ffed594dcc6ca76553893a807c1645d')
+md5sums=('51167f1ca1f15a25b7ae82310dc6783c'
+         '50424a25558d08abff0575cb64ee3418')
 
 prepare() {
   cd "${pkgname}-${pkgver}"
diff --git a/arch-config.diff b/arch-config.diff
index 7e20180fac87..5457ebf8d2e5 100644
--- a/arch-config.diff
+++ b/arch-config.diff
@@ -1,38 +1,38 @@
-diff -up src/xrdp-0.9.2/instfiles/xrdp.service.orig src/xrdp-0.9.2/instfiles/xrdp.service
---- src/xrdp-0.9.2/instfiles/xrdp.service.orig	2017-02-20 00:11:37.000000000 -0700
-+++ src/xrdp-0.9.2/instfiles/xrdp.service	2017-03-31 14:38:23.000000000 -0600
+diff -up src/xrdp-0.9.3/instfiles/xrdp.service.orig src/xrdp-0.9.3/instfiles/xrdp.service
+--- src/xrdp-0.9.3/instfiles/xrdp.service.orig	2017-07-29 19:09:02.000000000 -0600
++++ src/xrdp-0.9.3/instfiles/xrdp.service	2017-07-29 19:13:34.000000000 -0600
 @@ -7,10 +7,8 @@ After=network.target xrdp-sesman.service
  [Service]
  Type=forking
  PIDFile=/var/run/xrdp.pid
 -EnvironmentFile=-/etc/sysconfig/xrdp
 -EnvironmentFile=-/etc/default/xrdp
--ExecStart=/usr/sbin/xrdp $XRDP_OPTIONS
--ExecStop=/usr/sbin/xrdp $XRDP_OPTIONS --kill
+-ExecStart=/usr/local/sbin/xrdp $XRDP_OPTIONS
+-ExecStop=/usr/local/sbin/xrdp $XRDP_OPTIONS --kill
 +ExecStart=/usr/bin/xrdp
 +ExecStop=/usr/bin/xrdp --kill
  
  [Install]
  WantedBy=multi-user.target
-diff -up src/xrdp-0.9.2/instfiles/xrdp-sesman.service.orig src/xrdp-0.9.2/instfiles/xrdp-sesman.service
---- src/xrdp-0.9.2/instfiles/xrdp-sesman.service.orig	2017-03-31 14:38:23.000000000 -0600
-+++ src/xrdp-0.9.2/instfiles/xrdp-sesman.service	2017-03-31 14:40:29.000000000 -0600
+diff -up src/xrdp-0.9.3/instfiles/xrdp-sesman.service.orig src/xrdp-0.9.3/instfiles/xrdp-sesman.service
+--- src/xrdp-0.9.3/instfiles/xrdp-sesman.service.orig	2017-07-29 19:09:02.000000000 -0600
++++ src/xrdp-0.9.3/instfiles/xrdp-sesman.service	2017-07-29 19:14:49.000000000 -0600
 @@ -8,10 +8,8 @@ BindsTo=xrdp.service
  [Service]
  Type=forking
  PIDFile=/var/run/xrdp-sesman.pid
 -EnvironmentFile=-/etc/sysconfig/xrdp
 -EnvironmentFile=-/etc/default/xrdp
--ExecStart=/usr/sbin/xrdp-sesman $SESMAN_OPTIONS
--ExecStop=/usr/sbin/xrdp-sesman $SESMAN_OPTIONS --kill
+-ExecStart=/usr/local/sbin/xrdp-sesman $SESMAN_OPTIONS
+-ExecStop=/usr/local/sbin/xrdp-sesman $SESMAN_OPTIONS --kill
 +ExecStart=/usr/bin/xrdp-sesman
 +ExecStop=/usr/bin/xrdp-sesman --kill
  
  [Install]
  WantedBy=multi-user.target
-diff -up src/xrdp-0.9.2/instfiles/xrdp.sh.orig src/xrdp-0.9.2/instfiles/xrdp.sh
---- src/xrdp-0.9.2/instfiles/xrdp.sh.orig	2016-12-22 05:09:05.000000000 -0700
-+++ src/xrdp-0.9.2/instfiles/xrdp.sh	2017-03-31 14:38:23.000000000 -0600
+diff -up src/xrdp-0.9.3/instfiles/xrdp.sh.orig src/xrdp-0.9.3/instfiles/xrdp.sh
+--- src/xrdp-0.9.3/instfiles/xrdp.sh.orig	2017-06-26 07:09:39.000000000 -0600
++++ src/xrdp-0.9.3/instfiles/xrdp.sh	2017-07-29 19:09:03.000000000 -0600
 @@ -17,7 +17,7 @@
  # Description: starts xrdp
  ### END INIT INFO
@@ -42,10 +42,10 @@ diff -up src/xrdp-0.9.2/instfiles/xrdp.sh.orig src/xrdp-0.9.2/instfiles/xrdp.sh
  LOG=/dev/null
  CFGDIR=/etc/xrdp
  
-diff -up src/xrdp-0.9.2/sesman/startwm.sh.orig src/xrdp-0.9.2/sesman/startwm.sh
---- src/xrdp-0.9.2/sesman/startwm.sh.orig	2016-12-22 05:09:05.000000000 -0700
-+++ src/xrdp-0.9.2/sesman/startwm.sh	2017-03-31 14:38:23.000000000 -0600
-@@ -8,6 +8,17 @@ wm_start()
+diff -up src/xrdp-0.9.3/sesman/startwm.sh.orig src/xrdp-0.9.3/sesman/startwm.sh
+--- src/xrdp-0.9.3/sesman/startwm.sh.orig	2017-07-13 01:46:42.000000000 -0600
++++ src/xrdp-0.9.3/sesman/startwm.sh	2017-07-29 19:09:03.000000000 -0600
+@@ -56,6 +56,17 @@ wm_start()
      export LANG LANGUAGE
    fi
  
@@ -62,4 +62,4 @@ diff -up src/xrdp-0.9.2/sesman/startwm.sh.orig src/xrdp-0.9.2/sesman/startwm.sh
 +
    # debian
    if [ -r /etc/X11/Xsession ]; then
-     . /etc/X11/Xsession
+     pre_start