Reorder arguments passed to addgroup/adduser in scripts.

Now all invocations have following order of arguments (if present):

    addgroup -S -g ... GROUP
    adduser -S -u ... -D -H -h ... -s ... -G ... -g ... USER

community/caddy/caddy.pre-install

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-adduser -S -h /var/lib/caddy -D -s /sbin/nologin -g caddy caddy 2>/dev/null
+adduser -S -D -h /var/lib/caddy -s /sbin/nologin -g caddy caddy 2>/dev/null
 adduser caddy www-data 2>/dev/null
 
 exit 0

community/docker-registry/docker-registry.pre-install

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

community/domoticz/domoticz.pre-install

@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -h /var/lib/domoticz -D -s /sbin/nologin -g domoticz domoticz 2>/dev/null
+adduser -S -D -h /var/lib/domoticz -s /sbin/nologin -g domoticz domoticz 2>/dev/null
 
 exit 0

community/icinga2/icinga2.pre-install

@@ -2,7 +2,7 @@
 
 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 -g icinga icinga 2>/dev/null
+adduser -S -D -H -h /var/spool/icinga2 -s /sbin/nologin -G icinga -g icinga icinga 2>/dev/null
 adduser icinga icingacmd 2>/dev/null
 
 exit 0

community/minetest/minetest-server.pre-install

@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -s /sbin/nologin -D -h /var/lib/minetest -g minetest minetest games 2>/dev/null
+adduser -S -D -h /var/lib/minetest -s /sbin/nologin -G games -g minetest minetest 2>/dev/null
 
 exit 0

community/oscam/oscam.pre-install

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

community/redmine/redmine.pre-install

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 addgroup -S -g 82 www-data 2>/dev/null
-adduser -S -H -h /usr/share/webapps/redmine -s /bin/sh -D -g redmine redmine 2>/dev/null
+adduser -S -D -H -h /usr/share/webapps/redmine -s /bin/sh -g redmine redmine 2>/dev/null
 addgroup redmine www-data 2>/dev/null
 
 exit 0

community/seafile/seafile-server.pre-install

@@ -3,6 +3,6 @@
 SEAFILE_HOME=/var/lib/seafile
 
 addgroup -S -g 800 seafile 2>/dev/null
-adduser -S -h $SEAFILE_HOME -s /bin/sh -G seafile -g seafile -u 800 -D seafile 2>/dev/null
+adduser -S -u 800 -D -h $SEAFILE_HOME -s /bin/sh -G seafile -g seafile seafile 2>/dev/null
 
 exit 0

community/smstools/smstools.pre-install

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 addgroup -S smsd 2>/dev/null
-adduser -S -h /var/spool/sms -s /sbin/nologin -G smsd -D -g smsd smsd 2>/dev/null
+adduser -S -D -h /var/spool/sms -s /sbin/nologin -G smsd -g smsd smsd 2>/dev/null
 adduser -G uucp smsd 2>/dev/null
 
 exit 0

community/sniproxy/sniproxy.pre-install

@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S sniproxy 2>/dev/null
-adduser -S -h /var/log/sniproxy -s /bin/false -D -g sniproxy sniproxy 2>/dev/null
+adduser -S -D -h /var/log/sniproxy -s /bin/false -g sniproxy sniproxy 2>/dev/null
 
 exit 0

community/syncthing/syncthing.pre-install

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

community/tvheadend/tvheadend.pre-install

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-adduser -S -G video -s /sbin/nologin -H -h /usr/share/tvheadend -g tvheadend tvheadend 2>/dev/null
+adduser -S -H -h /usr/share/tvheadend -s /sbin/nologin -G video -g tvheadend tvheadend 2>/dev/null
 addgroup tvheadend usb 2>/dev/null
 
 exit 0

main/amavisd-new/amavisd-new.pre-install

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

