Mail archive
alpine-aports

[alpine-aports] [PATCH 3/7] Add lacking -S option (system) to adduser/addgroup in scripts.

From: Przemyslaw Pawelczyk <przemoc_at_zoho.com>
Date: Sat, 23 Apr 2016 13:13:37 +0200

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
---
 community/caddy/caddy.pre-install                  | 2 +-
 community/domoticz/domoticz.pre-install            | 2 +-
 community/icinga2/icinga2.pre-install              | 4 ++--
 community/minetest/minetest-server.pre-install     | 2 +-
 community/oscam/oscam.pre-install                  | 2 +-
 community/seafile/seafile-server.pre-install       | 2 +-
 community/sword/sword.pre-install                  | 2 +-
 community/syncthing/syncthing.pre-install          | 2 +-
 main/amavisd-new/amavisd-new.pre-install           | 2 +-
 main/apache2/apache2.pre-install                   | 2 +-
 main/aports-build/aports-build.pre-install         | 2 +-
 main/atheme-iris/atheme-iris.pre-install           | 2 +-
 main/bind/bind.pre-install                         | 2 +-
 main/chrony/chrony.pre-install                     | 2 +-
 main/clamav/clamav-db.pre-install                  | 2 +-
 main/clamsmtp/clamsmtp.pre-install                 | 2 +-
 main/clamsmtp/clamsmtp.pre-upgrade                 | 2 +-
 main/coova-chilli/coova-chilli.pre-install         | 2 +-
 main/cvechecker/cvechecker.pre-install             | 4 ++--
 main/dhcp/dhcp.pre-install                         | 2 +-
 main/distcc/distcc.pre-install                     | 2 +-
 main/djbdns/dnscache.pre-install                   | 2 +-
 main/djbdns/tinydns.pre-install                    | 2 +-
 main/dnsmasq/dnsmasq.pre-install                   | 2 +-
 main/dovecot/dovecot.pre-install                   | 4 ++--
 main/ez-ipupdate/ez-ipupdate.pre-install           | 2 +-
 main/fetchmail/fetchmail.pre-install               | 2 +-
 main/freeradius/freeradius.pre-install             | 2 +-
 main/freeswitch/freeswitch.pre-install             | 2 +-
 main/gdnsd/gdnsd.pre-install                       | 2 +-
 main/gitolite/gitolite.pre-install                 | 2 +-
 main/gnats/gnats.pre-install                       | 2 +-
 main/gross/gross.pre-install                       | 2 +-
 main/haproxy/haproxy.pre-install                   | 2 +-
 main/haproxy/haproxy.pre-upgrade                   | 2 +-
 main/icecast/icecast.pre-install                   | 2 +-
 main/kamailio/kamailio.pre-install                 | 4 ++--
 main/lighttpd/lighttpd.pre-install                 | 2 +-
 main/logcheck/logcheck.pre-install                 | 2 +-
 main/mariadb/mariadb.pre-install                   | 2 +-
 main/memcached/memcached.pre-install               | 2 +-
 main/mlmmj/mlmmj.pre-install                       | 2 +-
 main/ngircd/ngircd.pre-install                     | 2 +-
 main/nrpe/nrpe.pre-install                         | 4 ++--
 main/open-vm-tools/open-vm-tools.pre-install       | 2 +-
 main/openntpd/openntpd.pre-install                 | 2 +-
 main/postgrey/postgrey.pre-install                 | 4 ++--
 main/privoxy/privoxy.pre-install                   | 2 +-
 main/redis/redis.pre-install                       | 2 +-
 main/samba/winbind.pre-install                     | 2 +-
 main/sircbot/sircbot.pre-install                   | 2 +-
 main/smokeping/smokeping.pre-install               | 2 +-
 main/snort/snort.pre-install                       | 2 +-
 main/squark/squark.post-install                    | 2 +-
 main/squid/squid.pre-install                       | 4 ++--
 main/squid/squid.pre-upgrade                       | 4 ++--
 main/subversion/subversion.pre-install             | 4 ++--
 main/trac/trac.pre-install                         | 4 ++--
 main/transmission/transmission-daemon.pre-install  | 2 +-
 main/vsftpd/vsftpd.pre-install                     | 2 +-
 main/ympd/ympd.pre-install                         | 2 +-
 main/zabbix/zabbix-agent.pre-install               | 2 +-
 main/znc/znc.pre-install                           | 2 +-
 testing/3proxy/3proxy.pre-install                  | 2 +-
 testing/at/at.pre-install                          | 2 +-
 testing/buildbot-slave/buildbot-slave.pre-install  | 2 +-
 testing/buildbot/buildbot.pre-install              | 2 +-
 testing/clapf/clapf.pre-install                    | 2 +-
 testing/cluster-glue/cluster-glue.pre-install      | 4 ++--
 testing/dbmail/dbmail.pre-install                  | 2 +-
 testing/dspam/dspam.pre-install                    | 2 +-
 testing/ejabberd/ejabberd.pre-install              | 2 +-
 testing/elasticsearch/elasticsearch.pre-install    | 2 +-
 testing/emby/emby.pre-install                      | 4 ++--
 testing/gdnsd/gdnsd.pre-install                    | 2 +-
 testing/lusca/lusca.pre-install                    | 2 +-
 testing/lusca/lusca.pre-upgrade                    | 2 +-
 testing/mongodb/mongodb.pre-install                | 4 ++--
 testing/opensips/opensips.pre-install              | 2 +-
 testing/openxcap/openxcap.pre-install              | 2 +-
 testing/pdns/pdns.pre-install                      | 2 +-
 testing/prosody/prosody.pre-install                | 4 ++--
 testing/qpage/qpage.pre-install                    | 2 +-
 testing/rancid/rancid.pre-install                  | 2 +-
 testing/rrdbot/rrdbot.pre-install                  | 2 +-
 testing/rutorrent/rutorrent.pre-install            | 2 +-
 testing/wt/wt.pre-install                          | 2 +-
 testing/zabbix/zabbix-agent.pre-install            | 4 ++--
 unmaintained/ejabberd-git/ejabberd-git.pre-install | 2 +-
 89 files changed, 104 insertions(+), 104 deletions(-)
