From 199d9b534e161ff207e28bbf0a18411bd2afb4d4 Mon Sep 17 00:00:00 2001 From: mobinmob Date: Fri, 17 Feb 2023 20:11:07 +0200 Subject: [PATCH 01/19] skalibs: update to 2.13.1.0. --- common/shlibs | 2 +- srcpkgs/skalibs/template | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/shlibs b/common/shlibs index 0f9c75af44bc..d7a886b366f6 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2377,7 +2377,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.0.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 c2775442aeadba28e3b39078b0e5b7cde25ea52a Mon Sep 17 00:00:00 2001 From: mobinmob Date: Fri, 17 Feb 2023 20:11:14 +0200 Subject: [PATCH 02/19] execline: update to 2.9.2.0. --- srcpkgs/execline/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/execline/template b/srcpkgs/execline/template index 2df4249d34cc..6c16293af1a8 100644 --- a/srcpkgs/execline/template +++ b/srcpkgs/execline/template @@ -1,6 +1,6 @@ # Template file for 'execline' pkgname=execline -version=2.9.0.1 +version=2.9.2.0 revision=1 build_style=configure configure_args="--libdir=/usr/lib --bindir=/usr/bin @@ -14,7 +14,7 @@ license="ISC" homepage="https://skarnet.org/software/execline/" changelog="https://skarnet.org/software/execline/upgrade.html" distfiles="https://skarnet.org/software/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=01260fcaf80ffbca2a94aa55ea474dfb9e39b3033b55c8af88126791879531f6 +checksum=9365012558a1e3c019cafc6eb574b0f5890495fb02652f20efdd782d577b1601 CFLAGS="-fPIC" From 6fbeb2a9c0383fa0c6ad9fdd15e54963a96de5b8 Mon Sep 17 00:00:00 2001 From: mobinmob Date: Fri, 17 Feb 2023 20:11:20 +0200 Subject: [PATCH 03/19] s6: update to 2.11.3.0. --- srcpkgs/s6/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/s6/template b/srcpkgs/s6/template index d54785b251b2..ef18c396fcde 100644 --- a/srcpkgs/s6/template +++ b/srcpkgs/s6/template @@ -1,6 +1,6 @@ # Template file for 's6' pkgname=s6 -version=2.11.1.1 +version=2.11.3.0 revision=1 build_style=configure configure_args="--libdir=/usr/lib --bindir=/usr/bin @@ -15,7 +15,7 @@ license="ISC" homepage="http://skarnet.org/software/s6/" changelog="https://skarnet.org/software/s6/upgrade.html" distfiles="http://skarnet.org/software/s6/s6-${version}.tar.gz" -checksum=1cef7f7b3a7e01181fbb6fe8300e6ba422d9689007221c78af1f99528acb6c38 +checksum=0ef2de80c40b603d58bf65ec5dd9f0bb1f227d35f311e8948d9e30f81efb5b81 build_options="static" From b5d9fc4f514f155a84ee01f4d4a25d43ded7b0dd Mon Sep 17 00:00:00 2001 From: mobinmob Date: Fri, 17 Feb 2023 20:11:24 +0200 Subject: [PATCH 04/19] s6-rc: update to 0.5.4.0. --- srcpkgs/s6-rc/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/s6-rc/template b/srcpkgs/s6-rc/template index 495907ef8a60..1fef769f112f 100644 --- a/srcpkgs/s6-rc/template +++ b/srcpkgs/s6-rc/template @@ -1,6 +1,6 @@ # Template file for 's6-rc' pkgname=s6-rc -version=0.5.3.2 +version=0.5.4.0 revision=1 build_style=configure configure_args="--prefix=/usr --libdir=/usr/lib --includedir=/usr/include @@ -15,7 +15,7 @@ license="ISC" homepage="https://skarnet.org/software/s6-rc/" changelog="https://skarnet.org/software/s6-rc/upgrade.html" distfiles="https://skarnet.org/software/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=4f24a4966a4aa353d2bd1a8afca9b88c7b7bd29c46b3a1a7f5305686b9d6e038 +checksum=9e750e63a19aaf65ef50cf6f691b8641f7d98857fa2e992b8186953fb32cad70 build_options="static" From 13e60edb6430f1b587c0947fa226fa4864844536 Mon Sep 17 00:00:00 2001 From: mobinmob Date: Fri, 17 Feb 2023 20:11:38 +0200 Subject: [PATCH 05/19] nsss: update to 0.2.0.3. --- srcpkgs/nsss/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/nsss/template b/srcpkgs/nsss/template index b4efae672355..ae3cac748266 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 +version=0.2.0.3 +revision=1 # Only available for musl archs="*-musl" build_style=configure @@ -16,7 +16,7 @@ license="ISC" homepage="https://skarnet.org/software/nsss/" changelog="https://skarnet.org/software/nsss/upgrade.html" distfiles="https://skarnet.org/software/nsss/nsss-${version}.tar.gz" -checksum=7d984ea627b3a8d7649d9bf24c79693f338e911d2b11040b89c4febfb1b3125b +checksum=b1e397ed5b327611a7c2c8c1dc60e91fef353c54fead464f887720bc0914148e build_options="static" From 71b6a05fd72ff7e8b27ed16518948e152efccca1 Mon Sep 17 00:00:00 2001 From: mobinmob Date: Fri, 17 Feb 2023 20:11:42 +0200 Subject: [PATCH 06/19] s6-dns: update to 2.3.5.5. --- srcpkgs/s6-dns/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/s6-dns/template b/srcpkgs/s6-dns/template index 4d282185ce8a..7f243bc2ec82 100644 --- a/srcpkgs/s6-dns/template +++ b/srcpkgs/s6-dns/template @@ -1,6 +1,6 @@ # Template file for 's6-dns' pkgname=s6-dns -version=2.3.5.4 +version=2.3.5.5 revision=1 build_style=configure configure_args="--prefix=/usr --libdir=/usr/lib @@ -13,7 +13,7 @@ maintainer="Orphaned " license="ISC" homepage="https://skarnet.org/software/s6-dns" distfiles="${homepage}/${pkgname}-${version}.tar.gz" -checksum=76af222472c4754f83cdc59ad354255ce1b1e6f6833a059328463f8e51f4db43 +checksum=56979b5d5125c38071a80b5e3df0d4a6b2a7c52bb863a2410b6e3d797ffe1ee8 build_options="static" From 7e0e4d58e33acb024e03ff20d2b3575be79f345f Mon Sep 17 00:00:00 2001 From: mobinmob Date: Fri, 17 Feb 2023 20:11:49 +0200 Subject: [PATCH 07/19] s6-networking: update to 2.5.1.2. --- srcpkgs/s6-networking/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/s6-networking/template b/srcpkgs/s6-networking/template index 5a04b9abf01b..1652f93ec9ac 100644 --- a/srcpkgs/s6-networking/template +++ b/srcpkgs/s6-networking/template @@ -1,6 +1,6 @@ # Template file for 's6-networking' pkgname=s6-networking -version=2.5.1.1 +version=2.5.1.2 revision=1 build_style=configure configure_args="--libdir=/usr/lib $(vopt_if libtls --enable-ssl=libtls) @@ -16,7 +16,7 @@ license="ISC" homepage="https://skarnet.org/software/s6-networking" changelog="https://skarnet.org/software/s6-networking/upgrade.html" distfiles="${homepage}/${pkgname}-${version}.tar.gz" -checksum=7ac79d4de3d9c13532e444ab7497c4e04ad0fa7229d502984d9dc7d48aa64418 +checksum=d072deb67a4ca4d7c512640c5f33a766c7b854364949727d3600738c6769f146 build_options="bearssl libtls static" build_options_default="bearssl" From 024f1e672d80e46dc904c37d435bc471bac556e9 Mon Sep 17 00:00:00 2001 From: mobinmob Date: Fri, 17 Feb 2023 20:11:59 +0200 Subject: [PATCH 08/19] s6-portable-utils: update to 2.3.0.0. --- srcpkgs/s6-portable-utils/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/s6-portable-utils/template b/srcpkgs/s6-portable-utils/template index ca0c308fb3b1..eca93d57160e 100644 --- a/srcpkgs/s6-portable-utils/template +++ b/srcpkgs/s6-portable-utils/template @@ -1,6 +1,6 @@ # Template file for 's6-portable-utils' pkgname=s6-portable-utils -version=2.2.5.0 +version=2.3.0.0 revision=1 build_style=configure configure_args="--prefix=/usr --libdir=/usr/lib --includedir=/usr/include @@ -14,7 +14,7 @@ license="ISC" homepage="https://skarnet.org/software/s6-portable-utils/" changelog="https://skarnet.org/software/s6-portable-utils/upgrade.html" distfiles="https://skarnet.org/software/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=ebb39f8934fd36f25d31352e61bbd94dc02b1e9f04411850d2fd9658bd916e36 +checksum=1e9066c430c1cb39a3a7b7004cd379ffebe566bd3d698db18de6125783002005 build_options="static" From e3ec53c0276a7a5d0707bfd364530a66762796e0 Mon Sep 17 00:00:00 2001 From: mobinmob Date: Fri, 17 Feb 2023 20:12:05 +0200 Subject: [PATCH 09/19] s6-linux-utils: update to 2.6.1.0. --- srcpkgs/s6-linux-utils/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/s6-linux-utils/template b/srcpkgs/s6-linux-utils/template index 212752cc26d0..28bd4b52b8a4 100644 --- a/srcpkgs/s6-linux-utils/template +++ b/srcpkgs/s6-linux-utils/template @@ -1,6 +1,6 @@ # Template file for 's6-linux-utils' pkgname=s6-linux-utils -version=2.6.0.0 +version=2.6.1.0 revision=1 build_style=configure configure_args="--libdir=/usr/lib --includedir=/usr/include @@ -14,7 +14,7 @@ license="ISC" homepage="https://skarnet.org/software/s6-linux-utils" changelog="https://skarnet.org/software/s6-linux-utils/upgrade.html" distfiles="${homepage}/${pkgname}-${version}.tar.gz" -checksum=6c7132734a0c8287002ee6910c469f175a97d766a8023c0c33af8ba92643ed59 +checksum=2accb5a443dd04203a6358534bdcf0dd369aceb4733e322612c2b8329260b7a2 build_options="static" From 472cec1308d96dd5efc4cf08b5c16dcf1daa1eeb Mon Sep 17 00:00:00 2001 From: mobinmob Date: Fri, 17 Feb 2023 20:12:13 +0200 Subject: [PATCH 10/19] s6-man-pages: update to 2.11.2.0.1. --- srcpkgs/s6-man-pages/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/s6-man-pages/template b/srcpkgs/s6-man-pages/template index 308c8a8ebd2b..290c85a02bd4 100644 --- a/srcpkgs/s6-man-pages/template +++ b/srcpkgs/s6-man-pages/template @@ -1,6 +1,6 @@ # Template file for 's6-man-pages' pkgname=s6-man-pages -version=2.11.1.1.1 +version=2.11.2.0.1 revision=1 build_style=gnu-makefile short_desc="Ports of the HTML documentation for the s6 supervision suite to mdoc(7)" @@ -8,7 +8,7 @@ maintainer="mobinmob " license="ISC" homepage="https://github.com/flexibeast/s6-man-pages" distfiles="https://github.com/flexibeast/s6-man-pages/archive/v${version}.tar.gz" -checksum=794cd18cabee8c5afcb2cddfb35a5ae93240595aae5dc831acc8f4e258ca2199 +checksum=733db565d05425ad4f70ea70f43e2f63d0b3b8f16a46f89a3e8653ebbf0fe93b post_install() { vlicense LICENSE From c2222d99eee63badd33b211caa41f14101f29098 Mon Sep 17 00:00:00 2001 From: mobinmob Date: Fri, 17 Feb 2023 20:12:25 +0200 Subject: [PATCH 11/19] s6-networking-man-pages: update to 2.5.1.2.1. --- srcpkgs/s6-networking-man-pages/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/s6-networking-man-pages/template b/srcpkgs/s6-networking-man-pages/template index 2480ac1440f9..a34ce9e71fa7 100644 --- a/srcpkgs/s6-networking-man-pages/template +++ b/srcpkgs/s6-networking-man-pages/template @@ -1,6 +1,6 @@ # Template file for 's6-networking-man-pages' pkgname=s6-networking-man-pages -version=2.5.1.1.1 +version=2.5.1.2.1 revision=1 build_style=gnu-makefile hostmakedepends="mdocml" @@ -9,7 +9,7 @@ maintainer="mobinmob " license="ISC" homepage="https://github.com/flexibeast/s6-networking-man-pages" distfiles="https://github.com/flexibeast/s6-networking-man-pages/archive/refs/tags/v${version}.tar.gz" -checksum=8502edfc01f54c7eca8131a5cb3c9a46c698c9199f9654db9183f7e307ece258 +checksum=40cd9f4f96b020f1bcf867dbc789111723a9a8931a66b9820a72e2491d154ab5 post_install() { vlicense LICENSE From 9339d4fce2b8eb35fb1de4b5b411ae96f055a777 Mon Sep 17 00:00:00 2001 From: mobinmob Date: Fri, 17 Feb 2023 20:12:38 +0200 Subject: [PATCH 12/19] s6-portable-utils-man-pages: update to 2.2.5.1.1. --- srcpkgs/s6-portable-utils-man-pages/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/s6-portable-utils-man-pages/template b/srcpkgs/s6-portable-utils-man-pages/template index 28c906c1a67a..3320a91af185 100644 --- a/srcpkgs/s6-portable-utils-man-pages/template +++ b/srcpkgs/s6-portable-utils-man-pages/template @@ -1,6 +1,6 @@ # Template file for 's6-portable-utils-man-pages' pkgname=s6-portable-utils-man-pages -version=2.2.5.0.1 +version=2.2.5.1.1 revision=1 build_style=gnu-makefile hostmakedepends="mdocml" @@ -9,7 +9,7 @@ maintainer="mobinmob " license="ISC" homepage="https://github.com/flexibeast/s6-portable-utils-man-pages" distfiles="https://github.com/flexibeast/s6-portable-utils-man-pages/archive/refs/tags/v${version}.tar.gz" -checksum=e960dbd459285846f89900643742846848431c0d82d4645f3c4b697227abdfe4 +checksum=977c7f204d7ae57872682407d27f3c4df53e5417d9e1cf57d62bce45893db8ff post_install() { vlicense LICENSE From 241113619fd8696b9b0502f903b3a37d5b01ef4d Mon Sep 17 00:00:00 2001 From: mobinmob Date: Fri, 17 Feb 2023 20:12:54 +0200 Subject: [PATCH 13/19] execline-man-pages: update to 2.9.1.0.1. --- srcpkgs/execline-man-pages/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/execline-man-pages/template b/srcpkgs/execline-man-pages/template index 7369115caf4c..3803ed7c4d4f 100644 --- a/srcpkgs/execline-man-pages/template +++ b/srcpkgs/execline-man-pages/template @@ -1,6 +1,6 @@ # Template file for 'execline-man-pages' pkgname=execline-man-pages -version=2.9.0.0.1 +version=2.9.1.0.1 revision=1 build_style=gnu-makefile hostmakedepends="mdocml" @@ -9,7 +9,7 @@ maintainer="mobinmob " license="ISC" homepage="https://github.com/flexibeast/execline-man-pages" distfiles="https://github.com/flexibeast/execline-man-pages/archive/v${version}.tar.gz" -checksum=e8e7e3deacbfdbb7144574068fdb5621340522ec8c6fa7e4d32b6b44ee060b33 +checksum=f170669b4a56e559275ac2b166cbadc4229b635906fe5c072fde7df545287d06 post_install() { vlicense LICENSE From c3923143490ddfc7e4cb875742831bf156e95739 Mon Sep 17 00:00:00 2001 From: mobinmob Date: Fri, 17 Feb 2023 20:14:06 +0200 Subject: [PATCH 14/19] oblibs: revbump for new skarnet stack release. --- 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 0ab6d559c016244570adf6fc0cec31d48d16f65c Mon Sep 17 00:00:00 2001 From: mobinmob Date: Fri, 17 Feb 2023 20:14:28 +0200 Subject: [PATCH 15/19] 66-tools: revbump for new skarnet release. --- 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 3f8df10cfdd61c0aedb10fd564122b816e19b046 Mon Sep 17 00:00:00 2001 From: mobinmob Date: Fri, 17 Feb 2023 20:14:44 +0200 Subject: [PATCH 16/19] 66: revbump for new skarnet release. --- 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 160089ea606ae49cce90948b9a06ee0ba65d1e97 Mon Sep 17 00:00:00 2001 From: dkwo Date: Fri, 24 Feb 2023 17:01:40 -0500 Subject: [PATCH 17/19] 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..3d95ad3a6850 --- /dev/null +++ b/srcpkgs/mdevd/files/mdevd/run @@ -0,0 +1,4 @@ +#!/bin/sh + +exec 2>&1 +exec mdevd -f /etc/mdev.conf -D 3 -b 200000 -O4 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 3f9811fe481692d2cd84ad86d54a2cb7a1d106fb Mon Sep 17 00:00:00 2001 From: dkwo Date: Fri, 24 Feb 2023 18:26:36 -0500 Subject: [PATCH 18/19] new package: libudev-zero --- srcpkgs/libudev-zero-devel | 1 + srcpkgs/libudev-zero-helper | 1 + srcpkgs/libudev-zero/template | 44 +++++++++++++++++++++++++++++++++++ 3 files changed, 46 insertions(+) create mode 120000 srcpkgs/libudev-zero-devel create mode 120000 srcpkgs/libudev-zero-helper create mode 100644 srcpkgs/libudev-zero/template diff --git a/srcpkgs/libudev-zero-devel b/srcpkgs/libudev-zero-devel new file mode 120000 index 000000000000..fa3977904232 --- /dev/null +++ b/srcpkgs/libudev-zero-devel @@ -0,0 +1 @@ +libudev-zero/ \ No newline at end of file diff --git a/srcpkgs/libudev-zero-helper b/srcpkgs/libudev-zero-helper new file mode 120000 index 000000000000..fa3977904232 --- /dev/null +++ b/srcpkgs/libudev-zero-helper @@ -0,0 +1 @@ +libudev-zero/ \ No newline at end of file diff --git a/srcpkgs/libudev-zero/template b/srcpkgs/libudev-zero/template new file mode 100644 index 000000000000..a001e8342262 --- /dev/null +++ b/srcpkgs/libudev-zero/template @@ -0,0 +1,44 @@ +# Template file for 'libudev-zero' +pkgname=libudev-zero +version=1.0.1 +revision=1 +_UDEV_VERSION=243 +build_style=gnu-makefile +short_desc="Daemonless replacement for libudev" +maintainer="dkwo " +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 +provides="libudev-${_UDEV_VERSION}_${revision}" +conflicts="eudev-libudev>=3.2.11_1" + +post_build() { + "$CC" $LDFLAGS $CFLAGS $CPPFLAGS -o libudev-zero-helper contrib/helper.c +} + +post_install() { + vlicense LICENSE +} + +libudev-zero-devel_package() { + provides="libudev-devel-${_UDEV_VERSION}_${revision}" + conflicts="eudev-libudev-devel>=3.2.11_1" + depends="libudev-zero>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove "usr/lib/*.a" + vmove "usr/lib/*.so" + } +} + +libudev-zero-helper_package() { + depends="libudev-zero>=${version}_${revision}" + short_desc+=" - helper" + pkg_install() { + vinstall libudev-zero-helper 755 usr/libexec + } +} From dc6a21d466b9b9c406169fa4c9190c45c052e2d5 Mon Sep 17 00:00:00 2001 From: dkwo Date: Wed, 1 Mar 2023 17:07:50 -0500 Subject: [PATCH 19/19] runit-void: patch for udev --- srcpkgs/runit-void/patches/udev.patch | 79 +++++++++++++++++++++++++++ srcpkgs/runit-void/template | 2 +- 2 files changed, 80 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/runit-void/patches/udev.patch diff --git a/srcpkgs/runit-void/patches/udev.patch b/srcpkgs/runit-void/patches/udev.patch new file mode 100644 index 000000000000..b15530bc0f2d --- /dev/null +++ b/srcpkgs/runit-void/patches/udev.patch @@ -0,0 +1,79 @@ +From 109a056987fce4e0706420fba6705522e379bda5 Mon Sep 17 00:00:00 2001 +From: dkwo +Date: Wed, 1 Mar 2023 15:42:53 -0500 +Subject: [PATCH] core-services/{02,99},rc.conf: allow alternative udevd + +--- + core-services/02-udev.sh | 27 +++++++++++++-------------- + core-services/99-cleanup.sh | 11 +++++++++++ + rc.conf | 5 +++++ + 3 files changed, 29 insertions(+), 14 deletions(-) + +diff --git a/core-services/02-udev.sh b/core-services/02-udev.sh +index b08f8ca..2c46d55 100644 +--- a/core-services/02-udev.sh ++++ b/core-services/02-udev.sh +@@ -2,18 +2,17 @@ + + [ -n "$VIRTUALIZATION" ] && return 0 + +-if [ -x /usr/lib/systemd/systemd-udevd ]; then +- _udevd=/usr/lib/systemd/systemd-udevd +-elif [ -x /sbin/udevd -o -x /bin/udevd ]; then +- _udevd=udevd +-else +- msg_warn "cannot find udevd!" +-fi ++msg "Starting device manager and waiting for devices to settle..." ++case $CONFIG_DEV in ++ udevd) ++ udevd --daemon ++ udevadm trigger --action=add --type=subsystems ++ udevadm trigger --action=add --type=devices ++ udevadm settle ++ ;; + +-if [ -n "${_udevd}" ]; then +- msg "Starting udev and waiting for devices to settle..." +- ${_udevd} --daemon +- udevadm trigger --action=add --type=subsystems +- udevadm trigger --action=add --type=devices +- udevadm settle +-fi ++ mdevd) ++ mdevd & pid_mdevd=$! ++ mdevd-coldplug ++ ;; ++esac +diff --git a/core-services/99-cleanup.sh b/core-services/99-cleanup.sh +index f27f728..d9f3f98 100644 +--- a/core-services/99-cleanup.sh ++++ b/core-services/99-cleanup.sh +@@ -8,3 +8,14 @@ if [ ! -e /var/log/btmp ]; then + fi + install -dm1777 /tmp/.X11-unix /tmp/.ICE-unix + rm -f /etc/nologin /forcefsck /forcequotacheck /fastboot ++ ++msg "Killing device manager to make way for service..." ++case $CONFIG_DEV in ++ udevd) ++ udevadm control --exit ++ ;; ++ ++ mdevd) ++ kill "$pid_mdevd" ++ ;; ++esac +diff --git a/rc.conf b/rc.conf +index aa3da51..8a5e9f4 100644 +--- a/rc.conf ++++ b/rc.conf +@@ -45,3 +45,8 @@ + # RNG, for example if you plan to replicate this file system image and do not + # have the wherewithal to first delete the contents of /var/lib/seedrng. + #SEEDRNG_SKIP_CREDIT=false ++ ++# The device manager to run during the init process. This is killed once boot ++# is complete for a supervised version to take its place. Valid values are ++# currently 'mdevd' or 'udevd' (default). ++CONFIG_DEV=udevd diff --git a/srcpkgs/runit-void/template b/srcpkgs/runit-void/template index 71020dfba965..3fcb02d1cf58 100644 --- a/srcpkgs/runit-void/template +++ b/srcpkgs/runit-void/template @@ -1,7 +1,7 @@ # Template file for 'runit-void' pkgname=runit-void version=20220329 -revision=1 +revision=2 build_style=gnu-makefile short_desc="Void Linux runit scripts" maintainer="Enno Boland "