[PR PATCH] [rfc] udev alternatives

[dkwo <dkwo@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1008 bytes --]

There is a new pull request by dkwo against master on the void-packages repository

https://github.com/dkwo/void-packages udev
https://github.com/void-linux/void-packages/pull/42488

[rfc] udev alternatives
There are still some things I do not understand, notably:
- how to deal with eudev-libudev: libudev-zero replaces, conflicts, provides it? it provides /usr/lib/libudev.so.1, I expect some stuff built with eudev-libudev-devel (wlroots, libinput) to work with it, while other may not if one removes eudev-libudev (lvm2, pipewire), see https://github.com/illiliti/libudev-zero
- find an optimal mdev.conf (current one is taken from kiss-linux, alpine has a similar one)
- edit the corresponing runit parts in stage 1.

- I tested the changes in this PR: no
- I built this PR locally for my native architecture, (x86_64-musl)

cc mantainer @mobinmob for now I updated mdevd, added a service and conf file.

A patch file from https://github.com/void-linux/void-packages/pull/42488.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-udev-42488.patch --]
[-- Type: text/x-diff, Size: 14722 bytes --]

From ea7d695205d0f6fc25484cf468b330204aa3fa85 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 24 Feb 2023 17:01:39 -0500
Subject: [PATCH 01/14] 66: bump for skalibs 2.13

---
 srcpkgs/66/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/66/template b/srcpkgs/66/template
index 150ab6049654..89677d007138 100644
--- a/srcpkgs/66/template
+++ b/srcpkgs/66/template
@@ -1,7 +1,7 @@
 # Template file for '66'
 pkgname=66
 version=0.6.2.0
-revision=3
+revision=4
 build_style=configure
 configure_args="--prefix=/usr
  --with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps

From 58ebb0d8e0ca6ddb8d6768f395d9cb2f0c9f183c Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 24 Feb 2023 17:01:40 -0500
Subject: [PATCH 02/14] 66-tools: bump for skalibs 2.13

---
 srcpkgs/66-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/66-tools/template b/srcpkgs/66-tools/template
index 7f0983a12660..7536c2ba76aa 100644
--- a/srcpkgs/66-tools/template
+++ b/srcpkgs/66-tools/template
@@ -1,7 +1,7 @@
 # Template file for '66-tools'
 pkgname=66-tools
 version=0.0.8.0
-revision=2
+revision=3
 build_style=configure
 configure_args="--prefix=/usr
  --with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps

From 50648828958b2c1f1a2dd2f31aa54c3a4f72f057 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 24 Feb 2023 17:01:40 -0500
Subject: [PATCH 03/14] execline: bump for skalibs 2.13

---
 srcpkgs/execline/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/execline/template b/srcpkgs/execline/template
index 2df4249d34cc..f1be2b2618c5 100644
--- a/srcpkgs/execline/template
+++ b/srcpkgs/execline/template
@@ -1,7 +1,7 @@
 # Template file for 'execline'
 pkgname=execline
 version=2.9.0.1
-revision=1
+revision=2
 build_style=configure
 configure_args="--libdir=/usr/lib --bindir=/usr/bin
  --with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps

From 923d15cedce8fca4a9776c32ab14df0364b4067e Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 24 Feb 2023 17:01:41 -0500
Subject: [PATCH 04/14] nsss: bump for skalibs 2.13

---
 srcpkgs/nsss/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nsss/template b/srcpkgs/nsss/template
index b4efae672355..4df7beb1af21 100644
--- a/srcpkgs/nsss/template
+++ b/srcpkgs/nsss/template
@@ -1,7 +1,7 @@
 # Template file for 'nsss'
 pkgname=nsss
 version=0.2.0.1
-revision=2
+revision=3
 # Only available for musl
 archs="*-musl"
 build_style=configure

From fa34d1b005f0ea8d5b316d5d369f3c0b59e9b389 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 24 Feb 2023 17:01:41 -0500
Subject: [PATCH 05/14] oblibs: bump for skalibs 2.13

---
 srcpkgs/oblibs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/oblibs/template b/srcpkgs/oblibs/template
index f1adf1a9f436..15cc98f4d089 100644
--- a/srcpkgs/oblibs/template
+++ b/srcpkgs/oblibs/template
@@ -1,7 +1,7 @@
 # Template file for 'oblibs'
 pkgname=oblibs
 version=0.1.4.0
-revision=2
+revision=3
 build_style=configure
 configure_args="--prefix=/usr --libdir=/usr/lib --with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps"
 makedepends="skalibs-devel execline-devel"

