Use REAL_ROOT_USER/REAL_ROOT_GROUP instead of ROOT_USER/ROOT_GROUP

for all pkgsrc dir/file ownership rules. Fixes unprivileged
user/group names from leaking into binary packages, manifest as
non-fatal chown/chgrp failure messages at pkg_add time.

Bump respective packages' PKGREVISION.

8 files changed, 41 insertions, 40 deletions

diff --git a/mail/elm/Makefile b/mail/elm/Makefile
index 7a20a01a63b..fcf276e7366 100644
--- a/mail/elm/Makefile
+++ b/mail/elm/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.50 2016/02/25 15:00:50 jperkin Exp $
+# $NetBSD: Makefile,v 1.51 2016/05/17 10:32:07 fhajny Exp $
 
 DISTNAME=		elm2.5.8
 PKGNAME=		elm-2.5.8
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		mail
 MASTER_SITES=		http://www.instinct.org/elm/files/tarballs/
 
@@ -29,7 +29,7 @@ OPSYSVARS+=		LIBC
 LIBC.Darwin=		/usr/lib/libSystem.dylib
 LIBC.*=			/usr/lib/libc.so
 
-SPECIAL_PERMS+=		bin/elm ${ROOT_USER} mail 2755
+SPECIAL_PERMS+=		bin/elm ${REAL_ROOT_USER} mail 2755
 
 pre-configure:
 	${CP} ${FILESDIR}/config.sh ${WRKSRC}/config.sh.orig
diff --git a/mail/imp/Makefile b/mail/imp/Makefile
index 6b65d086957..79bc7f44fc5 100644
--- a/mail/imp/Makefile
+++ b/mail/imp/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.60 2015/12/19 14:27:14 taca Exp $
+# $NetBSD: Makefile,v 1.61 2016/05/17 10:32:07 fhajny Exp $
 
 DISTNAME=	imp-h3-${IMPVER}
 PKGNAME=	imp-${IMPVER}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	mail www
 MASTER_SITES=	http://ftp.horde.org/pub/imp/ \
 		ftp://ftp.horde.org/pub/imp/
@@ -48,28 +48,28 @@ CONF_FILES+=		${IMPDIR}/config/servers.php.dist \
 			${IMPDIR}/config/servers.php
 CONF_FILES_PERMS+=	${IMPDIR}/config/conf.xml.dist \
 			${IMPDIR}/config/conf.xml \
-			${APACHE_USER} ${ROOT_GROUP} 0440
+			${APACHE_USER} ${REAL_ROOT_GROUP} 0440
 CONF_FILES_PERMS+=	${IMPDIR}/config/filter.txt.dist \
 			${IMPDIR}/config/filter.txt \
-			${APACHE_USER} ${ROOT_GROUP} 0440
+			${APACHE_USER} ${REAL_ROOT_GROUP} 0440
 CONF_FILES_PERMS+=	${IMPDIR}/config/header.php.dist \
 			${IMPDIR}/config/header.php \
-			${APACHE_USER} ${ROOT_GROUP} 0440
+			${APACHE_USER} ${REAL_ROOT_GROUP} 0440
 CONF_FILES_PERMS+=	${IMPDIR}/config/menu.php.dist \
 			${IMPDIR}/config/menu.php \
-			${APACHE_USER} ${ROOT_GROUP} 0440
+			${APACHE_USER} ${REAL_ROOT_GROUP} 0440
 CONF_FILES_PERMS+=	${IMPDIR}/config/mime_drivers.php.dist \
 			${IMPDIR}/config/mime_drivers.php \
-			${APACHE_USER} ${ROOT_GROUP} 0440
+			${APACHE_USER} ${REAL_ROOT_GROUP} 0440
 CONF_FILES_PERMS+=	${IMPDIR}/config/motd.php.dist \
 			${IMPDIR}/config/motd.php \
-			${APACHE_USER} ${ROOT_GROUP} 0440
+			${APACHE_USER} ${REAL_ROOT_GROUP} 0440
 CONF_FILES_PERMS+=	${IMPDIR}/config/prefs.php.dist \
 			${IMPDIR}/config/prefs.php \
-			${APACHE_USER} ${ROOT_GROUP} 0440
+			${APACHE_USER} ${REAL_ROOT_GROUP} 0440
 CONF_FILES_PERMS+=	${IMPDIR}/config/trailer.txt.dist \
 			${IMPDIR}/config/trailer.txt \
-			${APACHE_USER} ${ROOT_GROUP} 0440
+			${APACHE_USER} ${REAL_ROOT_GROUP} 0440
 
 SUBST_CLASSES+=		files
 SUBST_STAGE.files=	post-build
diff --git a/mail/ingo/Makefile b/mail/ingo/Makefile
index b023d77a552..f543ad2b965 100644
--- a/mail/ingo/Makefile
+++ b/mail/ingo/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2015/12/19 14:27:14 taca Exp $
+# $NetBSD: Makefile,v 1.23 2016/05/17 10:32:07 fhajny Exp $
 
 DISTNAME=	ingo-h3-${INGOVER}
 PKGNAME=	ingo-${INGOVER}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	mail www
 MASTER_SITES=	http://ftp.horde.org/pub/ingo/ \
 		ftp://ftp.horde.org/pub/ingo/