main/apache2/apache2.pre-install

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 addgroup -S -g 82 www-data 2>/dev/null
-adduser -S -H -h /var/www -s /sbin/nologin -D -g apache apache 2>/dev/null
+adduser -S -D -H -h /var/www -s /sbin/nologin -g apache apache 2>/dev/null
 addgroup apache www-data 2>/dev/null
 
 exit 0

main/arpwatch/arpwatch.pre-install

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

main/asterisk/asterisk.pre-install

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-adduser -S -h /var/lib/asterisk -s /sbin/nologin -D -g asterisk asterisk 2>/dev/null
+adduser -S -D -h /var/lib/asterisk -s /sbin/nologin -g asterisk asterisk 2>/dev/null
 addgroup -S dialout 2>/dev/null
 addgroup asterisk dialout 2>/dev/null
 

main/asterisk/asterisk.pre-upgrade

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-adduser -S -h /var/lib/asterisk -s /bin/false -D -g asterisk asterisk 2>/dev/null
+adduser -S -D -h /var/lib/asterisk -s /bin/false -g asterisk asterisk 2>/dev/null
 addgroup -S dialout 2>/dev/null
 addgroup asterisk dialout 2>/dev/null
 

main/atheme-iris/atheme-iris.pre-install

@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -H -h /usr/share/webapps/atheme-iris -g iris -D -s /sbin/nologin iris >/dev/null
+adduser -S -D -H -h /usr/share/webapps/atheme-iris -s /sbin/nologin -g iris iris >/dev/null
 
 exit 0

main/avahi/avahi.pre-install

@@ -2,12 +2,11 @@
 
 addgroup -S -g 28 netdev 2>/dev/null
 addgroup -S -g 86 avahi 2>/dev/null
-adduser -S -u 86 \
+adduser -S -u 86 -D -H \
 	-h /var/run/avahi-daemon \
 	-s /sbin/nologin \
-	-D -H \
-	-g "Avahi System User" \
 	-G avahi \
+	-g "Avahi System User" \
 	avahi 2>/dev/null
 
 exit 0

main/backuppc/backuppc.pre-install

@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S backuppc 2>/dev/null
-adduser -S -h /var/lib/BackupPC -s /bin/sh -D -H -G backuppc -g "BackupPC user" backuppc 2>/dev/null
+adduser -S -D -H -h /var/lib/BackupPC -s /bin/sh -G backuppc -g "BackupPC user" backuppc 2>/dev/null
 
 exit 0

main/bacula-client/bacula-client.pre-install

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

main/bacula/bacula.pre-install

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

main/bind/bind.pre-install

@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S named 2>/dev/null
-adduser -S -h /etc/bind -s /sbin/nologin -G named -D -g named named 2>/dev/null
+adduser -S -D -h /etc/bind -s /sbin/nologin -G named -g named named 2>/dev/null
 
 exit 0

main/charybdis/charybdis.pre-install

@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -h /var/run/charybdis -s /sbin/nologin -D -g ircd ircd 2>/dev/null
+adduser -S -D -h /var/run/charybdis -s /sbin/nologin -g ircd ircd 2>/dev/null
 
 exit 0

main/chrony/chrony.pre-install

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

main/clamav/clamav-daemon.pre-install

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

main/clamav/clamav-db.pre-install

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

main/clamav/freshclam.pre-install

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

main/clamsmtp/clamsmtp.pre-install

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

main/clamsmtp/clamsmtp.pre-upgrade

@@ -10,6 +10,6 @@ if [ -f "$old" ] && [ ! -f "$new" ]; then
 	echo " *"
 fi
 
-adduser -S -H -s /bin/false -D -g clamav clamav 2>/dev/null
+adduser -S -D -H -s /bin/false -g clamav clamav 2>/dev/null
 
 exit 0

main/coova-chilli/coova-chilli.pre-install

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

main/cvechecker/cvechecker.pre-install

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