diff --git a/community/caddy/caddy.pre-install b/community/caddy/caddy.pre-install
index 16d74a3..8c67557 100644
--- a/community/caddy/caddy.pre-install
+++ b/community/caddy/caddy.pre-install
_at_@ -1,4 +1,4 @@
 #!/bin/sh
-adduser -h /var/lib/caddy -D -s /sbin/nologin caddy 2>/dev/null
+adduser -S -h /var/lib/caddy -D -s /sbin/nologin caddy 2>/dev/null
 adduser caddy www-data 2>/dev/null
 exit 0
diff --git a/community/domoticz/domoticz.pre-install b/community/domoticz/domoticz.pre-install
index a94a5fb..8a7d12c 100644
--- a/community/domoticz/domoticz.pre-install
+++ b/community/domoticz/domoticz.pre-install
_at_@ -1,3 +1,3 @@
 #!/bin/sh
-adduser -h /var/lib/domoticz -D -s /sbin/nologin domoticz 2>/dev/null
+adduser -S -h /var/lib/domoticz -D -s /sbin/nologin domoticz 2>/dev/null
 exit 0
diff --git a/community/icinga2/icinga2.pre-install b/community/icinga2/icinga2.pre-install
index cd2a432..349c8c8 100644
--- a/community/icinga2/icinga2.pre-install
+++ b/community/icinga2/icinga2.pre-install
_at_@ -1,6 +1,6 @@
 #!/bin/sh
-addgroup icinga 2>/dev/null
-addgroup icingacmd 2>/dev/null
+addgroup -S icinga 2>/dev/null
+addgroup -S icingacmd 2>/dev/null
 adduser -S -G icinga -H -h /var/spool/icinga2 -s /sbin/nologin -D icinga 2>/dev/null
 adduser icinga icingacmd 2>/dev/null 2>/dev/null
 exit 0
diff --git a/community/minetest/minetest-server.pre-install b/community/minetest/minetest-server.pre-install
index f995e42..dbf1411 100644
--- a/community/minetest/minetest-server.pre-install
+++ b/community/minetest/minetest-server.pre-install
_at_@ -1,3 +1,3 @@
 #!/bin/sh
-adduser -s /sbin/nologin -D -h /var/lib/minetest minetest games 2>/dev/null
+adduser -S -s /sbin/nologin -D -h /var/lib/minetest minetest games 2>/dev/null
 exit 0
