From 64431545370d85deb9bcc195834bc2dd70afe33e Mon Sep 17 00:00:00 2001
From: Peter Avalos <pavalos@dragonflybsd.org>
Date: Wed, 11 Jul 2012 02:12:36 -0700
Subject: [PATCH] Update files for OpenPAM Micrampelis import.

---
 lib/libpam/Makefile | 13 ++++++++++++-
 lib/libpam/config.h | 14 ++++++++++----
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/lib/libpam/Makefile b/lib/libpam/Makefile
index 41afd2a06a..da9c1debee 100644
--- a/lib/libpam/Makefile
+++ b/lib/libpam/Makefile
@@ -6,7 +6,7 @@ MODULE_DIR=	${LIBDIR}/security
 
 CFLAGS+= -DHAVE_CONFIG_H
 CFLAGS+= -DOPENPAM_MODULES_DIR='"${MODULE_DIR}/"'
-CFLAGS+= -I${SRCDIR}/lib -I${.CURDIR}
+CFLAGS+= -I${SRCDIR}/lib -I${SRCDIR}/include -I${.CURDIR}
 
 # Dist files
 SRCS=	openpam_borrow_cred.c \
@@ -15,17 +15,23 @@ SRCS=	openpam_borrow_cred.c \
 	openpam_constants.c \
 	openpam_dispatch.c \
 	openpam_dynamic.c \
+	openpam_features.c \
 	openpam_findenv.c \
 	openpam_free_data.c \
 	openpam_free_envlist.c \
+	openpam_get_feature.c \
 	openpam_get_option.c \
 	openpam_load.c \
 	openpam_log.c \
 	openpam_nullconv.c \
 	openpam_readline.c \
+	openpam_readlinev.c \
+	openpam_readword.c \
 	openpam_restore_cred.c \
 	openpam_set_option.c \
+	openpam_set_feature.c \
 	openpam_static.c \
+	openpam_straddch.c \
 	openpam_subst.c \
 	openpam_ttyconv.c \
 	pam_acct_mgmt.c \
@@ -92,12 +98,17 @@ MAN=	pam_acct_mgmt.3 \
 	openpam_borrow_cred.3 \
 	openpam_free_data.3 \
 	openpam_free_envlist.3 \
+	openpam_get_feature.3 \
 	openpam_get_option.3 \
 	openpam_log.3 \
 	openpam_nullconv.3 \
 	openpam_readline.3 \
+	openpam_readlinev.3 \
+	openpam_readword.3 \
 	openpam_restore_cred.3 \
+	openpam_set_feature.3 \
 	openpam_set_option.3 \
+	openpam_straddch.3 \
 	openpam_subst.3 \
 	openpam_ttyconv.3 \
 	pam_error.3 \
diff --git a/lib/libpam/config.h b/lib/libpam/config.h
index 224442a9b7..d8fc1736ab 100644
--- a/lib/libpam/config.h
+++ b/lib/libpam/config.h
@@ -10,6 +10,9 @@
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #define HAVE_DLFCN_H 1
 
+/* Define to 1 if you have the `fdlopen' function. */
+#define HAVE_FDLOPEN 1
+
 /* Define to 1 if you have the `fpurge' function. */
 #define HAVE_FPURGE 1
 
@@ -20,7 +23,7 @@
 #define HAVE_LIBCRYPT 1
 
 /* Define to 1 if you have the `dl' library (-ldl). */
-/* #undef HAVE_LIBDL */
+#define HAVE_LIBDL 1
 
 /* Define to 1 if you have the <memory.h> header file. */
 #define HAVE_MEMORY_H 1
@@ -37,6 +40,9 @@
 /* Define to 1 if you have the <string.h> header file. */
 #define HAVE_STRING_H 1
 
+/* Define to 1 if you have the `strlcat' function. */
+#define HAVE_STRLCAT 1
+
 /* Define to 1 if you have the `strlcmp' function. */
 /* #undef HAVE_STRLCMP */
 
@@ -76,7 +82,7 @@
 #define PACKAGE_NAME "OpenPAM"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "OpenPAM 20111218"
+#define PACKAGE_STRING "OpenPAM 20120526"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "openpam"
@@ -85,7 +91,7 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "20111218"
+#define PACKAGE_VERSION "20120526"
 
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
@@ -113,7 +119,7 @@
 
 
 /* Version number of package */
-#define VERSION "20111218"
+#define VERSION "20120526"
 
 /* Define to 1 if on MINIX. */
 /* #undef _MINIX */
-- 
2.41.0