From ddc0217fc869e8d0b64a55b37c1c7aad4a8037cb Mon Sep 17 00:00:00 2001
From: sulincix <parduscix@yandex.ru>
Date: Sun, 21 May 2023 20:45:59 +0000
Subject: [PATCH] fixes

---
 sys/block/ndctl/ympbuild                  |  6 +--
 sys/fs/btrfs-progs/btrfs-progs.install    | 15 --------
 sys/fs/btrfs-progs/btrfs-scrub@.service   | 10 -----
 sys/fs/btrfs-progs/btrfs-scrub@.timer     | 11 ------
 sys/fs/btrfs-progs/initcpio-hook-btrfs    |  7 ----
 sys/fs/btrfs-progs/initcpio-install-btrfs | 17 ---------
 sys/fs/btrfs-progs/ympbuild               | 46 ++++-------------------
 sys/fs/dosfstools/ympbuild                |  4 +-
 sys/fs/xfsprogs/ympbuild                  | 12 +++---
 x11/misc/lightdm/lightdm.initd            | 17 +++++++++
 x11/misc/lightdm/ympbuild                 | 33 ++++++++++------
 11 files changed, 56 insertions(+), 122 deletions(-)
 delete mode 100644 sys/fs/btrfs-progs/btrfs-progs.install
 delete mode 100644 sys/fs/btrfs-progs/btrfs-scrub@.service
 delete mode 100644 sys/fs/btrfs-progs/btrfs-scrub@.timer
 delete mode 100644 sys/fs/btrfs-progs/initcpio-hook-btrfs
 delete mode 100644 sys/fs/btrfs-progs/initcpio-install-btrfs
 create mode 100644 x11/misc/lightdm/lightdm.initd