diff --git a/community/oscam/oscam.pre-install b/community/oscam/oscam.pre-install
index fe379e1..6f2cc9e 100644
--- a/community/oscam/oscam.pre-install
+++ b/community/oscam/oscam.pre-install
_at_@ -1,4 +1,4 @@
 #!/bin/sh
-adduser -H -D -s /sbin/nologin oscam 2>/dev/null
+adduser -S -H -D -s /sbin/nologin oscam 2>/dev/null
 addgroup oscam usb 2>/dev/null
 exit 0
diff --git a/community/seafile/seafile-server.pre-install b/community/seafile/seafile-server.pre-install
index 173e73a..66e7a2c 100644
--- a/community/seafile/seafile-server.pre-install
+++ b/community/seafile/seafile-server.pre-install
_at_@ -3,5 +3,5 @@
 SEAFILE_HOME=/var/lib/seafile
 
 addgroup -S -g 800 seafile 2>/dev/null
-adduser -h $SEAFILE_HOME -s /bin/sh -G seafile -g seafile -u 800 -D seafile 2>/dev/null
+adduser -S -h $SEAFILE_HOME -s /bin/sh -G seafile -g seafile -u 800 -D seafile 2>/dev/null
 exit 0
diff --git a/community/sword/sword.pre-install b/community/sword/sword.pre-install
index 0ab0d71..d8abdb5 100755
--- a/community/sword/sword.pre-install
+++ b/community/sword/sword.pre-install
_at_@ -1,3 +1,3 @@
 #!/bin/sh
 echo "Adding 'sword' group for installing SWORD modules systemwide"
-addgroup sword 2>/dev/null >&2 || true
+addgroup -S sword 2>/dev/null >&2 || true
diff --git a/community/syncthing/syncthing.pre-install b/community/syncthing/syncthing.pre-install
index b2207a0..dd7f389 100644
--- a/community/syncthing/syncthing.pre-install
+++ b/community/syncthing/syncthing.pre-install
_at_@ -1,3 +1,3 @@
 #!/bin/sh
-adduser -H -h /var/lib/syncthing -s /sbin/nologin -D syncthing 2>/dev/null
+adduser -S -H -h /var/lib/syncthing -s /sbin/nologin -D syncthing 2>/dev/null
 exit 0
