diff options
| author | jlam <jlam@pkgsrc.org> | 2004-01-08 00:07:26 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2004-01-08 00:07:26 +0000 |
| commit | 5f0d313b30dc8c42a8715171e62ac2c9cb013ab8 (patch) | |
| tree | 7937f795d187b969c336ed3a939857c40337a795 /security | |
| parent | de736ccb8c2dfcf1a0ee07a471fd63ca08353d42 (diff) | |
| download | pkgsrc-5f0d313b30dc8c42a8715171e62ac2c9cb013ab8.tar.gz | |
bl3ify
Diffstat (limited to 'security')
| -rw-r--r-- | security/PAM/Makefile | 15 | ||||
| -rw-r--r-- | security/PAM/distinfo | 4 | ||||
| -rw-r--r-- | security/PAM/patches/patch-ad | 15 |
3 files changed, 24 insertions, 10 deletions
diff --git a/security/PAM/Makefile b/security/PAM/Makefile index 4964778ba4f..4a255ddc28a 100644 --- a/security/PAM/Makefile +++ b/security/PAM/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2003/10/18 12:40:11 cjep Exp $ +# $NetBSD: Makefile,v 1.18 2004/01/08 00:07:26 jlam Exp $ # DISTNAME= Linux-${PKGNAME} @@ -13,7 +13,9 @@ MAINTAINER= rh@NetBSD.org HOMEPAGE= http://www.kernel.org/pub/linux/libs/pam/ COMMENT= Pluggable Authentication Modules (PAM) -USE_BUILDLINK2= yes +PKG_INSTALLATION_TYPES= overwrite pkgviews + +USE_BUILDLINK3= yes USE_PKGINSTALL= yes USE_GMAKE= yes USE_DB185= yes @@ -30,10 +32,13 @@ CONFIGURE_ENV+= ac_cv_prog_HAVE_SGML2LATEX=no CONFIGURE_ENV+= ac_cv_prog_HAVE_SGML2PS=no CONFIGURE_ENV+= ac_cv_prog_HAVE_PS2PDF=no +PAM_MODULEDIR= ${VIEWBASE}/lib/security +MAKE_ENV+= PAM_MODULEDIR="${PAM_MODULEDIR}" + .include "../../mk/bsd.prefs.mk" .if ${USE_LIBCRACK} == YES -.include "../../security/libcrack/buildlink2.mk" +. include "../../security/libcrack/buildlink3.mk" CONFIGURE_ARGS+= --with-libcrack PLIST_SUBST+= USE_LIBCRACK= .else @@ -63,7 +68,7 @@ PLIST_SUBST+= PAM_LIMITS= PLIST_SUBST+= PAM_LIMITS="@comment " .endif -CONF_FILES= ${EGDIR}/pam.conf ${PKG_SYSCONFBASE}/pam.conf +CONF_FILES= ${EGDIR}/pam.conf ${PKG_SYSCONFBASEDIR}/pam.conf .for FILE in ${CFILES} CONF_FILES+= ${EGDIR}/${FILE} ${PKG_SYSCONFDIR}/${FILE} .endfor @@ -86,5 +91,5 @@ post-install: .endif ${INSTALL_DATA_DIR} ${DOCDIR} -.include "../../databases/db/buildlink2.mk" +.include "../../databases/db/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/PAM/distinfo b/security/PAM/distinfo index d1c07ca7c71..752c9e7f3ed 100644 --- a/security/PAM/distinfo +++ b/security/PAM/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.8 2003/05/16 17:30:58 wiz Exp $ +$NetBSD: distinfo,v 1.9 2004/01/08 00:07:26 jlam Exp $ SHA1 (Linux-PAM-0.77.tar.gz) = 58dff29aec3c0b6a9e9b53af6fb643056ce0f304 Size (Linux-PAM-0.77.tar.gz) = 442569 bytes SHA1 (patch-aa) = 99f4889c24ff71a9e40e0e913d6071b78a326877 SHA1 (patch-ab) = c0257ace9538c4cf623a476e602eac30d42301d6 SHA1 (patch-ac) = 9153b5aa54c68dc07deb6325a9ea03dbc28e1624 -SHA1 (patch-ad) = b3713e7150ecfa5dce47680b03c455317f1596de +SHA1 (patch-ad) = 2f4a7f03d60a160ab89d772708c1b612e6c0dabf SHA1 (patch-ae) = 8cdf38fddfb3e30a2bd220f3c2a83cec26918a2b SHA1 (patch-af) = 966d42796a99d38dfa9bbdefb3daf7c48122fc88 SHA1 (patch-ag) = f7673f80592466e1cdeb22645a620aaa3602903d diff --git a/security/PAM/patches/patch-ad b/security/PAM/patches/patch-ad index 5e8986285d9..77377e93698 100644 --- a/security/PAM/patches/patch-ad +++ b/security/PAM/patches/patch-ad @@ -1,8 +1,17 @@ -$NetBSD: patch-ad,v 1.3 2002/12/23 21:23:58 jlam Exp $ +$NetBSD: patch-ad,v 1.4 2004/01/08 00:07:26 jlam Exp $ --- libpam/Makefile.orig Sun Dec 9 16:44:58 2001 -+++ libpam/Makefile -@@ -125,8 +125,9 @@ ifeq ($(DYNAMIC_LIBPAM),yes) ++++ libpam/Makefile Thu Sep 11 19:50:44 2003 +@@ -6,7 +6,7 @@ + include ../Make.Rules + + # need to tell libpam about the default directory for PAMs +-MOREFLAGS=-D"DEFAULT_MODULE_PATH=\"$(SECUREDIR)/\"" ++MOREFLAGS=-D"DEFAULT_MODULE_PATH=\"$(PAM_MODULEDIR)/\"" + + ifeq ($(WITH_LIBDEBUG),yes) + LIBNAME=libpamd +@@ -125,8 +125,9 @@ $(INSTALL) -m $(SHLIBMODE) $(LIBPAM) $(FAKEROOT)$(libdir)/$(LIBPAMFULL) $(LDCONFIG) ifneq ($(DYNTYPE),"sl") |