From a7d67c695ca2750e7088ca33cc365281c353af18 Mon Sep 17 00:00:00 2001
From: Przemyslaw Pawelczyk <przemoc@zoho.com>
Date: Mon, 6 Jun 2016 02:05:10 +0200
Subject: 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
---
 main/clamsmtp/clamsmtp.pre-install | 3 ++-
 main/clamsmtp/clamsmtp.pre-upgrade | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'main/clamsmtp')

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
-- 
cgit v1.2.3