summaryrefslogtreecommitdiff
path: root/system
diff options
context:
space:
mode:
Diffstat (limited to 'system')
-rw-r--r--system/execline/APKBUILD16
-rw-r--r--system/execline/execline.pc.in6
-rw-r--r--system/kbd/APKBUILD4
-rw-r--r--system/mdevd/APKBUILD14
-rw-r--r--system/mdevd/mdevd.initd2
-rw-r--r--system/pcre2/APKBUILD10
-rw-r--r--system/ruby/APKBUILD2
-rw-r--r--system/s6-linux-init/APKBUILD19
-rw-r--r--system/s6-linux-init/s6-linux-init.pc.in6
-rw-r--r--system/s6-rc/APKBUILD18
-rw-r--r--system/s6-rc/s6-rc.pc.in7
-rw-r--r--system/s6/APKBUILD16
-rw-r--r--system/s6/s6.pc.in6
-rw-r--r--system/skalibs/APKBUILD14
-rw-r--r--system/skalibs/skalibs.pc.in5
-rw-r--r--system/utmps/APKBUILD17
-rw-r--r--system/utmps/utmps.pc.in6
17 files changed, 61 insertions, 107 deletions
diff --git a/system/execline/APKBUILD b/system/execline/APKBUILD
index 502097bcd..028c1a0f6 100644
--- a/system/execline/APKBUILD
+++ b/system/execline/APKBUILD
@@ -1,22 +1,23 @@
-# Contributor: Laurent Bercot <ska-adelie@skarnet.org>
# Maintainer: Laurent Bercot <ska-adelie@skarnet.org>
pkgname=execline
-pkgver=2.9.6.1
-pkgrel=1
+pkgver=2.9.7.0
+pkgrel=0
pkgdesc="A small scripting language for non-interactive scripts"
url="https://skarnet.org/software/execline/"
arch="all"
options="!check" # No test suite.
license="ISC"
-_skalibs_version=2.14.3
+_skalibs_version=2.14.4
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 execline.pc.in"
+source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz"
build() {
./configure \
--enable-shared \
+ --with-pkgconfig \
+ --enable-pkgconfig \
--enable-static-libc \
--enable-pedantic-posix
make
@@ -25,11 +26,8 @@ build() {
package() {
make DESTDIR="$pkgdir" install
mkdir -p -m 0755 "$pkgdir/usr/share/doc" "$pkgdir/usr/bin"
- 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"
ln -s ../../bin/execlineb "$pkgdir/usr/bin/execlineb"
}
-sha512sums="86e20a63926cc03cb81e07c9cbea9da5d0384436a82b93e331da6b3ced33829baf5adae4286d2c053b21474d41602d53804ff0bc280da60f7bccc64cbe5f601e execline-2.9.6.1.tar.gz
-54026153ee1b96357bdf4614c520a287b34db1ded012cb563240c1292daea33af6da6b39a051ad18dd5b53a1d42c25cc109185ce83c8cbc67fcb098a9418d78e execline.pc.in"
+sha512sums="c46aa4954a560610074a5a4f8cecc1512bab05b40739c4dddc74881edb30468f248fc08ca1a461ec66279fa43fa25d130b339790995fb1eeb1612a13dc479ac1 execline-2.9.7.0.tar.gz"
diff --git a/system/execline/execline.pc.in b/system/execline/execline.pc.in
deleted file mode 100644
index c0b28d9df..000000000
--- a/system/execline/execline.pc.in
+++ /dev/null
@@ -1,6 +0,0 @@
-Name: execline
-Description: the execline library for argv and envp manipulation
-URL: https://skarnet.org/software/execline/
-Version: @@VERSION@@
-Requires.private: skalibs >= @@SKALIBS_VERSION@@
-Libs: -lexecline
diff --git a/system/kbd/APKBUILD b/system/kbd/APKBUILD
index 144ddcefc..4380b9161 100644
--- a/system/kbd/APKBUILD
+++ b/system/kbd/APKBUILD
@@ -2,13 +2,13 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kbd
pkgver=2.2.0_git20190823
-pkgrel=2
+pkgrel=3
pkgdesc="Console keyboard and font management utilities"
url="https://kbd-project.org/"
arch="all"
options="!check" # padding error on at least ppc64
license="GPL-2.0+"
-depends=""
+depends="gzip"
checkdepends="check-dev"
makedepends="linux-headers linux-pam-dev autoconf automake libtool"
provides="$pkgname-keymaps"
diff --git a/system/mdevd/APKBUILD b/system/mdevd/APKBUILD
index f97c26160..b4ef7fa4e 100644
--- a/system/mdevd/APKBUILD
+++ b/system/mdevd/APKBUILD
@@ -1,20 +1,24 @@
# Contributor: Laurent Bercot <ska-adelie@skarnet.org>
# Maintainer: Laurent Bercot <ska-adelie@skarnet.org>
pkgname=mdevd
-pkgver=0.1.6.5
+pkgver=0.1.7.0
pkgrel=0
pkgdesc="A small uevent manager daemon"
url="https://skarnet.org/software/mdevd/"
arch="all"
options="!check" # No test suite.
license="ISC"
-_skalibs_version=2.14.3
+_skalibs_version=2.14.4
makedepends="skalibs-dev>=$_skalibs_version"
subpackages="$pkgname-doc $pkgname-openrc"
source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz mdev.conf mdevd.run mdevd.initd"
build() {
- ./configure --enable-allstatic --enable-static-libc
+ ./configure \
+ --enable-allstatic \
+ --with-pkgconfig \
+ --enable-pkgconfig \
+ --enable-static-libc
make
}
@@ -40,7 +44,7 @@ openrc() {
ln -s ../../init.d/mdevd "$rldir/mdevd"
}
-sha512sums="a6d4fd9802e46746b7c677bf1c5d496f7af46eb3d827248781989c0cfcd81e14b5eb7ab6af6aef9be6f3b3f1bc4fa6de1a61735f2fc2aa6b7dc994b0f73999f7 mdevd-0.1.6.5.tar.gz
+sha512sums="b50750afbba81c5168348acc2b38ba28abe0ac19bf4ea49c04f68eec1269a079642bccbed0acb1ef5da4848aea20c5f71c2711945eb2218ab79d570ffecdce57 mdevd-0.1.7.0.tar.gz
f966d66366eac3b9b9eeb9b8523ea0924ada2b858c85ca0c0151d0fb374dfbf56c49ec2210d2d5ca19aa4d9f24371c85d777050eb8bf9f57821ec65704f18717 mdev.conf
427a5903fa2126060955dcce8144d59255a679c4973f2dbc3145a4d646e879fc241ebcaa53289498719d343c746fc376c41defa87932dcbe91192b2d6f4ed1c4 mdevd.run
-e7599f51a4280243a5be459c6fad7eb8ba3b5f65fae8cad923ccca2addab55787819909fea311c998e1126e6802a81ab000ee6de7474f3245ce72521244c22ba mdevd.initd"
+afda8cb4fbf3125367b67df713b51a1de4fea9e444580bcf7e0056a236f7a1b72b64f1b3feabe9aff308d46ff04b2f2711e64fada305eea4290080017c8a72fe mdevd.initd"
diff --git a/system/mdevd/mdevd.initd b/system/mdevd/mdevd.initd
index e9dff025f..1b55a3a84 100644
--- a/system/mdevd/mdevd.initd
+++ b/system/mdevd/mdevd.initd
@@ -1,5 +1,5 @@
#!/sbin/openrc-run
-# Copyright 2019-2023 Adélie Linux
+# Copyright 2019-2025 Adélie Linux
description="mdevd manages device permissions and symbolic links in /dev"
extra_started_commands="reload"
diff --git a/system/pcre2/APKBUILD b/system/pcre2/APKBUILD
index 4e4aa309d..ddf7de0e4 100644
--- a/system/pcre2/APKBUILD
+++ b/system/pcre2/APKBUILD
@@ -1,10 +1,10 @@
# Contributor: Jakub Jirutka <jakub@jirutka.cz>
# Maintainer: Zach van Rijn <me@zv.io>
pkgname=pcre2
-pkgver=10.42
+pkgver=10.45
pkgrel=0
pkgdesc="Perl-compatible regular expression library"
-url="https://pcre.org"
+url="https://www.pcre.org/"
arch="all"
license="BSD-3-Clause"
depends=""
@@ -12,7 +12,7 @@ depends_dev="libedit-dev zlib-dev"
makedepends="$depends_dev"
subpackages="$pkgname-dev $pkgname-doc $pkgname-tools
libpcre2-16:_libpcre libpcre2-32:_libpcre"
-source="https://github.com/PhilipHazel/pcre2/releases/download/$pkgname-$pkgver/$pkgname-$pkgver.tar.gz
+source="https://github.com/PhilipHazel/pcre2/releases/download/$pkgname-$pkgver/$pkgname-$pkgver.tar.bz2
"
# secfixes:
@@ -40,7 +40,7 @@ build() {
--enable-pcre2-32 \
--enable-pcre2grep-libz \
--enable-pcre2test-libedit \
- --with-match-limit-recursion=8192 \
+ --with-match-limit-depth=262144 \
$_enable_jit
make
}
@@ -69,4 +69,4 @@ tools() {
mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
}
-sha512sums="a3db6c5c620775838819be616652e73ce00f5ef5c1f49f559ff3efb51a119d02f01254c5901c1f7d0c47c0ddfcf4313e38d6ca32c35381b8f87f36896d10e6f7 pcre2-10.42.tar.gz"
+sha512sums="4c1f0cf793624516d7eeb15745d6c07c9f678dd2c2b349062c6b614e88bf42262972d133576e85140dee2a882984aaf2d688953fc9c69ec7105b2daaeae89845 pcre2-10.45.tar.bz2"
diff --git a/system/ruby/APKBUILD b/system/ruby/APKBUILD
index 4c8ec8e3b..c01d0fec0 100644
--- a/system/ruby/APKBUILD
+++ b/system/ruby/APKBUILD
@@ -77,7 +77,7 @@ replaces="ruby-etc ruby-gems"
_gemdir="/usr/lib/ruby/gems/$_abiver"
_rubydir="/usr/lib/ruby/$_abiver"
-_chost="$(printf '%s' "$CHOST" | sed 's/-foxkit-/-/')"
+_chost="$(printf '%s' "$CHOST" | sed 's/-.*-linux-musl/-linux-musl/')"
case "$CARCH" in
x86 | pmmx) _arch="i386";;
diff --git a/system/s6-linux-init/APKBUILD b/system/s6-linux-init/APKBUILD
index 8131fbb38..a5ad313c1 100644
--- a/system/s6-linux-init/APKBUILD
+++ b/system/s6-linux-init/APKBUILD
@@ -1,17 +1,16 @@
-# Contributor: Laurent Bercot <ska-adelie@skarnet.org>
# Maintainer: Laurent Bercot <ska-adelie@skarnet.org>
pkgname=s6-linux-init
-pkgver=1.1.2.1
+pkgver=1.1.3.0
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.3
-_utmps_version=0.1.2
-_execline_version=2.9.6
-_s6_version=2.13.1
+_skalibs_version=2.14.4
+_utmps_version=0.1.3
+_execline_version=2.9.7
+_s6_version=2.13.2
depends="execline s6>=$_s6_version s6-linux-init-common"
depends_dev="skalibs-dev>=$_skalibs_version"
makedepends="$depends_dev execline-dev>=$_execline_version s6-dev>=$_s6_version utmps-dev>=$_utmps_version"
@@ -28,7 +27,6 @@ source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz
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"
@@ -36,6 +34,8 @@ provides="/sbin/init=0"
build() {
./configure \
--enable-shared \
+ --with-pkgconfig \
+ --enable-pkgconfig \
--enable-static-libc \
--libexecdir="/lib/$pkgname" \
--enable-utmps
@@ -68,8 +68,6 @@ 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"
}
@@ -106,11 +104,10 @@ dracut() {
install -D -m755 "$srcdir"/dracut_module.sh "$subpkgdir"/usr/lib/dracut/modules.d/99s6li/module-setup.sh
}
-sha512sums="343b6a9bdcf3b1abb544409bb2d7a6c8a1dbcb07d1b941ae74e8800e48ad605c6427f724d7692569b3ade4829948d0e57024c764c18a60c3bb2eb2efefedb622 s6-linux-init-1.1.2.1.tar.gz
+sha512sums="671f0532f708f570b307510d76eefabfecf0fb989491b2bb02dfccc1043ed80761367c2f7a56821aa44d159b57b4c1eca739b50362ec56f2be3b498df6f9a34a s6-linux-init-1.1.3.0.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
deleted file mode 100644
index 338fef40a..000000000
--- a/system/s6-linux-init/s6-linux-init.pc.in
+++ /dev/null
@@ -1,6 +0,0 @@
-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
diff --git a/system/s6-rc/APKBUILD b/system/s6-rc/APKBUILD
index a45dcc5aa..f4b23483a 100644
--- a/system/s6-rc/APKBUILD
+++ b/system/s6-rc/APKBUILD
@@ -1,25 +1,26 @@
-# Contributor: Laurent Bercot <ska-adelie@skarnet.org>
# Maintainer: Laurent Bercot <ska-adelie@skarnet.org>
pkgname=s6-rc
-pkgver=0.5.5.0
+pkgver=0.5.6.0
pkgrel=0
pkgdesc="skarnet.org's service manager, working on top of s6"
url="https://skarnet.org/software/s6-rc/"
arch="all"
options="!check"
license="ISC"
-_skalibs_version=2.14.3
-_execline_version=2.9.6
-_s6_version=2.13.1
+_skalibs_version=2.14.4
+_execline_version=2.9.7
+_s6_version=2.13.2
depends="execline"
depends_dev="skalibs-dev>=$_skalibs_version s6-dev>=$_s6_version"
makedepends="$depends_dev execline-dev>=$_execline_version"
subpackages="$pkgname-dev $pkgname-libs $pkgname-doc"
-source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz s6-rc.pc.in"
+source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz"
build() {
./configure \
--enable-shared \
+ --with-pkgconfig \
+ --enable-pkgconfig \
--enable-static-libc \
--libexecdir="/lib/$pkgname"
make
@@ -27,11 +28,8 @@ build() {
package() {
make DESTDIR="$pkgdir" install
- sed -e "s/@@VERSION@@/$pkgver/g; s/@@SKALIBS_VERSION@@/${_skalibs_version}/g; s/@@S6_VERSION@@/${_s6_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/usr/share/doc"
cp -a "$builddir/doc" "$pkgdir/usr/share/doc/$pkgname"
}
-sha512sums="8769c71eaf1416fb1d2040865585e0c3c7abb0c9732313d3534f82be8f50417500796cda41a434e8a521bff77960ba23009e51080892700a158ae61537303081 s6-rc-0.5.5.0.tar.gz
-1ca049b2ad49a8ad22f9136d4a82ab692616e82e14b27657b82433b937c5f7ff193ad230a9c968498fb0a1597a4f58174757576444a27bd865347cf28c149ae2 s6-rc.pc.in"
+sha512sums="1e65ff999b7c5b4f34c90ae1edf5e4315e3323d03ac82ca1467848a41936f57623cb2d20b77b43f944b6845992ceb482a5573acbfa1c1d241eb825ea4b7ca90b s6-rc-0.5.6.0.tar.gz"
diff --git a/system/s6-rc/s6-rc.pc.in b/system/s6-rc/s6-rc.pc.in
deleted file mode 100644
index 1b8f1b180..000000000
--- a/system/s6-rc/s6-rc.pc.in
+++ /dev/null
@@ -1,7 +0,0 @@
-Name: s6-rc
-Description: The C interface to the s6-rc service manager
-URL: https://skarnet.org/software/s6-rc/
-Version: @@VERSION@@
-Requires.private: s6 >= @@S6_VERSION@@, skalibs >= @@SKALIBS_VERSION@@
-Libs: -ls6rc
-
diff --git a/system/s6/APKBUILD b/system/s6/APKBUILD
index b5a96d864..022dc594c 100644
--- a/system/s6/APKBUILD
+++ b/system/s6/APKBUILD
@@ -1,26 +1,27 @@
-# Contributor: Laurent Bercot <ska-adelie@skarnet.org>
# Maintainer: Laurent Bercot <ska-adelie@skarnet.org>
pkgname=s6
-pkgver=2.13.1.0
+pkgver=2.13.2.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.3
-_execline_version=2.9.6
+_skalibs_version=2.14.4
+_execline_version=2.9.7
depends="execline"
depends_dev="skalibs-dev>=$_skalibs_version"
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 s6.pc.in"
+source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz"
build() {
./configure \
--enable-shared \
+ --with-pkgconfig \
+ --enable-pkgconfig \
--enable-static-libc \
--libexecdir="/lib/$pkgname"
make
@@ -28,11 +29,8 @@ build() {
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="89912f627d239e9d0b830c97e3b35b0358ac3ea1b3b958de091318e19ee9ca0bac0a008f114682bc0ed8388e15592ffd683c4bbf1128fe7109cad16f18a1065b s6-2.13.1.0.tar.gz
-0af788e78b5840a0ed612de6d2c15bc868d4f2444063f283af1ac42aec7029af24c660abf65c7d9fa369aa1ca96bb8503ffffe37db531fdd75b80db570888a38 s6.pc.in"
+sha512sums="0ee3b319fb0731681e8823bd6c0b415c556b87819b1ca72be2ff622b4f35f87ffe7a71ccaa2c783933d76eedcde7ded1fe767ee44a63e1717b2299a2b5aa81e1 s6-2.13.2.0.tar.gz"
diff --git a/system/s6/s6.pc.in b/system/s6/s6.pc.in
deleted file mode 100644
index f01fd55ac..000000000
--- a/system/s6/s6.pc.in
+++ /dev/null
@@ -1,6 +0,0 @@
-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
diff --git a/system/skalibs/APKBUILD b/system/skalibs/APKBUILD
index d1f6e1f8d..05fc9ebde 100644
--- a/system/skalibs/APKBUILD
+++ b/system/skalibs/APKBUILD
@@ -1,7 +1,6 @@
-# Contributor: Laurent Bercot <ska-adelie@skarnet.org>
# Maintainer: Laurent Bercot <ska-adelie@skarnet.org>
pkgname=skalibs
-pkgver=2.14.3.0
+pkgver=2.14.4.0
pkgrel=0
pkgdesc="A set of general-purpose C programming libraries for skarnet.org software"
url="https://skarnet.org/software/skalibs/"
@@ -9,19 +8,19 @@ arch="all"
options="!check" # No test suite.
license="ISC"
subpackages="$pkgname-dev $pkgname-doc"
-source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz skalibs.pc.in"
+source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz"
build() {
./configure \
+ --enable-pkgconfig \
--with-sysdeps-devurandom=yes \
- --with-sysdeps-posixspawnearlyreturn=no
+ --with-sysdeps-posixspawnearlyreturn=no \
+ --with-sysdeps-procselfexe=/proc/self/exe
make
}
package() {
make DESTDIR="$pkgdir" install
- sed -e "s/@@VERSION@@/$pkgver/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/usr/share/doc"
cp -a "$builddir/doc" "$pkgdir/usr/share/doc/$pkgname"
}
@@ -32,5 +31,4 @@ dev() {
mv "$pkgdir/usr/lib/skalibs/sysdeps" "$subpkgdir/usr/lib/skalibs/"
}
-sha512sums="f40222740494425477252e78c772edda3f6cb201723558c513acb6c87d55a0f3432c918acf112c9457ed3ff0ee71bf5192f61b1c9070e668f219fd6d3f6f3bfa skalibs-2.14.3.0.tar.gz
-5771f0e72e7e7e9a45cafdf2e4508938a29ff9474845c897e383004b031ad142dee1b65d83a9a0168696782163cb4a32f82db4d7360413b433e68282cd4cc487 skalibs.pc.in"
+sha512sums="a97c9ecd62e4d751a6613c01831bff5856c5d23f8fd295d539c3280c6ffa2379e67789c728552cb4d85aa03b30af7e2499b80cb8025b52ca6d1c1746b48102b1 skalibs-2.14.4.0.tar.gz"
diff --git a/system/skalibs/skalibs.pc.in b/system/skalibs/skalibs.pc.in
deleted file mode 100644
index 33849426f..000000000
--- a/system/skalibs/skalibs.pc.in
+++ /dev/null
@@ -1,5 +0,0 @@
-Name: skalibs
-Description: The skarnet.org general-purpose C library.
-URL: https://skarnet.org/software/skalibs/
-Version: @@VERSION@@
-Libs: -lskarnet
diff --git a/system/utmps/APKBUILD b/system/utmps/APKBUILD
index b8dda2050..75c22fb25 100644
--- a/system/utmps/APKBUILD
+++ b/system/utmps/APKBUILD
@@ -1,7 +1,6 @@
-# Contributor: Laurent Bercot <ska-adelie@skarnet.org>
# Maintainer: Laurent Bercot <ska-adelie@skarnet.org>
pkgname=utmps
-pkgver=0.1.2.3
+pkgver=0.1.3.0
pkgrel=0
pkgdesc="A secure utmp/wtmp implementation"
url="https://skarnet.org/software/utmps/"
@@ -9,7 +8,7 @@ arch="all"
options="!check" # No test suite
license="ISC"
depends="execline s6"
-_skalibs_version=2.14.3
+_skalibs_version=2.14.4
depends_dev="skalibs-dev>=$_skalibs_version"
makedepends="skalibs-dev>=$_skalibs_version"
subpackages="$pkgname-dev $pkgname-libs $pkgname-doc $pkgname-openrc"
@@ -18,14 +17,15 @@ source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz
utmpd.run
wtmpd.run
btmpd.run
- utmps.initd
- utmps.pc.in"
+ utmps.initd"
build() {
./configure \
--enable-shared \
--enable-static-libc \
--libexecdir="/lib/$pkgname" \
+ --with-pkgconfig \
+ --enable-pkgconfig \
--enable-libc-includes
make
}
@@ -36,8 +36,6 @@ package() {
mkdir -p -m 0755 "$runimage/utmps" "$pkgdir/usr/share/doc"
chown utmp:utmp "$runimage/utmps"
install -D -m 0755 "$srcdir/utmps.initd" "$pkgdir/etc/init.d/utmps"
- 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"
}
@@ -62,9 +60,8 @@ openrc() {
ln -s ../../init.d/utmps "$rldir/utmps"
}
-sha512sums="41822b5ef582c86cd2439f13c88871bef2d496e6c7ae5493d9e2be70c7cf2f25656dedf045b4dbe925b1c6b3bfbadc7430a898ccc56951f096e768990a9735df utmps-0.1.2.3.tar.gz
+sha512sums="307010371d8c7d9e56e1823c599d84f44719e6050ccf30799f08d7a6c071ca2fbc46ef236d5e2422dc1b96f8a7582ae735635302c28becd6aac3263302c385d9 utmps-0.1.3.0.tar.gz
0ec30284c64c6ea9f25142c5f4a643bd48b137fe85781b650104f5137ffa4dfc35ca7be3e41e3acd3403ebe1d8c5378073afa4e2f3607d3d794fcd9f98ed51c4 utmpd.run
9e875a5cd37be531320a8e582afed2c980dd0a1bdfc2f6f3d826d5e5389fc6ab93f973ed1506edb23f4c73cf24a2357aefe856148eaacff86c2aafe376c575e2 wtmpd.run
503bdbb3d244243934b9b4e3deea0bf92a95f88417c822ad9cf6202584d4724d5e182a0d88d7f09069e435a8a97230b85d2b264736c85c893da193fd5ec34c71 btmpd.run
-89fb24ab5759b3a1162044895efbe01c7a17d505a29df0cd7141654783b7ada8e934a1ce5981218af41812cfb517263bbd608948102af40b7a41a843b7aaf6ca utmps.initd
-d5ac39af2e688b5a118302ff31f15a0ea708eff4a94e2f6631c37f77ae528d64034ada1685f302af5b09816b617aae13b3513721883c8d9fee33fe729377f435 utmps.pc.in"
+89fb24ab5759b3a1162044895efbe01c7a17d505a29df0cd7141654783b7ada8e934a1ce5981218af41812cfb517263bbd608948102af40b7a41a843b7aaf6ca utmps.initd"
diff --git a/system/utmps/utmps.pc.in b/system/utmps/utmps.pc.in
deleted file mode 100644
index ef581ec6f..000000000
--- a/system/utmps/utmps.pc.in
+++ /dev/null
@@ -1,6 +0,0 @@
-Name: utmps
-Description: A secure implementation of the utmp mechanism.
-URL: https://skarnet.org/software/utmps/
-Version: @@VERSION@@
-Requires.private: skalibs >= @@SKALIBS_VERSION@@
-Libs: -lutmps
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-07-18 05:39:17 +0000