[pkgsrc/trunk]: pkgsrc/security/PAM bl3ify

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7a69e926113f
branches:  trunk
changeset: 465899:7a69e926113f
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Thu Jan 08 00:07:26 2004 +0000

description:
bl3ify

diffstat:

 security/PAM/Makefile         |  15 ++++++++++-----
 security/PAM/distinfo         |   4 ++--
 security/PAM/patches/patch-ad |  15 ++++++++++++---
 3 files changed, 24 insertions(+), 10 deletions(-)

diffs (92 lines):

diff -r bf69ce00f8f0 -r 7a69e926113f security/PAM/Makefile
--- a/security/PAM/Makefile     Wed Jan 07 23:10:17 2004 +0000
+++ b/security/PAM/Makefile     Thu Jan 08 00:07:26 2004 +0000
@@ -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 @@
 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_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="@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 @@
 .endif
        ${INSTALL_DATA_DIR} ${DOCDIR}
 
-.include "../../databases/db/buildlink2.mk"
+.include "../../databases/db/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r bf69ce00f8f0 -r 7a69e926113f security/PAM/distinfo
--- a/security/PAM/distinfo     Wed Jan 07 23:10:17 2004 +0000
+++ b/security/PAM/distinfo     Thu Jan 08 00:07:26 2004 +0000
@@ -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 -r bf69ce00f8f0 -r 7a69e926113f security/PAM/patches/patch-ad
--- a/security/PAM/patches/patch-ad     Wed Jan 07 23:10:17 2004 +0000
+++ b/security/PAM/patches/patch-ad     Thu Jan 08 00:07:26 2004 +0000
@@ -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")