Mail archive
alpine-aports

[alpine-aports] [PATCH 4/7] Add -g option (GECOS/comment) to adduser in scripts.

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

This way we can avoid ugly default:

    Linux user,,,
---
 community/caddy/caddy.pre-install                                    | 2 +-
 community/docker-registry/docker-registry.pre-install                | 2 +-
 community/domoticz/domoticz.pre-install                              | 2 +-
 community/icinga2/icinga2.pre-install                                | 2 +-
 community/minetest/minetest-server.pre-install                       | 2 +-
 community/oscam/oscam.pre-install                                    | 2 +-
 community/redmine/redmine.pre-install                                | 2 +-
 community/smstools/smstools.pre-install                              | 2 +-
 community/sniproxy/sniproxy.pre-install                              | 2 +-
 community/syncthing/syncthing.pre-install                            | 2 +-
 community/tvheadend/tvheadend.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/arpwatch/arpwatch.pre-install                                   | 2 +-
 main/asterisk/asterisk.pre-install                                   | 2 +-
 main/asterisk/asterisk.pre-upgrade                                   | 2 +-
 main/bacula-client/bacula-client.pre-install                         | 2 +-
 main/bacula/bacula.pre-install                                       | 2 +-
 main/bind/bind.pre-install                                           | 2 +-
 main/charybdis/charybdis.pre-install                                 | 2 +-
 main/chrony/chrony.pre-install                                       | 2 +-
 main/clamav/clamav-daemon.pre-install                                | 2 +-
 main/clamav/clamav-db.pre-install                                    | 2 +-
 main/clamav/freshclam.pre-install                                    | 2 +-
 main/clamsmtp/clamsmtp.pre-install                                   | 2 +-
 main/clamsmtp/clamsmtp.pre-upgrade                                   | 2 +-
 main/coova-chilli/coova-chilli.pre-install                           | 2 +-
 main/cups/cups.pre-install                                           | 2 +-
 main/cvechecker/cvechecker.pre-install                               | 2 +-
 main/dansguardian/dansguardian.pre-install                           | 1 +
 main/darkhttpd/darkhttpd.pre-install                                 | 4 ++--
 main/dbus/dbus.pre-install                                           | 2 +-
 main/dhcp/dhcp.pre-install                                           | 2 +-
 main/distcc/distcc.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/ircservices/ircservices.pre-install                             | 2 +-
 main/kamailio/kamailio.pre-install                                   | 2 +-
 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/mini_httpd/mini_httpd.pre-install                               | 2 +-
 main/minidlna/minidlna.pre-install                                   | 2 +-
 main/mlmmj/mlmmj.pre-install                                         | 2 +-
 main/mosquitto/mosquitto.pre-install                                 | 2 +-
 main/mpd/mpd.pre-install                                             | 2 +-
 main/nagios/nagios.pre-install                                       | 2 +-
 main/nginx-initscripts/nginx-initscripts.pre-install                 | 2 +-
 main/ngircd/ngircd.pre-install                                       | 2 +-
 main/nrpe/nrpe.pre-install                                           | 2 +-
 main/nsd/nsd.pre-install                                             | 2 +-
 main/nss-pam-ldapd/nss-pam-ldapd.pre-install                         | 2 +-
 main/ntop/ntop.pre-install                                           | 2 +-
 main/openntpd/openntpd.pre-install                                   | 2 +-
 main/opentracker/opentracker.pre-install                             | 2 +-
 main/openvpn/openvpn.pre-install                                     | 2 +-
 main/pcsc-lite/pcsc-lite.pre-install                                 | 2 +-
 main/pdnsd/pdnsd.pre-install                                         | 2 +-
 main/perdition/perdition.pre-install                                 | 2 +-
 main/postfix/postfix.pre-install                                     | 4 ++--
 main/postgrey/postgrey.pre-install                                   | 2 +-
 main/privoxy/privoxy.pre-install                                     | 2 +-
 main/quagga-nhrp/quagga-nhrp.pre-install                             | 2 +-
 main/quagga/quagga.pre-install                                       | 2 +-
 main/quassel/quassel-core.pre-install                                | 2 +-
 main/redis/redis.pre-install                                         | 2 +-
 main/rpcbind/rpcbind.pre-install                                     | 2 +-
 main/rtnppd/rtnppd.pre-install                                       | 2 +-
 main/rtpproxy/rtpproxy.pre-install                                   | 2 +-
 main/sems/sems.pre-install                                           | 2 +-
 main/sircbot/sircbot.pre-install                                     | 2 +-
 main/smokeping/smokeping.pre-install                                 | 2 +-
 main/snmptt/snmptt.pre-install                                       | 2 +-
 main/snort/snort.pre-install                                         | 2 +-
 main/squid/squid.pre-install                                         | 2 +-
 main/squid/squid.pre-upgrade                                         | 2 +-
 main/strongswan/strongswan.pre-install                               | 2 +-
 main/subversion/subversion.pre-install                               | 2 +-
 main/trac/trac.pre-install                                           | 2 +-
 main/transmission/transmission-daemon.pre-install                    | 2 +-
 main/umurmur/umurmur.post-install                                    | 2 +-
 main/uvncrepeater/uvncrepeater.pre-install                           | 2 +-
 main/varnish/varnish.pre-install                                     | 2 +-
 main/vde2/vde2.pre-install                                           | 2 +-
 main/vlc/vlc-daemon.pre-install                                      | 2 +-
 main/vsftpd/vsftpd.pre-install                                       | 2 +-
 main/ympd/ympd.pre-install                                           | 2 +-
 main/zabbix/zabbix-agent.pre-install                                 | 2 +-
 main/zabbix/zabbix.pre-install                                       | 2 +-
 main/znc/znc.pre-install                                             | 2 +-
 testing/3proxy/3proxy.pre-install                                    | 2 +-
 testing/at/at.pre-install                                            | 2 +-
 testing/clapf/clapf.pre-install                                      | 2 +-
 testing/cluster-glue/cluster-glue.pre-install                        | 2 +-
 testing/consul/consul.pre-install                                    | 2 +-
 testing/crtmpserver/crtmpserver.pre-install                          | 2 +-
 testing/dante/dante-server.pre-install                               | 2 +-
 testing/darwin-streaming-server/darwin-streaming-server.post-install | 2 +-
 testing/dbmail/dbmail.pre-install                                    | 2 +-
 testing/dnscrypt-proxy/dnscrypt-proxy.pre-install                    | 2 +-
 testing/drizzle/drizzle.post-install                                 | 2 +-
 testing/dspam/dspam.pre-install                                      | 2 +-
 testing/ejabberd/ejabberd.pre-install                                | 2 +-
 testing/fcron/fcron.pre-install                                      | 2 +-
 testing/gdnsd/gdnsd.pre-install                                      | 2 +-
 testing/gogs/gogs.pre-install                                        | 2 +-
 testing/h2o/h2o.pre-install                                          | 2 +-
 testing/knot/knot.pre-install                                        | 2 +-
 testing/lightdm/lightdm.pre-install                                  | 2 +-
 testing/lizardfs/lizardfs.pre-install                                | 2 +-
 testing/lshell/lshell.pre-install                                    | 2 +-
 testing/lusca/lusca.pre-install                                      | 2 +-
 testing/lusca/lusca.pre-upgrade                                      | 2 +-
 testing/milter-greylist/milter-greylist.pre-install                  | 2 +-
 testing/mongodb/mongodb.pre-install                                  | 2 +-
 testing/motion/motion.pre-install                                    | 2 +-
 testing/munin/munin-node.pre-install                                 | 2 +-
 testing/nginx-naxsi/nginx-naxsi.pre-install                          | 2 +-
 testing/ntopng/ntopng.pre-install                                    | 2 +-
 testing/opensips/opensips.pre-install                                | 2 +-
 testing/openxcap/openxcap.pre-install                                | 2 +-
 testing/pdns/pdns.pre-install                                        | 2 +-
 testing/qpage/qpage.pre-install                                      | 2 +-
 testing/radicale/radicale.pre-install                                | 2 +-
 testing/rancid/rancid.pre-install                                    | 2 +-
 testing/rrdbot/rrdbot.pre-install                                    | 2 +-
 testing/sipwise-sems/sipwise-sems.pre-install                        | 2 +-
 testing/socklog/socklog.post-install                                 | 2 +-
 testing/stunnel/stunnel.pre-install                                  | 2 +-
 testing/tengine/tengine.pre-install                                  | 2 +-
 testing/tengine/tengine.pre-upgrade                                  | 2 +-
 testing/thttpd/thttpd.pre-install                                    | 2 +-
 testing/tor/tor.pre-install                                          | 2 +-
 testing/tvheadend-git/tvheadend-git.pre-install                      | 2 +-
 testing/vault/vault.pre-install                                      | 2 +-
 testing/vnstat/vnstat.pre-install                                    | 2 +-
 testing/wt/wt.pre-install                                            | 2 +-
 testing/x2goserver/x2goserver.pre-install                            | 2 +-
 testing/zabbix/zabbix-agent.pre-install                              | 2 +-
 testing/zabbix/zabbix.pre-install                                    | 2 +-
 unmaintained/apache-couchdb/apache-couchdb.post-install              | 2 +-
 unmaintained/ejabberd-git/ejabberd-git.pre-install                   | 2 +-
 unmaintained/kde-workspace/kde-workspace.pre-install                 | 2 +-
 unmaintained/shadowircd/shadowircd.pre-install                       | 2 +-
 157 files changed, 160 insertions(+), 159 deletions(-)
diff --git a/community/caddy/caddy.pre-install b/community/caddy/caddy.pre-install
index 8c67557..7bf003d 100644
--- a/community/caddy/caddy.pre-install
+++ b/community/caddy/caddy.pre-install
_at_@ -1,4 +1,4 @@
 #!/bin/sh
-adduser -S -h /var/lib/caddy -D -s /sbin/nologin caddy 2>/dev/null
+adduser -S -h /var/lib/caddy -D -s /sbin/nologin -g caddy caddy 2>/dev/null
 adduser caddy www-data 2>/dev/null
 exit 0
diff --git a/community/docker-registry/docker-registry.pre-install b/community/docker-registry/docker-registry.pre-install
index e921230..3bc3eab 100644
--- a/community/docker-registry/docker-registry.pre-install
+++ b/community/docker-registry/docker-registry.pre-install
_at_@ -1,5 +1,5 @@
 #!/bin/sh
 
 addgroup -S docker-registry 2>/dev/null
-adduser -S -H -h /dev/null -s /sbin/nologin -D -G docker-registry 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
 exit 0
diff --git a/community/domoticz/domoticz.pre-install b/community/domoticz/domoticz.pre-install
index 8a7d12c..077e0fa 100644
--- a/community/domoticz/domoticz.pre-install
+++ b/community/domoticz/domoticz.pre-install
_at_@ -1,3 +1,3 @@
 #!/bin/sh
-adduser -S -h /var/lib/domoticz -D -s /sbin/nologin domoticz 2>/dev/null
+adduser -S -h /var/lib/domoticz -D -s /sbin/nologin -g domoticz domoticz 2>/dev/null
 exit 0
diff --git a/community/icinga2/icinga2.pre-install b/community/icinga2/icinga2.pre-install
index 349c8c8..e84e09e 100644
--- a/community/icinga2/icinga2.pre-install
+++ b/community/icinga2/icinga2.pre-install
_at_@ -1,6 +1,6 @@
 #!/bin/sh
 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 -S -G icinga -H -h /var/spool/icinga2 -s /sbin/nologin -D -g icinga 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 dbf1411..4cde639 100644
--- a/community/minetest/minetest-server.pre-install
+++ b/community/minetest/minetest-server.pre-install
_at_@ -1,3 +1,3 @@
 #!/bin/sh
