diff options
| -rw-r--r-- | system/execline/APKBUILD | 48 | ||||
| -rw-r--r-- | system/s6/APKBUILD | 45 | ||||
| -rw-r--r-- | system/s6/s6.post-upgrade | 15 | ||||
| -rw-r--r-- | system/skalibs/APKBUILD | 40 | ||||
| -rw-r--r-- | system/utmps/APKBUILD | 48 | ||||
| -rw-r--r-- | user/s6-dns/APKBUILD | 48 | ||||
| -rw-r--r-- | user/s6-networking/APKBUILD | 46 |
7 files changed, 235 insertions, 55 deletions
diff --git a/system/execline/APKBUILD b/system/execline/APKBUILD index 3bc4801be..79fca7177 100644 --- a/system/execline/APKBUILD +++ b/system/execline/APKBUILD @@ -1,16 +1,16 @@ # Contributor: Laurent Bercot <ska-adelie@skarnet.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=execline -pkgver=2.5.0.1 -pkgrel=2 +pkgver=2.5.1.0 +pkgrel=0 pkgdesc="A small scripting language for non-interactive scripts" -url="http://skarnet.org/software/$pkgname/" +url="https://skarnet.org/software/$pkgname/" arch="all" options="!check" # No test suite. license="ISC" -depends_dev="skalibs-dev" -makedepends="skalibs-dev>=2.7" -subpackages="$pkgname-dev $pkgname-doc" +_skalibs_version=2.8 +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" build() { @@ -18,6 +18,7 @@ build() { ./configure \ --enable-shared \ --enable-static \ + --enable-allstatic \ --enable-static-libc \ --libdir=/usr/lib \ --with-dynlib=/lib @@ -29,10 +30,37 @@ package() { make DESTDIR="$pkgdir" install } + +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" + 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/" +} + + doc() { - default_doc - mkdir -p "$subpkgdir/usr/share/doc" - cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname" + 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="9e013a83844fc3f5b28c6aea44b446f550dafe52131facf0d7c0648c9ae62c4a62d895f72cedb010754319c0e298fb4c8396d2c6be019cd6218558934bffaea3 execline-2.5.0.1.tar.gz" +sha512sums="461a91d0e790e96233179c89c783bb29d89592def451643265c97259db83056556cd5f231d668e8c460396c35a8792f56b30193171e85488e60e3cb4feb7379c execline-2.5.1.0.tar.gz" diff --git a/system/s6/APKBUILD b/system/s6/APKBUILD index 5c7ec31a1..d160e104f 100644 --- a/system/s6/APKBUILD +++ b/system/s6/APKBUILD @@ -1,17 +1,18 @@ # Contributor: Laurent Bercot <ska-adelie@skarnet.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=s6 -pkgver=2.7.2.2 +pkgver=2.8.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" -depends_dev="skalibs-dev execline-dev" -makedepends="skalibs-dev>=2.7 execline-dev" +_skalibs_version=2.8 +depends="execline" +makedepends="skalibs-dev>=$_skalibs_version execline-dev" install="$pkgname.post-upgrade" -subpackages="$pkgname-dev $pkgname-doc" +subpackages="$pkgname-libs $pkgname-dev $pkgname-libs-dev:libsdev $pkgname-doc" triggers="$pkgname.trigger=/run/service" source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz s6-svscanboot" @@ -21,6 +22,7 @@ build() { ./configure \ --enable-shared \ --enable-static \ + --enable-allstatic \ --enable-static-libc \ --libdir=/usr/lib \ --libexecdir="/lib/$pkgname" \ @@ -36,11 +38,38 @@ package() { chmod 0755 "$pkgdir/lib/s6/s6-svscanboot" } + +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" + 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/" +} + + doc() { - default_doc - mkdir -p "$subpkgdir/usr/share/doc" - cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname" + 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="ed7b9fbc73e9947e56ad641459c04ff210fb801c8cfdbb5f0a00bdecbe1f5969ae73a6b52b048cd6617c88308f3a7bfd0ed98a48e78b1b5ba90b96e95845d165 s6-2.7.2.2.tar.gz +sha512sums="e2f2f0fb9481a745fc80b3b8c0aa2de979c0c8dbe066e2402cf7700a08edc32448d7ed3065a19a01a18dc5a12f3abcfd3aba5d2c5fefbbf49fee4a6f8396c106 s6-2.8.0.0.tar.gz 9c29bc9eee6d5ab502a5a86bb043ebd21e085022efc506a330ae5ab0eadf7038d0a3dc8e025d78d9610cf7ec0ca031887f755486c4cb4e571090ea3a9c1806ac s6-svscanboot" diff --git a/system/s6/s6.post-upgrade b/system/s6/s6.post-upgrade index 54144895b..0b69f49e7 100644 --- a/system/s6/s6.post-upgrade +++ b/system/s6/s6.post-upgrade @@ -1,3 +1,18 @@ #!/bin/sh -e rm -f /etc/runlevels/default/s6 + +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: +* +* s6-svscanctl -t /run/service +* +* Running this command will instantly log everyone out of all the +* terminals that are listed in the GETTYS variable in /etc/conf.d/gettys +* - so please save your work first. +* + +EOF diff --git a/system/skalibs/APKBUILD b/system/skalibs/APKBUILD index 2bf84e868..46494176b 100644 --- a/system/skalibs/APKBUILD +++ b/system/skalibs/APKBUILD @@ -1,14 +1,14 @@ # Contributor: Laurent Bercot <ska-adelie@skarnet.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=skalibs -pkgver=2.7.0.0 -pkgrel=1 +pkgver=2.8.0.0 +pkgrel=0 pkgdesc="A set of general-purpose C programming libraries for skarnet.org software" -url="http://skarnet.org/software/skalibs/" +url="https://skarnet.org/software/skalibs/" arch="all" options="!check" # No test suite. license="ISC" -subpackages="$pkgname-dev $pkgname-doc" +subpackages="$pkgname-libs $pkgname-dev $pkgname-libs-dev:libsdev $pkgname-doc" source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz" build() { @@ -26,17 +26,37 @@ package() { make DESTDIR="$pkgdir" install } + +libs() { + pkgdesc="$pkgdesc (shared libraries)" + depends= + mkdir -p "$subpkgdir/lib" + mv "$pkgdir"/lib/*.so.* "$subpkgdir/lib/" +} + + dev() { - default_dev - mv "$pkgdir/usr/lib/$pkgname"/sysdeps/* \ - "$subpkgdir/usr/lib/$pkgname"/sysdeps/ - rm -rf "$pkgdir"/usr + pkgdesc="$pkgdesc (development files)" + depends= + mkdir -p "$subpkgdir" + mv "$pkgdir/usr" "$subpkgdir/" } + +libsdev() { + pkgdesc="$pkgdesc (development files for dynamic linking)" + depends="$pkgname-dev" + mkdir -p "$subpkgdir/lib" + mv "$pkgdir"/lib/*.so "$subpkgdir/lib/" +} + + doc() { - default_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="33624b606a0846478e6fde10057633b43e76bda299d067cff269582c252f05108ebf28c539865c7f24b67e99575328fc7789326dfbb2e81bf209aa51445f04a1 skalibs-2.7.0.0.tar.gz" +sha512sums="0d8d4a5a68a3f522312c69913a2e998a7cd8562fb99595ed6631531af590701f995b05c2d85defab3cd24d3480787a7456c8326e7bff00cd1a84ff06ca89b463 skalibs-2.8.0.0.tar.gz" diff --git a/system/utmps/APKBUILD b/system/utmps/APKBUILD index 91bb18b19..9ce4c0dda 100644 --- a/system/utmps/APKBUILD +++ b/system/utmps/APKBUILD @@ -1,17 +1,17 @@ # Contributor: Laurent Bercot <ska-adelie@skarnet.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=utmps -pkgver=0.0.2.0 -pkgrel=2 +pkgver=0.0.2.1 +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" -depends_dev="skalibs-dev" -makedepends="skalibs-dev>=2.7" -subpackages="$pkgname-dev $pkgname-doc" +_skalibs_version=2.8 +makedepends="skalibs-dev>=$_skalibs_version" +subpackages="$pkgname-libs $pkgname-dev $pkgname-libs-dev:libsdev $pkgname-doc" install="$pkgname.post-upgrade" source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz utmpd.run @@ -22,7 +22,8 @@ build() { ./configure \ --enable-shared \ --enable-static \ - --disable-allstatic \ + --enable-allstatic \ + --enable-static-libc \ --libdir=/usr/lib \ --libexecdir="/lib/$pkgname" \ --with-dynlib=/lib @@ -40,12 +41,39 @@ package() { chmod 0755 "$pkgdir/etc/s6/early-services/utmpd/run" "$pkgdir/etc/s6/early-services/wtmpd/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" + 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/" +} + + doc() { - default_doc - mkdir -p "$subpkgdir/usr/share/doc" - cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname" + 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="5fffb86f68475f3eadf8da53e3ae40284040cceb644f453218a5fd9e1be081920b5c787283e2578a60922e2feb75c94a7430034a658f7399645fc3bcc9afa28f utmps-0.0.2.0.tar.gz +sha512sums="e0ead9dc4085ce778f22831eec0f79ad251c6f5cb83afa6e52a9ab47a4a0037695e70c2ff0624da8b406a8e3c79f0c8653600bc541fad90c4e21d241c53c27aa utmps-0.0.2.1.tar.gz 525d43e3eced30c564e5390fc715b6caa1ae2b6515a9e3bf01263ff3fb9379bd6908ed302d0d50b6568ac36ed44d272dcc44a683f9ae34d586d8ad17023ed6b1 utmpd.run 93e4fae527ada9381e0b0a7ad5de9079e8d88959abd74fa5c0710c30c6153832abb010b57ddf83055ca34c032e7e5c9c1eedceb2f122a11ab20837ab66dcf5e2 wtmpd.run" diff --git a/user/s6-dns/APKBUILD b/user/s6-dns/APKBUILD index a0fa13696..aa1473ba5 100644 --- a/user/s6-dns/APKBUILD +++ b/user/s6-dns/APKBUILD @@ -1,16 +1,17 @@ # Contributor: Laurent Bercot <ska-adelie@skarnet.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=s6-dns -pkgver=2.3.0.1 +pkgver=2.3.0.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" -license="ISC" -makedepends="skalibs-dev" options="!check" -makedepends="skalibs-dev" -subpackages="$pkgname-dev $pkgname-doc" +license="ISC" +_skalibs_version=2.8 +depends= +makedepends="skalibs-dev>=$_skalibs_version skalibs-libs-dev>=$_skalibs_version" +subpackages="$pkgname-libs $pkgname-dev $pkgname-libs-dev:libsdev $pkgname-doc" source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz" build() { @@ -20,6 +21,7 @@ build() { --enable-static \ --disable-allstatic \ --prefix=/usr \ + --libdir=/usr/lib \ --libexecdir="/usr/lib/$package" \ --with-dynlib=/lib make @@ -30,10 +32,38 @@ package() { make DESTDIR="$pkgdir" install } + +libs() { + pkgdesc="$pkgdesc (shared libraries)" + depends="skalibs-libs>=$_skalibs_version" + mkdir -p "$subpkgdir/usr/lib" + mv "$pkgdir"/usr/lib/*.so.* "$subpkgdir/usr/lib/" +} + + +dev() { + pkgdesc="$pkgdesc (development files)" + depends="skalibs-dev>=$_skalibs_version" + mkdir -p "$subpkgdir/usr/include" "$subpkgdir/usr/lib" + mv "$pkgdir/usr/include" "$subpkgdir/usr/" + mv "$pkgdir"/usr/lib/*.a "$subpkgdir/usr/lib/" +} + + +libsdev() { + pkgdesc="$pkgdesc (development files for dynamic linking)" + depends="$pkgname-dev" + mkdir -p "$subpkgdir/usr/lib" + mv "$pkgdir"/usr/lib/*.so "$subpkgdir/usr/lib/" +} + + doc() { - default_doc - mkdir -p "$subpkgdir"/usr/share/doc - cp -a "$builddir"/doc "$subpkgdir"/usr/share/doc/$pkgname + 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="69ae32f9b4ff22a5d38e3a2c950357d8c8032a649c1d81e4a4e5f474ae5c1bb1072555baa1a34f955293aa0f66a93f51f2cc8efd8aa56704b906e0b0979f8157 s6-dns-2.3.0.1.tar.gz" +sha512sums="fec0edf852423bf8f717fcdc3c00c8f38e7bab4d9a03d14e6e81ad3f175b5db57be44409761bbd990f56f81c3ae8e0aa76ab8c5b65fec823a0ce392bf41cdf33 s6-dns-2.3.0.2.tar.gz" diff --git a/user/s6-networking/APKBUILD b/user/s6-networking/APKBUILD index 39b08026f..09ba89702 100644 --- a/user/s6-networking/APKBUILD +++ b/user/s6-networking/APKBUILD @@ -1,16 +1,17 @@ # Contributor: Laurent Bercot <ska-adelie@skarnet.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=s6-networking -pkgver=2.3.0.3 +pkgver=2.3.0.4 pkgrel=0 -pkgdesc="skarnet.org's UCSPI Unix and TCP tools, access control tools, and network time management utilities." +pkgdesc="skarnet.org's UCSPI TCP tools, access control tools, and network time management utilities." url="https://skarnet.org/software/$pkgname/" arch="all" -license="ISC" options="!check" # No test suite. -depends_dev="skalibs-dev bearssl-dev" -makedepends="skalibs-dev execline-dev s6-dev s6-dns-dev bearssl-dev" -subpackages="$pkgname-dev $pkgname-doc" +license="ISC" +_skalibs_version=2.8 +depends="execline" +makedepends="skalibs-dev>=$_skalibs_version skalibs-libs-dev>=$_skalibs_version execline-dev s6-dev s6-libs-dev s6-dns-dev s6-dns-libs-dev bearssl-dev" +subpackages="$pkgname-libs $pkgname-dev $pkgname-libs-dev:libsdev $pkgname-doc" source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz" build() { @@ -20,6 +21,7 @@ build() { --enable-static \ --disable-allstatic \ --prefix=/usr \ + --libdir=/usr/lib \ --libexecdir="/usr/lib/$pkgname" \ --with-dynlib=/lib \ --enable-ssl=bearssl @@ -31,10 +33,38 @@ package() { make DESTDIR="$pkgdir" install } + +libs() { + pkgdesc="$pkgdesc (shared libraries)" + depends="skalibs-libs>=$_skalibs_version" + mkdir -p "$subpkgdir/usr/lib" + mv "$pkgdir"/usr/lib/*.so.* "$subpkgdir/usr/lib/" +} + + +dev() { + pkgdesc="$pkgdesc (development files)" + depends="skalibs-dev>=$_skalibs_version" + mkdir -p "$subpkgdir/usr/include" "$subpkgdir/usr/lib" + mv "$pkgdir/usr/include" "$subpkgdir/usr/" + mv "$pkgdir"/usr/lib/*.a "$subpkgdir/usr/lib/" +} + + +libsdev() { + pkgdesc="$pkgdesc (development files for dynamic linking)" + depends="$pkgname-dev" + mkdir -p "$subpkgdir/usr/lib" + mv "$pkgdir"/usr/lib/*.so "$subpkgdir/usr/lib/" +} + + doc() { - default_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="f710c8c67b88523d4d461ab775ad3a56ca148e0e5ee4c02fe40d0783ff43af8779e598548db5048cc32852be6659f2feb7ac29ba07a953daa0039cec0fc14762 s6-networking-2.3.0.3.tar.gz" +sha512sums="e0a6dbaf3420beae5b6bab1cedeaeb5d58dea36c9a6e1c3f7140515c83eaf3e872f896d90e43771d74669edcc0a3f25ba8135cc3a21d378a297d92ba2abc62d3 s6-networking-2.3.0.4.tar.gz" |