diff options
author | fhajny <fhajny@pkgsrc.org> | 2016-05-17 10:32:06 +0000 |
---|---|---|
committer | fhajny <fhajny@pkgsrc.org> | 2016-05-17 10:32:06 +0000 |
commit | 3c581072bdf4170a88e004c862f36c3e5826040c (patch) | |
tree | bb4a8c9947c804084004863ea06af206d79d402b /chat | |
parent | 1b4694d98df4656434a6840b4e7c1c2d4bf07e94 (diff) | |
download | pkgsrc-3c581072bdf4170a88e004c862f36c3e5826040c.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 'chat')
-rw-r--r-- | chat/ejabberd/Makefile | 11 | ||||
-rw-r--r-- | chat/silc-server/Makefile | 6 |
2 files changed, 9 insertions, 8 deletions
diff --git a/chat/ejabberd/Makefile b/chat/ejabberd/Makefile index 36cb7bb5aca..f1f37d87c03 100644 --- a/chat/ejabberd/Makefile +++ b/chat/ejabberd/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.65 2016/04/29 19:05:22 fhajny Exp $ +# $NetBSD: Makefile,v 1.66 2016/05/17 10:32:06 fhajny Exp $ DISTNAME= ejabberd-16.04 +PKGREVISION= 1 CATEGORIES= chat MASTER_SITES= http://www.process-one.net/downloads/ejabberd/${PKGVERSION_NOREV}/ EXTRACT_SUFX= .tgz @@ -81,12 +82,12 @@ INSTALLATION_DIRS+= share/doc/${PKGBASE} ${EGDIR} share/bash-completion.d INSTALLATION_DIRS+= lib/erlang/lib/${DISTNAME}/priv/sql CONF_FILES_PERMS= ${EGDIR}/ejabberd.yml ${PKG_SYSCONFDIR}/ejabberd.yml \ - ${ROOT_USER} ${EJABBERD_GROUP} 0640 + ${REAL_ROOT_USER} ${EJABBERD_GROUP} 0640 CONF_FILES_PERMS+= ${EGDIR}/ejabberdctl.cfg ${PKG_SYSCONFDIR}/ejabberdctl.cfg \ - ${ROOT_USER} ${EJABBERD_GROUP} 0640 + ${REAL_ROOT_USER} ${EJABBERD_GROUP} 0640 CONF_FILES_PERMS+= ${EGDIR}/inetrc ${PKG_SYSCONFDIR}/inetrc \ - ${ROOT_USER} ${EJABBERD_GROUP} 0640 -SPECIAL_PERMS+= sbin/ejabberdctl ${ROOT_USER} ${EJABBERD_GROUP} 0750 + ${REAL_ROOT_USER} ${EJABBERD_GROUP} 0640 +SPECIAL_PERMS+= sbin/ejabberdctl ${REAL_ROOT_USER} ${EJABBERD_GROUP} 0750 REPLACE_BASH= ejabberdctl.template tools/captcha.sh diff --git a/chat/silc-server/Makefile b/chat/silc-server/Makefile index effb23e05cd..3f096368af9 100644 --- a/chat/silc-server/Makefile +++ b/chat/silc-server/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.66 2013/07/12 10:44:53 jperkin Exp $ +# $NetBSD: Makefile,v 1.67 2016/05/17 10:32:06 fhajny Exp $ DISTNAME= silc-server-1.1.18 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= chat security MASTER_SITES= http://www.silcnet.org/download/server/sources/ \ ftp://ftp.silcnet.org/silc/server/sources/ @@ -48,7 +48,7 @@ CONF_FILES+= ${EGDIR}/silcd.conf.default \ CONF_FILES+= ${EGDIR}/silcalgs.conf.default \ ${PKG_SYSCONFDIR}/silcalgs.conf CONF_FILES_PERMS+= ${EGDIR}/motd.txt.default ${PKG_SYSCONFDIR}/motd.txt \ - ${REAL_ROOT_USER} ${ROOT_GROUP} 0644 + ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0644 RCD_SCRIPTS= silcd |