-adduser -S -s /sbin/nologin -D -h /var/lib/minetest minetest games 2>/dev/null
+adduser -S -s /sbin/nologin -D -h /var/lib/minetest -g minetest minetest games 2>/dev/null
 exit 0
diff --git a/community/oscam/oscam.pre-install b/community/oscam/oscam.pre-install
index 6f2cc9e..2f5f5d9 100644
--- a/community/oscam/oscam.pre-install
+++ b/community/oscam/oscam.pre-install
_at_@ -1,4 +1,4 @@
 #!/bin/sh
-adduser -S -H -D -s /sbin/nologin oscam 2>/dev/null
+adduser -S -H -D -s /sbin/nologin -g oscam oscam 2>/dev/null
 addgroup oscam usb 2>/dev/null
 exit 0
diff --git a/community/redmine/redmine.pre-install b/community/redmine/redmine.pre-install
index f382844..072bd1d 100644
--- a/community/redmine/redmine.pre-install
+++ b/community/redmine/redmine.pre-install
_at_@ -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 redmine 2>/dev/null
+adduser -S -H -h /usr/share/webapps/redmine -s /bin/sh -D -g redmine redmine 2>/dev/null
 addgroup redmine www-data 2>/dev/null
 
 exit 0
diff --git a/community/smstools/smstools.pre-install b/community/smstools/smstools.pre-install
index 638266c..d9e1d36 100755
--- a/community/smstools/smstools.pre-install
+++ b/community/smstools/smstools.pre-install
_at_@ -1,5 +1,5 @@
 #!/bin/sh
 addgroup -S smsd &>/dev/null
-adduser -S -h /var/spool/sms -s /sbin/nologin -G smsd -D smsd &>/dev/null
+adduser -S -h /var/spool/sms -s /sbin/nologin -G smsd -D -g smsd smsd &>/dev/null
 adduser -G uucp smsd &>/dev/null
 exit 0
diff --git a/community/sniproxy/sniproxy.pre-install b/community/sniproxy/sniproxy.pre-install
index 0c6ea46..c56f31d 100644
--- a/community/sniproxy/sniproxy.pre-install
+++ b/community/sniproxy/sniproxy.pre-install
_at_@ -1,4 +1,4 @@
 #!/bin/sh
 addgroup -S sniproxy 2>/dev/null
-adduser -S -h /var/log/sniproxy -s /bin/false -D sniproxy 2>/dev/null
+adduser -S -h /var/log/sniproxy -s /bin/false -D -g sniproxy sniproxy 2>/dev/null
 exit 0
diff --git a/community/syncthing/syncthing.pre-install b/community/syncthing/syncthing.pre-install
index dd7f389..002a54f 100644
--- a/community/syncthing/syncthing.pre-install
+++ b/community/syncthing/syncthing.pre-install
_at_@ -1,3 +1,3 @@
 #!/bin/sh
-adduser -S -H -h /var/lib/syncthing -s /sbin/nologin -D syncthing 2>/dev/null
+adduser -S -H -h /var/lib/syncthing -s /sbin/nologin -D -g syncthing syncthing 2>/dev/null
 exit 0
diff --git a/community/tvheadend/tvheadend.pre-install b/community/tvheadend/tvheadend.pre-install
index 0580cb5..6fee0b4 100644
--- a/community/tvheadend/tvheadend.pre-install
+++ b/community/tvheadend/tvheadend.pre-install
_at_@ -1,4 +1,4 @@
 #!/bin/sh
-adduser -S -G video -s /sbin/nologin -H -h /usr/share/tvheadend tvheadend 2>/dev/null
+adduser -S -G video -s /sbin/nologin -H -h /usr/share/tvheadend -g tvheadend tvheadend 2>/dev/null
 addgroup tvheadend usb 2>/dev/null
 exit 0
diff --git a/main/amavisd-new/amavisd-new.pre-install b/main/amavisd-new/amavisd-new.pre-install
index bd8c3a6..d0c0700 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 -S amavis 2>/dev/null
-adduser -S -D -G amavis -h /var/amavis -s /sbin/nologin amavis 2>/dev/null
+adduser -S -D -G amavis -h /var/amavis -s /sbin/nologin -g amavis amavis 2>/dev/null
 exit 0
 
diff --git a/main/apache2/apache2.pre-install b/main/apache2/apache2.pre-install
index 81f4b06..cb80323 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 -S -H -h /var/www -s /sbin/nologin -D apache 2>/dev/null
+adduser -S -H -h /var/www -s /sbin/nologin -D -g apache 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 21bf106..a4928eb 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 -S -D buildozer -s /bin/sh 2>/dev/null
+adduser -S -D -g buildozer buildozer -s /bin/sh 2>/dev/null
 exit 0
diff --git a/main/arpwatch/arpwatch.pre-install b/main/arpwatch/arpwatch.pre-install
index d09fad4..d75874f 100644
--- a/main/arpwatch/arpwatch.pre-install
+++ b/main/arpwatch/arpwatch.pre-install
_at_@ -1,4 +1,4 @@
 #!/bin/sh
-adduser -S -H -s /sbin/nologin -D arpwatch 2>/dev/null
+adduser -S -H -s /sbin/nologin -D -g arpwatch arpwatch 2>/dev/null
 exit 0
 
diff --git a/main/asterisk/asterisk.pre-install b/main/asterisk/asterisk.pre-install
index 80b7e67..935466d 100644
--- a/main/asterisk/asterisk.pre-install
+++ b/main/asterisk/asterisk.pre-install
_at_@ -1,6 +1,6 @@
 #!/bin/sh
 
-adduser -S -h /var/lib/asterisk -s /sbin/nologin -D asterisk 2>/dev/null
+adduser -S -h /var/lib/asterisk -s /sbin/nologin -D -g asterisk asterisk 2>/dev/null
 addgroup -S dialout 2>/dev/null
 addgroup asterisk dialout 2>/dev/null
 exit 0
diff --git a/main/asterisk/asterisk.pre-upgrade b/main/asterisk/asterisk.pre-upgrade
index 6c2984a..781d5d8 100644
--- a/main/asterisk/asterisk.pre-upgrade
+++ b/main/asterisk/asterisk.pre-upgrade
_at_@ -1,6 +1,6 @@
 #!/bin/sh
 
-adduser -S -h /var/lib/asterisk -s /bin/false -D asterisk 2>/dev/null
+adduser -S -h /var/lib/asterisk -s /bin/false -D -g asterisk asterisk 2>/dev/null
 addgroup -S dialout 2>/dev/null
 addgroup asterisk dialout 2>/dev/null
 exit 0
diff --git a/main/bacula-client/bacula-client.pre-install b/main/bacula-client/bacula-client.pre-install
index 0eb2cab..7827de6 100644
--- a/main/bacula-client/bacula-client.pre-install
+++ b/main/bacula-client/bacula-client.pre-install
_at_@ -1,4 +1,4 @@
 #!/bin/sh
 addgroup -S bacula 2>/dev/null
-adduser -S -h /var/lib/bacula/ -s /sbin/nologin -G bacula -D bacula 2>/dev/null
+adduser -S -h /var/lib/bacula/ -s /sbin/nologin -G bacula -D -g bacula bacula 2>/dev/null
 exit 0
diff --git a/main/bacula/bacula.pre-install b/main/bacula/bacula.pre-install
index 0eb2cab..7827de6 100644
--- a/main/bacula/bacula.pre-install
+++ b/main/bacula/bacula.pre-install
_at_@ -1,4 +1,4 @@
 #!/bin/sh
 addgroup -S bacula 2>/dev/null
-adduser -S -h /var/lib/bacula/ -s /sbin/nologin -G bacula -D bacula 2>/dev/null
+adduser -S -h /var/lib/bacula/ -s /sbin/nologin -G bacula -D -g bacula bacula 2>/dev/null
 exit 0
diff --git a/main/bind/bind.pre-install b/main/bind/bind.pre-install
index 3770738..116d51e 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 -S -h /etc/bind -s /sbin/nologin -G named -D named 2>/dev/null
+adduser -S -h /etc/bind -s /sbin/nologin -G named -D -g named named 2>/dev/null
 exit 0
 
diff --git a/main/charybdis/charybdis.pre-install b/main/charybdis/charybdis.pre-install
index 3c120d3..83ffff3 100644
--- a/main/charybdis/charybdis.pre-install
+++ b/main/charybdis/charybdis.pre-install
_at_@ -1,3 +1,3 @@
 #!/bin/sh
-adduser -S -h /var/run/charybdis -s /sbin/nologin -D ircd 2>/dev/null
+adduser -S -h /var/run/charybdis -s /sbin/nologin -D -g ircd ircd 2>/dev/null
 exit 0
diff --git a/main/chrony/chrony.pre-install b/main/chrony/chrony.pre-install
index 83c4560..41e01c6 100644
--- a/main/chrony/chrony.pre-install
+++ b/main/chrony/chrony.pre-install
_at_@ -1,5 +1,5 @@
 #!/bin/sh
 
 addgroup -S chrony 2>/dev/null
-adduser -S -G chrony -h /var/log/chrony -s /sbin/nologin -D chrony 2>/dev/null
+adduser -S -G chrony -h /var/log/chrony -s /sbin/nologin -D -g chrony chrony 2>/dev/null
 exit 0
diff --git a/main/clamav/clamav-daemon.pre-install b/main/clamav/clamav-daemon.pre-install
index 4528fbb..5ef833a 100644
--- a/main/clamav/clamav-daemon.pre-install
+++ b/main/clamav/clamav-daemon.pre-install
_at_@ -1,5 +1,5 @@
 #!/bin/sh
 
 addgroup -S clamav 2>/dev/null
-adduser -S -h /var/lib/clamav -H -s /sbin/nologin -D -G clamav clamav 2>/dev/null
+adduser -S -h /var/lib/clamav -H -s /sbin/nologin -D -G clamav -g clamav clamav 2>/dev/null
 exit 0
diff --git a/main/clamav/clamav-db.pre-install b/main/clamav/clamav-db.pre-install
index 9bc70dd..f46eabe 100644
--- a/main/clamav/clamav-db.pre-install
+++ b/main/clamav/clamav-db.pre-install
_at_@ -1,4 +1,4 @@
 #!/bin/sh
 
-adduser -S -H -s /sbin/nologin -D clamav 2>/dev/null
+adduser -S -H -s /sbin/nologin -D -g clamav clamav 2>/dev/null
 exit 0
diff --git a/main/clamav/freshclam.pre-install b/main/clamav/freshclam.pre-install
index 4528fbb..5ef833a 100644
--- a/main/clamav/freshclam.pre-install
+++ b/main/clamav/freshclam.pre-install
_at_@ -1,5 +1,5 @@
 #!/bin/sh
 
 addgroup -S clamav 2>/dev/null
-adduser -S -h /var/lib/clamav -H -s /sbin/nologin -D -G clamav clamav 2>/dev/null
+adduser -S -h /var/lib/clamav -H -s /sbin/nologin -D -G clamav -g clamav clamav 2>/dev/null
 exit 0
diff --git a/main/clamsmtp/clamsmtp.pre-install b/main/clamsmtp/clamsmtp.pre-install
index 9bc70dd..f46eabe 100644
--- a/main/clamsmtp/clamsmtp.pre-install
+++ b/main/clamsmtp/clamsmtp.pre-install
_at_@ -1,4 +1,4 @@
 #!/bin/sh
 
-adduser -S -H -s /sbin/nologin -D clamav 2>/dev/null
+adduser -S -H -s /sbin/nologin -D -g clamav clamav 2>/dev/null
 exit 0
diff --git a/main/clamsmtp/clamsmtp.pre-upgrade b/main/clamsmtp/clamsmtp.pre-upgrade
index 7e736a2..c673e27 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 -S -H -s /bin/false -D clamav 2>/dev/null
+adduser -S -H -s /bin/false -D -g clamav 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 6ef8741..15de617 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 -S -H -s /sbin/nologin -D chilli 2>/dev/null
+adduser -S -H -s /sbin/nologin -D -g chilli chilli 2>/dev/null
 exit 0
 
