diff options
| author | Chris Rees <crees@FreeBSD.org> | 2011-06-27 17:54:21 +0000 |
|---|---|---|
| committer | Chris Rees <crees@FreeBSD.org> | 2011-06-27 17:54:21 +0000 |
| commit | 29fb0f538c6bab615e423e27be18550835bf2bec (patch) | |
| tree | 66d793a7581802dd441b1c4c8d62aa3b0ad00d73 | |
| parent | - Use USERS and GROUPS (diff) | |
- Use USERS and GROUPS
PR: ports/157578
Submitted by: Chris Rees (utisoft@gmail.com)
Approved by: tabthorpe (co-mentor)
Notes
Notes:
svn path=/head/; revision=276515
| -rw-r--r-- | dns/dnrd/Makefile | 12 | ||||
| -rw-r--r-- | dns/dnrd/pkg-install | 25 |
2 files changed, 3 insertions, 34 deletions
diff --git a/dns/dnrd/Makefile b/dns/dnrd/Makefile index a8b119053f65..efa4da7ba749 100644 --- a/dns/dnrd/Makefile +++ b/dns/dnrd/Makefile @@ -28,14 +28,12 @@ OPTIONS= TCP "Enable TCP support" off \ DEBUG "Enable debugging" off \ RANDOM "Enable random source port" off -DNRD_USER?= dnrd -DNRD_GROUP?= dnrd +USERS= dnrd +GROUPS= dnrd DNRD_DIR?= ${ETCDIR} SUB_FILES= pkg-install -SUB_LIST+= DNRD_USER=${DNRD_USER} \ - DNRD_GROUP=${DNRD_GROUP} \ - DNRD_DIR=${DNRD_DIR} +SUB_LIST+= DNRD_DIR=${DNRD_DIR} .include <bsd.port.pre.mk> @@ -55,10 +53,6 @@ CONFIGURE_ARGS+= --enable-debug CONFIGURE_ARGS+= --enable-random-src .endif -pre-install: - @${ECHO} "==> Creating custom user to run dnrd..." - @${SETENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL - do-install: @${ECHO} "==> Creating dnrd directory" @${SETENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL diff --git a/dns/dnrd/pkg-install b/dns/dnrd/pkg-install index 7266a4efbc96..950332819e14 100644 --- a/dns/dnrd/pkg-install +++ b/dns/dnrd/pkg-install @@ -1,34 +1,9 @@ #!/bin/sh -USER=${DNRDUSER:-dnrd} -GROUP=${USER} SYSCONF_DIR=${SYSCONF_DIR:-${PKG_PREFIX}/etc/dnrd} case $2 in - PRE-INSTALL) - if ! pw groupshow "${GROUP}" 2>/dev/null 1>&2; then - if pw groupadd ${GROUP}; then - echo "Added group \"${GROUP}\"." - else - echo "Adding group \"${GROUP}\" failed..." - exit 1 - fi - fi - - if ! pw usershow "${USER}" 2>/dev/null 1>&2; then - if pw useradd ${USER} -g ${GROUP} -h - \ - -s "/sbin/nologin" -d "/var/empty" \ - -c "DNRD daemon"; \ - then - echo "Added user \"${USER}\"." - else - echo "Adding user \"${USER}\" failed..." - exit 1 - fi - fi - ;; - POST-INSTALL) if [ ! -d ${SYSCONF_DIR} ]; then mkdir -p ${SYSCONF_DIR} |