diff options
| author | jlam <jlam@pkgsrc.org> | 2001-11-26 20:38:31 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2001-11-26 20:38:31 +0000 |
| commit | 678c0f86f876a6627f87f5035ca03d672e715ae2 (patch) | |
| tree | 72e7c5f0163f0edf167281176b0a2f60b193d72b /security/cyrus-sasl | |
| parent | 22d02d6b3ee441bb598f813d6f7a5421dca6335f (diff) | |
| download | pkgsrc-678c0f86f876a6627f87f5035ca03d672e715ae2.tar.gz | |
Use PKG_{USERS,GROUPS} instead of PKG_{USER,GROUP}.
Diffstat (limited to 'security/cyrus-sasl')
| -rw-r--r-- | security/cyrus-sasl/Makefile | 10 | ||||
| -rw-r--r-- | security/cyrus-sasl/files/sasl_pwcheck.sh | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/security/cyrus-sasl/Makefile b/security/cyrus-sasl/Makefile index 4ce2be0e963..70a90cd4254 100644 --- a/security/cyrus-sasl/Makefile +++ b/security/cyrus-sasl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2001/11/25 18:59:47 jlam Exp $ +# $NetBSD: Makefile,v 1.21 2001/11/26 20:38:32 jlam Exp $ DISTNAME= cyrus-sasl-1.5.24 PKGNAME= ${DISTNAME}nb3 @@ -27,6 +27,7 @@ LTCONFIG_OVERRIDE= ${WRKSRC}/config/ltconfig # CYRUS_USER?= cyrus CYRUS_GROUP?= mail +FILES_SUBST+= CYRUS_USER=${CYRUS_USER} HTMLDIR= ${PREFIX}/share/doc/html/cyrus-sasl PWCHECKDIR= /var/pwcheck @@ -76,11 +77,10 @@ CONFIGURE_ARGS+= --with-pam=${PREFIX} .include "../../security/PAM/buildlink.mk" .endif -PKG_USER= ${CYRUS_USER} -PKG_USER_SHELL= ${SH} -PKG_GROUP= ${CYRUS_GROUP} +PKG_GROUPS= ${CYRUS_GROUP} +PKG_USERS= ${CYRUS_USER}:${CYRUS_GROUP}::::${SH} RCD_SCRIPTS= sasl_pwcheck -OWN_DIRS_PERMS= ${PWCHECKDIR} ${PKG_USER} ${ROOT_GROUP} 0700 +OWN_DIRS_PERMS= ${PWCHECKDIR} ${CYRUS_USER} ${ROOT_GROUP} 0700 DEINSTALL_EXTRA_TMPL= ${PKGDIR}/DEINSTALL diff --git a/security/cyrus-sasl/files/sasl_pwcheck.sh b/security/cyrus-sasl/files/sasl_pwcheck.sh index 3b983c76147..b50636f2d38 100644 --- a/security/cyrus-sasl/files/sasl_pwcheck.sh +++ b/security/cyrus-sasl/files/sasl_pwcheck.sh @@ -1,6 +1,6 @@ #! /bin/sh # -# $NetBSD: sasl_pwcheck.sh,v 1.3 2001/11/26 07:34:05 jlam Exp $ +# $NetBSD: sasl_pwcheck.sh,v 1.4 2001/11/26 20:38:32 jlam Exp $ # # The pwcheck daemon allows UNIX password authentication with Cyrus SASL. # @@ -32,7 +32,7 @@ sasl_pwcheck_dbinit() else @ECHO@ password | ${saslpasswd} -p user ${saslpasswd} -d user - @CHOWN@ @PKG_USER@ ${sasldb} + @CHOWN@ @CYRUS_USER@ ${sasldb} @CHMOD@ 0600 ${sasldb} fi ) |