@@ -51,16 +51,16 @@ BUILD_DEFS=		APACHE_USER
 CONF_FILES=		${EGDIR}/ingo.conf ${PKG_SYSCONFDIR}/ingo.conf
 CONF_FILES_PERMS+=	${INGODIR}/config/conf.xml.dist \
 			${INGODIR}/config/conf.xml \
-			${APACHE_USER} ${ROOT_GROUP} 0440
+			${APACHE_USER} ${REAL_ROOT_GROUP} 0440
 CONF_FILES_PERMS+=	${INGODIR}/config/backends.php.dist \
 			${INGODIR}/config/backends.php \
-			${APACHE_USER} ${ROOT_GROUP} 0440
+			${APACHE_USER} ${REAL_ROOT_GROUP} 0440
 CONF_FILES_PERMS+=	${INGODIR}/config/fields.php.dist \
 			${INGODIR}/config/fields.php \
-			${APACHE_USER} ${ROOT_GROUP} 0440
+			${APACHE_USER} ${REAL_ROOT_GROUP} 0440
 CONF_FILES_PERMS+=	${INGODIR}/config/prefs.php.dist \
 			${INGODIR}/config/prefs.php \
-			${APACHE_USER} ${ROOT_GROUP} 0440
+			${APACHE_USER} ${REAL_ROOT_GROUP} 0440
 
 .include "options.mk"
 
diff --git a/mail/mimp/Makefile b/mail/mimp/Makefile
index 017cb6e8601..2f2a4613863 100644
--- a/mail/mimp/Makefile
+++ b/mail/mimp/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2015/12/19 14:27:14 taca Exp $
+# $NetBSD: Makefile,v 1.4 2016/05/17 10:32:07 fhajny Exp $
 
 DISTNAME=	mimp-h3-${MIMPVER}
 PKGNAME=	mimp-${MIMPVER}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	mail www
 MASTER_SITES=	http://ftp.horde.org/pub/mimp/ \
 		ftp://ftp.horde.org/pub/mimp/
@@ -39,16 +39,16 @@ PKG_SYSCONFSUBDIR?=	httpd
 CONF_FILES=		${EGDIR}/mimp.conf ${PKG_SYSCONFDIR}/mimp.conf
 CONF_FILES_PERMS+=	${MIMPDIR}/config/conf.xml.dist \
 			${MIMPDIR}/config/conf.xml \
-			${APACHE_USER} ${ROOT_GROUP} 0440
+			${APACHE_USER} ${REAL_ROOT_GROUP} 0440
 CONF_FILES_PERMS+=	${MIMPDIR}/config/menu.php.dist \
 			${MIMPDIR}/config/menu.php \
-			${APACHE_USER} ${ROOT_GROUP} 0440
+			${APACHE_USER} ${REAL_ROOT_GROUP} 0440
 CONF_FILES_PERMS+=	${MIMPDIR}/config/mime_drivers.php.dist \
 			${MIMPDIR}/config/mime_drivers.php \
-			${APACHE_USER} ${ROOT_GROUP} 0440
+			${APACHE_USER} ${REAL_ROOT_GROUP} 0440
 CONF_FILES_PERMS+=	${MIMPDIR}/config/prefs.php.dist \
 			${MIMPDIR}/config/prefs.php \
-			${APACHE_USER} ${ROOT_GROUP} 0440
+			${APACHE_USER} ${REAL_ROOT_GROUP} 0440
 
 SUBST_CLASSES+=		files
 SUBST_STAGE.files=	post-build
diff --git a/mail/qmail-qfilter/Makefile b/mail/qmail-qfilter/Makefile
index 2ac34ba6044..f5f89bdcf5b 100644
--- a/mail/qmail-qfilter/Makefile
+++ b/mail/qmail-qfilter/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2014/11/17 02:56:04 schmonz Exp $
+# $NetBSD: Makefile,v 1.23 2016/05/17 10:32:07 fhajny Exp $
 #
 
 DISTNAME=		qmail-qfilter-2.1
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		mail
 MASTER_SITES=		${HOMEPAGE}
 
@@ -15,7 +15,7 @@ DEPENDS+=		qmail>=1.03nb9:../../mail/qmail
 
 PKG_DESTDIR_SUPPORT=	destdir
 
-OWN_DIRS_PERMS+=	${QMAIL_QFILTER_TMPDIR} qmaild ${ROOT_GROUP} 700
+OWN_DIRS_PERMS+=	${QMAIL_QFILTER_TMPDIR} qmaild ${REAL_ROOT_GROUP} 700
 
 REPLACE_PERL=		samples/block-long-dates			\
 			samples/deny-filetypes				\
diff --git a/mail/relay-ctrl/Makefile b/mail/relay-ctrl/Makefile
index 86501520e7f..bfa8ebb3707 100644
--- a/mail/relay-ctrl/Makefile
+++ b/mail/relay-ctrl/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2010/03/15 04:34:05 schmonz Exp $
+# $NetBSD: Makefile,v 1.3 2016/05/17 10:32:07 fhajny Exp $
 #
 
 DISTNAME=	relay-ctrl-3.1.1
+PKGREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	${HOMEPAGE}
 
@@ -19,8 +20,8 @@ DJB_MAKE_TARGETS=	NO
 DOCDIR=			share/doc/${PKGBASE}
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man8 ${DOCDIR}
 INSTALL_ENV+=		install_prefix=${DESTDIR:Q}
-OWN_DIRS_PERMS+=	${RELAY_CTRL_DIR} ${ROOT_USER} ${ROOT_GROUP} 700
-OWN_DIRS_PERMS+=	${RELAY_CTRL_DIR}/allow ${ROOT_USER} ${ROOT_GROUP} 777
+OWN_DIRS_PERMS+=	${RELAY_CTRL_DIR} ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 700
+OWN_DIRS_PERMS+=	${RELAY_CTRL_DIR}/allow ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 777
 MESSAGE_SUBST+=		RELAY_CTRL_DIR=${RELAY_CTRL_DIR:Q} DOCDIR=${DOCDIR:Q}
 BUILD_DEFS+=		RELAY_CTRL_DIR
 
diff --git a/mail/sympa/Makefile b/mail/sympa/Makefile
index eeffc15e750..d168074a778 100644
--- a/mail/sympa/Makefile
+++ b/mail/sympa/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.61 2016/03/05 11:28:51 jperkin Exp $
+# $NetBSD: Makefile,v 1.62 2016/05/17 10:32:07 fhajny Exp $
 
 DISTNAME=	sympa-6.2.7
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	http://www.sympa.org/distribution/ \
 		http://www.sympa.org/distribution/old/
@@ -144,7 +144,7 @@ OWN_DIRS_PERMS+=	${SYMPA_SPOOL}/outgoing ${SYMPA_USER} ${SYMPA_GROUP} 770
 OWN_DIRS_PERMS+=	${SYMPA_SPOOL}/task ${SYMPA_USER} ${SYMPA_GROUP} 770
 OWN_DIRS_PERMS+=	${SYMPA_SPOOL}/tmp ${SYMPA_USER} ${SYMPA_GROUP} 770
 
-SPECIAL_PERMS+=  ${SYMPA_BIN}/sympa_newaliases-wrapper ${ROOT_USER} ${SYMPA_GROUP} 4550
+SPECIAL_PERMS+=  ${SYMPA_BIN}/sympa_newaliases-wrapper ${REAL_ROOT_USER} ${SYMPA_GROUP} 4550
 SPECIAL_PERMS+=	 ${SYMPA_BIN}/bouncequeue ${SYMPA_USER} ${SYMPA_GROUP} 4555
 SPECIAL_PERMS+=	 ${SYMPA_BIN}/familyqueue ${SYMPA_USER} ${SYMPA_GROUP} 4555
 SPECIAL_PERMS+=	 ${SYMPA_BIN}/queue ${SYMPA_USER} ${SYMPA_GROUP} 4555
diff --git a/mail/turba/Makefile b/mail/turba/Makefile
index babb50615b8..b3d3c0e6eba 100644
--- a/mail/turba/Makefile
+++ b/mail/turba/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.41 2015/06/12 10:50:27 wiz Exp $
+# $NetBSD: Makefile,v 1.42 2016/05/17 10:32:08 fhajny Exp $
 
 DISTNAME=	turba-h3-${TURBAVER}
 PKGNAME=	turba-${TURBAVER}
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	mail www
 MASTER_SITES=	http://ftp.horde.org/pub/turba/ \
 		ftp://ftp.horde.org/pub/turba/
@@ -55,18 +55,18 @@ REPLACE_FILES.php=	scripts/import_vcards.php \
 CONF_FILES=		${EGDIR}/turba.conf ${PKG_SYSCONFDIR}/turba.conf
 CONF_FILES_PERMS+=	${TURBADIR}/config/sources.php.dist \
 			${TURBADIR}/config/sources.php \
-			${APACHE_USER} ${ROOT_GROUP} 0440
+			${APACHE_USER} ${REAL_ROOT_GROUP} 0440
 CONF_FILES+=		${TURBADIR}/config/attributes.php.dist \
 			${TURBADIR}/config/attributes.php
 CONF_FILES_PERMS+=	${TURBADIR}/config/conf.xml.dist \
 			${TURBADIR}/config/conf.xml \
-			${APACHE_USER} ${ROOT_GROUP} 0440
+			${APACHE_USER} ${REAL_ROOT_GROUP} 0440
 CONF_FILES_PERMS+=	${TURBADIR}/config/menu.php.dist \
 			${TURBADIR}/config/menu.php \
-			${APACHE_USER} ${ROOT_GROUP} 0440
+			${APACHE_USER} ${REAL_ROOT_GROUP} 0440
 CONF_FILES_PERMS+=	${TURBADIR}/config/prefs.php.dist \
 			${TURBADIR}/config/prefs.php \
-			${APACHE_USER} ${ROOT_GROUP} 0440
+			${APACHE_USER} ${REAL_ROOT_GROUP} 0440
 
 .include "options.mk"