Update to v0.10.0-beta.1

5 files changed, 22 insertions, 80 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 963ee674f9d8..da22ff9ce466 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = xrdp
 	pkgdesc = An open source remote desktop protocol (RDP) server
-	pkgver = 0.9.24
+	pkgver = 0.10.0_beta.1
 	pkgrel = 1
 	url = https://github.com/neutrinolabs/xrdp
 	install = xrdp.install
@@ -9,9 +9,10 @@ pkgbase = xrdp
 	arch = armv6h
 	arch = armv7l
 	arch = aarch64
-	license = Apache
+	license = Apache-2.0
 	checkdepends = check
 	makedepends = nasm
+	makedepends = cmocka
 	depends = libxrandr
 	depends = fuse
 	depends = libfdk-aac
@@ -26,9 +27,10 @@ pkgbase = xrdp
 	backup = etc/xrdp/key.pem
 	backup = etc/xrdp/startwm.sh
 	backup = etc/xrdp/reconnectwm.sh
-	source = https://github.com/neutrinolabs/xrdp/releases/download/v0.9.24/xrdp-0.9.24.tar.gz
+	backup = etc/default/xrdp
+	source = https://github.com/neutrinolabs/xrdp/releases/download/v0.10.0-beta.1/xrdp-0.10.0-beta.1.tar.gz
 	source = arch-config.diff
-	sha256sums = 68b2c58254ed8488900b99e6f84ed666324e7665614ce68d21dcf2f5e8ad1717
-	sha256sums = 1ea3b860870786e52c7ae0dc83c533ada7e6ef8a33f7bcf4889228337ea3dc15
+	sha256sums = 4e2ce2d4298eccf18edeaa3da040bf457ef3f349a1ca5f9a3bef2cff08842908
+	sha256sums = e0ffce5b1a436990281fe2cc4a3cd9c2840a1dad99740aeaea866ccd9ef56db0
 
 pkgname = xrdp
diff --git a/PKGBUILD b/PKGBUILD
index 155c7471db33..c01f41a49c90 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,13 +7,13 @@
 # Contributor: Alan Beale <the.mrabz@gmail.com>
 
 pkgname=xrdp
-pkgver=0.9.24
+pkgver=0.10.0_beta.1
 pkgrel=1
 pkgdesc="An open source remote desktop protocol (RDP) server"
 url="https://github.com/neutrinolabs/xrdp"
 arch=(i686 x86_64 armv6h armv7l aarch64)
-license=('Apache')
-makedepends=('nasm')
+license=('Apache-2.0')
+makedepends=('nasm' 'cmocka')
 depends=('libxrandr' 'fuse' 'libfdk-aac' 'ffmpeg' 'imlib2')
 checkdepends=('check')
 optdepends=('tigervnc' 'tightvnc' 'realvnc-vnc-server')
@@ -22,23 +22,25 @@ backup=('etc/xrdp/sesman.ini'
 	'etc/xrdp/cert.pem'
 	'etc/xrdp/key.pem'
 	'etc/xrdp/startwm.sh'
-	'etc/xrdp/reconnectwm.sh')
+	'etc/xrdp/reconnectwm.sh'
+	'etc/default/xrdp')
 install="${pkgname}.install"
-source=("https://github.com/neutrinolabs/xrdp/releases/download/v${pkgver}/xrdp-${pkgver}.tar.gz"
+source=("https://github.com/neutrinolabs/xrdp/releases/download/v${pkgver//_/-}/xrdp-${pkgver//_/-}.tar.gz"
 	"arch-config.diff")
-sha256sums=('68b2c58254ed8488900b99e6f84ed666324e7665614ce68d21dcf2f5e8ad1717'
-            '1ea3b860870786e52c7ae0dc83c533ada7e6ef8a33f7bcf4889228337ea3dc15')
+sha256sums=('4e2ce2d4298eccf18edeaa3da040bf457ef3f349a1ca5f9a3bef2cff08842908'
+            'e0ffce5b1a436990281fe2cc4a3cd9c2840a1dad99740aeaea866ccd9ef56db0')
 
 prepare() {
-  cd "${pkgname}-${pkgver}"
+  cd "${pkgname}-${pkgver//_/-}"
   patch -Np2 -b -z .orig <../arch-config.diff
   ./bootstrap
 }
 
 build() {
-  cd "${pkgname}-${pkgver}"
+  cd "${pkgname}-${pkgver//_/-}"
   ./configure --prefix=/usr \
               --sysconfdir=/etc \
+              --libexecdir=/usr/lib \
               --localstatedir=/var \
               --sbindir=/usr/bin \
               --with-systemdsystemunitdir=/usr/lib/systemd/system \
@@ -62,13 +64,15 @@ build() {
 }
 
 check () {
-  cd "${pkgname}-${pkgver}"
+  cd "${pkgname}-${pkgver//_/-}"
   make check
 }
 
 package() {
-  cd "${pkgname}-${pkgver}"
+  cd "${pkgname}-${pkgver//_/-}"
+  sed -i 's^param=Xorg^param=/usr/lib/Xorg^g' sesman/sesman.ini
   make DESTDIR="$pkgdir" install
   rm -f "$pkgdir"/etc/xrdp/rsakeys.ini
   install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
+  install -Dm644 instfiles/default/xrdp "$pkgdir"/etc/default/xrdp
 }
diff --git a/arch-config.diff b/arch-config.diff
index 4f6f598f5b0b..0968a4a7f5cf 100644
--- a/arch-config.diff
+++ b/arch-config.diff
@@ -1,39 +1,3 @@
-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-12 17:06:31.680000000 -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.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-12 17:06:31.690000000 -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.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-12 17:06:31.690000000 -0600
diff --git a/xrdp-sesman.service b/xrdp-sesman.service
deleted file mode 100644
index c33376ecc337..000000000000
--- a/xrdp-sesman.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=xrdp session manager
-After=syslog.target network.target
-StopWhenUnneeded=true
-
-[Service]
-Type=forking
-PIDFile=/var/run/xrdp-sesman.pid
-ExecStart=/usr/bin/xrdp-sesman
-ExecStop=/usr/bin/xrdp-sesman --kill
-
-[Install]
-WantedBy=multi-user.target
-
diff --git a/xrdp.service b/xrdp.service
deleted file mode 100644
index 269dff87b457..000000000000
--- a/xrdp.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=xrdp daemon
-Requires=xrdp-sesman.service
-After=syslog.target network.target xrdp-sesman.service
-
-[Service]
-Type=forking
-PIDFile=/var/run/xrdp.pid
-EnvironmentFile=/etc/xrdp/xrdp.ini
-ExecStart=/usr/bin/xrdp $XRDP_OPTIONS
-ExecStop=/usr/bin/xrdp $XRDP_OPTIONS --kill
-
-[Install]
-WantedBy=multi-user.target