From de328c829154ca59857572e181ea1a2d17957b0d Mon Sep 17 00:00:00 2001 From: Sertonix Date: Mon, 8 Jan 2024 11:31:54 +0100 Subject: [PATCH] main/*: always use /sbin/nologin as no login shell --- main/haproxy/APKBUILD | 2 +- main/haproxy/haproxy.pre-install | 2 +- main/musl-nscd/APKBUILD | 2 +- main/musl-nscd/musl-nscd.pre-install | 2 +- main/redis/APKBUILD | 2 +- main/redis/redis.pre-install | 2 +- main/rng-tools/rng-tools.pre-install | 2 +- main/s6/APKBUILD | 2 +- main/s6/s6.pre-install | 2 +- main/sanlock/sanlock.pre-install | 2 +- main/umurmur/APKBUILD | 2 +- main/umurmur/umurmur.post-install | 2 +- main/utmps/APKBUILD | 2 +- main/utmps/utmps.pre-install | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/main/haproxy/APKBUILD b/main/haproxy/APKBUILD index a7ffde4dc2a..6b2621e1908 100644 --- a/main/haproxy/APKBUILD +++ b/main/haproxy/APKBUILD @@ -6,7 +6,7 @@ pkgname=haproxy # Using LTS versions is easier to keep it in good shape for stable releases pkgver=2.8.7 _pkgmajorver=${pkgver%.*} -pkgrel=0 +pkgrel=1 pkgdesc="A TCP/HTTP reverse proxy for high availability environments" url="https://www.haproxy.org/" arch="all" diff --git a/main/haproxy/haproxy.pre-install b/main/haproxy/haproxy.pre-install index 85cefc98146..c1d34dbc25e 100644 --- a/main/haproxy/haproxy.pre-install +++ b/main/haproxy/haproxy.pre-install @@ -1,7 +1,7 @@ #!/bin/sh addgroup -S haproxy 2>/dev/null -adduser -S -D -H -h /var/lib/haproxy -s /bin/false \ +adduser -S -D -H -h /var/lib/haproxy -s /sbin/nologin \ -G haproxy -g haproxy haproxy 2>/dev/null # move config to new location diff --git a/main/musl-nscd/APKBUILD b/main/musl-nscd/APKBUILD index 3e7bf007a48..baab60de3c0 100644 --- a/main/musl-nscd/APKBUILD +++ b/main/musl-nscd/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Michael Aldridge pkgname=musl-nscd pkgver=1.1.1 -pkgrel=3 +pkgrel=4 pkgdesc="Implementation of nscd for nsswitch modules for musl" url="https://github.com/pikhq/musl-nscd" arch="all" diff --git a/main/musl-nscd/musl-nscd.pre-install b/main/musl-nscd/musl-nscd.pre-install index 45e214e5ad6..351c086c8a4 100644 --- a/main/musl-nscd/musl-nscd.pre-install +++ b/main/musl-nscd/musl-nscd.pre-install @@ -1,6 +1,6 @@ #!/bin/sh addgroup -S nscd 2>/dev/null -adduser -S -D -H -s /bin/false -G nscd -g nscd nscd 2>/dev/null +adduser -S -D -H -s /sbin/nologin -G nscd -g nscd nscd 2>/dev/null exit 0 diff --git a/main/redis/APKBUILD b/main/redis/APKBUILD index 213bc1c56e5..b6b9fb91d1b 100644 --- a/main/redis/APKBUILD +++ b/main/redis/APKBUILD @@ -4,7 +4,7 @@ pkgname=redis # CAUTION: Do not upgrade to 7.3+ (non-free license). pkgver=7.2.4 -pkgrel=0 +pkgrel=1 pkgdesc="Advanced key-value store" url="https://redis.io/" arch="all" diff --git a/main/redis/redis.pre-install b/main/redis/redis.pre-install index f7321312665..22622e58400 100644 --- a/main/redis/redis.pre-install +++ b/main/redis/redis.pre-install @@ -1,6 +1,6 @@ #!/bin/sh addgroup -S redis 2>/dev/null -adduser -S -D -H -h /var/lib/redis -s /bin/false -G redis -g redis redis 2>/dev/null +adduser -S -D -H -h /var/lib/redis -s /sbin/nologin -G redis -g redis redis 2>/dev/null exit 0 diff --git a/main/rng-tools/rng-tools.pre-install b/main/rng-tools/rng-tools.pre-install index 02fe2e0cc66..3ddcf93115e 100644 --- a/main/rng-tools/rng-tools.pre-install +++ b/main/rng-tools/rng-tools.pre-install @@ -1,7 +1,7 @@ #!/bin/sh addgroup -S rngd 2>/dev/null -adduser -S -D -H -h /dev/null -s /bin/nologin -G rngd \ +adduser -S -D -H -h /dev/null -s /sbin/nologin -G rngd \ -g "rngd" rngd 2>/dev/null exit 0 diff --git a/main/s6/APKBUILD b/main/s6/APKBUILD index c9c52b7bb15..f458f368a86 100644 --- a/main/s6/APKBUILD +++ b/main/s6/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Laurent Bercot pkgname=s6 pkgver=2.12.0.3 -pkgrel=1 +pkgrel=2 pkgdesc="skarnet.org's small & secure supervision software suite." url=https://skarnet.org/software/s6/ arch="all" diff --git a/main/s6/s6.pre-install b/main/s6/s6.pre-install index 614364261b9..6337333a93b 100644 --- a/main/s6/s6.pre-install +++ b/main/s6/s6.pre-install @@ -1,5 +1,5 @@ #!/bin/sh addgroup -S catchlog 2>/dev/null -adduser -S -D -h / -H -s /bin/false -G catchlog -g catchlog catchlog 2>/dev/null +adduser -S -D -h / -H -s /sbin/nologin -G catchlog -g catchlog catchlog 2>/dev/null exit 0 diff --git a/main/sanlock/sanlock.pre-install b/main/sanlock/sanlock.pre-install index 25b72e99bb1..f77b38e2562 100644 --- a/main/sanlock/sanlock.pre-install +++ b/main/sanlock/sanlock.pre-install @@ -1,7 +1,7 @@ #!/bin/sh addgroup -S sanlock 2>/dev/null -adduser -S -D -H -s /bin/false -G sanlock -g sanlock sanlock 2>/dev/null +adduser -S -D -H -s /sbin/nologin -G sanlock -g sanlock sanlock 2>/dev/null addgroup sanlock disk 2>/dev/null exit 0 diff --git a/main/umurmur/APKBUILD b/main/umurmur/APKBUILD index f00b2a028c5..4626dd35ef2 100644 --- a/main/umurmur/APKBUILD +++ b/main/umurmur/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Leonardo Arena pkgname=umurmur pkgver=0.2.20 -pkgrel=5 +pkgrel=6 pkgdesc="Minimalistic Mumble server primarily targeted to run on routers" url="https://umurmur.net/" arch="all" diff --git a/main/umurmur/umurmur.post-install b/main/umurmur/umurmur.post-install index adff9264e41..aa8c0ab0f61 100644 --- a/main/umurmur/umurmur.post-install +++ b/main/umurmur/umurmur.post-install @@ -1,6 +1,6 @@ #!/bin/sh addgroup -S umurmur 2>/dev/null -adduser -S -D -h /var/run/umurmurd -s /bin/false -G umurmur -g umurmur umurmur 2>/dev/null +adduser -S -D -h /var/run/umurmurd -s /sbin/nologin -G umurmur -g umurmur umurmur 2>/dev/null exit 0 diff --git a/main/utmps/APKBUILD b/main/utmps/APKBUILD index 642b5c2c866..a011c9d3a32 100644 --- a/main/utmps/APKBUILD +++ b/main/utmps/APKBUILD @@ -9,7 +9,7 @@ pkgname=utmps # - openssh # - util-linux pkgver=0.1.2.2 -pkgrel=0 +pkgrel=1 pkgdesc="A secure utmp/wtmp implementation" url=https://skarnet.org/software/utmps/ arch="all" diff --git a/main/utmps/utmps.pre-install b/main/utmps/utmps.pre-install index 10b5b31ff06..fd7b522bcfd 100644 --- a/main/utmps/utmps.pre-install +++ b/main/utmps/utmps.pre-install @@ -1,5 +1,5 @@ #!/bin/sh addgroup -S utmp 2>/dev/null -adduser -S -D -H -s /bin/false -G utmp -g utmp utmp 2>/dev/null +adduser -S -D -H -s /sbin/nologin -G utmp -g utmp utmp 2>/dev/null exit 0