From a1e1b44f17feff5f71a3a93852355d45878ed8ee Mon Sep 17 00:00:00 2001
From: Martijn van Maurik <git@vmaurik.nl>
Date: Mon, 14 Jun 2021 12:10:18 +0200
Subject: [PATCH 1/3] Add service file for open-iscsi

---
 srcpkgs/open-iscsi/files/iscsid/run | 3 +++
 srcpkgs/open-iscsi/template         | 6 +++++-
 2 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100755 srcpkgs/open-iscsi/files/iscsid/run

diff --git a/srcpkgs/open-iscsi/files/iscsid/run b/srcpkgs/open-iscsi/files/iscsid/run
new file mode 100755
index 000000000000..70765b6fc3ab
--- /dev/null
+++ b/srcpkgs/open-iscsi/files/iscsid/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+[ -r conf ] && . ./conf
+exec /usr/bin/iscsid ${OPTS:=--config /etc/iscsi/iscsid.conf -f} 1>&2
diff --git a/srcpkgs/open-iscsi/template b/srcpkgs/open-iscsi/template
index 7cd8308b0498..ee417ab90e8d 100644
--- a/srcpkgs/open-iscsi/template
+++ b/srcpkgs/open-iscsi/template
@@ -1,7 +1,7 @@
 # Template file for 'open-iscsi'
 pkgname=open-iscsi
 version=2.1.3
-revision=2
+revision=3
 conf_files="/etc/iscsi/iscsid.conf /etc/iscsi/initiatorname.iscsi"
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
@@ -46,3 +46,7 @@ do_install() {
 
 	sed -i 's,/sbin/iscsid,/usr/bin/iscsid,' ${DESTDIR}/etc/iscsi/iscsid.conf
 }
+
+post_install() {
+  vsv iscsid
+}

From a1de874b56804d9841735b63de7c3fc2c5060a84 Mon Sep 17 00:00:00 2001
From: Martijn van Maurik <git@vmaurik.nl>
Date: Mon, 14 Jun 2021 12:10:44 +0200
Subject: [PATCH 2/3] Add xrdp package

---
 srcpkgs/xrdp/files/xrdp-sesman/run |  3 +++
 srcpkgs/xrdp/files/xrdp/run        |  3 +++
 srcpkgs/xrdp/template              | 25 +++++++++++++++++++++++++
 3 files changed, 31 insertions(+)
 create mode 100644 srcpkgs/xrdp/files/xrdp-sesman/run
 create mode 100644 srcpkgs/xrdp/files/xrdp/run
 create mode 100644 srcpkgs/xrdp/template

diff --git a/srcpkgs/xrdp/files/xrdp-sesman/run b/srcpkgs/xrdp/files/xrdp-sesman/run
new file mode 100644
index 000000000000..1969d68769a2
--- /dev/null
+++ b/srcpkgs/xrdp/files/xrdp-sesman/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+[ -r conf ] && . ./conf
+exec xrdp-sesman ${OPTS:=-n} 1>&2
diff --git a/srcpkgs/xrdp/files/xrdp/run b/srcpkgs/xrdp/files/xrdp/run
new file mode 100644
index 000000000000..f47a94a3fd2b
--- /dev/null
+++ b/srcpkgs/xrdp/files/xrdp/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+[ -r conf ] && . ./conf
+exec xrdp ${OPTS:=-n} 1>&2
diff --git a/srcpkgs/xrdp/template b/srcpkgs/xrdp/template
new file mode 100644
index 000000000000..26dcd13851db
--- /dev/null
+++ b/srcpkgs/xrdp/template
@@ -0,0 +1,25 @@
+# Template file for 'xrdp'
+pkgname=xrdp
+version=0.9.16
+revision=3
+archs="x86_64"
+build_style=gnu-configure
+hostmakedepends="pkg-config automake autoconf which nasm flex bison libxml2-python3 python3 libtool"
+makedepends="openssl-devel pam-devel libjpeg-turbo-devel libX11-devel libXfixes-devel libXrandr-devel fuse-devel libxml2-devel lame-devel pixman-devel xorg-server-devel opus-devel"
+depends="openssl pam libjpeg-turbo libX11 libXfixes libXrandr intltool libxslt fuse lame fdkaac opus pixman xorg"
+short_desc="XRDP"
+maintainer="Martijn van Maurik <git@vmaurik.nl>"
+license="Apache-2.0"
+homepage="https://xrdp.org"
+distfiles="https://github.com/neutrinolabs/xrdp/releases/download/v$version/xrdp-$version.tar.gz"
+checksum="72a86bf3bb8ca3a41905bfa84f500ad73cd23615753f34db7e36278a33c19916"
+configure_args="--enable-pam --enable-vsock --enable-pam-config=unix --enable-tjpeg --enable-fuse --enable-mp3lame --enable-rfxcodec --enable-opus --enable-pixman --enable-ipv6 --libdir /usr/lib64 --enable-painter"
+
+pre_configure() {
+  ./bootstrap
+}
+
+post_install() {
+  vsv xrdp
+  vsv xrdp-sesman
+}

From cb0de51b6eb4ee61b8c36c9770fea70687ae3fbc Mon Sep 17 00:00:00 2001
From: Martijn van Maurik <git@vmaurik.nl>
Date: Mon, 14 Jun 2021 12:10:54 +0200
Subject: [PATCH 3/3] Add xorgxrdp package

---
 srcpkgs/xorgxrdp/template | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 srcpkgs/xorgxrdp/template

diff --git a/srcpkgs/xorgxrdp/template b/srcpkgs/xorgxrdp/template
new file mode 100644
index 000000000000..845e00a8cade
--- /dev/null
+++ b/srcpkgs/xorgxrdp/template
@@ -0,0 +1,21 @@
+# Template file for 'xrdp'
+pkgname=xorgxrdp
+version=0.2.16
+revision=3
+archs="x86_64"
+build_style=gnu-configure
+hostmakedepends="pkg-config automake autoconf which nasm flex bison libxml2-python3 python3 libtool"
+makedepends="lame-devel opus-devel pixman-devel fuse-devel libjpeg-turbo-devel openssl-devel xorg-server-devel xrdp libdrm-devel"
+depends="lame fdkaac opus pixman fuse libjpeg-turbo xrdp libdrm"
+short_desc="Xorg videodriver for XRDP"
+maintainer="Martijn van Maurik <git@vmaurik.nl>"
+license="Apache-2.0"
+homepage="https://xrdp.org"
+distfiles="https://github.com/neutrinolabs/xorgxrdp/releases/download/v$version/xorgxrdp-$version.tar.gz"
+checksum="e6b5f3df44cbf147dcbbc326cdd08c95fe28dba80c2a216e046fe42d962f9215"
+configure_args="--enable-rfxcodec --enable-mp3lame --enable-fdkaac --enable-opus --enable-pixman --enable-fuse --enable-tjpeg --enable-ipv6 --libdir /usr/lib64"
+make_build_args="EXTRA_FLAGS='-I/usr/include/libdrm'"
+
+pre_configure() {
+  ./bootstrap
+}