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.

4 files changed, 17 insertions, 17 deletions

diff --git a/security/mit-krb5/Makefile b/security/mit-krb5/Makefile
index 35e5a54c114..bc4e899c371 100644
--- a/security/mit-krb5/Makefile
+++ b/security/mit-krb5/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.90 2016/04/17 15:33:13 kamil Exp $
+# $NetBSD: Makefile,v 1.91 2016/05/17 10:32:08 fhajny Exp $
 
 DISTNAME=	krb5-1.14.1
 PKGNAME=	mit-${DISTNAME}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	http://web.mit.edu/kerberos/dist/krb5/${PKGVERSION_NOREV:R}/
 EXTRACT_SUFX=	.tar.gz
@@ -57,7 +57,7 @@ PATCH_DIST_ARGS=	-d ${WRKSRC} -p2
 INFO_FILES=		YES
 
 OWN_DIRS_PERMS=		${MIT_KRB5_STATEDIR}/krb5kdc			\
-			${ROOT_USER} ${ROOT_GROUP} 0700
+			${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0700
 RCD_SCRIPTS=		kadmind kdc
 
 INSTALLATION_DIRS=	bin include/gssapi include/gssrpc ${PKGINFODIR}	\
diff --git a/security/prelude-lml/Makefile b/security/prelude-lml/Makefile
index b031840b10c..b880c98e006 100644
--- a/security/prelude-lml/Makefile
+++ b/security/prelude-lml/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.38 2015/08/23 14:30:41 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2016/05/17 10:32:08 fhajny Exp $
 #
 
 DISTNAME=		prelude-lml-0.9.15
-PKGREVISION=		7
+PKGREVISION=		8
 CATEGORIES=		security
 MASTER_SITES=		http://www.prelude-ids.com/download/releases/prelude-lml/
 
@@ -61,9 +61,9 @@ SUBST_SED.make=		-e 's,@EGDIR@,${EGDIR},g'
 
 PKG_SYSCONFSUBDIR=	prelude-lml
 CONF_FILES_PERMS+=	${EGDIR}/plugins.rules ${PKG_SYSCONFDIR}/plugins.rules \
-			${ROOT_USER} ${ROOT_GROUP} 0644
+			${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0644
 CONF_FILES_PERMS+=	${EGDIR}/prelude-lml.conf ${PKG_SYSCONFDIR}/prelude-lml.conf \
-			${ROOT_USER} ${ROOT_GROUP} 0644
+			${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0644
 
 # From plugins/pcre/ruleset/Makefile.in
 ruleset_DATA = \
diff --git a/security/stud/Makefile b/security/stud/Makefile
index 0cd0b579111..121787efa69 100644
--- a/security/stud/Makefile
+++ b/security/stud/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2016/03/05 11:29:27 jperkin Exp $
+# $NetBSD: Makefile,v 1.8 2016/05/17 10:32:09 fhajny Exp $
 #
 
 PKGNAME=	stud-0.3p53
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	security
 MAINTAINER=	jym@NetBSD.org
 HOMEPAGE=	http://github.com/bumptech/stud
@@ -51,7 +51,7 @@ SUBST_VARS.makefile=	PREFIX
 SUBST_MESSAGE.makefile=	Set prefix path.
 
 PKG_SYSCONFSUBDIR=	stud
-PKG_SYSCONFDIR_PERMS=	${ROOT_USER} ${STUD_GROUP} 0750
+PKG_SYSCONFDIR_PERMS=	${REAL_ROOT_USER} ${STUD_GROUP} 0750
 CONF_FILES+=		${EGDIR}/stud.conf ${PKG_SYSCONFDIR}/stud.conf
 
 post-extract:
diff --git a/security/zoneminder/Makefile b/security/zoneminder/Makefile
index 7e9a22f5499..d1e0ad56b5c 100644
--- a/security/zoneminder/Makefile
+++ b/security/zoneminder/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2016/03/05 11:29:27 jperkin Exp $
+# $NetBSD: Makefile,v 1.26 2016/05/17 10:32:09 fhajny Exp $
 
 PKGNAME=	${DISTNAME:S/ZoneMinder-/zoneminder-/}
 DISTNAME=	ZoneMinder-1.28.1
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GITHUB:=ZoneMinder/}
 GITHUB_PROJECT=	ZoneMinder
@@ -109,7 +109,7 @@ BUILD_DEFS+=		APACHE_USER APACHE_GROUP
 
 # This directory contains no useful state, so use MAKE_DIRS instead of
 # OWN_DIRS.
-MAKE_DIRS_PERMS+=	${VARBASE}/run/zm ${ROOT_USER} ${APACHE_GROUP} 775
+MAKE_DIRS_PERMS+=	${VARBASE}/run/zm ${REAL_ROOT_USER} ${APACHE_GROUP} 775
 
 CONFIGURE_ARGS+=	--with-webuser=${APACHE_USER}
 CONFIGURE_ARGS+=	--with-webgroup=${APACHE_GROUP}
@@ -123,10 +123,10 @@ DEPENDS+=	${PHP_PKG_PREFIX}-pdo_mysql-[0-9]*:../../databases/php-pdo_mysql
 
 # This directory contains state, so use OWN_DIRS instead of MAKE_DIRS.
 ZM_CACHE=	${VARBASE}/cache/zoneminder
-OWN_DIRS_PERMS+=	${ZM_CACHE} ${ROOT_USER} ${ROOT_GROUP} 755
-OWN_DIRS_PERMS+=	${ZM_CACHE}/temp ${ROOT_USER} ${APACHE_GROUP} 775
-OWN_DIRS_PERMS+=	${ZM_CACHE}/images ${ROOT_USER} ${APACHE_GROUP} 775
-OWN_DIRS_PERMS+=	${ZM_CACHE}/events ${ROOT_USER} ${APACHE_GROUP} 775
+OWN_DIRS_PERMS+=	${ZM_CACHE} ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 755
+OWN_DIRS_PERMS+=	${ZM_CACHE}/temp ${REAL_ROOT_USER} ${APACHE_GROUP} 775
+OWN_DIRS_PERMS+=	${ZM_CACHE}/images ${REAL_ROOT_USER} ${APACHE_GROUP} 775
+OWN_DIRS_PERMS+=	${ZM_CACHE}/events ${REAL_ROOT_USER} ${APACHE_GROUP} 775
 
 REPLACE_PERL+=	scripts/zmaudit.pl.in
 REPLACE_PERL+=	scripts/zmcamtool.pl.in