summaryrefslogtreecommitdiff
path: root/system
diff options
context:
space:
mode:
authorLaurent Bercot <ska-adelie@skarnet.org>2024-10-10 03:35:10 +0000
committerLaurent Bercot <ska-adelie@skarnet.org>2024-10-10 03:35:10 +0000
commit1d4a7a53ef2b329549187bf7c60a6c98a2896fc8 (patch)
tree997efee44297fcc072b203f12c77fb1ccb61b6e0 /system
parent20bc0d8d8e007e736c4ce79777ca90235aecc832 (diff)
downloadpackages-1d4a7a53ef2b329549187bf7c60a6c98a2896fc8.tar.gz
packages-1d4a7a53ef2b329549187bf7c60a6c98a2896fc8.tar.bz2
packages-1d4a7a53ef2b329549187bf7c60a6c98a2896fc8.tar.xz
packages-1d4a7a53ef2b329549187bf7c60a6c98a2896fc8.zip
system/s6: upgrade to 2.13.1.0
Also add a .pc file.
Diffstat (limited to 'system')
-rw-r--r--system/s6/APKBUILD20
-rw-r--r--system/s6/s6.pc.in6
2 files changed, 16 insertions, 10 deletions
diff --git a/system/s6/APKBUILD b/system/s6/APKBUILD
index 52c462154..b5a96d864 100644
--- a/system/s6/APKBUILD
+++ b/system/s6/APKBUILD
@@ -1,38 +1,38 @@
# Contributor: Laurent Bercot <ska-adelie@skarnet.org>
# Maintainer: Laurent Bercot <ska-adelie@skarnet.org>
pkgname=s6
-pkgver=2.13.0.0
+pkgver=2.13.1.0
pkgrel=0
pkgdesc="skarnet.org's small & secure supervision software suite"
url="https://skarnet.org/software/s6/"
arch="all"
options="!check" # No test suite.
license="ISC"
-_skalibs_version=2.14.1
+_skalibs_version=2.14.3
+_execline_version=2.9.6
depends="execline"
depends_dev="skalibs-dev>=$_skalibs_version"
-makedepends="$depends_dev execline-dev"
+makedepends="$depends_dev execline-dev>=$_execline_version"
install="$pkgname.post-upgrade"
subpackages="$pkgname-dev $pkgname-libs $pkgname-doc"
triggers="$pkgname.trigger=/run/service"
-source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz"
+source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz s6.pc.in"
build() {
./configure \
--enable-shared \
- --enable-static \
- --enable-allstatic \
--enable-static-libc \
- --libdir=/usr/lib \
- --libexecdir="/lib/$pkgname" \
- --with-dynlib=/lib
+ --libexecdir="/lib/$pkgname"
make
}
package() {
make DESTDIR="$pkgdir" install
+ sed -e "s/@@VERSION@@/$pkgver/g; s/@@SKALIBS_VERSION@@/${_skalibs_version}/g; s/@@EXECLINE_VERSION@@/${_execline_version}/g;" "$srcdir/$pkgname.pc.in" > "$srcdir/$pkgname.pc"
+ install -D -m 0644 "$srcdir/$pkgname.pc" "$pkgdir/usr/lib/pkgconfig/$pkgname.pc"
mkdir -p -m 0755 "$pkgdir/var/lib/s6/services" "$pkgdir/usr/share/doc"
cp -a "$builddir/doc" "$pkgdir/usr/share/doc/$pkgname"
}
-sha512sums="b54d334496d79d1b845552f5e7763c536d6f253c9bb2d61802695ea1a596af918562daa230f09f4cbfc06614eff70930d0963439d7d84ec8ae0388291912ca9d s6-2.13.0.0.tar.gz"
+sha512sums="89912f627d239e9d0b830c97e3b35b0358ac3ea1b3b958de091318e19ee9ca0bac0a008f114682bc0ed8388e15592ffd683c4bbf1128fe7109cad16f18a1065b s6-2.13.1.0.tar.gz
+0af788e78b5840a0ed612de6d2c15bc868d4f2444063f283af1ac42aec7029af24c660abf65c7d9fa369aa1ca96bb8503ffffe37db531fdd75b80db570888a38 s6.pc.in"
diff --git a/system/s6/s6.pc.in b/system/s6/s6.pc.in
new file mode 100644
index 000000000..f01fd55ac
--- /dev/null
+++ b/system/s6/s6.pc.in
@@ -0,0 +1,6 @@
+Name: s6
+Description: The C interface to the s6 supervision suite
+URL: https://skarnet.org/software/s6/
+Version: @@VERSION@@
+Requires.private: execline >= @@EXECLINE_VERSION@@, skalibs >= @@SKALIBS_VERSION@@
+Libs: -ls6