summaryrefslogtreecommitdiff
path: root/system
diff options
context:
space:
mode:
Diffstat (limited to 'system')
-rw-r--r--system/execline/APKBUILD6
-rw-r--r--system/s6-linux-init/APKBUILD13
-rw-r--r--system/s6-linux-init/reboot.sh2
-rw-r--r--system/s6/APKBUILD8
-rw-r--r--system/skalibs/APKBUILD11
-rw-r--r--system/skalibs/env_dump-unterminated-strings.patch26
-rw-r--r--system/utmps/APKBUILD8
7 files changed, 22 insertions, 52 deletions
diff --git a/system/execline/APKBUILD b/system/execline/APKBUILD
index 79fca7177..361f03dbf 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.5.1.0
+pkgver=2.5.2.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.8
+_skalibs_version=2.9.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"
@@ -63,4 +63,4 @@ doc() {
cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname"
}
-sha512sums="461a91d0e790e96233179c89c783bb29d89592def451643265c97259db83056556cd5f231d668e8c460396c35a8792f56b30193171e85488e60e3cb4feb7379c execline-2.5.1.0.tar.gz"
+sha512sums="cc9fc1ee4879112eb53fd72ef75e98f4d6705ee05d679c5fc62706bc453965a8982ffceb26dfe7ce8c4a06be549ba18482fea81defee01091fa131ec2013a0b6 execline-2.5.2.0.tar.gz"
diff --git a/system/s6-linux-init/APKBUILD b/system/s6-linux-init/APKBUILD
index a52c329d5..7dff13d2e 100644
--- a/system/s6-linux-init/APKBUILD
+++ b/system/s6-linux-init/APKBUILD
@@ -1,14 +1,14 @@
# Contributor: Laurent Bercot <ska-adelie@skarnet.org>
# Maintainer: Laurent Bercot <ska-adelie@skarnet.org>
pkgname=s6-linux-init
-pkgver=1.0.2.1
-pkgrel=1
+pkgver=1.0.3.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.8.1.0
+_skalibs_version=2.9.0.0
depends="execline s6 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"
@@ -55,8 +55,7 @@ package() {
-f "$pkgdir/etc/s6-linux-init/skel" \
-U "" \
"$pkgdir/etc/s6-linux-init/current"
- mkdir -p -m 0755 "$pkgdir/sbin" "$pkgdir/etc/runlevels/empty" "$pkgdir/etc/sysctl.d"
- echo 'kernel.ctrl-alt-del = 0' > "$pkgdir/etc/sysctl.d/ctrlaltdel.conf"
+ mkdir -p -m 0755 "$pkgdir/sbin" "$pkgdir/etc/runlevels/empty"
for i in init halt poweroff reboot shutdown telinit ; do
ln -sf "../etc/s6-linux-init/current/bin/$i" "$pkgdir/sbin/$i"
done
@@ -120,8 +119,8 @@ doc() {
cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname"
}
-sha512sums="65ffd4c7a1457c6ad7397ccf7c4ee92dd04e546e21acf75bbfd49ace5b93eb22bac673185061ad9389449d324b6164577715258ab292825da8973140bc548d92 s6-linux-init-1.0.2.1.tar.gz
+sha512sums="defcf58a21dc763b899212f66879ecece350d7248ea77974fda7b4679035143172bb31b456ea1bd43284a1a85a39ef246dfd9fa7e2f2bcb549a7daac2d4f24ae s6-linux-init-1.0.3.0.tar.gz
756b0cbbe5dabb4631380c3c7ea199cc213224b2e36e50a2d012a61948170078b78bf49b85d886319fecf59843087f937d3d804723b2553ac9f94d088a2f0fd8 rc.init
e73c3c32b118831074288d23fadace2158a2b15d5a13ffa73290b92a9e39c2a21c73d3b0eabea29bcbaa5f6381611fd8d0aaa6aa691ec7de91b8ef6ae404b6da runlevel
7bb050248a5c2ab6a56c50c35f87cde724f97ff9882f5e60b0f0f2f14bd93c1df7d99fedc3d81c8519cf1a1ed90e03f1cbb9bf891c7b3618aa9a5f5738d262f4 rc.shutdown
-de702d3a221993cd3192dae4544842402dfbe362bcc4105f3071df15eb0aa6c218bf401bbf221298ee063f6545fe909fd54abf1d1e9222e13bcdc9a29f9a2b19 reboot.sh"
+6fb2a1112988fd2322b4bc4862bfb948a1c2e43921c5d01ae873c0d31b39fe74fc2934a5018c08b1704a2b2199b31d3a3d7365be369bba734f153b74e000aa74 reboot.sh"
diff --git a/system/s6-linux-init/reboot.sh b/system/s6-linux-init/reboot.sh
index d0d87aeb6..38838f402 100644
--- a/system/s6-linux-init/reboot.sh
+++ b/system/s6-linux-init/reboot.sh
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/sh
# This script performs a "poor man's reboot" when the
# init infrastructures are not there to do a proper one.
diff --git a/system/s6/APKBUILD b/system/s6/APKBUILD
index ad5f1f28f..6a87bdd52 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.8.0.1
-pkgrel=1
+pkgver=2.9.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.8.1.0
+_skalibs_version=2.9.0.0
depends="execline"
makedepends="skalibs-dev>=$_skalibs_version execline-dev"
install="$pkgname.post-upgrade"
@@ -68,4 +68,4 @@ doc() {
cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname"
}
-sha512sums="03478aed129c1e50b34e0b75d7ff50bd84f62eadee862b6227c4313153d47776e7cbeae728d63209773b91931a2abc8372bb7db4953762807d0ed3d305efd23f s6-2.8.0.1.tar.gz"
+sha512sums="0ac007c1464633ec6c6acc75e845fee99c6ad8ec8ac52fc646bd542559f281a94035f18b3f8858bf13249f52b9d512253edfdaf6d74a56488f00cc3be64b2df6 s6-2.9.0.0.tar.gz"
diff --git a/system/skalibs/APKBUILD b/system/skalibs/APKBUILD
index cbf64462e..e621916be 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.8.1.0
+pkgver=2.9.0.0
pkgrel=1
pkgdesc="A set of general-purpose C programming libraries for skarnet.org software"
url="https://skarnet.org/software/skalibs/"
@@ -9,16 +9,14 @@ arch="all"
options="!check" # No test suite.
license="ISC"
subpackages="$pkgname-libs $pkgname-dev $pkgname-libs-dev:libsdev $pkgname-doc"
-source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz
- env_dump-unterminated-strings.patch"
+source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz"
build() {
cd "$builddir"
./configure \
--enable-shared \
--enable-static \
- --libdir=/usr/lib \
- --enable-clock
+ --libdir=/usr/lib
make
}
@@ -60,5 +58,4 @@ doc() {
cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname"
}
-sha512sums="d2717e6f034af22a7b2ce31b019f30cfa270f64c61549db7b60b319defc5236fc6b58d29a4dae0f740ffdf32180b1940630f4239ea40cbedfcc5861398d20d86 skalibs-2.8.1.0.tar.gz
-286a8e0537399fc52c550c1aeac7dd0748c07d34d51b65cb36ab9e3db5a44ff51ba988c212c6bafa74b107ce80698bcab37a99df6276fe7ce60550de0ffc0567 env_dump-unterminated-strings.patch"
+sha512sums="7ed4b45bc527e87fb436b6ac81148a31534c91f7097fe064da586f84afa3188577720d23df9499ebe8fc3eae2cd73f7378c243ca6825e02f986f5802169eee22 skalibs-2.9.0.0.tar.gz"
diff --git a/system/skalibs/env_dump-unterminated-strings.patch b/system/skalibs/env_dump-unterminated-strings.patch
deleted file mode 100644
index a20a78125..000000000
--- a/system/skalibs/env_dump-unterminated-strings.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From d69644de85148f56efeed4259a783881e2a1bddc Mon Sep 17 00:00:00 2001
-From: Laurent Bercot <ska-skaware@skarnet.org>
-Date: Wed, 31 Jul 2019 23:47:35 +0000
-Subject: [PATCH] bugfix: env_dump() unterminated strings
-
----
- src/libstddjb/env_dump.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/libstddjb/env_dump.c b/src/libstddjb/env_dump.c
-index fc79bc3..10f5913 100644
---- a/src/libstddjb/env_dump.c
-+++ b/src/libstddjb/env_dump.c
-@@ -32,7 +32,8 @@ int env_dump (char const *dir, mode_t mode, char const *const *envp)
- size_t len = str_chr(*envp, '=') ;
- size_t vallen = strlen(*envp + len + 1) ;
- char fn[len + 1] ;
-- memcpy(fn, *envp, len + 1) ;
-+ memcpy(fn, *envp, len) ;
-+ fn[len] = 0 ;
- len = openwritenclose_at(fd, fn, *envp + len + 1, vallen) ;
- if (len < vallen) goto cerr ;
- }
---
-2.22.0
-
diff --git a/system/utmps/APKBUILD b/system/utmps/APKBUILD
index 50bd13dba..52ed77de6 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.2.2
-pkgrel=1
+pkgver=0.0.3.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.8
+_skalibs_version=2.9.0.0
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="1e7b53e7fcbd15a113aef8001ac77c3646ecd4723eaca77b36400c76ee96dafe919a993603a1fd441f1c9fff08c5924714910d43ae86fbf85971c39b950323c0 utmps-0.0.2.2.tar.gz
+sha512sums="2bfd88f2f965a82c50e9e1ef420e578085f888dadbd5a3af2549048d243c524b46a678ae527fa696d9757ddd81d8917b706f87951ee41e41d8969355cdc4b21a utmps-0.0.3.0.tar.gz
0ec30284c64c6ea9f25142c5f4a643bd48b137fe85781b650104f5137ffa4dfc35ca7be3e41e3acd3403ebe1d8c5378073afa4e2f3607d3d794fcd9f98ed51c4 utmpd.run
cba4f2ec3b8f5becf3ae57eecf584745d783046ee6cf5d116322421ad5ffd074d2955da22d31d2b5b1d05f906378aae92f221d2ac95ac21b54a361fbdc0566e7 wtmpd.run"
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-01 14:02:12 +0000