diff --git a/main/cups/cups.pre-install b/main/cups/cups.pre-install
index 468163c..4b099d8 100644
--- a/main/cups/cups.pre-install
+++ b/main/cups/cups.pre-install
_at_@ -2,6 +2,6 @@
 
 addgroup -S lpadmin 2>/dev/null
 addgroup -S lp 2>/dev/null
-adduser -S -G lp lp 2>/dev/null
+adduser -S -G lp -g lp lp 2>/dev/null
 addgroup lp lp 2>/dev/null
 exit 0
diff --git a/main/cvechecker/cvechecker.pre-install b/main/cvechecker/cvechecker.pre-install
index cf6b144..b698117 100644
--- a/main/cvechecker/cvechecker.pre-install
+++ b/main/cvechecker/cvechecker.pre-install
_at_@ -1,3 +1,3 @@
 #!/bin/sh
 addgroup -S cvechecker &>/dev/null
-adduser -S cvechecker -h /var/cvechecker -DG cvechecker &>/dev/null
+adduser -S -g cvechecker cvechecker -h /var/cvechecker -DG cvechecker &>/dev/null
diff --git a/main/dansguardian/dansguardian.pre-install b/main/dansguardian/dansguardian.pre-install
index f5c8bbf..e897f8c 100644
--- a/main/dansguardian/dansguardian.pre-install
+++ b/main/dansguardian/dansguardian.pre-install
_at_@ -5,5 +5,6 @@ adduser -S -D -H \
 	-h /var/log/dansguardian \
 	-s /sbin/nologin \
 	-G dansguar \
+	-g dansguar \
 	dansguar 2>/dev/null || true
 
diff --git a/main/darkhttpd/darkhttpd.pre-install b/main/darkhttpd/darkhttpd.pre-install
index 80cfa6b..b189233 100644
--- a/main/darkhttpd/darkhttpd.pre-install
+++ b/main/darkhttpd/darkhttpd.pre-install
_at_@ -1,8 +1,8 @@
 #!/bin/sh
 
 addgroup -S -g 82 www-data 2>/dev/null
-adduser -S -H -h /var/www/localhost/htdocs -s /sbin/nologin -D darkhttpd \
-	2>/dev/null
+adduser -S -H -h /var/www/localhost/htdocs -s /sbin/nologin -D -g darkhttpd \
+	darkhttpd 2>/dev/null
 addgroup darkhttpd www-data 2>/dev/null
 
 exit 0
diff --git a/main/dbus/dbus.pre-install b/main/dbus/dbus.pre-install
index 57f9f54..7fdb08a 100644
--- a/main/dbus/dbus.pre-install
+++ b/main/dbus/dbus.pre-install
_at_@ -1,5 +1,5 @@
 #!/bin/sh
 
 addgroup -S messagebus 2>/dev/null
-adduser -S -H -h /dev/null -s /sbin/nologin -D messagebus -G messagebus 2>/dev/null
+adduser -S -H -h /dev/null -s /sbin/nologin -D -g messagebus messagebus -G messagebus 2>/dev/null
 exit 0
diff --git a/main/dhcp/dhcp.pre-install b/main/dhcp/dhcp.pre-install
index 27fa93f..5aaa6c4 100644
--- a/main/dhcp/dhcp.pre-install
+++ b/main/dhcp/dhcp.pre-install
_at_@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -h /var/lib/dhcp -s /sbin/nologin -D dhcp 2>/dev/null
+adduser -S -h /var/lib/dhcp -s /sbin/nologin -D -g dhcp dhcp 2>/dev/null
 exit 0
 
diff --git a/main/distcc/distcc.pre-install b/main/distcc/distcc.pre-install
index b07f846..b408b4a 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 -S -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 -g distcc distcc 2>/dev/null
 exit 0
diff --git a/main/dnsmasq/dnsmasq.pre-install b/main/dnsmasq/dnsmasq.pre-install
index 3e9e4b0..43f60b8 100644
--- a/main/dnsmasq/dnsmasq.pre-install
+++ b/main/dnsmasq/dnsmasq.pre-install
_at_@ -1,5 +1,5 @@
 #!/bin/sh
 
 addgroup -S dnsmasq 2>/dev/null
-adduser -S -H -h /dev/null -s /sbin/nologin -G dnsmasq -D dnsmasq 2>/dev/null
+adduser -S -H -h /dev/null -s /sbin/nologin -G dnsmasq -D -g dnsmasq dnsmasq 2>/dev/null
 exit 0
diff --git a/main/dovecot/dovecot.pre-install b/main/dovecot/dovecot.pre-install
index 58346c6..481132b 100644
--- a/main/dovecot/dovecot.pre-install
+++ b/main/dovecot/dovecot.pre-install
_at_@ -1,5 +1,5 @@
 #!/bin/sh
 
-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
+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
 exit 0
diff --git a/main/ez-ipupdate/ez-ipupdate.pre-install b/main/ez-ipupdate/ez-ipupdate.pre-install
index 064e418..23d9fae 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 -S -h /var/lib/ez-ipupdate -s /sbin/nologin -D ipupdate 2>/dev/null
+adduser -S -h /var/lib/ez-ipupdate -s /sbin/nologin -D -g ipupdate ipupdate 2>/dev/null
 exit 0
 
diff --git a/main/fetchmail/fetchmail.pre-install b/main/fetchmail/fetchmail.pre-install
index 2961b9a..67681f8 100644
--- a/main/fetchmail/fetchmail.pre-install
+++ b/main/fetchmail/fetchmail.pre-install
_at_@ -1,4 +1,4 @@
 #!/bin/sh
 
-adduser -S -H -h /var/lib/fetchmail -s /sbin/nologin -D fetchmail 2>/dev/null
+adduser -S -H -h /var/lib/fetchmail -s /sbin/nologin -D -g fetchmail fetchmail 2>/dev/null
 exit 0
diff --git a/main/freeradius/freeradius.pre-install b/main/freeradius/freeradius.pre-install
index b81e86d..f02c2c0 100644
--- a/main/freeradius/freeradius.pre-install
+++ b/main/freeradius/freeradius.pre-install
_at_@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S radius 2>/dev/null
-adduser -S -G radius -h /var/log/radius -s /sbin/nologin -D radius 2>/dev/null
+adduser -S -G radius -h /var/log/radius -s /sbin/nologin -D -g radius radius 2>/dev/null
 exit 0
 
diff --git a/main/freeswitch/freeswitch.pre-install b/main/freeswitch/freeswitch.pre-install
index 4dccd57..f175cd3 100755
--- a/main/freeswitch/freeswitch.pre-install
+++ b/main/freeswitch/freeswitch.pre-install
_at_@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -H -h /var/run/freeswitch -s /sbin/nologin -D freeswitch 2>/dev/null
+adduser -S -H -h /var/run/freeswitch -s /sbin/nologin -D -g freeswitch freeswitch 2>/dev/null
 
 exit 0
diff --git a/main/gdnsd/gdnsd.pre-install b/main/gdnsd/gdnsd.pre-install
index 2479466..040e7f1 100644
--- a/main/gdnsd/gdnsd.pre-install
+++ b/main/gdnsd/gdnsd.pre-install
_at_@ -1,5 +1,5 @@
 #!/bin/sh
 
 addgroup -S gdnsd 2>/dev/null
-adduser -S -H -h /dev/null -s /sbin/nologin -D -G gdnsd gdnsd 2>/dev/null
+adduser -S -H -h /dev/null -s /sbin/nologin -D -G gdnsd -g gdnsd gdnsd 2>/dev/null
 exit 0
diff --git a/main/gitolite/gitolite.pre-install b/main/gitolite/gitolite.pre-install
index fbb1e2a..2d155ab 100644
--- a/main/gitolite/gitolite.pre-install
+++ b/main/gitolite/gitolite.pre-install
_at_@ -1,3 +1,3 @@
 #!/bin/sh
-adduser -S -H -h /var/lib/git -s /bin/sh -D git 2>/dev/null
+adduser -S -H -h /var/lib/git -s /bin/sh -D -g git git 2>/dev/null
 exit 0
diff --git a/main/gnats/gnats.pre-install b/main/gnats/gnats.pre-install
index 849841f..81093a4 100644
--- a/main/gnats/gnats.pre-install
+++ b/main/gnats/gnats.pre-install
_at_@ -1,4 +1,4 @@
 #!/bin/sh
 
-adduser -S -h /var/lib/gnatsdb -D gnats 2>/dev/null
+adduser -S -h /var/lib/gnatsdb -D -g gnats gnats 2>/dev/null
 exit 0
diff --git a/main/gross/gross.pre-install b/main/gross/gross.pre-install
index f79e657..d3a5f85 100644
--- a/main/gross/gross.pre-install
+++ b/main/gross/gross.pre-install
_at_@ -1,3 +1,3 @@
 #!/bin/sh
-adduser -S -H -s /sbin/nologin -D gross 2>/dev/null
+adduser -S -H -s /sbin/nologin -D -g gross gross 2>/dev/null
 exit 0
diff --git a/main/haproxy/haproxy.pre-install b/main/haproxy/haproxy.pre-install
index 4706956..72b8ab0 100644
--- a/main/haproxy/haproxy.pre-install
+++ b/main/haproxy/haproxy.pre-install
_at_@ -2,7 +2,7 @@
 
 addgroup -S haproxy 2>/dev/null
 adduser -S -H -h /var/lib/haproxy -s /bin/false -D \
-	-G haproxy haproxy 2>/dev/null
+	-G haproxy -g haproxy haproxy 2>/dev/null
 
 # move config to new location
 if [ -e /etc/haproxy.cfg ] && ! [ -e /etc/haproxy/haproxy.cfg ]; then
diff --git a/main/haproxy/haproxy.pre-upgrade b/main/haproxy/haproxy.pre-upgrade
index 4706956..72b8ab0 100644
--- a/main/haproxy/haproxy.pre-upgrade
+++ b/main/haproxy/haproxy.pre-upgrade
_at_@ -2,7 +2,7 @@
 
 addgroup -S haproxy 2>/dev/null
 adduser -S -H -h /var/lib/haproxy -s /bin/false -D \
-	-G haproxy haproxy 2>/dev/null
+	-G haproxy -g haproxy haproxy 2>/dev/null
 
 # move config to new location
 if [ -e /etc/haproxy.cfg ] && ! [ -e /etc/haproxy/haproxy.cfg ]; then
diff --git a/main/icecast/icecast.pre-install b/main/icecast/icecast.pre-install
index 9978a4b..8734c1e 100644
--- a/main/icecast/icecast.pre-install
+++ b/main/icecast/icecast.pre-install
_at_@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -h /var/log/icecast -s /sbin/nologin -D icecast  2>/dev/null
+adduser -S -h /var/log/icecast -s /sbin/nologin -D -g icecast icecast  2>/dev/null
 
 exit 0
diff --git a/main/ircservices/ircservices.pre-install b/main/ircservices/ircservices.pre-install
index 5016c89..4f6144a 100644
--- a/main/ircservices/ircservices.pre-install
+++ b/main/ircservices/ircservices.pre-install
_at_@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -h /var/lib/ircservices -s /sbin/nologin -D ircservices 2>/dev/null
+adduser -S -h /var/lib/ircservices -s /sbin/nologin -D -g ircservices ircservices 2>/dev/null
 exit 0
 
diff --git a/main/kamailio/kamailio.pre-install b/main/kamailio/kamailio.pre-install
index fd7b13e..19d11f5 100644
--- a/main/kamailio/kamailio.pre-install
+++ b/main/kamailio/kamailio.pre-install
_at_@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S kamailio 2>/dev/null
-adduser -S -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 -g kamailio kamailio  2>/dev/null
 
 exit 0
