From 35063aab6edab5a16339e77770965a91be4f80b6 Mon Sep 17 00:00:00 2001
From: aliriza <aliriza.keskin@pardus.org.tr>
Date: Thu, 16 Feb 2023 12:32:45 +0000
Subject: [PATCH] xinit improvements

---
 x11/apps/xinit/{ => files}/Xsession      |  0
 x11/apps/xinit/files/xinit.confd         |  4 ++++
 x11/apps/xinit/files/xinit.initd         | 14 ++++++++++++++
 x11/apps/xinit/{ => files}/xinit.sysconf |  0
 x11/apps/xinit/{ => files}/xinitrc       |  0
 x11/apps/xinit/{ => files}/xserverrc     |  0
 x11/apps/xinit/ympbuild                  | 19 +++++++++++++++----
 7 files changed, 33 insertions(+), 4 deletions(-)
 rename x11/apps/xinit/{ => files}/Xsession (100%)
 create mode 100644 x11/apps/xinit/files/xinit.confd
 create mode 100644 x11/apps/xinit/files/xinit.initd
 rename x11/apps/xinit/{ => files}/xinit.sysconf (100%)
 rename x11/apps/xinit/{ => files}/xinitrc (100%)
 rename x11/apps/xinit/{ => files}/xserverrc (100%)

diff --git a/x11/apps/xinit/Xsession b/x11/apps/xinit/files/Xsession
similarity index 100%
rename from x11/apps/xinit/Xsession
rename to x11/apps/xinit/files/Xsession
diff --git a/x11/apps/xinit/files/xinit.confd b/x11/apps/xinit/files/xinit.confd
new file mode 100644
index 00000000..13f3e6af
--- /dev/null
+++ b/x11/apps/xinit/files/xinit.confd
@@ -0,0 +1,4 @@
+# Configuration for /etc/init.d/xinit
+## X11 autologin service
+## Target user name (default=root)
+#USER=root
diff --git a/x11/apps/xinit/files/xinit.initd b/x11/apps/xinit/files/xinit.initd
new file mode 100644
index 00000000..3ed1c09e
--- /dev/null
+++ b/x11/apps/xinit/files/xinit.initd
@@ -0,0 +1,14 @@
+#!/sbin/openrc-run
+
+name="xinit"
+description="X11 autologin service"
+
+start(){
+    exec /bin/busybox su - $USER -c "exec /usr/bin/startx"
+}
+
+depend()
+{
+        need dbus
+        provide gui display-manager getty
+}
diff --git a/x11/apps/xinit/xinit.sysconf b/x11/apps/xinit/files/xinit.sysconf
similarity index 100%
rename from x11/apps/xinit/xinit.sysconf
rename to x11/apps/xinit/files/xinit.sysconf
diff --git a/x11/apps/xinit/xinitrc b/x11/apps/xinit/files/xinitrc
similarity index 100%
rename from x11/apps/xinit/xinitrc
rename to x11/apps/xinit/files/xinitrc
diff --git a/x11/apps/xinit/xserverrc b/x11/apps/xinit/files/xserverrc
similarity index 100%
rename from x11/apps/xinit/xserverrc
rename to x11/apps/xinit/files/xserverrc
diff --git a/x11/apps/xinit/ympbuild b/x11/apps/xinit/ympbuild
index 6feb2729..742b5d96 100644
--- a/x11/apps/xinit/ympbuild
+++ b/x11/apps/xinit/ympbuild
@@ -8,14 +8,18 @@ email='bayramk@gmail.com'
 maintainer='bk'
 license=('GPLv3')
 source=("https://gitlab.freedesktop.org/xorg/app/xinit/-/archive/xinit-$version/xinit-xinit-1.4.2.tar.gz"
-        "xinitrc"
-        "xserverrc"
-        "Xsession"
-        "xinit.sysconf"
+        "files/xinitrc"
+        "files/xserverrc"
+        "files/Xsession"
+        "files/xinit.sysconf"
+        "files/xinit.confd"
+        "files/xinit.initd"
 )
 depends=(xorg-macros xorgproto libX11)
 makedepends=()
 md5sums=('0855364c1c869679300d55e9dd57e2aa'
+         'SKIP'
+         'SKIP'
          'SKIP'
          'SKIP'
          'SKIP'
@@ -43,5 +47,12 @@ package(){
     install -m755 -D ../Xsession "$DESTDIR"/etc/X11/xinit/Xsession
     install -m755 ../xserverrc "$DESTDIR"/etc/X11/xinit/xserverrc
     install -m755 -D ../xinit.sysconf "$DESTDIR"/etc/sysconf.d/xinit
+    install -m755 -D ../xinit.initd "$DESTDIR"/etc/init.d/xinit
+    install -m755 -D ../xinit.confd "$DESTDIR"/etc/conf.d/xinit
+    # allow local connections config
+    mkdir -p "$DESTDIR"/etc/X11/xinit/xinitrc.d
+    echo "#!/bin/sh" > "$DESTDIR"/etc/X11/xinit/xinitrc.d/10-local.sh
+    echo "xhost +local:" >> "$DESTDIR"/etc/X11/xinit/xinitrc.d/10-local.sh
+    chmod 754 "$DESTDIR"/etc/X11/xinit/xinitrc.d/10-local.sh
 }