diff --git a/main/amavisd-new/amavisd-new.pre-install b/main/amavisd-new/amavisd-new.pre-install
index 691ae27..bd8c3a6 100755
--- a/main/amavisd-new/amavisd-new.pre-install
+++ b/main/amavisd-new/amavisd-new.pre-install
_at_@ -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 762de83..81f4b06 100644
--- a/main/apache2/apache2.pre-install
+++ b/main/apache2/apache2.pre-install
_at_@ -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 e9d9bfb..21bf106 100644
--- a/main/aports-build/aports-build.pre-install
+++ b/main/aports-build/aports-build.pre-install
_at_@ -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 1bb8677..4198df2 100644
--- a/main/atheme-iris/atheme-iris.pre-install
+++ b/main/atheme-iris/atheme-iris.pre-install
_at_@ -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 3849716..3770738 100644
--- a/main/bind/bind.pre-install
+++ b/main/bind/bind.pre-install
_at_@ -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 2c54ecc..83c4560 100644
--- a/main/chrony/chrony.pre-install
+++ b/main/chrony/chrony.pre-install
_at_@ -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 7706eef..9bc70dd 100644
--- a/main/clamav/clamav-db.pre-install
+++ b/main/clamav/clamav-db.pre-install
_at_@ -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 7706eef..9bc70dd 100644
--- a/main/clamsmtp/clamsmtp.pre-install
+++ b/main/clamsmtp/clamsmtp.pre-install
_at_@ -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 97d9081..7e736a2 100644
--- a/main/clamsmtp/clamsmtp.pre-upgrade
+++ b/main/clamsmtp/clamsmtp.pre-upgrade
_at_@ -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 4bf0c3c..6ef8741 100644
--- a/main/coova-chilli/coova-chilli.pre-install
+++ b/main/coova-chilli/coova-chilli.pre-install
_at_@ -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 f2b4535..cf6b144 100644
--- a/main/cvechecker/cvechecker.pre-install
+++ b/main/cvechecker/cvechecker.pre-install
_at_@ -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 7f09003..27fa93f 100644
--- a/main/dhcp/dhcp.pre-install
+++ b/main/dhcp/dhcp.pre-install
_at_@ -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 bd7fba2..b07f846 100644
--- a/main/distcc/distcc.pre-install
+++ b/main/distcc/distcc.pre-install
_at_@ -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 f1f948e..106fc29 100644
--- a/main/djbdns/dnscache.pre-install
+++ b/main/djbdns/dnscache.pre-install
_at_@ -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 e3ab6ce..8676fb4 100644
--- a/main/djbdns/tinydns.pre-install
+++ b/main/djbdns/tinydns.pre-install
_at_@ -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 931d258..3e9e4b0 100644
--- a/main/dnsmasq/dnsmasq.pre-install
+++ b/main/dnsmasq/dnsmasq.pre-install
_at_@ -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 432a3b8..58346c6 100644
--- a/main/dovecot/dovecot.pre-install
+++ b/main/dovecot/dovecot.pre-install
_at_@ -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 7c1ea47..064e418 100644
--- a/main/ez-ipupdate/ez-ipupdate.pre-install
+++ b/main/ez-ipupdate/ez-ipupdate.pre-install
_at_@ -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 6122e0c..2961b9a 100644
--- a/main/fetchmail/fetchmail.pre-install
+++ b/main/fetchmail/fetchmail.pre-install
_at_@ -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 30ff048..b81e86d 100644
--- a/main/freeradius/freeradius.pre-install
+++ b/main/freeradius/freeradius.pre-install
_at_@ -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 88dcc89..4dccd57 100755
--- a/main/freeswitch/freeswitch.pre-install
+++ b/main/freeswitch/freeswitch.pre-install
_at_@ -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 dc6e44b..2479466 100644
--- a/main/gdnsd/gdnsd.pre-install
+++ b/main/gdnsd/gdnsd.pre-install
_at_@ -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 79a7a63..fbb1e2a 100644
--- a/main/gitolite/gitolite.pre-install
+++ b/main/gitolite/gitolite.pre-install
_at_@ -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 0a2e5a5..849841f 100644
--- a/main/gnats/gnats.pre-install
+++ b/main/gnats/gnats.pre-install
_at_@ -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 809dd4c..f79e657 100644
--- a/main/gross/gross.pre-install
+++ b/main/gross/gross.pre-install
_at_@ -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 33e0164..4706956 100644
--- a/main/haproxy/haproxy.pre-install
+++ b/main/haproxy/haproxy.pre-install
_at_@ -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 33e0164..4706956 100644
--- a/main/haproxy/haproxy.pre-upgrade
+++ b/main/haproxy/haproxy.pre-upgrade
_at_@ -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 e8e8610..9978a4b 100644
--- a/main/icecast/icecast.pre-install
+++ b/main/icecast/icecast.pre-install
_at_@ -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 58e5bb6..fd7b13e 100644
--- a/main/kamailio/kamailio.pre-install
+++ b/main/kamailio/kamailio.pre-install
_at_@ -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 9520292..2349478 100644
--- a/main/lighttpd/lighttpd.pre-install
+++ b/main/lighttpd/lighttpd.pre-install
_at_@ -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 61f3c23..b0f2a83 100644
--- a/main/logcheck/logcheck.pre-install
+++ b/main/logcheck/logcheck.pre-install
_at_@ -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 2e6e668..5b68b1e 100644
--- a/main/mariadb/mariadb.pre-install
+++ b/main/mariadb/mariadb.pre-install
_at_@ -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 bee8d7f..6612df9 100644
--- a/main/memcached/memcached.pre-install
+++ b/main/memcached/memcached.pre-install
_at_@ -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 c6043d3..38b8fb8 100644
--- a/main/mlmmj/mlmmj.pre-install
+++ b/main/mlmmj/mlmmj.pre-install
_at_@ -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 36bc1f8..5c8d34b 100644
--- a/main/ngircd/ngircd.pre-install
+++ b/main/ngircd/ngircd.pre-install
_at_@ -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 6acde2a..a9a0d38 100644
--- a/main/nrpe/nrpe.pre-install
+++ b/main/nrpe/nrpe.pre-install
_at_@ -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 10b989a..15fbca3 100644
--- a/main/open-vm-tools/open-vm-tools.pre-install
+++ b/main/open-vm-tools/open-vm-tools.pre-install
_at_@ -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 0b2be06..feb5d9c 100644
--- a/main/openntpd/openntpd.pre-install
+++ b/main/openntpd/openntpd.pre-install
_at_@ -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 21dd01f..480391c 100644
--- a/main/postgrey/postgrey.pre-install
+++ b/main/postgrey/postgrey.pre-install
_at_@ -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 cfc8428..72a917e 100644
--- a/main/privoxy/privoxy.pre-install
+++ b/main/privoxy/privoxy.pre-install
_at_@ -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 2e36f49..479434e 100644
--- a/main/redis/redis.pre-install
+++ b/main/redis/redis.pre-install
_at_@ -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 792e73a..ac4df3f 100644
--- a/main/samba/winbind.pre-install
+++ b/main/samba/winbind.pre-install
_at_@ -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 450fff3..453ba5d 100644
--- a/main/sircbot/sircbot.pre-install
+++ b/main/sircbot/sircbot.pre-install
_at_@ -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 490c4c1..8934148 100644
--- a/main/smokeping/smokeping.pre-install
+++ b/main/smokeping/smokeping.pre-install
_at_@ -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 80740eb..c8bf706 100644
--- a/main/snort/snort.pre-install
+++ b/main/snort/snort.pre-install
_at_@ -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 28120d3..3c40694 100755
--- a/main/squark/squark.post-install
+++ b/main/squark/squark.post-install
_at_@ -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 322d21d..b51ade1 100644
--- a/main/squid/squid.pre-install
+++ b/main/squid/squid.pre-install
_at_@ -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 322d21d..b51ade1 100644
--- a/main/squid/squid.pre-upgrade
+++ b/main/squid/squid.pre-upgrade
_at_@ -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 fb516ee..ddec16c 100644
--- a/main/subversion/subversion.pre-install
+++ b/main/subversion/subversion.pre-install
_at_@ -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 1479916..f39f2b2 100644
--- a/main/trac/trac.pre-install
+++ b/main/trac/trac.pre-install
_at_@ -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 9b7d6cb..2f9a398 100644
--- a/main/transmission/transmission-daemon.pre-install
+++ b/main/transmission/transmission-daemon.pre-install
_at_@ -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 4bdf064..200d233 100755
--- a/main/vsftpd/vsftpd.pre-install
+++ b/main/vsftpd/vsftpd.pre-install
_at_@ -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 0455be2..1bbd045 100644
--- a/main/ympd/ympd.pre-install
+++ b/main/ympd/ympd.pre-install
_at_@ -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 57d46c2..91ea88c 100644
--- a/main/zabbix/zabbix-agent.pre-install
+++ b/main/zabbix/zabbix-agent.pre-install
_at_@ -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 91f2f8d..ad5aed9 100644
--- a/main/znc/znc.pre-install
+++ b/main/znc/znc.pre-install
_at_@ -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
diff --git a/testing/3proxy/3proxy.pre-install b/testing/3proxy/3proxy.pre-install
index b1e227a..dbfa438 100644
--- a/testing/3proxy/3proxy.pre-install
+++ b/testing/3proxy/3proxy.pre-install
_at_@ -1,6 +1,6 @@
 #!/bin/sh
 
