Arch Linux xrdp 0.9.21.1 arch-config.diff

arch-config.diff

diff -up src/xrdp-0.9.21.1/instfiles/xrdp.service.in.orig src/xrdp-0.9.21.1/instfiles/xrdp.service.in
--- src/xrdp-0.9.21.1/instfiles/xrdp.service.in.orig	2020-06-26 06:13:58.000000000 -0500
+++ src/xrdp-0.9.21.1/instfiles/xrdp.service.in	2022-12-17 12:52:05.780527631 -0600
@@ -6,11 +6,9 @@ After=network.target xrdp-sesman.service

 [Service]
 Type=forking
-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.21.1/instfiles/xrdp-sesman.service.in.orig src/xrdp-0.9.21.1/instfiles/xrdp-sesman.service.in
--- src/xrdp-0.9.21.1/instfiles/xrdp-sesman.service.in.orig	2022-12-09 01:47:27.000000000 -0600
+++ src/xrdp-0.9.21.1/instfiles/xrdp-sesman.service.in	2022-12-17 12:52:05.780527631 -0600
@@ -7,11 +7,9 @@ BindsTo=xrdp.service

 [Service]
 Type=forking
-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.21.1/sesman/sesman.ini.orig src/xrdp-0.9.21.1/sesman/sesman.ini
--- src/xrdp-0.9.21.1/sesman/sesman.ini.orig	2022-12-13 03:01:50.000000000 -0600
+++ src/xrdp-0.9.21.1/sesman/sesman.ini	2022-12-17 12:52:05.783861328 -0600
@@ -111,7 +111,7 @@ EnableSyslog=true
 ; CentOS 8              :  param=/usr/libexec/Xorg
 ; FreeBSD (from 2022Q4) :  param=/usr/local/libexec/Xorg
 ;
-param=Xorg
+param=/usr/lib/Xorg
 ; Leave the rest parameters as-is unless you understand what will happen.
 param=-config
 param=xrdp/xorg.conf
diff -up src/xrdp-0.9.21.1/sesman/startwm.sh.orig src/xrdp-0.9.21.1/sesman/startwm.sh
--- src/xrdp-0.9.21.1/sesman/startwm.sh.orig	2022-11-09 04:26:07.000000000 -0600
+++ src/xrdp-0.9.21.1/sesman/startwm.sh	2022-12-17 12:52:05.783861328 -0600
@@ -58,11 +58,26 @@ post_start()
 #start the window manager
 wm_start()
 {
-  if [ -r /etc/default/locale ]; then
-    . /etc/default/locale
+  if [ -r /etc/locale.conf ]; then
+    . /etc/locale.conf
     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
+
   # debian
   if [ -r /etc/X11/Xsession ]; then
     pre_start