From 3816f90053f62e67243c7562107291177249323f Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Sun, 26 Sep 2021 19:36:07 +0000 Subject: Upgrade skarnet.org packages to the latest version --- system/execline/APKBUILD | 6 +++--- system/mdevd/APKBUILD | 10 +++++----- system/mdevd/mdev.conf | 4 ++-- system/mdevd/mdevd.initd | 2 +- system/s6-linux-init/APKBUILD | 9 ++++----- system/s6-rc/APKBUILD | 8 ++++---- system/s6/APKBUILD | 6 +++--- system/s6/s6.post-upgrade | 25 ------------------------- system/s6/s6.trigger | 2 +- system/skalibs/APKBUILD | 4 ++-- system/utmps/APKBUILD | 6 +++--- 11 files changed, 28 insertions(+), 54 deletions(-) (limited to 'system') diff --git a/system/execline/APKBUILD b/system/execline/APKBUILD index a0fcc2a88..f24fa4ca2 100644 --- a/system/execline/APKBUILD +++ b/system/execline/APKBUILD @@ -1,14 +1,14 @@ # Contributor: Laurent Bercot # Maintainer: Laurent Bercot pkgname=execline -pkgver=2.8.0.0 +pkgver=2.8.1.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.10.0.0 +_skalibs_version=2.11 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="9250248ff3753806c05c99d8fd76b17f511413e691fcb2fe0907cbd16b691e17ff260b15f504a8c8bc279cd53360012f345af803fd48b0a27a1009c171a8ddf9 execline-2.8.0.0.tar.gz" +sha512sums="4e20ff5cd82941914a639abe2481efd93a7ada6d2431b65813793cc7801463179bc1c58ee73e889747038c859e5fd6e7e668b758fa1785da03e549547ca3c94c execline-2.8.1.0.tar.gz" diff --git a/system/mdevd/APKBUILD b/system/mdevd/APKBUILD index 36128c5cb..945aad789 100644 --- a/system/mdevd/APKBUILD +++ b/system/mdevd/APKBUILD @@ -1,14 +1,14 @@ # Contributor: Laurent Bercot # Maintainer: Laurent Bercot pkgname=mdevd -pkgver=0.1.3.0 +pkgver=0.1.5.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.10.0.0 +_skalibs_version=2.11 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="8f7b922f6ce8b4dad2dd0e395034f068d950501fe166609da31b5fd7110e938e91e537f6c5e5271043cb24864955aff21f708b80aeea83c9502cce280376c17c mdevd-0.1.3.0.tar.gz -b237443837c3d76f8964e2b1a48c2278af7b4a4e7f735da6fc861b7598cbf50017e961e5a4fd1f20dd9cb7dd46f4cdf68144539d909b1f245e110b75c2d849db mdev.conf +sha512sums="1c615b136ac5b14f85cadc747a89068e089420bb6b5413ac9c402d3308d7ae46b94b3d3f66f3fc45500de0a3bba4687eaf1fd8a165e6ade3521dc8a5f3184b52 mdevd-0.1.5.0.tar.gz +ebc44034663423acfa403856e591b224c3aac180407fa679182f8b42ab2730592be677446ef109c15c3aedb821345f5f9fb0e38ea21a42871a46dcc1e1c37706 mdev.conf 31231b28d0b980dda634e8b043a2ee31960493d60c2c9aac8a4f3f68ca1d130342569af2acd0bc04d9d8008b8e234ba949b64d9ec3ff1bded64b4e4f0ce3786b mdevd.run -f6f9eebf49c2de6abde9cfb7a9d7b3a6b3afdd3e01ba4155f1b95dfa27e522363059b69cec19305881773d776ffeccf6c1106d537d01780468bd3b9846edb2cc mdevd.initd" +3b22077f867a07493284bf1d0c0f1ec5c4359d6f6e7313ce917e354b275286833136defd3eddde967257e3dd255c7581f096bcf2f345553ce6db088296abb41f mdevd.initd" diff --git a/system/mdevd/mdev.conf b/system/mdevd/mdev.conf index 49f040ca2..17b0280a7 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.initd b/system/mdevd/mdevd.initd index 3f6bccf86..28c34b796 100644 --- a/system/mdevd/mdevd.initd +++ b/system/mdevd/mdevd.initd @@ -1,5 +1,5 @@ #!/sbin/openrc-run -# Copyright 2019 Adélie Linux +# Copyright 2019-2021 Adélie Linux description="mdevd manages device permissions and symbolic links in /dev" extra_started_commands="reload" diff --git a/system/s6-linux-init/APKBUILD b/system/s6-linux-init/APKBUILD index e7c6c86ce..10a138ef7 100644 --- a/system/s6-linux-init/APKBUILD +++ b/system/s6-linux-init/APKBUILD @@ -1,15 +1,15 @@ # Contributor: Laurent Bercot # Maintainer: Laurent Bercot pkgname=s6-linux-init -pkgver=1.0.6.1 +pkgver=1.0.6.4 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.10.0.0 -_s6_version=2.10.0.0 +_skalibs_version=2.11 +_s6_version=2.11 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" @@ -51,7 +51,6 @@ package() { -m 022 \ -s /run/kernel_env \ -f "$pkgdir/etc/s6-linux-init/skel" \ - -U "" \ "$pkgdir/etc/s6-linux-init/current" mkdir -p -m 0755 "$pkgdir/sbin" "$pkgdir/etc/runlevels/empty" for i in init halt poweroff reboot shutdown telinit ; do @@ -120,7 +119,7 @@ doc() { cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname" } -sha512sums="0d18b96a70ef39e06e164bb391e22d7b1cce54f941c5526e6a107c7af5b6801b1dd257ba255bc07eff240d48f8ef7f096e180bade25490a86b6326290448d45c s6-linux-init-1.0.6.1.tar.gz +sha512sums="810e0df76e3d661efc0e12b58cb52e8a8c78024a9bec430b1b283006a629e836d5d113282ddcafa7654737003f20779b474b770d791e2844573bb6838ff866ae s6-linux-init-1.0.6.4.tar.gz 756b0cbbe5dabb4631380c3c7ea199cc213224b2e36e50a2d012a61948170078b78bf49b85d886319fecf59843087f937d3d804723b2553ac9f94d088a2f0fd8 rc.init e73c3c32b118831074288d23fadace2158a2b15d5a13ffa73290b92a9e39c2a21c73d3b0eabea29bcbaa5f6381611fd8d0aaa6aa691ec7de91b8ef6ae404b6da runlevel 7bb050248a5c2ab6a56c50c35f87cde724f97ff9882f5e60b0f0f2f14bd93c1df7d99fedc3d81c8519cf1a1ed90e03f1cbb9bf891c7b3618aa9a5f5738d262f4 rc.shutdown diff --git a/system/s6-rc/APKBUILD b/system/s6-rc/APKBUILD index bb11c9844..3dc050190 100644 --- a/system/s6-rc/APKBUILD +++ b/system/s6-rc/APKBUILD @@ -1,15 +1,15 @@ # Contributor: Laurent Bercot # Maintainer: Laurent Bercot pkgname=s6-rc -pkgver=0.5.2.1 +pkgver=0.5.2.3 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.10.0.0 -_s6_version=2.10.0.0 +_skalibs_version=2.11 +_s6_version=2.11 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="0cbd48e79b7f0e24528b6dda1df6980ca3dcebca7aecf408ad69490aacced4a425b5bcdb1a68b5bfa46199b7a05364a80158db5722cd6506d8d833da125c1fec s6-rc-0.5.2.1.tar.gz" +sha512sums="99f0b2801218425a6241692af641de7a8fc5420e7aed402cc6eef3b51287f50094ac5085028853ef8580157d6bb7f95b31878701780ebbb9fa2cc83d3800ebef s6-rc-0.5.2.3.tar.gz" diff --git a/system/s6/APKBUILD b/system/s6/APKBUILD index 489a8ef22..1ba685820 100644 --- a/system/s6/APKBUILD +++ b/system/s6/APKBUILD @@ -1,14 +1,14 @@ # Contributor: Laurent Bercot # Maintainer: Laurent Bercot pkgname=s6 -pkgver=2.10.0.2 +pkgver=2.11.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.10.0.0 +_skalibs_version=2.11 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="d3eb7e17f3eeb4250c734208a1e9a71b4da0ae3d5090e98c3b02749d42ab83c20f405f1d219293bc378223e31410f0cbfec497c64518235faad9c0ccc6a348dc s6-2.10.0.2.tar.gz" +sha512sums="5421b01de6d4f75e80056d3335cef409b3eb1330f1585c8b303228a36e60537056bed130f3f375f3f02f9063be04fc8776c4687cb0ec23e969960ad3fb5141e3 s6-2.11.0.0.tar.gz" diff --git a/system/s6/s6.post-upgrade b/system/s6/s6.post-upgrade index 3188f031d..54144895b 100644 --- a/system/s6/s6.post-upgrade +++ b/system/s6/s6.post-upgrade @@ -1,28 +1,3 @@ #!/bin/sh -e -newv="$1" -oldv="$2" - rm -f /etc/runlevels/default/s6 - -if test `apk version -t "$oldv" 2.9` = "<" ; then - - cat < # Maintainer: Laurent Bercot pkgname=skalibs -pkgver=2.10.0.2 +pkgver=2.11.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="b36b7fefb9df63093f1bd775fe9d2bf7ed588404a99a55b1ecabfc0e3b6eac49989dfb736f7f69a9508e4dfeeb669d48e639964aef5c65c330043c543cd38801 skalibs-2.10.0.2.tar.gz" +sha512sums="14e62e9e63735184d54497295b0d3d97bee393d1dc09af9542f17c6083c2a6b310e6f15275d96819f14cb2e033baa264c6b3a4c680eb0c83edf84932b8df87f2 skalibs-2.11.0.0.tar.gz" diff --git a/system/utmps/APKBUILD b/system/utmps/APKBUILD index cd7040973..a2e528db5 100644 --- a/system/utmps/APKBUILD +++ b/system/utmps/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Laurent Bercot # Maintainer: Laurent Bercot pkgname=utmps -pkgver=0.1.0.0 +pkgver=0.1.0.3 pkgrel=0 pkgdesc="A secure utmp/wtmp implementation" url="https://skarnet.org/software/$pkgname/" @@ -9,7 +9,7 @@ arch="all" options="!check" # No test suite license="ISC" depends="execline s6" -_skalibs_version=2.10.0.0 +_skalibs_version=2.11 makedepends="skalibs-dev>=$_skalibs_version" subpackages="$pkgname-libs $pkgname-dev $pkgname-libs-dev:libsdev $pkgname-doc" install="$pkgname.post-upgrade" @@ -76,6 +76,6 @@ doc() { cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname" } -sha512sums="f8d246897690829fccc6e4a4e1bfbbbacd10d337863dacb6966f62cffc166d61c49db1ac83d51aa023e571a5d62f81cf030fa439eb8e3fe742e427764f18adcf utmps-0.1.0.0.tar.gz +sha512sums="37daf1c94640f2576795ff5e274b09b95d05d5a42711914e65688493c31efa8cbdaf8698f43af1d90dc28a0ea42695cc1a69e326621f50e6470708853596ae88 utmps-0.1.0.3.tar.gz 0ec30284c64c6ea9f25142c5f4a643bd48b137fe85781b650104f5137ffa4dfc35ca7be3e41e3acd3403ebe1d8c5378073afa4e2f3607d3d794fcd9f98ed51c4 utmpd.run cba4f2ec3b8f5becf3ae57eecf584745d783046ee6cf5d116322421ad5ffd074d2955da22d31d2b5b1d05f906378aae92f221d2ac95ac21b54a361fbdc0566e7 wtmpd.run" -- cgit v1.2.3-60-g2f50