-addgroup 3proxy 2>/dev/null
+addgroup -S 3proxy 2>/dev/null
 adduser -S -G 3proxy -h /var/log/3proxy -s /sbin/nologin -D 3proxy 2>/dev/null
 exit 0
 
diff --git a/testing/at/at.pre-install b/testing/at/at.pre-install
index 058a9d0..5372277 100644
--- a/testing/at/at.pre-install
+++ b/testing/at/at.pre-install
_at_@ -5,7 +5,7 @@ if ! getent group at >/dev/null; then
 fi
 
 if ! getent passwd at >/dev/null; then
-	adduser -H -s /bin/false -D at 2>/dev/null
+	adduser -S -H -s /bin/false -D at 2>/dev/null
 fi
 
 if [ -z `echo " $(groups at) " | grep ' at '`] ; then
diff --git a/testing/buildbot-slave/buildbot-slave.pre-install b/testing/buildbot-slave/buildbot-slave.pre-install
index 7e52d9c..40e2945 100644
--- a/testing/buildbot-slave/buildbot-slave.pre-install
+++ b/testing/buildbot-slave/buildbot-slave.pre-install
_at_@ -1,4 +1,4 @@
 #!/bin/sh
-adduser -H -h /home/buildbot -g buildbot -D -s /sbin/nologin buildbot 2>/dev/null
+adduser -S -H -h /home/buildbot -g buildbot -D -s /sbin/nologin buildbot 2>/dev/null
 exit 0
 