diff --git a/sys/block/ndctl/ympbuild b/sys/block/ndctl/ympbuild
index bca647c5..adaa6a06 100644
--- a/sys/block/ndctl/ympbuild
+++ b/sys/block/ndctl/ympbuild
@@ -18,9 +18,9 @@ arch=('x86_64')
 cd $name-$version
 setup(){
 	meson setup build --prefix=/usr \
-        --libdir=/usr/lib64/ \
-        -Ddocs=disabled \
-        -Dtest=disabled
+            --libdir=/usr/lib64/ \
+            -Ddocs=disabled \
+            -Dtest=disabled
 }
 
 build(){
diff --git a/sys/fs/btrfs-progs/btrfs-progs.install b/sys/fs/btrfs-progs/btrfs-progs.install
deleted file mode 100644
index 1e75f025..00000000
--- a/sys/fs/btrfs-progs/btrfs-progs.install
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-## arg 1:  the new package version
-## arg 2:  the old package version
-post_upgrade() {
-  if (( "$(vercmp "$2" 0.19.20121005)" < 0 )); then
-    echo 'btrfs multi-device support now relies on linux 3.6 or later'
-  elif (( "$(vercmp "$2" 4.3.1-2)" < 0 )); then
-    echo 'btrfs-scrub@.timer instance names must not be prefix by dash anymore'
-    echo 'use btrfs-scrub@-.timer to scrub / monthly'
-    echo '    btrfs-scrub@home.timer to scrub /home monthly.'
-  fi
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/sys/fs/btrfs-progs/btrfs-scrub@.service b/sys/fs/btrfs-progs/btrfs-scrub@.service
deleted file mode 100644
index ac2e16d3..00000000
--- a/sys/fs/btrfs-progs/btrfs-scrub@.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Btrfs scrub on %f
-ConditionPathIsMountPoint=%f
-RequiresMountsFor=%f
-
-[Service]
-Nice=19
-IOSchedulingClass=idle
-KillSignal=SIGINT
-ExecStart=/usr/bin/btrfs scrub start -B %f
diff --git a/sys/fs/btrfs-progs/btrfs-scrub@.timer b/sys/fs/btrfs-progs/btrfs-scrub@.timer
deleted file mode 100644
index 7ee54a5f..00000000
--- a/sys/fs/btrfs-progs/btrfs-scrub@.timer
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Monthly Btrfs scrub on %f
-
-[Timer]
-OnCalendar=monthly
-AccuracySec=1d
-RandomizedDelaySec=1w
-Persistent=true
-
-[Install]
-WantedBy=timers.target
diff --git a/sys/fs/btrfs-progs/initcpio-hook-btrfs b/sys/fs/btrfs-progs/initcpio-hook-btrfs
deleted file mode 100644
index 7965d0a8..00000000
--- a/sys/fs/btrfs-progs/initcpio-hook-btrfs
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/ash
-
-run_hook() {
-    btrfs device scan
-}
-
-# vim: set ft=sh ts=4 sw=4 et:
diff --git a/sys/fs/btrfs-progs/initcpio-install-btrfs b/sys/fs/btrfs-progs/initcpio-install-btrfs
deleted file mode 100644
index f7b0285b..00000000
--- a/sys/fs/btrfs-progs/initcpio-install-btrfs
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-build() {
-    add_module btrfs
-    add_binary btrfs
-    add_binary btrfsck
-    add_runscript
-}
-
-help() {
-    cat <<HELPEOF
-This hook provides support for multi-device btrfs volumes. This hook
-is only needed for initramfs images which do not use udev.
-HELPEOF
-}
-
-# vim: set ft=sh ts=4 sw=4 et:
diff --git a/sys/fs/btrfs-progs/ympbuild b/sys/fs/btrfs-progs/ympbuild
index a1d71496..e6937db9 100644
--- a/sys/fs/btrfs-progs/ympbuild
+++ b/sys/fs/btrfs-progs/ympbuild
@@ -7,19 +7,10 @@ description='A library for manipulating block devices'
 email='bayramk@gmail.com'
 maintainer='bk'
 license=('GPLv3')
-source=("https://github.com/kdave/btrfs-progs/archive/refs/tags/v6.3.tar.gz"
-	'initcpio-install-btrfs'
-        'initcpio-hook-btrfs'
-        'btrfs-scrub@.service'
-        'btrfs-scrub@.timer'
-)
-depends=( e2fsprogs zlib libgcrypt libzstd)
+source=("https://github.com/kdave/btrfs-progs/archive/refs/tags/v6.3.tar.gz")
+depends=(e2fsprogs zlib libgcrypt)
 makedepends=()
-md5sums=('4806f9346f55cfbea44f9e423541e17c'
-'SKIP'
-'SKIP'
-'SKIP'
-'SKIP')
+md5sums=('4806f9346f55cfbea44f9e423541e17c')
 group=(sys.fs)
 uses=()
 arch=('x86_64')
@@ -28,25 +19,13 @@ install=btrfs-progs.install
 options=(!staticlibs)
 
 cd $name-$version
-prepare() {
-  # apply patch from the source array (should be a pacman feature)
-  local src
-  for src in "${source[@]}"; do
-    src="${src%%::*}"
-    src="${src##*/}"
-    [[ $src = *.patch ]] || continue
-    echo "Applying patch $src..."
-    patch -Np1 < "../$src"
-  done
-}
-
 
 setup(){
 	./autogen.sh
 	./configure --prefix=/usr \
-        --libdir=/usr/lib64/  --with-crypto=libgcrypt \
-        --disable-zstd \
-        --disable-py3-sphinx
+            --libdir=/usr/lib64/  --with-crypto=libgcrypt \
+            --disable-zstd \
+            --disable-documentation
 }
 
 build(){
@@ -54,19 +33,8 @@ build(){
 }
 
 package(){
-make DESTDIR="$DESTDIR" install install_python
-
+  make DESTDIR="$DESTDIR" install install_python
   # install bash completion (FS#44618)
   install -Dm644 btrfs-completion "$DESTDIR/usr/share/bash-completion/completions/btrfs"
-
-  # install mkinitcpio hooks
- # cd "$srcdir"
-   install -Dm644 ../initcpio-hook-btrfs "$DESTDIR/usr/lib/initcpio/hooks/btrfs"
-   install -Dm644 ../initcpio-install-btrfs "$DESTDIR/usr/lib/initcpio/install/btrfs"
-
-  # install scrub service/timer
-  install -Dm644 ../btrfs-scrub@.service "$DESTDIR/usr/lib/systemd/system/btrfs-scrub@.service"
-  install -Dm644 ../btrfs-scrub@.timer "$DESTDIR/usr/lib/systemd/system/btrfs-scrub@.timer"
-
 }
 
diff --git a/sys/fs/dosfstools/ympbuild b/sys/fs/dosfstools/ympbuild
index e053f192..c7970de9 100644
--- a/sys/fs/dosfstools/ympbuild
+++ b/sys/fs/dosfstools/ympbuild
@@ -19,8 +19,8 @@ cd $name-$version
 setup(){
 	./autogen.sh
 	./configure --prefix=/usr \
-        --libdir=/usr/lib64/ \
-        --enable-compat-symlinks
+            --libdir=/usr/lib64/ \
+            --enable-compat-symlinks
 }
 
 build(){
diff --git a/sys/fs/xfsprogs/ympbuild b/sys/fs/xfsprogs/ympbuild
index 7b750950..a560c046 100644
--- a/sys/fs/xfsprogs/ympbuild
+++ b/sys/fs/xfsprogs/ympbuild
@@ -17,10 +17,10 @@ arch=('x86_64')
 
 cd $name-$version
 setup(){
- make configure
-  #export OPTIMIZER="-march=${CARCH/_/-} -O1"
-  export DEBUG=-DNDEBUG
-  ./configure --prefix=/usr --libdir=/usr/lib64/ --sbindir=/usr/bin
+    make configure
+    ./configure --prefix=/usr \
+        --libdir=/usr/lib64/ \
+        --sbindir=/usr/sbin
 
 }
 
@@ -30,9 +30,7 @@ build(){
 
 package(){
    # make install $jobs
-  make DIST_ROOT="${DESTDIR}" PKG_ROOT_SBIN_DIR="/usr/bin" install install-dev
-  chown -R root "$DESTDIR"
-  chgrp -R root "$DESTDIR"
+  make DIST_ROOT="${DESTDIR}" PKG_ROOT_SBIN_DIR="/usr/sbin" install install-dev
   # add hack as we cannot set rootlibdir
   mv "${DESTDIR}"/lib64/libhandle.so* "${DESTDIR}/usr/lib64/"
   rm -rf "${DESTDIR}/lib64"
diff --git a/x11/misc/lightdm/lightdm.initd b/x11/misc/lightdm/lightdm.initd
new file mode 100644
index 00000000..b8300dca
--- /dev/null
+++ b/x11/misc/lightdm/lightdm.initd
@@ -0,0 +1,17 @@
+#!/sbin/openrc-run
+supervisor=supervise-daemon
+
+name="Display Manager"
+description="Lightweight $name"
+
+command=/usr/sbin/lightdm
+
+depend() {
+	provide display-manager
+	need localmount dbus
+}
+
+start_pre() {
+	checkpath --owner lightdm:lightdm --directory /var/lib/lightdm
+}
+
diff --git a/x11/misc/lightdm/ympbuild b/x11/misc/lightdm/ympbuild
index 1c126588..1f3ed036 100644
--- a/x11/misc/lightdm/ympbuild
+++ b/x11/misc/lightdm/ympbuild
@@ -7,10 +7,12 @@ description='A lightweight display manager'
 email='bayramk@gmail.com'
 maintainer='bk'
 license=('GPLv3')
-source=("https://salsa.debian.org/xfce-extras-team/lightdm/-/archive/debian/$version-1/lightdm-debian-$version-1.tar.gz")
-depends=(libX11 pam libxklavier polkit xorg-server libxcb glib libgcrypt libXdmcp xmodmap xrdb yelp-tools libXi)
-makedepends=(gobject-introspection vala intltool)
-md5sums=('2b845ca384f042f21b646a76c52345f0')
+source=("https://salsa.debian.org/xfce-extras-team/lightdm/-/archive/debian/$version-1/lightdm-debian-$version-1.tar.gz"
+        "lightdm.initd")
+depends=(libX11 pam libxklavier xorg-server libxcb glib libgcrypt libXdmcp xmodmap xrdb libXi)
+makedepends=(gobject-introspection vala intltool yelp-tools)
+md5sums=('2b845ca384f042f21b646a76c52345f0'
+         'SKIP')
 group=(x11.misc)
 uses=()
 arch=('x86_64')
@@ -20,13 +22,14 @@ cd lightdm-debian-$version-1
 setup(){
    	./autogen.sh
 	./configure --prefix=/usr \
-        --libdir=/usr/lib64/ \
-        --disable-tests \
-        --disable-gtk-doc \
-        --enable-yelp-tools \
-        --enable-qt5-base \
-        --with-greeter-user=lightdm \
-        --with-greeter-session=lightdm-gtk-greeter
+            --sysconfdir=/etc \
+            --libdir=/usr/lib64/ \
+            --disable-tests \
+            --disable-gtk-doc \
+            --enable-yelp-tools \
+            --enable-qt5-base \
+            --with-greeter-user=lightdm \
+            --with-greeter-session=lightdm-gtk-greeter
 }
 
 build(){
@@ -35,5 +38,13 @@ build(){
 
 package(){
     make install $jobs
+    # create user and group
+    mkdir -p $DESTDIR/etc/group.d
+    mkdir -p $DESTDIR/etc/passwd.d
+    echo "lightdm:x:108:118:Lightdm Display Manager:/var/lib/lightdm/:/bin/false" > $DESTDIR/etc/passwd.d/lightdm
+    echo "lightdm:x:118:" > $DESTDIR/etc/group.d/lightdm
+    # install service
+    mkdir -p $DESTDIR/etc/init.d
+    install ../lightdm.initd $DESTDIR/etc/init.d/lightdm
 }