Merge branch 'skaware.20210109' into 'master'

update to latest version of skarnet.org software

See merge request adelie/packages!598

10 files changed, 39 insertions, 31 deletions

diff --git a/system/execline/APKBUILD b/system/execline/APKBUILD
index 9565e76d5..6306ef14f 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.6.1.0
+pkgver=2.7.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.9.2.1
+_skalibs_version=2.10.0.0
 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"
@@ -61,4 +61,5 @@ doc() {
         mkdir -p "$subpkgdir/usr/share/doc"
         cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname"
 }
-sha512sums="5bddf400f4cddeb8ddf8c80415c426553f14c879feeb4e69d5e21adb517c76a781581e8b4769c8560b56dc6f89f10a8b38fcf296baa6989b86c73bdb2cd6603e  execline-2.6.1.0.tar.gz"
+
+sha512sums="e13e4f37ef95284be5c0f9704baf11fe43a402320e3f5a4f3fce4310e6b93c9f1c0424ed12ff9bebd6e3f82abec138c36491f7477912c9bcb30b3499c4d12441  execline-2.7.0.0.tar.gz"
diff --git a/system/mdevd/APKBUILD b/system/mdevd/APKBUILD
index c0c9ac011..36128c5cb 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.1.2
+pkgver=0.1.3.0
 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.9.1.0
+_skalibs_version=2.10.0.0
 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"
@@ -47,7 +47,7 @@ openrc() {
         ln -s ../../init.d/mdevd "$rldir/mdevd"
 }
 
-sha512sums="7d7a25facde1291854f564e805cc2bf7e7e0b06aaa4b631a640cf999007a3ef063ec68e8973559ec69023f40bb6ed24937d4d8510fd697f34a97345a22ede5b5  mdevd-0.1.1.2.tar.gz
+sha512sums="8f7b922f6ce8b4dad2dd0e395034f068d950501fe166609da31b5fd7110e938e91e537f6c5e5271043cb24864955aff21f708b80aeea83c9502cce280376c17c  mdevd-0.1.3.0.tar.gz
 b237443837c3d76f8964e2b1a48c2278af7b4a4e7f735da6fc861b7598cbf50017e961e5a4fd1f20dd9cb7dd46f4cdf68144539d909b1f245e110b75c2d849db  mdev.conf
 31231b28d0b980dda634e8b043a2ee31960493d60c2c9aac8a4f3f68ca1d130342569af2acd0bc04d9d8008b8e234ba949b64d9ec3ff1bded64b4e4f0ce3786b  mdevd.run
 f6f9eebf49c2de6abde9cfb7a9d7b3a6b3afdd3e01ba4155f1b95dfa27e522363059b69cec19305881773d776ffeccf6c1106d537d01780468bd3b9846edb2cc  mdevd.initd"
diff --git a/system/s6-linux-init/APKBUILD b/system/s6-linux-init/APKBUILD
index 742ed3ff6..102b23a4f 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.5.1
+pkgver=1.0.6.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.9.3.0
-_s6_version=2.9.2.0
+_skalibs_version=2.10.0.0
+_s6_version=2.10.0.0
 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,7 +119,8 @@ doc() {
         mkdir -p "$subpkgdir/usr/share/doc"
         cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname"
 }
-sha512sums="c23fff1f5f2433119cbcfceb8e69c2f5542c8377079010891f4147a056d66c23fc08e08ca20ce0236d40386aac187cefd7b38bccb1bd5395d01ef4716c7a7432  s6-linux-init-1.0.5.1.tar.gz
+
+sha512sums="9312a7719bd1d10c2846aab996a88b7e55b3a805cbae8f270983ded2707f05bfb76cff211e0a4aee76ec62ed0a23d956fcf56daebf8b2decc499c375c768446d  s6-linux-init-1.0.6.0.tar.gz
 756b0cbbe5dabb4631380c3c7ea199cc213224b2e36e50a2d012a61948170078b78bf49b85d886319fecf59843087f937d3d804723b2553ac9f94d088a2f0fd8  rc.init
 e73c3c32b118831074288d23fadace2158a2b15d5a13ffa73290b92a9e39c2a21c73d3b0eabea29bcbaa5f6381611fd8d0aaa6aa691ec7de91b8ef6ae404b6da  runlevel
 7bb050248a5c2ab6a56c50c35f87cde724f97ff9882f5e60b0f0f2f14bd93c1df7d99fedc3d81c8519cf1a1ed90e03f1cbb9bf891c7b3618aa9a5f5738d262f4  rc.shutdown
diff --git a/system/s6-rc/APKBUILD b/system/s6-rc/APKBUILD
index ae61b9a1a..bb11c9844 100644
--- a/system/s6-rc/APKBUILD
+++ b/system/s6-rc/APKBUILD
@@ -1,15 +1,15 @@
 # Contributor: Laurent Bercot <ska-adelie@skarnet.org>
 # Maintainer: Laurent Bercot <ska-adelie@skarnet.org>
 pkgname=s6-rc
-pkgver=0.5.1.4
+pkgver=0.5.2.1
 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.9.2.1
