diff options
Diffstat (limited to 'system/utmps')
| -rw-r--r-- | system/utmps/APKBUILD | 60 | ||||
| -rw-r--r-- | system/utmps/utmps.initd | 22 |
2 files changed, 27 insertions, 55 deletions
diff --git a/system/utmps/APKBUILD b/system/utmps/APKBUILD index ccdc0c615..7ae3849ed 100644 --- a/system/utmps/APKBUILD +++ b/system/utmps/APKBUILD @@ -1,17 +1,18 @@ # Contributor: Laurent Bercot <ska-adelie@skarnet.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=utmps -pkgver=0.1.2.0 -pkgrel=0 +pkgver=0.1.2.2 +pkgrel=2 pkgdesc="A secure utmp/wtmp implementation" -url="https://skarnet.org/software/$pkgname/" +url="https://skarnet.org/software/utmps/" arch="all" options="!check" # No test suite license="ISC" depends="execline s6" -_skalibs_version=2.12 +_skalibs_version=2.14 +depends_dev="skalibs-dev>=$_skalibs_version" makedepends="skalibs-dev>=$_skalibs_version" -subpackages="$pkgname-libs $pkgname-dev $pkgname-libs-dev:libsdev $pkgname-doc $pkgname-openrc" +subpackages="$pkgname-dev $pkgname-libs $pkgname-doc $pkgname-openrc" install="$pkgname.post-upgrade" source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz utmpd.run @@ -35,64 +36,35 @@ build() { package() { make DESTDIR="$pkgdir" install runimage="$pkgdir/etc/s6-linux-init/current/run-image" - mkdir -p -m 0755 "$runimage/utmps" "$runimage/service/utmpd" + mkdir -p -m 0755 "$runimage/utmps" "$pkgdir/usr/share/doc" chown utmp:utmp "$runimage/utmps" - cp -f "$srcdir/utmpd.run" "$runimage/service/utmpd/run" - echo 3 > "$runimage/service/utmpd/notification-fd" - chmod 0755 "$runimage/service/utmpd/run" - install -D -m755 "$srcdir/utmps.initd" "$pkgdir/etc/init.d/utmps" + install -D -m 0755 "$srcdir/utmps.initd" "$pkgdir/etc/init.d/utmps" + cp -a "$builddir/doc" "$pkgdir/usr/share/doc/$pkgname" } openrc() { rldir="$subpkgdir"/etc/runlevels/boot subrunimage="$subpkgdir/etc/s6-linux-init/current/run-image" default_openrc - mkdir -p -m 0755 "$rldir" "$subpkgdir/var/log/wtmpd" "$subrunimage/service/wtmpd" "$subrunimage/service/btmpd" + mkdir -p -m 0755 "$rldir" "$subpkgdir/var/log/wtmpd" "$subrunimage/service/utmpd" "$subrunimage/service/wtmpd" "$subrunimage/service/btmpd" + cp -f "$srcdir/utmpd.run" "$subrunimage/service/utmpd/run" + echo 3 > "$subrunimage/service/utmpd/notification-fd" + touch "$subrunimage/service/utmpd/down" cp -f "$srcdir/wtmpd.run" "$subrunimage/service/wtmpd/run" echo 3 > "$subrunimage/service/wtmpd/notification-fd" touch "$subrunimage/service/wtmpd/down" cp -f "$srcdir/btmpd.run" "$subrunimage/service/btmpd/run" echo 3 > "$subrunimage/service/btmpd/notification-fd" touch "$subrunimage/service/btmpd/down" - chmod 0755 "$subrunimage/service/wtmpd/run" "$subrunimage/service/btmpd/run" + chmod 0755 "$subrunimage/service/utmpd/run" "$subrunimage/service/wtmpd/run" "$subrunimage/service/btmpd/run" chown utmp:utmp "$subpkgdir/var/log/wtmpd" ln -s wtmpd/wtmp "$subpkgdir/var/log/wtmp" ln -s wtmpd/btmp "$subpkgdir/var/log/btmp" ln -s ../../init.d/utmps "$rldir/utmps" } -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" - install_if="dev $pkgname=$pkgver-r$pkgrel" - 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() { - 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="a89c054584680ec1abeb145d244488433cbb3e837fbd77e8914c402e84ce7bc50615c8cf13e7f97316096417fcd5ed84a24f618b4714c640cd8e39fb6749b00d utmps-0.1.2.0.tar.gz +sha512sums="57a73658ecb947af9dfad7a5e2931660ad1b8fa61d36c803c373e8aba13e9afa8398c1522765f5ea2b5df87d942cea17062faf30f589afa6acc744ff3ae4a409 utmps-0.1.2.2.tar.gz 0ec30284c64c6ea9f25142c5f4a643bd48b137fe85781b650104f5137ffa4dfc35ca7be3e41e3acd3403ebe1d8c5378073afa4e2f3607d3d794fcd9f98ed51c4 utmpd.run 9e875a5cd37be531320a8e582afed2c980dd0a1bdfc2f6f3d826d5e5389fc6ab93f973ed1506edb23f4c73cf24a2357aefe856148eaacff86c2aafe376c575e2 wtmpd.run 503bdbb3d244243934b9b4e3deea0bf92a95f88417c822ad9cf6202584d4724d5e182a0d88d7f09069e435a8a97230b85d2b264736c85c893da193fd5ec34c71 btmpd.run -3a658c7b078f3df4d20192b0719c2c8ac5b08083c7c36807ef39ab67232ffacc64429c63fba27a06d509048b3ebf47128885ef34aa4b6fac1ad8df894cbb604a utmps.initd" +89fb24ab5759b3a1162044895efbe01c7a17d505a29df0cd7141654783b7ada8e934a1ce5981218af41812cfb517263bbd608948102af40b7a41a843b7aaf6ca utmps.initd" diff --git a/system/utmps/utmps.initd b/system/utmps/utmps.initd index c6f884a52..1131ca199 100644 --- a/system/utmps/utmps.initd +++ b/system/utmps/utmps.initd @@ -1,7 +1,7 @@ #!/sbin/openrc-run -# Copyright 2022 Adélie Linux +# Copyright 2022-2023 Adélie Linux -description="boot script for the utmps wtmp and btmp services" +description="boot script for the utmps utmp, wtmp and btmp services" depend() { @@ -12,19 +12,19 @@ depend() stop() { - ebegin "Stopping the utmps wtmp and btmp services" - touch /run/service/wtmpd/down /run/service/btmpd/down - s6-svc -d /run/service/btmpd - s6-svc -d /run/service/wtmpd + ebegin "Stopping the utmps services" + s6-svc -D /run/service/btmpd + s6-svc -D /run/service/wtmpd + s6-svc -D /run/service/utmpd eend $? } start() { - ebegin "Starting the utmps wtmp and btmp services" - rm -f /run/service/wtmpd/down /run/service/btmpd/down - s6-svlisten -U " /run/service/wtmpd" " /run/service/btmpd" "" \ - foreground " s6-svc" " -u" " /run/service/wtmpd" "" \ - s6-svc -u /run/service/btmpd + ebegin "Starting the utmps services" + s6-svlisten -U " /run/service/utmpd" " /run/service/wtmpd" " /run/service/btmpd" "" \ + foreground " s6-svc" " -U" " /run/service/utmpd" "" \ + foreground " s6-svc" " -U" " /run/service/wtmpd" "" \ + s6-svc -U /run/service/btmpd eend $? } |