From ac445d2404712acbeb9a61baa320bb9c94a4b013 Mon Sep 17 00:00:00 2001
From: markm <markm@FreeBSD.org>
Date: Thu, 3 May 2001 10:55:48 +0000
Subject: [PATCH] Update for (Linux-)PAM 0.75

---
 lib/libpam/libpam/Makefile              | 18 +++----
 lib/libpam/libpam/security/_pam_aconf.h | 66 +++++++++++++++++++++++++
 2 files changed, 74 insertions(+), 10 deletions(-)
 create mode 100644 lib/libpam/libpam/security/_pam_aconf.h

diff --git a/lib/libpam/libpam/Makefile b/lib/libpam/libpam/Makefile
index 344be7f465fd..7cdf5d5626df 100644
--- a/lib/libpam/libpam/Makefile
+++ b/lib/libpam/libpam/Makefile
@@ -24,16 +24,21 @@
 #
 #	$FreeBSD$
 
+LIBPAM_VERSION_MAJOR=	0
+LIBPAM_VERSION_MINOR=	75
+
 PAMDIR=		${.CURDIR}/../../../contrib/libpam
 MODOBJDIR=	../modules
 
 .PATH:		${PAMDIR}/libpam ${PAMDIR}/libpam_misc ${PAMDIR}/doc/man
 
 LIB=		pam
-CFLAGS+=	-I${PAMDIR}/libpam/include -I.
-CFLAGS+=	-DDEFAULT_MODULE_PATH=\"${SHLIBDIR}/\"
+CFLAGS+=	-I${PAMDIR}/libpam/include -I${PAMDIR}/libpam_misc/include \
+		-I${PAMDIR}/libpamc/include -I. -I${.CURDIR}
+CFLAGS+=	-DDEFAULT_MODULE_PATH=\"${SHLIBDIR}/\" \
+		-DLIBPAM_VERSION_MAJOR=${LIBPAM_VERSION_MAJOR} \
+		-DLIBPAM_VERSION_MINOR=${LIBPAM_VERSION_MINOR}
 NOPROFILE=	yes
-CLEANFILES+=	security
 
 # Files from ${PAMDIR}/libpam:
 SRCS=		pam_account.c pam_auth.c pam_data.c pam_delay.c \
@@ -106,10 +111,6 @@ pam_static_modules.o:	pam_static.o ${STATIC_MODULES}
 	${LD} -o ${.TARGET} -r -Bforcearchive ${.ALLSRC}
 .endif
 
-all:		security
-
-beforedepend:	security
-
 beforeinstall:
 	cd ${PAMDIR}/libpam/include/security; \
 		${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \
@@ -121,7 +122,4 @@ beforeinstall:
 		${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \
 		${HDRS3} ${DESTDIR}/usr/include/security
 
-security:
-	ln -sf ${PAMDIR}/libpam_misc security
-
 .include <bsd.lib.mk>
diff --git a/lib/libpam/libpam/security/_pam_aconf.h b/lib/libpam/libpam/security/_pam_aconf.h
new file mode 100644
index 000000000000..10e93c6a23d0
--- /dev/null
+++ b/lib/libpam/libpam/security/_pam_aconf.h
@@ -0,0 +1,66 @@
+/* _pam_aconf.h.  Generated automatically by configure.  */
+/*
+ * $Id: _pam_aconf.h.in,v 1.4 2000/12/04 20:56:10 baggins Exp $
+ * $FreeBSD$
+ *
+ * 
+ */
+
+#ifndef PAM_ACONF_H
+#define PAM_ACONF_H
+
+/* lots of stuff gets written to /tmp/pam-debug.log */
+/* #undef DEBUG */
+
+/* build libraries with different names (suffixed with 'd') */
+/* #undef WITH_LIBDEBUG */
+
+/* provide a global locking facility within libpam */
+/* #undef PAM_LOCKING */
+
+/* GNU systems as a class, all have the feature.h file */
+/* #undef HAVE_FEATURES_H */
+#ifdef HAVE_FEATURES_H
+# define _SVID_SOURCE
+# define _BSD_SOURCE
+# define __USE_BSD
+# define __USE_SVID
+# define __USE_MISC
+# define _GNU_SOURCE
+# include <features.h>
+#endif /* HAVE_FEATURES_H */
+
+/* we have libcrack available */
+/* #undef HAVE_LIBCRACK */
+
+/* we have libcrypt - its not part of libc (do we need both definitions?) */
+/* #undef HAVE_LIBCRYPT */
+/* #undef HAVE_CRYPT_H */
+
+/* we have libndbm and/or libdb */
+#define HAVE_DB_H 1
+#define HAVE_NDBM_H 1
+
+/* have libfl (Flex) */
+#define HAVE_LIBFL 1
+
+/* have libnsl - instead of libc support */
+/* #undef HAVE_LIBNSL */
+
+/* have libpwdb - don't expect this to be important for much longer */
+/* #undef HAVE_LIBPWDB */
+
+/* ugly hack to partially support old pam_strerror syntax */
+/* #undef UGLY_HACK_FOR_PRIOR_BEHAVIOR_SUPPORT */
+
+/* read both confs - read /etc/pam.d and /etc/pam.conf in serial */
+/* #undef PAM_READ_BOTH_CONFS */
+
+#define HAVE_PATHS_H 1
+#ifdef HAVE_PATHS_H
+#include <paths.h>
+#endif
+/* location of the mail spool directory */
+#define PAM_PATH_MAILDIR _PATH_MAILDIR
+
+#endif /* PAM_ACONF_H */