summaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
authorxtraeme <xtraeme>2004-11-17 11:45:49 +0000
committerxtraeme <xtraeme>2004-11-17 11:45:49 +0000
commitdd161d07542047e57523c315aba96106f97a97e0 (patch)
tree1c360a3ad28d1f040f75e028863880b64a9bc594 /devel
parent34a2df0db6c658c93881ec165e6d755b3f4e354b (diff)
downloadpkgsrc-dd161d07542047e57523c315aba96106f97a97e0.tar.gz
As reed@ said in another email:
"No files should be owned by "nobody" because that defeats the purpose of having a "nobody" account." Make this use a specific user/group called distcc to run the daemon. Bump PKGREVISION.
Diffstat (limited to 'devel')
-rw-r--r--devel/distcc/Makefile12
-rwxr-xr-xdevel/distcc/files/distccd.sh6
2 files changed, 14 insertions, 4 deletions
diff --git a/devel/distcc/Makefile b/devel/distcc/Makefile
index 2eb14f8e22a..94c8d2b6292 100644
--- a/devel/distcc/Makefile
+++ b/devel/distcc/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2004/11/16 09:24:50 xtraeme Exp $
+# $NetBSD: Makefile,v 1.19 2004/11/17 11:45:49 xtraeme Exp $
DISTNAME= distcc-2.18.2
+PKGREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://distcc.samba.org/ftp/distcc/
EXTRACT_SUFX= .tar.bz2
@@ -20,10 +21,17 @@ CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
PKG_SYSCONFSUBDIR= distcc
RCD_SCRIPTS= distccd
+DISTCC_USER?= distcc
+DISTCC_GROUP?= distcc
+PKG_GROUPS= ${DISTCC_GROUP}
+PKG_USERS= ${DISTCC_USER}:${DISTCC_GROUP}::Distccd\\ user
+
DISTCC_PIDDIR?= ${VARBASE}/run/distccd
-OWN_DIRS_PERMS= ${DISTCC_PIDDIR} nobody nobody 0750
+OWN_DIRS_PERMS= ${DISTCC_PIDDIR} ${DISTCC_USER} ${DISTCC_GROUP} 0750
FILES_SUBST+= DISTCC_PIDDIR=${DISTCC_PIDDIR}
+FILES_SUBST+= DISTCC_USER=${DISTCC_USER}
+FILES_SUBST+= DISTCC_GROUP=${DISTCC_GROUP}
SUBST_CLASSES= doc
SUBST_STAGE.doc= post-patch
diff --git a/devel/distcc/files/distccd.sh b/devel/distcc/files/distccd.sh
index f3828855453..d3193a36b30 100755
--- a/devel/distcc/files/distccd.sh
+++ b/devel/distcc/files/distccd.sh
@@ -1,6 +1,6 @@
#!@RCD_SCRIPTS_SHELL@
#
-# $NetBSD: distccd.sh,v 1.5 2004/11/16 09:24:50 xtraeme Exp $
+# $NetBSD: distccd.sh,v 1.6 2004/11/17 11:45:49 xtraeme Exp $
#
# PROVIDE: distccd
@@ -14,7 +14,9 @@ name="distccd"
rcvar="${name}"
command="@PREFIX@/bin/${name}"
pidfile="@DISTCC_PIDDIR@/${name}.pid"
-command_args="--daemon --pid-file ${pidfile} --user nobody"
+command_args="--daemon --pid-file ${pidfile}"
+distccd_user="@DISTCC_USER@"
+distccd_group="@DISTCC_GROUP@"
if [ -f /etc/rc.subr -a -f /etc/rc.conf -a -f /etc/rc.d/DAEMON ]; then
load_rc_config $name