From b19a78e5a216d987361243fdbc8908755e93b11c Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-adelie@skarnet.org>
Date: Thu, 10 Oct 2024 04:07:49 +0000
Subject: system/s6-linux-init: upgrade to 1.1.2.1

Also add a .pc file.
---
 system/s6-linux-init/APKBUILD            | 30 +++++++++++++++++++-----------
 system/s6-linux-init/s6-linux-init.pc.in |  6 ++++++
 2 files changed, 25 insertions(+), 11 deletions(-)
 create mode 100644 system/s6-linux-init/s6-linux-init.pc.in

diff --git a/system/s6-linux-init/APKBUILD b/system/s6-linux-init/APKBUILD
index 973037509..8131fbb38 100644
--- a/system/s6-linux-init/APKBUILD
+++ b/system/s6-linux-init/APKBUILD
@@ -1,18 +1,20 @@
 # Contributor: Laurent Bercot <ska-adelie@skarnet.org>
 # Maintainer: Laurent Bercot <ska-adelie@skarnet.org>
 pkgname=s6-linux-init
-pkgver=1.1.2.0
-pkgrel=2
+pkgver=1.1.2.1
+pkgrel=0
 pkgdesc="A s6-based init system"
 url="https://skarnet.org/software/s6-linux-init/"
 arch="all"
 options="!check"  # No test suite.
 license="ISC"
-_skalibs_version=2.14
-_s6_version=2.12
+_skalibs_version=2.14.3
+_utmps_version=0.1.2
+_execline_version=2.9.6
+_s6_version=2.13.1
 depends="execline s6>=$_s6_version s6-linux-init-common"
 depends_dev="skalibs-dev>=$_skalibs_version"
-makedepends="$depends_dev execline-dev s6-dev utmps-dev"
+makedepends="$depends_dev execline-dev>=$_execline_version s6-dev>=$_s6_version utmps-dev>=$_utmps_version"
 subpackages="
 	$pkgname-common:common:noarch
 	$pkgname-early-getty:earlygetty:noarch
@@ -20,19 +22,22 @@ subpackages="
 	$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"
+source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz
+	rc.init
+	runlevel
+	rc.shutdown
+	reboot.sh
+	earlygetty.run
+	s6-linux-init.pc.in
+	dracut_module.sh"
 install="$pkgname.post-install $pkgname.post-upgrade $pkgname.pre-deinstall"
 provides="/sbin/init=0"
 
 build() {
 	./configure \
 		--enable-shared \
-		--enable-static \
-		--enable-allstatic \
 		--enable-static-libc \
-		--libdir=/usr/lib \
 		--libexecdir="/lib/$pkgname" \
-		--with-dynlib=/lib \
 		--enable-utmps
 	make
 }
@@ -63,6 +68,8 @@ package() {
 	for i in init halt poweroff reboot shutdown telinit ; do
 		ln -sf "../etc/s6-linux-init/current/bin/$i" "$pkgdir/sbin/$i"
 	done
+	sed -e "s/@@VERSION@@/$pkgver/g; s/@@SKALIBS_VERSION@@/${_skalibs_version}/g;" "$srcdir/$pkgname.pc.in" > "$srcdir/$pkgname.pc"
+	install -D -m 0644 "$srcdir/$pkgname.pc" "$pkgdir/usr/lib/pkgconfig/$pkgname.pc"
 	cp -a "$builddir/doc" "$pkgdir/usr/share/doc/$pkgname"
 }
 
@@ -99,10 +106,11 @@ dracut() {
 	install -D -m755 "$srcdir"/dracut_module.sh "$subpkgdir"/usr/lib/dracut/modules.d/99s6li/module-setup.sh
 }
 
-sha512sums="76376c4d407e665f67f733f1366dbacca58d268ebdbe22a9147cb102d519bd4c5887a345f66db2005d29ed9a841cb5a388c73c7d8df00d984cc4a25b9a813786  s6-linux-init-1.1.2.0.tar.gz
+sha512sums="343b6a9bdcf3b1abb544409bb2d7a6c8a1dbcb07d1b941ae74e8800e48ad605c6427f724d7692569b3ade4829948d0e57024c764c18a60c3bb2eb2efefedb622  s6-linux-init-1.1.2.1.tar.gz
 756b0cbbe5dabb4631380c3c7ea199cc213224b2e36e50a2d012a61948170078b78bf49b85d886319fecf59843087f937d3d804723b2553ac9f94d088a2f0fd8  rc.init
 e73c3c32b118831074288d23fadace2158a2b15d5a13ffa73290b92a9e39c2a21c73d3b0eabea29bcbaa5f6381611fd8d0aaa6aa691ec7de91b8ef6ae404b6da  runlevel
 7bb050248a5c2ab6a56c50c35f87cde724f97ff9882f5e60b0f0f2f14bd93c1df7d99fedc3d81c8519cf1a1ed90e03f1cbb9bf891c7b3618aa9a5f5738d262f4  rc.shutdown
 6fb2a1112988fd2322b4bc4862bfb948a1c2e43921c5d01ae873c0d31b39fe74fc2934a5018c08b1704a2b2199b31d3a3d7365be369bba734f153b74e000aa74  reboot.sh
 dfff483b61370ce2c8fe653cb4e9b6ec7ef678f26b128eab8e677548a48b668b532b12a2e4618c85bf95777a666ac30189780708803d6ea12e43ab0072399212  earlygetty.run
+1e617f0a1ae724c80d0f577c1484297b4aea3107cad6b2589ffeabcad3a12a8ba5de876fd2a6d7ddc03c4e6e9d34938dd0356b273fe62c475ff31da9aef2596d  s6-linux-init.pc.in
 a62cf543e64aaf24f16c0e3d23497890de7a4a621c9d8f93c447001ea56a21324046ee589188d11b3d4dbfea4a707b5a1889d2b703c00ea6a81207a0442f9799  dracut_module.sh"
diff --git a/system/s6-linux-init/s6-linux-init.pc.in b/system/s6-linux-init/s6-linux-init.pc.in
new file mode 100644
index 000000000..338fef40a
--- /dev/null
+++ b/system/s6-linux-init/s6-linux-init.pc.in
@@ -0,0 +1,6 @@
+Name: s6-linux-init
+Description: Library to register a logout hook
+URL: https://skarnet.org/software/s6-linux-init/
+Version: @@VERSION@@
+Requires.private: skalibs >= @@SKALIBS_VERSION@@
+Libs: -ls6_linux_init
-- 
cgit v1.2.3-70-g09d2