main/darkhttpd/darkhttpd.pre-install

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 addgroup -S -g 82 www-data 2>/dev/null
-adduser -S -H -h /var/www/localhost/htdocs -s /sbin/nologin -D -g darkhttpd \
+adduser -S -D -H -h /var/www/localhost/htdocs -s /sbin/nologin -g darkhttpd \
 	darkhttpd 2>/dev/null
 addgroup darkhttpd www-data 2>/dev/null
 

main/dbus/dbus.pre-install

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

main/dhcp/dhcp.pre-install

@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -h /var/lib/dhcp -s /sbin/nologin -D -g dhcp dhcp 2>/dev/null
+adduser -S -D -h /var/lib/dhcp -s /sbin/nologin -g dhcp dhcp 2>/dev/null
 
 exit 0

main/distcc/distcc.pre-install

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

main/djbdns/dnscache.pre-install

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

main/djbdns/tinydns.pre-install

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

main/dnsmasq/dnsmasq.pre-install

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

main/dovecot/dovecot.pre-install

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-adduser -S -u 90 -H -h /dev/null -s /sbin/nologin -D -g dovecot dovecot 2>/dev/null
-adduser -S -u 91 -H -h /dev/null -s /sbin/nologin -D -g dovenull dovenull 2>/dev/null
+adduser -S -u 90 -D -H -h /dev/null -s /sbin/nologin -g dovecot dovecot 2>/dev/null
+adduser -S -u 91 -D -H -h /dev/null -s /sbin/nologin -g dovenull dovenull 2>/dev/null
 
 exit 0

main/ez-ipupdate/ez-ipupdate.pre-install

@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -h /var/lib/ez-ipupdate -s /sbin/nologin -D -g ipupdate ipupdate 2>/dev/null
+adduser -S -D -h /var/lib/ez-ipupdate -s /sbin/nologin -g ipupdate ipupdate 2>/dev/null
 
 exit 0

main/fetchmail/fetchmail.pre-install

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

main/freeradius/freeradius.pre-install

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

main/freeswitch/freeswitch.pre-install

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

main/gdnsd/gdnsd.pre-install

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

main/gitolite/gitolite.pre-install

@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -H -h /var/lib/git -s /bin/sh -D -g git git 2>/dev/null
+adduser -S -D -H -h /var/lib/git -s /bin/sh -g git git 2>/dev/null
 
 exit 0

main/gnats/gnats.pre-install

@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -h /var/lib/gnatsdb -D -g gnats gnats 2>/dev/null
+adduser -S -D -h /var/lib/gnatsdb -g gnats gnats 2>/dev/null
 
 exit 0

main/gross/gross.pre-install

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

main/haproxy/haproxy.pre-install

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 addgroup -S haproxy 2>/dev/null
-adduser -S -H -h /var/lib/haproxy -s /bin/false -D \
+adduser -S -D -H -h /var/lib/haproxy -s /bin/false \
 	-G haproxy -g haproxy haproxy 2>/dev/null
 
 # move config to new location

main/haproxy/haproxy.pre-upgrade

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 addgroup -S haproxy 2>/dev/null
-adduser -S -H -h /var/lib/haproxy -s /bin/false -D \
+adduser -S -D -H -h /var/lib/haproxy -s /bin/false \
 	-G haproxy -g haproxy haproxy 2>/dev/null
 
 # move config to new location

main/icecast/icecast.pre-install

@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -h /var/log/icecast -s /sbin/nologin -D -g icecast icecast 2>/dev/null
+adduser -S -D -h /var/log/icecast -s /sbin/nologin -g icecast icecast 2>/dev/null
 
 exit 0

main/ircservices/ircservices.pre-install

@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -h /var/lib/ircservices -s /sbin/nologin -D -g ircservices ircservices 2>/dev/null
+adduser -S -D -h /var/lib/ircservices -s /sbin/nologin -g ircservices ircservices 2>/dev/null
 
 exit 0

main/kamailio/kamailio.pre-install

