From 884e0efe0196ae2398a186ee732e4892b279a0cf Mon Sep 17 00:00:00 2001 From: Leo Date: Tue, 6 Aug 2019 10:48:12 -0300 Subject: community/utmps: move from testing --- community/utmps/APKBUILD | 63 +++++++++++++++++++++++++++++++++++++++ community/utmps/utmpd.run | 8 +++++ community/utmps/utmps.initd | 32 ++++++++++++++++++++ community/utmps/utmps.pre-install | 6 ++++ community/utmps/utmps.pre-upgrade | 6 ++++ community/utmps/wtmpd.run | 8 +++++ testing/utmps/APKBUILD | 63 --------------------------------------- testing/utmps/utmpd.run | 8 ----- testing/utmps/utmps.initd | 32 -------------------- testing/utmps/utmps.pre-install | 6 ---- testing/utmps/utmps.pre-upgrade | 6 ---- testing/utmps/wtmpd.run | 8 ----- 12 files changed, 123 insertions(+), 123 deletions(-) create mode 100644 community/utmps/APKBUILD create mode 100644 community/utmps/utmpd.run create mode 100644 community/utmps/utmps.initd create mode 100644 community/utmps/utmps.pre-install create mode 100644 community/utmps/utmps.pre-upgrade create mode 100644 community/utmps/wtmpd.run delete mode 100644 testing/utmps/APKBUILD delete mode 100644 testing/utmps/utmpd.run delete mode 100644 testing/utmps/utmps.initd delete mode 100644 testing/utmps/utmps.pre-install delete mode 100644 testing/utmps/utmps.pre-upgrade delete mode 100644 testing/utmps/wtmpd.run diff --git a/community/utmps/APKBUILD b/community/utmps/APKBUILD new file mode 100644 index 0000000000..be7ed488c7 --- /dev/null +++ b/community/utmps/APKBUILD @@ -0,0 +1,63 @@ +# Maintainer: Laurent Bercot +# Contributor: Laurent Bercot +pkgname=utmps +pkgver=0.0.2.1 +pkgrel=1 +pkgdesc="A secure utmp/wtmp implementation" +url="https://skarnet.org/software/$pkgname/" +arch="all" +license="ISC" +depends="execline s6" +depends_dev="skalibs-dev" +makedepends="skalibs-dev" +options="!check" +subpackages="$pkgname-dev $pkgname-doc $pkgname-openrc" +source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz $pkgname.initd utmpd.run wtmpd.run" +builddir="$srcdir/$pkgname-$pkgver" +install="$pkgname.pre-install $pkgname.pre-upgrade" + +build() { + cd "$builddir" + ./configure \ + --enable-shared \ + --enable-static \ + --disable-allstatic \ + --libdir=/usr/lib \ + --libexecdir="/lib/$pkgname" \ + --with-dynlib=/lib + make +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install + mkdir -p "$pkgdir/etc/init.d" "$pkgdir/var/lib/$pkgname/services/utmpd" "$pkgdir/var/lib/$pkgname/services/wtmpd" + cp -f "$srcdir/$pkgname.initd" "$pkgdir/etc/init.d/$pkgname" + cp -f "$srcdir/utmpd.run" "$pkgdir/var/lib/$pkgname/services/utmpd/run" + echo 3 > "$pkgdir/var/lib/$pkgname/services/utmpd/notification-fd" + s6-mkfifodir -g0 -- "$pkgdir/var/lib/$pkgname/services/utmpd/event" + cp -f "$srcdir/wtmpd.run" "$pkgdir/var/lib/$pkgname/services/wtmpd/run" + echo 3 > "$pkgdir/var/lib/$pkgname/services/wtmpd/notification-fd" + s6-mkfifodir -g 0 -- "$pkgdir/var/lib/$pkgname/services/wtmpd/event" + chmod 0755 "$pkgdir/etc/init.d/$pkgname" "$pkgdir/var/lib/$pkgname/services/utmpd/run" "$pkgdir/var/lib/$pkgname/services/wtmpd/run" + mkdir -m 0700 "$pkgdir/var/lib/$pkgname/services/utmpd/supervise" "$pkgdir/var/lib/$pkgname/services/wtmpd/supervise" + dd if=/dev/zero of="$pkgdir/var/lib/$pkgname/services/utmpd/supervise/status" bs=35 count=1 + dd if=/dev/zero of="$pkgdir/var/lib/$pkgname/services/wtmpd/supervise/status" bs=35 count=1 +} + +# Remove this dev() override when musl-dev doesn't own /usr/include/utmpx.h anymore. +dev() { + default_dev + rm -f "$subpkgdir/usr/include/utmpx.h" +} + +doc() { + default_doc + mkdir -p "$subpkgdir/usr/share/doc" + cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname" +} + +sha512sums="e0ead9dc4085ce778f22831eec0f79ad251c6f5cb83afa6e52a9ab47a4a0037695e70c2ff0624da8b406a8e3c79f0c8653600bc541fad90c4e21d241c53c27aa utmps-0.0.2.1.tar.gz +437d0c52ef1ecd23775990225647c2a6ca53691fb5688ffa866a0e6db177a08fe465f2e683e8b98ba668d8ddcd4ffa0fe3939f23ded276f4ca7acaa2553b10e6 utmps.initd +0ec30284c64c6ea9f25142c5f4a643bd48b137fe85781b650104f5137ffa4dfc35ca7be3e41e3acd3403ebe1d8c5378073afa4e2f3607d3d794fcd9f98ed51c4 utmpd.run +cba4f2ec3b8f5becf3ae57eecf584745d783046ee6cf5d116322421ad5ffd074d2955da22d31d2b5b1d05f906378aae92f221d2ac95ac21b54a361fbdc0566e7 wtmpd.run" diff --git a/community/utmps/utmpd.run b/community/utmps/utmpd.run new file mode 100644 index 0000000000..47bc824a27 --- /dev/null +++ b/community/utmps/utmpd.run @@ -0,0 +1,8 @@ +#!/bin/execlineb -P + +fdmove -c 2 1 +s6-setuidgid utmp +cd /run/utmps +fdmove 1 3 +s6-ipcserver -1 -- .utmpd-socket +utmps-utmpd diff --git a/community/utmps/utmps.initd b/community/utmps/utmps.initd new file mode 100644 index 0000000000..db4570031c --- /dev/null +++ b/community/utmps/utmps.initd @@ -0,0 +1,32 @@ +#!/sbin/openrc-run +# Copyright 2018 Laurent Bercot +# Distributed under the terms of the ISC License. +# +# OpenRC is only used here to trigger the s6 mechanisms. + +depend() { + need s6 +} + +start() { + ebegin "Starting utmpd and wtmpd services" + mkdir -p -m 0755 /run/utmps + chown utmp:utmp /run/utmps + + # OpenRC has no readiness notification framework, so it can run this before s6 is ready. + # To avoid the race (yes, I have hit it), do a polling check here. + # If you want to avoid unnecessary delays, switch to a real service manager like s6-rc. + until test -e /run/service/.s6-svscan/control ; do sleep 1 ; done + + ln -nsf /var/lib/utmps/services/utmpd /run/service/utmpd + ln -nsf /var/lib/utmps/services/wtmpd /run/service/wtmpd + s6-svlisten -U -t 5000 -- /var/lib/utmps/services/utmpd /var/lib/utmps/services/wtmpd "" s6-svscanctl -an /run/service + eend $? +} + +stop() { + ebegin "Stopping utmpd and wtmpd services" + rm -f /run/service/utmpd /run/service/wtmpd + s6-svlisten -d -t 5000 -- /var/lib/utmps/services/utmpd /var/lib/utmps/services/wtmpd "" s6-svscanctl -an /run/service + eend $? +} diff --git a/community/utmps/utmps.pre-install b/community/utmps/utmps.pre-install new file mode 100644 index 0000000000..6db960686c --- /dev/null +++ b/community/utmps/utmps.pre-install @@ -0,0 +1,6 @@ +#!/bin/sh + +addgroup -S utmp 2>/dev/null +adduser -S -D -H -s /bin/false -G utmp -g utmp utmp 2>/dev/null +echo 'Run "rc-update add s6 default; rc-update add utmps default" to automatically start the utmpd and wtmpd services at boot time.' 1>&2 +exit 0 diff --git a/community/utmps/utmps.pre-upgrade b/community/utmps/utmps.pre-upgrade new file mode 100644 index 0000000000..6db960686c --- /dev/null +++ b/community/utmps/utmps.pre-upgrade @@ -0,0 +1,6 @@ +#!/bin/sh + +addgroup -S utmp 2>/dev/null +adduser -S -D -H -s /bin/false -G utmp -g utmp utmp 2>/dev/null +echo 'Run "rc-update add s6 default; rc-update add utmps default" to automatically start the utmpd and wtmpd services at boot time.' 1>&2 +exit 0 diff --git a/community/utmps/wtmpd.run b/community/utmps/wtmpd.run new file mode 100644 index 0000000000..ab5a40641a --- /dev/null +++ b/community/utmps/wtmpd.run @@ -0,0 +1,8 @@ +#!/bin/execlineb -P + +fdmove -c 2 1 +s6-setuidgid utmp +cd /run/utmps +fdmove 1 3 +s6-ipcserver -1 -- .wtmpd-socket +utmps-wtmpd diff --git a/testing/utmps/APKBUILD b/testing/utmps/APKBUILD deleted file mode 100644 index be7ed488c7..0000000000 --- a/testing/utmps/APKBUILD +++ /dev/null @@ -1,63 +0,0 @@ -# Maintainer: Laurent Bercot -# Contributor: Laurent Bercot -pkgname=utmps -pkgver=0.0.2.1 -pkgrel=1 -pkgdesc="A secure utmp/wtmp implementation" -url="https://skarnet.org/software/$pkgname/" -arch="all" -license="ISC" -depends="execline s6" -depends_dev="skalibs-dev" -makedepends="skalibs-dev" -options="!check" -subpackages="$pkgname-dev $pkgname-doc $pkgname-openrc" -source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz $pkgname.initd utmpd.run wtmpd.run" -builddir="$srcdir/$pkgname-$pkgver" -install="$pkgname.pre-install $pkgname.pre-upgrade" - -build() { - cd "$builddir" - ./configure \ - --enable-shared \ - --enable-static \ - --disable-allstatic \ - --libdir=/usr/lib \ - --libexecdir="/lib/$pkgname" \ - --with-dynlib=/lib - make -} - -package() { - cd "$builddir" - make DESTDIR="$pkgdir" install - mkdir -p "$pkgdir/etc/init.d" "$pkgdir/var/lib/$pkgname/services/utmpd" "$pkgdir/var/lib/$pkgname/services/wtmpd" - cp -f "$srcdir/$pkgname.initd" "$pkgdir/etc/init.d/$pkgname" - cp -f "$srcdir/utmpd.run" "$pkgdir/var/lib/$pkgname/services/utmpd/run" - echo 3 > "$pkgdir/var/lib/$pkgname/services/utmpd/notification-fd" - s6-mkfifodir -g0 -- "$pkgdir/var/lib/$pkgname/services/utmpd/event" - cp -f "$srcdir/wtmpd.run" "$pkgdir/var/lib/$pkgname/services/wtmpd/run" - echo 3 > "$pkgdir/var/lib/$pkgname/services/wtmpd/notification-fd" - s6-mkfifodir -g 0 -- "$pkgdir/var/lib/$pkgname/services/wtmpd/event" - chmod 0755 "$pkgdir/etc/init.d/$pkgname" "$pkgdir/var/lib/$pkgname/services/utmpd/run" "$pkgdir/var/lib/$pkgname/services/wtmpd/run" - mkdir -m 0700 "$pkgdir/var/lib/$pkgname/services/utmpd/supervise" "$pkgdir/var/lib/$pkgname/services/wtmpd/supervise" - dd if=/dev/zero of="$pkgdir/var/lib/$pkgname/services/utmpd/supervise/status" bs=35 count=1 - dd if=/dev/zero of="$pkgdir/var/lib/$pkgname/services/wtmpd/supervise/status" bs=35 count=1 -} - -# Remove this dev() override when musl-dev doesn't own /usr/include/utmpx.h anymore. -dev() { - default_dev - rm -f "$subpkgdir/usr/include/utmpx.h" -} - -doc() { - default_doc - mkdir -p "$subpkgdir/usr/share/doc" - cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname" -} - -sha512sums="e0ead9dc4085ce778f22831eec0f79ad251c6f5cb83afa6e52a9ab47a4a0037695e70c2ff0624da8b406a8e3c79f0c8653600bc541fad90c4e21d241c53c27aa utmps-0.0.2.1.tar.gz -437d0c52ef1ecd23775990225647c2a6ca53691fb5688ffa866a0e6db177a08fe465f2e683e8b98ba668d8ddcd4ffa0fe3939f23ded276f4ca7acaa2553b10e6 utmps.initd -0ec30284c64c6ea9f25142c5f4a643bd48b137fe85781b650104f5137ffa4dfc35ca7be3e41e3acd3403ebe1d8c5378073afa4e2f3607d3d794fcd9f98ed51c4 utmpd.run -cba4f2ec3b8f5becf3ae57eecf584745d783046ee6cf5d116322421ad5ffd074d2955da22d31d2b5b1d05f906378aae92f221d2ac95ac21b54a361fbdc0566e7 wtmpd.run" diff --git a/testing/utmps/utmpd.run b/testing/utmps/utmpd.run deleted file mode 100644 index 47bc824a27..0000000000 --- a/testing/utmps/utmpd.run +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/execlineb -P - -fdmove -c 2 1 -s6-setuidgid utmp -cd /run/utmps -fdmove 1 3 -s6-ipcserver -1 -- .utmpd-socket -utmps-utmpd diff --git a/testing/utmps/utmps.initd b/testing/utmps/utmps.initd deleted file mode 100644 index db4570031c..0000000000 --- a/testing/utmps/utmps.initd +++ /dev/null @@ -1,32 +0,0 @@ -#!/sbin/openrc-run -# Copyright 2018 Laurent Bercot -# Distributed under the terms of the ISC License. -# -# OpenRC is only used here to trigger the s6 mechanisms. - -depend() { - need s6 -} - -start() { - ebegin "Starting utmpd and wtmpd services" - mkdir -p -m 0755 /run/utmps - chown utmp:utmp /run/utmps - - # OpenRC has no readiness notification framework, so it can run this before s6 is ready. - # To avoid the race (yes, I have hit it), do a polling check here. - # If you want to avoid unnecessary delays, switch to a real service manager like s6-rc. - until test -e /run/service/.s6-svscan/control ; do sleep 1 ; done - - ln -nsf /var/lib/utmps/services/utmpd /run/service/utmpd - ln -nsf /var/lib/utmps/services/wtmpd /run/service/wtmpd - s6-svlisten -U -t 5000 -- /var/lib/utmps/services/utmpd /var/lib/utmps/services/wtmpd "" s6-svscanctl -an /run/service - eend $? -} - -stop() { - ebegin "Stopping utmpd and wtmpd services" - rm -f /run/service/utmpd /run/service/wtmpd - s6-svlisten -d -t 5000 -- /var/lib/utmps/services/utmpd /var/lib/utmps/services/wtmpd "" s6-svscanctl -an /run/service - eend $? -} diff --git a/testing/utmps/utmps.pre-install b/testing/utmps/utmps.pre-install deleted file mode 100644 index 6db960686c..0000000000 --- a/testing/utmps/utmps.pre-install +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -addgroup -S utmp 2>/dev/null -adduser -S -D -H -s /bin/false -G utmp -g utmp utmp 2>/dev/null -echo 'Run "rc-update add s6 default; rc-update add utmps default" to automatically start the utmpd and wtmpd services at boot time.' 1>&2 -exit 0 diff --git a/testing/utmps/utmps.pre-upgrade b/testing/utmps/utmps.pre-upgrade deleted file mode 100644 index 6db960686c..0000000000 --- a/testing/utmps/utmps.pre-upgrade +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -addgroup -S utmp 2>/dev/null -adduser -S -D -H -s /bin/false -G utmp -g utmp utmp 2>/dev/null -echo 'Run "rc-update add s6 default; rc-update add utmps default" to automatically start the utmpd and wtmpd services at boot time.' 1>&2 -exit 0 diff --git a/testing/utmps/wtmpd.run b/testing/utmps/wtmpd.run deleted file mode 100644 index ab5a40641a..0000000000 --- a/testing/utmps/wtmpd.run +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/execlineb -P - -fdmove -c 2 1 -s6-setuidgid utmp -cd /run/utmps -fdmove 1 3 -s6-ipcserver -1 -- .wtmpd-socket -utmps-wtmpd -- cgit v1.2.3