diff --git a/main/lighttpd/lighttpd.pre-install b/main/lighttpd/lighttpd.pre-install
index 2349478..80f2562 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 -S -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 -g lighttpd 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 b0f2a83..ea6028c 100644
--- a/main/logcheck/logcheck.pre-install
+++ b/main/logcheck/logcheck.pre-install
_at_@ -1,5 +1,5 @@
 #!/bin/sh
 
 addgroup -S logcheck 2>/dev/null
-adduser -S -H -h /dev/null -s /sbin/nologin -D -G logcheck logcheck 2>/dev/null
+adduser -S -H -h /dev/null -s /sbin/nologin -D -G logcheck -g logcheck logcheck 2>/dev/null
 exit 0
diff --git a/main/mariadb/mariadb.pre-install b/main/mariadb/mariadb.pre-install
index 5b68b1e..e4f16d2 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 -S -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 -g mysql mysql 2>/dev/null
 exit 0
 
diff --git a/main/memcached/memcached.pre-install b/main/memcached/memcached.pre-install
index 6612df9..df22cd5 100644
--- a/main/memcached/memcached.pre-install
+++ b/main/memcached/memcached.pre-install
_at_@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -H -s /sbin/nologin -D memcached 2>/dev/null
+adduser -S -H -s /sbin/nologin -D -g memcached memcached 2>/dev/null
 exit 0
 
diff --git a/main/mini_httpd/mini_httpd.pre-install b/main/mini_httpd/mini_httpd.pre-install
index 3b5258a..63876f7 100644
--- a/main/mini_httpd/mini_httpd.pre-install
+++ b/main/mini_httpd/mini_httpd.pre-install
_at_@ -9,7 +9,7 @@ fi
 
 addgroup -S -g 82 www-data 2>/dev/null
 adduser -S -H -h /var/www/localhost/htdocs -s /sbin/nologin \
-        -D minihttpd 2>/dev/null
+        -D -g minihttpd minihttpd 2>/dev/null
 addgroup minihttpd www-data 2>/dev/null
 
 exit 0
diff --git a/main/minidlna/minidlna.pre-install b/main/minidlna/minidlna.pre-install
index 78fb2d4..4423a73 100644
--- a/main/minidlna/minidlna.pre-install
+++ b/main/minidlna/minidlna.pre-install
_at_@ -2,5 +2,5 @@
 
 addgroup -S minidlna 2>/dev/null
 adduser -S -H -h /var/run/minidlna -s /sbin/nologin -D -G minidlna \
-	minidlna 2>/dev/null
+	-g minidlna minidlna 2>/dev/null
 exit 0
diff --git a/main/mlmmj/mlmmj.pre-install b/main/mlmmj/mlmmj.pre-install
index 38b8fb8..046a821 100644
--- a/main/mlmmj/mlmmj.pre-install
+++ b/main/mlmmj/mlmmj.pre-install
_at_@ -1,5 +1,5 @@
 #!/bin/sh
 
 addgroup -S mlmmj 2>/dev/null
-adduser -S -H -h /var/spool/mlmmj -s /sbin/nologin -D -G mlmmj mlmmj 2>/dev/null
+adduser -S -H -h /var/spool/mlmmj -s /sbin/nologin -D -G mlmmj -g mlmmj mlmmj 2>/dev/null
 exit 0
diff --git a/main/mosquitto/mosquitto.pre-install b/main/mosquitto/mosquitto.pre-install
index 026fe2c..a0a8f72 100644
--- a/main/mosquitto/mosquitto.pre-install
+++ b/main/mosquitto/mosquitto.pre-install
_at_@ -1,5 +1,5 @@
 #!/bin/sh
 
 addgroup -S mosquitto 2>/dev/null
-adduser -S -H -h /var/empty -s /sbin/nologin -D -G mosquitto mosquitto 2>/dev/null
+adduser -S -H -h /var/empty -s /sbin/nologin -D -G mosquitto -g mosquitto mosquitto 2>/dev/null
 exit 0
diff --git a/main/mpd/mpd.pre-install b/main/mpd/mpd.pre-install
index 70bddb2..7e012f8 100644
--- a/main/mpd/mpd.pre-install
+++ b/main/mpd/mpd.pre-install
_at_@ -1,3 +1,3 @@
 #!/bin/sh
 
-adduser -S -h /var/lib/mpd -s /sbin/nologin -G audio -D mpd 2>/dev/null || true
+adduser -S -h /var/lib/mpd -s /sbin/nologin -G audio -D -g mpd mpd 2>/dev/null || true
diff --git a/main/nagios/nagios.pre-install b/main/nagios/nagios.pre-install
index dad8a0e..d9c0f3c 100644
--- a/main/nagios/nagios.pre-install
+++ b/main/nagios/nagios.pre-install
_at_@ -1,5 +1,5 @@
 #!/bin/sh
 
 addgroup -S nagios 2>/dev/null
-adduser -S -G nagios -H -h /var/nagios -s /sbin/nologin nagios 2>/dev/null
+adduser -S -G nagios -H -h /var/nagios -s /sbin/nologin -g nagios nagios 2>/dev/null
 exit 0
diff --git a/main/nginx-initscripts/nginx-initscripts.pre-install b/main/nginx-initscripts/nginx-initscripts.pre-install
index 63db1e9..00bd0de 100644
--- a/main/nginx-initscripts/nginx-initscripts.pre-install
+++ b/main/nginx-initscripts/nginx-initscripts.pre-install
_at_@ -3,7 +3,7 @@
 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 nginx 2>/dev/null
+	-D -g nginx nginx 2>/dev/null
 addgroup nginx www-data 2>/dev/null
 
 exit 0
diff --git a/main/ngircd/ngircd.pre-install b/main/ngircd/ngircd.pre-install
index 5c8d34b..036c9ab 100644
--- a/main/ngircd/ngircd.pre-install
+++ b/main/ngircd/ngircd.pre-install
_at_@ -1,4 +1,4 @@
 #!/bin/sh
 
-adduser -S -H -h /etc/ngircd -s /sbin/nologin -D ngircd 2>/dev/null
+adduser -S -H -h /etc/ngircd -s /sbin/nologin -D -g ngircd ngircd 2>/dev/null
 exit 0
diff --git a/main/nrpe/nrpe.pre-install b/main/nrpe/nrpe.pre-install
index a9a0d38..7ee629b 100644
--- a/main/nrpe/nrpe.pre-install
+++ b/main/nrpe/nrpe.pre-install
_at_@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -H -h /dev/null -s /sbin/nologin -D nagios 2>/dev/null
+adduser -S -H -h /dev/null -s /sbin/nologin -D -g nagios nagios 2>/dev/null
 addgroup -S nagios 2>/dev/null
 exit 0
diff --git a/main/nsd/nsd.pre-install b/main/nsd/nsd.pre-install
index 7f92eca..106ac00 100644
--- a/main/nsd/nsd.pre-install
+++ b/main/nsd/nsd.pre-install
_at_@ -1,4 +1,4 @@
 #!/bin/sh
 addgroup -S nsd 2>/dev/null
-adduser -S -G nsd -H -h /var/db/nsd -s /sbin/nologin nsd 2>/dev/null
+adduser -S -G nsd -H -h /var/db/nsd -s /sbin/nologin -g nsd nsd 2>/dev/null
 exit 0
diff --git a/main/nss-pam-ldapd/nss-pam-ldapd.pre-install b/main/nss-pam-ldapd/nss-pam-ldapd.pre-install
index 5d30b9c..5a7076f 100644
--- a/main/nss-pam-ldapd/nss-pam-ldapd.pre-install
+++ b/main/nss-pam-ldapd/nss-pam-ldapd.pre-install
_at_@ -5,5 +5,5 @@ groupname=$username
 
 addgroup -S $username 2>/dev/null
 adduser -S -H -h /var/run/$username -s /sbin/nologin -D -G $groupname \
-	$username 2>/dev/null
+	-g $username $username 2>/dev/null
 exit 0
diff --git a/main/ntop/ntop.pre-install b/main/ntop/ntop.pre-install
index e22ff3e..2386dc8 100755
--- a/main/ntop/ntop.pre-install
+++ b/main/ntop/ntop.pre-install
_at_@ -1,4 +1,4 @@
 #!/bin/sh
 addgroup -S ntop 2>/dev/null
-adduser -S -h /var/lib/ntop -s /sbin/nologin -G ntop -H -D ntop 2>/dev/null
+adduser -S -h /var/lib/ntop -s /sbin/nologin -G ntop -H -D -g ntop ntop 2>/dev/null
 exit 0
diff --git a/main/openntpd/openntpd.pre-install b/main/openntpd/openntpd.pre-install
index feb5d9c..997e7bf 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 -S -H -h /var/empty -s /sbin/nologin -D ntp  2>/dev/null
+adduser -S -H -h /var/empty -s /sbin/nologin -D -g ntp ntp  2>/dev/null
 
 exit 0
diff --git a/main/opentracker/opentracker.pre-install b/main/opentracker/opentracker.pre-install
index 8d619f6..2e591db 100644
--- a/main/opentracker/opentracker.pre-install
+++ b/main/opentracker/opentracker.pre-install
_at_@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -D -H -h /var/empty -s /sbin/false opentracker 2>/dev/null
+adduser -S -D -H -h /var/empty -s /sbin/false -g opentracker opentracker 2>/dev/null
 exit 0
 
diff --git a/main/openvpn/openvpn.pre-install b/main/openvpn/openvpn.pre-install
index 0f39d06..37e0bf2 100644
--- a/main/openvpn/openvpn.pre-install
+++ b/main/openvpn/openvpn.pre-install
_at_@ -1,5 +1,5 @@
 #!/bin/sh
 
 addgroup -S openvpn 2>/dev/null
-adduser -S -H -h /dev/null -s /sbin/nologin -D -G openvpn openvpn 2>/dev/null
+adduser -S -H -h /dev/null -s /sbin/nologin -D -G openvpn -g openvpn openvpn 2>/dev/null
 exit 0
diff --git a/main/pcsc-lite/pcsc-lite.pre-install b/main/pcsc-lite/pcsc-lite.pre-install
index 1c1ba3c..192e10e 100644
--- a/main/pcsc-lite/pcsc-lite.pre-install
+++ b/main/pcsc-lite/pcsc-lite.pre-install
_at_@ -5,5 +5,5 @@ groupname=$username
 
 addgroup -S $username 2>/dev/null
 adduser -S -H -h /var/run/$username -s /sbin/nologin -D -G $groupname \
-	$username 2>/dev/null
+	-g $username $username 2>/dev/null
 exit 0
diff --git a/main/pdnsd/pdnsd.pre-install b/main/pdnsd/pdnsd.pre-install
index 247928c..b916dab 100644
--- a/main/pdnsd/pdnsd.pre-install
+++ b/main/pdnsd/pdnsd.pre-install
_at_@ -1,4 +1,4 @@
 #!/bin/sh
 
-adduser -S -H -h /var/cache/pdnsd -s /sbin/nologin pdnsd 2>/dev/null
+adduser -S -H -h /var/cache/pdnsd -s /sbin/nologin -g pdnsd pdnsd 2>/dev/null
 exit 0
diff --git a/main/perdition/perdition.pre-install b/main/perdition/perdition.pre-install
index 5d9148f..1c0b01e 100644
--- a/main/perdition/perdition.pre-install
+++ b/main/perdition/perdition.pre-install
_at_@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S perdition 2>/dev/null
-adduser -S -h /var/run/perdition -s /sbin/nologin -G perdition -D perdition 2>/dev/null
+adduser -S -h /var/run/perdition -s /sbin/nologin -G perdition -D -g perdition perdition 2>/dev/null
 
 exit 0
diff --git a/main/postfix/postfix.pre-install b/main/postfix/postfix.pre-install
index c3fc668..6a59570 100644
--- a/main/postfix/postfix.pre-install
+++ b/main/postfix/postfix.pre-install
_at_@ -2,9 +2,9 @@
 
 addgroup -S postfix 2>/dev/null
 addgroup -S postdrop 2>/dev/null