From 9629f17d24302a003ebbb7cf6a0687f69124afb5 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 24 Feb 2023 17:01:41 -0500
Subject: [PATCH 06/14] s6: bump for skalibs 2.13

---
 srcpkgs/s6/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/s6/template b/srcpkgs/s6/template
index d54785b251b2..59c9f3959272 100644
--- a/srcpkgs/s6/template
+++ b/srcpkgs/s6/template
@@ -1,7 +1,7 @@
 # Template file for 's6'
 pkgname=s6
 version=2.11.1.1
-revision=1
+revision=2
 build_style=configure
 configure_args="--libdir=/usr/lib --bindir=/usr/bin
  --with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps

From b99a4c507c979a0180252f43b2d316549b7468c6 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 24 Feb 2023 17:01:41 -0500
Subject: [PATCH 07/14] s6-dns: bump for skalibs 2.13

---
 srcpkgs/s6-dns/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/s6-dns/template b/srcpkgs/s6-dns/template
index 4d282185ce8a..b0506b26683f 100644
--- a/srcpkgs/s6-dns/template
+++ b/srcpkgs/s6-dns/template
@@ -1,7 +1,7 @@
 # Template file for 's6-dns'
 pkgname=s6-dns
 version=2.3.5.4
-revision=1
+revision=2
 build_style=configure
 configure_args="--prefix=/usr --libdir=/usr/lib
  --with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps

From eb3908b591ed1d99bf1c00d1ba894c4ad8bfea79 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 24 Feb 2023 17:01:42 -0500
Subject: [PATCH 08/14] s6-linux-utils: bump for skalibs 2.13

---
 srcpkgs/s6-linux-utils/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/s6-linux-utils/template b/srcpkgs/s6-linux-utils/template
index 212752cc26d0..ba026d6f25d8 100644
--- a/srcpkgs/s6-linux-utils/template
+++ b/srcpkgs/s6-linux-utils/template
@@ -1,7 +1,7 @@
 # Template file for 's6-linux-utils'
 pkgname=s6-linux-utils
 version=2.6.0.0
-revision=1
+revision=2
 build_style=configure
 configure_args="--libdir=/usr/lib --includedir=/usr/include
  --with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps

From 281736069afdb3db942052166a6c10be34d382bb Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 24 Feb 2023 17:01:42 -0500
Subject: [PATCH 09/14] s6-networking: bump for skalibs 2.13

---
 srcpkgs/s6-networking/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/s6-networking/template b/srcpkgs/s6-networking/template
index 5a04b9abf01b..3d9d561dd968 100644
--- a/srcpkgs/s6-networking/template
+++ b/srcpkgs/s6-networking/template
@@ -1,7 +1,7 @@
 # Template file for 's6-networking'
 pkgname=s6-networking
 version=2.5.1.1
-revision=1
+revision=2
 build_style=configure
 configure_args="--libdir=/usr/lib $(vopt_if libtls --enable-ssl=libtls)
  $(vopt_if bearssl --enable-ssl=bearssl)

From 166c99429a3d40244ffcd524a4235740b387594d Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 24 Feb 2023 17:01:42 -0500
Subject: [PATCH 10/14] s6-portable-utils: bump for skalibs 2.13

---
 srcpkgs/s6-portable-utils/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/s6-portable-utils/template b/srcpkgs/s6-portable-utils/template
index ca0c308fb3b1..a40dfbd95599 100644
--- a/srcpkgs/s6-portable-utils/template
+++ b/srcpkgs/s6-portable-utils/template
@@ -1,7 +1,7 @@
 # Template file for 's6-portable-utils'
 pkgname=s6-portable-utils
 version=2.2.5.0
-revision=1
+revision=2
 build_style=configure
 configure_args="--prefix=/usr --libdir=/usr/lib --includedir=/usr/include
  --with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps

From 65379f8b11afdd125d5f37e0c9ac1f16a62c8fa6 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 24 Feb 2023 17:01:43 -0500
Subject: [PATCH 11/14] s6-rc: bump for skalibs 2.13

---
 srcpkgs/s6-rc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/s6-rc/template b/srcpkgs/s6-rc/template
index 495907ef8a60..18aea5485545 100644
--- a/srcpkgs/s6-rc/template
+++ b/srcpkgs/s6-rc/template
@@ -1,7 +1,7 @@
 # Template file for 's6-rc'
 pkgname=s6-rc
 version=0.5.3.2
-revision=1
+revision=2
 build_style=configure
 configure_args="--prefix=/usr --libdir=/usr/lib --includedir=/usr/include
  --with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps

