diff options
| author | jlam <jlam@pkgsrc.org> | 2002-01-29 17:10:10 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2002-01-29 17:10:10 +0000 |
| commit | 17018c8489f0df4626f5b4a684fdb3c43f0de293 (patch) | |
| tree | e12c78421b0706b31803e0bad945711b4562c556 /security/PAM | |
| parent | cebe44bdd812fecc14652c0841a69619232545a4 (diff) | |
| download | pkgsrc-17018c8489f0df4626f5b4a684fdb3c43f0de293.tar.gz | |
Update security/PAM to 0.75. Note that this release contains backwardly
incompatible changes to libpam.so; prior versions were buggy so upgrading
is highly recommended.
Pkgsrc changes from version 0.72 include:
* Honor ${PKG_SYSCONFDIR}: the config files are now found in /etc/pam.conf
and /etc/pam/*.conf, or in the appropriate ${PKG_SYSCONFBASE} directory.
* Convert to use the general INSTALL/DEINSTALL scripts.
Changes from version 0.72 include:
* bug fixes to almost every PAM module
* pam_pwdb replaced with pam_unix
* fixed a small security hole (more of a user confusion issue) with
the unix and pwdb password helper binaries.
* improved handling of the setcred/close_session and update chauthtok
stack. *Warning* This is a backwardly incompatible change, but 'more
sane' than before. (Bug 129775 - agmorgan)
* added support for '/' symbols in pam_time and pam_group config files
(support for modern terminal devices). Fixed infinite loop problem
with '\\[^\n]' in these files.
* added accessconf=<filename> feature to pam_access
Diffstat (limited to 'security/PAM')
38 files changed, 515 insertions, 595 deletions
diff --git a/security/PAM/DESCR b/security/PAM/DESCR index 7f0d705a2a3..02c857c5151 100644 --- a/security/PAM/DESCR +++ b/security/PAM/DESCR @@ -1,4 +1,4 @@ - PAM provides a way to develop programs that are independent of +PAM provides a way to develop programs that are independent of authentication scheme. These programs need "authentication modules" to be attatched to them at run-time in order to work. Which authentication module is to be attatched is dependent upon the local system setup and is at the diff --git a/security/PAM/Makefile b/security/PAM/Makefile index e6adf9d770a..da46b4eaa32 100644 --- a/security/PAM/Makefile +++ b/security/PAM/Makefile @@ -1,77 +1,61 @@ -# $NetBSD: Makefile,v 1.7 2001/09/27 23:18:37 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2002/01/29 17:10:10 jlam Exp $ # DISTNAME= Linux-${PKGNAME} -PKGNAME= PAM-0.72 +PKGNAME= PAM-0.75 CATEGORIES= security -MASTER_SITES= ftp://ftp.kernel.org/pub/linux/libs/pam/pre/library/ +MASTER_SITES= http://www.kernel.org/pub/linux/libs/pam/pre/library/ \ + ftp://ftp.kernel.org/pub/linux/libs/pam/pre/library/ MAINTAINER= rh@netbsd.org HOMEPAGE= http://www.kernel.org/pub/linux/libs/pam/ COMMENT= Pluggable Authentication Modules -BUILD_DEPENDS+= bison-[0-9]*:../../devel/bison +USE_BUILDLINK_ONLY= yes +USE_GMAKE= yes -USE_GMAKE= YES -USE_BUILDLINK_ONLY= YES +GNU_CONFIGURE= yes +CONFIGURE_ARGS+= --enable-includedir=${PREFIX}/include +CONFIGURE_ARGS+= --enable-sconfigdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --enable-static-libpam -.include "../../security/libcrack/buildlink.mk" +CFLAGS+= -DHAVE_UTMP_H=1 +MAKE_FLAGS+= OS_CFLAGS="${CFLAGS}" -MAKE_ENV+= LOWER_OPSYS="${LOWER_OPSYS}" -MAKE_ENV+= MACHINE_GNU_ARCH="${MACHINE_GNU_ARCH}" -MAKE_ENV+= MKDIR="${MKDIR}" -MAKE_ENV+= ARPRG="${AR}" -MAKE_ENV+= RANLIB="${RANLIB}" -MAKE_ENV+= BSD_INSTALL="${INSTALL}" -MAKE_ENV+= CONFIGED="${PREFIX}/etc" -MAKE_ENV+= CONFD="${PREFIX}/etc" +PKG_SYSCONFSUBDIR?= pam +EGDIR= ${PREFIX}/share/examples/${PKGBASE} +DOCDIR= ${PREFIX}/share/doc/${PKGBASE} +HTMLDIR= ${PREFIX}/share/doc/html/${PKGBASE} -do-configure: - cd ${WRKSRC} && ${TOUCH} .quiet_install && \ - for i in `${FIND} . -type f` ; do \ - if ${GREP} -q '\/etc\/' $$i ; then \ - ${CP} $$i $$i.old && \ - ${SED} < $$i.old > $$i \ - -e 's:/etc/security:${PREFIX}/etc/pam:g' \ - -e 's:/etc/pam:${PREFIX}/etc/pam:g' && \ - ${RM} $$i.old ; \ - fi ; \ - if ${GREP} -q 'bash' $$i ; then \ - ${CP} $$i $$i.old && \ - ${SED} < $$i.old > $$i \ - -e 's:bash:sh:g' && \ - ${RM} $$i.old ; \ - fi ; \ - done +CFILES= access.conf pam_env.conf group.conf time.conf +CONF_FILES= ${EGDIR}/pam.conf ${PKG_SYSCONFBASE}/pam.conf +.for FILE in ${CFILES} +CONF_FILES+= ${EGDIR}/${FILE} ${PKG_SYSCONFDIR}/${FILE} +.endfor -# for OBJECT_FMT -.include "../../mk/bsd.prefs.mk" +post-extract: + cd ${WRKSRC}/doc; \ + if [ -f ${DISTNAME}-docs.tar.gz ]; then \ + ${GZCAT} ${DISTNAME}-docs.tar.gz | ${GTAR} -xf -; \ + fi post-install: - for doc in ${WRKSRC}/doc/man/*.3 ; do \ - ${INSTALL_MAN} $$doc ${PREFIX}/man/man3 ; \ - done - for doc in ${WRKSRC}/doc/man/*.8 ; do \ - ${INSTALL_MAN} $$doc ${PREFIX}/man/man8 ; \ + ${INSTALL_DATA_DIR} ${EGDIR} + ${INSTALL_DATA} ${WRKSRC}/conf/pam.conf ${EGDIR} + ${INSTALL_DATA} ${WRKSRC}/modules/pam_access/access.conf ${EGDIR} + ${INSTALL_DATA} ${WRKSRC}/modules/pam_env/pam_env.conf-example \ + ${EGDIR}/pam_env.conf + ${INSTALL_DATA} ${WRKSRC}/modules/pam_group/group.conf ${EGDIR} + ${INSTALL_DATA} ${WRKSRC}/modules/pam_time/time.conf ${EGDIR} + ${INSTALL_DATA_DIR} ${DOCDIR} + cd ${WRKSRC}/doc; for file in modules/*.sgml; do \ + ${INSTALL_DATA} $${file} ${DOCDIR}; \ done - ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/PAM/modules - ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/PAM/sgml - for doc in ${WRKSRC}/doc/modules/* ; do \ - ${INSTALL_DATA} $$doc ${PREFIX}/share/doc/PAM/modules ; \ + ${INSTALL_DATA_DIR} ${HTMLDIR} + cd ${WRKSRC}/doc; for file in html/*.html; do \ + ${INSTALL_DATA} $${file} ${HTMLDIR}; \ done - ${INSTALL_DATA} ${WRKSRC}/doc/figs/pam_orient.txt \ - ${PREFIX}/share/doc/PAM -.for doc in draft-morgan-pam.raw rfc86.0.txt - ${INSTALL_DATA} ${WRKSRC}/doc/specs/${doc} ${PREFIX}/share/doc/PAM -.endfor -.for doc in appl modules source - ${INSTALL_DATA} ${WRKSRC}/doc/pam_${doc}.sgml \ - ${PREFIX}/share/doc/PAM/sgml -.endfor -.if (${OBJECT_FMT} == "ELF") - ${LN} -fs ${PREFIX}/lib/libpam.so.0.72 ${PREFIX}/lib/libpam.so.0 - ${LN} -fs ${PREFIX}/lib/libpam_misc.so.0.72 ${PREFIX}/lib/libpam_misc.so.0 - ${LN} -fs ${PREFIX}/lib/libpamc.so.0.72 ${PREFIX}/lib/libpamc.so.0 -.endif +.include "../../security/libcrack/buildlink.mk" +.include "../../mk/bsd.pkg.install.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/PAM/PLIST b/security/PAM/PLIST index 822fb095adb..8e6ccc40fe9 100644 --- a/security/PAM/PLIST +++ b/security/PAM/PLIST @@ -1,9 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:16:27 zuntum Exp $ -etc/pam.conf -etc/pam/access.conf -etc/pam/group.conf -etc/pam/pam_env.conf -etc/pam/time.conf +include/security/_pam_aconf.h include/security/_pam_compat.h include/security/_pam_macros.h include/security/_pam_types.h @@ -15,15 +10,15 @@ include/security/pam_modules.h lib/libpam.a lib/libpam.so lib/libpam.so.0 -lib/libpam.so.0.72 +lib/libpam.so.0.75 lib/libpam_misc.a lib/libpam_misc.so lib/libpam_misc.so.0 -lib/libpam_misc.so.0.72 +lib/libpam_misc.so.0.75 lib/libpamc.a lib/libpamc.so lib/libpamc.so.0 -lib/libpamc.so.0.72 +lib/libpamc.so.0.75 lib/security/pam_access.so lib/security/pam_cracklib.so lib/security/pam_deny.so @@ -68,46 +63,85 @@ man/man8/pam.conf.8 man/man8/pam.d.8 sbin/pam_filter/upperLOWER sbin/unix_chkpwd -share/doc/PAM/draft-morgan-pam.raw -share/doc/PAM/modules/README -share/doc/PAM/modules/module.sgml-template -share/doc/PAM/modules/pam_access.sgml -share/doc/PAM/modules/pam_chroot.sgml -share/doc/PAM/modules/pam_cracklib.sgml -share/doc/PAM/modules/pam_deny.sgml -share/doc/PAM/modules/pam_env.sgml -share/doc/PAM/modules/pam_filter.sgml -share/doc/PAM/modules/pam_ftp.sgml -share/doc/PAM/modules/pam_group.sgml -share/doc/PAM/modules/pam_issue.sgml -share/doc/PAM/modules/pam_krb4.sgml -share/doc/PAM/modules/pam_lastlog.sgml -share/doc/PAM/modules/pam_limits.sgml -share/doc/PAM/modules/pam_listfile.sgml -share/doc/PAM/modules/pam_mail.sgml -share/doc/PAM/modules/pam_mkhomedir.sgml -share/doc/PAM/modules/pam_motd.sgml -share/doc/PAM/modules/pam_nologin.sgml -share/doc/PAM/modules/pam_permit.sgml -share/doc/PAM/modules/pam_pwdb.sgml -share/doc/PAM/modules/pam_radius.sgml -share/doc/PAM/modules/pam_rhosts.sgml -share/doc/PAM/modules/pam_rootok.sgml -share/doc/PAM/modules/pam_securetty.sgml -share/doc/PAM/modules/pam_time.sgml -share/doc/PAM/modules/pam_unix.sgml -share/doc/PAM/modules/pam_userdb.sgml -share/doc/PAM/modules/pam_warn.sgml -share/doc/PAM/modules/pam_wheel.sgml -share/doc/PAM/pam_orient.txt -share/doc/PAM/rfc86.0.txt -share/doc/PAM/sgml/pam_appl.sgml -share/doc/PAM/sgml/pam_modules.sgml -share/doc/PAM/sgml/pam_source.sgml -@dirrm share/doc/PAM/sgml -@dirrm share/doc/PAM/modules -@dirrm share/doc/PAM +share/doc/${PKGBASE}/pam_access.sgml +share/doc/${PKGBASE}/pam_chroot.sgml +share/doc/${PKGBASE}/pam_cracklib.sgml +share/doc/${PKGBASE}/pam_deny.sgml +share/doc/${PKGBASE}/pam_env.sgml +share/doc/${PKGBASE}/pam_filter.sgml +share/doc/${PKGBASE}/pam_ftp.sgml +share/doc/${PKGBASE}/pam_group.sgml +share/doc/${PKGBASE}/pam_issue.sgml +share/doc/${PKGBASE}/pam_krb4.sgml +share/doc/${PKGBASE}/pam_lastlog.sgml +share/doc/${PKGBASE}/pam_limits.sgml +share/doc/${PKGBASE}/pam_listfile.sgml +share/doc/${PKGBASE}/pam_mail.sgml +share/doc/${PKGBASE}/pam_mkhomedir.sgml +share/doc/${PKGBASE}/pam_motd.sgml +share/doc/${PKGBASE}/pam_nologin.sgml +share/doc/${PKGBASE}/pam_permit.sgml +share/doc/${PKGBASE}/pam_pwdb.sgml +share/doc/${PKGBASE}/pam_radius.sgml +share/doc/${PKGBASE}/pam_rhosts.sgml +share/doc/${PKGBASE}/pam_rootok.sgml +share/doc/${PKGBASE}/pam_securetty.sgml +share/doc/${PKGBASE}/pam_tally.sgml +share/doc/${PKGBASE}/pam_time.sgml +share/doc/${PKGBASE}/pam_unix.sgml +share/doc/${PKGBASE}/pam_userdb.sgml +share/doc/${PKGBASE}/pam_warn.sgml +share/doc/${PKGBASE}/pam_wheel.sgml +share/doc/html/${PKGBASE}/index.html +share/doc/html/${PKGBASE}/pam-1.html +share/doc/html/${PKGBASE}/pam-10.html +share/doc/html/${PKGBASE}/pam-11.html +share/doc/html/${PKGBASE}/pam-12.html +share/doc/html/${PKGBASE}/pam-2.html +share/doc/html/${PKGBASE}/pam-3.html +share/doc/html/${PKGBASE}/pam-4.html +share/doc/html/${PKGBASE}/pam-5.html +share/doc/html/${PKGBASE}/pam-6.html +share/doc/html/${PKGBASE}/pam-7.html +share/doc/html/${PKGBASE}/pam-8.html +share/doc/html/${PKGBASE}/pam-9.html +share/doc/html/${PKGBASE}/pam.html +share/doc/html/${PKGBASE}/pam_appl-1.html +share/doc/html/${PKGBASE}/pam_appl-10.html +share/doc/html/${PKGBASE}/pam_appl-11.html +share/doc/html/${PKGBASE}/pam_appl-12.html +share/doc/html/${PKGBASE}/pam_appl-13.html +share/doc/html/${PKGBASE}/pam_appl-14.html +share/doc/html/${PKGBASE}/pam_appl-2.html +share/doc/html/${PKGBASE}/pam_appl-3.html +share/doc/html/${PKGBASE}/pam_appl-4.html +share/doc/html/${PKGBASE}/pam_appl-5.html +share/doc/html/${PKGBASE}/pam_appl-6.html +share/doc/html/${PKGBASE}/pam_appl-7.html +share/doc/html/${PKGBASE}/pam_appl-8.html +share/doc/html/${PKGBASE}/pam_appl-9.html +share/doc/html/${PKGBASE}/pam_appl.html +share/doc/html/${PKGBASE}/pam_modules-1.html +share/doc/html/${PKGBASE}/pam_modules-10.html +share/doc/html/${PKGBASE}/pam_modules-11.html +share/doc/html/${PKGBASE}/pam_modules-12.html +share/doc/html/${PKGBASE}/pam_modules-2.html +share/doc/html/${PKGBASE}/pam_modules-3.html +share/doc/html/${PKGBASE}/pam_modules-4.html +share/doc/html/${PKGBASE}/pam_modules-5.html +share/doc/html/${PKGBASE}/pam_modules-6.html +share/doc/html/${PKGBASE}/pam_modules-7.html +share/doc/html/${PKGBASE}/pam_modules-8.html +share/doc/html/${PKGBASE}/pam_modules-9.html +share/doc/html/${PKGBASE}/pam_modules.html +share/examples/${PKGBASE}/access.conf +share/examples/${PKGBASE}/group.conf +share/examples/${PKGBASE}/pam.conf +share/examples/${PKGBASE}/pam_env.conf +share/examples/${PKGBASE}/time.conf +@dirrm share/examples/${PKGBASE} +@dirrm share/doc/html/${PKGBASE} +@dirrm share/doc/${PKGBASE} @dirrm sbin/pam_filter @dirrm lib/security @dirrm include/security -@dirrm etc/pam diff --git a/security/PAM/buildlink.mk b/security/PAM/buildlink.mk index 75c02653ae8..5e5413749e7 100644 --- a/security/PAM/buildlink.mk +++ b/security/PAM/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.10 2001/07/27 13:33:34 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.11 2002/01/29 17:10:10 jlam Exp $ # # This Makefile fragment is included by packages that use libpam. # @@ -17,11 +17,20 @@ PAM_BUILDLINK_MK= # defined .include "../../mk/bsd.buildlink.mk" -BUILDLINK_DEPENDS.pam?= PAM>=0.72 -DEPENDS+= ${BUILDLINK_DEPENDS.pam}:../../security/PAM +BUILDLINK_DEPENDS.pam?= PAM>=0.75 + +.if exists(/usr/include/security/pam_appl.h) +_NEED_PAM= NO +.else +_NEED_PAM= YES +.endif + +.if ${_NEED_PAM} == "YES" +DEPENDS+= ${BUILDLINK_DEPENDS.pam}:../../security/PAM EVAL_PREFIX+= BUILDLINK_PREFIX.pam=PAM BUILDLINK_PREFIX.pam_DEFAULT= ${LOCALBASE} + BUILDLINK_FILES.pam= include/security/* BUILDLINK_FILES.pam+= lib/libpam.* BUILDLINK_FILES.pam+= lib/libpamc.* @@ -30,7 +39,26 @@ BUILDLINK_FILES.pam+= lib/libpam_misc.* BUILDLINK_TARGETS.pam= pam-buildlink BUILDLINK_TARGETS+= ${BUILDLINK_TARGETS.pam} +.else + +# The PAM libraries are usually in /lib on Linux systems while the headers +# are in /usr/include. +# +BUILDLINK_PREFIX.pam-inc= /usr +BUILDLINK_FILES.pam-inc= include/security/* +BUILDLINK_PREFIX.pam-lib= / +BUILDLINK_FILES.pam-lib+= lib/libpam.* +BUILDLINK_FILES.pam-lib+= lib/libpamc.* +BUILDLINK_FILES.pam-lib+= lib/libpam_misc.* + +BUILDLINK_TARGETS.pam= pam-inc-buildlink +BUILDLINK_TARGETS.pam+= pam-lib-buildlink + +.endif + pre-configure: ${BUILDLINK_TARGETS.pam} pam-buildlink: _BUILDLINK_USE +pam-inc-buildlink: _BUILDLINK_USE +pam-lib-buildlink: _BUILDLINK_USE .endif # PAM_BUILDLINK_MK diff --git a/security/PAM/distinfo b/security/PAM/distinfo index b38ff48707f..0d9601e2c70 100644 --- a/security/PAM/distinfo +++ b/security/PAM/distinfo @@ -1,30 +1,23 @@ -$NetBSD: distinfo,v 1.3 2001/06/19 09:20:11 jlam Exp $ +$NetBSD: distinfo,v 1.4 2002/01/29 17:10:10 jlam Exp $ -SHA1 (Linux-PAM-0.72.tar.gz) = cb6433d02bb85af5d8462afec32d987d525484dc -Size (Linux-PAM-0.72.tar.gz) = 395073 bytes -SHA1 (patch-aa) = aee63641f5d4bf22b826f124ef02c6d584675f4d -SHA1 (patch-ab) = cb4c5a214dffbcaacda6a1da500aff3117592400 -SHA1 (patch-ac) = 1c5ca06e502ea8d540e317ca1dd598179648fb4e -SHA1 (patch-ad) = 5b23bca4c833ea326f8cc9b2b3d0cabd23704818 -SHA1 (patch-ae) = c50ebe934e4c12038cdea11948432cb0816f4285 -SHA1 (patch-af) = 5071d16e505e936729f18281a814e69653eb3b84 -SHA1 (patch-ag) = b531062ee6ab8c9aed2155648ffb987a723b7ff6 -SHA1 (patch-ah) = afe82eb4219799aeb0d8fcee75aa5b0b10ef2a5c -SHA1 (patch-ai) = 7ed530b0d9beb6f9a720d66393bb00502d9285cf -SHA1 (patch-aj) = e7b56a0eeed6906daf2eaabe7e8aceda486136a0 -SHA1 (patch-ak) = e60019fbb66c047da23a1dcaf330de9086cfc1c8 -SHA1 (patch-al) = 705dc4483890e6d0c35ed4728e88b11ce909164f -SHA1 (patch-am) = 6de619faab8d7177d7ef57924681134e7262a8a9 -SHA1 (patch-an) = e27b1a0887bcd37568c445207930e4518d9ea844 -SHA1 (patch-ao) = 34835092260539faedfa6de3cf6d4f39c76c142c -SHA1 (patch-ap) = 4c33633e957a2020f6d8f3fef2362b8cd594dc1c -SHA1 (patch-aq) = b1f2ce9662759af7c05ec7054d441a2e7352c3a9 -SHA1 (patch-ar) = 57bdfddf5bd070ccfdd093f926eabc11ad1d1503 -SHA1 (patch-as) = 4fe20503e1755817e5d0c11c8bd5d062b05911f9 -SHA1 (patch-at) = 61eb909bbe7d461b4b67ac595610c6bcd5f7560c -SHA1 (patch-au) = 64193ba7d99d478658389c161d5f3ef7392e4212 -SHA1 (patch-av) = f494aa2d955e14d044da683751a7ad81d81a0d7f -SHA1 (patch-aw) = 7d87c9aed54c2fa6c0d679b69693a9ff3eb40b43 -SHA1 (patch-ax) = 890228a991fd2dc795bee6d9d5f473912e905986 -SHA1 (patch-ay) = 8e669dbe2ed5bdf5f2ced08a33311b4b2a76283b -SHA1 (patch-az) = 834747c94dcd27a30ae3ef8be2bbd5ae0031bfbc +SHA1 (Linux-PAM-0.75.tar.gz) = 5151e9f91e69c199988d1397a90d07b0c459896b +Size (Linux-PAM-0.75.tar.gz) = 874549 bytes +SHA1 (patch-aa) = 6d10ac69ffead0d4d78adb58081920d68922034a +SHA1 (patch-ac) = a1816f6d42fdd168c6e689a976cc4d27f72c3d32 +SHA1 (patch-aj) = cd8f889540d8d8794c7ea7d1e252d984509a9ad0 +SHA1 (patch-al) = 3a49be8ca4dcf47e2ba78107455d59c6cfa34889 +SHA1 (patch-an) = fdb8337a06abdfaf020639dec95df68b2a59496a +SHA1 (patch-ao) = c1fcc3ae3a8d9239dd06a5cf30f5bb52743770de +SHA1 (patch-ap) = 150bb938c25150a3913520401ec29b6797ede7e8 +SHA1 (patch-ar) = 1f904ee50c7710bd599ee4bed60a8eb5aa90986a +SHA1 (patch-au) = f339c50f765f8f86a00a6403e276719b035d7745 +SHA1 (patch-av) = d6b89d9d6c434c48fe54e556d150c7ff9ac7288c +SHA1 (patch-aw) = b4ee852cc4c13b668b5a613668f91c3a6a95b450 +SHA1 (patch-az) = b0caa87c0aeb131c941eeb6a994042ea7742afa4 +SHA1 (patch-ba) = c4dbd3af959222c990f3cd23af2861ec7f3b0701 +SHA1 (patch-bb) = 68e2149c0f1f8186199bfc3690feeb0e3394036c +SHA1 (patch-bc) = bcb321fa850b17ff7a7dc179c029ab33811cfe56 +SHA1 (patch-bd) = c42a7c8cc3a06648d07e0d1fa5a369e9a8224a75 +SHA1 (patch-be) = 80a993a93e1d786bc3c297227c128de084eba746 +SHA1 (patch-bf) = a5846710b69f36a02b585727abd7ecb22ecc9c81 +SHA1 (patch-bg) = 7f78998a103c344682c8f1d889162a4e219145c1 diff --git a/security/PAM/patches/patch-aa b/security/PAM/patches/patch-aa index 19b5b7139d5..d5ae2bb418f 100644 --- a/security/PAM/patches/patch-aa +++ b/security/PAM/patches/patch-aa @@ -1,88 +1,29 @@ -$NetBSD: patch-aa,v 1.2 2001/06/19 09:20:11 jlam Exp $ +$NetBSD: patch-aa,v 1.3 2002/01/29 17:10:10 jlam Exp $ ---- Makefile.orig Mon Nov 22 04:02:36 1999 +--- Makefile.orig Sat Jan 20 17:29:47 2001 +++ Makefile -@@ -31,8 +31,8 @@ - #STATIC=-DPAM_STATIC - - # Comment out these lines to disable building dynamic/static libpam.* --DYNAMIC_LIBPAM=yes --#STATIC_LIBPAM=yes -+DYNAMIC_LIBPAM?=yes -+STATIC_LIBPAM?=yes - - # All combinations of the above four variable definitions are legal, - # however, not defining either dynamic or static modules and yet -@@ -43,22 +43,22 @@ - # they control the building of some modules in this distribution - # Note, these definitions are all "export"ed below... - --HAVE_PWDBLIB=yes -+HAVE_PWDBLIB=no - HAVE_CRACKLIB=yes - HAVE_AFSLIBS=no --HAVE_KRBLIBS=no -+HAVE_KRBLIBS=yes - - # NB. The following is the generic defines for compilation. - # They can be overridden in the default.defs file below - # --WARNINGS = -ansi -D_POSIX_SOURCE -Wall -Wwrite-strings \ -+WARNINGS = -ansi -Wall -Wwrite-strings \ - -Wpointer-arith -Wcast-qual -Wcast-align \ - -Wtraditional -Wstrict-prototypes -Wmissing-prototypes \ - -Wnested-externs -Winline -Wshadow -pedantic - PIC=-fPIC - - # Mode to install shared libraries with --SHLIBMODE=755 -+SHLIBMODE=444 - - # - # Conditional defines.. -@@ -66,7 +66,7 @@ - - ifdef DYNAMIC - # need the dynamic library functions --LIBDL=-l$(DYNLOAD) -+LIBDL= - ifdef STATIC_LIBPAM - # needed because pam_xxx() fn's are now in statically linked library - RDYNAMIC = -rdynamic -@@ -98,15 +98,15 @@ - - # the sub-directories to make things in - --DIRS = modules libpam conf libpam_misc libpamc examples -+DIRS = libpam modules conf libpam_misc libpamc examples - - # - # basic defines - # - --INCLUDEDIR=-I$(shell pwd)/include --PAMLIB=-L$(shell pwd)/libpam --PAMMISCLIB=-L$(shell pwd)/libpam_misc -+INCLUDEDIR=-I$(shell pwd)/include -I${BUILDLINK_DIR}/include/cracklib -+PAMLIB=-L$(shell pwd)/libpam -Wl,-R${PREFIX}/lib -L${BUILDLINK_DIR}/lib -+PAMMISCLIB=-L$(shell pwd)/libpam_misc -Wl,-R${PREFIX}/lib -L${BUILDLINK_DIR}/lib - ifeq ($(DEBUG_REL),yes) - PAMLIB += -lpamd - PAMMISCLIB += -lpamd_misc -@@ -121,6 +121,7 @@ - # only that you are compiling the "Linux" (read FREE) implementation - # of Pluggable Authentication Modules. - EXTRAS += -DLINUX_PAM -+EXTRAS += -DHAVE_UTMP_H - - # - # build composite defines -@@ -209,7 +210,7 @@ - ## the rules - ## - --all: .freezemake headers -+all: headers - - @for i in $(DIRS) ; do \ - $(MAKE) -C $$i all ; \ +@@ -58,20 +58,20 @@ + install: _pam_aconf.h prep + $(MKDIR) $(FAKEROOT)$(INCLUDED) + $(INSTALL) -m 444 security/_pam_aconf.h $(FAKEROOT)$(INCLUDED) +- for x in $(THINGSTOMAKE) ; do make -C $$x install ; done ++ for x in $(THINGSTOMAKE) ; do $(MAKE) -C $$x install ; done + + remove: + rm -f $(FAKEROOT)$(INCLUDED)/_pam_aconf.h +- for x in $(THINGSTOMAKE) ; do make -C $$x remove ; done ++ for x in $(THINGSTOMAKE) ; do $(MAKE) -C $$x remove ; done + + release: +- @if [ ! -f Make.Rules ]; then echo make Make.Rules first ; exit 1; fi ++ @if [ ! -f Make.Rules ]; then echo $(MAKE) Make.Rules first ; exit 1; fi + @if [ ! -L ../$(DISTNAME)-$(MAJOR_REL).$(MINOR_REL) ]; then \ + echo generating ../$(DISTNAME)-$(MAJOR_REL).$(MINOR_REL) link ; \ + ln -sf $(DISTNAME) ../$(DISTNAME)-$(MAJOR_REL).$(MINOR_REL) ; \ + echo to ../$(DISTNAME) . ; fi + @diff ../$(DISTNAME)-$(MAJOR_REL).$(MINOR_REL)/Make.Rules Make.Rules +- make distclean ++ $(MAKE) distclean + cd .. ; tar zvfc $(DISTNAME)-$(MAJOR_REL).$(MINOR_REL).tar.gz \ + --exclude CVS --exclude .cvsignore --exclude '.#*' \ + $(DISTNAME)-$(MAJOR_REL).$(MINOR_REL)/* diff --git a/security/PAM/patches/patch-ab b/security/PAM/patches/patch-ab deleted file mode 100644 index c9c2a7106d7..00000000000 --- a/security/PAM/patches/patch-ab +++ /dev/null @@ -1,59 +0,0 @@ -$NetBSD: patch-ab,v 1.1.1.1 2000/10/21 18:41:54 rh Exp $ - ---- default.defs.orig Thu Jul 8 07:01:39 1999 -+++ default.defs -@@ -1,36 +1,20 @@ --## --# defs for Red Hat Linux --# Michael K. Johnson <johnsonm@redhat.com> --## --# this file indicates the compiler and the various hardware/OS dependent --# flags for installation. It also defines the various destinations of --# installed files on the system. --# --# This file is the version used for Red Hat Linux. -- --OS=linux --ARCH=$(shell rpm --showrc | grep '^build arch' | sed 's/^.*: //g') --CC=gcc --INSTALL=install --MKDIR=mkdir -p --CFLAGS=$(RPM_OPT_FLAGS) -pipe -g --ULIBS=#-lefence --LD=ld --LD_D=gcc -shared -Xlinker -x --LD_L=$(LD) -x -shared -+OS=${LOWER_OPSYS} -+ARCH=${MACHINE_GNU_ARCH} -+INSTALL=${BSD_INSTALL} -+WARNINGS= -+ULIBS= -+LD_L=${LD} -G -+LD_D=${LD_L} -+RDYNAMIC= - USESONAME=yes --SOSWITCH=-soname --LINKLIBS=-lc -+SOSWITCH=-h - NEEDSONAME=no --LDCONFIG=/sbin/ldconfig --AR=ar -cr --RANLIB=ranlib --FAKEROOT=$(RPM_BUILD_ROOT) --PREFIX= --SUPLEMENTED=$(PREFIX)/sbin --LIBDIR=$(PREFIX)/lib --SECUREDIR=$(LIBDIR)/security --INCLUDED=/usr/include/security --CONFIGED=/etc --SCONFIGED=/etc/security --EXTRALS=-lcrypt -+LDCONFIG=echo -+AR=${ARPRG} -cr -+FAKEROOT= -+SUPLEMENTED=${PREFIX}/sbin -+LIBDIR=${PREFIX}/lib -+SECUREDIR=${LIBDIR}/security -+INCLUDED=${PREFIX}/include/security -+CONFIGED=${PREFIX}/etc -+SCONFIGED=${CONFIGED}/pam diff --git a/security/PAM/patches/patch-ac b/security/PAM/patches/patch-ac index 40b2111e579..f90b376e9cc 100644 --- a/security/PAM/patches/patch-ac +++ b/security/PAM/patches/patch-ac @@ -1,22 +1,13 @@ -$NetBSD: patch-ac,v 1.1.1.1 2000/10/21 18:41:54 rh Exp $ +$NetBSD: patch-ac,v 1.2 2002/01/29 17:10:10 jlam Exp $ ---- modules/pam_access/Makefile.orig Sat Oct 21 15:23:02 2000 +--- modules/pam_access/Makefile.orig Mon Jan 28 17:28:23 2002 +++ modules/pam_access/Makefile -@@ -6,7 +6,7 @@ - # +@@ -14,8 +14,4 @@ + DEFS=-DDEFAULT_CONF_FILE=\"$(INSTALLED_CONFILE)\" + CFLAGS += $(DEFS) - TITLE=pam_access --CONFD=$(CONFIGED)/security -+CONFD=$(CONFIGED)/pam - export CONFD - CONFILE=$(CONFD)/access.conf - export CONFILE -@@ -17,7 +17,7 @@ - export DYNAMIC=-DPAM_DYNAMIC - export CC=gcc - export CFLAGS=-O2 -Dlinux -DLINUX_PAM \ -- -ansi -D_POSIX_SOURCE -Wall -Wwrite-strings \ -+ -ansi -Wall -Wwrite-strings \ - -Wpointer-arith -Wcast-qual -Wcast-align -Wtraditional \ - -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Winline \ - -Wshadow -pedantic -fPIC +-MODULE_SIMPLE_INSTALL=bash -f ../install_conf "$(FAKEROOT)" "$(SCONFIGD)" "$(INSTALLED_CONFILE)" "$(TITLE)" "$(LOCAL_CONFILE)" +-MODULE_SIMPLE_REMOVE=rm -f $(FAKEROOT)$(INSTALLED_CONFILE) +-MODULE_SIMPLE_CLEAN=rm -f ./.ignore_age +- + include ../Simple.Rules diff --git a/security/PAM/patches/patch-ad b/security/PAM/patches/patch-ad deleted file mode 100644 index d46c45741ef..00000000000 --- a/security/PAM/patches/patch-ad +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ad,v 1.1.1.1 2000/10/21 18:41:54 rh Exp $ - ---- modules/pam_deny/Makefile.orig Sun Jul 12 07:17:16 1998 -+++ modules/pam_deny/Makefile -@@ -40,7 +40,7 @@ - export DYNAMIC=-DPAM_DYNAMIC - export CC=gcc - export CFLAGS=-O2 -Dlinux -DLINUX_PAM \ -- -ansi -D_POSIX_SOURCE -Wall -Wwrite-strings \ -+ -ansi -Wall -Wwrite-strings \ - -Wpointer-arith -Wcast-qual -Wcast-align -Wtraditional \ - -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Winline \ - -Wshadow -pedantic -fPIC diff --git a/security/PAM/patches/patch-ae b/security/PAM/patches/patch-ae deleted file mode 100644 index 4f86bacc767..00000000000 --- a/security/PAM/patches/patch-ae +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ae,v 1.1.1.1 2000/10/21 18:41:54 rh Exp $ - ---- modules/pam_lastlog/Makefile.orig Sun Jul 12 07:17:17 1998 -+++ modules/pam_lastlog/Makefile -@@ -26,7 +26,7 @@ - export DYNAMIC=-DPAM_DYNAMIC - export CC=gcc - export CFLAGS=-O2 -Dlinux -DLINUX_PAM \ -- -ansi -D_POSIX_SOURCE -Wall -Wwrite-strings \ -+ -ansi -Wall -Wwrite-strings \ - -Wpointer-arith -Wcast-qual -Wcast-align -Wtraditional \ - -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Winline \ - -Wshadow -pedantic -fPIC diff --git a/security/PAM/patches/patch-af b/security/PAM/patches/patch-af deleted file mode 100644 index ea6df5b8511..00000000000 --- a/security/PAM/patches/patch-af +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-af,v 1.1.1.1 2000/10/21 18:41:54 rh Exp $ - ---- modules/pam_permit/Makefile.orig Sun Jul 12 07:17:16 1998 -+++ modules/pam_permit/Makefile -@@ -40,7 +40,7 @@ - export DYNAMIC=-DPAM_DYNAMIC - export CC=gcc - export CFLAGS=-O2 -Dlinux -DLINUX_PAM \ -- -ansi -D_POSIX_SOURCE -Wall -Wwrite-strings \ -+ -ansi -Wall -Wwrite-strings \ - -Wpointer-arith -Wcast-qual -Wcast-align -Wtraditional \ - -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Winline \ - -Wshadow -pedantic -fPIC diff --git a/security/PAM/patches/patch-ag b/security/PAM/patches/patch-ag deleted file mode 100644 index 4e827255280..00000000000 --- a/security/PAM/patches/patch-ag +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ag,v 1.1.1.1 2000/10/21 18:41:54 rh Exp $ - ---- modules/pam_pwdb/Makefile.orig Sun Aug 1 18:18:27 1999 -+++ modules/pam_pwdb/Makefile -@@ -16,7 +16,7 @@ - export DYNAMIC=-DPAM_DYNAMIC - export CC=gcc - export CFLAGS=-O2 -Dlinux -DLINUX_PAM \ -- -ansi -D_POSIX_SOURCE -Wall -Wwrite-strings \ -+ -ansi -Wall -Wwrite-strings \ - -Wpointer-arith -Wcast-qual -Wcast-align -Wtraditional \ - -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Winline \ - -Wshadow -pedantic -fPIC diff --git a/security/PAM/patches/patch-ah b/security/PAM/patches/patch-ah deleted file mode 100644 index 35cffeabb09..00000000000 --- a/security/PAM/patches/patch-ah +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-ah,v 1.2 2001/06/19 09:20:11 jlam Exp $ - ---- modules/pam_cracklib/Makefile.orig Sat Oct 9 07:07:02 1999 -+++ modules/pam_cracklib/Makefile -@@ -22,11 +22,11 @@ - ifeq ($(HAVE_CRACKLIB),yes) - - TITLE=pam_cracklib --CRACKLIB=-lcrack -+CRACKLIB=-R${PREFIX}/lib -L${BUILDLINK_DIR}/lib -lcrack - ifeq ($(shell if [ -f /usr/lib/cracklib_dict.hwm ]; then echo yes ; fi),yes) - CRACKLIB_DICTPATH=/usr/lib/cracklib_dict - else -- CRACKLIB_DICTPATH=/usr/share/dict/cracklib_dict -+ CRACKLIB_DICTPATH=${PREFIX}/libdata/pw_dict - endif - # - ifeq ($(shell if [ -f /usr/include/crypt.h ]; then echo yes ; fi),yes) diff --git a/security/PAM/patches/patch-ai b/security/PAM/patches/patch-ai deleted file mode 100644 index c0067222dc1..00000000000 --- a/security/PAM/patches/patch-ai +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ai,v 1.1.1.1 2000/10/21 18:41:54 rh Exp $ - ---- modules/pam_env/pam_env.c.orig Sat Oct 21 11:37:33 2000 -+++ modules/pam_env/pam_env.c -@@ -18,7 +18,10 @@ - #define _GNU_SOURCE - #define _BSD_SOURCE - -+#include <sys/param.h> -+#if (!defined(BSD) || BSD < 199306) - #include <features.h> -+#endif - #include <ctype.h> - #include <errno.h> - #include <pwd.h> diff --git a/security/PAM/patches/patch-aj b/security/PAM/patches/patch-aj index 5c008c1706b..573b2c75b66 100644 --- a/security/PAM/patches/patch-aj +++ b/security/PAM/patches/patch-aj @@ -1,37 +1,43 @@ -$NetBSD: patch-aj,v 1.1.1.1 2000/10/21 18:41:54 rh Exp $ +$NetBSD: patch-aj,v 1.2 2002/01/29 17:10:11 jlam Exp $ ---- modules/pam_filter/pam_filter.c.orig Sat Oct 21 11:39:55 2000 +--- modules/pam_filter/pam_filter.c.orig Sun Nov 19 18:54:03 2000 +++ modules/pam_filter/pam_filter.c -@@ -18,13 +18,18 @@ - - #include <stdio.h> - #include <sys/types.h> -+#include <sys/param.h> - #include <sys/wait.h> - #include <sys/time.h> - #include <sys/file.h> +@@ -21,7 +21,7 @@ #include <sys/stat.h> #include <sys/socket.h> #include <sys/ioctl.h> -#include <termio.h> +#include <termios.h> -+ -+#if (defined(BSD) && BSD >= 199306) -+#define termio termios -+#endif #include <signal.h> -@@ -310,7 +315,7 @@ +@@ -278,7 +278,7 @@ + { + int status=-1; + char terminal[TERMINAL_LEN]; +- struct termio stored_mode; /* initial terminal mode settings */ ++ struct termios stored_mode; /* initial terminal mode settings */ + int fd[2], child=0, child2=0, aterminal; - /* this is termio terminal handling... */ + if (filtername == NULL || *filtername != '/') { +@@ -305,28 +305,32 @@ + /* set terminal into raw mode.. remember old mode so that we can + revert to it after the child has quit. */ + +- /* this is termio terminal handling... */ ++ /* this is termios terminal handling... */ - if (ioctl(STDIN_FILENO, TCGETA, (char *) &stored_mode ) < 0) { + if (tcgetattr(STDIN_FILENO, &stored_mode ) < 0) { /* in trouble, so close down */ close(fd[0]); _pam_log(LOG_CRIT, "couldn't copy terminal mode"); -@@ -322,14 +327,18 @@ + return PAM_ABORT; + } else { +- struct termio t_mode = stored_mode; ++ struct termios t_mode = stored_mode; + + t_mode.c_iflag = 0; /* no input control */ t_mode.c_oflag &= ~OPOST; /* no ouput post processing */ /* no signals, canonical input, echoing, upper/lower output */ @@ -47,11 +53,11 @@ $NetBSD: patch-aj,v 1.1.1.1 2000/10/21 18:41:54 rh Exp $ t_mode.c_cc[VTIME] = 0; /* 0/10th second for chars */ - if (ioctl(STDIN_FILENO, TCSETA, (char *) &t_mode) < 0) { -+ if (tcsetattr(STDIN_FILENO, TCSANOW, &t_mode ) < 0) { ++ if (tcsetattr(STDIN_FILENO, TCSANOW, &t_mode) < 0) { close(fd[0]); _pam_log(LOG_WARNING, "couldn't put terminal in RAW mode"); return PAM_ABORT; -@@ -359,7 +368,7 @@ +@@ -356,7 +360,7 @@ _pam_log(LOG_WARNING,"first fork failed"); if (aterminal) { @@ -60,7 +66,7 @@ $NetBSD: patch-aj,v 1.1.1.1 2000/10/21 18:41:54 rh Exp $ } return PAM_AUTH_ERR; -@@ -401,7 +410,7 @@ +@@ -398,7 +402,7 @@ /* initialize the child's terminal to be the way the parent's was before we set it into RAW mode */ @@ -69,7 +75,7 @@ $NetBSD: patch-aj,v 1.1.1.1 2000/10/21 18:41:54 rh Exp $ _pam_log(LOG_WARNING,"cannot set slave terminal mode; %s" ,terminal); close(fd[1]); -@@ -575,7 +584,7 @@ +@@ -572,7 +576,7 @@ if (aterminal) { /* reset to initial terminal mode */ diff --git a/security/PAM/patches/patch-ak b/security/PAM/patches/patch-ak deleted file mode 100644 index ee2623e621f..00000000000 --- a/security/PAM/patches/patch-ak +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ak,v 1.1.1.1 2000/10/21 18:41:54 rh Exp $ - ---- modules/pam_ftp/pam_ftp.c.orig Sat Oct 21 11:54:46 2000 -+++ modules/pam_ftp/pam_ftp.c -@@ -17,7 +17,10 @@ - #define _GNU_SOURCE - #define _BSD_SOURCE - -+#include <sys/param.h> -+#if (!defined(BSD) || BSD < 199306) - #include <features.h> -+#endif - #include <stdio.h> - #include <stdlib.h> - #include <unistd.h> diff --git a/security/PAM/patches/patch-al b/security/PAM/patches/patch-al index e0cf473674d..ab79d039881 100644 --- a/security/PAM/patches/patch-al +++ b/security/PAM/patches/patch-al @@ -1,6 +1,6 @@ -$NetBSD: patch-al,v 1.1.1.1 2000/10/21 18:41:54 rh Exp $ +$NetBSD: patch-al,v 1.2 2002/01/29 17:10:11 jlam Exp $ ---- modules/pam_issue/pam_issue.c.orig Sat Oct 21 11:56:30 2000 +--- modules/pam_issue/pam_issue.c.orig Wed Feb 21 23:49:45 2001 +++ modules/pam_issue/pam_issue.c @@ -21,6 +21,7 @@ #include <stdio.h> @@ -8,9 +8,9 @@ $NetBSD: patch-al,v 1.1.1.1 2000/10/21 18:41:54 rh Exp $ #include <sys/types.h> +#include <sys/param.h> #include <sys/stat.h> + #include <time.h> #include <fcntl.h> - #include <string.h> -@@ -214,12 +215,24 @@ +@@ -215,12 +216,24 @@ case 'U': { int users = 0; @@ -23,7 +23,7 @@ $NetBSD: patch-al,v 1.1.1.1 2000/10/21 18:41:54 rh Exp $ + if (ut.ut_name[0] != '\0') + ++users; + (void) fclose(uf); -+ } ++ } +#else struct utmp *ut; setutent(); diff --git a/security/PAM/patches/patch-am b/security/PAM/patches/patch-am deleted file mode 100644 index c0107ce6eec..00000000000 --- a/security/PAM/patches/patch-am +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-am,v 1.2 2001/06/19 09:20:11 jlam Exp $ - ---- modules/pam_mkhomedir/Makefile.orig Sat Oct 21 12:44:27 2000 -+++ modules/pam_mkhomedir/Makefile -@@ -61,7 +61,7 @@ - $(LIBOBJD): $(LIBSRC) - - $(LIBSHARED): $(LIBOBJD) -- $(LD_D) -o $@ $(LIBOBJD) $(LINKLIBS) -lpam -+ ${LD_D} -o $@ ${LIBOBJD} -R${PREFIX}/lib -L../../libpam -L${BUILDLINK_DIR}/lib ${LINKLIBS} -lpam - endif - - ifdef STATIC diff --git a/security/PAM/patches/patch-an b/security/PAM/patches/patch-an index 44c1665b0e3..9720f36dfe0 100644 --- a/security/PAM/patches/patch-an +++ b/security/PAM/patches/patch-an @@ -1,8 +1,8 @@ -$NetBSD: patch-an,v 1.1.1.1 2000/10/21 18:41:54 rh Exp $ +$NetBSD: patch-an,v 1.2 2002/01/29 17:10:11 jlam Exp $ ---- modules/pam_unix/pam_unix_acct.c.orig Sat Oct 21 12:49:02 2000 +--- modules/pam_unix/pam_unix_acct.c.orig Wed Dec 20 00:15:05 2000 +++ modules/pam_unix/pam_unix_acct.c -@@ -46,9 +46,12 @@ +@@ -41,9 +41,12 @@ #include <string.h> #include <unistd.h> #include <sys/types.h> @@ -14,8 +14,8 @@ $NetBSD: patch-an,v 1.1.1.1 2000/10/21 18:41:54 rh Exp $ +#endif #include <time.h> /* for time() */ - -@@ -78,7 +81,7 @@ + #include <security/_pam_macros.h> +@@ -72,7 +75,7 @@ const char *uname; int retval, daysleft; time_t curdays; @@ -24,7 +24,7 @@ $NetBSD: patch-an,v 1.1.1.1 2000/10/21 18:41:54 rh Exp $ struct passwd *pwent; char buf[80]; -@@ -119,6 +122,9 @@ +@@ -113,6 +116,9 @@ return PAM_CRED_INSUFFICIENT; } } @@ -34,7 +34,7 @@ $NetBSD: patch-an,v 1.1.1.1 2000/10/21 18:41:54 rh Exp $ spent = getspnam( uname ); if (save_uid == pwent->pw_uid) setreuid( save_uid, save_euid ); -@@ -127,16 +133,42 @@ +@@ -121,16 +127,42 @@ setreuid( save_uid, -1 ); setreuid( -1, save_euid ); } @@ -78,7 +78,7 @@ $NetBSD: patch-an,v 1.1.1.1 2000/10/21 18:41:54 rh Exp $ curdays = time(NULL) / (60 * 60 * 24); D(("today is %d, last change %d", curdays, spent->sp_lstchg)); if ((curdays > spent->sp_expire) && (spent->sp_expire != -1) -@@ -189,7 +221,7 @@ +@@ -183,7 +215,7 @@ daysleft, daysleft == 1 ? "" : "s"); _make_remark(pamh, ctrl, PAM_TEXT_INFO, buf); } diff --git a/security/PAM/patches/patch-ao b/security/PAM/patches/patch-ao index 977c4e8f2cf..0771ddd3b6e 100644 --- a/security/PAM/patches/patch-ao +++ b/security/PAM/patches/patch-ao @@ -1,9 +1,9 @@ -$NetBSD: patch-ao,v 1.1.1.1 2000/10/21 18:41:54 rh Exp $ +$NetBSD: patch-ao,v 1.2 2002/01/29 17:10:11 jlam Exp $ ---- modules/pam_unix/pam_unix_passwd.c.orig Sat Oct 21 13:10:07 2000 +--- modules/pam_unix/pam_unix_passwd.c.orig Sun Feb 11 01:33:53 2001 +++ modules/pam_unix/pam_unix_passwd.c -@@ -52,7 +52,10 @@ - #include <errno.h> +@@ -47,7 +47,10 @@ + #include <sys/types.h> #include <pwd.h> #include <syslog.h> +#include <sys/param.h> @@ -13,7 +13,7 @@ $NetBSD: patch-ao,v 1.1.1.1 2000/10/21 18:41:54 rh Exp $ #include <time.h> /* for time() */ #include <fcntl.h> #include <ctype.h> -@@ -83,7 +86,7 @@ +@@ -77,7 +80,7 @@ #include "md5.h" #include "support.h" @@ -22,9 +22,9 @@ $NetBSD: patch-ao,v 1.1.1.1 2000/10/21 18:41:54 rh Exp $ extern int getrpcport(const char *host, unsigned long prognum, unsigned long versnum, unsigned int proto); #endif /* GNU libc 2.1 */ -@@ -334,6 +337,9 @@ +@@ -330,6 +333,9 @@ - static int _update_passwd(const char *forwho, char *towhat) + static int _update_passwd(const char *forwho, const char *towhat) { +#ifdef BSD + return PAM_AUTHTOK_ERR; @@ -32,7 +32,7 @@ $NetBSD: patch-ao,v 1.1.1.1 2000/10/21 18:41:54 rh Exp $ struct passwd *tmpent = NULL; FILE *pwfile, *opwfile; int retval = 0; -@@ -376,10 +382,14 @@ +@@ -372,10 +378,14 @@ unlink(PW_TMPFILE); return retval; @@ -47,15 +47,15 @@ $NetBSD: patch-ao,v 1.1.1.1 2000/10/21 18:41:54 rh Exp $ struct spwd *spwdent = NULL, *stmpent = NULL; FILE *pwfile, *opwfile; int retval = 0; -@@ -428,6 +438,7 @@ +@@ -424,6 +434,7 @@ unlink(SH_TMPFILE); return retval; +#endif } - static int _do_setpass(const char *forwho, char *fromwhat, char *towhat, -@@ -535,15 +546,18 @@ + static int _do_setpass(pam_handle_t* pamh, const char *forwho, char *fromwhat, +@@ -531,15 +542,18 @@ return PAM_AUTHINFO_UNAVAIL; /* We don't need to do the rest... */ if (strcmp(pwd->pw_passwd, "x") == 0) { @@ -74,7 +74,7 @@ $NetBSD: patch-ao,v 1.1.1.1 2000/10/21 18:41:54 rh Exp $ if (strcmp(pwd->pw_passwd,"*NP*") == 0) { /* NIS+ */ uid_t save_uid; -@@ -556,8 +570,15 @@ +@@ -552,8 +566,15 @@ return PAM_AUTHINFO_UNAVAIL; } else spwdent = NULL; @@ -90,7 +90,7 @@ $NetBSD: patch-ao,v 1.1.1.1 2000/10/21 18:41:54 rh Exp $ if (spwdent != NULL) { /* We have the user's information, now let's check if their account has expired (60 * 60 * 24 = number of seconds in a day) */ -@@ -583,6 +604,7 @@ +@@ -579,6 +600,7 @@ retval = PAM_ACCT_EXPIRED; } } diff --git a/security/PAM/patches/patch-ap b/security/PAM/patches/patch-ap index 710dbe842db..aa5d3f25ba0 100644 --- a/security/PAM/patches/patch-ap +++ b/security/PAM/patches/patch-ap @@ -1,6 +1,6 @@ -$NetBSD: patch-ap,v 1.1.1.1 2000/10/21 18:41:54 rh Exp $ +$NetBSD: patch-ap,v 1.2 2002/01/29 17:10:11 jlam Exp $ ---- modules/pam_unix/support.c.orig Sat Oct 21 14:21:48 2000 +--- modules/pam_unix/support.c.orig Sun Feb 11 01:33:53 2001 +++ modules/pam_unix/support.c @@ -12,7 +12,10 @@ #include <string.h> @@ -13,7 +13,7 @@ $NetBSD: patch-ap,v 1.1.1.1 2000/10/21 18:41:54 rh Exp $ #include <limits.h> #include <utmp.h> -@@ -99,6 +102,9 @@ +@@ -111,6 +114,9 @@ */ char *PAM_getlogin(void) { @@ -22,8 +22,8 @@ $NetBSD: patch-ap,v 1.1.1.1 2000/10/21 18:41:54 rh Exp $ +#else struct utmp *ut, line; char *curr_tty, *retval; - static char curr_user[UT_NAMESIZE + 4]; -@@ -120,6 +126,7 @@ + static char curr_user[sizeof(ut->ut_user) + 4]; +@@ -132,6 +138,7 @@ D(("PAM_getlogin retval: %s", retval)); return retval; @@ -31,7 +31,7 @@ $NetBSD: patch-ap,v 1.1.1.1 2000/10/21 18:41:54 rh Exp $ } /* -@@ -302,6 +309,7 @@ +@@ -330,6 +337,7 @@ pwd = getpwnam(name); /* Get password file entry... */ if (pwd != NULL) { @@ -39,7 +39,7 @@ $NetBSD: patch-ap,v 1.1.1.1 2000/10/21 18:41:54 rh Exp $ if (strcmp( pwd->pw_passwd, "*NP*" ) == 0) { /* NIS+ */ uid_t save_euid, save_uid; -@@ -339,6 +347,7 @@ +@@ -367,6 +375,7 @@ if (spwdent) salt = x_strdup(spwdent->sp_pwdp); else @@ -47,7 +47,7 @@ $NetBSD: patch-ap,v 1.1.1.1 2000/10/21 18:41:54 rh Exp $ salt = x_strdup(pwd->pw_passwd); } /* Does this user have a password? */ -@@ -450,6 +459,7 @@ +@@ -481,6 +490,7 @@ pwd = getpwnam(name); /* Get password file entry... */ if (pwd != NULL) { @@ -55,7 +55,7 @@ $NetBSD: patch-ap,v 1.1.1.1 2000/10/21 18:41:54 rh Exp $ if (strcmp( pwd->pw_passwd, "*NP*" ) == 0) { /* NIS+ */ uid_t save_euid, save_uid; -@@ -467,7 +477,7 @@ +@@ -498,7 +508,7 @@ return PAM_CRED_INSUFFICIENT; } } @@ -64,7 +64,7 @@ $NetBSD: patch-ap,v 1.1.1.1 2000/10/21 18:41:54 rh Exp $ spwdent = getspnam( name ); if (save_uid == pwd->pw_uid) setreuid( save_uid, save_euid ); -@@ -486,6 +496,7 @@ +@@ -517,6 +527,7 @@ if (spwdent) salt = x_strdup(spwdent->sp_pwdp); else diff --git a/security/PAM/patches/patch-aq b/security/PAM/patches/patch-aq deleted file mode 100644 index 81f55e42c51..00000000000 --- a/security/PAM/patches/patch-aq +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-aq,v 1.2 2001/06/19 09:20:11 jlam Exp $ - ---- modules/pam_unix/Makefile.orig Sat Oct 21 14:28:23 2000 -+++ modules/pam_unix/Makefile -@@ -30,10 +30,10 @@ - ######################################################################## - - CFLAGS += $(USE_CRACKLIB) $(USE_LCKPWDF) $(NEED_LCKPWDF) $(EXTRAS) --LDLIBS = $(EXTRALS) -+LDLIBS = $(EXTRALS) -lcrypt - - ifdef USE_CRACKLIB --CRACKLIB = -lcrack -+CRACKLIB = -R${PREFIX}/lib -L${BUILDLINK_DIR}/lib -lcrack - endif - - diff --git a/security/PAM/patches/patch-ar b/security/PAM/patches/patch-ar index f43bdf78458..5daeda92eb0 100644 --- a/security/PAM/patches/patch-ar +++ b/security/PAM/patches/patch-ar @@ -1,8 +1,8 @@ -$NetBSD: patch-ar,v 1.1.1.1 2000/10/21 18:41:54 rh Exp $ +$NetBSD: patch-ar,v 1.2 2002/01/29 17:10:11 jlam Exp $ ---- modules/pam_unix/unix_chkpwd.c.orig Sat Oct 21 14:30:41 2000 +--- modules/pam_unix/unix_chkpwd.c.orig Sun Feb 11 01:33:53 2001 +++ modules/pam_unix/unix_chkpwd.c -@@ -26,8 +26,11 @@ +@@ -22,8 +22,11 @@ #include <syslog.h> #include <unistd.h> #include <sys/types.h> @@ -14,7 +14,7 @@ $NetBSD: patch-ar,v 1.1.1.1 2000/10/21 18:41:54 rh Exp $ #include <signal.h> #define MAXPASS 200 /* the maximum length of a password */ -@@ -98,6 +101,9 @@ +@@ -94,6 +97,9 @@ pwd = getpwnam(name); /* Get password file entry... */ endpwent(); if (pwd != NULL) { @@ -24,7 +24,7 @@ $NetBSD: patch-ar,v 1.1.1.1 2000/10/21 18:41:54 rh Exp $ if (strcmp(pwd->pw_passwd, "x") == 0) { /* * ...and shadow password file entry for this user, -@@ -124,6 +130,7 @@ +@@ -120,6 +126,7 @@ salt = x_strdup(pwd->pw_passwd); } } diff --git a/security/PAM/patches/patch-as b/security/PAM/patches/patch-as deleted file mode 100644 index 219cede6282..00000000000 --- a/security/PAM/patches/patch-as +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-as,v 1.1.1.1 2000/10/21 18:41:54 rh Exp $ - ---- modules/pam_userdb/pam_userdb.c.orig Sat Oct 21 14:34:30 2000 -+++ modules/pam_userdb/pam_userdb.c -@@ -9,7 +9,10 @@ - #define _GNU_SOURCE - #define _BSD_SOURCE - -+#include <sys/param.h> -+#ifndef BSD - #include <features.h> -+#endif - #include <stdlib.h> - #include <unistd.h> - #include <string.h> diff --git a/security/PAM/patches/patch-at b/security/PAM/patches/patch-at deleted file mode 100644 index 057c2899959..00000000000 --- a/security/PAM/patches/patch-at +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-at,v 1.1.1.1 2000/10/21 18:41:54 rh Exp $ - ---- modules/pam_userdb/Makefile.orig Sat Oct 21 14:36:41 2000 -+++ modules/pam_userdb/Makefile -@@ -20,7 +20,6 @@ - LIBOBJD = $(addprefix dynamic/,$(LIBOBJ)) - #LIBOBJS = $(addprefix static/,$(LIBOBJ)) - --EXTRALS += -ldb - CFLAGS += $(WHICH_DB) - - dynamic/%.o : %.c diff --git a/security/PAM/patches/patch-au b/security/PAM/patches/patch-au index 2d049531f33..8a2f5fc81e9 100644 --- a/security/PAM/patches/patch-au +++ b/security/PAM/patches/patch-au @@ -1,19 +1,14 @@ -$NetBSD: patch-au,v 1.1.1.1 2000/10/21 18:41:54 rh Exp $ +$NetBSD: patch-au,v 1.2 2002/01/29 17:10:12 jlam Exp $ ---- conf/install_conf.orig Sun Jul 12 07:17:14 1998 -+++ conf/install_conf -@@ -14,11 +14,10 @@ - echo "\ - An older Linux-PAM configuration file already exists ($CONFILE)" - WRITE=overwrite -+ yes=n -+ else -+ yes=y - fi -- echo -n "\ --Do you wish to copy the $CONF file in this distribution --to $CONFILE ? (y/n) [n] " -- read yes +--- modules/pam_userdb/Makefile.orig Sat Feb 17 22:03:31 2001 ++++ modules/pam_userdb/Makefile +@@ -12,7 +12,9 @@ + + ifeq ($(HAVE_NDBM_H),yes) + WHICH_DB=ndbm ++ifeq ($(HAVE_LIBNDBM),yes) + MODULE_SIMPLE_EXTRALIBS = -lndbm ++endif else - yes=n - fi + ifeq ($(HAVE_LIBDB),yes) + WHICH_DB=db diff --git a/security/PAM/patches/patch-av b/security/PAM/patches/patch-av index 17c577f48c1..89d19f1c359 100644 --- a/security/PAM/patches/patch-av +++ b/security/PAM/patches/patch-av @@ -1,13 +1,13 @@ -$NetBSD: patch-av,v 1.1.1.1 2000/10/21 18:41:54 rh Exp $ +$NetBSD: patch-av,v 1.2 2002/01/29 17:10:12 jlam Exp $ ---- modules/pam_env/Makefile.orig Sat Oct 21 15:45:39 2000 +--- modules/pam_env/Makefile.orig Mon Jan 28 17:28:23 2002 +++ modules/pam_env/Makefile -@@ -24,7 +24,7 @@ +@@ -15,8 +15,4 @@ + DEFS=-DDEFAULT_CONF_FILE=\"$(INSTALLED_CONFILE)\" + CFLAGS += $(DEFS) - TITLE=pam_env - --CONFD=$(CONFIGED)/security -+CONFD=$(CONFIGED)/pam - export CONFD - CONFILE=$(CONFD)/pam_env.conf - export CONFILE +-MODULE_SIMPLE_INSTALL=bash -f ../install_conf "$(FAKEROOT)" "$(SCONFIGD)" "$(INSTALLED_CONFILE)" "$(TITLE)" "$(LOCAL_CONFILE)" +-MODULE_SIMPLE_REMOVE=rm -f $(FAKEROOT)$(INSTALLED_CONFILE) +-MODULE_SIMPLE_CLEAN=rm -f ./.ignore_age +- + include ../Simple.Rules diff --git a/security/PAM/patches/patch-aw b/security/PAM/patches/patch-aw index 189395d0ae0..a0686af4373 100644 --- a/security/PAM/patches/patch-aw +++ b/security/PAM/patches/patch-aw @@ -1,13 +1,13 @@ -$NetBSD: patch-aw,v 1.1.1.1 2000/10/21 18:41:54 rh Exp $ +$NetBSD: patch-aw,v 1.2 2002/01/29 17:10:12 jlam Exp $ ---- modules/pam_group/Makefile.orig Sat Oct 21 15:45:39 2000 +--- modules/pam_group/Makefile.orig Mon Jan 28 17:28:23 2002 +++ modules/pam_group/Makefile -@@ -9,7 +9,7 @@ - # +@@ -14,8 +14,4 @@ + DEFS=-DDEFAULT_CONF_FILE=\"$(CONFILE)\" + CFLAGS += $(DEFS) - TITLE=pam_group --CONFD=$(CONFIGED)/security -+CONFD=$(CONFIGED)/pam - export CONFD - CONFILE=$(CONFD)/group.conf - export CONFILE +-MODULE_SIMPLE_INSTALL=bash -f ../install_conf "$(FAKEROOT)" "$(SCONFIGD)" "$(INSTALLED_CONFILE)" "$(TITLE)" "$(LOCAL_CONFILE)" +-MODULE_SIMPLE_REMOVE=rm -f $(FAKEROOT)$(INSTALLED_CONFILE) +-MODULE_SIMPLE_CLEAN=rm -f ./.ignore_age +- + include ../Simple.Rules diff --git a/security/PAM/patches/patch-ax b/security/PAM/patches/patch-ax deleted file mode 100644 index 5bd43b46dd3..00000000000 --- a/security/PAM/patches/patch-ax +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ax,v 1.1.1.1 2000/10/21 18:41:54 rh Exp $ - ---- modules/pam_limits/Makefile.orig Sat Oct 21 15:45:39 2000 -+++ modules/pam_limits/Makefile -@@ -8,7 +8,7 @@ - - ifeq ($(OS),linux) - TITLE=pam_limits --CONFD=$(CONFIGED)/security -+CONFD=$(CONFIGED)/pam - export CONFD - CONFILE=$(CONFD)/limits.conf - export CONFILE diff --git a/security/PAM/patches/patch-ay b/security/PAM/patches/patch-ay deleted file mode 100644 index b1e317238ce..00000000000 --- a/security/PAM/patches/patch-ay +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ay,v 1.1.1.1 2000/10/21 18:41:54 rh Exp $ - ---- modules/pam_radius/Makefile.orig Sat Oct 21 15:45:39 2000 -+++ modules/pam_radius/Makefile -@@ -9,7 +9,7 @@ - # - - TITLE=pam_radius --CONFD=$(CONFIGED)/security -+CONFD=$(CONFIGED)/pam - export CONFD - CONFILE=$(CONFD)/radius.conf - export CONFILE diff --git a/security/PAM/patches/patch-az b/security/PAM/patches/patch-az index 9f66cce918c..b979b886f0b 100644 --- a/security/PAM/patches/patch-az +++ b/security/PAM/patches/patch-az @@ -1,13 +1,13 @@ -$NetBSD: patch-az,v 1.1.1.1 2000/10/21 18:41:54 rh Exp $ +$NetBSD: patch-az,v 1.2 2002/01/29 17:10:12 jlam Exp $ ---- modules/pam_time/Makefile.orig Sat Oct 21 15:45:39 2000 +--- modules/pam_time/Makefile.orig Mon Jan 28 17:28:23 2002 +++ modules/pam_time/Makefile -@@ -9,7 +9,7 @@ - # +@@ -14,8 +14,4 @@ + DEFS=-DDEFAULT_CONF_FILE=\"$(INSTALLED_CONFILE)\" + CFLAGS += $(DEFS) - TITLE=pam_time --CONFD=$(CONFIGED)/security -+CONFD=$(CONFIGED)/pam - export CONFD - CONFILE=$(CONFD)/time.conf - export CONFILE +-MODULE_SIMPLE_INSTALL=bash -f ../install_conf "$(FAKEROOT)" "$(SCONFIGD)" "$(INSTALLED_CONFILE)" "$(TITLE)" "$(LOCAL_CONFILE)" +-MODULE_SIMPLE_REMOVE=rm -f $(FAKEROOT)$(INSTALLED_CONFILE) +-MODULE_SIMPLE_CLEAN=rm -f ./.ignore_age +- + include ../Simple.Rules diff --git a/security/PAM/patches/patch-ba b/security/PAM/patches/patch-ba new file mode 100644 index 00000000000..31c8fdca516 --- /dev/null +++ b/security/PAM/patches/patch-ba @@ -0,0 +1,53 @@ +$NetBSD: patch-ba,v 1.1 2002/01/29 17:10:12 jlam Exp $ + +--- configure.in.orig Sun Mar 18 20:56:36 2001 ++++ configure.in +@@ -172,7 +172,7 @@ + HAVE_LIBCRACK=no) + AC_SUBST(HAVE_LIBCRACK) + +-AC_CHECK_LIB(crypt, fcrypt, HAVE_LIBCRYPT=yes ; AC_DEFINE(HAVE_LIBCRYPT), ++AC_CHECK_LIB(crypt, crypt, HAVE_LIBCRYPT=yes ; AC_DEFINE(HAVE_LIBCRYPT), + HAVE_LIBCRYPT=no) + AC_SUBST(HAVE_LIBCRYPT) + AC_CHECK_LIB(util, logwtmp, HAVE_LIBUTIL=yes ; AC_DEFINE(HAVE_LIBUTIL), +@@ -220,7 +220,7 @@ + + dnl Look for cracklib dictionary + AC_MSG_CHECKING(path to cracklib dictionary) +-DICT_DIR_CANDIDATES="/usr/lib /usr/share/dict /usr/share/lib \ ++DICT_DIR_CANDIDATES="${prefix}/libdata /usr/lib /usr/share/dict /usr/share/lib \ + /usr/local/lib /usr/local/share/lib" + DICT_FILE_CANDIDATES="pw_dict cracklib_dict" + CRACKLIB_DICTPATH="" +@@ -264,6 +264,21 @@ + if test "$GCC" = yes; then + ### + ### Non-Linux needs attention on per-OS basis ++ case $OS in ++ netbsd*) ++ OS_CFLAGS="" ++ WARNINGS="$GCC_WARNINGS" ++ PIC="-fPIC" ++#can/should we use LD=gcc ??? ++ LD=ld ++ LD_D="\$(CC) -shared -Xlinker -x" ++ LD_L="$LD -x -shared" ++ RANLIB=ranlib ++ STRIP=strip ++ CC_STATIC="-Xlinker -export-dynamic" ++ ;; ++ ++ *) + OS_CFLAGS="-ansi -D_POSIX_SOURCE -pedantic" + WARNINGS="$GCC_WARNINGS" + PIC="-fPIC" +@@ -274,6 +289,8 @@ + RANLIB=ranlib + STRIP=strip + CC_STATIC="-Xlinker -export-dynamic" ++ ;; ++ esac + else + ### + ### Non-gcc needs attention on per-OS basis diff --git a/security/PAM/patches/patch-bb b/security/PAM/patches/patch-bb new file mode 100644 index 00000000000..02b96f924c0 --- /dev/null +++ b/security/PAM/patches/patch-bb @@ -0,0 +1,69 @@ +$NetBSD: patch-bb,v 1.1 2002/01/29 17:10:12 jlam Exp $ + +--- configure.orig Sun Mar 18 20:56:36 2001 ++++ configure +@@ -1460,9 +1460,9 @@ + + + +-echo $ac_n "checking for fcrypt in -lcrypt""... $ac_c" 1>&6 +-echo "configure:1465: checking for fcrypt in -lcrypt" >&5 +-ac_lib_var=`echo crypt'_'fcrypt | sed 'y%./+-%__p_%'` ++echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6 ++echo "configure:1465: checking for crypt in -lcrypt" >&5 ++ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -1474,10 +1474,10 @@ + /* Override any gcc2 internal prototype to avoid an error. */ + /* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +-char fcrypt(); ++char crypt(); + + int main() { +-fcrypt() ++crypt() + ; return 0; } + EOF + if { (eval echo configure:1484: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +@@ -2257,7 +2257,7 @@ + + echo $ac_n "checking path to cracklib dictionary""... $ac_c" 1>&6 + echo "configure:2260: checking path to cracklib dictionary" >&5 +-DICT_DIR_CANDIDATES="/usr/lib /usr/share/dict /usr/share/lib \ ++DICT_DIR_CANDIDATES="${prefix}/libdata /usr/lib /usr/share/dict /usr/share/lib \ + /usr/local/lib /usr/local/share/lib" + DICT_FILE_CANDIDATES="pw_dict cracklib_dict" + CRACKLIB_DICTPATH="" +@@ -2288,6 +2288,20 @@ + if test "$GCC" = yes; then + ### + ### Non-Linux needs attention on per-OS basis ++ case $OS in ++ netbsd*) ++ OS_CFLAGS="" ++ WARNINGS="$GCC_WARNINGS" ++ PIC="-fPIC" ++ LD=ld ++ LD_D="\$(CC) -shared -Xlinker -x" ++ LD_L="$LD -x -shared" ++ RANLIB=ranlib ++ STRIP=strip ++ CC_STATIC="-Xlinker -export-dynamic" ++ ;; ++ ++ *) + OS_CFLAGS="-ansi -D_POSIX_SOURCE -pedantic" + WARNINGS="$GCC_WARNINGS" + PIC="-fPIC" +@@ -2298,6 +2312,8 @@ + RANLIB=ranlib + STRIP=strip + CC_STATIC="-Xlinker -export-dynamic" ++ ;; ++ esac + else + ### + ### Non-gcc needs attention on per-OS basis diff --git a/security/PAM/patches/patch-bc b/security/PAM/patches/patch-bc new file mode 100644 index 00000000000..6dd94142df1 --- /dev/null +++ b/security/PAM/patches/patch-bc @@ -0,0 +1,13 @@ +$NetBSD: patch-bc,v 1.1 2002/01/29 17:10:12 jlam Exp $ + +--- modules/Simple.Rules.orig Wed Feb 21 23:55:41 2001 ++++ modules/Simple.Rules +@@ -56,7 +56,7 @@ + + ifdef DYNAMIC + $(LIBSHARED): $(LIBOBJD) +- $(LD_D) -o $@ $(LIBOBJD) $(MODULE_SIMPLE_EXTRALIBS) $(NEED_LINK_LIB_C) ++ $(LD_D) -o $@ $(LIBOBJD) $(LDFLAGS) $(MODULE_SIMPLE_EXTRALIBS) $(NEED_LINK_LIB_C) + + endif + diff --git a/security/PAM/patches/patch-bd b/security/PAM/patches/patch-bd new file mode 100644 index 00000000000..04aeeddf2c2 --- /dev/null +++ b/security/PAM/patches/patch-bd @@ -0,0 +1,13 @@ +$NetBSD: patch-bd,v 1.1 2002/01/29 17:10:12 jlam Exp $ + +--- doc/Makefile.orig Mon Jan 28 18:45:38 2002 ++++ doc/Makefile +@@ -5,7 +5,7 @@ + + # These two should probably be moved into autoconf... + DOCDIR=/usr/doc/Linux-PAM +-MANDIR=/usr/man ++MANDIR=${mandir} + + ####################################################### + diff --git a/security/PAM/patches/patch-be b/security/PAM/patches/patch-be new file mode 100644 index 00000000000..f177b68cd37 --- /dev/null +++ b/security/PAM/patches/patch-be @@ -0,0 +1,16 @@ +$NetBSD: patch-be,v 1.1 2002/01/29 17:10:12 jlam Exp $ + +--- libpam/Makefile.orig Mon Jan 28 19:00:46 2002 ++++ libpam/Makefile +@@ -125,8 +125,9 @@ + $(INSTALL) -m $(SHLIBMODE) $(LIBPAM) $(FAKEROOT)$(libdir)/$(LIBPAMFULL) + $(LDCONFIG) + ifneq ($(DYNTYPE),"sl") +- ( cd $(FAKEROOT)$(libdir) ; rm -f $(LIBPAM) ; \ +- ln -sf $(LIBPAMNAME) $(LIBPAM) ) ++ ( cd $(FAKEROOT)$(libdir) ; rm -f $(LIBPAM) $(LIBPAMNAME); \ ++ ln -sf $(LIBPAMFULL) $(LIBPAMNAME); \ ++ ln -sf $(LIBPAMFULL) $(LIBPAM) ) + endif + endif + ifeq ($(STATIC_LIBPAM),yes) diff --git a/security/PAM/patches/patch-bf b/security/PAM/patches/patch-bf new file mode 100644 index 00000000000..ada9b4f5a2f --- /dev/null +++ b/security/PAM/patches/patch-bf @@ -0,0 +1,13 @@ +$NetBSD: patch-bf,v 1.1 2002/01/29 17:10:12 jlam Exp $ + +--- libpam_misc/Makefile.orig Mon Jan 28 19:00:46 2002 ++++ libpam_misc/Makefile +@@ -85,7 +85,7 @@ + $(INSTALL) -m $(SHLIBMODE) $(LIBNAMED) $(FAKEROOT)$(libdir)/$(LIBNAMEDFULL) + $(LDCONFIG) + ifneq ($(DYNTYPE),"sl") +- ( cd $(FAKEROOT)$(libdir) ; rm -f $(LIBNAMED) ; ln -s $(LIBNAMEDNAME) $(LIBNAMED) ) ++ ( cd $(FAKEROOT)$(libdir) ; rm -f $(LIBNAMED) $(LIBNAMEDNAME); ln -s $(LIBNAMEDFULL) $(LIBNAMED); ln -s $(LIBNAMEDFULL) $(LIBNAMEDNAME) ) + endif + endif + ifeq ($(STATIC_LIBPAM),yes) diff --git a/security/PAM/patches/patch-bg b/security/PAM/patches/patch-bg new file mode 100644 index 00000000000..d0300df7d44 --- /dev/null +++ b/security/PAM/patches/patch-bg @@ -0,0 +1,13 @@ +$NetBSD: patch-bg,v 1.1 2002/01/29 17:10:13 jlam Exp $ + +--- libpamc/Makefile.orig Mon Jan 28 19:00:46 2002 ++++ libpamc/Makefile +@@ -85,7 +85,7 @@ + $(INSTALL) -m $(SHLIBMODE) $(LIBNAMED) $(FAKEROOT)$(libdir)/$(LIBNAMEDFULL) + $(LDCONFIG) + ifneq ($(DYNTYPE),"sl") +- ( cd $(FAKEROOT)$(libdir) ; rm -f $(LIBNAMED) ; ln -s $(LIBNAMEDNAME) $(LIBNAMED) ) ++ ( cd $(FAKEROOT)$(libdir) ; rm -f $(LIBNAMED) $(LIBNAMEDNAME); ln -s $(LIBNAMEDFULL) $(LIBNAMED); ln -s $(LIBNAMEDFULL) $(LIBNAMEDNAME) ) + endif + endif + ifeq ($(STATIC_LIBPAM),yes) |