-adduser -S -h /var/spool/postfix -G postfix postfix 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 vmail 2>/dev/null
+adduser -S -H -s /sbin/nologin -h /var/mail/domains -G postdrop -g vmail vmail 2>/dev/null
 
 
 exit 0
diff --git a/main/postgrey/postgrey.pre-install b/main/postgrey/postgrey.pre-install
index 480391c..e745acf 100644
--- a/main/postgrey/postgrey.pre-install
+++ b/main/postgrey/postgrey.pre-install
_at_@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S postgrey 2>/dev/null
-adduser -S -H -h /dev/null -s /sbin/nologin -D postgrey  2>/dev/null
+adduser -S -H -h /dev/null -s /sbin/nologin -D -g postgrey postgrey  2>/dev/null
 
 exit 0
diff --git a/main/privoxy/privoxy.pre-install b/main/privoxy/privoxy.pre-install
index 72a917e..72b4ac1 100644
--- a/main/privoxy/privoxy.pre-install
+++ b/main/privoxy/privoxy.pre-install
_at_@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S privoxy 2>/dev/null
-adduser -S -G privoxy -h /var/log/privoxy -s /sbin/nologin -D privoxy 2>/dev/null
+adduser -S -G privoxy -h /var/log/privoxy -s /sbin/nologin -D -g privoxy privoxy 2>/dev/null
 exit 0
 
diff --git a/main/quagga-nhrp/quagga-nhrp.pre-install b/main/quagga-nhrp/quagga-nhrp.pre-install
index c0fe3c8..f8340fa 100644
--- a/main/quagga-nhrp/quagga-nhrp.pre-install
+++ b/main/quagga-nhrp/quagga-nhrp.pre-install
_at_@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S quagga 2>/dev/null
-adduser -S -h /var/run/quagga -s /sbin/nologin -D -G quagga quagga 2>/dev/null
+adduser -S -h /var/run/quagga -s /sbin/nologin -D -G quagga -g quagga quagga 2>/dev/null
 exit 0
 
diff --git a/main/quagga/quagga.pre-install b/main/quagga/quagga.pre-install
index c0fe3c8..f8340fa 100644
--- a/main/quagga/quagga.pre-install
+++ b/main/quagga/quagga.pre-install
_at_@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S quagga 2>/dev/null
-adduser -S -h /var/run/quagga -s /sbin/nologin -D -G quagga quagga 2>/dev/null
+adduser -S -h /var/run/quagga -s /sbin/nologin -D -G quagga -g quagga quagga 2>/dev/null
 exit 0
 
diff --git a/main/quassel/quassel-core.pre-install b/main/quassel/quassel-core.pre-install
index 66572a1..01ec63d 100644
--- a/main/quassel/quassel-core.pre-install
+++ b/main/quassel/quassel-core.pre-install
_at_@ -1,6 +1,6 @@
 #!/bin/sh
 
-adduser -S -h /var/lib/quassel -s /sbin/nologin -D quassel 2>/dev/null
+adduser -S -h /var/lib/quassel -s /sbin/nologin -D -g quassel quassel 2>/dev/null
 addgroup -S quassel 2>/dev/null
 addgroup quassel quassel
 
diff --git a/main/redis/redis.pre-install b/main/redis/redis.pre-install
index 479434e..2a59934 100644
--- a/main/redis/redis.pre-install
+++ b/main/redis/redis.pre-install
_at_@ -1,5 +1,5 @@
 #!/bin/sh
 
 addgroup -S redis 2>/dev/null
-adduser -S -H -h /var/lib/redis -s /bin/false -D -G redis redis 2>/dev/null
+adduser -S -H -h /var/lib/redis -s /bin/false -D -G redis -g redis redis 2>/dev/null
 exit 0
diff --git a/main/rpcbind/rpcbind.pre-install b/main/rpcbind/rpcbind.pre-install
index 8db3128..51fae45 100644
--- a/main/rpcbind/rpcbind.pre-install
+++ b/main/rpcbind/rpcbind.pre-install
_at_@ -1,5 +1,5 @@
 #!/bin/sh
 
 addgroup -S rpc 2>/dev/null
-adduser -S -h /var/lib/rpcbind -s /sbin/nologin -D -G rpc rpc 2>/dev/null
+adduser -S -h /var/lib/rpcbind -s /sbin/nologin -D -G rpc -g rpc rpc 2>/dev/null
 exit 0
diff --git a/main/rtnppd/rtnppd.pre-install b/main/rtnppd/rtnppd.pre-install
index ec2c922..faf0431 100644
--- a/main/rtnppd/rtnppd.pre-install
+++ b/main/rtnppd/rtnppd.pre-install
_at_@ -1,5 +1,5 @@
 #!/bin/sh
 
 addgroup -S rtnppd 2>/dev/null
-adduser -S -G rtnppd -H -h /var/run/rtnppd -s /sbin/nologin rtnppd 2>/dev/null
+adduser -S -G rtnppd -H -h /var/run/rtnppd -s /sbin/nologin -g rtnppd rtnppd 2>/dev/null
 exit 0
diff --git a/main/rtpproxy/rtpproxy.pre-install b/main/rtpproxy/rtpproxy.pre-install
index d4ca593..cbf1e52 100644
--- a/main/rtpproxy/rtpproxy.pre-install
+++ b/main/rtpproxy/rtpproxy.pre-install
_at_@ -1,5 +1,5 @@
 #!/bin/sh
 
 addgroup -S rtpproxy 2>/dev/null
-adduser -S -G rtpproxy -H -h /usr/share/rtpproxy -s /sbin/nologin rtpproxy 2>/dev/null
+adduser -S -G rtpproxy -H -h /usr/share/rtpproxy -s /sbin/nologin -g rtpproxy rtpproxy 2>/dev/null
 exit 0
diff --git a/main/sems/sems.pre-install b/main/sems/sems.pre-install
index 6241566..b3b5c78 100644
--- a/main/sems/sems.pre-install
+++ b/main/sems/sems.pre-install
_at_@ -4,7 +4,7 @@ if ! getent group sems >/dev/null; then
 	addgroup -S sems
 fi
 if ! getent passwd sems >/dev/null; then
-	adduser -S -H -h /var/empty -s /sbin/nologin -D -G sems sems 2>/dev/null
+	adduser -S -H -h /var/empty -s /sbin/nologin -D -G sems -g sems sems 2>/dev/null
 fi
 
 exit 0
diff --git a/main/sircbot/sircbot.pre-install b/main/sircbot/sircbot.pre-install
index 453ba5d..8bfedcc 100644
--- a/main/sircbot/sircbot.pre-install
+++ b/main/sircbot/sircbot.pre-install
_at_@ -1,5 +1,5 @@
 #!/bin/sh
 
 addgroup -S sircbot 2>/dev/null
-adduser -S -h /var/run/sircbot -G sircbot -D sircbot 2>/dev/null
+adduser -S -h /var/run/sircbot -G sircbot -D -g sircbot sircbot 2>/dev/null
 exit 0
diff --git a/main/smokeping/smokeping.pre-install b/main/smokeping/smokeping.pre-install
index 8934148..3158cc4 100644
--- a/main/smokeping/smokeping.pre-install
+++ b/main/smokeping/smokeping.pre-install
_at_@ -1,5 +1,5 @@
 #!/bin/sh
 
 addgroup -S smokeping 2>/dev/null
-adduser -S -h /var/lib/smokeping -D -G smokeping smokeping 2>/dev/null
+adduser -S -h /var/lib/smokeping -D -G smokeping -g smokeping smokeping 2>/dev/null
 exit 0
diff --git a/main/snmptt/snmptt.pre-install b/main/snmptt/snmptt.pre-install
index 6619337..efc8a6e 100644
--- a/main/snmptt/snmptt.pre-install
+++ b/main/snmptt/snmptt.pre-install
_at_@ -1,3 +1,3 @@
 #!/bin/sh
-adduser -S -h /var/spool/snmptt -s /sbin/nologin -D snmptt &>/dev/null
+adduser -S -h /var/spool/snmptt -s /sbin/nologin -D -g snmptt snmptt &>/dev/null
 exit 0
diff --git a/main/snort/snort.pre-install b/main/snort/snort.pre-install
index c8bf706..47608ed 100644
--- a/main/snort/snort.pre-install
+++ b/main/snort/snort.pre-install
_at_@ -1,4 +1,4 @@
 #!/bin/sh
 
-adduser -S -h /var/log/snort -s /sbin/nologin -D snort 2>/dev/null
+adduser -S -h /var/log/snort -s /sbin/nologin -D -g snort snort 2>/dev/null
 exit 0
diff --git a/main/squid/squid.pre-install b/main/squid/squid.pre-install
index b51ade1..3ac1f9f 100644
--- a/main/squid/squid.pre-install
+++ b/main/squid/squid.pre-install
_at_@ -1,6 +1,6 @@
 #!/bin/sh
 
-adduser -S -D squid -H /var/cache/squid  2>/dev/null
+adduser -S -D -g squid 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 b51ade1..3ac1f9f 100644
--- a/main/squid/squid.pre-upgrade
+++ b/main/squid/squid.pre-upgrade
_at_@ -1,6 +1,6 @@
 #!/bin/sh
 
-adduser -S -D squid -H /var/cache/squid  2>/dev/null
+adduser -S -D -g squid squid -H /var/cache/squid  2>/dev/null
 addgroup -S winbind 2>/dev/null
 addgroup squid winbind
 exit 0
diff --git a/main/strongswan/strongswan.pre-install b/main/strongswan/strongswan.pre-install
index e1fa319..12371d1 100644
--- a/main/strongswan/strongswan.pre-install
+++ b/main/strongswan/strongswan.pre-install
_at_@ -4,7 +4,7 @@ if ! getent group ipsec >/dev/null; then
 	addgroup -S ipsec
 fi
 if ! getent passwd ipsec >/dev/null; then
-	adduser -S -H -h /var/empty -s /sbin/nologin -D -G ipsec ipsec 2>/dev/null
+	adduser -S -H -h /var/empty -s /sbin/nologin -D -G ipsec -g ipsec ipsec 2>/dev/null
 fi
 
 exit 0
diff --git a/main/subversion/subversion.pre-install b/main/subversion/subversion.pre-install
index ddec16c..3109006 100644
--- a/main/subversion/subversion.pre-install
+++ b/main/subversion/subversion.pre-install
_at_@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S svnusers 2>/dev/null
-adduser -S svn -D -h /var/svn -G svnusers 2>/dev/null
+adduser -S -g svn 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 f39f2b2..0fa8f02 100644
--- a/main/trac/trac.pre-install
+++ b/main/trac/trac.pre-install
_at_@ -1,5 +1,5 @@
 #!/bin/sh
 
 addgroup -S tracd 2>/dev/null
-adduser -S -s /sbin/nologin -G tracd -D -H tracd 2>/dev/null
+adduser -S -s /sbin/nologin -G tracd -D -H -g tracd tracd 2>/dev/null
 exit 0
diff --git a/main/transmission/transmission-daemon.pre-install b/main/transmission/transmission-daemon.pre-install
index 2f9a398..9ccac8c 100644
--- a/main/transmission/transmission-daemon.pre-install
+++ b/main/transmission/transmission-daemon.pre-install
_at_@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -h /var/lib/transmission -s /sbin/nologin -D transmission 2>/dev/null
+adduser -S -h /var/lib/transmission -s /sbin/nologin -D -g transmission transmission 2>/dev/null
 
 exit 0
diff --git a/main/umurmur/umurmur.post-install b/main/umurmur/umurmur.post-install
index 9d5f408..d9a350a 100755
--- a/main/umurmur/umurmur.post-install
+++ b/main/umurmur/umurmur.post-install
_at_@ -1,4 +1,4 @@
 #!/bin/sh
 addgroup -S umurmur &>/dev/null
