diff options
| author | jlam <jlam> | 2000-12-12 16:03:13 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2000-12-12 16:03:13 +0000 |
| commit | 92cf087ad76a314937f0c2b87d124f09c50af90c (patch) | |
| tree | b7c0fc14d9fa19025b48014fb458ea1f880bb5e5 /print | |
| parent | 19edbd5742ec26af61b9fb3bf29caad7102f5c21 (diff) | |
| download | pkgsrc-92cf087ad76a314937f0c2b87d124f09c50af90c.tar.gz | |
Add ${USE_PAM}-triggered PAM authentication support.
Diffstat (limited to 'print')
| -rw-r--r-- | print/cups/Makefile | 18 | ||||
| -rw-r--r-- | print/cups/pkg/INSTALL | 13 |
2 files changed, 28 insertions, 3 deletions
diff --git a/print/cups/Makefile b/print/cups/Makefile index a648201076e..acba5acb45f 100644 --- a/print/cups/Makefile +++ b/print/cups/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2000/12/11 09:00:51 jlam Exp $ +# $NetBSD: Makefile,v 1.13 2000/12/12 16:03:13 jlam Exp $ # DISTNAME= cups-1.1.4-source @@ -26,12 +26,21 @@ USE_LIBTOOL= # defined GNU_CONFIGURE= # defined CONFIGURE_ARGS+= --enable-libtool-unsupported="${LIBTOOL}" CONFIGURE_ARGS+= --enable-rootconfig -CONFIGURE_ARGS+= --disable-pam CFLAGS+= -I${LOCALBASE}/include .include "../../mk/bsd.prefs.mk" +.if defined(USE_PAM) +DEPENDS+= PAM-*:../../security/PAM +CONFIGURE_ARGS+= --enable-pam +PLIST_SRC= ${PKGDIR}/PLIST.pam +PLIST_SRC+= ${PKGDIR}/PLIST +.else +CONFIGURE_ARGS+= --disable-pam +PLIST_SRC= ${PKGDIR}/PLIST +.endif + # CUPS_USER username of the CUPS administrator # CUPS_GROUP group of the CUPS administrator # @@ -71,6 +80,8 @@ post-configure: post-build: ${SED} -e "s,@PREFIX@,${PREFIX},g" \ < ${FILESDIR}/cupsd.sh > ${WRKDIR}/cupsd.sh + ${SED} -e "s,@PREFIX@,${PREFIX},g" \ + < ${FILESDIR}/cups.pam > ${WRKDIR}/cups.pam pre-install: ${SED} -e "s,@CUPS_USER@,${CUPS_USER},g" \ @@ -100,6 +111,9 @@ post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/cups cd ${WRKSRC}/conf; ${INSTALL_DATA} *.conf mime.* \ ${PREFIX}/share/examples/cups +.if defined(USE_PAM) + ${INSTALL_DATA} ${WRKDIR}/cups.pam ${PREFIX}/share/examples/cups +.endif PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL .include "../../mk/bsd.pkg.mk" diff --git a/print/cups/pkg/INSTALL b/print/cups/pkg/INSTALL index 291ed053b80..9ea9a0bf91e 100644 --- a/print/cups/pkg/INSTALL +++ b/print/cups/pkg/INSTALL @@ -1,6 +1,6 @@ #! /bin/sh # -# $NetBSD: INSTALL,v 1.5 2000/12/11 08:42:03 jlam Exp $ +# $NetBSD: INSTALL,v 1.6 2000/12/12 16:03:14 jlam Exp $ PKGNAME=$1 STAGE=$2 @@ -93,6 +93,17 @@ EOF FILE=${CONFDIR}/${file} echo " ${FILE}" done + if [ -f ${SAMPLECONFDIR}/cups.pam ] + then + ${CAT} << EOF + +To authenticate for CUPS using PAM, add the contents of the file: + + ${SAMPLECONFDIR}/cups.pam + +to your PAM configuration file. +EOF + fi ${CAT} << EOF =========================================================================== EOF |