diff --git a/testing/buildbot/buildbot.pre-install b/testing/buildbot/buildbot.pre-install
index 7e52d9c..40e2945 100644
--- a/testing/buildbot/buildbot.pre-install
+++ b/testing/buildbot/buildbot.pre-install
_at_@ -1,4 +1,4 @@
 #!/bin/sh
-adduser -H -h /home/buildbot -g buildbot -D -s /sbin/nologin buildbot 2>/dev/null
+adduser -S -H -h /home/buildbot -g buildbot -D -s /sbin/nologin buildbot 2>/dev/null
 exit 0
 
diff --git a/testing/clapf/clapf.pre-install b/testing/clapf/clapf.pre-install
index 01997df..bf78879 100644
--- a/testing/clapf/clapf.pre-install
+++ b/testing/clapf/clapf.pre-install
_at_@ -1,3 +1,3 @@
 #!/bin/sh
-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/testing/cluster-glue/cluster-glue.pre-install b/testing/cluster-glue/cluster-glue.pre-install
index 4e7f2f5..056fbde 100644
--- a/testing/cluster-glue/cluster-glue.pre-install
+++ b/testing/cluster-glue/cluster-glue.pre-install
_at_@ -1,7 +1,7 @@
 #!/bin/sh
 
-addgroup haclient 2>/dev/null
-adduser hacluster \
+addgroup -S haclient 2>/dev/null
+adduser -S hacluster \
 	-h /var/lib/heartbeat/cores/hacluster \
 	-G haclient \
 	-s /sbin/nologin \
diff --git a/testing/dbmail/dbmail.pre-install b/testing/dbmail/dbmail.pre-install
index 1abaeb9..aa19b67 100644
--- a/testing/dbmail/dbmail.pre-install
+++ b/testing/dbmail/dbmail.pre-install
_at_@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -s /bin/false -D -H -h /var/lib/dbmail dbmail 2>/dev/null
+adduser -S -s /bin/false -D -H -h /var/lib/dbmail dbmail 2>/dev/null
 exit 0
 
diff --git a/testing/dspam/dspam.pre-install b/testing/dspam/dspam.pre-install
index 9a6cc6f..2eb8940 100644
--- a/testing/dspam/dspam.pre-install
+++ b/testing/dspam/dspam.pre-install
_at_@ -1,6 +1,6 @@
 #!/bin/sh
 
-adduser -h /var/lib/dspam -s /bin/false -D dspam 2>/dev/null
+adduser -S -h /var/lib/dspam -s /bin/false -D dspam 2>/dev/null
 chown dspam:dspam /var/lib/dspam
 exit 0
 
diff --git a/testing/ejabberd/ejabberd.pre-install b/testing/ejabberd/ejabberd.pre-install
index 4111b31..6d80151 100644
--- a/testing/ejabberd/ejabberd.pre-install
+++ b/testing/ejabberd/ejabberd.pre-install
_at_@ -1,3 +1,3 @@
 #!/bin/sh
-adduser -H -h /var/lib/ejabberd -G ejabberd -D ejabberd  2>/dev/null
+adduser -S -H -h /var/lib/ejabberd -G ejabberd -D ejabberd  2>/dev/null
 exit 0
diff --git a/testing/elasticsearch/elasticsearch.pre-install b/testing/elasticsearch/elasticsearch.pre-install
index 9e96765..63e023a 100644
--- a/testing/elasticsearch/elasticsearch.pre-install
+++ b/testing/elasticsearch/elasticsearch.pre-install
_at_@ -1,6 +1,6 @@
 #!/bin/sh
 
-addgroup elastico
+addgroup -S elastico
 adduser -S -h /var/lib/elasticsearch -s /sbin/nologin -G elastico \
 	-g "added by apk for elasticsearch" -DH elastico
 