From fb0fe816bc212836233aba533d3857bd865b7693 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 24 Feb 2023 17:03:59 -0500
Subject: [PATCH 12/14] skalibs: update to 2.13.1

---
 common/shlibs            | 2 +-
 srcpkgs/skalibs/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 538ff08ce5ff..1e14994592fe 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2374,7 +2374,7 @@ libgnunettransport.so.2 gnunet-0.12.2_1
 libgnunettransportapplication.so.0 gnunet-0.12.2_1
 libgnunettransportcore.so.0 gnunet-0.12.2_1
 libgnunettransportcommunicator.so.0 gnunet-0.12.2_1
-libskarnet.so.2.12 skalibs-2.12.0.0_1
+libskarnet.so.2.13 skalibs-2.13.1.0_1
 libKF5BalooWidgets.so.5 baloo-widgets5-17.04.3_1
 libtidy.so.58 libtidy5-5.8.0_1
 libSDL2_gfx-1.0.so.0 SDL2_gfx-1.0.1_1
diff --git a/srcpkgs/skalibs/template b/srcpkgs/skalibs/template
index dccbcee327eb..185177eb4165 100644
--- a/srcpkgs/skalibs/template
+++ b/srcpkgs/skalibs/template
@@ -1,6 +1,6 @@
 # Template file for 'skalibs'
 pkgname=skalibs
-version=2.12.0.1
+version=2.13.1.0
 revision=1
 build_style=configure
 configure_args="--libdir=/usr/lib --enable-static --enable-shared
@@ -14,7 +14,7 @@ license="ISC"
 homepage="https://skarnet.org/software/skalibs/"
 changelog="https://skarnet.org/software/skalibs/upgrade.html"
 distfiles="https://skarnet.org/software/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=3e228f72f18d88c17f6c4e0a66881d6d3779427b7e7e889f3142b6f26da30285
