main/[various]: Add group and use it as primary in .pre-* scripts.

Fixes the problem I unintentionally brought in commit ccc056dbf9d3:
system user creation doesn't add same named group and uses nogroup as
primary group unless explicitly specified via -G.

Brings status quo regarding primary groups of users created in packages:
- main/apache2
- main/aports-build
- main/atheme-iris
- main/clamav
- main/clamsmtp
- main/coova-chilli
- main/dhcp
- main/djbdns
- main/ez-ipupdate
- main/fetchmail
- main/freeswitch
- main/gitolite
- main/gnats
- main/gross
- main/icecast
- main/memcached
- main/ngircd
- main/openntpd
- main/snort
- main/squid
- main/transmission
- main/znc

25 files changed, 50 insertions, 25 deletions

diff --git a/main/apache2/apache2.pre-install b/main/apache2/apache2.pre-install
index 703681e013..d4ede74766 100644
--- a/main/apache2/apache2.pre-install
+++ b/main/apache2/apache2.pre-install
@@ -1,7 +1,8 @@
 #!/bin/sh
 
 addgroup -S -g 82 www-data 2>/dev/null
-adduser -S -D -H -h /var/www -s /sbin/nologin -g apache apache 2>/dev/null
+addgroup -S apache 2>/dev/null
+adduser -S -D -H -h /var/www -s /sbin/nologin -G apache -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 4fcbdd439b..72c62b4099 100644
--- a/main/aports-build/aports-build.pre-install
+++ b/main/aports-build/aports-build.pre-install
@@ -1,5 +1,6 @@
 #!/bin/sh
 
-adduser -S -D -s /bin/sh -g buildozer buildozer 2>/dev/null
+addgroup -S buildozer 2>/dev/null
+adduser -S -D -s /bin/sh -G buildozer -g buildozer buildozer 2>/dev/null
 
 exit 0
diff --git a/main/atheme-iris/atheme-iris.pre-install b/main/atheme-iris/atheme-iris.pre-install
index ce2d521420..aa18cf533d 100644
--- a/main/atheme-iris/atheme-iris.pre-install
+++ b/main/atheme-iris/atheme-iris.pre-install
@@ -1,5 +1,6 @@
 #!/bin/sh
 
-adduser -S -D -H -h /usr/share/webapps/atheme-iris -s /sbin/nologin -g iris iris 2>/dev/null
+addgroup -S iris 2>/dev/null
+adduser -S -D -H -h /usr/share/webapps/atheme-iris -s /sbin/nologin -G iris -g iris iris 2>/dev/null
 
 exit 0
diff --git a/main/clamav/clamav-db.pre-install b/main/clamav/clamav-db.pre-install
index d1e52fb016..fdb83a0904 100644
--- a/main/clamav/clamav-db.pre-install
+++ b/main/clamav/clamav-db.pre-install
@@ -1,5 +1,6 @@
 #!/bin/sh
 
-adduser -S -D -H -s /sbin/nologin -g clamav clamav 2>/dev/null
+addgroup -S clamav 2>/dev/null
+adduser -S -D -H -s /sbin/nologin -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 d1e52fb016..fdb83a0904 100644
--- a/main/clamsmtp/clamsmtp.pre-install
+++ b/main/clamsmtp/clamsmtp.pre-install
@@ -1,5 +1,6 @@
 #!/bin/sh
 
-adduser -S -D -H -s /sbin/nologin -g clamav clamav 2>/dev/null
+addgroup -S clamav 2>/dev/null
+adduser -S -D -H -s /sbin/nologin -G clamav -g clamav clamav 2>/dev/null
 
 exit 0
diff --git a/main/clamsmtp/clamsmtp.pre-upgrade b/main/clamsmtp/clamsmtp.pre-upgrade
index 959576dd40..c397bfc382 100644
--- a/main/clamsmtp/clamsmtp.pre-upgrade
+++ b/main/clamsmtp/clamsmtp.pre-upgrade
@@ -10,6 +10,7 @@ if [ -f "$old" ] && [ ! -f "$new" ]; then
 	echo " *"
 fi
 