diff --git a/testing/emby/emby.pre-install b/testing/emby/emby.pre-install
index b3431b2..cfe5965 100644
--- a/testing/emby/emby.pre-install
+++ b/testing/emby/emby.pre-install
_at_@ -1,5 +1,5 @@
 #!/bin/sh
-addgroup emby 2>/dev/null
-adduser -D -h /var/lib/emby -s /sbin/nologin -g "Emby media server" \
+addgroup -S emby 2>/dev/null
+adduser -S -D -h /var/lib/emby -s /sbin/nologin -g "Emby media server" \
 	-G emby emby 2>/dev/null
 exit 0
diff --git a/testing/gdnsd/gdnsd.pre-install b/testing/gdnsd/gdnsd.pre-install
index dc6e44b..2479466 100644
--- a/testing/gdnsd/gdnsd.pre-install
+++ b/testing/gdnsd/gdnsd.pre-install
_at_@ -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/testing/lusca/lusca.pre-install b/testing/lusca/lusca.pre-install
index 2ed0cc5..7679028 100644
--- a/testing/lusca/lusca.pre-install
+++ b/testing/lusca/lusca.pre-install
_at_@ -1,6 +1,6 @@
 #!/bin/sh
 
 adduser -S -D lusca -h /var/cache/lusca -s /sbin/nologin  2>/dev/null
-addgroup winbind 2>/dev/null
+addgroup -S winbind 2>/dev/null
 addgroup lusca winbind
 exit 0
diff --git a/testing/lusca/lusca.pre-upgrade b/testing/lusca/lusca.pre-upgrade
index 2ed0cc5..7679028 100644
--- a/testing/lusca/lusca.pre-upgrade
+++ b/testing/lusca/lusca.pre-upgrade
_at_@ -1,6 +1,6 @@
 #!/bin/sh
 
 adduser -S -D lusca -h /var/cache/lusca -s /sbin/nologin  2>/dev/null
-addgroup winbind 2>/dev/null
+addgroup -S winbind 2>/dev/null
 addgroup lusca winbind
 exit 0
diff --git a/testing/mongodb/mongodb.pre-install b/testing/mongodb/mongodb.pre-install
index 9b4b642..432d983 100644
--- a/testing/mongodb/mongodb.pre-install
+++ b/testing/mongodb/mongodb.pre-install
_at_@ -1,5 +1,5 @@
 #!/bin/sh
 
-addgroup mongodb
-adduser -D -G mongodb -h /var/lib/mongodb -s /sbin/nologin mongodb
+addgroup -S mongodb
+adduser -S -D -G mongodb -h /var/lib/mongodb -s /sbin/nologin mongodb
 exit 0
diff --git a/testing/opensips/opensips.pre-install b/testing/opensips/opensips.pre-install
index 4b9ccd4..5da9a0e 100644
--- a/testing/opensips/opensips.pre-install
+++ b/testing/opensips/opensips.pre-install
_at_@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -H -h /var/empty -s /bin/false -D opensips  2>/dev/null
+adduser -S -H -h /var/empty -s /bin/false -D opensips  2>/dev/null
 
 exit 0
diff --git a/testing/openxcap/openxcap.pre-install b/testing/openxcap/openxcap.pre-install
index c67a449..0323113 100755
--- a/testing/openxcap/openxcap.pre-install
+++ b/testing/openxcap/openxcap.pre-install
_at_@ -1,5 +1,5 @@
 #!/bin/sh
 
-addgroup openxcap 2>/dev/null
+addgroup -S openxcap 2>/dev/null
 adduser -S -G openxcap -h /var/run/openxcap -s /bin/false -D -H openxcap 2>/dev/null
 exit 0
diff --git a/testing/pdns/pdns.pre-install b/testing/pdns/pdns.pre-install
index c9d2d14..2565d49 100644
--- a/testing/pdns/pdns.pre-install
+++ b/testing/pdns/pdns.pre-install
_at_@ -1,4 +1,4 @@
 #!/bin/sh
 
-adduser -H -h /var/empty -D -s /bin/false pdns 2>/dev/null
+adduser -S -H -h /var/empty -D -s /bin/false pdns 2>/dev/null
 exit 0
diff --git a/testing/prosody/prosody.pre-install b/testing/prosody/prosody.pre-install
index 2dbe8bf..e2fab21 100644
--- a/testing/prosody/prosody.pre-install
+++ b/testing/prosody/prosody.pre-install
_at_@ -1,6 +1,6 @@
 #!/bin/sh
