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

25 files changed, 30 insertions, 30 deletions

diff --git a/testing/3proxy/3proxy.pre-install b/testing/3proxy/3proxy.pre-install
index b1e227a96..dbfa4381d 100644
--- a/testing/3proxy/3proxy.pre-install
+++ b/testing/3proxy/3proxy.pre-install
@@ -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 058a9d0ca..5372277bb 100644
--- a/testing/at/at.pre-install
+++ b/testing/at/at.pre-install
@@ -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 7e52d9ccf..40e29454c 100644
--- a/testing/buildbot-slave/buildbot-slave.pre-install
+++ b/testing/buildbot-slave/buildbot-slave.pre-install
@@ -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 7e52d9ccf..40e29454c 100644
--- a/testing/buildbot/buildbot.pre-install
+++ b/testing/buildbot/buildbot.pre-install
@@ -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 01997df89..bf7887954 100644
--- a/testing/clapf/clapf.pre-install
+++ b/testing/clapf/clapf.pre-install
@@ -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 4e7f2f5ba..056fbde8f 100644
--- a/testing/cluster-glue/cluster-glue.pre-install
+++ b/testing/cluster-glue/cluster-glue.pre-install
@@ -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 1abaeb9c0..aa19b6707 100644
--- a/testing/dbmail/dbmail.pre-install
+++ b/testing/dbmail/dbmail.pre-install
@@ -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 9a6cc6f1e..2eb89408d 100644
--- a/testing/dspam/dspam.pre-install
+++ b/testing/dspam/dspam.pre-install
@@ -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 4111b3189..6d8015165 100644
--- a/testing/ejabberd/ejabberd.pre-install
+++ b/testing/ejabberd/ejabberd.pre-install
@@ -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 9e96765bd..63e023a16 100644
--- a/testing/elasticsearch/elasticsearch.pre-install
+++ b/testing/elasticsearch/elasticsearch.pre-install
@@ -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 b3431b260..cfe59652f 100644
--- a/testing/emby/emby.pre-install
+++ b/testing/emby/emby.pre-install
@@ -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 dc6e44b9c..247946687 100644
--- a/testing/gdnsd/gdnsd.pre-install
+++ b/testing/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/testing/lusca/lusca.pre-install b/testing/lusca/lusca.pre-install
index 2ed0cc5cf..76790288e 100644
--- a/testing/lusca/lusca.pre-install
+++ b/testing/lusca/lusca.pre-install
@@ -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 2ed0cc5cf..76790288e 100644
--- a/testing/lusca/lusca.pre-upgrade
+++ b/testing/lusca/lusca.pre-upgrade
@@ -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 9b4b642f6..432d98384 100644
--- a/testing/mongodb/mongodb.pre-install
+++ b/testing/mongodb/mongodb.pre-install
@@ -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 4b9ccd418..5da9a0e28 100644
--- a/testing/opensips/opensips.pre-install
+++ b/testing/opensips/opensips.pre-install
@@ -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 c67a449d3..032311392 100755
--- a/testing/openxcap/openxcap.pre-install
+++ b/testing/openxcap/openxcap.pre-install
@@ -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 c9d2d1473..2565d49cf 100644
--- a/testing/pdns/pdns.pre-install
+++ b/testing/pdns/pdns.pre-install
@@ -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 2dbe8bf5b..e2fab2127 100644
--- a/testing/prosody/prosody.pre-install
+++ b/testing/prosody/prosody.pre-install
@@ -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 c463899a1..160fc0b45 100644
--- a/testing/qpage/qpage.pre-install
+++ b/testing/qpage/qpage.pre-install
@@ -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 aa86d1cc5..55691b2f6 100644
--- a/testing/rancid/rancid.pre-install
+++ b/testing/rancid/rancid.pre-install
@@ -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 2c35d02d1..ab339f8c8 100644
--- a/testing/rrdbot/rrdbot.pre-install
+++ b/testing/rrdbot/rrdbot.pre-install
@@ -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 2d0c909c3..0d814556e 100644
--- a/testing/rutorrent/rutorrent.pre-install
+++ b/testing/rutorrent/rutorrent.pre-install
@@ -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 8fca39d25..e4478b2bf 100644
--- a/testing/wt/wt.pre-install
+++ b/testing/wt/wt.pre-install
@@ -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 57d46c251..3e42ff09f 100644
--- a/testing/zabbix/zabbix-agent.pre-install
+++ b/testing/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
+addgroup -S -g 30 zabbix 2>/dev/null
 exit 0