Skaware.20220616

13 files changed, 99 insertions, 42 deletions

diff --git a/system/execline/APKBUILD b/system/execline/APKBUILD
index f9cdcb7e7..cd2113d41 100644
--- a/system/execline/APKBUILD
+++ b/system/execline/APKBUILD
@@ -1,14 +1,14 @@
 # Contributor: Laurent Bercot <ska-adelie@skarnet.org>
 # Maintainer: Laurent Bercot <ska-adelie@skarnet.org>
 pkgname=execline
-pkgver=2.8.2.0
+pkgver=2.9.0.0
 pkgrel=0
 pkgdesc="A small scripting language for non-interactive scripts"
 url="https://skarnet.org/software/$pkgname/"
 arch="all"
 options="!check"  # No test suite.
 license="ISC"
-_skalibs_version=2.11
+_skalibs_version=2.12
 makedepends="skalibs-dev>=$_skalibs_version"
 subpackages="$pkgname-libs $pkgname-dev $pkgname-libs-dev:libsdev $pkgname-doc"
 source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz"
@@ -62,4 +62,4 @@ doc() {
         cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname"
 }
 
-sha512sums="9a2c21fbddfc4bce69857fa906fcbb7b17b0cd1009a33a9f3bbcce69ff443af82704d74b792e2d4393eb6d7de9888a5bc74ff208c31485d3398b0dea07368a15  execline-2.8.2.0.tar.gz"
+sha512sums="bd491ef38c439cfe469a3aeda6d462930b1edcbf04a1118851161c30fcd3521e8ec98ef53261f9216c6f210a6816d6dd7cff6dcc853a5d2f28d963f8083aed84  execline-2.9.0.0.tar.gz"
diff --git a/system/mdevd/APKBUILD b/system/mdevd/APKBUILD
index d0e89a27a..f3e133d93 100644
--- a/system/mdevd/APKBUILD
+++ b/system/mdevd/APKBUILD
@@ -1,14 +1,14 @@
 # Contributor: Laurent Bercot <ska-adelie@skarnet.org>
 # Maintainer: Laurent Bercot <ska-adelie@skarnet.org>
 pkgname=mdevd
-pkgver=0.1.5.1
+pkgver=0.1.5.2
 pkgrel=0
 pkgdesc="A small uevent manager daemon"
 url="https://skarnet.org/software/$pkgname/"
 arch="all"
 options="!check"  # No test suite.
 license="ISC"
-_skalibs_version=2.11
+_skalibs_version=2.12
 makedepends="skalibs-dev>=$_skalibs_version"
 subpackages="$pkgname-doc $pkgname-openrc"
 source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz mdev.conf mdevd.run mdevd.initd"
