summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurent Bercot <ska-adelie@skarnet.org>2018-08-18 13:44:03 +0000
committerLaurent Bercot <ska-adelie@skarnet.org>2018-08-18 13:44:26 +0000
commit7ef2ed32d3d4442463f39d31380cff9432608231 (patch)
tree88d70d5e46f0896d85e2242d05c9fd6bf99a6d17
parent21439e797102a2e2427b01d53f357a378369aa37 (diff)
downloadpackages-7ef2ed32d3d4442463f39d31380cff9432608231.tar.gz
packages-7ef2ed32d3d4442463f39d31380cff9432608231.tar.bz2
packages-7ef2ed32d3d4442463f39d31380cff9432608231.tar.xz
packages-7ef2ed32d3d4442463f39d31380cff9432608231.zip
system/utmps: the utmp user and group are already hardcoded in
-rw-r--r--system/utmps/APKBUILD4
-rw-r--r--system/utmps/utmps.pre-install5
-rw-r--r--system/utmps/utmps.pre-upgrade5
3 files changed, 2 insertions, 12 deletions
diff --git a/system/utmps/APKBUILD b/system/utmps/APKBUILD
index 291727141..2306b8be3 100644
--- a/system/utmps/APKBUILD
+++ b/system/utmps/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Laurent Bercot <ska-adelie@skarnet.org>
pkgname=utmps
pkgver=0.0.1.3
-pkgrel=1
+pkgrel=2
pkgdesc="A secure utmp/wtmp implementation"
url="https://skarnet.org/software/$pkgname/"
arch="all"
@@ -12,7 +12,7 @@ depends="execline s6"
depends_dev="skalibs-dev"
makedepends="skalibs-dev>=2.7"
subpackages="$pkgname-dev $pkgname-doc"
-install="$pkgname.pre-install $pkgname.pre-upgrade $pkgname.post-upgrade"
+install="$pkgname.post-upgrade"
source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz
utmpd.run
wtmpd.run"
diff --git a/system/utmps/utmps.pre-install b/system/utmps/utmps.pre-install
deleted file mode 100644
index 10b5b31ff..000000000
--- a/system/utmps/utmps.pre-install
+++ /dev/null
@@ -1,5 +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
-exit 0
diff --git a/system/utmps/utmps.pre-upgrade b/system/utmps/utmps.pre-upgrade
deleted file mode 100644
index 10b5b31ff..000000000
--- a/system/utmps/utmps.pre-upgrade
+++ /dev/null
@@ -1,5 +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
-exit 0