pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/security/PAM Libtoolize security/PAM so that the appro...
details: https://anonhg.NetBSD.org/pkgsrc/rev/1f9c2c668f87
branches: trunk
changeset: 483619:1f9c2c668f87
user: jlam <jlam%pkgsrc.org@localhost>
date: Tue Nov 16 07:46:57 2004 +0000
description:
Libtoolize security/PAM so that the appropriate options are passed to
the compiler to build shared modules, and so that it builds correctly
across different platforms. Bump the PKGREVISION.
In particular, this should fix problems building this package on
NetBSD/amd64.
diffstat:
security/PAM/Makefile | 25 ++++---
security/PAM/PLIST | 73 +++++++++------------
security/PAM/buildlink3.mk | 3 +-
security/PAM/distinfo | 22 +++--
security/PAM/patches/patch-ab | 21 +------
security/PAM/patches/patch-ac | 21 +------
security/PAM/patches/patch-ad | 138 ++++++++++++++++++++++++++++++++++++++---
security/PAM/patches/patch-ae | 126 +++++++++++++++++++++++++++++++++++---
security/PAM/patches/patch-af | 117 +++++++++++++++++++++++++++++++++--
security/PAM/patches/patch-ag | 67 +++++++++++++++-----
security/PAM/patches/patch-ah | 96 +++++++++++++++++++++++++---
security/PAM/patches/patch-at | 40 +++++++++---
security/PAM/patches/patch-au | 95 ++++++++++++++++++++++++++++
security/PAM/patches/patch-av | 101 ++++++++++++++++++++++++++++++
security/PAM/patches/patch-aw | 137 +++++++++++++++++++++++++++++++++++++++++
security/PAM/patches/patch-ax | 13 +++
16 files changed, 928 insertions(+), 167 deletions(-)
diffs (truncated from 1294 to 300 lines):
diff -r db0370cc3bb5 -r 1f9c2c668f87 security/PAM/Makefile
--- a/security/PAM/Makefile Tue Nov 16 06:19:23 2004 +0000
+++ b/security/PAM/Makefile Tue Nov 16 07:46:57 2004 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.28 2004/10/03 00:18:07 tv Exp $
+# $NetBSD: Makefile,v 1.29 2004/11/16 07:46:57 jlam Exp $
#
DISTNAME= Linux-PAM-0.77
PKGNAME= ${DISTNAME:S/Linux-//}
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= security
MASTER_SITES= http://www.kernel.org/pub/linux/libs/pam/pre/library/ \
ftp://ftp.kernel.org/pub/linux/libs/pam/pre/library/ \
@@ -19,6 +19,7 @@
USE_BUILDLINK3= yes
USE_PKGINSTALL= yes
USE_GNU_TOOLS+= make
+USE_LIBTOOL= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --enable-docdir=${PREFIX}/share/doc/PAM
@@ -58,16 +59,16 @@
PLIST_SUBST+= USE_LIBCRACK="@comment "
.endif
-.if defined(LDCONFIG) && !exists(${LDCONFIG})
-LDCONFIG=
-.endif
-MAKE_ENV+= PKG_LDCONFIG=${LDCONFIG}
-
.if !empty(OPSYS:M*BSD)
CFLAGS+= -DUSE_GETLOGIN=1
.endif
MAKE_FLAGS+= OS_CFLAGS="${CFLAGS}"
+# pam_userdb uses ndbm if it finds it, otherwise it will use Berkeley DB.
+.if !exists(/usr/include/ndbm.h)
+. include "../../mk/bdb.buildlink3.mk"
+.endif
+
PKG_SYSCONFSUBDIR?= pam
EGDIR= ${PREFIX}/share/examples/${PKGBASE}
@@ -84,10 +85,15 @@
.for FILE in ${CFILES}
CONF_FILES+= ${EGDIR}/${FILE} ${PKG_SYSCONFDIR}/${FILE}
.endfor
-
-.include "../../mk/bdb.buildlink3.mk"
+SPECIAL_PERMS= ${PREFIX}/sbin/unix_chkpwd ${SETUID_ROOT_PERMS}
post-configure:
+ cd ${WRKSRC}; for file in Make.Rules; do \
+ ${SED} -e "s|@LIBTOOL@|${LIBTOOL}|g" \
+ -e "s|@SHLIBTOOL@|${SHLIBTOOL}|g" \
+ $$file > $$file.new; \
+ ${MV} -f $$file.new $$file; \
+ done
cd ${WRKSRC}; for file in libpam/pam_private.h; do \
${SED} -e "s|/etc/|${PKG_SYSCONFBASEDIR}/|g" \
$$file > $$file.new; \
@@ -110,6 +116,5 @@
${INSTALL_DATA} ${WRKSRC}/security/modules/pam_limits/limits.skel \
${EGDIR}/limits.conf
.endif
- ${INSTALL_DATA_DIR} ${DOCDIR}
.include "../../mk/bsd.pkg.mk"
diff -r db0370cc3bb5 -r 1f9c2c668f87 security/PAM/PLIST
--- a/security/PAM/PLIST Tue Nov 16 06:19:23 2004 +0000
+++ b/security/PAM/PLIST Tue Nov 16 07:46:57 2004 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2003/05/22 14:36:06 wiz Exp $
+@comment $NetBSD: PLIST,v 1.6 2004/11/16 07:46:57 jlam Exp $
include/security/_pam_aconf.h
include/security/_pam_compat.h
include/security/_pam_macros.h
@@ -8,51 +8,42 @@
include/security/pam_filter.h
include/security/pam_misc.h
include/security/pam_modules.h
-lib/libpam.a
-lib/libpam.so
-lib/libpam.so.0
-lib/libpam.so.${PKGVERSION}
-lib/libpam_misc.a
-lib/libpam_misc.so
-lib/libpam_misc.so.0
-lib/libpam_misc.so.${PKGVERSION}
-lib/libpamc.a
-lib/libpamc.so
-lib/libpamc.so.0
-lib/libpamc.so.${PKGVERSION}
-lib/security/pam_access.so
-${USE_LIBCRACK}lib/security/pam_cracklib.so
-lib/security/pam_debug.so
-lib/security/pam_deny.so
-lib/security/pam_env.so
-lib/security/pam_filter.so
+lib/libpam.la
+lib/libpam_misc.la
+lib/libpamc.la
+lib/security/pam_access.la
+${USE_LIBCRACK}lib/security/pam_cracklib.la
+lib/security/pam_debug.la
+lib/security/pam_deny.la
+lib/security/pam_env.la
+lib/security/pam_filter.la
lib/security/pam_filter/upperLOWER
-lib/security/pam_ftp.so
-lib/security/pam_group.so
-lib/security/pam_issue.so
-lib/security/pam_lastlog.so
-${PAM_LIMITS}lib/security/pam_limits.so
-lib/security/pam_listfile.so
-lib/security/pam_mail.so
-lib/security/pam_mkhomedir.so
-lib/security/pam_motd.so
-lib/security/pam_nologin.so
-lib/security/pam_permit.so
-lib/security/pam_rhosts_auth.so
-lib/security/pam_rootok.so
-lib/security/pam_securetty.so
-lib/security/pam_shells.so
-lib/security/pam_stress.so
-lib/security/pam_tally.so
-lib/security/pam_time.so
-lib/security/pam_unix.so
+lib/security/pam_ftp.la
+lib/security/pam_group.la
+lib/security/pam_issue.la
+lib/security/pam_lastlog.la
+${PAM_LIMITS}lib/security/pam_limits.la
+lib/security/pam_listfile.la
+lib/security/pam_mail.la
+lib/security/pam_mkhomedir.la
+lib/security/pam_motd.la
+lib/security/pam_nologin.la
+lib/security/pam_permit.la
+lib/security/pam_rhosts_auth.la
+lib/security/pam_rootok.la
+lib/security/pam_securetty.la
+lib/security/pam_shells.la
+lib/security/pam_stress.la
+lib/security/pam_tally.la
+lib/security/pam_time.la
+lib/security/pam_unix.la
lib/security/pam_unix_acct.so
lib/security/pam_unix_auth.so
lib/security/pam_unix_passwd.so
lib/security/pam_unix_session.so
-lib/security/pam_userdb.so
-lib/security/pam_warn.so
-lib/security/pam_wheel.so
+lib/security/pam_userdb.la
+lib/security/pam_warn.la
+lib/security/pam_wheel.la
man/man3/pam_authenticate.3
man/man3/pam_chauthtok.3
man/man3/pam_close_session.3
diff -r db0370cc3bb5 -r 1f9c2c668f87 security/PAM/buildlink3.mk
--- a/security/PAM/buildlink3.mk Tue Nov 16 06:19:23 2004 +0000
+++ b/security/PAM/buildlink3.mk Tue Nov 16 07:46:57 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2004/05/17 21:32:34 seb Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2004/11/16 07:46:57 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PAM_BUILDLINK3_MK:= ${PAM_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@
.if !empty(PAM_BUILDLINK3_MK:M+)
BUILDLINK_DEPENDS.pam+= PAM>=0.75
+BUILDLINK_RECOMMENDED.pam+= PAM>=0.77nb3
BUILDLINK_PKGSRCDIR.pam?= ../../security/PAM
.endif # PAM_BUILDLINK3_MK
diff -r db0370cc3bb5 -r 1f9c2c668f87 security/PAM/distinfo
--- a/security/PAM/distinfo Tue Nov 16 06:19:23 2004 +0000
+++ b/security/PAM/distinfo Tue Nov 16 07:46:57 2004 +0000
@@ -1,15 +1,15 @@
-$NetBSD: distinfo,v 1.9 2004/01/08 00:07:26 jlam Exp $
+$NetBSD: distinfo,v 1.10 2004/11/16 07:46:57 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) = 2f4a7f03d60a160ab89d772708c1b612e6c0dabf
-SHA1 (patch-ae) = 8cdf38fddfb3e30a2bd220f3c2a83cec26918a2b
-SHA1 (patch-af) = 966d42796a99d38dfa9bbdefb3daf7c48122fc88
-SHA1 (patch-ag) = f7673f80592466e1cdeb22645a620aaa3602903d
-SHA1 (patch-ah) = 30e13e82faa3b8978e28725b7c8cd8577aab8beb
+SHA1 (patch-ab) = 02fbb08bc8f74860eada3bdb23333ec5c191f124
+SHA1 (patch-ac) = dfd528bc187fcfeaedaee0418549ac6a65c644f4
+SHA1 (patch-ad) = 9e43f70d1b772727c0ef4e14e6cb12a15128c9a3
+SHA1 (patch-ae) = a630453cc887fabee3a52cceea1e2aa5cec3f9ca
+SHA1 (patch-af) = a6ca640f46457998146f4ea5efb06577b76fc57d
+SHA1 (patch-ag) = 6329935d62d0ff82b6bf12783a600ccee28032aa
+SHA1 (patch-ah) = 5fb98628d5fcec8a7a76f3743d5e960b3279ba18
SHA1 (patch-ai) = 950c9e949c72eaf904452d8afefc0f994101e5a8
SHA1 (patch-aj) = d47bc58c3dc810497290d6ec4a3646380b5fa4d7
SHA1 (patch-ak) = 491aa837ee756269d57d642aeba999d1f8cc8187
@@ -21,4 +21,8 @@
SHA1 (patch-aq) = 91587c5b9c6587221708247decb0e82f665ae2bf
SHA1 (patch-ar) = b8072ebbc1a38c26d44c0e087a2b8b93f1eb7768
SHA1 (patch-as) = e4fdfef53c097985c2aa8ff8225fed1caa812c10
-SHA1 (patch-at) = 9a4dff60d5ce77a1a0792cd98e847ce946b49765
+SHA1 (patch-at) = c4ec24d53daf467a05b7e5875625d4ba37288cb1
+SHA1 (patch-au) = 21000d628f7d1c99ea8914069f1db41fc37dcab0
+SHA1 (patch-av) = bc74f55d71f84abe3c3c80b970b049343c3716af
+SHA1 (patch-aw) = fe1ddef649a736459ff998b6abd96d7b3f522838
+SHA1 (patch-ax) = 16f4ef37306f05a9792684440a802bed727b03df
diff -r db0370cc3bb5 -r 1f9c2c668f87 security/PAM/patches/patch-ab
--- a/security/PAM/patches/patch-ab Tue Nov 16 06:19:23 2004 +0000
+++ b/security/PAM/patches/patch-ab Tue Nov 16 07:46:57 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.3 2002/12/23 21:23:58 jlam Exp $
+$NetBSD: patch-ab,v 1.4 2004/11/16 07:46:57 jlam Exp $
--- configure.in.orig Tue Jul 9 02:17:13 2002
+++ configure.in
@@ -34,22 +34,3 @@
/usr/local/lib /usr/local/share/lib"
DICT_FILE_CANDIDATES="pw_dict cracklib_dict"
CRACKLIB_DICTPATH=""
-@@ -305,6 +312,18 @@ if test "$GCC" = yes; then
- case $OS in
- linux)
- OS_CFLAGS="-ansi -D_POSIX_SOURCE -pedantic"
-+ LD_D="gcc -shared -Xlinker -x"
-+ WARNINGS="$GCC_WARNINGS"
-+ PIC="-fPIC"
-+ DYNTYPE=so
-+ LD=ld
-+ LD_L="$LD -x -shared"
-+ RANLIB=ranlib
-+ STRIP=strip
-+ CC_STATIC="-Xlinker -export-dynamic"
-+ ;;
-+ netbsd)
-+ OS_CFLAGS=""
- LD_D="gcc -shared -Xlinker -x"
- WARNINGS="$GCC_WARNINGS"
- PIC="-fPIC"
diff -r db0370cc3bb5 -r 1f9c2c668f87 security/PAM/patches/patch-ac
--- a/security/PAM/patches/patch-ac Tue Nov 16 06:19:23 2004 +0000
+++ b/security/PAM/patches/patch-ac Tue Nov 16 07:46:57 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.3 2002/12/23 21:23:58 jlam Exp $
+$NetBSD: patch-ac,v 1.4 2004/11/16 07:46:57 jlam Exp $
--- configure.orig Tue Jul 9 02:17:13 2002
+++ configure
@@ -201,22 +201,3 @@
/usr/local/lib /usr/local/share/lib"
DICT_FILE_CANDIDATES="pw_dict cracklib_dict"
CRACKLIB_DICTPATH=""
-@@ -2475,6 +2612,18 @@ if test "$GCC" = yes; then
- case $OS in
- linux)
- OS_CFLAGS="-ansi -D_POSIX_SOURCE -pedantic"
-+ LD_D="gcc -shared -Xlinker -x"
-+ WARNINGS="$GCC_WARNINGS"
-+ PIC="-fPIC"
-+ DYNTYPE=so
-+ LD=ld
-+ LD_L="$LD -x -shared"
-+ RANLIB=ranlib
-+ STRIP=strip
-+ CC_STATIC="-Xlinker -export-dynamic"
-+ ;;
-+ netbsd)
-+ OS_CFLAGS=""
- LD_D="gcc -shared -Xlinker -x"
- WARNINGS="$GCC_WARNINGS"
- PIC="-fPIC"
diff -r db0370cc3bb5 -r 1f9c2c668f87 security/PAM/patches/patch-ad
--- a/security/PAM/patches/patch-ad Tue Nov 16 06:19:23 2004 +0000
+++ b/security/PAM/patches/patch-ad Tue Nov 16 07:46:57 2004 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.4 2004/01/08 00:07:26 jlam Exp $
+$NetBSD: patch-ad,v 1.5 2004/11/16 07:46:57 jlam Exp $
---- libpam/Makefile.orig Sun Dec 9 16:44:58 2001
-+++ libpam/Makefile Thu Sep 11 19:50:44 2003
+--- libpam/Makefile.orig 2001-12-09 16:44:58.000000000 -0500
++++ libpam/Makefile
@@ -6,7 +6,7 @@
include ../Make.Rules
@@ -11,15 +11,133 @@
ifeq ($(WITH_LIBDEBUG),yes)
LIBNAME=libpamd
-@@ -125,8 +125,9 @@
+@@ -36,6 +36,10 @@ LIBPAMFULL = $(LIBPAMNAME)$(MODIFICATION
Home |
Main Index |
Thread Index |
Old Index