-adduser -S -s /bin/false -G umurmur -h /var/run/umurmurd -D umurmur &>/dev/null
+adduser -S -s /bin/false -G umurmur -h /var/run/umurmurd -D -g umurmur umurmur &>/dev/null
 exit 0
diff --git a/main/uvncrepeater/uvncrepeater.pre-install b/main/uvncrepeater/uvncrepeater.pre-install
index a1126c6..0c856f8 100644
--- a/main/uvncrepeater/uvncrepeater.pre-install
+++ b/main/uvncrepeater/uvncrepeater.pre-install
_at_@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -D uvncrep 2>/dev/null
+adduser -S -D -g uvncrep uvncrep 2>/dev/null
 exit 0
 
diff --git a/main/varnish/varnish.pre-install b/main/varnish/varnish.pre-install
index 930d46b..74ccfd1 100644
--- a/main/varnish/varnish.pre-install
+++ b/main/varnish/varnish.pre-install
_at_@ -1,5 +1,5 @@
 #!/bin/sh
 
 addgroup -S varnish 2>/dev/null
-adduser -S -H -h /var/lib/varnish -s /sbin/nologin -D -G varnish varnish 2>/dev/null
+adduser -S -H -h /var/lib/varnish -s /sbin/nologin -D -G varnish -g varnish varnish 2>/dev/null
 exit 0
diff --git a/main/vde2/vde2.pre-install b/main/vde2/vde2.pre-install
index bb5037c..0e42350 100644
--- a/main/vde2/vde2.pre-install
+++ b/main/vde2/vde2.pre-install
_at_@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S vde2-net 2>/dev/null
-adduser -S -h /var/run/vde2 -s /sbin/nologin -G vde2-net -D -H vde2-net 2>/dev/null
+adduser -S -h /var/run/vde2 -s /sbin/nologin -G vde2-net -D -H -g vde2-net vde2-net 2>/dev/null
 
 exit 0
diff --git a/main/vlc/vlc-daemon.pre-install b/main/vlc/vlc-daemon.pre-install
index 72ee1b7..33f99df 100644
--- a/main/vlc/vlc-daemon.pre-install
+++ b/main/vlc/vlc-daemon.pre-install
_at_@ -4,7 +4,7 @@ groups="vlc audio video"
 for group in $groups; do
 	addgroup -S $group 2>/dev/null
 done
-adduser -S -h /home/vlc -s /bin/sh -G vlc -D vlc 2>/dev/null
+adduser -S -h /home/vlc -s /bin/sh -G vlc -D -g vlc vlc 2>/dev/null
 
 # make sure vlc are in all groups
 for group in $groups; do
diff --git a/main/vsftpd/vsftpd.pre-install b/main/vsftpd/vsftpd.pre-install
index 200d233..0ed59d9 100755
--- a/main/vsftpd/vsftpd.pre-install
+++ b/main/vsftpd/vsftpd.pre-install
_at_@ -1,5 +1,5 @@
 #!/bin/sh
 addgroup -S ftp &>/dev/null
 addgroup vsftp ftp &>/dev/null
-adduser -S -h /var/lib/ftp -s /sbin/nologin -G ftp vsftp &>/dev/null
+adduser -S -h /var/lib/ftp -s /sbin/nologin -G ftp -g vsftp vsftp &>/dev/null
 exit 0
diff --git a/main/ympd/ympd.pre-install b/main/ympd/ympd.pre-install
index 1bbd045..369f25d 100644
--- a/main/ympd/ympd.pre-install
+++ b/main/ympd/ympd.pre-install
_at_@ -1,3 +1,3 @@
 #!/bin/sh
-adduser -S -H -D -s /sbin/nologin -G audio ympd 2>/dev/null
+adduser -S -H -D -s /sbin/nologin -G audio -g ympd ympd 2>/dev/null
 exit 0
diff --git a/main/zabbix/zabbix-agent.pre-install b/main/zabbix/zabbix-agent.pre-install
index 91ea88c..a63d884 100644
--- a/main/zabbix/zabbix-agent.pre-install
+++ b/main/zabbix/zabbix-agent.pre-install
_at_@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S zabbix 2>/dev/null
-adduser -S -H -h /dev/null -s /sbin/nologin -D -G zabbix zabbix 2>/dev/null
+adduser -S -H -h /dev/null -s /sbin/nologin -D -G zabbix -g zabbix zabbix 2>/dev/null
 addgroup -g 30 zabbix 2>/dev/null
 exit 0
diff --git a/main/zabbix/zabbix.pre-install b/main/zabbix/zabbix.pre-install
index 19d6469..30851f1 100644
--- a/main/zabbix/zabbix.pre-install
+++ b/main/zabbix/zabbix.pre-install
_at_@ -1,5 +1,5 @@
 #!/bin/sh
 
 addgroup -S zabbix 2>/dev/null
-adduser -S -H -h /dev/null -s /sbin/nologin -D -G zabbix zabbix 2>/dev/null
+adduser -S -H -h /dev/null -s /sbin/nologin -D -G zabbix -g zabbix zabbix 2>/dev/null
 exit 0
diff --git a/main/znc/znc.pre-install b/main/znc/znc.pre-install
index ad5aed9..c0e1fa5 100644
--- a/main/znc/znc.pre-install
+++ b/main/znc/znc.pre-install
_at_@ -1,3 +1,3 @@
 #!/bin/sh
-adduser -S -H -D -s /sbin/nologin znc 2>/dev/null
+adduser -S -H -D -s /sbin/nologin -g znc znc 2>/dev/null
 exit 0
diff --git a/testing/3proxy/3proxy.pre-install b/testing/3proxy/3proxy.pre-install
index dbfa438..46e6ea5 100644
--- a/testing/3proxy/3proxy.pre-install
+++ b/testing/3proxy/3proxy.pre-install
_at_@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S 3proxy 2>/dev/null
-adduser -S -G 3proxy -h /var/log/3proxy -s /sbin/nologin -D 3proxy 2>/dev/null
+adduser -S -G 3proxy -h /var/log/3proxy -s /sbin/nologin -D -g 3proxy 3proxy 2>/dev/null
 exit 0
 
diff --git a/testing/at/at.pre-install b/testing/at/at.pre-install
index 5372277..a35aa48 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 -S -H -s /bin/false -D at 2>/dev/null
+	adduser -S -H -s /bin/false -D -g at at 2>/dev/null
 fi
 
 if [ -z `echo " $(groups at) " | grep ' at '`] ; then
diff --git a/testing/clapf/clapf.pre-install b/testing/clapf/clapf.pre-install
index bf78879..dff8c72 100644
--- a/testing/clapf/clapf.pre-install
+++ b/testing/clapf/clapf.pre-install
_at_@ -1,3 +1,3 @@
 #!/bin/sh
-adduser -S -H -s /bin/false -D clamav 2>/dev/null
+adduser -S -H -s /bin/false -D -g clamav 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 056fbde..2dff6b2 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 -S haclient 2>/dev/null
-adduser -S hacluster \
+adduser -S -g hacluster hacluster \
 	-h /var/lib/heartbeat/cores/hacluster \
 	-G haclient \
 	-s /sbin/nologin \
diff --git a/testing/consul/consul.pre-install b/testing/consul/consul.pre-install
index 6e11c5b..4d7a385 100644
--- a/testing/consul/consul.pre-install
+++ b/testing/consul/consul.pre-install
_at_@ -2,6 +2,6 @@
 
 # Create consul group and user
 addgroup -S consul 2> /dev/null
-adduser -S -h /var/consul -s /sbin/nologin -G consul -D consul 2> /dev/null
+adduser -S -h /var/consul -s /sbin/nologin -G consul -D -g consul consul 2> /dev/null
 exit 0
 
diff --git a/testing/crtmpserver/crtmpserver.pre-install b/testing/crtmpserver/crtmpserver.pre-install
index 025170a..643a6f8 100644
--- a/testing/crtmpserver/crtmpserver.pre-install
+++ b/testing/crtmpserver/crtmpserver.pre-install
_at_@ -1,3 +1,3 @@
 #!/bin/sh
-adduser -S -h /var/crtmpserver -s /bin/false rtmpd 2>/dev/null
+adduser -S -h /var/crtmpserver -s /bin/false -g rtmpd rtmpd 2>/dev/null
 exit 0
diff --git a/testing/dante/dante-server.pre-install b/testing/dante/dante-server.pre-install
index f245d67..f657308 100644
--- a/testing/dante/dante-server.pre-install
+++ b/testing/dante/dante-server.pre-install
_at_@ -1,5 +1,5 @@
 #!/bin/sh
 
 addgroup -S sockd 2>/dev/null
-adduser -S -H -h /dev/null -s /sbin/nologin -D -G sockd sockd 2>/dev/null
+adduser -S -H -h /dev/null -s /sbin/nologin -D -G sockd -g sockd sockd 2>/dev/null
 exit 0
diff --git a/testing/darwin-streaming-server/darwin-streaming-server.post-install b/testing/darwin-streaming-server/darwin-streaming-server.post-install
index 607ec15..005bd35 100644
--- a/testing/darwin-streaming-server/darwin-streaming-server.post-install
+++ b/testing/darwin-streaming-server/darwin-streaming-server.post-install
_at_@ -1,4 +1,4 @@
 #!/bin/sh
 addgroup -S qtss &>/dev/null
-adduser -S -s /bin/false -G qtss -h /var/darwinstreaming -D qtss &>/dev/null
+adduser -S -s /bin/false -G qtss -h /var/darwinstreaming -D -g qtss qtss &>/dev/null
 exit 0
diff --git a/testing/dbmail/dbmail.pre-install b/testing/dbmail/dbmail.pre-install
index aa19b67..1f650df 100644
--- a/testing/dbmail/dbmail.pre-install
+++ b/testing/dbmail/dbmail.pre-install
_at_@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -s /bin/false -D -H -h /var/lib/dbmail dbmail 2>/dev/null
+adduser -S -s /bin/false -D -H -h /var/lib/dbmail -g dbmail dbmail 2>/dev/null
 exit 0
 
diff --git a/testing/dnscrypt-proxy/dnscrypt-proxy.pre-install b/testing/dnscrypt-proxy/dnscrypt-proxy.pre-install
index 49c4ce6..3bee7f2 100644
--- a/testing/dnscrypt-proxy/dnscrypt-proxy.pre-install
+++ b/testing/dnscrypt-proxy/dnscrypt-proxy.pre-install
_at_@ -1,4 +1,4 @@
 #!/bin/sh
 addgroup -S dnscrypt 2>/dev/null
-adduser -S -H -h /var/empty -G dnscrypt -D -s /sbin/nologin dnscrypt 2>/dev/null
+adduser -S -H -h /var/empty -G dnscrypt -D -s /sbin/nologin -g dnscrypt dnscrypt 2>/dev/null
 exit 0
diff --git a/testing/drizzle/drizzle.post-install b/testing/drizzle/drizzle.post-install
index effba7b..e7c7dcb 100644
--- a/testing/drizzle/drizzle.post-install
+++ b/testing/drizzle/drizzle.post-install
_at_@ -1,2 +1,2 @@
 addgroup -S drizzle
-adduser -SDHG drizzle drizzle
+adduser -SDHG drizzle -g drizzle drizzle
diff --git a/testing/dspam/dspam.pre-install b/testing/dspam/dspam.pre-install
index 2eb8940..d06ab90 100644
--- a/testing/dspam/dspam.pre-install
+++ b/testing/dspam/dspam.pre-install
_at_@ -1,6 +1,6 @@
 #!/bin/sh
 