-adduser -S -D -H -s /bin/false -g clamav clamav 2>/dev/null
+addgroup -S clamav 2>/dev/null
+adduser -S -D -H -s /bin/false -G clamav -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 bf6ea4c1c1..342778dcd6 100644
--- a/main/coova-chilli/coova-chilli.pre-install
+++ b/main/coova-chilli/coova-chilli.pre-install
@@ -1,5 +1,6 @@
 #!/bin/sh
 
-adduser -S -D -H -s /sbin/nologin -g chilli chilli 2>/dev/null
+addgroup -S chilli 2>/dev/null
+adduser -S -D -H -s /sbin/nologin -G chilli -g chilli chilli 2>/dev/null
 
 exit 0
diff --git a/main/dhcp/dhcp.pre-install b/main/dhcp/dhcp.pre-install
index 2e0b83989b..6aa3de03be 100644
--- a/main/dhcp/dhcp.pre-install
+++ b/main/dhcp/dhcp.pre-install
@@ -1,5 +1,6 @@
 #!/bin/sh
 
-adduser -S -D -h /var/lib/dhcp -s /sbin/nologin -g dhcp dhcp 2>/dev/null
+addgroup -S dhcp 2>/dev/null
+adduser -S -D -h /var/lib/dhcp -s /sbin/nologin -G dhcp -g dhcp dhcp 2>/dev/null
 
 exit 0
diff --git a/main/djbdns/dnscache.pre-install b/main/djbdns/dnscache.pre-install
index 664732ca54..f59549a438 100644
--- a/main/djbdns/dnscache.pre-install
+++ b/main/djbdns/dnscache.pre-install
@@ -1,5 +1,6 @@
 #!/bin/sh
 
-adduser -S -D -H -h /etc/dnscache -g dnscache -s /sbin/nologin dnscache 2>/dev/null
+addgroup -S dnscache 2>/dev/null
+adduser -S -D -H -h /etc/dnscache -G dnscache -g dnscache -s /sbin/nologin dnscache 2>/dev/null
 
 exit 0
diff --git a/main/djbdns/tinydns.pre-install b/main/djbdns/tinydns.pre-install
index 85ba7e7e20..da47789e25 100644
--- a/main/djbdns/tinydns.pre-install
+++ b/main/djbdns/tinydns.pre-install
@@ -1,5 +1,6 @@
 #!/bin/sh
 
-adduser -S -D -H -h /etc/tinydns -s /sbin/nologin -g tinydns tinydns 2>/dev/null
+addgroup -S tinydns 2>/dev/null
+adduser -S -D -H -h /etc/tinydns -s /sbin/nologin -G tinydns -g tinydns tinydns 2>/dev/null
 
 exit 0
diff --git a/main/ez-ipupdate/ez-ipupdate.pre-install b/main/ez-ipupdate/ez-ipupdate.pre-install
index 11b4c57b27..8d33acc84a 100644
--- a/main/ez-ipupdate/ez-ipupdate.pre-install
+++ b/main/ez-ipupdate/ez-ipupdate.pre-install
@@ -1,5 +1,6 @@
 #!/bin/sh
 
-adduser -S -D -h /var/lib/ez-ipupdate -s /sbin/nologin -g ipupdate ipupdate 2>/dev/null
+addgroup -S ipupdate 2>/dev/null
+adduser -S -D -h /var/lib/ez-ipupdate -s /sbin/nologin -G ipupdate -g ipupdate ipupdate 2>/dev/null
 
 exit 0
diff --git a/main/fetchmail/fetchmail.pre-install b/main/fetchmail/fetchmail.pre-install
index ed3d409b5a..ef46a104d7 100644
--- a/main/fetchmail/fetchmail.pre-install
+++ b/main/fetchmail/fetchmail.pre-install
@@ -1,5 +1,6 @@
 #!/bin/sh
 
-adduser -S -D -H -h /var/lib/fetchmail -s /sbin/nologin -g fetchmail fetchmail 2>/dev/null
+addgroup -S fetchmail 2>/dev/null
+adduser -S -D -H -h /var/lib/fetchmail -s /sbin/nologin -G fetchmail -g fetchmail fetchmail 2>/dev/null
 
 exit 0
