From 69efa625f7faaaa10c65a78596e2c0df249a1b86 Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Fri, 7 Jun 2024 16:05:20 +0000 Subject: Skaware.20240531 --- system/execline/APKBUILD | 7 +++--- system/mdevd/APKBUILD | 6 ++--- system/s6-linux-init/APKBUILD | 51 +++++++++----------------------------- system/s6-rc/APKBUILD | 9 ++++--- system/s6/APKBUILD | 7 +++--- system/s6/s6.post-upgrade | 13 ++++++++++ system/skalibs/APKBUILD | 6 ++--- user/s6-dns/APKBUILD | 9 ++++--- user/s6-networking/APKBUILD | 9 ++++--- user/smtpd-starttls-proxy/APKBUILD | 6 ++--- user/tipidee/APKBUILD | 8 +++--- 11 files changed, 62 insertions(+), 69 deletions(-) diff --git a/system/execline/APKBUILD b/system/execline/APKBUILD index 96da1fb5a..d4d136a2e 100644 --- a/system/execline/APKBUILD +++ b/system/execline/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Laurent Bercot # Maintainer: Laurent Bercot pkgname=execline -pkgver=2.9.5.1 +pkgver=2.9.6.0 pkgrel=0 pkgdesc="A small scripting language for non-interactive scripts" url="https://skarnet.org/software/execline/" @@ -9,7 +9,8 @@ arch="all" options="!check" # No test suite. license="ISC" _skalibs_version=2.14 -makedepends="skalibs-dev>=$_skalibs_version" +depends_dev="skalibs-dev>=$_skalibs_version" +makedepends="$depends_dev" subpackages="$pkgname-libs $pkgname-dev $pkgname-doc" source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz" @@ -31,4 +32,4 @@ package() { cp -a "$builddir/doc" "$pkgdir/usr/share/doc/$pkgname" } -sha512sums="11bfd825b0b72cba118eff9ecb97672d0c015e0bd50c7c8f83e101ee41c323b3a3c82e42fed75b6bc65ab6edb85a8bbeef8900b594cf651825b6313a5123c88f execline-2.9.5.1.tar.gz" +sha512sums="1c5233b0f17b4c92ab2e9e8700b47c8429ad97962bcb7c83190d0b3251b26584e591d77418eca77e8112cdecd24eec50aaca7da1dbb506120931bbda39f2b7cb execline-2.9.6.0.tar.gz" diff --git a/system/mdevd/APKBUILD b/system/mdevd/APKBUILD index 94e05d5d0..228ef287e 100644 --- a/system/mdevd/APKBUILD +++ b/system/mdevd/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Laurent Bercot # Maintainer: Laurent Bercot pkgname=mdevd -pkgver=0.1.6.3 -pkgrel=1 +pkgver=0.1.6.4 +pkgrel=0 pkgdesc="A small uevent manager daemon" url="https://skarnet.org/software/mdevd/" arch="all" @@ -40,7 +40,7 @@ openrc() { ln -s ../../init.d/mdevd "$rldir/mdevd" } -sha512sums="2962be689858117960aa5b332bbc7ca31c2d6592bae1c10acb35a7d66e4bf093cc70d2966649b742ce10ab3ac252b49a4b86b2c548355544aae65ca6214cdaf1 mdevd-0.1.6.3.tar.gz +sha512sums="4435fac14887f12ba429099f8ad9c9215a6fc3966a5f836a48684ecdd2fa38ccbcdaf363af7e8397b4dc741b92fad0998179919e12fc5c0404b914370db13f1b mdevd-0.1.6.4.tar.gz f966d66366eac3b9b9eeb9b8523ea0924ada2b858c85ca0c0151d0fb374dfbf56c49ec2210d2d5ca19aa4d9f24371c85d777050eb8bf9f57821ec65704f18717 mdev.conf 427a5903fa2126060955dcce8144d59255a679c4973f2dbc3145a4d646e879fc241ebcaa53289498719d343c746fc376c41defa87932dcbe91192b2d6f4ed1c4 mdevd.run e7599f51a4280243a5be459c6fad7eb8ba3b5f65fae8cad923ccca2addab55787819909fea311c998e1126e6802a81ab000ee6de7474f3245ce72521244c22ba mdevd.initd" diff --git a/system/s6-linux-init/APKBUILD b/system/s6-linux-init/APKBUILD index 9c2d7206e..973037509 100644 --- a/system/s6-linux-init/APKBUILD +++ b/system/s6-linux-init/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Laurent Bercot pkgname=s6-linux-init pkgver=1.1.2.0 -pkgrel=1 +pkgrel=2 pkgdesc="A s6-based init system" url="https://skarnet.org/software/s6-linux-init/" arch="all" @@ -11,8 +11,15 @@ license="ISC" _skalibs_version=2.14 _s6_version=2.12 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 $pkgname-dracut" +depends_dev="skalibs-dev>=$_skalibs_version" +makedepends="$depends_dev execline-dev s6-dev utmps-dev" +subpackages=" + $pkgname-common:common:noarch + $pkgname-early-getty:earlygetty:noarch + $pkgname-dracut:dracut:noarch + $pkgname-libs + $pkgname-dev + $pkgname-doc" source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz rc.init runlevel rc.shutdown reboot.sh earlygetty.run dracut_module.sh" install="$pkgname.post-install $pkgname.post-upgrade $pkgname.pre-deinstall" provides="/sbin/init=0" @@ -52,10 +59,11 @@ package() { -s /run/kernel_env \ -f "$pkgdir/etc/s6-linux-init/skel" \ -- "$pkgdir/etc/s6-linux-init/current" - mkdir -p -m 0755 "$pkgdir/sbin" "$pkgdir/etc/runlevels/empty" + mkdir -p -m 0755 "$pkgdir/sbin" "$pkgdir/etc/runlevels/empty" "$pkgdir/usr/share/doc" for i in init halt poweroff reboot shutdown telinit ; do ln -sf "../etc/s6-linux-init/current/bin/$i" "$pkgdir/sbin/$i" done + cp -a "$builddir/doc" "$pkgdir/usr/share/doc/$pkgname" } @@ -85,47 +93,12 @@ earlygetty() { chmod 0755 "$subsvcimg/s6-linux-init-early-getty/run" } - -libs() { - pkgdesc="$pkgdesc (shared libraries)" - depends="skalibs-libs>=$_skalibs_version" - mkdir -p "$subpkgdir/lib" - mv "$pkgdir"/lib/*.so.* "$subpkgdir/lib/" -} - - -dev() { - pkgdesc="$pkgdesc (development files)" - depends="skalibs-dev>=$_skalibs_version" - install_if="dev $pkgname=$pkgver-r$pkgrel" - mkdir -p "$subpkgdir/usr" - mv "$pkgdir/usr/lib" "$pkgdir/usr/include" "$subpkgdir/usr/" -} - - -libsdev() { - pkgdesc="$pkgdesc (development files for dynamic linking)" - depends="$pkgname-dev" - mkdir -p "$subpkgdir/lib" - mv "$pkgdir"/lib/*.so "$subpkgdir/lib/" -} - - dracut() { pkgdesc="$pkgdesc (Dracut module)" install_if="$pkgname=$pkgver-r$pkgrel dracut" install -D -m755 "$srcdir"/dracut_module.sh "$subpkgdir"/usr/lib/dracut/modules.d/99s6li/module-setup.sh } - -doc() { - pkgdesc="$pkgdesc (documentation)" - depends="" - install_if="docs $pkgname=$pkgver-r$pkgrel" - mkdir -p "$subpkgdir/usr/share/doc" - cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname" -} - sha512sums="76376c4d407e665f67f733f1366dbacca58d268ebdbe22a9147cb102d519bd4c5887a345f66db2005d29ed9a841cb5a388c73c7d8df00d984cc4a25b9a813786 s6-linux-init-1.1.2.0.tar.gz 756b0cbbe5dabb4631380c3c7ea199cc213224b2e36e50a2d012a61948170078b78bf49b85d886319fecf59843087f937d3d804723b2553ac9f94d088a2f0fd8 rc.init e73c3c32b118831074288d23fadace2158a2b15d5a13ffa73290b92a9e39c2a21c73d3b0eabea29bcbaa5f6381611fd8d0aaa6aa691ec7de91b8ef6ae404b6da runlevel diff --git a/system/s6-rc/APKBUILD b/system/s6-rc/APKBUILD index 35eebddfa..6fbcf44e1 100644 --- a/system/s6-rc/APKBUILD +++ b/system/s6-rc/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Laurent Bercot # Maintainer: Laurent Bercot pkgname=s6-rc -pkgver=0.5.4.2 -pkgrel=1 +pkgver=0.5.4.3 +pkgrel=0 pkgdesc="skarnet.org's service manager, working on top of s6" url="https://skarnet.org/software/s6-rc/" arch="all" @@ -11,7 +11,8 @@ license="ISC" _skalibs_version=2.14 _s6_version=2.12 depends="execline" -makedepends="skalibs-dev>=$_skalibs_version execline-dev s6-dev>=$_s6_version" +depends_dev="skalibs-dev>=$_skalibs_version s6-dev>=$_s6_version" +makedepends="$depends_dev execline-dev" subpackages="$pkgname-dev $pkgname-libs $pkgname-doc" source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz" @@ -33,4 +34,4 @@ package() { cp -a "$builddir/doc" "$pkgdir/usr/share/doc/$pkgname" } -sha512sums="f04e94db957e6d0033e328cc63530f64c9db101815bcafdb00a23205f4e75039dd3e593f93d48e4d9877b0696ea734ca62f672d92ff31e4e07aa19d26d809443 s6-rc-0.5.4.2.tar.gz" +sha512sums="7a54a32ea1261de79b9494adde74b50dbefce831f5a00f9d3772c9b64fd71918ce54a16dff828de0fb762633255226ca935357f9f31c4264716b7041a5f5f8bb s6-rc-0.5.4.3.tar.gz" diff --git a/system/s6/APKBUILD b/system/s6/APKBUILD index 4a6d060cf..52c462154 100644 --- a/system/s6/APKBUILD +++ b/system/s6/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Laurent Bercot # Maintainer: Laurent Bercot pkgname=s6 -pkgver=2.12.0.4 +pkgver=2.13.0.0 pkgrel=0 pkgdesc="skarnet.org's small & secure supervision software suite" url="https://skarnet.org/software/s6/" @@ -10,7 +10,8 @@ options="!check" # No test suite. license="ISC" _skalibs_version=2.14.1 depends="execline" -makedepends="skalibs-dev>=$_skalibs_version execline-dev" +depends_dev="skalibs-dev>=$_skalibs_version" +makedepends="$depends_dev execline-dev" install="$pkgname.post-upgrade" subpackages="$pkgname-dev $pkgname-libs $pkgname-doc" triggers="$pkgname.trigger=/run/service" @@ -34,4 +35,4 @@ package() { cp -a "$builddir/doc" "$pkgdir/usr/share/doc/$pkgname" } -sha512sums="dfdb9c0189177762a89d1f47e1d6b0a82bba5554baef4fa899b1c0a85c192d5e1dac2b929173d750df3707f0d699b28591f1eab3e63b8791e4a51af1c65e3e56 s6-2.12.0.4.tar.gz" +sha512sums="b54d334496d79d1b845552f5e7763c536d6f253c9bb2d61802695ea1a596af918562daa230f09f4cbfc06614eff70930d0963439d7d84ec8ae0388291912ca9d s6-2.13.0.0.tar.gz" diff --git a/system/s6/s6.post-upgrade b/system/s6/s6.post-upgrade index 54144895b..91459ad9f 100644 --- a/system/s6/s6.post-upgrade +++ b/system/s6/s6.post-upgrade @@ -1,3 +1,16 @@ #!/bin/sh -e rm -f /etc/runlevels/default/s6 + +vnew="$1" +vold="$2" + +if test `apk version -t $vnew 2.13` != '<' && test `apk version -t $vold 2.13` = '<' ; then + echo + echo '***' + echo 'The s6 package has undergone an ABI change.' + echo 'Please reboot at your earliest convenience. Commands such as s6-svstat' + echo 'may not work until you do so.' + echo '***' + echo +fi diff --git a/system/skalibs/APKBUILD b/system/skalibs/APKBUILD index 90b07644d..acef0c29c 100644 --- a/system/skalibs/APKBUILD +++ b/system/skalibs/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Laurent Bercot # Maintainer: Laurent Bercot pkgname=skalibs -pkgver=2.14.1.1 -pkgrel=1 +pkgver=2.14.2.0 +pkgrel=0 pkgdesc="A set of general-purpose C programming libraries for skarnet.org software" url="https://skarnet.org/software/skalibs/" arch="all" @@ -31,4 +31,4 @@ dev() { mv "$pkgdir/usr/lib/skalibs/sysdeps" "$subpkgdir/usr/lib/skalibs/" } -sha512sums="01b3da7614ee626f838b62aff6fa2d4677ab5c5dfffcb3145232db9ac0b5bf70c063f4d83abdee809139fee721c75550eb997e2c3e265417b9493c98886236f9 skalibs-2.14.1.1.tar.gz" +sha512sums="b96491e6429cc69bc75f50be99b7b18769cb756c1a82f698994c23aefb16bc68ee5558076993b948a6674203ecd82a454a978c89f450c219cc2728d52b7f5656 skalibs-2.14.2.0.tar.gz" diff --git a/user/s6-dns/APKBUILD b/user/s6-dns/APKBUILD index cd6c7cc03..fe725f999 100644 --- a/user/s6-dns/APKBUILD +++ b/user/s6-dns/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Laurent Bercot # Maintainer: Laurent Bercot pkgname=s6-dns -pkgver=2.3.7.1 -pkgrel=1 +pkgver=2.3.7.2 +pkgrel=0 pkgdesc="skarnet.org's DNS client libraries and command-line DNS client utilities" url="https://skarnet.org/software/s6-dns/" arch="all" @@ -10,7 +10,8 @@ options="!check" license="ISC" _skalibs_version=2.14 depends="" -makedepends="skalibs-dev>=$_skalibs_version" +depends_dev="skalibs-dev>=$_skalibs_version" +makedepends="$depends_dev" subpackages="$pkgname-dev $pkgname-libs $pkgname-doc" source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz" @@ -32,4 +33,4 @@ package() { cp -a "$builddir/doc" "$pkgdir/usr/share/doc/$pkgname" } -sha512sums="9dabee86d9a27fb0e4a3c10563694bb5734c08c4d730a69daec17dad140274aa104bd6edbd501261c7a7c7bcee505f79134b7119457d5fbedcbb2be6b352ebb0 s6-dns-2.3.7.1.tar.gz" +sha512sums="4dc89e3b8ba22e4e63e8e5a84432ce444865712755c600b4bc62b49dda13c09c372ff2169b0db4790d0f07c392005dda76ed1df5ef8335d2f382d09919b53eae s6-dns-2.3.7.2.tar.gz" diff --git a/user/s6-networking/APKBUILD b/user/s6-networking/APKBUILD index a129c6931..f99d5a2e8 100644 --- a/user/s6-networking/APKBUILD +++ b/user/s6-networking/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Laurent Bercot # Maintainer: Laurent Bercot pkgname=s6-networking -pkgver=2.7.0.2 -pkgrel=1 +pkgver=2.7.0.3 +pkgrel=0 pkgdesc="skarnet.org's UCSPI TCP and TLS tools, access control tools, and network time management utilities." url="https://skarnet.org/software/s6-networking/" arch="all" @@ -10,7 +10,8 @@ options="!check" # No test suite. license="ISC" _skalibs_version=2.14.1 depends="execline" -makedepends="skalibs-dev>=$_skalibs_version execline-dev s6-dev s6-dns-dev bearssl-dev" +depends_dev="skalibs-dev>=$_skalibs_version" +makedepends="$depends_dev execline-dev s6-dev s6-dns-dev bearssl-dev" subpackages="$pkgname-dev $pkgname-libs $pkgname-doc" source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz" @@ -33,4 +34,4 @@ package() { cp -a "$builddir/doc" "$pkgdir/usr/share/doc/$pkgname" } -sha512sums="49f80c68d639f2b7ac7451ca2ace828ca4e8c1eeffec4a9b31f8157c26a87228275ea14d8b6495b0af0879a961b37910aa2b769d8db56d8731d0827c96053631 s6-networking-2.7.0.2.tar.gz" +sha512sums="50d369303bd448d09a3f6431e64fb0f0b13383c92764b499ed881af3a6a8c4f779f1f9d98341943f6fdc8b18d16df444897d3750212df89efd838b6de562eede s6-networking-2.7.0.3.tar.gz" diff --git a/user/smtpd-starttls-proxy/APKBUILD b/user/smtpd-starttls-proxy/APKBUILD index 72c2cc0fc..d597d3457 100644 --- a/user/smtpd-starttls-proxy/APKBUILD +++ b/user/smtpd-starttls-proxy/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Laurent Bercot # Maintainer: Laurent Bercot pkgname=smtpd-starttls-proxy -pkgver=0.0.1.3 -pkgrel=1 +pkgver=0.0.1.4 +pkgrel=0 pkgdesc="An SMTP proxy implementing STARTTLS" url="https://skarnet.org/software/smtpd-starttls-proxy/" arch="all" @@ -30,4 +30,4 @@ package() { cp -a "$builddir/doc" "$pkgdir/usr/share/doc/$pkgname" } -sha512sums="55fc24d3923b7f3cf3137f4d36ed90ebfd2b603f55cfb6cd6d9ae3f67ec38706540c21c2f1a6257f5702e0a93dcba2e31fbfb99fae9d27e20002b265e78b0cf9 smtpd-starttls-proxy-0.0.1.3.tar.gz" +sha512sums="21dc1ee03d7178283a03f8b59f87b9277c5dd8d878a402b986563c4f54f7276bc0d3d05f569f2ddaf59223a3b57d24d4b80a56269bf73112de599e27d5d8795c smtpd-starttls-proxy-0.0.1.4.tar.gz" diff --git a/user/tipidee/APKBUILD b/user/tipidee/APKBUILD index 613be9e3c..473818fd7 100644 --- a/user/tipidee/APKBUILD +++ b/user/tipidee/APKBUILD @@ -1,15 +1,17 @@ # Contributor: Laurent Bercot # Maintainer: Laurent Bercot pkgname=tipidee -pkgver=0.0.4.0 +pkgver=0.0.5.0 pkgrel=0 pkgdesc="The skarnet.org web server" url="https://skarnet.org/software/tipidee/" arch="all" options="!check" # No test suite. license="ISC" +_skalibs_version=2.14.1.1 depends="execline s6 s6-networking" -makedepends="skalibs-dev>=2.14.1.1" +depends_dev="skalibs-dev>=$_skalibs_version" +makedepends="$depends_dev" subpackages="tipidee-dev tipidee-libs tipidee-doc tipidee-openrc" source=" https://skarnet.org/software/tipidee/tipidee-$pkgver.tar.gz @@ -78,7 +80,7 @@ dev() { mv "$subpkgdir/usr/bin/tipidee-config" "$pkgdir/usr/bin/tipidee-config" } -sha512sums="d177f4c00db9855792dbddc4c96d2c75bd302443f29376e1d35d511d56964e5de11dd2cf4af3190d7465404c429eedfc17264715e4850d6b830a9e492ff25741 tipidee-0.0.4.0.tar.gz +sha512sums="861d5509a00d3943e9a483d191d92df91be1aead519b16d1fac96740357670ff9f32cf0ff2b8dd08d0cac059732c59233632379562a508ab3705fd68103f370c tipidee-0.0.5.0.tar.gz 0de0d6bd39adfd6e65694335e9cf06cec7625032e6af5cf5e54ced5c009707ca4e27b2dbdff8b7825575fbef7cd98ac0333e07b1924f24fda23019c92c08023f httpd.run 65cdbfb5a6485aed0203ed910af124b202994d5253cb365ed25432f0c906471dd30f96eb862b6f25004c6ec8ec4cb38a5b49cde717e7a00d7c9d7fd07025f225 httpsd.run b5af306fe7040f966b13da84bfb0c4b528683c03205519d08fe429ee826ffad27c9ddb32be8c8bf8b42ce7964ef15572e3c66a96494aed833ee951c769f81bd2 logger.run -- cgit v1.2.3-70-g09d2