@@ -20,9 +20,11 @@ build() {
 
 package() {
 	make DESTDIR="$pkgdir" install
-	mkdir -p -m 0755 "$pkgdir/etc"
+	mkdir -p -m 0755 "$pkgdir/etc/init.d"
 	cp -f "$srcdir/mdev.conf" "$pkgdir/etc/"
 	chmod 0644 "$pkgdir/etc/mdev.conf"
+	cp -f "$srcdir/mdevd.initd" "$pkgdir/etc/init.d/mdevd"
+	chmod 0755 "$pkgdir/etc/init.d/mdevd"
 }
 
 
@@ -47,7 +49,7 @@ openrc() {
         ln -s ../../init.d/mdevd "$rldir/mdevd"
 }
 
-sha512sums="10a6cf1658da066e781367eba3c2e0c73316089b63e6d087e87ffd5f57c960da5ecf5276bb38a089ceb804d592ddedc40291825d5c69ef8bed26208339288a8b  mdevd-0.1.5.1.tar.gz
-ebc44034663423acfa403856e591b224c3aac180407fa679182f8b42ab2730592be677446ef109c15c3aedb821345f5f9fb0e38ea21a42871a46dcc1e1c37706  mdev.conf
-31231b28d0b980dda634e8b043a2ee31960493d60c2c9aac8a4f3f68ca1d130342569af2acd0bc04d9d8008b8e234ba949b64d9ec3ff1bded64b4e4f0ce3786b  mdevd.run
+sha512sums="50d0b517255bc8acc25b226822186a6315569e7691511bca44a274e18bd443b9ff70e99884ffb9467c9ec85af2a1bd5256b05c92905eeca67ee14b98cd0b540d  mdevd-0.1.5.2.tar.gz
+f966d66366eac3b9b9eeb9b8523ea0924ada2b858c85ca0c0151d0fb374dfbf56c49ec2210d2d5ca19aa4d9f24371c85d777050eb8bf9f57821ec65704f18717  mdev.conf
+427a5903fa2126060955dcce8144d59255a679c4973f2dbc3145a4d646e879fc241ebcaa53289498719d343c746fc376c41defa87932dcbe91192b2d6f4ed1c4  mdevd.run
 3b22077f867a07493284bf1d0c0f1ec5c4359d6f6e7313ce917e354b275286833136defd3eddde967257e3dd255c7581f096bcf2f345553ce6db088296abb41f  mdevd.initd"
diff --git a/system/mdevd/mdev.conf b/system/mdevd/mdev.conf
index 17b0280a7..8f5a262a5 100644
--- a/system/mdevd/mdev.conf
+++ b/system/mdevd/mdev.conf
@@ -34,7 +34,7 @@ md[0-9]*        root:disk 0660 # */opt/mdev/helpers/storage-device
 dm-[0-9]*       root:disk 0660 # */opt/mdev/helpers/storage-device
 bcache[0-9]*    root:disk 0660 # */opt/mdev/helpers/storage-device
 mmcblk[0-9].*   root:disk 0660 # */opt/mdev/helpers/storage-device
-sr[0-9]*        root:cdrom 0660 +ln -sf $MDEV cdrom
+sr[0-9]*        root:cdrom 0660 # +ln -sf $MDEV cdrom
 
 # Run settle-nics every time new NIC appear.
 # If you don't want to auto-populate /etc/mactab with NICs, run 'settle-nics' without '--write-mactab' param.
@@ -60,7 +60,7 @@ rd!(.*)     root:disk 0660 =rd/%1
 
 agpgart     root:root 0660 # >misc/
 psaux       root:root 0660 # >misc/
-rtc[0-9]*   root:root 0600 +ln -sf $MDEV rtc
+rtc[0-9]*   root:root 0600 # +ln -sf $MDEV rtc
 
 # input stuff
 SUBSYSTEM=input;.* root:input 0660
diff --git a/system/mdevd/mdevd.run b/system/mdevd/mdevd.run
index d4b5b8320..f4468fcf2 100644
--- a/system/mdevd/mdevd.run
+++ b/system/mdevd/mdevd.run
@@ -1,3 +1,3 @@
 #!/bin/execlineb -P
 
-mdevd -D 3
+mdevd -D3 -O4
diff --git a/system/s6-linux-init/APKBUILD b/system/s6-linux-init/APKBUILD
index 87c00210c..9518c97cf 100644
--- a/system/s6-linux-init/APKBUILD
+++ b/system/s6-linux-init/APKBUILD
@@ -1,15 +1,15 @@
 # Contributor: Laurent Bercot <ska-adelie@skarnet.org>
 # Maintainer: Laurent Bercot <ska-adelie@skarnet.org>
 pkgname=s6-linux-init
-pkgver=1.0.7.0
+pkgver=1.0.8.0
 pkgrel=0
 pkgdesc="A s6-based init system"
 url="https://skarnet.org/software/$pkgname/"
 arch="all"
 options="!check"  # No test suite.
 license="ISC"
-_skalibs_version=2.11
-_s6_version=2.11
+_skalibs_version=2.12
+_s6_version=2.11.1.1
 depends="execline s6>=$_s6_version s6-linux-init-common"
 makedepends="skalibs-dev>=$_skalibs_version execline-dev s6-dev utmps-dev"
 subpackages="$pkgname-common:common:noarch $pkgname-early-getty:earlygetty:noarch $pkgname-libs $pkgname-dev $pkgname-libs-dev:libsdev $pkgname-doc"
@@ -119,9 +119,9 @@ doc() {
         cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname"
 }
 
-sha512sums="bcda7787d6519b04d8eef36b9db84af17bafb7bc33047b0d79d46dcbd2f0c622e787c056b5ac3633b2a365eafbdbe3744162fa10005d01732c496f54e5bb56f0  s6-linux-init-1.0.7.0.tar.gz
+sha512sums="b64319bc13a98e5f766a118ebd54ccec93163b38b2afc060fe4034a4f2312bb6ae68019e37706338f84c74aa527e5b2ac1f4b29d39255c2d436eab8608483346  s6-linux-init-1.0.8.0.tar.gz
 756b0cbbe5dabb4631380c3c7ea199cc213224b2e36e50a2d012a61948170078b78bf49b85d886319fecf59843087f937d3d804723b2553ac9f94d088a2f0fd8  rc.init
 e73c3c32b118831074288d23fadace2158a2b15d5a13ffa73290b92a9e39c2a21c73d3b0eabea29bcbaa5f6381611fd8d0aaa6aa691ec7de91b8ef6ae404b6da  runlevel
 7bb050248a5c2ab6a56c50c35f87cde724f97ff9882f5e60b0f0f2f14bd93c1df7d99fedc3d81c8519cf1a1ed90e03f1cbb9bf891c7b3618aa9a5f5738d262f4  rc.shutdown
 6fb2a1112988fd2322b4bc4862bfb948a1c2e43921c5d01ae873c0d31b39fe74fc2934a5018c08b1704a2b2199b31d3a3d7365be369bba734f153b74e000aa74  reboot.sh
-67b8dfc5e4174d7ec6fab4ac618e6acf27481808bbaa7cfd3d805dc3e66c017f76e30c5e1ce5d5a5bb5ba3fbf97c0d8b864d8095fae40d1ae9dad3ae629811f9  earlygetty.run"
+dfff483b61370ce2c8fe653cb4e9b6ec7ef678f26b128eab8e677548a48b668b532b12a2e4618c85bf95777a666ac30189780708803d6ea12e43ab0072399212  earlygetty.run"
diff --git a/system/s6-linux-init/earlygetty.run b/system/s6-linux-init/earlygetty.run
index 5e60e7028..072fdd7d2 100644
--- a/system/s6-linux-init/earlygetty.run
+++ b/system/s6-linux-init/earlygetty.run
@@ -4,7 +4,7 @@ tty=tty2
 baud=
 options='-L'
 
-if line=`head -n 1 /run/kernel_env/earlygetty` ; then
+if line=`head -n 1 /run/kernel_env/earlygetty 2>/dev/null` ; then
   tty="${line%%,*}"
   bpnf="${line##*,}"
   nf=
diff --git a/system/s6-rc/APKBUILD b/system/s6-rc/APKBUILD
index 4bcb7d07c..62012a267 100644
--- a/system/s6-rc/APKBUILD
+++ b/system/s6-rc/APKBUILD
@@ -1,14 +1,14 @@
 # Contributor: Laurent Bercot <ska-adelie@skarnet.org>
 # Maintainer: Laurent Bercot <ska-adelie@skarnet.org>
 pkgname=s6-rc
-pkgver=0.5.3.0
+pkgver=0.5.3.2
 pkgrel=0
 pkgdesc="skarnet.org's service manager, working on top of s6"
 url="https://skarnet.org/software/s6-rc/"
 arch="all"
 options="!check"
 license="ISC"
-_skalibs_version=2.11.1
+_skalibs_version=2.12
 _s6_version=2.11
 depends="execline"
 makedepends="skalibs-dev>=$_skalibs_version execline-dev s6-dev>=$_s6_version"
@@ -66,4 +66,4 @@ doc() {
         cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname"
 }
 
-sha512sums="0b5dda996d96761f1df192675ed117f2acff9f2ad24e6c1405f3eaa46fdd2767178005582fbc9938152232f85ff01b008efedab6c80051bc65f1193d468a56f1  s6-rc-0.5.3.0.tar.gz"
+sha512sums="72963b2aa8e338503918d063102653d392cbd701823e35f87b45d9777fd512f7ad49ab47b94df0f9e5ef50a0dad5162f6f3526fa77dfaa3afb48ad8db4097051  s6-rc-0.5.3.2.tar.gz"
diff --git a/system/s6/APKBUILD b/system/s6/APKBUILD
index 203ea25ce..81b20d1cf 100644
--- a/system/s6/APKBUILD
+++ b/system/s6/APKBUILD
@@ -1,14 +1,14 @@
 # Contributor: Laurent Bercot <ska-adelie@skarnet.org>
 # Maintainer: Laurent Bercot <ska-adelie@skarnet.org>
 pkgname=s6
-pkgver=2.11.0.1
+pkgver=2.11.1.1
 pkgrel=0
 pkgdesc="skarnet.org's small & secure supervision software suite"
 url="https://skarnet.org/software/$pkgname/"
 arch="all"
 options="!check"  # No test suite.
 license="ISC"
-_skalibs_version=2.11
+_skalibs_version=2.12
 depends="execline"
 makedepends="skalibs-dev>=$_skalibs_version execline-dev"
 install="$pkgname.post-upgrade"
@@ -67,4 +67,4 @@ doc() {
         cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname"
 }
 
-sha512sums="e833ae42d7094a46eea4d914c8e9b07b030cab2c6010c1d7698a070d14adbb62a614822a9575a3064a6b8a5a856146fc9fa27661f0d84569dac14ad6cdbf84d9  s6-2.11.0.1.tar.gz"
+sha512sums="f5fc903c11b57b2a83d9e120a51f64b63984a2af9b772dd6fd64f268b512a083350abedcae04c926deb6751b5ae30e992d6a4128ddf4ab1d49c548ef8f3d7752  s6-2.11.1.1.tar.gz"
diff --git a/system/skalibs/APKBUILD b/system/skalibs/APKBUILD
index f6fb6c628..6759578e5 100644
--- a/system/skalibs/APKBUILD
+++ b/system/skalibs/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Laurent Bercot <ska-adelie@skarnet.org>
 # Maintainer: Laurent Bercot <ska-adelie@skarnet.org>
 pkgname=skalibs
-pkgver=2.11.1.0
+pkgver=2.12.0.0
 pkgrel=0
 pkgdesc="A set of general-purpose C programming libraries for skarnet.org software"
 url="https://skarnet.org/software/skalibs/"
@@ -57,4 +57,4 @@ doc() {
 	cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname"
 }
 
-sha512sums="7db390b887234437d52f3b9388f7398e92877cde4c93de76532abff64ee1a127524181c53a0fdddd86bd84247d84f704527bd89c5581e27433081862e9970af7  skalibs-2.11.1.0.tar.gz"
+sha512sums="7a431b47bb5be1d6f647da65026c7d3fa9c836b6a5e9984ae8b46dda9263a738ad1f26d76b6fe12b750f8338e9506fc8472f467c6d7d5b8369cadd602d9131bf  skalibs-2.12.0.0.tar.gz"
diff --git a/system/utmps/APKBUILD b/system/utmps/APKBUILD
index dae854ed2..ccdc0c615 100644
--- a/system/utmps/APKBUILD
+++ b/system/utmps/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Laurent Bercot <ska-adelie@skarnet.org>
 # Maintainer: Laurent Bercot <ska-adelie@skarnet.org>
 pkgname=utmps
-pkgver=0.1.1.0
+pkgver=0.1.2.0
 pkgrel=0
 pkgdesc="A secure utmp/wtmp implementation"
 url="https://skarnet.org/software/$pkgname/"
@@ -9,13 +9,15 @@ arch="all"
 options="!check"  # No test suite
 license="ISC"
 depends="execline s6"
-_skalibs_version=2.11.1
+_skalibs_version=2.12
 makedepends="skalibs-dev>=$_skalibs_version"
-subpackages="$pkgname-libs $pkgname-dev $pkgname-libs-dev:libsdev $pkgname-doc"
+subpackages="$pkgname-libs $pkgname-dev $pkgname-libs-dev:libsdev $pkgname-doc $pkgname-openrc"
 install="$pkgname.post-upgrade"
 source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz
 	utmpd.run
-	wtmpd.run"
+	wtmpd.run
+	btmpd.run
+	utmps.initd"
 
 build() {
 	./configure \
@@ -33,15 +35,31 @@ build() {
 package() {
 	make DESTDIR="$pkgdir" install
 	runimage="$pkgdir/etc/s6-linux-init/current/run-image"
-        mkdir -p -m 0755 "$runimage/utmps" "$runimage/service/utmpd" "$runimage/service/wtmpd"
+        mkdir -p -m 0755 "$runimage/utmps" "$runimage/service/utmpd"
 	chown utmp:utmp "$runimage/utmps"
         cp -f "$srcdir/utmpd.run" "$runimage/service/utmpd/run"
 	echo 3 > "$runimage/service/utmpd/notification-fd"
-        cp -f "$srcdir/wtmpd.run" "$runimage/service/wtmpd/run"
-	echo 3 > "$runimage/service/wtmpd/notification-fd"
-        chmod 0755 "$runimage/service/utmpd/run" "$runimage/service/wtmpd/run"
+        chmod 0755 "$runimage/service/utmpd/run"
+	install -D -m755 "$srcdir/utmps.initd" "$pkgdir/etc/init.d/utmps"
 }
 
+openrc() {
+	rldir="$subpkgdir"/etc/runlevels/boot
+	subrunimage="$subpkgdir/etc/s6-linux-init/current/run-image"
+	default_openrc
+	mkdir -p -m 0755 "$rldir" "$subpkgdir/var/log/wtmpd" "$subrunimage/service/wtmpd" "$subrunimage/service/btmpd"
+        cp -f "$srcdir/wtmpd.run" "$subrunimage/service/wtmpd/run"
+	echo 3 > "$subrunimage/service/wtmpd/notification-fd"
+	touch "$subrunimage/service/wtmpd/down"
+        cp -f "$srcdir/btmpd.run" "$subrunimage/service/btmpd/run"
+	echo 3 > "$subrunimage/service/btmpd/notification-fd"
+	touch "$subrunimage/service/btmpd/down"
+        chmod 0755 "$subrunimage/service/wtmpd/run" "$subrunimage/service/btmpd/run"
+	chown utmp:utmp "$subpkgdir/var/log/wtmpd"
+	ln -s wtmpd/wtmp "$subpkgdir/var/log/wtmp"
+	ln -s wtmpd/btmp "$subpkgdir/var/log/btmp"
+	ln -s ../../init.d/utmps "$rldir/utmps"
+}
 
 libs() {
         pkgdesc="$pkgdesc (shared libraries)"
@@ -50,7 +68,6 @@ libs() {
         mv "$pkgdir"/lib/*.so.* "$subpkgdir/lib/"
 }
 
-
 dev() {
         pkgdesc="$pkgdesc (development files)"
         depends="skalibs-dev>=$_skalibs_version"
@@ -59,7 +76,6 @@ dev() {
         mv "$pkgdir/usr/lib" "$pkgdir/usr/include" "$subpkgdir/usr/"
 }
 
-
 libsdev() {
         pkgdesc="$pkgdesc (development files for dynamic linking)"
         depends="$pkgname-dev"
@@ -67,7 +83,6 @@ libsdev() {
         mv "$pkgdir"/lib/*.so "$subpkgdir/lib/"
 }
 
-
 doc() {
         pkgdesc="$pkgdesc (documentation)"
         depends=""
@@ -76,6 +91,8 @@ doc() {
         cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname"
 }
 
-sha512sums="13a6791df2d246c2e2b04176bc614cc0ee238cc2131aa893e0abb7250f9e10598b0d3a5e8ed26cb18a9dffea16bc75a1787d537a80067588bc8e4388139de78f  utmps-0.1.1.0.tar.gz
+sha512sums="a89c054584680ec1abeb145d244488433cbb3e837fbd77e8914c402e84ce7bc50615c8cf13e7f97316096417fcd5ed84a24f618b4714c640cd8e39fb6749b00d  utmps-0.1.2.0.tar.gz
 0ec30284c64c6ea9f25142c5f4a643bd48b137fe85781b650104f5137ffa4dfc35ca7be3e41e3acd3403ebe1d8c5378073afa4e2f3607d3d794fcd9f98ed51c4  utmpd.run
-cba4f2ec3b8f5becf3ae57eecf584745d783046ee6cf5d116322421ad5ffd074d2955da22d31d2b5b1d05f906378aae92f221d2ac95ac21b54a361fbdc0566e7  wtmpd.run"
+9e875a5cd37be531320a8e582afed2c980dd0a1bdfc2f6f3d826d5e5389fc6ab93f973ed1506edb23f4c73cf24a2357aefe856148eaacff86c2aafe376c575e2  wtmpd.run
+503bdbb3d244243934b9b4e3deea0bf92a95f88417c822ad9cf6202584d4724d5e182a0d88d7f09069e435a8a97230b85d2b264736c85c893da193fd5ec34c71  btmpd.run
+3a658c7b078f3df4d20192b0719c2c8ac5b08083c7c36807ef39ab67232ffacc64429c63fba27a06d509048b3ebf47128885ef34aa4b6fac1ad8df894cbb604a  utmps.initd"
diff --git a/system/utmps/btmpd.run b/system/utmps/btmpd.run
new file mode 100644
index 000000000..56a5de77e
--- /dev/null
+++ b/system/utmps/btmpd.run
@@ -0,0 +1,8 @@
+#!/bin/execlineb -P
+
+fdmove -c 2 1
+s6-setuidgid utmp
+cd /var/log/wtmpd
+fdmove 1 3
+s6-ipcserver -1 -- /run/utmps/.btmpd-socket
+utmps-wtmpd btmp
diff --git a/system/utmps/utmps.initd b/system/utmps/utmps.initd
new file mode 100644
index 000000000..c6f884a52
--- /dev/null
+++ b/system/utmps/utmps.initd
@@ -0,0 +1,30 @@
+#!/sbin/openrc-run
+# Copyright 2022 Adélie Linux
+
+description="boot script for the utmps wtmp and btmp services"
+
+depend()
+{
+	need localmount
+	after bootmisc
+	before networking
+}
+
+stop()
+{
+	ebegin "Stopping the utmps wtmp and btmp services"
+	touch /run/service/wtmpd/down /run/service/btmpd/down
+	s6-svc -d /run/service/btmpd
+	s6-svc -d /run/service/wtmpd
+	eend $?
+}
+
+start()
+{
+	ebegin "Starting the utmps wtmp and btmp services"
+	rm -f /run/service/wtmpd/down /run/service/btmpd/down
+	s6-svlisten -U " /run/service/wtmpd" " /run/service/btmpd" "" \
+		foreground " s6-svc" " -u" " /run/service/wtmpd" "" \
+		s6-svc -u /run/service/btmpd
+	eend $?
+}
diff --git a/system/utmps/wtmpd.run b/system/utmps/wtmpd.run
index ab5a40641..599c63b83 100644
--- a/system/utmps/wtmpd.run
+++ b/system/utmps/wtmpd.run
@@ -2,7 +2,7 @@
 
 fdmove -c 2 1
 s6-setuidgid utmp
-cd /run/utmps
+cd /var/log/wtmpd
 fdmove 1 3
-s6-ipcserver -1 -- .wtmpd-socket
-utmps-wtmpd
+s6-ipcserver -1 -- /run/utmps/.wtmpd-socket
+utmps-wtmpd wtmp