-_s6_version=2.9.2.0
+_skalibs_version=2.10.0.0
+_s6_version=2.10.0.0
 depends="execline"
 makedepends="skalibs-dev>=$_skalibs_version execline-dev s6-dev>=$_s6_version"
 subpackages="$pkgname-libs $pkgname-dev $pkgname-libs-dev:libsdev $pkgname-doc"
@@ -66,4 +66,4 @@ doc() {
         cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname"
 }
 
-sha512sums="3b5f6d8676e77e81f50faed314239cd98ff1094568fe415786a3c2176d8d1c9344a05cdca659482e5d5b573acc04c4ecc0d0793a2fd62ae9b2204cbf6e4c3658  s6-rc-0.5.1.4.tar.gz"
+sha512sums="0cbd48e79b7f0e24528b6dda1df6980ca3dcebca7aecf408ad69490aacced4a425b5bcdb1a68b5bfa46199b7a05364a80158db5722cd6506d8d833da125c1fec  s6-rc-0.5.2.1.tar.gz"
diff --git a/system/s6/APKBUILD b/system/s6/APKBUILD
index 4909c3daf..4529f6126 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.9.2.0
+pkgver=2.10.0.0
 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.9.2.1
+_skalibs_version=2.10.0.0
 depends="execline"
 makedepends="skalibs-dev>=$_skalibs_version execline-dev"
 install="$pkgname.post-upgrade"
@@ -66,4 +66,5 @@ doc() {
         mkdir -p "$subpkgdir/usr/share/doc"
         cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname"
 }
-sha512sums="ef814c0426d00112c793d4f8bb99319cde8e4ab91c24e98401559bbd28eafdb11a66d446a31816a50f67d607ed1e8c55383362e9761abca21ca24b3598929eee  s6-2.9.2.0.tar.gz"
+
+sha512sums="a3b6603ff7144a41d15e85bbfabc78656a52c0fad18e4195619a9a2c1a84adb84d736bcaa3f082d98dd11d3ac4d4d40988d1206ebaa33a0f9125b29fe380b6f7  s6-2.10.0.0.tar.gz"
diff --git a/system/s6/s6.post-upgrade b/system/s6/s6.post-upgrade
index 26d289c27..3188f031d 100644
--- a/system/s6/s6.post-upgrade
+++ b/system/s6/s6.post-upgrade
@@ -5,13 +5,14 @@ oldv="$2"
 
 rm -f /etc/runlevels/default/s6
 
-if test `apk version -t "$oldv" 2.8` = "<" ; then
+if test `apk version -t "$oldv" 2.9` = "<" ; then
 
   cat <<EOF
 
 *
 * The s6 package has been upgraded. To complete the upgrade, you need to
-* restart the supervision tree - with the following command, run as root:
+* restart the supervision tree. If you are using sysvinit, please use the
+* following command, run as root:
 *
 *    s6-svscanctl -t /run/service
 *
@@ -19,6 +20,9 @@ if test `apk version -t "$oldv" 2.8` = "<" ; then
 * terminals that are listed in the GETTYS variable in /etc/conf.d/gettys
 * - so please save your work first.
 *
+* If you are using s6-linux-init, which is the default, please just
+* reboot your machine as soon as is convenient for you.
+*
 
 EOF
 fi
diff --git a/system/skalibs/APKBUILD b/system/skalibs/APKBUILD
index ed0414589..6a09485b8 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.9.3.0
+pkgver=2.10.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,5 @@ doc() {
 	cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname"
 }
 
-sha512sums="41e867fcaf16da437840b796a41b2d34ea53aafedde8b4fc86d712934ec533e9f7f2a8b7902542570ea6b5bcba772569fc4f47bccef770b5dee4f9d113b3df11  skalibs-2.9.3.0.tar.gz"
+
+sha512sums="e8b36388b24ee8066e48d39650a27030374f263f0ee014eaa79f9d71f2b5647dd1a052cc8ffe0d8457fed8fd1b1fc74980c03dd1182a9d0f1efbe044bff99269  skalibs-2.10.0.0.tar.gz"
diff --git a/system/sysvinit/APKBUILD b/system/sysvinit/APKBUILD
index 67ce05459..b3e912601 100644
--- a/system/sysvinit/APKBUILD
+++ b/system/sysvinit/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=sysvinit
 pkgver=2.88
-pkgrel=7
+pkgrel=8
 pkgdesc="System V-style init programs"
 url="https://savannah.nongnu.org/projects/sysvinit"
 arch="all"