diff --git a/main/freeswitch/freeswitch.pre-install b/main/freeswitch/freeswitch.pre-install
index 6f31b67f61..a7790e9314 100755
--- a/main/freeswitch/freeswitch.pre-install
+++ b/main/freeswitch/freeswitch.pre-install
@@ -1,5 +1,6 @@
 #!/bin/sh
 
-adduser -S -D -H -h /var/run/freeswitch -s /sbin/nologin -g freeswitch freeswitch 2>/dev/null
+addgroup -S freeswitch 2>/dev/null
+adduser -S -D -H -h /var/run/freeswitch -s /sbin/nologin -G freeswitch -g freeswitch freeswitch 2>/dev/null
 
 exit 0
diff --git a/main/gitolite/gitolite.pre-install b/main/gitolite/gitolite.pre-install
index 506ef1d8f1..eadbf736e3 100644
--- a/main/gitolite/gitolite.pre-install
+++ b/main/gitolite/gitolite.pre-install
@@ -1,5 +1,6 @@
 #!/bin/sh
 
-adduser -S -D -H -h /var/lib/git -s /bin/sh -g git git 2>/dev/null
+addgroup -S git 2>/dev/null
+adduser -S -D -H -h /var/lib/git -s /bin/sh -G git -g git git 2>/dev/null
 
 exit 0
diff --git a/main/gnats/gnats.pre-install b/main/gnats/gnats.pre-install
index e3a4de0082..7e46b87e62 100644
--- a/main/gnats/gnats.pre-install
+++ b/main/gnats/gnats.pre-install
@@ -1,5 +1,6 @@
 #!/bin/sh
 
-adduser -S -D -h /var/lib/gnatsdb -g gnats gnats 2>/dev/null
+addgroup -S gnats 2>/dev/null
+adduser -S -D -h /var/lib/gnatsdb -G gnats -g gnats gnats 2>/dev/null
 
 exit 0
diff --git a/main/gross/gross.pre-install b/main/gross/gross.pre-install
index 078372da72..2a3db3cb3b 100644
--- a/main/gross/gross.pre-install
+++ b/main/gross/gross.pre-install
@@ -1,5 +1,6 @@
 #!/bin/sh
 
-adduser -S -D -H -s /sbin/nologin -g gross gross 2>/dev/null
+addgroup -S gross 2>/dev/null
+adduser -S -D -H -s /sbin/nologin -G gross -g gross gross 2>/dev/null
 
 exit 0
diff --git a/main/icecast/icecast.pre-install b/main/icecast/icecast.pre-install
index 3ee9c4a087..1951890cd1 100644
--- a/main/icecast/icecast.pre-install
+++ b/main/icecast/icecast.pre-install
@@ -1,5 +1,6 @@
 #!/bin/sh
 
-adduser -S -D -h /var/log/icecast -s /sbin/nologin -g icecast icecast 2>/dev/null
+addgroup -S icecast 2>/dev/null
+adduser -S -D -h /var/log/icecast -s /sbin/nologin -G icecast -g icecast icecast 2>/dev/null
 
 exit 0
diff --git a/main/memcached/memcached.pre-install b/main/memcached/memcached.pre-install
index 8ff0274efe..87b6ba91bc 100644
--- a/main/memcached/memcached.pre-install
+++ b/main/memcached/memcached.pre-install
@@ -1,5 +1,6 @@
 #!/bin/sh
 
-adduser -S -D -H -s /sbin/nologin -g memcached memcached 2>/dev/null
+addgroup -S memcached 2>/dev/null
+adduser -S -D -H -s /sbin/nologin -G memcached -g memcached memcached 2>/dev/null
 
 exit 0
diff --git a/main/ngircd/ngircd.pre-install b/main/ngircd/ngircd.pre-install
index c073447b37..49dd9d529d 100644
--- a/main/ngircd/ngircd.pre-install
+++ b/main/ngircd/ngircd.pre-install
@@ -1,5 +1,6 @@
 #!/bin/sh
 
