uppkg

3 files changed, 39 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f9b10f07eed8..9388c0c675c6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = xrdp
 	pkgdesc = An open source remote desktop protocol (RDP) server
-	pkgver = 0.9.3
+	pkgver = 0.9.4
 	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.3/xrdp-0.9.3.tar.gz
+	source = https://github.com/neutrinolabs/xrdp/releases/download/v0.9.4/xrdp-0.9.4.tar.gz
 	source = arch-config.diff
-	md5sums = 51167f1ca1f15a25b7ae82310dc6783c
-	md5sums = 50424a25558d08abff0575cb64ee3418
+	md5sums = 44598489561125182f6e2e0c33ac8e19
+	md5sums = 62e398bea7f09f464d2eb25492bfe0dc
 
 pkgname = xrdp
 
diff --git a/PKGBUILD b/PKGBUILD
index a3b9cce44fbb..e86b89067ce5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 # Contributor: Mathias R. <pu154r@overlinux.org>
 
 pkgname=xrdp
-pkgver=0.9.3
+pkgver=0.9.4
 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=('51167f1ca1f15a25b7ae82310dc6783c'
-         '50424a25558d08abff0575cb64ee3418')
+md5sums=('44598489561125182f6e2e0c33ac8e19'
+         '62e398bea7f09f464d2eb25492bfe0dc')
 
 prepare() {
   cd "${pkgname}-${pkgver}"
diff --git a/arch-config.diff b/arch-config.diff
index 5457ebf8d2e5..3fbb65199012 100644
--- a/arch-config.diff
+++ b/arch-config.diff
@@ -1,38 +1,42 @@
-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
+diff -up src/xrdp-0.9.4/instfiles/xrdp.service.in.orig src/xrdp-0.9.4/instfiles/xrdp.service.in
+--- src/xrdp-0.9.4/instfiles/xrdp.service.in.orig	2017-07-18 22:23:49.000000000 -0600
++++ src/xrdp-0.9.4/instfiles/xrdp.service.in	2017-11-18 23:48:10.000000000 -0700
+@@ -6,11 +6,9 @@ After=network.target xrdp-sesman.service
+ 
  [Service]
  Type=forking
- PIDFile=/var/run/xrdp.pid
--EnvironmentFile=-/etc/sysconfig/xrdp
--EnvironmentFile=-/etc/default/xrdp
--ExecStart=/usr/local/sbin/xrdp $XRDP_OPTIONS
--ExecStop=/usr/local/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
++PIDFile=/run/xrdp.pid
++ExecStart=@sbindir@/xrdp
++ExecStop=@sbindir@/xrdp --kill
  
  [Install]
  WantedBy=multi-user.target
-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
+diff -up src/xrdp-0.9.4/instfiles/xrdp-sesman.service.in.orig src/xrdp-0.9.4/instfiles/xrdp-sesman.service.in
+--- src/xrdp-0.9.4/instfiles/xrdp-sesman.service.in.orig	2017-07-18 22:23:49.000000000 -0600
++++ src/xrdp-0.9.4/instfiles/xrdp-sesman.service.in	2017-11-18 23:47:37.000000000 -0700
+@@ -7,11 +7,9 @@ BindsTo=xrdp.service
+ 
  [Service]
  Type=forking
- PIDFile=/var/run/xrdp-sesman.pid
--EnvironmentFile=-/etc/sysconfig/xrdp
--EnvironmentFile=-/etc/default/xrdp
--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
+-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
++PIDFile=/run/xrdp-sesman.pid
++ExecStart=@sbindir@/xrdp-sesman
++ExecStop=@sbindir@/xrdp-sesman --kill
  
  [Install]
  WantedBy=multi-user.target
-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
+diff -up src/xrdp-0.9.4/instfiles/xrdp.sh.orig src/xrdp-0.9.4/instfiles/xrdp.sh
+--- src/xrdp-0.9.4/instfiles/xrdp.sh.orig	2017-06-26 07:09:39.000000000 -0600
++++ src/xrdp-0.9.4/instfiles/xrdp.sh	2017-11-18 23:44:01.000000000 -0700
 @@ -17,7 +17,7 @@
  # Description: starts xrdp
  ### END INIT INFO
@@ -42,9 +46,9 @@ diff -up src/xrdp-0.9.3/instfiles/xrdp.sh.orig src/xrdp-0.9.3/instfiles/xrdp.sh
  LOG=/dev/null
  CFGDIR=/etc/xrdp
  
-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
+diff -up src/xrdp-0.9.4/sesman/startwm.sh.orig src/xrdp-0.9.4/sesman/startwm.sh
+--- src/xrdp-0.9.4/sesman/startwm.sh.orig	2017-07-18 22:23:49.000000000 -0600
++++ src/xrdp-0.9.4/sesman/startwm.sh	2017-11-18 23:42:35.000000000 -0700
 @@ -56,6 +56,17 @@ wm_start()
      export LANG LANGUAGE
    fi