diff options
| author | ghen <ghen> | 2006-11-29 10:11:53 +0000 |
|---|---|---|
| committer | ghen <ghen> | 2006-11-29 10:11:53 +0000 |
| commit | cdf96346d290358ec2395bfbb014db3cd32b7645 (patch) | |
| tree | 05c75e8f8a07c027990af12e9000b128d5de97a9 /sysutils | |
| parent | 2e055590ab635f1d6605678add7314d5ae9cd7d9 (diff) | |
| download | pkgsrc-cdf96346d290358ec2395bfbb014db3cd32b7645.tar.gz | |
Make the dbus user and group configurable, because (at least on NetBSD) the
defaults messagebus:messagebus trigger daily security warnings (more than 8
characters). The default values are set in mk/defaults/mk.conf but kept the
same for backwards compatibility, so no PKGREVISION bump.
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/dbus/Makefile | 16 | ||||
| -rw-r--r-- | sysutils/dbus/files/dbus.sh | 4 |
2 files changed, 13 insertions, 7 deletions
diff --git a/sysutils/dbus/Makefile b/sysutils/dbus/Makefile index 775931a4869..3bff7d044a1 100644 --- a/sysutils/dbus/Makefile +++ b/sysutils/dbus/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2006/11/13 15:16:20 drochner Exp $ +# $NetBSD: Makefile,v 1.19 2006/11/29 10:11:53 ghen Exp $ # DISTNAME= dbus-1.0.0 @@ -36,6 +36,7 @@ CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q} CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} CONFIGURE_ARGS+= --with-xml=expat CONFIGURE_ARGS+= --without-x +CONFIGURE_ARGS+= --with-dbus-user=${DBUS_USER} PKG_OPTIONS_VAR= PKG_OPTIONS.dbus PKG_SUPPORTED_OPTIONS+= debug @@ -59,10 +60,15 @@ INSTALLATION_DIRS= ${EGDIR} RCD_SCRIPTS= dbus -PKG_GROUPS= messagebus -PKG_USERS= messagebus:messagebus -PKG_GECOS.messagebus= System message bus -PKG_HOME.messagebus= ${VARBASE}/run/dbus +BUILD_DEFS+= DBUS_USER DBUS_GROUP + +PKG_GROUPS= ${DBUS_GROUP} +PKG_USERS= ${DBUS_USER}:${DBUS_GROUP} +PKG_GECOS.${DBUS_USER}= System message bus +PKG_HOME.${DBUS_USER}= ${VARBASE}/run/dbus + +FILES_SUBST+= DBUS_USER=${DBUS_USER} +FILES_SUBST+= DBUS_GROUP=${DBUS_GROUP} .include "../../devel/gettext-lib/buildlink3.mk" .include "../../textproc/expat/buildlink3.mk" diff --git a/sysutils/dbus/files/dbus.sh b/sysutils/dbus/files/dbus.sh index 72d812688e2..61c5632fd40 100644 --- a/sysutils/dbus/files/dbus.sh +++ b/sysutils/dbus/files/dbus.sh @@ -1,6 +1,6 @@ #!@RCD_SCRIPTS_SHELL@ # -# $NetBSD: dbus.sh,v 1.5 2006/11/13 15:16:20 drochner Exp $ +# $NetBSD: dbus.sh,v 1.6 2006/11/29 10:11:53 ghen Exp $ # # PROVIDE: dbus # REQUIRE: DAEMON @@ -19,7 +19,7 @@ dbus_prestart() { if @TEST@ ! -d "@VARBASE@/run/dbus"; then @MKDIR@ "@VARBASE@/run/dbus" @CHMOD@ 0755 "@VARBASE@/run/dbus" - @CHOWN@ messagebus:messagebus "@VARBASE@/run/dbus" + @CHOWN@ @DBUS_USER@:@DBUS_GROUP@ "@VARBASE@/run/dbus" fi @PREFIX@/bin/dbus-uuidgen --ensure } |