main/*: always use /sbin/nologin as no login shell

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"

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

main/musl-nscd/APKBUILD

@@ -1,7 +1,7 @@
 # Maintainer: Michael Aldridge <maldridge@voidlinux.org>
 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"

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

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"

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

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

main/s6/APKBUILD

@@ -2,7 +2,7 @@
 # Maintainer: Laurent Bercot <ska-devel@skarnet.org>
 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"

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

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

main/umurmur/APKBUILD

@@ -2,7 +2,7 @@
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 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"

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

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"

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