@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S kamailio 2>/dev/null
-adduser -S -H -h /var/empty -s /sbin/nologin -D -G kamailio -g kamailio kamailio 2>/dev/null
+adduser -S -D -H -h /var/empty -s /sbin/nologin -G kamailio -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 -S -H -h /var/www/localhost/htdocs -s /sbin/nologin -D -g lighttpd lighttpd 2>/dev/null
+adduser -S -D -H -h /var/www/localhost/htdocs -s /sbin/nologin -g lighttpd lighttpd 2>/dev/null
 addgroup lighttpd www-data 2>/dev/null
 
 exit 0

main/logcheck/logcheck.pre-install

@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S logcheck 2>/dev/null
-adduser -S -H -h /dev/null -s /sbin/nologin -D -G logcheck -g logcheck logcheck 2>/dev/null
+adduser -S -D -H -h /dev/null -s /sbin/nologin -G logcheck -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 -S -h /var/lib/mysql -s /sbin/nologin -G mysql -D -g mysql mysql 2>/dev/null
+adduser -S -D -h /var/lib/mysql -s /sbin/nologin -G mysql -g mysql mysql 2>/dev/null
 
 exit 0

main/memcached/memcached.pre-install

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

main/mini_httpd/mini_httpd.pre-install

@@ -8,8 +8,8 @@ if [ -f /etc/mini_httpd.conf ] && ! [ -L /etc/mini_httpd.conf ]; then
 fi
 
 addgroup -S -g 82 www-data 2>/dev/null
-adduser -S -H -h /var/www/localhost/htdocs -s /sbin/nologin \
-        -D -g minihttpd minihttpd 2>/dev/null
+adduser -S -D -H -h /var/www/localhost/htdocs -s /sbin/nologin \
+        -g minihttpd minihttpd 2>/dev/null
 addgroup minihttpd www-data 2>/dev/null
 
 exit 0

main/minidlna/minidlna.pre-install

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 addgroup -S minidlna 2>/dev/null
-adduser -S -H -h /var/run/minidlna -s /sbin/nologin -D -G minidlna \
+adduser -S -D -H -h /var/run/minidlna -s /sbin/nologin -G minidlna \
 	-g minidlna minidlna 2>/dev/null
 
 exit 0

main/mlmmj/mlmmj.pre-install

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

main/mosquitto/mosquitto.pre-install

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

main/mpd/mpd.pre-install

@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -h /var/lib/mpd -s /sbin/nologin -G audio -D -g mpd mpd 2>/dev/null
+adduser -S -D -h /var/lib/mpd -s /sbin/nologin -G audio -g mpd mpd 2>/dev/null
 
 exit 0

main/mumble/murmur.pre-install

@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S murmur 2>/dev/null
-adduser -S -h /var/lib/murmur -s /sbin/nologin -G murmur -g "Mumble daemon" -H -D murmur 2>/dev/null
+adduser -S -D -H -h /var/lib/murmur -s /sbin/nologin -G murmur -g "Mumble daemon" murmur 2>/dev/null
 
 exit 0

main/nagios/nagios.pre-install

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

main/nginx-initscripts/nginx-initscripts.pre-install

@@ -2,8 +2,8 @@
 
 addgroup -S -g 82 www-data 2>/dev/null
 addgroup -S nginx 2>/dev/null
-adduser -S -G nginx -H -h /var/www/localhost/htdocs -s /sbin/nologin \
-	-D -g nginx nginx 2>/dev/null
+adduser -S -D -H -h /var/www/localhost/htdocs -s /sbin/nologin -G nginx \
+	-g nginx nginx 2>/dev/null
 addgroup nginx www-data 2>/dev/null
 
 exit 0

main/nginx/nginx-common.pre-install

@@ -2,7 +2,7 @@
 
 addgroup -Sg 82 www-data 2>/dev/null
 addgroup -S nginx 2>/dev/null
