uppkg

3 files changed, 21 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 37205a9f1d21..4b02f6fceaec 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = xrdp
 	pkgdesc = An open source remote desktop protocol (RDP) server
-	pkgver = 0.9.15
+	pkgver = 0.9.16
 	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.15/xrdp-0.9.15.tar.gz
+	source = https://github.com/neutrinolabs/xrdp/releases/download/v0.9.16/xrdp-0.9.16.tar.gz
 	source = arch-config.diff
-	sha256sums = ad0381e45fe5236c34ff750850df9545c5bef45fc3b3c9386217cb65a6f9b541
-	sha256sums = 462c0b973a31effbe0423c7c365b0b2fd2ca5cdc6f1bd8744ea48ef45e04593c
+	sha256sums = 72a86bf3bb8ca3a41905bfa84f500ad73cd23615753f34db7e36278a33c19916
+	sha256sums = b7f7acf1d823cb8c3b732fc5162e316dbd32dc5bc62fc27d9e3d15c60b907cf7
 
 pkgname = xrdp
 
diff --git a/PKGBUILD b/PKGBUILD
index 1d33ba71ec73..7297d09999f2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 # Contributor: Mathias R. <pu154r@overlinux.org>
 
 pkgname=xrdp
-pkgver=0.9.15
+pkgver=0.9.16
 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")
-sha256sums=('ad0381e45fe5236c34ff750850df9545c5bef45fc3b3c9386217cb65a6f9b541'
-            '462c0b973a31effbe0423c7c365b0b2fd2ca5cdc6f1bd8744ea48ef45e04593c')
+sha256sums=('72a86bf3bb8ca3a41905bfa84f500ad73cd23615753f34db7e36278a33c19916'
+            'b7f7acf1d823cb8c3b732fc5162e316dbd32dc5bc62fc27d9e3d15c60b907cf7')
 
 prepare() {
   cd "${pkgname}-${pkgver}"
diff --git a/arch-config.diff b/arch-config.diff
index a274f835b96d..66a5fbe3abdb 100644
--- a/arch-config.diff
+++ b/arch-config.diff
@@ -1,6 +1,6 @@
-diff -up src/xrdp-0.9.9/instfiles/xrdp.service.in.orig src/xrdp-0.9.9/instfiles/xrdp.service.in
---- src/xrdp-0.9.9/instfiles/xrdp.service.in.orig	2018-10-19 01:09:19.000000000 -0600
-+++ src/xrdp-0.9.9/instfiles/xrdp.service.in	2019-01-13 06:49:55.000000000 -0700
+diff -up src/xrdp-0.9.16/instfiles/xrdp.service.in.orig src/xrdp-0.9.16/instfiles/xrdp.service.in
+--- src/xrdp-0.9.16/instfiles/xrdp.service.in.orig	2020-06-26 05:13:58.000000000 -0600
++++ src/xrdp-0.9.16/instfiles/xrdp.service.in	2021-05-02 13:34:02.650000000 -0600
 @@ -6,11 +6,9 @@ After=network.target xrdp-sesman.service
  
  [Service]
@@ -16,9 +16,9 @@ diff -up src/xrdp-0.9.9/instfiles/xrdp.service.in.orig src/xrdp-0.9.9/instfiles/
  
  [Install]
  WantedBy=multi-user.target
-diff -up src/xrdp-0.9.9/instfiles/xrdp-sesman.service.in.orig src/xrdp-0.9.9/instfiles/xrdp-sesman.service.in
---- src/xrdp-0.9.9/instfiles/xrdp-sesman.service.in.orig	2018-10-19 01:09:19.000000000 -0600
-+++ src/xrdp-0.9.9/instfiles/xrdp-sesman.service.in	2019-01-13 06:49:55.000000000 -0700
+diff -up src/xrdp-0.9.16/instfiles/xrdp-sesman.service.in.orig src/xrdp-0.9.16/instfiles/xrdp-sesman.service.in
+--- src/xrdp-0.9.16/instfiles/xrdp-sesman.service.in.orig	2020-06-26 05:13:58.000000000 -0600
++++ src/xrdp-0.9.16/instfiles/xrdp-sesman.service.in	2021-05-02 13:34:02.660000000 -0600
 @@ -7,11 +7,9 @@ BindsTo=xrdp.service
  
  [Service]
@@ -34,10 +34,10 @@ diff -up src/xrdp-0.9.9/instfiles/xrdp-sesman.service.in.orig src/xrdp-0.9.9/ins
  
  [Install]
  WantedBy=multi-user.target
-diff -up src/xrdp-0.9.9/sesman/startwm.sh.orig src/xrdp-0.9.9/sesman/startwm.sh
---- src/xrdp-0.9.9/sesman/startwm.sh.orig	2018-10-25 00:20:43.000000000 -0600
-+++ src/xrdp-0.9.9/sesman/startwm.sh	2019-01-13 06:52:12.000000000 -0700
-@@ -58,11 +58,22 @@ post_start()
+diff -up src/xrdp-0.9.16/sesman/startwm.sh.orig src/xrdp-0.9.16/sesman/startwm.sh
+--- src/xrdp-0.9.16/sesman/startwm.sh.orig	2020-12-28 07:03:43.000000000 -0700
++++ src/xrdp-0.9.16/sesman/startwm.sh	2021-05-02 13:37:03.440000000 -0600
+@@ -58,11 +58,26 @@ post_start()
  #start the window manager
  wm_start()
  {
@@ -50,12 +50,16 @@ diff -up src/xrdp-0.9.9/sesman/startwm.sh.orig src/xrdp-0.9.9/sesman/startwm.sh
  
 +  # arch user
 +  if [ -r ~/.xinitrc ]; then
++    pre_start
 +    . ~/.xinitrc
++    post_start
 +    exit 0
 +  fi
 +  # arch
 +  if [ -r /etc/X11/xinit/xinitrc ]; then
++    pre_start
 +    . /etc/X11/xinit/xinitrc
++    post_start
 +    exit 0
 +  fi
 +