version 1:0.9.2.r0.g7a7445fe

3 files changed, 32 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7dcbcd3e8b47..a8734928db57 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = xrdp-git
 	pkgdesc = An open source remote desktop protocol (RDP) server - GIT version
-	pkgver = 0.9.2.r0.g7a7445fe
+	pkgver = 0.9.3.r0.gaaa40ede
 	pkgrel = 1
 	epoch = 1
 	url = https://github.com/neutrinolabs/xrdp
@@ -23,7 +23,7 @@ pkgbase = xrdp-git
 	source = xrdp-git::git+https://github.com/neutrinolabs/xrdp.git#branch=master
 	source = arch-config.diff
 	md5sums = SKIP
-	md5sums = 4ffed594dcc6ca76553893a807c1645d
+	md5sums = b0680e6f15e888b87b616fdae8c3afc5
 
 pkgname = xrdp-git
 
diff --git a/PKGBUILD b/PKGBUILD
index d1128347e40c..6c74bcbc5e7d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Brian Bidulock <bidulock@openss7.org>
 # Contributor: Tau Tsao <realturner at gmail.com>
 pkgname=xrdp-git
-pkgver=0.9.2.r0.g7a7445fe
+pkgver=0.9.3.r0.gaaa40ede
 pkgrel=1
 epoch=1
 pkgdesc="An open source remote desktop protocol (RDP) server - GIT version"
@@ -17,7 +17,7 @@ install="${pkgname}.install"
 source=("$pkgname::git+https://github.com/neutrinolabs/xrdp.git#branch=master"
         "arch-config.diff")
 md5sums=('SKIP'
-         '4ffed594dcc6ca76553893a807c1645d')
+         'b0680e6f15e888b87b616fdae8c3afc5')
 
 pkgver() {
   cd $pkgname
diff --git a/arch-config.diff b/arch-config.diff
index 7e20180fac87..5ddd0bd6a2a1 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-git/instfiles/xrdp.service.in.orig src/xrdp-git/instfiles/xrdp.service.in
+--- src/xrdp-git/instfiles/xrdp.service.in.orig	2017-07-29 19:28:37.000000000 -0600
++++ src/xrdp-git/instfiles/xrdp.service.in	2017-07-29 19:32:15.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/bin/xrdp
-+ExecStop=/usr/bin/xrdp --kill
+ PIDFile=@localstatedir@/run/xrdp.pid
+-EnvironmentFile=-@sysconfdir@/sysconfig/xrdp
+-EnvironmentFile=-@sysconfdir@/default/xrdp
+-ExecStart=@sbindir@/xrdp $XRDP_OPTIONS
+-ExecStop=@sbindir@/xrdp $XRDP_OPTIONS --kill
++ExecStart=@sbindir@/xrdp
++ExecStop=@sbindir@/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-git/instfiles/xrdp-sesman.service.in.orig src/xrdp-git/instfiles/xrdp-sesman.service.in
+--- src/xrdp-git/instfiles/xrdp-sesman.service.in.orig	2017-07-29 19:28:46.000000000 -0600
++++ src/xrdp-git/instfiles/xrdp-sesman.service.in	2017-07-29 19:33:02.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/bin/xrdp-sesman
-+ExecStop=/usr/bin/xrdp-sesman --kill
+ PIDFile=@localstatedir@/run/xrdp-sesman.pid
+-EnvironmentFile=-@sysconfdir@/sysconfig/xrdp
+-EnvironmentFile=-@sysconfdir@/default/xrdp
+-ExecStart=@sbindir@/xrdp-sesman $SESMAN_OPTIONS
+-ExecStop=@sbindir@/xrdp-sesman $SESMAN_OPTIONS --kill
++ExecStart=@sbindir@/xrdp-sesman
++ExecStop=@sbindir@/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-git/instfiles/xrdp.sh.orig src/xrdp-git/instfiles/xrdp.sh
+--- src/xrdp-git/instfiles/xrdp.sh.orig	2017-07-29 19:27:42.000000000 -0600
++++ src/xrdp-git/instfiles/xrdp.sh	2017-07-29 19:27:45.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-git/sesman/startwm.sh.orig src/xrdp-git/sesman/startwm.sh
+--- src/xrdp-git/sesman/startwm.sh.orig	2017-07-29 19:27:43.000000000 -0600
++++ src/xrdp-git/sesman/startwm.sh	2017-07-29 19:27:45.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