-addgroup prosody 2>/dev/null
-adduser -D \
+addgroup -S prosody 2>/dev/null
+adduser -S -D \
 	-h /var/lib/prosody \
 	-s /sbin/nologin \
 	-g "Prosody XMPP Server" \
diff --git a/testing/qpage/qpage.pre-install b/testing/qpage/qpage.pre-install
index c463899..160fc0b 100644
--- a/testing/qpage/qpage.pre-install
+++ b/testing/qpage/qpage.pre-install
_at_@ -1,3 +1,3 @@
 #!/bin/sh
 
-adduser -h /var/lib/qpage -s /bin/false -G qpage -D qpage 2>/dev/null || true
+adduser -S -h /var/lib/qpage -s /bin/false -G qpage -D qpage 2>/dev/null || true
diff --git a/testing/rancid/rancid.pre-install b/testing/rancid/rancid.pre-install
index aa86d1c..55691b2 100644
--- a/testing/rancid/rancid.pre-install
+++ b/testing/rancid/rancid.pre-install
_at_@ -1,5 +1,5 @@
 #!/bin/sh
 
-addgroup netadm 2>/dev/null
+addgroup -S netadm 2>/dev/null
 adduser -S -h /var/rancid -s /bin/sh -G netadm -D rancid 2>/dev/null
 exit 0
diff --git a/testing/rrdbot/rrdbot.pre-install b/testing/rrdbot/rrdbot.pre-install
index 2c35d02..ab339f8 100644
--- a/testing/rrdbot/rrdbot.pre-install
+++ b/testing/rrdbot/rrdbot.pre-install
_at_@ -2,6 +2,6 @@
 
 # this user should be included in alpine-baselayout-1.2.
 # included here for backward compability.
-adduser -H -s /bin/false -D rrdbotd  2>/dev/null
+adduser -S -H -s /bin/false -D rrdbotd  2>/dev/null
 
 exit 0
diff --git a/testing/rutorrent/rutorrent.pre-install b/testing/rutorrent/rutorrent.pre-install
index 2d0c909..0d81455 100644
--- a/testing/rutorrent/rutorrent.pre-install
+++ b/testing/rutorrent/rutorrent.pre-install
_at_@ -1,4 +1,4 @@
 #!/bin/sh
-addgroup rutorrent 2>/dev/null
+addgroup -S rutorrent 2>/dev/null
 exit 0
 
diff --git a/testing/wt/wt.pre-install b/testing/wt/wt.pre-install
index 8fca39d..e4478b2 100644
--- a/testing/wt/wt.pre-install
+++ b/testing/wt/wt.pre-install
_at_@ -1,5 +1,5 @@
 #!/bin/sh
 addgroup -S -g 82 www-data 2>/dev/null
-adduser -H -s /sbin/nologin -D wt 2>/dev/null
+adduser -S -H -s /sbin/nologin -D wt 2>/dev/null
 addgroup wt www-data 2>/dev/null
 exit 0
diff --git a/testing/zabbix/zabbix-agent.pre-install b/testing/zabbix/zabbix-agent.pre-install
index 57d46c2..3e42ff0 100644
--- a/testing/zabbix/zabbix-agent.pre-install
+++ b/testing/zabbix/zabbix-agent.pre-install
_at_@ -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
+addgroup -S -g 30 zabbix 2>/dev/null
 exit 0
diff --git a/unmaintained/ejabberd-git/ejabberd-git.pre-install b/unmaintained/ejabberd-git/ejabberd-git.pre-install
index 4111b31..6d80151 100644
--- a/unmaintained/ejabberd-git/ejabberd-git.pre-install
+++ b/unmaintained/ejabberd-git/ejabberd-git.pre-install
_at_@ -1,3 +1,3 @@
 #!/bin/sh
-adduser -H -h /var/lib/ejabberd -G ejabberd -D ejabberd  2>/dev/null
+adduser -S -H -h /var/lib/ejabberd -G ejabberd -D ejabberd  2>/dev/null
 exit 0
-- 
2.6.6
---
Unsubscribe:  alpine-aports+unsubscribe_at_lists.alpinelinux.org
Help:         alpine-aports+help_at_lists.alpinelinux.org
---
Received on Sat Apr 23 2016 - 13:13:37 GMT