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

community/caddy/caddy.pre-install

@@ -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

community/domoticz/domoticz.pre-install

@@ -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

community/icinga2/icinga2.pre-install

@@ -1,6 +1,6 @@
 #!/bin/sh
-addgroup icinga 2>/dev/null
+addgroup -S icinga 2>/dev/null
-addgroup icingacmd 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

community/minetest/minetest-server.pre-install

@@ -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

community/oscam/oscam.pre-install

@@ -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

community/seafile/seafile-server.pre-install

@@ -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

community/sword/sword.pre-install

@@ -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

community/syncthing/syncthing.pre-install

@@ -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

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
 

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

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

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
 

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
 

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

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

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

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

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
 

main/cvechecker/cvechecker.pre-install

@@ -1,3 +1,3 @@
 #!/bin/sh
-addgroup cvechecker &>/dev/null
+addgroup -S cvechecker &>/dev/null
-adduser cvechecker -h /var/cvechecker -DG cvechecker &>/dev/null
+adduser -S cvechecker -h /var/cvechecker -DG cvechecker &>/dev/null

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
 

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

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
 

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
 

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

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 -S -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 91 -H -h /dev/null -s /sbin/nologin -D dovenull 2>/dev/null
 exit 0

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
 

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

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
 

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

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

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

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

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

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
 

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
 

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

main/kamailio/kamailio.pre-install

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-addgroup kamailio 2>/dev/null
+addgroup -S kamailio 2>/dev/null
-adduser -H -h /var/empty -s /sbin/nologin -D -G kamailio kamailio  2>/dev/null
+adduser -S -H -h /var/empty -s /sbin/nologin -D -G kamailio kamailio  2>/dev/null
 
 exit 0

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

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

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
 

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
 

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

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

main/nrpe/nrpe.pre-install

@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -H -h /dev/null -s /sbin/nologin -D nagios 2>/dev/null
+adduser -S -H -h /dev/null -s /sbin/nologin -D nagios 2>/dev/null
-addgroup nagios 2>/dev/null
+addgroup -S nagios 2>/dev/null
 exit 0

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
 

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

main/postgrey/postgrey.pre-install

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-addgroup postgrey 2>/dev/null
+addgroup -S postgrey 2>/dev/null
-adduser -H -h /dev/null -s /sbin/nologin -D postgrey  2>/dev/null
+adduser -S -H -h /dev/null -s /sbin/nologin -D postgrey  2>/dev/null
 
 exit 0

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
 

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

main/samba/winbind.pre-install

@@ -1,5 +1,5 @@
 #!/bin/sh
 
-addgroup winbind 2>/dev/null
+addgroup -S winbind 2>/dev/null
 
 exit 0

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

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

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

main/squark/squark.post-install

@@ -1,2 +1,2 @@
 #!/bin/sh
-addgroup squark &>/dev/null || exit 0
+addgroup -S squark &>/dev/null || exit 0

main/squid/squid.pre-install

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-adduser -D squid -H /var/cache/squid  2>/dev/null
+adduser -S -D squid -H /var/cache/squid  2>/dev/null
-addgroup winbind 2>/dev/null
+addgroup -S winbind 2>/dev/null
 addgroup squid winbind
 exit 0

main/squid/squid.pre-upgrade

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-adduser -D squid -H /var/cache/squid  2>/dev/null
+adduser -S -D squid -H /var/cache/squid  2>/dev/null
-addgroup winbind 2>/dev/null
+addgroup -S winbind 2>/dev/null
 addgroup squid winbind
 exit 0

main/subversion/subversion.pre-install

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-addgroup svnusers 2>/dev/null
+addgroup -S svnusers 2>/dev/null
-adduser svn -D -h /var/svn -G svnusers 2>/dev/null
+adduser -S svn -D -h /var/svn -G svnusers 2>/dev/null
 exit 0
 

main/trac/trac.pre-install

@@ -1,5 +1,5 @@
 #!/bin/sh
 
-addgroup tracd 2>/dev/null
+addgroup -S tracd 2>/dev/null
-adduser -s /sbin/nologin -G tracd -D -H tracd 2>/dev/null
+adduser -S -s /sbin/nologin -G tracd -D -H tracd 2>/dev/null
 exit 0

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

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

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

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

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

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
 

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

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
 

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
 

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

testing/cluster-glue/cluster-glue.pre-install

@@ -1,7 +1,7 @@
 #!/bin/sh
 
-addgroup haclient 2>/dev/null
+addgroup -S haclient 2>/dev/null
-adduser hacluster \
+adduser -S hacluster \
 	-h /var/lib/heartbeat/cores/hacluster \
 	-G haclient \
 	-s /sbin/nologin \

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
 

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
 

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

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
 

testing/emby/emby.pre-install

@@ -1,5 +1,5 @@
 #!/bin/sh
-addgroup emby 2>/dev/null
+addgroup -S emby 2>/dev/null
-adduser -D -h /var/lib/emby -s /sbin/nologin -g "Emby media server" \
+adduser -S -D -h /var/lib/emby -s /sbin/nologin -g "Emby media server" \
 	-G emby emby 2>/dev/null
 exit 0

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

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

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

testing/mongodb/mongodb.pre-install

@@ -1,5 +1,5 @@
 #!/bin/sh
 
-addgroup mongodb
+addgroup -S mongodb
-adduser -D -G mongodb -h /var/lib/mongodb -s /sbin/nologin mongodb
+adduser -S -D -G mongodb -h /var/lib/mongodb -s /sbin/nologin mongodb
 exit 0

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

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

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

testing/prosody/prosody.pre-install

@@ -1,6 +1,6 @@
 #!/bin/sh
-addgroup prosody 2>/dev/null
+addgroup -S prosody 2>/dev/null
-adduser -D \
+adduser -S -D \
 	-h /var/lib/prosody \
 	-s /sbin/nologin \
 	-g "Prosody XMPP Server" \

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

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

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

testing/rutorrent/rutorrent.pre-install

@@ -1,4 +1,4 @@
 #!/bin/sh
-addgroup rutorrent 2>/dev/null
+addgroup -S rutorrent 2>/dev/null
 exit 0
 

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

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

unmaintained/ejabberd-git/ejabberd-git.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