Bug #437386: FreeBSD netqmail support. FreeBSD does not have a "root" group, it has "wheel" instead.

1 files changed, 16 insertions, 15 deletions

diff --git a/eclass/qmail.eclass b/eclass/qmail.eclass
index 5ba95b938779..8057c9802299 100644
--- a/eclass/qmail.eclass
+++ b/eclass/qmail.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qmail.eclass,v 1.7 2012/09/15 16:16:53 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qmail.eclass,v 1.8 2013/05/27 00:59:06 robbat2 Exp $
 
 # @ECLASS: qmail.eclass
 # @MAINTAINER:
@@ -65,7 +65,7 @@ is_prime() {
 
 dospp() {
 	insinto "${QMAIL_HOME}"/plugins/
-	insopts -o root -g root  -m 0755
+	insopts -o root -g "$GROUP_ROOT" -m 0755
 	newins $1 ${2:-$(basename $1)}
 }
 
@@ -78,8 +78,8 @@ dosupervise() {
 	local runfile=${2:-${service}} logfile=${3:-${service}-log}
 	[[ -z "${service}" ]] && die "no service given"
 
-	insopts -o root -g root -m 0755
-	diropts -o root -g root -m 0755
+	insopts -o root -g "$GROUP_ROOT" -m 0755
+	diropts -o root -g "$GROUP_ROOT" -m 0755
 
 	dodir ${SUPERVISE_DIR}/${service}{,/log}
 	fperms +t ${SUPERVISE_DIR}/${service}{,/log}
@@ -213,12 +213,12 @@ qmail_full_install() {
 qmail_config_install() {
 	einfo "Installing stock configuration files"
 	insinto "${QMAIL_HOME}"/control
-	insopts -o root -g root -m 644
+	insopts -o root -g "$GROUP_ROOT" -m 644
 	doins "${GENQMAIL_S}"/control/{conf-*,defaultdelivery}
 
 	einfo "Installing configuration sanity checker and launcher"
 	insinto "${QMAIL_HOME}"/bin
-	insopts -o root -g root -m 644
+	insopts -o root -g "$GROUP_ROOT" -m 644
 	doins "${GENQMAIL_S}"/control/qmail-config-system
 
 	declare -F qmail_config_install_hook >/dev/null && \
@@ -276,9 +276,9 @@ qmail_maildir_install() {
 	done
 
 	einfo "Setting up default maildirs in the account skeleton"
-	diropts -o root -g root -m 755
+	diropts -o root -g "$GROUP_ROOT" -m 755
 	insinto /etc/skel
-	insopts -o root -g root -m 644
+	insopts -o root -g "$GROUP_ROOT" -m 644
 	newins "${GENQMAIL_S}"/control/defaultdelivery .qmail.sample
 	"${MAILDIRMAKE}" "${D}"/etc/skel/.maildir
 	keepdir /etc/skel/.maildir/{cur,new,tmp}
@@ -290,7 +290,7 @@ qmail_maildir_install() {
 qmail_tcprules_install() {
 	dodir "${TCPRULES_DIR}"
 	insinto "${TCPRULES_DIR}"
-	insopts -o root -g root -m 0644
+	insopts -o root -g "$GROUP_ROOT" -m 0644
 	doins "${GENQMAIL_S}"/tcprules/Makefile.qmail
 	doins "${GENQMAIL_S}"/tcprules/tcp.qmail-*
 	use ssl || rm -f "${D}${TCPRULES_DIR}"/tcp.qmail-pop3sd
@@ -303,13 +303,13 @@ qmail_supervise_install() {
 
 	for i in qmail-{send,smtpd,qmtpd,qmqpd,pop3d}; do
 		dosupervise ${i}
-		diropts -o qmaill -g root -m 755
+		diropts -o qmaill -g "$GROUP_ROOT" -m 755
 		keepdir /var/log/qmail/${i}
 	done
 
 	if use ssl; then
 		dosupervise qmail-pop3sd
-		diropts -o qmaill -g root -m 755
+		diropts -o qmaill -g "$GROUP_ROOT" -m 755
 		keepdir /var/log/qmail/qmail-pop3sd
 	fi
 
@@ -320,7 +320,7 @@ qmail_supervise_install() {
 qmail_spp_install() {
 	einfo "Installing qmail-spp configuration files"
 	insinto "${QMAIL_HOME}"/control/
-	insopts -o root -g root -m 0644
+	insopts -o root -g "$GROUP_ROOT" -m 0644
 	doins "${GENQMAIL_S}"/spp/smtpplugins
 
 	einfo "Installing qmail-spp plugins"
@@ -340,16 +340,16 @@ qmail_ssl_install() {
 
 	einfo "Installing SSL Certificate creation script"
 	insinto "${QMAIL_HOME}"/control
-	insopts -o root -g root -m 0644
+	insopts -o root -g "$GROUP_ROOT" -m 0644
 	doins "${GENQMAIL_S}"/ssl/servercert.cnf
 
 	insinto "${QMAIL_HOME}"/bin
-	insopts -o root -g root -m 0755
+	insopts -o root -g "$GROUP_ROOT" -m 0755
 	doins "${GENQMAIL_S}"/ssl/mkservercert
 
 	einfo "Installing RSA key generation cronjob"
 	insinto /etc/${CRON_FOLDER}
-	insopts -o root -g root -m 0755
+	insopts -o root -g "$GROUP_ROOT" -m 0755
 	doins "${GENQMAIL_S}"/ssl/qmail-genrsacert.sh
 
 	keepdir "${QMAIL_HOME}"/control/tlshosts
@@ -359,6 +359,7 @@ qmail_ssl_install() {
 }
 
 qmail_src_install() {
+	export GROUP_ROOT="$(id -gn root)"
 	qmail_base_install
 	qmail_full_install
 	qmail_config_install