-adduser -S -h /var/lib/dspam -s /bin/false -D dspam 2>/dev/null
+adduser -S -h /var/lib/dspam -s /bin/false -D -g dspam 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 6d80151..d4cab3c 100644
--- a/testing/ejabberd/ejabberd.pre-install
+++ b/testing/ejabberd/ejabberd.pre-install
_at_@ -1,3 +1,3 @@
 #!/bin/sh
-adduser -S -H -h /var/lib/ejabberd -G ejabberd -D ejabberd  2>/dev/null
+adduser -S -H -h /var/lib/ejabberd -G ejabberd -D -g ejabberd ejabberd  2>/dev/null
 exit 0
diff --git a/testing/fcron/fcron.pre-install b/testing/fcron/fcron.pre-install
index 98f7bf1..d513ffd 100644
--- a/testing/fcron/fcron.pre-install
+++ b/testing/fcron/fcron.pre-install
_at_@ -1,4 +1,4 @@
 #!/bin/sh
-adduser -S -D fcron -H -s /sbin/nologin  2>/dev/null
+adduser -S -D -g fcron fcron -H -s /sbin/nologin  2>/dev/null
 addgroup -S fcron
 exit 0
diff --git a/testing/gdnsd/gdnsd.pre-install b/testing/gdnsd/gdnsd.pre-install
index 2479466..040e7f1 100644
--- a/testing/gdnsd/gdnsd.pre-install
+++ b/testing/gdnsd/gdnsd.pre-install
_at_@ -1,5 +1,5 @@
 #!/bin/sh
 
 addgroup -S gdnsd 2>/dev/null
-adduser -S -H -h /dev/null -s /sbin/nologin -D -G gdnsd gdnsd 2>/dev/null
+adduser -S -H -h /dev/null -s /sbin/nologin -D -G gdnsd -g gdnsd gdnsd 2>/dev/null
 exit 0
diff --git a/testing/gogs/gogs.pre-install b/testing/gogs/gogs.pre-install
index 981a379..1596d65 100644
--- a/testing/gogs/gogs.pre-install
+++ b/testing/gogs/gogs.pre-install
_at_@ -1,4 +1,4 @@
 #!/bin/sh
 
-adduser -S -h /var/lib/gogs -s /bin/ash -G www-data -D gogs 2>/dev/null || true
+adduser -S -h /var/lib/gogs -s /bin/ash -G www-data -D -g gogs gogs 2>/dev/null || true
 passwd -u gogs || true
diff --git a/testing/h2o/h2o.pre-install b/testing/h2o/h2o.pre-install
index 358f4a2..92631f1 100644
--- a/testing/h2o/h2o.pre-install
+++ b/testing/h2o/h2o.pre-install
_at_@ -1,6 +1,6 @@
 #!/bin/sh
 
-adduser -S -s /sbin/nologin -h /var/www -D -H h2o 2>/dev/null 
+adduser -S -s /sbin/nologin -h /var/www -D -H -g h2o h2o 2>/dev/null 
 addgroup -S -g 82 www-data 2>/dev/null
 addgroup h2o www-data 2>/dev/null
 
diff --git a/testing/knot/knot.pre-install b/testing/knot/knot.pre-install
index 82be3a6..60789de 100644
--- a/testing/knot/knot.pre-install
+++ b/testing/knot/knot.pre-install
_at_@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S knot 2>/dev/null
-adduser -S -s /sbin/nologin -G knot -D -H knot 2>/dev/null
+adduser -S -s /sbin/nologin -G knot -D -H -g knot knot 2>/dev/null
 
 exit 0
diff --git a/testing/lightdm/lightdm.pre-install b/testing/lightdm/lightdm.pre-install
index 7a5fefe..b8dbf56 100644
--- a/testing/lightdm/lightdm.pre-install
+++ b/testing/lightdm/lightdm.pre-install
_at_@ -2,5 +2,5 @@
 
 name=lightdm
 addgroup -S $name 2>/dev/null
-adduser -S -H -h /var/run/lightdm -s /bin/false -D -G $name $name 2>/dev/null
+adduser -S -H -h /var/run/lightdm -s /bin/false -D -G $name -g $name $name 2>/dev/null
 exit 0
diff --git a/testing/lizardfs/lizardfs.pre-install b/testing/lizardfs/lizardfs.pre-install
index 33821a2..f302e85 100644
--- a/testing/lizardfs/lizardfs.pre-install
+++ b/testing/lizardfs/lizardfs.pre-install
_at_@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S mfs 2>/dev/null
-adduser -S -H -h /var/lib/mfs -s /sbin/nologin -D -G mfs mfs \
+adduser -S -H -h /var/lib/mfs -s /sbin/nologin -D -G mfs -g mfs mfs \
 	2>/dev/null
 exit 0
diff --git a/testing/lshell/lshell.pre-install b/testing/lshell/lshell.pre-install
index 64ed203..89e31b2 100644
--- a/testing/lshell/lshell.pre-install
+++ b/testing/lshell/lshell.pre-install
_at_@ -1,4 +1,4 @@
 #!/bin/sh
 addgroup -S lshell 2>/dev/null
-adduser -S -H -h /var/empty -G lshell -D -s /sbin/nologin lshell 2>/dev/null
+adduser -S -H -h /var/empty -G lshell -D -s /sbin/nologin -g lshell lshell 2>/dev/null
 exit 0
diff --git a/testing/lusca/lusca.pre-install b/testing/lusca/lusca.pre-install
index 7679028..72953cf 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
+adduser -S -D -g lusca lusca -h /var/cache/lusca -s /sbin/nologin  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 7679028..72953cf 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
+adduser -S -D -g lusca lusca -h /var/cache/lusca -s /sbin/nologin  2>/dev/null
 addgroup -S winbind 2>/dev/null
 addgroup lusca winbind
 exit 0
diff --git a/testing/milter-greylist/milter-greylist.pre-install b/testing/milter-greylist/milter-greylist.pre-install
index 06b94b4..f5e5359 100644
--- a/testing/milter-greylist/milter-greylist.pre-install
+++ b/testing/milter-greylist/milter-greylist.pre-install
_at_@ -1,4 +1,4 @@
 #!/bin/sh
 addgroup -S smmsp &>/dev/null
-adduser -h /var/lib/milter-greylist -s /sbin/nologin -S -G smmsp smmsp &>/dev/null
+adduser -h /var/lib/milter-greylist -s /sbin/nologin -S -G smmsp -g smmsp smmsp &>/dev/null
 exit 0
diff --git a/testing/mongodb/mongodb.pre-install b/testing/mongodb/mongodb.pre-install
index 432d983..93c85ec 100644
--- a/testing/mongodb/mongodb.pre-install
+++ b/testing/mongodb/mongodb.pre-install
_at_@ -1,5 +1,5 @@
 #!/bin/sh
 
 addgroup -S mongodb
-adduser -S -D -G mongodb -h /var/lib/mongodb -s /sbin/nologin mongodb
+adduser -S -D -G mongodb -h /var/lib/mongodb -s /sbin/nologin -g mongodb mongodb
 exit 0
diff --git a/testing/motion/motion.pre-install b/testing/motion/motion.pre-install
index f4ff0d9..7e66ab0 100644
--- a/testing/motion/motion.pre-install
+++ b/testing/motion/motion.pre-install
_at_@ -1,6 +1,6 @@
 #!/bin/sh
 addgroup -S motion 2>/dev/null
-adduser -S -h /home/motion -s /bin/false -G motion -D motion 2>/dev/null
+adduser -S -h /home/motion -s /bin/false -G motion -D -g motion motion 2>/dev/null
 addgroup motion video
 exit 0
 
diff --git a/testing/munin/munin-node.pre-install b/testing/munin/munin-node.pre-install
index 86c601a..0680267 100644
--- a/testing/munin/munin-node.pre-install
+++ b/testing/munin/munin-node.pre-install
_at_@ -5,6 +5,6 @@ groupname="$username"
 
 addgroup -S "$username" 2>/dev/null
 adduser -S -H -h /run/"$username" -s /sbin/nologin -D -G "$groupname" \
-	"$username" 2>/dev/null
+	-g "$username" "$username" 2>/dev/null
 
 exit 0
diff --git a/testing/nginx-naxsi/nginx-naxsi.pre-install b/testing/nginx-naxsi/nginx-naxsi.pre-install
index 63db1e9..00bd0de 100644
--- a/testing/nginx-naxsi/nginx-naxsi.pre-install
+++ b/testing/nginx-naxsi/nginx-naxsi.pre-install
_at_@ -3,7 +3,7 @@
 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 nginx 2>/dev/null
+	-D -g nginx nginx 2>/dev/null
 addgroup nginx www-data 2>/dev/null
 
 exit 0
diff --git a/testing/ntopng/ntopng.pre-install b/testing/ntopng/ntopng.pre-install
index e22ff3e..2386dc8 100755
--- a/testing/ntopng/ntopng.pre-install
+++ b/testing/ntopng/ntopng.pre-install
_at_@ -1,4 +1,4 @@
 #!/bin/sh
 addgroup -S ntop 2>/dev/null
-adduser -S -h /var/lib/ntop -s /sbin/nologin -G ntop -H -D ntop 2>/dev/null
+adduser -S -h /var/lib/ntop -s /sbin/nologin -G ntop -H -D -g ntop ntop 2>/dev/null
 exit 0
diff --git a/testing/opensips/opensips.pre-install b/testing/opensips/opensips.pre-install
index 5da9a0e..9ef4702 100644
--- a/testing/opensips/opensips.pre-install
+++ b/testing/opensips/opensips.pre-install
_at_@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -H -h /var/empty -s /bin/false -D opensips  2>/dev/null
+adduser -S -H -h /var/empty -s /bin/false -D -g opensips opensips  2>/dev/null
 
 exit 0
diff --git a/testing/openxcap/openxcap.pre-install b/testing/openxcap/openxcap.pre-install
index 0323113..44ad106 100755
--- a/testing/openxcap/openxcap.pre-install
+++ b/testing/openxcap/openxcap.pre-install
_at_@ -1,5 +1,5 @@
 #!/bin/sh
 
 addgroup -S openxcap 2>/dev/null
-adduser -S -G openxcap -h /var/run/openxcap -s /bin/false -D -H openxcap 2>/dev/null
+adduser -S -G openxcap -h /var/run/openxcap -s /bin/false -D -H -g openxcap openxcap 2>/dev/null
 exit 0
diff --git a/testing/pdns/pdns.pre-install b/testing/pdns/pdns.pre-install
index 2565d49..e0b3c5a 100644
--- a/testing/pdns/pdns.pre-install
+++ b/testing/pdns/pdns.pre-install
_at_@ -1,4 +1,4 @@
 #!/bin/sh
 
-adduser -S -H -h /var/empty -D -s /bin/false pdns 2>/dev/null
+adduser -S -H -h /var/empty -D -s /bin/false -g pdns pdns 2>/dev/null
 exit 0
diff --git a/testing/qpage/qpage.pre-install b/testing/qpage/qpage.pre-install
index 160fc0b..aaa8d3e 100644
--- a/testing/qpage/qpage.pre-install
+++ b/testing/qpage/qpage.pre-install
_at_@ -1,3 +1,3 @@
 #!/bin/sh
 
-adduser -S -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 -g qpage qpage 2>/dev/null || true
diff --git a/testing/radicale/radicale.pre-install b/testing/radicale/radicale.pre-install
index 1145005..f101c38 100644
--- a/testing/radicale/radicale.pre-install
+++ b/testing/radicale/radicale.pre-install
_at_@ -2,6 +2,6 @@
 
 name=radicale
 addgroup -S $name 2>/dev/null
-adduser -S -H -h /var/lib/$name -s /sbin/nologin -D -G $name $name 2>/dev/null
+adduser -S -H -h /var/lib/$name -s /sbin/nologin -D -G $name -g $name $name 2>/dev/null
 addgroup $name $name 2>/dev/null
 exit 0