-adduser -S -h /var/lib/nginx -g "nginx" -s /sbin/nologin -DHG nginx nginx 2>/dev/null
+adduser -S -D -H -h /var/lib/nginx -s /sbin/nologin -G nginx -g nginx nginx 2>/dev/null
 addgroup nginx www-data 2>/dev/null
 
 exit 0

main/ngircd/ngircd.pre-install

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

main/nrpe/nrpe.pre-install

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

main/nsd/nsd.pre-install

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

main/nss-pam-ldapd/nss-pam-ldapd.pre-install

@@ -4,7 +4,7 @@ username=nslcd
 groupname=$username
 
 addgroup -S $username 2>/dev/null
-adduser -S -H -h /var/run/$username -s /sbin/nologin -D -G $groupname \
+adduser -S -D -H -h /var/run/$username -s /sbin/nologin -G $groupname \
 	-g $username $username 2>/dev/null
 
 exit 0

main/ntop/ntop.pre-install

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

main/openldap/openldap.pre-install

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 addgroup -S ldap 2>/dev/null
-adduser -S -h /usr/lib/openldap -s /sbin/nologin -D -H -g "OpenLdap User" \
-	-G ldap ldap 2>/dev/null
+adduser -S -D -H -h /usr/lib/openldap -s /sbin/nologin -G ldap \
+	-g "OpenLdap User" ldap 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 -S -H -h /var/empty -s /sbin/nologin -D -g ntp ntp 2>/dev/null
+adduser -S -D -H -h /var/empty -s /sbin/nologin -g ntp ntp 2>/dev/null
 
 exit 0

main/opensmtpd/opensmtpd.pre-install

@@ -2,8 +2,8 @@
 
 addgroup -S smtpd 2>/dev/null
 addgroup -S smtpq 2>/dev/null
-adduser -S -H -D -s /sbin/nologin -h /dev/null -g 'SMTP Daemon' -G smtpd smtpd 2>/dev/null
-adduser -S -H -D -s /sbin/nologin -h /dev/null -g 'SMTPD Queue' -G smtpq smtpq 2>/dev/null
+adduser -S -D -H -h /dev/null -s /sbin/nologin -G smtpd -g 'SMTP Daemon' smtpd 2>/dev/null
+adduser -S -D -H -h /dev/null -s /sbin/nologin -G smtpq -g 'SMTPD Queue' smtpq 2>/dev/null
 mkdir -p /var/spool/mail
 
 exit 0

main/openvpn/openvpn.pre-install

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

main/pcsc-lite/pcsc-lite.pre-install

@@ -4,7 +4,7 @@ username=pcscd
 groupname=$username
 
 addgroup -S $username 2>/dev/null
-adduser -S -H -h /var/run/$username -s /sbin/nologin -D -G $groupname \
+adduser -S -D -H -h /var/run/$username -s /sbin/nologin -G $groupname \
 	-g $username $username 2>/dev/null
 
 exit 0

main/perdition/perdition.pre-install

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

main/postfix/postfix.pre-install

@@ -4,6 +4,6 @@ addgroup -S postfix 2>/dev/null
 addgroup -S postdrop 2>/dev/null
 adduser -S -h /var/spool/postfix -G postfix -g postfix postfix 2>/dev/null
 addgroup postfix mail 2>/dev/null
-adduser -S -H -s /sbin/nologin -h /var/mail/domains -G postdrop -g vmail vmail 2>/dev/null
+adduser -S -H -h /var/mail/domains -s /sbin/nologin -G postdrop -g vmail vmail 2>/dev/null
 
 exit 0

main/postgrey/postgrey.pre-install

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

main/privoxy/privoxy.pre-install

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

main/quagga-nhrp/quagga-nhrp.pre-install

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

main/quagga/quagga.pre-install

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

main/quassel/quassel-core.pre-install

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-adduser -S -h /var/lib/quassel -s /sbin/nologin -D -g quassel quassel 2>/dev/null
+adduser -S -D -h /var/lib/quassel -s /sbin/nologin -g quassel quassel 2>/dev/null
 addgroup -S quassel 2>/dev/null
 addgroup quassel quassel
 

