Add -g option (GECOS/comment) to adduser in scripts.

This way we can avoid ugly default:

    Linux user,,,

community/caddy/caddy.pre-install

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

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

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

community/domoticz/domoticz.pre-install

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

community/icinga2/icinga2.pre-install

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

community/minetest/minetest-server.pre-install

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

community/oscam/oscam.pre-install

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

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

community/smstools/smstools.pre-install

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

community/sniproxy/sniproxy.pre-install

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

community/syncthing/syncthing.pre-install

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

community/tvheadend/tvheadend.pre-install

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

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 amavis 2>/dev/null
+adduser -S -D -G amavis -h /var/amavis -s /sbin/nologin -g amavis amavis 2>/dev/null
 exit 0
 

main/apache2/apache2.pre-install

@@ -1,5 +1,5 @@
 #!/bin/sh
 addgroup -S -g 82 www-data 2>/dev/null
-adduser -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

main/aports-build/aports-build.pre-install

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

main/arpwatch/arpwatch.pre-install

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

main/asterisk/asterisk.pre-install

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

main/asterisk/asterisk.pre-upgrade

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

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

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

main/bacula/bacula.pre-install

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

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 named 2>/dev/null
+adduser -S -h /etc/bind -s /sbin/nologin -G named -D -g named named 2>/dev/null
 exit 0
 

main/charybdis/charybdis.pre-install

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

main/chrony/chrony.pre-install

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

main/clamav/clamav-daemon.pre-install

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

main/clamav/clamav-db.pre-install

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

main/clamav/freshclam.pre-install

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

main/clamsmtp/clamsmtp.pre-install

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

main/clamsmtp/clamsmtp.pre-upgrade

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

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

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

main/cups/cups.pre-install

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

main/cvechecker/cvechecker.pre-install

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

main/dansguardian/dansguardian.pre-install

@@ -5,5 +5,6 @@ adduser -S -D -H \
 	-h /var/log/dansguardian \
 	-s /sbin/nologin \
 	-G dansguar \
+	-g dansguar \
 	dansguar 2>/dev/null || true
 

main/darkhttpd/darkhttpd.pre-install

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

main/dbus/dbus.pre-install

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

main/dhcp/dhcp.pre-install

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

main/distcc/distcc.pre-install

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

main/dnsmasq/dnsmasq.pre-install

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

main/dovecot/dovecot.pre-install

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

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

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

main/fetchmail/fetchmail.pre-install

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

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 radius 2>/dev/null
+adduser -S -G radius -h /var/log/radius -s /sbin/nologin -D -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 freeswitch 2>/dev/null
+adduser -S -H -h /var/run/freeswitch -s /sbin/nologin -D -g freeswitch freeswitch 2>/dev/null
 
 exit 0

main/gdnsd/gdnsd.pre-install

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

main/gitolite/gitolite.pre-install

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

main/gnats/gnats.pre-install

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

main/gross/gross.pre-install

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

main/haproxy/haproxy.pre-install

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

main/haproxy/haproxy.pre-upgrade

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

main/icecast/icecast.pre-install

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

main/ircservices/ircservices.pre-install

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

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 kamailio  2>/dev/null
+adduser -S -H -h /var/empty -s /sbin/nologin -D -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 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

main/logcheck/logcheck.pre-install

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

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 mysql 2>/dev/null
+adduser -S -h /var/lib/mysql -s /sbin/nologin -G mysql -D -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 memcached 2>/dev/null
+adduser -S -H -s /sbin/nologin -D -g memcached memcached 2>/dev/null
 exit 0
 

main/mini_httpd/mini_httpd.pre-install

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

main/minidlna/minidlna.pre-install

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

main/mlmmj/mlmmj.pre-install

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

main/mosquitto/mosquitto.pre-install

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

main/mpd/mpd.pre-install

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

main/nagios/nagios.pre-install

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

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

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

main/ngircd/ngircd.pre-install

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

main/nrpe/nrpe.pre-install

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

main/nsd/nsd.pre-install

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

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

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

main/ntop/ntop.pre-install

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

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 ntp  2>/dev/null
+adduser -S -H -h /var/empty -s /sbin/nologin -D -g ntp ntp  2>/dev/null
 
 exit 0

main/opentracker/opentracker.pre-install

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

main/openvpn/openvpn.pre-install

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

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

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

main/pdnsd/pdnsd.pre-install

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

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 perdition 2>/dev/null
+adduser -S -h /var/run/perdition -s /sbin/nologin -G perdition -D -g perdition perdition 2>/dev/null
 
 exit 0

main/postfix/postfix.pre-install

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

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 postgrey  2>/dev/null
+adduser -S -H -h /dev/null -s /sbin/nologin -D -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 privoxy 2>/dev/null
+adduser -S -G privoxy -h /var/log/privoxy -s /sbin/nologin -D -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 quagga 2>/dev/null
+adduser -S -h /var/run/quagga -s /sbin/nologin -D -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 quagga 2>/dev/null
+adduser -S -h /var/run/quagga -s /sbin/nologin -D -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 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
 

main/redis/redis.pre-install

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

main/rpcbind/rpcbind.pre-install

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

main/rtnppd/rtnppd.pre-install

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

main/rtpproxy/rtpproxy.pre-install

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

main/sems/sems.pre-install

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

main/sircbot/sircbot.pre-install

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

main/smokeping/smokeping.pre-install

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

main/snmptt/snmptt.pre-install

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

main/snort/snort.pre-install

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

main/squid/squid.pre-install

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

main/squid/squid.pre-upgrade

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

main/strongswan/strongswan.pre-install

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

main/subversion/subversion.pre-install

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

main/trac/trac.pre-install

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

main/transmission/transmission-daemon.pre-install

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

main/umurmur/umurmur.post-install

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

main/uvncrepeater/uvncrepeater.pre-install

@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -D uvncrep 2>/dev/null
+adduser -S -D -g uvncrep uvncrep 2>/dev/null
 exit 0
 

main/varnish/varnish.pre-install

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

main/vde2/vde2.pre-install

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

main/vlc/vlc-daemon.pre-install

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

main/vsftpd/vsftpd.pre-install

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

main/ympd/ympd.pre-install

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