diff --git a/testing/rancid/rancid.pre-install b/testing/rancid/rancid.pre-install
index 55691b2..7204ea3 100644
--- a/testing/rancid/rancid.pre-install
+++ b/testing/rancid/rancid.pre-install
_at_@ -1,5 +1,5 @@
 #!/bin/sh
 
 addgroup -S netadm 2>/dev/null
-adduser -S -h /var/rancid -s /bin/sh -G netadm -D rancid 2>/dev/null
+adduser -S -h /var/rancid -s /bin/sh -G netadm -D -g rancid rancid 2>/dev/null
 exit 0
diff --git a/testing/rrdbot/rrdbot.pre-install b/testing/rrdbot/rrdbot.pre-install
index ab339f8..291f918 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 -S -H -s /bin/false -D rrdbotd  2>/dev/null
+adduser -S -H -s /bin/false -D -g rrdbotd rrdbotd  2>/dev/null
 
 exit 0
diff --git a/testing/sipwise-sems/sipwise-sems.pre-install b/testing/sipwise-sems/sipwise-sems.pre-install
index 6241566..b3b5c78 100644
--- a/testing/sipwise-sems/sipwise-sems.pre-install
+++ b/testing/sipwise-sems/sipwise-sems.pre-install
_at_@ -4,7 +4,7 @@ if ! getent group sems >/dev/null; then
 	addgroup -S sems
 fi
 if ! getent passwd sems >/dev/null; then
-	adduser -S -H -h /var/empty -s /sbin/nologin -D -G sems sems 2>/dev/null
+	adduser -S -H -h /var/empty -s /sbin/nologin -D -G sems -g sems sems 2>/dev/null
 fi
 
 exit 0
diff --git a/testing/socklog/socklog.post-install b/testing/socklog/socklog.post-install
index 9cfa37f..3f1b8a3 100644
--- a/testing/socklog/socklog.post-install
+++ b/testing/socklog/socklog.post-install
_at_@ -3,7 +3,7 @@
 # Copyright 2015 Stuart Cardall (developer_at_it-offshore.co.uk)
 # Distributed under the terms of the GNU General Public License, v2 or later #
 
-adduser -S -H -h /var/empty -D -s /sbin/nologin log 2>/dev/null
+adduser -S -H -h /var/empty -D -s /sbin/nologin -g log log 2>/dev/null
 if [ ! -d /etc/sv/socklog-unix ]; then
 	socklog-conf unix nobody log
 	mkdir -p /etc/service
diff --git a/testing/stunnel/stunnel.pre-install b/testing/stunnel/stunnel.pre-install
index 2631cc4..cfb5805 100644
--- a/testing/stunnel/stunnel.pre-install
+++ b/testing/stunnel/stunnel.pre-install
_at_@ -1,5 +1,5 @@
 #!/bin/sh
 
 addgroup -S stunnel 2>/dev/null
-adduser -S -H -h /dev/null -s /sbin/nologin -D -G stunnel stunnel 2>/dev/null
+adduser -S -H -h /dev/null -s /sbin/nologin -D -G stunnel -g stunnel stunnel 2>/dev/null
 exit 0
diff --git a/testing/tengine/tengine.pre-install b/testing/tengine/tengine.pre-install
index 5e32855..5a3d4b1 100644
--- a/testing/tengine/tengine.pre-install
+++ b/testing/tengine/tengine.pre-install
_at_@ -3,7 +3,7 @@
 addgroup -S -g 82 www-data 2>/dev/null
 addgroup -S tengine 2>/dev/null
 adduser -S -G tengine -H -h /var/www/localhost/htdocs -s /sbin/nologin \
-	-D tengine 2>/dev/null
+	-D -g tengine tengine 2>/dev/null
 addgroup tengine www-data 2>/dev/null
 
 exit 0
diff --git a/testing/tengine/tengine.pre-upgrade b/testing/tengine/tengine.pre-upgrade
index 5e32855..5a3d4b1 100644
--- a/testing/tengine/tengine.pre-upgrade
+++ b/testing/tengine/tengine.pre-upgrade
_at_@ -3,7 +3,7 @@
 addgroup -S -g 82 www-data 2>/dev/null
 addgroup -S tengine 2>/dev/null
 adduser -S -G tengine -H -h /var/www/localhost/htdocs -s /sbin/nologin \
-	-D tengine 2>/dev/null
+	-D -g tengine tengine 2>/dev/null
 addgroup tengine www-data 2>/dev/null
 
 exit 0
diff --git a/testing/thttpd/thttpd.pre-install b/testing/thttpd/thttpd.pre-install
index 104f72b..c2ccfb7 100644
--- a/testing/thttpd/thttpd.pre-install
+++ b/testing/thttpd/thttpd.pre-install
_at_@ -2,5 +2,5 @@
 
 addgroup -S -g 82 www-data 2>/dev/null
 adduser -S -H -h /var/www/localhost/htdocs -s /sbin/nologin \
-        -D thttpd 2>/dev/null
+        -D -g thttpd thttpd 2>/dev/null
 addgroup thttpd www-data 2>/dev/null
diff --git a/testing/tor/tor.pre-install b/testing/tor/tor.pre-install
index 9db7ac8..2353635 100644
--- a/testing/tor/tor.pre-install
+++ b/testing/tor/tor.pre-install
_at_@ -1,4 +1,4 @@
 #!/bin/sh
-adduser -S -h /var/run/tor -s /sbin/nologin -D tor 2>/dev/null
+adduser -S -h /var/run/tor -s /sbin/nologin -D -g tor tor 2>/dev/null
 exit 0
 
diff --git a/testing/tvheadend-git/tvheadend-git.pre-install b/testing/tvheadend-git/tvheadend-git.pre-install
index 237161e..84ca2f8 100644
--- a/testing/tvheadend-git/tvheadend-git.pre-install
+++ b/testing/tvheadend-git/tvheadend-git.pre-install
_at_@ -1,4 +1,4 @@
 #!/bin/sh
-adduser -S -s /sbin/nologin -H -h /usr/share/tvheadend tvheadend 2>/dev/null
+adduser -S -s /sbin/nologin -H -h /usr/share/tvheadend -g tvheadend tvheadend 2>/dev/null
 adduser tvheadend video
 exit 0
diff --git a/testing/vault/vault.pre-install b/testing/vault/vault.pre-install
index 93ce40b..60d449f 100644
--- a/testing/vault/vault.pre-install
+++ b/testing/vault/vault.pre-install
_at_@ -1,5 +1,5 @@
 #!/bin/sh
 
 addgroup -S vault 2>/dev/null
-adduser -S -H -h /dev/null -s /sbin/nologin -D -G vault vault 2>/dev/null
+adduser -S -H -h /dev/null -s /sbin/nologin -D -G vault -g vault vault 2>/dev/null
 exit 0
diff --git a/testing/vnstat/vnstat.pre-install b/testing/vnstat/vnstat.pre-install
index 4cb61f2..9445d10 100644
--- a/testing/vnstat/vnstat.pre-install
+++ b/testing/vnstat/vnstat.pre-install
_at_@ -1,5 +1,5 @@
 #!/bin/sh
 
 addgroup -S vnstat 2>/dev/null
-adduser -S -h /var/lib/ -H -s /bin/false -D -G vnstat vnstat 2>/dev/null
+adduser -S -h /var/lib/ -H -s /bin/false -D -G vnstat -g vnstat vnstat 2>/dev/null
 exit 0
diff --git a/testing/wt/wt.pre-install b/testing/wt/wt.pre-install
index e4478b2..849322d 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 -S -H -s /sbin/nologin -D wt 2>/dev/null
+adduser -S -H -s /sbin/nologin -D -g wt wt 2>/dev/null
 addgroup wt www-data 2>/dev/null
 exit 0
diff --git a/testing/x2goserver/x2goserver.pre-install b/testing/x2goserver/x2goserver.pre-install
index db97192..911390e 100755
--- a/testing/x2goserver/x2goserver.pre-install
+++ b/testing/x2goserver/x2goserver.pre-install
_at_@ -1,4 +1,4 @@
 #!/bin/sh
 
 addgroup -S x2gouser
-adduser -S -D -G x2gouser -h /var/lib/x2go -s /bin/false x2gouser
+adduser -S -D -G x2gouser -h /var/lib/x2go -s /bin/false -g x2gouser x2gouser
diff --git a/testing/zabbix/zabbix-agent.pre-install b/testing/zabbix/zabbix-agent.pre-install
index 3e42ff0..3ec8ae7 100644
--- a/testing/zabbix/zabbix-agent.pre-install
+++ b/testing/zabbix/zabbix-agent.pre-install
_at_@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S zabbix 2>/dev/null
-adduser -S -H -h /dev/null -s /sbin/nologin -D -G zabbix zabbix 2>/dev/null
+adduser -S -H -h /dev/null -s /sbin/nologin -D -G zabbix -g zabbix zabbix 2>/dev/null
 addgroup -S -g 30 zabbix 2>/dev/null
 exit 0
diff --git a/testing/zabbix/zabbix.pre-install b/testing/zabbix/zabbix.pre-install
index 19d6469..30851f1 100644
--- a/testing/zabbix/zabbix.pre-install
+++ b/testing/zabbix/zabbix.pre-install
_at_@ -1,5 +1,5 @@
 #!/bin/sh
 
 addgroup -S zabbix 2>/dev/null
-adduser -S -H -h /dev/null -s /sbin/nologin -D -G zabbix zabbix 2>/dev/null
+adduser -S -H -h /dev/null -s /sbin/nologin -D -G zabbix -g zabbix zabbix 2>/dev/null
 exit 0
diff --git a/unmaintained/apache-couchdb/apache-couchdb.post-install b/unmaintained/apache-couchdb/apache-couchdb.post-install
index 4d3b841..4bf99a4 100755
--- a/unmaintained/apache-couchdb/apache-couchdb.post-install
+++ b/unmaintained/apache-couchdb/apache-couchdb.post-install
_at_@ -1,4 +1,4 @@
 #!/bin/sh
 addgroup -S couchdb &>/dev/null
-adduser -S -h /var/run/couchdb -s /bin/false -G couchdb -D couchdb &>/dev/null
+adduser -S -h /var/run/couchdb -s /bin/false -G couchdb -D -g couchdb couchdb &>/dev/null
 exit 0
diff --git a/unmaintained/ejabberd-git/ejabberd-git.pre-install b/unmaintained/ejabberd-git/ejabberd-git.pre-install
index 6d80151..d4cab3c 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 -S -H -h /var/lib/ejabberd -G ejabberd -D ejabberd  2>/dev/null
+adduser -S -H -h /var/lib/ejabberd -G ejabberd -D -g ejabberd ejabberd  2>/dev/null
 exit 0
diff --git a/unmaintained/kde-workspace/kde-workspace.pre-install b/unmaintained/kde-workspace/kde-workspace.pre-install
index 84921ba..ef2e671 100644
--- a/unmaintained/kde-workspace/kde-workspace.pre-install
+++ b/unmaintained/kde-workspace/kde-workspace.pre-install
_at_@ -2,5 +2,5 @@
 
 name=kdm
 addgroup -S $name 2>/dev/null
-adduser -S -H -h /var/run/kdm -s /bin/false -D -G $name $name 2>/dev/null
+adduser -S -H -h /var/run/kdm -s /bin/false -D -G $name -g $name $name 2>/dev/null
 exit 0
diff --git a/unmaintained/shadowircd/shadowircd.pre-install b/unmaintained/shadowircd/shadowircd.pre-install
index f8d24e4..e05b5e5 100644
--- a/unmaintained/shadowircd/shadowircd.pre-install
+++ b/unmaintained/shadowircd/shadowircd.pre-install
_at_@ -1,3 +1,3 @@
 #!/bin/sh
-adduser -S -h /var/run/shadowircd -s /bin/false -D ircd 2>/dev/null
+adduser -S -h /var/run/shadowircd -s /bin/false -D -g ircd ircd 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:38 GMT