summaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
authorfhajny <fhajny>2016-05-17 10:32:06 +0000
committerfhajny <fhajny>2016-05-17 10:32:06 +0000
commit519e34bafcc8eba73c0de68fc9d76b05483fa2dd (patch)
treebb4a8c9947c804084004863ea06af206d79d402b /devel
parent48b2ed488974cec05c61f8ce75956e5420f288ab (diff)
downloadpkgsrc-519e34bafcc8eba73c0de68fc9d76b05483fa2dd.tar.gz
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.
Diffstat (limited to 'devel')
-rw-r--r--devel/rt3/Makefile.install4
-rw-r--r--devel/zookeeper/Makefile5
2 files changed, 5 insertions, 4 deletions
diff --git a/devel/rt3/Makefile.install b/devel/rt3/Makefile.install
index 463d9b6cafc..5d7f731d907 100644
--- a/devel/rt3/Makefile.install
+++ b/devel/rt3/Makefile.install
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.install,v 1.20 2013/05/26 16:55:53 spz Exp $
+# $NetBSD: Makefile.install,v 1.21 2016/05/17 10:32:07 fhajny Exp $
.include "dirs.mk"
@@ -51,7 +51,7 @@ RT_CONFIG_FILES= RT_Config.pm RT_SiteConfig.pm
.for _file_ in ${RT_CONFIG_FILES}
CONF_FILES_PERMS+= ${RT_EXAMPLE_DIR}/${_file_} \
${PKG_SYSCONFDIR}/${_file_} \
- ${ROOT_USER} ${RT_GROUP} 0550
+ ${REAL_ROOT_USER} ${RT_GROUP} 0550
.endfor
RT_ETC_FILES= acl.Oracle acl.Pg acl.mysql constraints.mysql \
diff --git a/devel/zookeeper/Makefile b/devel/zookeeper/Makefile
index aa907ea153c..07b1c22fa94 100644
--- a/devel/zookeeper/Makefile
+++ b/devel/zookeeper/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2016/03/04 13:40:34 fhajny Exp $
+# $NetBSD: Makefile,v 1.4 2016/05/17 10:32:07 fhajny Exp $
#
.include "Makefile.common"
+PKGREVISION= 1
COMMENT= Highly reliable distributed coordination server
DISTFILES= ${DEFAULT_DISTFILES} ${DISTNAME}-deps.tar.gz
@@ -57,7 +58,7 @@ CONF_FILES+= ${EGDIR}/configuration.xsl ${PKG_SYSCONFDIR}/configuration.xsl
CONF_FILES+= ${EGDIR}/log4j.properties ${PKG_SYSCONFDIR}/log4j.properties
CONF_FILES+= ${EGDIR}/zoo.cfg ${PKG_SYSCONFDIR}/zoo.cfg
CONF_FILES_PERMS+= ${EGDIR}/zookeeper-env.sh ${PKG_SYSCONFDIR}/zookeeper-env.sh \
- ${ROOT_USER} ${ROOT_GROUP} 0755
+ ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0755
FILES_SUBST+= ZK_USER=${ZK_USER} ZK_GROUP=${ZK_GROUP}