aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancesco Colista <fcolista@alpinelinux.org>2021-08-06 14:28:08 +0000
committerFrancesco Colista <fcolista@alpinelinux.org>2021-08-06 14:29:19 +0000
commit54fbb84767edf822382c5ccfb341a8142316f818 (patch)
tree3faf2a82285dcc8762c8dc919220cfc75c95752a
parent8823831c66511d604a6c174910c458d2d9aec10d (diff)
downloadaports-54fbb84767edf822382c5ccfb341a8142316f818.tar.gz
aports-54fbb84767edf822382c5ccfb341a8142316f818.tar.bz2
aports-54fbb84767edf822382c5ccfb341a8142316f818.tar.xz
community/xrdp: enable pam, added alpine support on startwm.sh script
Fixes #12896
-rw-r--r--community/xrdp/APKBUILD8
-rw-r--r--community/xrdp/alpine-support-on-startwm-script.patch19
2 files changed, 24 insertions, 3 deletions
diff --git a/community/xrdp/APKBUILD b/community/xrdp/APKBUILD
index 4aece7d524..b07bdeb6a0 100644
--- a/community/xrdp/APKBUILD
+++ b/community/xrdp/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Alan Lacerda <alacerda@alpinelinux.org>
pkgname=xrdp
pkgver=0.9.16
-pkgrel=0
+pkgrel=1
pkgdesc="Open source RDP server"
url="https://www.xrdp.org/"
arch="all"
@@ -10,13 +10,14 @@ license="Apache-2.0"
install="$pkgname.post-install"
makedepends="autoconf automake libtool openssl-dev libx11-dev
libxfixes-dev libxrandr-dev libjpeg-turbo-dev fuse-dev linux-headers
- nasm"
+ nasm linux-pam-dev"
subpackages="$pkgname-doc $pkgname-dev $pkgname-openrc"
source="https://github.com/neutrinolabs/xrdp/releases/download/v$pkgver/xrdp-$pkgver.tar.gz
xrdp.initd
dynamic-link.patch
remove-werror.patch
openssl.conf
+ alpine-support-on-startwm-script.patch
"
# secfixes:
@@ -42,7 +43,7 @@ build() {
--localstatedir=/var \
--sbindir=/usr/sbin \
--enable-fuse \
- --disable-pam \
+ --enable-pam \
--enable-tjpeg \
$_simd_opt
make
@@ -70,4 +71,5 @@ sha512sums="
c20de35c4623bcdeae2ba8a740f965b5f320c506ff9a7b9444ec0c8300af518fd3a84b8c28f6e775b7bab73bdac7433be9261d133fc767d953ac54cb2d3b0afd dynamic-link.patch
e22d17ad3d7116707bd4259592960175cf7586637228f8c37d92e60430ae38bf71d10667688e2d1db123709a074480b1f2e4e6f279c6ef421cc1c20688cde816 remove-werror.patch
c06de34e3f926d3d580a54a95a97c0fb3069c9fbade65b23bf424609aabb2a42db68eaeaa9540716b93b8d96bc3e75616612eedfa6cd55e736eee3b79c585d4f openssl.conf
+1f17888e4098283db0af773e715298df0b84390aec5b764e4224960c71477947718d18f3fb0b03b14036b8f8141c4f42cc063315b14b6b4f5d02f3e3d38bf31f alpine-support-on-startwm-script.patch
"
diff --git a/community/xrdp/alpine-support-on-startwm-script.patch b/community/xrdp/alpine-support-on-startwm-script.patch
new file mode 100644
index 0000000000..531e9b11a8
--- /dev/null
+++ b/community/xrdp/alpine-support-on-startwm-script.patch
@@ -0,0 +1,19 @@
+diff --git a/sesman/startwm.sh b/sesman/startwm.sh
+index 4687c49..b1da997 100755
+--- a/sesman/startwm.sh
++++ b/sesman/startwm.sh
+@@ -71,6 +71,14 @@ wm_start()
+ exit 0
+ fi
+
++ # alpine
++ if [ -r /etc/X11/xinit/xinitrc ]; then
++ pre_start
++ . /etc/X11/xinit/xinitrc
++ post_start
++ exit 0
++ fi
++
+ # el
+ if [ -r /etc/X11/xinit/Xsession ]; then
+ pre_start