From e6121ae5fb6393c7835ccc907c1c766afa0b291e Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-adelie@skarnet.org>
Date: Wed, 6 Mar 2019 23:19:35 +0000
Subject:  system/s6: upgrade to 2.8.0.0

---
 system/s6/APKBUILD        | 45 +++++++++++++++++++++++++++++++++++++--------
 system/s6/s6.post-upgrade | 15 +++++++++++++++
 2 files changed, 52 insertions(+), 8 deletions(-)

(limited to 'system/s6')

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
-- 
cgit v1.2.3-60-g2f50