-adduser -S -D -H -h /etc/ngircd -s /sbin/nologin -g ngircd ngircd 2>/dev/null
+addgroup ngircd 2>/dev/null
+adduser -S -D -H -h /etc/ngircd -s /sbin/nologin -G ngircd -g ngircd ngircd 2>/dev/null
 
 exit 0
diff --git a/main/openntpd/openntpd.pre-install b/main/openntpd/openntpd.pre-install
index 6b8204b64f..975bf543f0 100644
--- a/main/openntpd/openntpd.pre-install
+++ b/main/openntpd/openntpd.pre-install
@@ -2,6 +2,7 @@
 
 # this user should be included in alpine-baselayout-1.2.
 # included here for backward compability.
-adduser -S -D -H -h /var/empty -s /sbin/nologin -g ntp ntp 2>/dev/null
+addgroup -S ntp 2>/dev/null
+adduser -S -D -H -h /var/empty -s /sbin/nologin -G ntp -g ntp ntp 2>/dev/null
 
 exit 0
diff --git a/main/snort/snort.pre-install b/main/snort/snort.pre-install
index e40838da55..3b762d5e35 100644
--- a/main/snort/snort.pre-install
+++ b/main/snort/snort.pre-install
@@ -1,5 +1,6 @@
 #!/bin/sh
 
-adduser -S -D -h /var/log/snort -s /sbin/nologin -g snort snort 2>/dev/null
+addgroup -S snort 2>/dev/null
+adduser -S -D -h /var/log/snort -s /sbin/nologin -G snort -g snort snort 2>/dev/null
 
 exit 0
diff --git a/main/squid/squid.pre-install b/main/squid/squid.pre-install
index f613759aa6..3c49c8642d 100644
--- a/main/squid/squid.pre-install
+++ b/main/squid/squid.pre-install
@@ -1,6 +1,7 @@
 #!/bin/sh
 
-adduser -S -D -h /var/cache/squid -g squid squid 2>/dev/null
+addgroup -S squid 2>/dev/null
+adduser -S -D -h /var/cache/squid -G squid -g squid squid 2>/dev/null
 addgroup -S winbind 2>/dev/null
 addgroup squid winbind 2>/dev/null
 
diff --git a/main/squid/squid.pre-upgrade b/main/squid/squid.pre-upgrade
index f613759aa6..3c49c8642d 100644
--- a/main/squid/squid.pre-upgrade
+++ b/main/squid/squid.pre-upgrade
@@ -1,6 +1,7 @@
 #!/bin/sh
 
-adduser -S -D -h /var/cache/squid -g squid squid 2>/dev/null
+addgroup -S squid 2>/dev/null
+adduser -S -D -h /var/cache/squid -G squid -g squid squid 2>/dev/null
 addgroup -S winbind 2>/dev/null
 addgroup squid winbind 2>/dev/null
 
diff --git a/main/transmission/transmission-daemon.pre-install b/main/transmission/transmission-daemon.pre-install
index ad8a575236..2e26d48d7a 100644
--- a/main/transmission/transmission-daemon.pre-install
+++ b/main/transmission/transmission-daemon.pre-install
@@ -1,5 +1,6 @@
 #!/bin/sh
 
-adduser -S -D -h /var/lib/transmission -s /sbin/nologin -g transmission transmission 2>/dev/null
+addgroup -S transmission 2>/dev/null
+adduser -S -D -h /var/lib/transmission -s /sbin/nologin -G transmission -g transmission transmission 2>/dev/null
 
 exit 0
diff --git a/main/znc/znc.pre-install b/main/znc/znc.pre-install
index bc81d8aad7..c47e5e16d0 100644
--- a/main/znc/znc.pre-install
+++ b/main/znc/znc.pre-install
@@ -1,5 +1,6 @@
 #!/bin/sh
 
-adduser -S -D -H -s /sbin/nologin -g znc znc 2>/dev/null
+addgroup -S znc 2>/dev/null
+adduser -S -D -H -s /sbin/nologin -G znc -g znc znc 2>/dev/null
 
 exit 0