summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfhajny <fhajny@pkgsrc.org>2016-05-17 10:32:06 +0000
committerfhajny <fhajny@pkgsrc.org>2016-05-17 10:32:06 +0000
commit3c581072bdf4170a88e004c862f36c3e5826040c (patch)
treebb4a8c9947c804084004863ea06af206d79d402b
parent1b4694d98df4656434a6840b4e7c1c2d4bf07e94 (diff)
downloadpkgsrc-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.
-rw-r--r--chat/ejabberd/Makefile11
-rw-r--r--chat/silc-server/Makefile6
-rw-r--r--devel/rt3/Makefile.install4
-rw-r--r--devel/zookeeper/Makefile5
-rw-r--r--filesystems/openafs-devel/Makefile9
-rw-r--r--filesystems/openafs/Makefile10
-rw-r--r--games/falcons-eye/Makefile22
-rw-r--r--mail/elm/Makefile6
-rw-r--r--mail/imp/Makefile20
-rw-r--r--mail/ingo/Makefile12
-rw-r--r--mail/mimp/Makefile12
-rw-r--r--mail/qmail-qfilter/Makefile6
-rw-r--r--mail/relay-ctrl/Makefile7
-rw-r--r--mail/sympa/Makefile6
-rw-r--r--mail/turba/Makefile12
-rw-r--r--net/argus/Makefile6
-rw-r--r--net/balance/Makefile5
-rw-r--r--net/netatalk30/Makefile6
-rw-r--r--net/ocsinventory-agent/Makefile6
-rw-r--r--net/rancid/Makefile9
-rw-r--r--net/sendfile/Makefile8
-rw-r--r--net/snmptt/Makefile6
-rw-r--r--net/vpnc-script/Makefile5
-rw-r--r--news/nntpcache/Makefile6
-rw-r--r--security/mit-krb5/Makefile6
-rw-r--r--security/prelude-lml/Makefile8
-rw-r--r--security/stud/Makefile6
-rw-r--r--security/zoneminder/Makefile14
-rw-r--r--sysutils/bacula/Makefile6
-rw-r--r--sysutils/grub2/Makefile6
-rw-r--r--sysutils/slocate/Makefile7
-rw-r--r--sysutils/webmin/Makefile17
-rw-r--r--sysutils/xentools3-hvm/Makefile6
-rw-r--r--time/kronolith/Makefile12
-rw-r--r--www/gallery/Makefile8
-rw-r--r--www/horde/Makefile22
36 files changed, 165 insertions, 158 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
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}
diff --git a/filesystems/openafs-devel/Makefile b/filesystems/openafs-devel/Makefile
index a0016f9e2c0..f1dd571d1f0 100644
--- a/filesystems/openafs-devel/Makefile
+++ b/filesystems/openafs-devel/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2012/10/03 16:08:33 asau Exp $
+# $NetBSD: Makefile,v 1.3 2016/05/17 10:32:07 fhajny Exp $
DISTNAME= openafs-1.7.11-src
PKGNAME= ${DISTNAME:C/-src//}
+PKGREVISION= 1
CATEGORIES= filesystems net sysutils
MASTER_SITES= http://www.openafs.org/dl/openafs/1.7.11/
EXTRACT_SUFX= .tar.bz2
@@ -33,10 +34,10 @@ WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
PLIST_SRC+= ${.CURDIR}/PLIST
OWN_DIRS+= ${PKG_SYSCONFDIR}/openafs
-OWN_DIRS_PERMS+= ${PKG_SYSCONFDIR}/openafs/server ${ROOT_USER} ${ROOT_GROUP} 775
-OWN_DIRS_PERMS+= ${VARBASE}/openafs ${ROOT_USER} ${ROOT_GROUP} 770
+OWN_DIRS_PERMS+= ${PKG_SYSCONFDIR}/openafs/server ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 775
+OWN_DIRS_PERMS+= ${VARBASE}/openafs ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 770
OWN_DIRS+= ${VARBASE}/openafs/logs
-OWN_DIRS_PERMS+= ${VARBASE}/openafs/db ${ROOT_USER} ${ROOT_GROUP} 700
+OWN_DIRS_PERMS+= ${VARBASE}/openafs/db ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 700
FILES_SUBST+= HOSTNAME_CMD=${HOSTNAME_CMD:Q}
diff --git a/filesystems/openafs/Makefile b/filesystems/openafs/Makefile
index 789396c5c6e..2658ed922bf 100644
--- a/filesystems/openafs/Makefile
+++ b/filesystems/openafs/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2016/04/04 12:48:29 jakllsch Exp $
+# $NetBSD: Makefile,v 1.13 2016/05/17 10:32:07 fhajny Exp $
DISTNAME= openafs-1.6.17-src
PKGNAME= ${DISTNAME:C/-src//}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= filesystems net sysutils
MASTER_SITES= http://www.openafs.org/dl/openafs/1.6.17/
EXTRACT_SUFX= .tar.bz2
@@ -36,10 +36,10 @@ WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
PLIST_SRC+= ${.CURDIR}/PLIST
OWN_DIRS+= ${PKG_SYSCONFDIR}/openafs
-OWN_DIRS_PERMS+= ${PKG_SYSCONFDIR}/openafs/server ${ROOT_USER} ${ROOT_GROUP} 775
-OWN_DIRS_PERMS+= ${VARBASE}/openafs ${ROOT_USER} ${ROOT_GROUP} 770
+OWN_DIRS_PERMS+= ${PKG_SYSCONFDIR}/openafs/server ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 775
+OWN_DIRS_PERMS+= ${VARBASE}/openafs ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 770
OWN_DIRS+= ${VARBASE}/openafs/logs
-OWN_DIRS_PERMS+= ${VARBASE}/openafs/db ${ROOT_USER} ${ROOT_GROUP} 700
+OWN_DIRS_PERMS+= ${VARBASE}/openafs/db ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 700
FILES_SUBST+= HOSTNAME_CMD=${HOSTNAME_CMD:Q}
diff --git a/games/falcons-eye/Makefile b/games/falcons-eye/Makefile
index cd3229cbf50..ca19c9574c6 100644
--- a/games/falcons-eye/Makefile
+++ b/games/falcons-eye/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.44 2016/02/25 13:19:47 jperkin Exp $
+# $NetBSD: Makefile,v 1.45 2016/05/17 10:32:07 fhajny Exp $
#
DISTNAME= nethack_source_331_jtp_193
PKGNAME= falcons-eye-1.9.3
-PKGREVISION= 15
+PKGREVISION= 16
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=falconseye/}
EXTRACT_SUFX= .zip
@@ -50,21 +50,21 @@ SUBST_SED.unixconf+= -e 's,^\#define LINUX,\/\* \#define LINUX \*\/,'
EGDIR= ${PREFIX}/share/examples/falcons-eye
SHAREDIR= ${PREFIX}/share/falcons-eye-dir
-CONF_FILES_PERMS+= /dev/null ${SHAREDIR}/logfile ${ROOT_USER} ${GAMES_GROUP} ${GAMEDATAMODE}
-CONF_FILES_PERMS+= /dev/null ${SHAREDIR}/record ${ROOT_USER} ${GAMES_GROUP} ${GAMEDATAMODE}
+CONF_FILES_PERMS+= /dev/null ${SHAREDIR}/logfile ${REAL_ROOT_USER} ${GAMES_GROUP} ${GAMEDATAMODE}
+CONF_FILES_PERMS+= /dev/null ${SHAREDIR}/record ${REAL_ROOT_USER} ${GAMES_GROUP} ${GAMEDATAMODE}
REQD_DIRS+= ${SHAREDIR}/config
-REQD_DIRS_PERMS+= ${SHAREDIR} ${ROOT_USER} ${GAMES_GROUP} ${GAMEDIRMODE}
-REQD_DIRS_PERMS+= ${SHAREDIR}/save ${ROOT_USER} ${GAMES_GROUP} 770
+REQD_DIRS_PERMS+= ${SHAREDIR} ${REAL_ROOT_USER} ${GAMES_GROUP} ${GAMEDIRMODE}
+REQD_DIRS_PERMS+= ${SHAREDIR}/save ${REAL_ROOT_USER} ${GAMES_GROUP} 770
CONF_FILES_PERMS+= ${EGDIR}/jtp_intr.txt ${SHAREDIR}/config/jtp_intr.txt \
- ${ROOT_USER} ${GAMES_GROUP} ${GAMEDATAMODE}
+ ${REAL_ROOT_USER} ${GAMES_GROUP} ${GAMEDATAMODE}
CONF_FILES_PERMS+= ${EGDIR}/jtp_keys.txt ${SHAREDIR}/config/jtp_keys.txt \
- ${ROOT_USER} ${GAMES_GROUP} ${GAMEDATAMODE}
+ ${REAL_ROOT_USER} ${GAMES_GROUP} ${GAMEDATAMODE}
CONF_FILES_PERMS+= ${EGDIR}/jtp_lit1.dat ${SHAREDIR}/config/jtp_lit1.dat \
- ${ROOT_USER} ${GAMES_GROUP} ${GAMEDATAMODE}
+ ${REAL_ROOT_USER} ${GAMES_GROUP} ${GAMEDATAMODE}
CONF_FILES_PERMS+= ${EGDIR}/jtp_opts.txt ${SHAREDIR}/config/jtp_opts.txt \
- ${ROOT_USER} ${GAMES_GROUP} ${GAMEDATAMODE}
+ ${REAL_ROOT_USER} ${GAMES_GROUP} ${GAMEDATAMODE}
CONF_FILES_PERMS+= ${EGDIR}/jtp_snds.txt ${SHAREDIR}/config/jtp_snds.txt \
- ${ROOT_USER} ${GAMES_GROUP} ${GAMEDATAMODE}
+ ${REAL_ROOT_USER} ${GAMES_GROUP} ${GAMEDATAMODE}
SPECIAL_PERMS+= ${SHAREDIR}/falcons-eye ${SETGID_GAMES_PERMS}
pre-configure:
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"
diff --git a/net/argus/Makefile b/net/argus/Makefile
index 5fd1e9e774b..a3439736912 100644
--- a/net/argus/Makefile
+++ b/net/argus/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2015/06/12 10:50:39 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2016/05/17 10:32:08 fhajny Exp $
DISTNAME= argus-3.7
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= net
MASTER_SITES= http://www.tcp4me.com/code/argus-archive/
EXTRACT_SUFX= .tgz
@@ -41,7 +41,7 @@ INSTALL_MAKE_FLAGS+= INSTALL_BIN=${DESTDIR}${PREFIX}/bin \
INSTALL_LIB=${DESTDIR}${PREFIX}/lib/argus \
INSTALL_DATA=${DESTDIR}${PREFIX}/share/examples/argus
-OWN_DIRS_PERMS= ${VARBASE}/argus ${ROOT_USER} ${REAL_ROOT_GROUP} 0777
+OWN_DIRS_PERMS= ${VARBASE}/argus ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0777
OWN_DIRS_PERMS+= ${VARBASE}/argus/perl ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0777
OWN_DIRS_PERMS+= ${VARBASE}/argus/gcache ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0777
OWN_DIRS_PERMS+= ${VARBASE}/argus/gdata ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0777
diff --git a/net/balance/Makefile b/net/balance/Makefile
index ea705fd1a4e..30b67e87b22 100644
--- a/net/balance/Makefile
+++ b/net/balance/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2016/02/25 16:20:50 jperkin Exp $
+# $NetBSD: Makefile,v 1.11 2016/05/17 10:32:08 fhajny Exp $
#
DISTNAME= balance-3.57
+PKGREVISION= 1
CATEGORIES= net
MASTER_SITES= http://www.inlab.de/
@@ -16,6 +17,6 @@ MAKE_ENV+= VARBASE=${VARBASE}
MAKE_ENV.SunOS+= LIBRARIES="-lsocket -lnsl"
OWN_DIRS_PERMS= ${VARBASE}/run/balance \
- ${ROOT_USER} ${ROOT_GROUP} 0750
+ ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0750
.include "../../mk/bsd.pkg.mk"
diff --git a/net/netatalk30/Makefile b/net/netatalk30/Makefile
index a58dabd0f19..6306fdec19b 100644
--- a/net/netatalk30/Makefile
+++ b/net/netatalk30/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2016/03/05 11:29:09 jperkin Exp $
+# $NetBSD: Makefile,v 1.10 2016/05/17 10:32:08 fhajny Exp $
DISTNAME= netatalk-3.0.8
PKGNAME= ${DISTNAME:C/-/30-/}
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=netatalk/}
EXTRACT_SUFX= .tar.bz2
@@ -36,7 +36,7 @@ CONFLICTS+= netatalk-asun-[0-9]* netatalk-umich-[0-9]*
.include "../../mk/bsd.prefs.mk"
BUILD_DEFS+= VARBASE
-OWN_DIRS+= ${VARBASE}/db/netatalk/CNID ${ROOT_USER} ${ROOT_GROUP}
+OWN_DIRS+= ${VARBASE}/db/netatalk/CNID ${REAL_ROOT_USER} ${REAL_ROOT_GROUP}
CONFIGURE_ARGS+= --enable-overwrite
CONFIGURE_ARGS+= --enable-quota
diff --git a/net/ocsinventory-agent/Makefile b/net/ocsinventory-agent/Makefile
index 73e49c787cf..003cc89ce42 100644
--- a/net/ocsinventory-agent/Makefile
+++ b/net/ocsinventory-agent/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2015/06/12 10:50:43 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2016/05/17 10:32:08 fhajny Exp $
#
VERS= 1.1.2.1
-PKGREVISION= 7
+PKGREVISION= 8
DISTNAME= Ocsinventory-Agent-${VERS}
PKGNAME= ocsinventory-agent-${VERS}
CATEGORIES= net
@@ -30,7 +30,7 @@ AUTO_MKDIRS=yes
.include "../../mk/bsd.prefs.mk"
EGDIR= ${PREFIX}/share/examples/ocsinventory-agent
-MAKE_DIRS_PERMS+= ${VARBASE}/db/ocsinventory ${ROOT_USER} ${ROOT_GROUP} 0700
+MAKE_DIRS_PERMS+= ${VARBASE}/db/ocsinventory ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0700
CONF_FILES+= ${EGDIR}/ocsinventory-agent.cfg ${PKG_SYSCONFDIR}/ocsinventory-agent.cfg
CONF_FILES+= ${EGDIR}/modules.conf ${PKG_SYSCONFDIR}/modules.conf
diff --git a/net/rancid/Makefile b/net/rancid/Makefile
index 32eb62c705e..ca8ee1e81e2 100644
--- a/net/rancid/Makefile
+++ b/net/rancid/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2016/03/19 06:45:28 pettai Exp $
+# $NetBSD: Makefile,v 1.17 2016/05/17 10:32:08 fhajny Exp $
#
DISTNAME= rancid-3.4.1
+PKGREVISION= 1
CATEGORIES= net
MASTER_SITES= ftp://ftp.shrubbery.net/pub/rancid/
@@ -41,11 +42,11 @@ REPLACE_PERL= lib/dell.pm.in
EGDIR= ${PREFIX}/share/examples/rancid
PKG_SYSCONFSUBDIR?= rancid
CONF_FILES_PERMS= ${EGDIR}/lg.conf.sample ${PKG_SYSCONFDIR}/lg.conf \
- ${ROOT_USER} ${ROOT_GROUP} 0644
+ ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0644
CONF_FILES_PERMS+= ${EGDIR}/rancid.conf.sample ${PKG_SYSCONFDIR}/rancid.conf \
- ${ROOT_USER} ${ROOT_GROUP} 0644
+ ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0644
CONF_FILES_PERMS+= ${EGDIR}/rancid.types.base ${PKG_SYSCONFDIR}/rancid.types.base \
- ${ROOT_USER} ${ROOT_GROUP} 0644
+ ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0644
MESSAGE_SUBST+= PREFIX=${PREFIX}
MESSAGE_SUBST+= RC_USER=${RC_USER}
diff --git a/net/sendfile/Makefile b/net/sendfile/Makefile
index 0adaca81657..bfa8472fb40 100644
--- a/net/sendfile/Makefile
+++ b/net/sendfile/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.35 2016/04/21 16:28:44 jperkin Exp $
+# $NetBSD: Makefile,v 1.36 2016/05/17 10:32:08 fhajny Exp $
#
DISTNAME= sendfile-2.1b
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= net
MASTER_SITES= http://fex.rus.uni-stuttgart.de/download/
@@ -27,7 +27,7 @@ post-configure:
cd ${WRKSRC} &&${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} config
OWN_DIRS+= ${VARBASE}/spool/sendfile
-OWN_DIRS_PERMS+=${VARBASE}/spool/sendfile/LOG ${ROOT_USER} ${ROOT_GROUP} 700
-OWN_DIRS_PERMS+=${VARBASE}/spool/sendfile/OUTGOING ${ROOT_USER} ${ROOT_GROUP} 1777
+OWN_DIRS_PERMS+=${VARBASE}/spool/sendfile/LOG ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 700
+OWN_DIRS_PERMS+=${VARBASE}/spool/sendfile/OUTGOING ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 1777
.include "../../mk/bsd.pkg.mk"
diff --git a/net/snmptt/Makefile b/net/snmptt/Makefile
index 7f93c0a2b81..9ffc2578b1a 100644
--- a/net/snmptt/Makefile
+++ b/net/snmptt/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.9 2016/03/05 11:29:12 jperkin Exp $
+# $NetBSD: Makefile,v 1.10 2016/05/17 10:32:08 fhajny Exp $
#
DISTNAME= snmptt_1.3
EXTRACT_SUFX= .tgz
PKGNAME= snmptt-1.3
-PKGREVISION= 6
+PKGREVISION= 7
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=snmptt/}
@@ -35,7 +35,7 @@ CONF_FILES= ${EGDIR}/snmptt.ini ${PKG_SYSCONFDIR}/snmptt.ini
DOCDIR= ${PREFIX}/share/doc/html/snmptt
-MAKE_DIRS_PERMS+= ${VARBASE}/spool/snmptt ${ROOT_USER} ${ROOT_GROUP} 0755
+MAKE_DIRS_PERMS+= ${VARBASE}/spool/snmptt ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0755
USE_TOOLS+= perl:run
REPLACE_PERL+= snmptt
diff --git a/net/vpnc-script/Makefile b/net/vpnc-script/Makefile
index d52cb7f4171..17a7338fb03 100644
--- a/net/vpnc-script/Makefile
+++ b/net/vpnc-script/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2015/03/02 15:24:12 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2016/05/17 10:32:08 fhajny Exp $
DISTNAME= vpnc-script-20140805
+PKGREVISION= 1
CATEGORIES= net security
MASTER_SITES= http://git.infradead.org/users/dwmw2/vpnc-scripts.git/blob_plain/HEAD:/
DIST_SUBDIR= ${PKGNAME_NOREV}
@@ -19,7 +20,7 @@ EGDIR= ${PREFIX}/share/examples/vpnc-script
INSTALLATION_DIRS= ${EGDIR}
CONF_FILES_PERMS= ${EGDIR}/vpnc-script \
${PKG_SYSCONFDIR}/vpnc-script \
- ${ROOT_USER} ${ROOT_GROUP} 555
+ ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 555
do-install:
${INSTALL_SCRIPT} ${WRKSRC}/vpnc-script ${DESTDIR}${EGDIR}
diff --git a/news/nntpcache/Makefile b/news/nntpcache/Makefile
index 6ebf2452f98..63260dfc8a3 100644
--- a/news/nntpcache/Makefile
+++ b/news/nntpcache/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.46 2016/03/05 11:29:15 jperkin Exp $
+# $NetBSD: Makefile,v 1.47 2016/05/17 10:32:08 fhajny Exp $
DISTNAME= nntpcache-3.0.2
-PKGREVISION= 10
+PKGREVISION= 11
CATEGORIES= news
MASTER_SITES= http://www.xs4all.nl/~suelette/
@@ -67,7 +67,7 @@ CONF_FILES_PERMS+= share/examples/nntpcache/pubring.pgp \
CONF_FILES_PERMS+= share/examples/nntpcache/spam.filter \
${PKG_SYSCONFDIR}/spam.filter \
${NNTPCACHE_USER} ${NNTPCACHE_GROUP} 600
-SPECIAL_PERMS+= libexec/unixauth ${ROOT_USER} ${NNTPCACHE_GROUP} 4554
+SPECIAL_PERMS+= libexec/unixauth ${REAL_ROOT_USER} ${NNTPCACHE_GROUP} 4554
REPLACE_PERL+= innreport/innreport.pl innreport/innreport.pm
REPLACE_PERL+= contrib/perlnewshound/newshound.pl
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
diff --git a/sysutils/bacula/Makefile b/sysutils/bacula/Makefile
index 32f7fe43714..a7e0e1e9040 100644
--- a/sysutils/bacula/Makefile
+++ b/sysutils/bacula/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.66 2016/04/11 19:02:03 ryoon Exp $
+# $NetBSD: Makefile,v 1.67 2016/05/17 10:32:09 fhajny Exp $
-PKGREVISION= 10
+PKGREVISION= 11
CONFLICTS+= bacula-client-[0-9]* bacula-clientonly-[0-9]*
@@ -21,7 +21,7 @@ CONFIGURE_ARGS+= --with-dir-user=${BACULA_DIR_USER}
CONFIGURE_ARGS+= --with-sd-group=${BACULA_GROUP}
CONFIGURE_ARGS+= --with-sd-user=${BACULA_SD_USER}
-OWN_DIRS_PERMS+= ${BACULA_WORKINGDIR} ${ROOT_USER} ${BACULA_GROUP} 770
+OWN_DIRS_PERMS+= ${BACULA_WORKINGDIR} ${REAL_ROOT_USER} ${BACULA_GROUP} 770
PKG_USERS= ${BACULA_DIR_USER}:${BACULA_GROUP}
PKG_USERS+= ${BACULA_SD_USER}:${BACULA_GROUP}
diff --git a/sysutils/grub2/Makefile b/sysutils/grub2/Makefile
index 9dfd6e2f324..8a6349af010 100644
--- a/sysutils/grub2/Makefile
+++ b/sysutils/grub2/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2016/05/03 10:54:56 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2016/05/17 10:32:09 fhajny Exp $
DISTNAME= grub-2.00
PKGNAME= ${DISTNAME:S/grub/grub2/}
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= sysutils
MASTER_SITES= ftp://ftp.gnu.org/gnu/grub/
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
@@ -89,7 +89,7 @@ EGFILES+= 10_linux
EGFILES+= 10_netbsd
.endif
.for file in ${EGFILES}
-CONF_FILES_PERMS+= ${EGDIR}/${file} ${PKG_SYSCONFDIR}/${file} ${ROOT_USER} ${ROOT_GROUP} 0755
+CONF_FILES_PERMS+= ${EGDIR}/${file} ${PKG_SYSCONFDIR}/${file} ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0755
.endfor
CONF_FILES+= ${EGDIR}/README ${PKG_SYSCONFDIR}/README
CONF_FILES+= ${EGDIR}/default.conf.sample ${PKG_SYSCONFDIR}/default.conf
diff --git a/sysutils/slocate/Makefile b/sysutils/slocate/Makefile
index 93f66365d3f..96662cee089 100644
--- a/sysutils/slocate/Makefile
+++ b/sysutils/slocate/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2012/12/12 15:24:17 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2016/05/17 10:32:09 fhajny Exp $
#
DISTNAME= slocate-3.1
+PKGREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= http://fossies.org/unix/misc/old/
@@ -23,9 +24,9 @@ EGDIR= ${PREFIX}/share/examples/slocate
MESSAGE_SUBST+= EGDIR=${EGDIR}
OWN_DIRS= ${PREFIX}/var/slocate
-OWN_DIRS_PERMS+= ${PREFIX}/var/slocate ${ROOT_USER} ${SLOCATE_GROUP} 0750
+OWN_DIRS_PERMS+= ${PREFIX}/var/slocate ${REAL_ROOT_USER} ${SLOCATE_GROUP} 0750
-SPECIAL_PERMS+= src/slocate ${ROOT_USER} ${SLOCATE_GROUP} 2755
+SPECIAL_PERMS+= src/slocate ${REAL_ROOT_USER} ${SLOCATE_GROUP} 2755
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/src/slocate ${DESTDIR}${PREFIX}/bin/
diff --git a/sysutils/webmin/Makefile b/sysutils/webmin/Makefile
index c32201338fa..a6663be529f 100644
--- a/sysutils/webmin/Makefile
+++ b/sysutils/webmin/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.41 2016/03/05 11:29:32 jperkin Exp $
+# $NetBSD: Makefile,v 1.42 2016/05/17 10:32:09 fhajny Exp $
.include "version.mk"
DISTNAME= webmin-${WBM_VERSION}
-#KGREVISION= 5
-PKGREVISION= 6
+PKGREVISION= 7
CATEGORIES= sysutils www
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=webadmin/}
@@ -36,28 +35,28 @@ BUILD_DEFS+= VARBASE
WEBMIN_MINIMAL_MODULES= acl cron init inittab man proc servers webmin webminlog
PKG_SYSCONFSUBDIR= webmin
-OWN_DIRS_PERMS+= ${WEBMIN_VARDIR} ${ROOT_USER} ${ROOT_GROUP} 0700
+OWN_DIRS_PERMS+= ${WEBMIN_VARDIR} ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0700
.for f in config install-dir perl-path var-path version
CONF_FILES+= ${WEBMIN_EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
.endfor
.for m in ${WEBMIN_MINIMAL_MODULES}
OWN_DIRS_PERMS+= ${PKG_SYSCONFDIR}/${m} \
- ${ROOT_USER} ${ROOT_GROUP} 0700
+ ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0700
CONF_FILES_PERMS+= ${WEBMIN_EGDIR}/${m}/config \
${PKG_SYSCONFDIR}/${m}/config \
- ${ROOT_USER} ${ROOT_GROUP} 0600
+ ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0600
.endfor
.for f in miniserv.pem
CONF_FILES_PERMS+= ${WEBMIN_DIR}/${f} ${PKG_SYSCONFDIR}/${f} \
- ${ROOT_USER} ${ROOT_GROUP} 0600
+ ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0600
.endfor
.for f in miniserv.conf miniserv.users webmin.acl
CONF_FILES_PERMS+= ${WEBMIN_EGDIR}/${f} ${PKG_SYSCONFDIR}/${f} \
- ${ROOT_USER} ${ROOT_GROUP} 0600
+ ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0600
.endfor
.for f in reload restart start stop
CONF_FILES_PERMS+= ${WEBMIN_EGDIR}/${f} ${PKG_SYSCONFDIR}/${f} \
- ${ROOT_USER} ${ROOT_GROUP} 0755
+ ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0755
.endfor
RCD_SCRIPTS= webmin
diff --git a/sysutils/xentools3-hvm/Makefile b/sysutils/xentools3-hvm/Makefile
index 27f134335d4..e80ca11cab2 100644
--- a/sysutils/xentools3-hvm/Makefile
+++ b/sysutils/xentools3-hvm/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.29 2016/02/26 10:24:14 jperkin Exp $
+# $NetBSD: Makefile,v 1.30 2016/05/17 10:32:09 fhajny Exp $
VERSION= 3.1.4
DISTNAME= xen-${VERSION}
PKGNAME= xentools3-hvm-${VERSION}
-PKGREVISION= 13
+PKGREVISION= 14
CATEGORIES= sysutils
MASTER_SITES= http://bits.xensource.com/oss-xen/release/${VERSION}/
@@ -69,7 +69,7 @@ PROCPATH.NetBSD= /kern
PROCPATH.*= /proc
CONF_FILES_PERMS+= ${EGDIR}/qemu-ifup ${PKG_SYSCONFDIR}/scripts/qemu-ifup \
- ${ROOT_USER} ${ROOT_GROUP} 0755
+ ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0755
OWN_DIRS= ${PKG_SYSCONFDIR}/scripts
diff --git a/time/kronolith/Makefile b/time/kronolith/Makefile
index eea89cb9fa1..4a3493cedd6 100644
--- a/time/kronolith/Makefile
+++ b/time/kronolith/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2015/12/06 12:13:12 taca Exp $
+# $NetBSD: Makefile,v 1.24 2016/05/17 10:32:09 fhajny Exp $
DISTNAME= kronolith-h3-${KRONOLITHVER}
PKGNAME= kronolith-${KRONOLITHVER}
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= www time
MASTER_SITES= http://ftp.horde.org/pub/kronolith/ \
ftp://ftp.horde.org/pub/kronolith/
@@ -58,16 +58,16 @@ PKG_USERS_VARS+= APACHE_USER
CONF_FILES= ${EGDIR}/kronolith.conf ${PKG_SYSCONFDIR}/kronolith.conf
CONF_FILES_PERMS+= ${KRONOLITHDIR}/config/conf.xml.dist \
${KRONOLITHDIR}/config/conf.xml \
- ${APACHE_USER} ${ROOT_GROUP} 0440
+ ${APACHE_USER} ${REAL_ROOT_GROUP} 0440
CONF_FILES_PERMS+= ${KRONOLITHDIR}/config/keywords.php.dist \
${KRONOLITHDIR}/config/keywords.php \
- ${APACHE_USER} ${ROOT_GROUP} 0440
+ ${APACHE_USER} ${REAL_ROOT_GROUP} 0440
CONF_FILES_PERMS+= ${KRONOLITHDIR}/config/menu.php.dist \
${KRONOLITHDIR}/config/menu.php \
- ${APACHE_USER} ${ROOT_GROUP} 0440
+ ${APACHE_USER} ${REAL_ROOT_GROUP} 0440
CONF_FILES_PERMS+= ${KRONOLITHDIR}/config/prefs.php.dist \
${KRONOLITHDIR}/config/prefs.php \
- ${APACHE_USER} ${ROOT_GROUP} 0440
+ ${APACHE_USER} ${REAL_ROOT_GROUP} 0440
SPECIAL_PERMS+= ${KRONOLITHDIR}/config ${APACHE_USER} ${SHAREGRP} 0750
do-build:
diff --git a/www/gallery/Makefile b/www/gallery/Makefile
index 6893bd61728..aa0fe5f9e39 100644
--- a/www/gallery/Makefile
+++ b/www/gallery/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2015/06/12 10:51:49 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2016/05/17 10:32:09 fhajny Exp $
#
DISTNAME= gallery-1.5.10
-PKGREVISION= 7
+PKGREVISION= 8
CATEGORIES= www graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gallery/}
@@ -30,9 +30,9 @@ EGDIR= ${PREFIX}/share/examples/gallery
G1DIR= ${PREFIX}/share/gallery
CONF_FILES_PERMS= ${EGDIR}/config.php ${G1DIR}/config.php \
- ${ROOT_USER} ${ROOT_GROUP} 0666
+ ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0666
CONF_FILES_PERMS+= ${EGDIR}/.htaccess ${G1DIR}/.htaccess \
- ${ROOT_USER} ${ROOT_GROUP} 0666
+ ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0666
MESSAGE_SUBST+= G1DIR=${G1DIR}
FILES_SUBST+= G1DIR=${G1DIR}
diff --git a/www/horde/Makefile b/www/horde/Makefile
index b83d236dd38..456843c81df 100644
--- a/www/horde/Makefile
+++ b/www/horde/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.76 2013/03/16 07:21:25 obache Exp $
+# $NetBSD: Makefile,v 1.77 2016/05/17 10:32:09 fhajny Exp $
DISTNAME= horde-3.3.13
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= www
MASTER_SITES= http://ftp.horde.org/pub/horde/ \
ftp://ftp.horde.org/pub/horde/
@@ -59,31 +59,31 @@ REPLACE_FILES.php= po/translation.php \
CONF_FILES+= ${EGDIR}/horde.conf ${PKG_SYSCONFDIR}/horde.conf
OWN_DIRS_PERMS+= ${HORDEDIR}/config \
- ${APACHE_USER} ${ROOT_GROUP} 0750
+ ${APACHE_USER} ${REAL_ROOT_GROUP} 0750
CONF_FILES_PERMS+= ${EGDIR}/config/conf.php \
${HORDEDIR}/config/conf.php \
- ${APACHE_USER} ${ROOT_GROUP} 0640
+ ${APACHE_USER} ${REAL_ROOT_GROUP} 0640
CONF_FILES_PERMS+= ${EGDIR}/config/conf.xml \
${HORDEDIR}/config/conf.xml \
- ${APACHE_USER} ${ROOT_GROUP} 0440
+ ${APACHE_USER} ${REAL_ROOT_GROUP} 0440
CONF_FILES_PERMS+= ${EGDIR}/config/mime_drivers.php \
${HORDEDIR}/config/mime_drivers.php \
- ${APACHE_USER} ${ROOT_GROUP} 0440
+ ${APACHE_USER} ${REAL_ROOT_GROUP} 0440
CONF_FILES_PERMS+= ${EGDIR}/config/motd.php \
${HORDEDIR}/config/motd.php \
- ${APACHE_USER} ${ROOT_GROUP} 0440
+ ${APACHE_USER} ${REAL_ROOT_GROUP} 0440
CONF_FILES_PERMS+= ${EGDIR}/config/nls.php \
${HORDEDIR}/config/nls.php \
- ${APACHE_USER} ${ROOT_GROUP} 0440
+ ${APACHE_USER} ${REAL_ROOT_GROUP} 0440
CONF_FILES_PERMS+= ${EGDIR}/config/prefs.php \
${HORDEDIR}/config/prefs.php \
- ${APACHE_USER} ${ROOT_GROUP} 0440
+ ${APACHE_USER} ${REAL_ROOT_GROUP} 0440
CONF_FILES_PERMS+= ${EGDIR}/config/registry.php \
${HORDEDIR}/config/registry.php \
- ${APACHE_USER} ${ROOT_GROUP} 0440
+ ${APACHE_USER} ${REAL_ROOT_GROUP} 0440
CONF_FILES_PERMS+= ${EGDIR}/config/hooks.php \
${HORDEDIR}/config/hooks.php \
- ${APACHE_USER} ${ROOT_GROUP} 0440
+ ${APACHE_USER} ${REAL_ROOT_GROUP} 0440
SUBST_CLASSES+= files
SUBST_STAGE.files= post-build