uppkg

3 files changed, 33 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ddf086afe86f..1ae10910dc5a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = xrdp-devel-git
 	pkgdesc = An open source remote desktop protocol (RDP) server - GIT version
-	pkgver = 0.9.13.r0.g0a669c5b
+	pkgver = 0.9.16.r0.ga4c7ee07
 	pkgrel = 1
 	url = https://github.com/neutrinolabs/xrdp
 	install = xrdp-devel-git.install
@@ -15,14 +15,14 @@ pkgbase = xrdp-devel-git
 	depends = lame
 	depends = opus
 	depends = fuse
-	provides = xrdp=0.9.13-1
+	provides = xrdp=0.9.16-1
 	conflicts = xrdp
 	backup = etc/xrdp/sesman.ini
 	backup = etc/xrdp/xrdp.ini
 	source = xrdp-devel-git::git+https://github.com/neutrinolabs/xrdp.git#branch=devel
 	source = arch-config.diff
 	md5sums = SKIP
-	md5sums = 5b0c7390d6380cc05cb76980426af9fc
+	md5sums = 68880e5311dd0fbb6d970278f52241f4
 
 pkgname = xrdp-devel-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 5ee13ea1393a..5fbc12319515 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: Tau Tsao <realturner at gmail.com>
 pkgname=xrdp-devel-git
 _pkgname=xrdp
-pkgver=0.9.13.r0.g0a669c5b
+pkgver=0.9.16.r0.ga4c7ee07
 pkgrel=1
 pkgdesc="An open source remote desktop protocol (RDP) server - GIT version"
 url="https://github.com/neutrinolabs/$_pkgname"
@@ -17,16 +17,16 @@ install="${pkgname}.install"
 source=("$pkgname::git+https://github.com/neutrinolabs/xrdp.git#branch=devel"
         "arch-config.diff")
 md5sums=('SKIP'
-         '5b0c7390d6380cc05cb76980426af9fc')
+         '68880e5311dd0fbb6d970278f52241f4')
 
 pkgver() {
   cd $pkgname
-  printf "0.9.13.r%s.g%s" "$(git rev-list --count v0.9.13..HEAD)" "$(git rev-parse --short HEAD)"
+  printf "0.9.16.r%s.g%s" "$(git rev-list --count v0.9.16..HEAD)" "$(git rev-parse --short HEAD)"
 }
 
 prepare() {
   cd $pkgname
-  patch -Np2 -b -z .orig < ../arch-config.diff
+  patch -Np2 -b -z .orig <../arch-config.diff
   ./bootstrap
 }
 
diff --git a/arch-config.diff b/arch-config.diff
index 655de09eaa37..946f25866ac2 100644
--- a/arch-config.diff
+++ b/arch-config.diff
@@ -1,6 +1,6 @@
-diff -up src/xrdp-devel-git/instfiles/xrdp.service.in.orig src/xrdp-devel-git/instfiles/xrdp.service.in
---- src/xrdp-devel-git/instfiles/xrdp.service.in.orig	2017-08-30 00:30:33.000000000 -0600
-+++ src/xrdp-devel-git/instfiles/xrdp.service.in	2017-08-30 00:31:08.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	2021-05-12 17:14:14.530000000 -0600
++++ src/xrdp-git/instfiles/xrdp.service.in	2021-05-12 17:14:15.300000000 -0600
 @@ -7,10 +7,8 @@ After=network.target xrdp-sesman.service
  [Service]
  Type=forking
@@ -14,9 +14,9 @@ diff -up src/xrdp-devel-git/instfiles/xrdp.service.in.orig src/xrdp-devel-git/in
  
  [Install]
  WantedBy=multi-user.target
-diff -up src/xrdp-devel-git/instfiles/xrdp-sesman.service.in.orig src/xrdp-devel-git/instfiles/xrdp-sesman.service.in
---- src/xrdp-devel-git/instfiles/xrdp-sesman.service.in.orig	2017-08-30 00:31:39.000000000 -0600
-+++ src/xrdp-devel-git/instfiles/xrdp-sesman.service.in	2017-08-30 00:32:25.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	2021-05-12 17:14:14.530000000 -0600
++++ src/xrdp-git/instfiles/xrdp-sesman.service.in	2021-05-12 17:14:15.310000000 -0600
 @@ -8,10 +8,8 @@ BindsTo=xrdp.service
  [Service]
  Type=forking
@@ -30,21 +30,37 @@ diff -up src/xrdp-devel-git/instfiles/xrdp-sesman.service.in.orig src/xrdp-devel
  
  [Install]
  WantedBy=multi-user.target
-diff -up src/xrdp-devel-git/sesman/startwm.sh.orig src/xrdp-devel-git/sesman/startwm.sh
---- src/xrdp-devel-git/sesman/startwm.sh.orig	2017-08-30 00:27:30.000000000 -0600
-+++ src/xrdp-devel-git/sesman/startwm.sh	2017-08-30 00:28:00.000000000 -0600
-@@ -56,6 +56,17 @@ wm_start()
+diff -up src/xrdp-git/sesman/sesman.ini.in.orig src/xrdp-git/sesman/sesman.ini.in
+--- src/xrdp-git/sesman/sesman.ini.in.orig	2021-05-12 17:14:14.880000000 -0600
++++ src/xrdp-git/sesman/sesman.ini.in	2021-05-12 17:15:56.580000000 -0600
+@@ -94,7 +94,7 @@ EnableSyslog=true
+ ; CentOS 7              :  param=/usr/bin/Xorg or param=Xorg
+ ; CentOS 8              :  param=/usr/libexec/Xorg
+ ;
+-param=Xorg
++param=/usr/lib/Xorg
+ ; Leave the rest paramaters as-is unless you understand what will happen.
+ param=-config
+ param=xrdp/xorg.conf
+diff -up src/xrdp-git/sesman/startwm.sh.orig src/xrdp-git/sesman/startwm.sh
+--- src/xrdp-git/sesman/startwm.sh.orig	2021-05-12 17:14:14.890000000 -0600
++++ src/xrdp-git/sesman/startwm.sh	2021-05-12 17:14:15.310000000 -0600
+@@ -63,6 +63,21 @@ wm_start()
      export LANG LANGUAGE
    fi
  
 +  # 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
 +