aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorPrzemyslaw Pawelczyk <przemoc@zoho.com>2016-04-23 13:13:37 +0200
committerNatanael Copa <ncopa@alpinelinux.org>2016-04-25 06:53:54 +0000
commitccc056dbf9d3fdeef2a8e8abc00f9d2cddc5348e (patch)
tree75162e9b7b80a8576e2044f2e55497d12a108984 /main
parent2a573734b692ce27e4809e47e514ca0dfffaa970 (diff)
downloadaports-ccc056dbf9d3fdeef2a8e8abc00f9d2cddc5348e.tar.gz
aports-ccc056dbf9d3fdeef2a8e8abc00f9d2cddc5348e.tar.bz2
aports-ccc056dbf9d3fdeef2a8e8abc00f9d2cddc5348e.tar.xz
Add lacking -S option (system) to adduser/addgroup in scripts.
Groups and users created by packages shouldn't use high ids by default (unless explicitly requested), to distinguish them from groups and users created by administrators for humans. Following 41 files lacked -S next to addgroup: - community/sword/sword.pre-install - main/amavisd-new/amavisd-new.pre-install - main/chrony/chrony.pre-install - main/cvechecker/cvechecker.pre-install - main/dnsmasq/dnsmasq.pre-install - main/freeradius/freeradius.pre-install - main/gdnsd/gdnsd.pre-install - main/haproxy/haproxy.pre-install - main/haproxy/haproxy.pre-upgrade - main/kamailio/kamailio.pre-install - main/logcheck/logcheck.pre-install - main/mlmmj/mlmmj.pre-install - main/nrpe/nrpe.pre-install - main/open-vm-tools/open-vm-tools.pre-install - main/postgrey/postgrey.pre-install - main/privoxy/privoxy.pre-install - main/redis/redis.pre-install - main/samba/winbind.pre-install - main/sircbot/sircbot.pre-install - main/smokeping/smokeping.pre-install - main/squark/squark.post-install - main/squid/squid.pre-install - main/squid/squid.pre-upgrade - main/subversion/subversion.pre-install - main/trac/trac.pre-install - main/vsftpd/vsftpd.pre-install - main/zabbix/zabbix-agent.pre-install - testing/3proxy/3proxy.pre-install - testing/cluster-glue/cluster-glue.pre-install - testing/elasticsearch/elasticsearch.pre-install - testing/emby/emby.pre-install - testing/gdnsd/gdnsd.pre-install - testing/icinga2/icinga2.pre-install - testing/lusca/lusca.pre-install - testing/lusca/lusca.pre-upgrade - testing/mongodb/mongodb.pre-install - testing/openxcap/openxcap.pre-install - testing/prosody/prosody.pre-install - testing/rancid/rancid.pre-install - testing/rutorrent/rutorrent.pre-install - testing/zabbix/zabbix-agent.pre-install Following 60 files lacked -S next to adduser: - community/caddy/caddy.pre-install - community/domoticz/domoticz.pre-install - community/minetest/minetest-server.pre-install - community/oscam/oscam.pre-install - community/seafile/seafile-server.pre-install - community/syncthing/syncthing.pre-install - main/apache2/apache2.pre-install - main/aports-build/aports-build.pre-install - main/atheme-iris/atheme-iris.pre-install - main/bind/bind.pre-install - main/clamav/clamav-db.pre-install - main/clamsmtp/clamsmtp.pre-install - main/clamsmtp/clamsmtp.pre-upgrade - main/coova-chilli/coova-chilli.pre-install - main/cvechecker/cvechecker.pre-install - main/dhcp/dhcp.pre-install - main/distcc/distcc.pre-install - main/djbdns/dnscache.pre-install - main/djbdns/tinydns.pre-install - main/dovecot/dovecot.pre-install - main/ez-ipupdate/ez-ipupdate.pre-install - main/fetchmail/fetchmail.pre-install - main/freeswitch/freeswitch.pre-install - main/gitolite/gitolite.pre-install - main/gnats/gnats.pre-install - main/gross/gross.pre-install - main/icecast/icecast.pre-install - main/kamailio/kamailio.pre-install - main/lighttpd/lighttpd.pre-install - main/mariadb/mariadb.pre-install - main/memcached/memcached.pre-install - main/ngircd/ngircd.pre-install - main/nrpe/nrpe.pre-install - main/openntpd/openntpd.pre-install - main/postgrey/postgrey.pre-install - main/snort/snort.pre-install - main/squid/squid.pre-install - main/squid/squid.pre-upgrade - main/subversion/subversion.pre-install - main/trac/trac.pre-install - main/transmission/transmission-daemon.pre-install - main/ympd/ympd.pre-install - main/znc/znc.pre-install - testing/at/at.pre-install - testing/buildbot-slave/buildbot-slave.pre-install - testing/buildbot/buildbot.pre-install - testing/clapf/clapf.pre-install - testing/cluster-glue/cluster-glue.pre-install - testing/dbmail/dbmail.pre-install - testing/dspam/dspam.pre-install - testing/ejabberd/ejabberd.pre-install - testing/emby/emby.pre-install - testing/mongodb/mongodb.pre-install - testing/opensips/opensips.pre-install - testing/pdns/pdns.pre-install - testing/prosody/prosody.pre-install - testing/qpage/qpage.pre-install - testing/rrdbot/rrdbot.pre-install - testing/wt/wt.pre-install - unmaintained/ejabberd-git/ejabberd-git.pre-install
Diffstat (limited to 'main')
-rwxr-xr-xmain/amavisd-new/amavisd-new.pre-install2
-rw-r--r--main/apache2/apache2.pre-install2
-rw-r--r--main/aports-build/aports-build.pre-install2
-rw-r--r--main/atheme-iris/atheme-iris.pre-install2
-rw-r--r--main/bind/bind.pre-install2
-rw-r--r--main/chrony/chrony.pre-install2
-rw-r--r--main/clamav/clamav-db.pre-install2
-rw-r--r--main/clamsmtp/clamsmtp.pre-install2
-rw-r--r--main/clamsmtp/clamsmtp.pre-upgrade2
-rw-r--r--main/coova-chilli/coova-chilli.pre-install2
-rw-r--r--main/cvechecker/cvechecker.pre-install4
-rw-r--r--main/dhcp/dhcp.pre-install2
-rw-r--r--main/distcc/distcc.pre-install2
-rw-r--r--main/djbdns/dnscache.pre-install2
-rw-r--r--main/djbdns/tinydns.pre-install2
-rw-r--r--main/dnsmasq/dnsmasq.pre-install2
-rw-r--r--main/dovecot/dovecot.pre-install4
-rw-r--r--main/ez-ipupdate/ez-ipupdate.pre-install2
-rw-r--r--main/fetchmail/fetchmail.pre-install2
-rw-r--r--main/freeradius/freeradius.pre-install2
-rwxr-xr-xmain/freeswitch/freeswitch.pre-install2
-rw-r--r--main/gdnsd/gdnsd.pre-install2
-rw-r--r--main/gitolite/gitolite.pre-install2
-rw-r--r--main/gnats/gnats.pre-install2
-rw-r--r--main/gross/gross.pre-install2
-rw-r--r--main/haproxy/haproxy.pre-install2
-rw-r--r--main/haproxy/haproxy.pre-upgrade2
-rw-r--r--main/icecast/icecast.pre-install2
-rw-r--r--main/kamailio/kamailio.pre-install4
-rw-r--r--main/lighttpd/lighttpd.pre-install2
-rw-r--r--main/logcheck/logcheck.pre-install2
-rw-r--r--main/mariadb/mariadb.pre-install2
-rw-r--r--main/memcached/memcached.pre-install2
-rw-r--r--main/mlmmj/mlmmj.pre-install2
-rw-r--r--main/ngircd/ngircd.pre-install2
-rw-r--r--main/nrpe/nrpe.pre-install4
-rw-r--r--main/open-vm-tools/open-vm-tools.pre-install2
-rw-r--r--main/openntpd/openntpd.pre-install2
-rw-r--r--main/postgrey/postgrey.pre-install4
-rw-r--r--main/privoxy/privoxy.pre-install2
-rw-r--r--main/redis/redis.pre-install2
-rw-r--r--main/samba/winbind.pre-install2
-rw-r--r--main/sircbot/sircbot.pre-install2
-rw-r--r--main/smokeping/smokeping.pre-install2
-rw-r--r--main/snort/snort.pre-install2
-rwxr-xr-xmain/squark/squark.post-install2
-rw-r--r--main/squid/squid.pre-install4
-rw-r--r--main/squid/squid.pre-upgrade4
-rw-r--r--main/subversion/subversion.pre-install4
-rw-r--r--main/trac/trac.pre-install4
-rw-r--r--main/transmission/transmission-daemon.pre-install2
-rwxr-xr-xmain/vsftpd/vsftpd.pre-install2
-rw-r--r--main/ympd/ympd.pre-install2
-rw-r--r--main/zabbix/zabbix-agent.pre-install2
-rw-r--r--main/znc/znc.pre-install2
55 files changed, 64 insertions, 64 deletions
diff --git a/main/amavisd-new/amavisd-new.pre-install b/main/amavisd-new/amavisd-new.pre-install
index 691ae27381..bd8c3a6fe6 100755
--- a/main/amavisd-new/amavisd-new.pre-install
+++ b/main/amavisd-new/amavisd-new.pre-install
@@ -1,6 +1,6 @@
#!/bin/sh
-addgroup amavis 2>/dev/null
+addgroup -S amavis 2>/dev/null
adduser -S -D -G amavis -h /var/amavis -s /sbin/nologin amavis 2>/dev/null
exit 0
diff --git a/main/apache2/apache2.pre-install b/main/apache2/apache2.pre-install
index 762de83910..81f4b068b7 100644
--- a/main/apache2/apache2.pre-install
+++ b/main/apache2/apache2.pre-install
@@ -1,5 +1,5 @@
#!/bin/sh
addgroup -S -g 82 www-data 2>/dev/null
-adduser -H -h /var/www -s /sbin/nologin -D apache 2>/dev/null
+adduser -S -H -h /var/www -s /sbin/nologin -D apache 2>/dev/null
addgroup apache www-data 2>/dev/null
exit 0
diff --git a/main/aports-build/aports-build.pre-install b/main/aports-build/aports-build.pre-install
index e9d9bfbf03..21bf106837 100644
--- a/main/aports-build/aports-build.pre-install
+++ b/main/aports-build/aports-build.pre-install
@@ -1,4 +1,4 @@
#!/bin/sh
-adduser -D buildozer -s /bin/sh 2>/dev/null
+adduser -S -D buildozer -s /bin/sh 2>/dev/null
exit 0
diff --git a/main/atheme-iris/atheme-iris.pre-install b/main/atheme-iris/atheme-iris.pre-install
index 1bb8677ddb..4198df244d 100644
--- a/main/atheme-iris/atheme-iris.pre-install
+++ b/main/atheme-iris/atheme-iris.pre-install
@@ -1,4 +1,4 @@
#!/bin/sh
-adduser -H -h /usr/share/webapps/atheme-iris -g iris -D -s /sbin/nologin iris >/dev/null
+adduser -S -H -h /usr/share/webapps/atheme-iris -g iris -D -s /sbin/nologin iris >/dev/null
exit 0
diff --git a/main/bind/bind.pre-install b/main/bind/bind.pre-install
index 384971658d..3770738af9 100644
--- a/main/bind/bind.pre-install
+++ b/main/bind/bind.pre-install
@@ -1,6 +1,6 @@
#!/bin/sh
addgroup -S named 2>/dev/null
-adduser -h /etc/bind -s /sbin/nologin -G named -D named 2>/dev/null
+adduser -S -h /etc/bind -s /sbin/nologin -G named -D named 2>/dev/null
exit 0
diff --git a/main/chrony/chrony.pre-install b/main/chrony/chrony.pre-install
index 2c54eccdbd..83c4560568 100644
--- a/main/chrony/chrony.pre-install
+++ b/main/chrony/chrony.pre-install
@@ -1,5 +1,5 @@
#!/bin/sh
-addgroup chrony 2>/dev/null
+addgroup -S chrony 2>/dev/null
adduser -S -G chrony -h /var/log/chrony -s /sbin/nologin -D chrony 2>/dev/null
exit 0
diff --git a/main/clamav/clamav-db.pre-install b/main/clamav/clamav-db.pre-install
index 7706eefe72..9bc70ddaa4 100644
--- a/main/clamav/clamav-db.pre-install
+++ b/main/clamav/clamav-db.pre-install
@@ -1,4 +1,4 @@
#!/bin/sh
-adduser -H -s /sbin/nologin -D clamav 2>/dev/null
+adduser -S -H -s /sbin/nologin -D clamav 2>/dev/null
exit 0
diff --git a/main/clamsmtp/clamsmtp.pre-install b/main/clamsmtp/clamsmtp.pre-install
index 7706eefe72..9bc70ddaa4 100644
--- a/main/clamsmtp/clamsmtp.pre-install
+++ b/main/clamsmtp/clamsmtp.pre-install
@@ -1,4 +1,4 @@
#!/bin/sh
-adduser -H -s /sbin/nologin -D clamav 2>/dev/null
+adduser -S -H -s /sbin/nologin -D clamav 2>/dev/null
exit 0
diff --git a/main/clamsmtp/clamsmtp.pre-upgrade b/main/clamsmtp/clamsmtp.pre-upgrade
index 97d90817be..7e736a2d43 100644
--- a/main/clamsmtp/clamsmtp.pre-upgrade
+++ b/main/clamsmtp/clamsmtp.pre-upgrade
@@ -10,5 +10,5 @@ if [ -f "$old" ] && [ ! -f "$new" ]; then
echo " *"
fi
-adduser -H -s /bin/false -D clamav 2>/dev/null
+adduser -S -H -s /bin/false -D clamav 2>/dev/null
exit 0
diff --git a/main/coova-chilli/coova-chilli.pre-install b/main/coova-chilli/coova-chilli.pre-install
index 4bf0c3c812..6ef874198f 100644
--- a/main/coova-chilli/coova-chilli.pre-install
+++ b/main/coova-chilli/coova-chilli.pre-install
@@ -1,4 +1,4 @@
#!/bin/sh
-adduser -H -s /sbin/nologin -D chilli 2>/dev/null
+adduser -S -H -s /sbin/nologin -D chilli 2>/dev/null
exit 0
diff --git a/main/cvechecker/cvechecker.pre-install b/main/cvechecker/cvechecker.pre-install
index f2b4535c11..cf6b144833 100644
--- a/main/cvechecker/cvechecker.pre-install
+++ b/main/cvechecker/cvechecker.pre-install
@@ -1,3 +1,3 @@
#!/bin/sh
-addgroup cvechecker &>/dev/null
-adduser cvechecker -h /var/cvechecker -DG cvechecker &>/dev/null
+addgroup -S cvechecker &>/dev/null
+adduser -S cvechecker -h /var/cvechecker -DG cvechecker &>/dev/null
diff --git a/main/dhcp/dhcp.pre-install b/main/dhcp/dhcp.pre-install
index 7f09003cd2..27fa93f824 100644
--- a/main/dhcp/dhcp.pre-install
+++ b/main/dhcp/dhcp.pre-install
@@ -1,5 +1,5 @@
#!/bin/sh
-adduser -h /var/lib/dhcp -s /sbin/nologin -D dhcp 2>/dev/null
+adduser -S -h /var/lib/dhcp -s /sbin/nologin -D dhcp 2>/dev/null
exit 0
diff --git a/main/distcc/distcc.pre-install b/main/distcc/distcc.pre-install
index bd7fba2a40..b07f8467f2 100644
--- a/main/distcc/distcc.pre-install
+++ b/main/distcc/distcc.pre-install
@@ -1,5 +1,5 @@
#!/bin/sh
addgroup -S distcc 2>/dev/null
-adduser -H -h /dev/null -s /sbin/nologin -G distcc -D distcc 2>/dev/null
+adduser -S -H -h /dev/null -s /sbin/nologin -G distcc -D distcc 2>/dev/null
exit 0
diff --git a/main/djbdns/dnscache.pre-install b/main/djbdns/dnscache.pre-install
index f1f948e478..106fc292cb 100644
--- a/main/djbdns/dnscache.pre-install
+++ b/main/djbdns/dnscache.pre-install
@@ -1,5 +1,5 @@
#!/bin/sh
-adduser -h /etc/dnscache -g dnscache -s /sbin/nologin -H -D dnscache 2>/dev/null
+adduser -S -h /etc/dnscache -g dnscache -s /sbin/nologin -H -D dnscache 2>/dev/null
exit 0
diff --git a/main/djbdns/tinydns.pre-install b/main/djbdns/tinydns.pre-install
index e3ab6ceaf8..8676fb4104 100644
--- a/main/djbdns/tinydns.pre-install
+++ b/main/djbdns/tinydns.pre-install
@@ -1,5 +1,5 @@
#!/bin/sh
-adduser -h /etc/tinydns -g tinydns -s /sbin/nologin -H -D tinydns 2>/dev/null
+adduser -S -h /etc/tinydns -g tinydns -s /sbin/nologin -H -D tinydns 2>/dev/null
exit 0
diff --git a/main/dnsmasq/dnsmasq.pre-install b/main/dnsmasq/dnsmasq.pre-install
index 931d258245..3e9e4b0814 100644
--- a/main/dnsmasq/dnsmasq.pre-install
+++ b/main/dnsmasq/dnsmasq.pre-install
@@ -1,5 +1,5 @@
#!/bin/sh
-addgroup dnsmasq 2>/dev/null
+addgroup -S dnsmasq 2>/dev/null
adduser -S -H -h /dev/null -s /sbin/nologin -G dnsmasq -D dnsmasq 2>/dev/null
exit 0
diff --git a/main/dovecot/dovecot.pre-install b/main/dovecot/dovecot.pre-install
index 432a3b846d..58346c66fb 100644
--- a/main/dovecot/dovecot.pre-install
+++ b/main/dovecot/dovecot.pre-install
@@ -1,5 +1,5 @@
#!/bin/sh
-adduser -u 90 -H -h /dev/null -s /sbin/nologin -D dovecot 2>/dev/null
-adduser -u 91 -H -h /dev/null -s /sbin/nologin -D dovenull 2>/dev/null
+adduser -S -u 90 -H -h /dev/null -s /sbin/nologin -D dovecot 2>/dev/null
+adduser -S -u 91 -H -h /dev/null -s /sbin/nologin -D dovenull 2>/dev/null
exit 0
diff --git a/main/ez-ipupdate/ez-ipupdate.pre-install b/main/ez-ipupdate/ez-ipupdate.pre-install
index 7c1ea477f7..064e418f45 100644
--- a/main/ez-ipupdate/ez-ipupdate.pre-install
+++ b/main/ez-ipupdate/ez-ipupdate.pre-install
@@ -1,5 +1,5 @@
#!/bin/sh
-adduser -h /var/lib/ez-ipupdate -s /sbin/nologin -D ipupdate 2>/dev/null
+adduser -S -h /var/lib/ez-ipupdate -s /sbin/nologin -D ipupdate 2>/dev/null
exit 0
diff --git a/main/fetchmail/fetchmail.pre-install b/main/fetchmail/fetchmail.pre-install
index 6122e0c6f3..2961b9a010 100644
--- a/main/fetchmail/fetchmail.pre-install
+++ b/main/fetchmail/fetchmail.pre-install
@@ -1,4 +1,4 @@
#!/bin/sh
-adduser -H -h /var/lib/fetchmail -s /sbin/nologin -D fetchmail 2>/dev/null
+adduser -S -H -h /var/lib/fetchmail -s /sbin/nologin -D fetchmail 2>/dev/null
exit 0
diff --git a/main/freeradius/freeradius.pre-install b/main/freeradius/freeradius.pre-install
index 30ff04814e..b81e86d7af 100644
--- a/main/freeradius/freeradius.pre-install
+++ b/main/freeradius/freeradius.pre-install
@@ -1,6 +1,6 @@
#!/bin/sh
-addgroup radius 2>/dev/null
+addgroup -S radius 2>/dev/null
adduser -S -G radius -h /var/log/radius -s /sbin/nologin -D radius 2>/dev/null
exit 0
diff --git a/main/freeswitch/freeswitch.pre-install b/main/freeswitch/freeswitch.pre-install
index 88dcc895bb..4dccd578c6 100755
--- a/main/freeswitch/freeswitch.pre-install
+++ b/main/freeswitch/freeswitch.pre-install
@@ -1,5 +1,5 @@
#!/bin/sh
-adduser -H -h /var/run/freeswitch -s /sbin/nologin -D freeswitch 2>/dev/null
+adduser -S -H -h /var/run/freeswitch -s /sbin/nologin -D freeswitch 2>/dev/null
exit 0
diff --git a/main/gdnsd/gdnsd.pre-install b/main/gdnsd/gdnsd.pre-install
index dc6e44b9cb..2479466873 100644
--- a/main/gdnsd/gdnsd.pre-install
+++ b/main/gdnsd/gdnsd.pre-install
@@ -1,5 +1,5 @@
#!/bin/sh
-addgroup gdnsd 2>/dev/null
+addgroup -S gdnsd 2>/dev/null
adduser -S -H -h /dev/null -s /sbin/nologin -D -G gdnsd gdnsd 2>/dev/null
exit 0
diff --git a/main/gitolite/gitolite.pre-install b/main/gitolite/gitolite.pre-install
index 79a7a6388a..fbb1e2a121 100644
--- a/main/gitolite/gitolite.pre-install
+++ b/main/gitolite/gitolite.pre-install
@@ -1,3 +1,3 @@
#!/bin/sh
-adduser -H -h /var/lib/git -s /bin/sh -D git 2>/dev/null
+adduser -S -H -h /var/lib/git -s /bin/sh -D git 2>/dev/null
exit 0
diff --git a/main/gnats/gnats.pre-install b/main/gnats/gnats.pre-install
index 0a2e5a589b..849841fa6e 100644
--- a/main/gnats/gnats.pre-install
+++ b/main/gnats/gnats.pre-install
@@ -1,4 +1,4 @@
#!/bin/sh
-adduser -h /var/lib/gnatsdb -D gnats 2>/dev/null
+adduser -S -h /var/lib/gnatsdb -D gnats 2>/dev/null
exit 0
diff --git a/main/gross/gross.pre-install b/main/gross/gross.pre-install
index 809dd4c6ee..f79e65773d 100644
--- a/main/gross/gross.pre-install
+++ b/main/gross/gross.pre-install
@@ -1,3 +1,3 @@
#!/bin/sh
-adduser -H -s /sbin/nologin -D gross 2>/dev/null
+adduser -S -H -s /sbin/nologin -D gross 2>/dev/null
exit 0
diff --git a/main/haproxy/haproxy.pre-install b/main/haproxy/haproxy.pre-install
index 33e0164aff..470695636e 100644
--- a/main/haproxy/haproxy.pre-install
+++ b/main/haproxy/haproxy.pre-install
@@ -1,6 +1,6 @@
#!/bin/sh
-addgroup haproxy 2>/dev/null
+addgroup -S haproxy 2>/dev/null
adduser -S -H -h /var/lib/haproxy -s /bin/false -D \
-G haproxy haproxy 2>/dev/null
diff --git a/main/haproxy/haproxy.pre-upgrade b/main/haproxy/haproxy.pre-upgrade
index 33e0164aff..470695636e 100644
--- a/main/haproxy/haproxy.pre-upgrade
+++ b/main/haproxy/haproxy.pre-upgrade
@@ -1,6 +1,6 @@
#!/bin/sh
-addgroup haproxy 2>/dev/null
+addgroup -S haproxy 2>/dev/null
adduser -S -H -h /var/lib/haproxy -s /bin/false -D \
-G haproxy haproxy 2>/dev/null
diff --git a/main/icecast/icecast.pre-install b/main/icecast/icecast.pre-install
index e8e86102da..9978a4be95 100644
--- a/main/icecast/icecast.pre-install
+++ b/main/icecast/icecast.pre-install
@@ -1,5 +1,5 @@
#!/bin/sh
-adduser -h /var/log/icecast -s /sbin/nologin -D icecast 2>/dev/null
+adduser -S -h /var/log/icecast -s /sbin/nologin -D icecast 2>/dev/null
exit 0
diff --git a/main/kamailio/kamailio.pre-install b/main/kamailio/kamailio.pre-install
index 58e5bb6fd6..fd7b13e487 100644
--- a/main/kamailio/kamailio.pre-install
+++ b/main/kamailio/kamailio.pre-install
@@ -1,6 +1,6 @@
#!/bin/sh
-addgroup kamailio 2>/dev/null
-adduser -H -h /var/empty -s /sbin/nologin -D -G kamailio kamailio 2>/dev/null
+addgroup -S kamailio 2>/dev/null
+adduser -S -H -h /var/empty -s /sbin/nologin -D -G kamailio kamailio 2>/dev/null
exit 0
diff --git a/main/lighttpd/lighttpd.pre-install b/main/lighttpd/lighttpd.pre-install
index 95202928f9..2349478f2f 100644
--- a/main/lighttpd/lighttpd.pre-install
+++ b/main/lighttpd/lighttpd.pre-install
@@ -1,7 +1,7 @@
#!/bin/sh
addgroup -S -g 82 www-data 2>/dev/null
-adduser -H -h /var/www/localhost/htdocs -s /sbin/nologin -D lighttpd 2>/dev/null
+adduser -S -H -h /var/www/localhost/htdocs -s /sbin/nologin -D lighttpd 2>/dev/null
addgroup lighttpd www-data 2>/dev/null
exit 0
diff --git a/main/logcheck/logcheck.pre-install b/main/logcheck/logcheck.pre-install
index 61f3c23ece..b0f2a83972 100644
--- a/main/logcheck/logcheck.pre-install
+++ b/main/logcheck/logcheck.pre-install
@@ -1,5 +1,5 @@
#!/bin/sh
-addgroup logcheck 2>/dev/null
+addgroup -S logcheck 2>/dev/null
adduser -S -H -h /dev/null -s /sbin/nologin -D -G logcheck logcheck 2>/dev/null
exit 0
diff --git a/main/mariadb/mariadb.pre-install b/main/mariadb/mariadb.pre-install
index 2e6e668e7f..5b68b1ea4f 100644
--- a/main/mariadb/mariadb.pre-install
+++ b/main/mariadb/mariadb.pre-install
@@ -1,6 +1,6 @@
#!/bin/sh
addgroup -S mysql 2>/dev/null
-adduser -h /var/lib/mysql -s /sbin/nologin -G mysql -D mysql 2>/dev/null
+adduser -S -h /var/lib/mysql -s /sbin/nologin -G mysql -D mysql 2>/dev/null
exit 0
diff --git a/main/memcached/memcached.pre-install b/main/memcached/memcached.pre-install
index bee8d7fd35..6612df975b 100644
--- a/main/memcached/memcached.pre-install
+++ b/main/memcached/memcached.pre-install
@@ -1,5 +1,5 @@
#!/bin/sh
-adduser -H -s /sbin/nologin -D memcached 2>/dev/null
+adduser -S -H -s /sbin/nologin -D memcached 2>/dev/null
exit 0
diff --git a/main/mlmmj/mlmmj.pre-install b/main/mlmmj/mlmmj.pre-install
index c6043d3911..38b8fb8394 100644
--- a/main/mlmmj/mlmmj.pre-install
+++ b/main/mlmmj/mlmmj.pre-install
@@ -1,5 +1,5 @@
#!/bin/sh
-addgroup mlmmj 2>/dev/null
+addgroup -S mlmmj 2>/dev/null
adduser -S -H -h /var/spool/mlmmj -s /sbin/nologin -D -G mlmmj mlmmj 2>/dev/null
exit 0
diff --git a/main/ngircd/ngircd.pre-install b/main/ngircd/ngircd.pre-install
index 36bc1f821b..5c8d34b6d8 100644
--- a/main/ngircd/ngircd.pre-install
+++ b/main/ngircd/ngircd.pre-install
@@ -1,4 +1,4 @@
#!/bin/sh
-adduser -H -h /etc/ngircd -s /sbin/nologin -D ngircd 2>/dev/null
+adduser -S -H -h /etc/ngircd -s /sbin/nologin -D ngircd 2>/dev/null
exit 0
diff --git a/main/nrpe/nrpe.pre-install b/main/nrpe/nrpe.pre-install
index 6acde2a510..a9a0d38957 100644
--- a/main/nrpe/nrpe.pre-install
+++ b/main/nrpe/nrpe.pre-install
@@ -1,5 +1,5 @@
#!/bin/sh
-adduser -H -h /dev/null -s /sbin/nologin -D nagios 2>/dev/null
-addgroup nagios 2>/dev/null
+adduser -S -H -h /dev/null -s /sbin/nologin -D nagios 2>/dev/null
+addgroup -S nagios 2>/dev/null
exit 0
diff --git a/main/open-vm-tools/open-vm-tools.pre-install b/main/open-vm-tools/open-vm-tools.pre-install
index 10b989ae53..15fbca33b8 100644
--- a/main/open-vm-tools/open-vm-tools.pre-install
+++ b/main/open-vm-tools/open-vm-tools.pre-install
@@ -1,4 +1,4 @@
#!/bin/sh
-addgroup vmware 2>/dev/null
+addgroup -S vmware 2>/dev/null
exit 0
diff --git a/main/openntpd/openntpd.pre-install b/main/openntpd/openntpd.pre-install
index 0b2be06957..feb5d9cb91 100644
--- a/main/openntpd/openntpd.pre-install
+++ b/main/openntpd/openntpd.pre-install
@@ -2,6 +2,6 @@
# this user should be included in alpine-baselayout-1.2.
# included here for backward compability.
-adduser -H -h /var/empty -s /sbin/nologin -D ntp 2>/dev/null
+adduser -S -H -h /var/empty -s /sbin/nologin -D ntp 2>/dev/null
exit 0
diff --git a/main/postgrey/postgrey.pre-install b/main/postgrey/postgrey.pre-install
index 21dd01faa2..480391cce4 100644
--- a/main/postgrey/postgrey.pre-install
+++ b/main/postgrey/postgrey.pre-install
@@ -1,6 +1,6 @@
#!/bin/sh
-addgroup postgrey 2>/dev/null
-adduser -H -h /dev/null -s /sbin/nologin -D postgrey 2>/dev/null
+addgroup -S postgrey 2>/dev/null
+adduser -S -H -h /dev/null -s /sbin/nologin -D postgrey 2>/dev/null
exit 0
diff --git a/main/privoxy/privoxy.pre-install b/main/privoxy/privoxy.pre-install
index cfc842800d..72a917e4f7 100644
--- a/main/privoxy/privoxy.pre-install
+++ b/main/privoxy/privoxy.pre-install
@@ -1,6 +1,6 @@
#!/bin/sh
-addgroup privoxy 2>/dev/null
+addgroup -S privoxy 2>/dev/null
adduser -S -G privoxy -h /var/log/privoxy -s /sbin/nologin -D privoxy 2>/dev/null
exit 0
diff --git a/main/redis/redis.pre-install b/main/redis/redis.pre-install
index 2e36f49e07..479434e50e 100644
--- a/main/redis/redis.pre-install
+++ b/main/redis/redis.pre-install
@@ -1,5 +1,5 @@
#!/bin/sh
-addgroup redis 2>/dev/null
+addgroup -S redis 2>/dev/null
adduser -S -H -h /var/lib/redis -s /bin/false -D -G redis redis 2>/dev/null
exit 0
diff --git a/main/samba/winbind.pre-install b/main/samba/winbind.pre-install
index 792e73a803..ac4df3f4ad 100644
--- a/main/samba/winbind.pre-install
+++ b/main/samba/winbind.pre-install
@@ -1,5 +1,5 @@
#!/bin/sh
-addgroup winbind 2>/dev/null
+addgroup -S winbind 2>/dev/null
exit 0
diff --git a/main/sircbot/sircbot.pre-install b/main/sircbot/sircbot.pre-install
index 450fff3fc4..453ba5dd10 100644
--- a/main/sircbot/sircbot.pre-install
+++ b/main/sircbot/sircbot.pre-install
@@ -1,5 +1,5 @@
#!/bin/sh
-addgroup sircbot 2>/dev/null
+addgroup -S sircbot 2>/dev/null
adduser -S -h /var/run/sircbot -G sircbot -D sircbot 2>/dev/null
exit 0
diff --git a/main/smokeping/smokeping.pre-install b/main/smokeping/smokeping.pre-install
index 490c4c1879..893414898d 100644
--- a/main/smokeping/smokeping.pre-install
+++ b/main/smokeping/smokeping.pre-install
@@ -1,5 +1,5 @@
#!/bin/sh
-addgroup smokeping 2>/dev/null
+addgroup -S smokeping 2>/dev/null
adduser -S -h /var/lib/smokeping -D -G smokeping smokeping 2>/dev/null
exit 0
diff --git a/main/snort/snort.pre-install b/main/snort/snort.pre-install
index 80740ebd11..c8bf706183 100644
--- a/main/snort/snort.pre-install
+++ b/main/snort/snort.pre-install
@@ -1,4 +1,4 @@
#!/bin/sh
-adduser -h /var/log/snort -s /sbin/nologin -D snort 2>/dev/null
+adduser -S -h /var/log/snort -s /sbin/nologin -D snort 2>/dev/null
exit 0
diff --git a/main/squark/squark.post-install b/main/squark/squark.post-install
index 28120d3e31..3c40694692 100755
--- a/main/squark/squark.post-install
+++ b/main/squark/squark.post-install
@@ -1,2 +1,2 @@
#!/bin/sh
-addgroup squark &>/dev/null || exit 0
+addgroup -S squark &>/dev/null || exit 0
diff --git a/main/squid/squid.pre-install b/main/squid/squid.pre-install
index 322d21deab..b51ade1564 100644
--- a/main/squid/squid.pre-install
+++ b/main/squid/squid.pre-install
@@ -1,6 +1,6 @@
#!/bin/sh
-adduser -D squid -H /var/cache/squid 2>/dev/null
-addgroup winbind 2>/dev/null
+adduser -S -D squid -H /var/cache/squid 2>/dev/null
+addgroup -S winbind 2>/dev/null
addgroup squid winbind
exit 0
diff --git a/main/squid/squid.pre-upgrade b/main/squid/squid.pre-upgrade
index 322d21deab..b51ade1564 100644
--- a/main/squid/squid.pre-upgrade
+++ b/main/squid/squid.pre-upgrade
@@ -1,6 +1,6 @@
#!/bin/sh
-adduser -D squid -H /var/cache/squid 2>/dev/null
-addgroup winbind 2>/dev/null
+adduser -S -D squid -H /var/cache/squid 2>/dev/null
+addgroup -S winbind 2>/dev/null
addgroup squid winbind
exit 0
diff --git a/main/subversion/subversion.pre-install b/main/subversion/subversion.pre-install
index fb516ee5a0..ddec16ce85 100644
--- a/main/subversion/subversion.pre-install
+++ b/main/subversion/subversion.pre-install
@@ -1,6 +1,6 @@
#!/bin/sh
-addgroup svnusers 2>/dev/null
-adduser svn -D -h /var/svn -G svnusers 2>/dev/null
+addgroup -S svnusers 2>/dev/null
+adduser -S svn -D -h /var/svn -G svnusers 2>/dev/null
exit 0
diff --git a/main/trac/trac.pre-install b/main/trac/trac.pre-install
index 147991649b..f39f2b2136 100644
--- a/main/trac/trac.pre-install
+++ b/main/trac/trac.pre-install
@@ -1,5 +1,5 @@
#!/bin/sh
-addgroup tracd 2>/dev/null
-adduser -s /sbin/nologin -G tracd -D -H tracd 2>/dev/null
+addgroup -S tracd 2>/dev/null
+adduser -S -s /sbin/nologin -G tracd -D -H tracd 2>/dev/null
exit 0
diff --git a/main/transmission/transmission-daemon.pre-install b/main/transmission/transmission-daemon.pre-install
index 9b7d6cb17e..2f9a398a04 100644
--- a/main/transmission/transmission-daemon.pre-install
+++ b/main/transmission/transmission-daemon.pre-install
@@ -1,5 +1,5 @@
#!/bin/sh
-adduser -h /var/lib/transmission -s /sbin/nologin -D transmission 2>/dev/null
+adduser -S -h /var/lib/transmission -s /sbin/nologin -D transmission 2>/dev/null
exit 0
diff --git a/main/vsftpd/vsftpd.pre-install b/main/vsftpd/vsftpd.pre-install
index 4bdf064b94..200d233e84 100755
--- a/main/vsftpd/vsftpd.pre-install
+++ b/main/vsftpd/vsftpd.pre-install
@@ -1,5 +1,5 @@
#!/bin/sh
-addgroup ftp &>/dev/null
+addgroup -S ftp &>/dev/null
addgroup vsftp ftp &>/dev/null
adduser -S -h /var/lib/ftp -s /sbin/nologin -G ftp vsftp &>/dev/null
exit 0
diff --git a/main/ympd/ympd.pre-install b/main/ympd/ympd.pre-install
index 0455be2acd..1bbd0459ab 100644
--- a/main/ympd/ympd.pre-install
+++ b/main/ympd/ympd.pre-install
@@ -1,3 +1,3 @@
#!/bin/sh
-adduser -H -D -s /sbin/nologin -G audio ympd 2>/dev/null
+adduser -S -H -D -s /sbin/nologin -G audio ympd 2>/dev/null
exit 0
diff --git a/main/zabbix/zabbix-agent.pre-install b/main/zabbix/zabbix-agent.pre-install
index 57d46c251a..91ea88c23b 100644
--- a/main/zabbix/zabbix-agent.pre-install
+++ b/main/zabbix/zabbix-agent.pre-install
@@ -1,6 +1,6 @@
#!/bin/sh
-addgroup zabbix 2>/dev/null
+addgroup -S zabbix 2>/dev/null
adduser -S -H -h /dev/null -s /sbin/nologin -D -G zabbix zabbix 2>/dev/null
addgroup -g 30 zabbix 2>/dev/null
exit 0
diff --git a/main/znc/znc.pre-install b/main/znc/znc.pre-install
index 91f2f8d27b..ad5aed93c1 100644
--- a/main/znc/znc.pre-install
+++ b/main/znc/znc.pre-install
@@ -1,3 +1,3 @@
#!/bin/sh
-adduser -H -D -s /sbin/nologin znc 2>/dev/null
+adduser -S -H -D -s /sbin/nologin znc 2>/dev/null
exit 0