@@ -53,7 +53,7 @@ _install_s6_stuff() {
 	mkdir -p -m 0755 "$pkgdir/sbin" "$svcimg/.s6-svscan" "$svcimg/s6-svscan-log"
 	{ echo '#!/bin/execlineb -P' ; echo 'false' ; } > "$svcimg/.s6-svscan/crash"
 	chmod 0755 "$svcimg/.s6-svscan/crash"
-	{ echo '#!/bin/execlineb -P' ; echo 's6-svc -X -- /run/service/s6-svscan-log' ; } > "$svcimg/.s6-svscan/finish"
+	{ echo '#!/bin/execlineb -P' ; echo 's6-svc -x -- /run/service/s6-svscan-log' ; } > "$svcimg/.s6-svscan/finish"
 	chmod 0755 "$svcimg/.s6-svscan/finish"
 	{ echo '#!/bin/execlineb -P' ; echo 'redirfd -rnb 0 fifo' ; echo 's6-setuidgid catchlog' ; echo 's6-log -bd3 -- t /run/uncaught-logs' ; } > "$svcimg/s6-svscan-log/run"
 	chmod 0755 "$svcimg/s6-svscan-log/run"
@@ -67,9 +67,8 @@ package() {
 	_install_s6_stuff
 }
 
-
 sha512sums="0bd8eeb124e84fdfa8e621b05f796804ee69a9076b65f5115826bfa814ac1d5d28d31a5c22ebe77c86a93b2288edf4891adc0afaecc4de656c4ecda8a83807bf  sysvinit-2.88dsf.tar.bz2
 87668b49690091a227c0384fd2400f1006d24c27cc27a25efa7eba56839ccb1eead00b58ce4b654eab9c0208d68aa2cbb888fd5f2990905845aa9688442a69a0  inittab-2.88
 27dfe089660a291cbcba06d8564bad11f7fd7c96629e72c2b005562689dc7d8bb479c760e980590906e98423b991ae0acd048713d3bc372174d55ed894abeb3f  sysvinit-2.88-posix-header.patch
 3605f88ac3faf7d12bf2269ca5d8625850d53e8583b573ab280fa17066c8e4e5217a0d17b94e47ea67a153ad3b88b433471a77544bd085f01f7d9d353ac16aae  utmpx.patch
-30fc01b99350d9cb9e2d430f32c357fce571864e618f25fc2c82199f0ae36f3d81316b175af37ff779c0ef26780452877ff0355b3ea47e2ef4eadc823d085e98  s6-svscanboot"
+e52fd49daa5abfc583f1973f3428b1e00a71e7136a8bc6418e94b345d53ef250b3b3c3bee389fe37872b26a78d0957ae852e221428f33b2c728dfd3d50b59634  s6-svscanboot"
diff --git a/system/sysvinit/s6-svscanboot b/system/sysvinit/s6-svscanboot
index 8c134b485..adfdc8044 100644
--- a/system/sysvinit/s6-svscanboot
+++ b/system/sysvinit/s6-svscanboot
@@ -12,4 +12,4 @@ if
 redirfd -w 3 /run/s6_ready
 redirfd -wnb 1 /run/service/s6-svscan-log/fifo
 fdmove -c 2 1
-s6-svscan -St0 -d3 /run/service
+s6-svscan -d3 /run/service
diff --git a/system/utmps/APKBUILD b/system/utmps/APKBUILD
index c78339725..cd7040973 100644
--- a/system/utmps/APKBUILD
+++ b/system/utmps/APKBUILD
@@ -1,15 +1,15 @@
 # Contributor: Laurent Bercot <ska-adelie@skarnet.org>
 # Maintainer: Laurent Bercot <ska-adelie@skarnet.org>
 pkgname=utmps
-pkgver=0.0.3.2
-pkgrel=1
+pkgver=0.1.0.0
+pkgrel=0
 pkgdesc="A secure utmp/wtmp implementation"
 url="https://skarnet.org/software/$pkgname/"
 arch="all"
 options="!check"  # No test suite
 license="ISC"
 depends="execline s6"
-_skalibs_version=2.9.2.1
+_skalibs_version=2.10.0.0
 makedepends="skalibs-dev>=$_skalibs_version"
 subpackages="$pkgname-libs $pkgname-dev $pkgname-libs-dev:libsdev $pkgname-doc"
 install="$pkgname.post-upgrade"
@@ -25,7 +25,8 @@ build() {
 		--enable-static-libc \
 		--libdir=/usr/lib \
 		--libexecdir="/lib/$pkgname" \
-		--with-dynlib=/lib
+		--with-dynlib=/lib \
+		--enable-libc-includes
 	make
 }
 
@@ -75,6 +76,6 @@ doc() {
         cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname"
 }
 
-sha512sums="096615bf4ef4bf73af6128fcdebc0473c736a154fb3f1db89f6f2f2301fdaf2ea183b709991d4591e75e6e8c51426ac03ce602e2d8ce9cd4a5c360bc5b44003e  utmps-0.0.3.2.tar.gz
+sha512sums="f8d246897690829fccc6e4a4e1bfbbbacd10d337863dacb6966f62cffc166d61c49db1ac83d51aa023e571a5d62f81cf030fa439eb8e3fe742e427764f18adcf  utmps-0.1.0.0.tar.gz
 0ec30284c64c6ea9f25142c5f4a643bd48b137fe85781b650104f5137ffa4dfc35ca7be3e41e3acd3403ebe1d8c5378073afa4e2f3607d3d794fcd9f98ed51c4  utmpd.run
 cba4f2ec3b8f5becf3ae57eecf584745d783046ee6cf5d116322421ad5ffd074d2955da22d31d2b5b1d05f906378aae92f221d2ac95ac21b54a361fbdc0566e7  wtmpd.run"