+checksum=b3c48938c7fba4b19a8b0dce6e7a11427717a0901160bb62cfc6823f8ac86d92
 
 post_install() {
 	vlicense COPYING LICENSE

From 7813112a51ec56bded48fbd92b4b6d334169bdc8 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 24 Feb 2023 17:01:40 -0500
Subject: [PATCH 13/14] mdevd: update to 0.6.1.2, add conf and service

---
 srcpkgs/mdevd/files/mdev.conf | 70 +++++++++++++++++++++++++++++++++++
 srcpkgs/mdevd/files/mdevd/run |  4 ++
 srcpkgs/mdevd/template        |  9 +++--
 3 files changed, 80 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/mdevd/files/mdev.conf
 create mode 100644 srcpkgs/mdevd/files/mdevd/run

diff --git a/srcpkgs/mdevd/files/mdev.conf b/srcpkgs/mdevd/files/mdev.conf
new file mode 100644
index 000000000000..0c88a022cdcc
--- /dev/null
+++ b/srcpkgs/mdevd/files/mdev.conf
@@ -0,0 +1,70 @@
+# Configuration based on 'mdev-like-a-boss'.
+# https://github.com/slashbeast/mdev-like-a-boss/blob/master/mdev.conf
+
+null          root:root 666 @chmod 666 $MDEV
+zero          root:root 666
+full          root:root 666
+random        root:root 444
+urandom       root:root 444
+hwrandom      root:root 444
+grsec         root:root 660
+kmem          root:root 640
+mem           root:root 640
+
+port          root:root 640
+console       root:tty  600 @chmod 600 $MDEV
+ptmx          root:tty  666
+pty.*         root:tty  660
+tty           root:tty  666
+tty[0-9]*     root:tty  660
+vcsa*[0-9]*   root:tty  660
+
+# Kernel based virtual machine.
+kvm           root:kvm  660
+vhost-net     root:kvm  660
+
+# Block devices.
+ram([0-9]*)   root:disk 660 >rd/%1
+loop([0-9]+)  root:disk 660 >loop/%1
+sr[0-9]*      root:cdrom 660 @ln -sf $MDEV cdrom
+fd[0-9]*      root:floppy 660
+
+net/tun[0-9]* root:kvm 660
+net/tap[0-9]* root:root 600
+fuse          root:root 666
+agpgart       root:root 660 >misc/
+psaux         root:root 660 >misc/
+rtc           root:root 664 >misc/
+
+# Audio stuff.
+adsp          root:audio 660 >sound/
+audio         root:audio 660 >sound/
+dsp           root:audio 660 >sound/
+mixer         root:audio 660 >sound/
+sequencer.*   root:audio 660 >sound/
+snd/.*        root:audio 660
+
+# Raid controllers.
+cciss!(.*)    root:disk 660 =cciss/%1
+ida!(.*)      root:disk 660 =ida/%1
+rd!(.*)       root:disk 660 =rd/%1
+
+# Input stuff.
+SUBSYSTEM=input;.* root:input 660
+
+# Video stuff.
+card[0-9]     root:video 660 =dri/
+vbi[0-9]      root:video 660 >v4l/
+video[0-9]    root:video 660 >v4l/
+dri/.*        root:video 660
+
+# Don't create old usbdev* devices.
+usbdev[0-9].[0-9]* root:root 660 !
+
+# Stop creating x:x:x:x which looks like /dev/dm-*.
+[0-9]+\:[0-9]+\:[0-9]+\:[0-9]+ root:root 660 !
+
+# /dev/cpu support.
+microcode       root:root 600 =cpu/
+cpu([0-9]+)     root:root 600 =cpu/%1/cpuid
+msr([0-9]+)     root:root 600 =cpu/%1/msr
diff --git a/srcpkgs/mdevd/files/mdevd/run b/srcpkgs/mdevd/files/mdevd/run
new file mode 100644
index 000000000000..3399ca5e95b9
--- /dev/null
+++ b/srcpkgs/mdevd/files/mdevd/run
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+exec 2>&1 
+exec mdevd -f /etc/mdevd.conf -D 3 -b 200000 -O4 
\ No newline at end of file
diff --git a/srcpkgs/mdevd/template b/srcpkgs/mdevd/template
index 43f2118937fb..b44a02046d60 100644
--- a/srcpkgs/mdevd/template
+++ b/srcpkgs/mdevd/template
@@ -1,6 +1,6 @@
 # Template file for 'mdevd'
 pkgname=mdevd
-version=0.1.6.0
+version=0.1.6.2
 revision=1
 build_style=configure
 configure_args="--includedir=/usr/include --bindir=/usr/bin --libdir=/usr/lib
@@ -14,9 +14,10 @@ license="ISC"
 homepage="https://skarnet.org/software/mdevd/"
 changelog="https://skarnet.org/software/mdevd/upgrade.html"
 distfiles="https://skarnet.org/software/mdevd/mdevd-${version}.tar.gz"
-checksum=33cf2b118634538fd24f302b30f52cc8aa28ea68b414916ce482b54a4ee57283
-
+checksum=ac2fcf9004f07904592c5894e2c401e15bb027ecf37bcb8ea661e2a7993447be
+conf_files="/etc/mdev.conf"
 build_options="static"
+make_check=no # no tests
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)
@@ -29,6 +30,8 @@ post_install() {
 	vlicense COPYING
 	vdoc README
 	vcopy "doc/*" usr/share/doc/${pkgname}
+	vsv mdevd
+	vcopy ${FILESDIR}/mdev.conf etc/mdev.conf
 }
 
 mdevd-doc_package() {

From 8dce193e36c89f46047600ba5d8692cdd805bab9 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 24 Feb 2023 18:26:36 -0500
Subject: [PATCH 14/14] new package: libudev-zero

---
 srcpkgs/libudev-zero/template | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 srcpkgs/libudev-zero/template

diff --git a/srcpkgs/libudev-zero/template b/srcpkgs/libudev-zero/template
new file mode 100644
index 000000000000..4c19b6b6dcfa
--- /dev/null
+++ b/srcpkgs/libudev-zero/template
@@ -0,0 +1,24 @@
+# Template file for 'libudev-zero'
+pkgname=libudev-zero
+version=1.0.1
+revision=1
+build_style=gnu-makefile
+short_desc="Daemonless replacement for libudev"
+maintainer="dkwo <npiazza@disroot.org>"
+license="ISC"
+homepage="https://github.com/illiliti/libudev-zero"
+distfiles="https://github.com/illiliti/libudev-zero/archive/refs/tags/${version}.tar.gz"
+checksum=c4cf149ea96295c1e6e86038d10c725344c751982ed4a790b06c76776923e0ea
+make_check=no # no tests
+replaces="eudev-libudev>=3.2.11_1"
+#provides
+
+post_build() {
+	"$CC" $LDFLAGS $CFLAGS $CPPFLAGS -o libudev-zero-helper contrib/helper.c
+}
+
+post_install() {
+	rm -f ${DESTDIR}/usr/lib/libudev.a
+	vlicense LICENSE
+	vinstall libudev-zero-helper 755 usr/libexec
+}