main/radvd/radvd.pre-install

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 addgroup -S radvd 2>/dev/null
-adduser -S -s /sbin/nologin -D -H -G radvd \
+adduser -S -D -H -s /sbin/nologin -G radvd \
 	-g "Router advertisement (radvd) user" radvd 2>/dev/null
 
 exit 0

main/redis/redis.pre-install

@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S redis 2>/dev/null
-adduser -S -H -h /var/lib/redis -s /bin/false -D -G redis -g redis redis 2>/dev/null
+adduser -S -D -H -h /var/lib/redis -s /bin/false -G redis -g redis redis 2>/dev/null
 
 exit 0

main/rpcbind/rpcbind.pre-install

@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S rpc 2>/dev/null
-adduser -S -h /var/lib/rpcbind -s /sbin/nologin -D -G rpc -g rpc rpc 2>/dev/null
+adduser -S -D -h /var/lib/rpcbind -s /sbin/nologin -G rpc -g rpc rpc 2>/dev/null
 
 exit 0

main/rt4/rt4.pre-install

@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S rt4 2>/dev/null
-adduser -S -s /sbin/nologin -G rt4 -D -H -g "Request Tracker 4 user" rt4 2>/dev/null
+adduser -S -D -H -s /sbin/nologin -G rt4 -g "Request Tracker 4 user" rt4 2>/dev/null
 
 exit 0

main/rtnppd/rtnppd.pre-install

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

main/rtpproxy/rtpproxy.pre-install

@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S rtpproxy 2>/dev/null
-adduser -S -G rtpproxy -H -h /usr/share/rtpproxy -s /sbin/nologin -g rtpproxy rtpproxy 2>/dev/null
+adduser -S -H -h /usr/share/rtpproxy -s /sbin/nologin -G rtpproxy -g rtpproxy rtpproxy 2>/dev/null
 
 exit 0

main/sems/sems.pre-install

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

main/sircbot/sircbot.pre-install

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

main/smokeping/smokeping.pre-install

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

main/snmptt/snmptt.pre-install

@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -h /var/spool/snmptt -s /sbin/nologin -D -g snmptt snmptt 2>/dev/null
+adduser -S -D -h /var/spool/snmptt -s /sbin/nologin -g snmptt snmptt 2>/dev/null
 
 exit 0

main/snort/snort.pre-install

@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -h /var/log/snort -s /sbin/nologin -D -g snort snort 2>/dev/null
+adduser -S -D -h /var/log/snort -s /sbin/nologin -g snort snort 2>/dev/null
 
 exit 0

main/strongswan/strongswan.pre-install

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

main/subversion/subversion.pre-install

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

main/tinyproxy/tinyproxy.pre-install

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 addgroup -S tinyproxy 2>/dev/null
-adduser -S -s /sbin/nologin -D -H -h /var/run/tinyproxy -G tinyproxy \
+adduser -S -D -H -h /var/run/tinyproxy -s /sbin/nologin -G tinyproxy \
 	-g "tinyproxy user" tinyproxy 2>/dev/null
 
 # return with success even if user already exist

main/trac/trac.pre-install

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

main/transmission/transmission-daemon.pre-install

@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -h /var/lib/transmission -s /sbin/nologin -D -g transmission transmission 2>/dev/null
+adduser -S -D -h /var/lib/transmission -s /sbin/nologin -g transmission transmission 2>/dev/null
 
 exit 0

main/umurmur/umurmur.post-install

@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S umurmur 2>/dev/null
-adduser -S -s /bin/false -G umurmur -h /var/run/umurmurd -D -g umurmur umurmur 2>/dev/null
+adduser -S -D -h /var/run/umurmurd -s /bin/false -G umurmur -g umurmur umurmur 2>/dev/null
 
 exit 0