Move tty_secure back out of libpam for the duration

1 files changed, 203 insertions, 19548 deletions

diff --git a/patches-applied/autoconf.patch b/patches-applied/autoconf.patch
index 48cdeffc..e18a43ce 100644
--- a/patches-applied/autoconf.patch
+++ b/patches-applied/autoconf.patch
@@ -11,116 +11,16 @@ Index: pam/Linux-PAM/Makefile.in
 ===================================================================
 --- pam.orig/Linux-PAM/Makefile.in
 +++ pam/Linux-PAM/Makefile.in
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -17,11 +17,15 @@
- #
- # Copyright (c) 2005, 2006, 2007 Thorsten Kukuk <kukuk@thkukuk.de>
- #
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = .
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -35,12 +39,12 @@
- POST_UNINSTALL = :
- build_triplet = @build@
- host_triplet = @host@
--subdir = .
+@@ -39,7 +39,7 @@
  DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
  	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
  	$(top_srcdir)/configure ABOUT-NLS AUTHORS COPYING ChangeLog \
 -	INSTALL NEWS compile config.guess config.rpath config.sub \
 +	INSTALL NEWS TODO compile config.guess config.rpath config.sub \
  	depcomp install-sh ltmain.sh missing mkinstalldirs ylwrap
-+subdir = .
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
- 	$(top_srcdir)/m4/iconv.m4 \
-@@ -54,7 +58,7 @@
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
- am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
-- configure.lineno config.status.lineno
-+ configure.lineno configure.status.lineno
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = config.h
- CONFIG_CLEAN_FILES =
-@@ -62,13 +66,10 @@
- DIST_SOURCES =
- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
- 	html-recursive info-recursive install-data-recursive \
--	install-dvi-recursive install-exec-recursive \
--	install-html-recursive install-info-recursive \
--	install-pdf-recursive install-ps-recursive install-recursive \
--	installcheck-recursive installdirs-recursive pdf-recursive \
--	ps-recursive uninstall-recursive
--RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
--  distclean-recursive maintainer-clean-recursive
-+	install-exec-recursive install-info-recursive \
-+	install-recursive installcheck-recursive installdirs-recursive \
-+	pdf-recursive ps-recursive uninstall-info-recursive \
-+	uninstall-recursive
- ETAGS = etags
- CTAGS = ctags
- DIST_SUBDIRS = libpam tests libpamc libpam_misc modules po conf doc \
-@@ -85,6 +86,8 @@
- distuninstallcheck_listfiles = find . -type f -print
- distcleancheck_listfiles = find . -type f -print
- ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -109,6 +112,10 @@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
-+ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
-+ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
-+ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
-+ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -117,7 +124,18 @@
- GMSGFMT_015 = @GMSGFMT_015@
- GREP = @GREP@
- HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
--INSTALL = @INSTALL@
-+HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
-+HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
-+HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
-+HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
-+HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
-+HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
-+HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
-+HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
-+HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
-+HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
-+HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
-+HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -129,6 +147,7 @@
+@@ -129,6 +129,7 @@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
  LIBAUDIT = @LIBAUDIT@
@@ -128,229 +28,14 @@ Index: pam/Linux-PAM/Makefile.in
  LIBCRACK = @LIBCRACK@
  LIBCRYPT = @LIBCRYPT@
  LIBDB = @LIBDB@
-@@ -152,7 +171,6 @@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
--MKDIR_P = @MKDIR_P@
- MSGFMT = @MSGFMT@
- MSGFMT_015 = @MSGFMT_015@
- MSGMERGE = @MSGMERGE@
-@@ -171,8 +189,11 @@
+@@ -171,6 +172,7 @@
  RANLIB = @RANLIB@
  SCONFIGDIR = @SCONFIGDIR@
  SECUREDIR = @SECUREDIR@
 +SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
-+STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
-+STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
  STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -186,13 +207,13 @@
- XSLTPROC = @XSLTPROC@
- YACC = @YACC@
- YFLAGS = @YFLAGS@
--abs_builddir = @abs_builddir@
--abs_srcdir = @abs_srcdir@
--abs_top_builddir = @abs_top_builddir@
--abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -204,7 +225,6 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
--builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -235,11 +255,8 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_builddir = @top_builddir@
--top_srcdir = @top_srcdir@
- AUTOMAKE_OPTIONS = 1.9 gnu dist-bzip2 check-news
- @STATIC_MODULES_FALSE@SUBDIRS = libpam tests libpamc libpam_misc modules po conf doc examples xtests
- @STATIC_MODULES_TRUE@SUBDIRS = modules libpam libpamc libpam_misc tests po conf doc examples xtests
-@@ -300,7 +317,7 @@
- config.h: stamp-h1
- 	@if test ! -f $@; then \
- 	  rm -f stamp-h1; \
--	  $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
-+	  $(MAKE) stamp-h1; \
- 	else :; fi
- 
- stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
-@@ -322,6 +339,7 @@
- 
- distclean-libtool:
- 	-rm -f libtool
-+uninstall-info-am:
- 
- # This directory's subdirectories are mostly independent; you can cd
- # into them and run `make' without going through this Makefile.
-@@ -354,7 +372,8 @@
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
- 	fi; test -z "$$fail"
- 
--$(RECURSIVE_CLEAN_TARGETS):
-+mostlyclean-recursive clean-recursive distclean-recursive \
-+maintainer-clean-recursive:
- 	@failcom='exit 1'; \
- 	for f in x $$MAKEFLAGS; do \
- 	  case $$f in \
-@@ -462,22 +481,24 @@
- 	  exit 1;; \
- 	esac
- 	$(am__remove_distdir)
--	test -d $(distdir) || mkdir $(distdir)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	list='$(DISTFILES)'; \
--	  dist_files=`for file in $$list; do echo $$file; done | \
--	  sed -e "s|^$$srcdirstrip/||;t" \
--	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
--	case $$dist_files in \
--	  */*) $(MKDIR_P) `echo "$$dist_files" | \
--			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
--			   sort -u` ;; \
--	esac; \
--	for file in $$dist_files; do \
-+	mkdir $(distdir)
-+	$(mkdir_p) $(distdir)/m4 $(distdir)/po
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
- 	  if test -d $$d/$$file; then \
--	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- 	    fi; \
-@@ -491,7 +512,7 @@
- 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- 	  if test "$$subdir" = .; then :; else \
- 	    test -d "$(distdir)/$$subdir" \
--	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-+	    || $(mkdir_p) "$(distdir)/$$subdir" \
- 	    || exit 1; \
- 	    distdir=`$(am__cd) $(distdir) && pwd`; \
- 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-@@ -499,8 +520,6 @@
- 	      $(MAKE) $(AM_MAKEFLAGS) \
- 	        top_distdir="$$top_distdir" \
- 	        distdir="$$distdir/$$subdir" \
--		am__remove_distdir=: \
--		am__skip_length_check=: \
- 	        distdir) \
- 	      || exit 1; \
- 	  fi; \
-@@ -508,7 +527,7 @@
- 	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
- 	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
- 	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
--	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
-+	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
- 	|| chmod -R a+r $(distdir)
- dist-gzip: distdir
- 	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-@@ -583,7 +602,7 @@
- 	$(am__remove_distdir)
- 	@(echo "$(distdir) archives ready for distribution: "; \
- 	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
--	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
-+	  sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
- distuninstallcheck:
- 	@cd $(distuninstallcheck_dir) \
- 	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
-@@ -654,20 +673,12 @@
- 
- install-data-am:
- 
--install-dvi: install-dvi-recursive
--
- install-exec-am:
- 
--install-html: install-html-recursive
--
- install-info: install-info-recursive
- 
- install-man:
- 
--install-pdf: install-pdf-recursive
--
--install-ps: install-ps-recursive
--
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-recursive
-@@ -688,26 +699,24 @@
- 
- ps-am:
- 
--uninstall-am:
-+uninstall-am: uninstall-info-am
- 
--.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
--	install-strip
-+uninstall-info: uninstall-info-recursive
- 
--.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
--	all all-am am--refresh check check-am clean clean-generic \
--	clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
--	dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \
-+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
-+	check-am clean clean-generic clean-libtool clean-recursive \
-+	ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
-+	dist-shar dist-tarZ dist-zip distcheck distclean \
- 	distclean-generic distclean-hdr distclean-libtool \
--	distclean-tags distcleancheck distdir distuninstallcheck dvi \
--	dvi-am html html-am info info-am install install-am \
--	install-data install-data-am install-dvi install-dvi-am \
--	install-exec install-exec-am install-html install-html-am \
--	install-info install-info-am install-man install-pdf \
--	install-pdf-am install-ps install-ps-am install-strip \
--	installcheck installcheck-am installdirs installdirs-am \
--	maintainer-clean maintainer-clean-generic mostlyclean \
--	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
--	tags tags-recursive uninstall uninstall-am
-+	distclean-recursive distclean-tags distcleancheck distdir \
-+	distuninstallcheck dvi dvi-am html html-am info info-am \
-+	install install-am install-data install-data-am install-exec \
-+	install-exec-am install-info install-info-am install-man \
-+	install-strip installcheck installcheck-am installdirs \
-+	installdirs-am maintainer-clean maintainer-clean-generic \
-+	maintainer-clean-recursive mostlyclean mostlyclean-generic \
-+	mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
-+	tags tags-recursive uninstall uninstall-am uninstall-info-am
- 
- 
- release: dist releasedocs
 Index: pam/Linux-PAM/aclocal.m4
 ===================================================================
 --- pam.orig/Linux-PAM/aclocal.m4
@@ -1594,90 +1279,7 @@ Index: pam/Linux-PAM/conf/Makefile.in
 ===================================================================
 --- pam.orig/Linux-PAM/conf/Makefile.in
 +++ pam/Linux-PAM/conf/Makefile.in
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -13,11 +13,15 @@
- # PARTICULAR PURPOSE.
- 
- @SET_MAKE@
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -52,18 +56,17 @@
- DIST_SOURCES =
- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
- 	html-recursive info-recursive install-data-recursive \
--	install-dvi-recursive install-exec-recursive \
--	install-html-recursive install-info-recursive \
--	install-pdf-recursive install-ps-recursive install-recursive \
--	installcheck-recursive installdirs-recursive pdf-recursive \
--	ps-recursive uninstall-recursive
--RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
--  distclean-recursive maintainer-clean-recursive
-+	install-exec-recursive install-info-recursive \
-+	install-recursive installcheck-recursive installdirs-recursive \
-+	pdf-recursive ps-recursive uninstall-info-recursive \
-+	uninstall-recursive
- ETAGS = etags
- CTAGS = ctags
- DIST_SUBDIRS = $(SUBDIRS)
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -88,6 +91,10 @@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
-+ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
-+ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
-+ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
-+ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -96,7 +103,18 @@
- GMSGFMT_015 = @GMSGFMT_015@
- GREP = @GREP@
- HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
--INSTALL = @INSTALL@
-+HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
-+HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
-+HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
-+HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
-+HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
-+HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
-+HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
-+HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
-+HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
-+HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
-+HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
-+HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -108,6 +126,7 @@
+@@ -108,6 +108,7 @@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
  LIBAUDIT = @LIBAUDIT@
@@ -1685,313 +1287,19 @@ Index: pam/Linux-PAM/conf/Makefile.in
  LIBCRACK = @LIBCRACK@
  LIBCRYPT = @LIBCRYPT@
  LIBDB = @LIBDB@
-@@ -131,7 +150,6 @@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
--MKDIR_P = @MKDIR_P@
- MSGFMT = @MSGFMT@
- MSGFMT_015 = @MSGFMT_015@
- MSGMERGE = @MSGMERGE@
-@@ -150,8 +168,11 @@
+@@ -150,6 +151,7 @@
  RANLIB = @RANLIB@
  SCONFIGDIR = @SCONFIGDIR@
  SECUREDIR = @SECUREDIR@
 +SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
-+STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
-+STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
  STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -165,13 +186,13 @@
- XSLTPROC = @XSLTPROC@
- YACC = @YACC@
- YFLAGS = @YFLAGS@
--abs_builddir = @abs_builddir@
--abs_srcdir = @abs_srcdir@
--abs_top_builddir = @abs_top_builddir@
--abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -183,7 +204,6 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
--builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -214,11 +234,8 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_builddir = @top_builddir@
--top_srcdir = @top_srcdir@
- SUBDIRS = pam_conv1
- CLEANFILES = *~
- EXTRA_DIST = install_conf md5itall pam.conf
-@@ -261,6 +278,10 @@
- clean-libtool:
- 	-rm -rf .libs _libs
- 
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
-+
- # This directory's subdirectories are mostly independent; you can cd
- # into them and run `make' without going through this Makefile.
- # To change the values of `make' variables: instead of editing Makefiles,
-@@ -292,7 +313,8 @@
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
- 	fi; test -z "$$fail"
- 
--$(RECURSIVE_CLEAN_TARGETS):
-+mostlyclean-recursive clean-recursive distclean-recursive \
-+maintainer-clean-recursive:
- 	@failcom='exit 1'; \
- 	for f in x $$MAKEFLAGS; do \
- 	  case $$f in \
-@@ -393,21 +415,22 @@
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	list='$(DISTFILES)'; \
--	  dist_files=`for file in $$list; do echo $$file; done | \
--	  sed -e "s|^$$srcdirstrip/||;t" \
--	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
--	case $$dist_files in \
--	  */*) $(MKDIR_P) `echo "$$dist_files" | \
--			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
--			   sort -u` ;; \
--	esac; \
--	for file in $$dist_files; do \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
- 	  if test -d $$d/$$file; then \
--	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- 	    fi; \
-@@ -421,7 +444,7 @@
- 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- 	  if test "$$subdir" = .; then :; else \
- 	    test -d "$(distdir)/$$subdir" \
--	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-+	    || $(mkdir_p) "$(distdir)/$$subdir" \
- 	    || exit 1; \
- 	    distdir=`$(am__cd) $(distdir) && pwd`; \
- 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-@@ -429,8 +452,6 @@
- 	      $(MAKE) $(AM_MAKEFLAGS) \
- 	        top_distdir="$$top_distdir" \
- 	        distdir="$$distdir/$$subdir" \
--		am__remove_distdir=: \
--		am__skip_length_check=: \
- 	        distdir) \
- 	      || exit 1; \
- 	  fi; \
-@@ -471,7 +492,8 @@
- 
- distclean: distclean-recursive
- 	-rm -f Makefile
--distclean-am: clean-am distclean-generic distclean-tags
-+distclean-am: clean-am distclean-generic distclean-libtool \
-+	distclean-tags
- 
- dvi: dvi-recursive
- 
-@@ -485,20 +507,12 @@
- 
- install-data-am:
- 
--install-dvi: install-dvi-recursive
--
- install-exec-am:
- 
--install-html: install-html-recursive
--
- install-info: install-info-recursive
- 
- install-man:
- 
--install-pdf: install-pdf-recursive
--
--install-ps: install-ps-recursive
--
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-recursive
-@@ -517,24 +531,22 @@
- 
- ps-am:
- 
--uninstall-am:
-+uninstall-am: uninstall-info-am
- 
--.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
--	install-strip
-+uninstall-info: uninstall-info-recursive
- 
--.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
--	all all-am check check-am clean clean-generic clean-libtool \
--	ctags ctags-recursive distclean distclean-generic \
--	distclean-libtool distclean-tags distdir dvi dvi-am html \
-+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-+	clean clean-generic clean-libtool clean-recursive ctags \
-+	ctags-recursive distclean distclean-generic distclean-libtool \
-+	distclean-recursive distclean-tags distdir dvi dvi-am html \
- 	html-am info info-am install install-am install-data \
--	install-data-am install-dvi install-dvi-am install-exec \
--	install-exec-am install-html install-html-am install-info \
--	install-info-am install-man install-pdf install-pdf-am \
--	install-ps install-ps-am install-strip installcheck \
-+	install-data-am install-exec install-exec-am install-info \
-+	install-info-am install-man install-strip installcheck \
- 	installcheck-am installdirs installdirs-am maintainer-clean \
--	maintainer-clean-generic mostlyclean mostlyclean-generic \
--	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
--	uninstall uninstall-am
-+	maintainer-clean-generic maintainer-clean-recursive \
-+	mostlyclean mostlyclean-generic mostlyclean-libtool \
-+	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-+	uninstall uninstall-am uninstall-info-am
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
 Index: pam/Linux-PAM/conf/pam_conv1/Makefile.in
 ===================================================================
 --- pam.orig/Linux-PAM/conf/pam_conv1/Makefile.in
 +++ pam/Linux-PAM/conf/pam_conv1/Makefile.in
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -18,11 +18,15 @@
- # Copyright (c) 2005 Thorsten Kukuk <kukuk@suse.de>
- #
- 
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ../..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -59,31 +63,30 @@
- am_pam_conv1_OBJECTS = pam_conv_l.$(OBJEXT) pam_conv_y.$(OBJEXT)
- pam_conv1_OBJECTS = $(am_pam_conv1_OBJECTS)
- pam_conv1_DEPENDENCIES =
--DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
--	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+	$(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
--	$(LDFLAGS) -o $@
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- LEXCOMPILE = $(LEX) $(LFLAGS) $(AM_LFLAGS)
--LTLEXCOMPILE = $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=compile $(LEX) $(LFLAGS) $(AM_LFLAGS)
--YLWRAP = $(top_srcdir)/ylwrap
-+LTLEXCOMPILE = $(LIBTOOL) --mode=compile $(LEX) $(LFLAGS) $(AM_LFLAGS)
- YACCCOMPILE = $(YACC) $(YFLAGS) $(AM_YFLAGS)
--LTYACCCOMPILE = $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=compile $(YACC) $(YFLAGS) $(AM_YFLAGS)
-+LTYACCCOMPILE = $(LIBTOOL) --mode=compile $(YACC) $(YFLAGS) \
-+	$(AM_YFLAGS)
- SOURCES = $(pam_conv1_SOURCES)
- DIST_SOURCES = $(pam_conv1_SOURCES)
- ETAGS = etags
- CTAGS = ctags
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -108,6 +111,10 @@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
-+ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
-+ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
-+ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
-+ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -116,7 +123,18 @@
- GMSGFMT_015 = @GMSGFMT_015@
- GREP = @GREP@
- HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
--INSTALL = @INSTALL@
-+HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
-+HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
-+HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
-+HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
-+HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
-+HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
-+HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
-+HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
-+HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
-+HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
-+HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
-+HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -128,6 +146,7 @@
+@@ -128,6 +128,7 @@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
  LIBAUDIT = @LIBAUDIT@
@@ -1999,243 +1307,14 @@ Index: pam/Linux-PAM/conf/pam_conv1/Makefile.in
  LIBCRACK = @LIBCRACK@
  LIBCRYPT = @LIBCRYPT@
  LIBDB = @LIBDB@
-@@ -151,7 +170,6 @@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
--MKDIR_P = @MKDIR_P@
- MSGFMT = @MSGFMT@
- MSGFMT_015 = @MSGFMT_015@
- MSGMERGE = @MSGMERGE@
-@@ -170,8 +188,11 @@
+@@ -170,6 +171,7 @@
  RANLIB = @RANLIB@
  SCONFIGDIR = @SCONFIGDIR@
  SECUREDIR = @SECUREDIR@
 +SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
-+STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
-+STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
  STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -185,13 +206,13 @@
- XSLTPROC = @XSLTPROC@
- YACC = @YACC@
- YFLAGS = @YFLAGS@
--abs_builddir = @abs_builddir@
--abs_srcdir = @abs_srcdir@
--abs_top_builddir = @abs_top_builddir@
--abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -203,7 +224,6 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
--builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -234,11 +254,8 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_builddir = @top_builddir@
--top_srcdir = @top_srcdir@
- CLEANFILES = *~
- EXTRA_DIST = README
- AM_YFLAGS = -d
-@@ -289,11 +306,11 @@
- pam_conv_y.h: pam_conv_y.c
- 	@if test ! -f $@; then \
- 	  rm -f pam_conv_y.c; \
--	  $(MAKE) $(AM_MAKEFLAGS) pam_conv_y.c; \
-+	  $(MAKE) pam_conv_y.c; \
- 	else :; fi
- pam_conv1$(EXEEXT): $(pam_conv1_OBJECTS) $(pam_conv1_DEPENDENCIES) 
- 	@rm -f pam_conv1$(EXEEXT)
--	$(LINK) $(pam_conv1_OBJECTS) $(pam_conv1_LDADD) $(LIBS)
-+	$(LINK) $(pam_conv1_LDFLAGS) $(pam_conv1_OBJECTS) $(pam_conv1_LDADD) $(LIBS)
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
-@@ -305,31 +322,51 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_conv_y.Po@am__quote@
- 
- .c.o:
--@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c $<
- 
- .c.obj:
--@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
- 
- .c.lo:
--@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
- 
- .l.c:
--	$(am__skiplex) $(SHELL) $(YLWRAP) $< $(LEX_OUTPUT_ROOT).c $@ -- $(LEXCOMPILE)
-+	$(LEXCOMPILE) $<
-+	sed '/^#/ s|$(LEX_OUTPUT_ROOT)\.c|$@|' $(LEX_OUTPUT_ROOT).c >$@
-+	rm -f $(LEX_OUTPUT_ROOT).c
- 
- .y.c:
--	$(am__skipyacc) $(SHELL) $(YLWRAP) $< y.tab.c $@ y.tab.h $*.h y.output $*.output -- $(YACCCOMPILE)
-+	$(YACCCOMPILE) $<
-+	if test -f y.tab.h; then \
-+	  to=`echo "$*_H" | sed \
-+                -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \
-+                -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \
-+	  sed -e "/^#/!b" -e "s/Y_TAB_H/$$to/g" -e "s|y\.tab\.h|$*.h|" \
-+            y.tab.h >$*.ht; \
-+	  rm -f y.tab.h; \
-+	  if cmp -s $*.ht $*.h; then \
-+	    rm -f $*.ht ;\
-+	  else \
-+	    mv $*.ht $*.h; \
-+	  fi; \
-+	fi
-+	if test -f y.output; then \
-+	  mv y.output $*.output; \
-+	fi
-+	sed '/^#/ s|y\.tab\.c|$@|' y.tab.c >$@t && mv $@t $@
-+	rm -f y.tab.c
- 
- mostlyclean-libtool:
- 	-rm -f *.lo
-@@ -337,6 +374,10 @@
- clean-libtool:
- 	-rm -rf .libs _libs
- 
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
-+
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- 	unique=`for i in $$list; do \
-@@ -386,21 +427,22 @@
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	list='$(DISTFILES)'; \
--	  dist_files=`for file in $$list; do echo $$file; done | \
--	  sed -e "s|^$$srcdirstrip/||;t" \
--	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
--	case $$dist_files in \
--	  */*) $(MKDIR_P) `echo "$$dist_files" | \
--			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
--			   sort -u` ;; \
--	esac; \
--	for file in $$dist_files; do \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
- 	  if test -d $$d/$$file; then \
--	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- 	    fi; \
-@@ -455,7 +497,7 @@
- 	-rm -rf ./$(DEPDIR)
- 	-rm -f Makefile
- distclean-am: clean-am distclean-compile distclean-generic \
--	distclean-tags
-+	distclean-libtool distclean-tags
- 
- dvi: dvi-am
- 
-@@ -469,20 +511,12 @@
- 
- install-data-am:
- 
--install-dvi: install-dvi-am
--
- install-exec-am:
- 
--install-html: install-html-am
--
- install-info: install-info-am
- 
- install-man:
- 
--install-pdf: install-pdf-am
--
--install-ps: install-ps-am
--
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
-@@ -503,22 +537,19 @@
- 
- ps-am:
- 
--uninstall-am:
--
--.MAKE: install-am install-strip
-+uninstall-am: uninstall-info-am
- 
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- 	clean-libtool clean-noinstPROGRAMS ctags distclean \
- 	distclean-compile distclean-generic distclean-libtool \
- 	distclean-tags distdir dvi dvi-am html html-am info info-am \
--	install install-am install-data install-data-am install-dvi \
--	install-dvi-am install-exec install-exec-am install-html \
--	install-html-am install-info install-info-am install-man \
--	install-pdf install-pdf-am install-ps install-ps-am \
-+	install install-am install-data install-data-am install-exec \
-+	install-exec-am install-info install-info-am install-man \
- 	install-strip installcheck installcheck-am installdirs \
- 	maintainer-clean maintainer-clean-generic mostlyclean \
- 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
--	pdf pdf-am ps ps-am tags uninstall uninstall-am
-+	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-+	uninstall-info-am
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
 Index: pam/Linux-PAM/config.h.in
 ===================================================================
 --- pam.orig/Linux-PAM/config.h.in
@@ -5147,97 +4226,7 @@ Index: pam/Linux-PAM/doc/Makefile.in
 ===================================================================
 --- pam.orig/Linux-PAM/doc/Makefile.in
 +++ pam/Linux-PAM/doc/Makefile.in
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -18,11 +18,15 @@
- # Copyright (c) 2005, 2006 Thorsten Kukuk <kukuk@suse.de>
- #
- 
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -58,11 +62,10 @@
- DIST_SOURCES =
- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
- 	html-recursive info-recursive install-data-recursive \
--	install-dvi-recursive install-exec-recursive \
--	install-html-recursive install-info-recursive \
--	install-pdf-recursive install-ps-recursive install-recursive \
--	installcheck-recursive installdirs-recursive pdf-recursive \
--	ps-recursive uninstall-recursive
-+	install-exec-recursive install-info-recursive \
-+	install-recursive installcheck-recursive installdirs-recursive \
-+	pdf-recursive ps-recursive uninstall-info-recursive \
-+	uninstall-recursive
- am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
- am__vpath_adj = case $$p in \
-     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-@@ -72,13 +75,13 @@
- am__installdirs = "$(DESTDIR)$(htmldir)"
- dist_htmlDATA_INSTALL = $(INSTALL_DATA)
- DATA = $(dist_html_DATA)
--RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
--  distclean-recursive maintainer-clean-recursive
- ETAGS = etags
- CTAGS = ctags
- DIST_SUBDIRS = $(SUBDIRS)
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -103,6 +106,10 @@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
-+ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
-+ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
-+ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
-+ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -111,7 +118,18 @@
- GMSGFMT_015 = @GMSGFMT_015@
- GREP = @GREP@
- HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
--INSTALL = @INSTALL@
-+HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
-+HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
-+HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
-+HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
-+HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
-+HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
-+HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
-+HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
-+HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
-+HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
-+HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
-+HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -123,6 +141,7 @@
+@@ -123,6 +123,7 @@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
  LIBAUDIT = @LIBAUDIT@
@@ -5245,293 +4234,19 @@ Index: pam/Linux-PAM/doc/Makefile.in
  LIBCRACK = @LIBCRACK@
  LIBCRYPT = @LIBCRYPT@
  LIBDB = @LIBDB@
-@@ -146,7 +165,6 @@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
--MKDIR_P = @MKDIR_P@
- MSGFMT = @MSGFMT@
- MSGFMT_015 = @MSGFMT_015@
- MSGMERGE = @MSGMERGE@
-@@ -165,8 +183,11 @@
+@@ -165,6 +166,7 @@
  RANLIB = @RANLIB@
  SCONFIGDIR = @SCONFIGDIR@
  SECUREDIR = @SECUREDIR@
 +SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
-+STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
-+STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
  STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -180,13 +201,13 @@
- XSLTPROC = @XSLTPROC@
- YACC = @YACC@
- YFLAGS = @YFLAGS@
--abs_builddir = @abs_builddir@
--abs_srcdir = @abs_srcdir@
--abs_top_builddir = @abs_top_builddir@
--abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -198,7 +219,6 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
--builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -229,11 +249,8 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_builddir = @top_builddir@
--top_srcdir = @top_srcdir@
- SUBDIRS = man specs sag adg mwg
- CLEANFILES = *~
- dist_html_DATA = index.html
-@@ -275,9 +292,13 @@
- 
- clean-libtool:
- 	-rm -rf .libs _libs
-+
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
- install-dist_htmlDATA: $(dist_html_DATA)
- 	@$(NORMAL_INSTALL)
--	test -z "$(htmldir)" || $(MKDIR_P) "$(DESTDIR)$(htmldir)"
-+	test -z "$(htmldir)" || $(mkdir_p) "$(DESTDIR)$(htmldir)"
- 	@list='$(dist_html_DATA)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  f=$(am__strip_dir) \
-@@ -324,7 +345,8 @@
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
- 	fi; test -z "$$fail"
- 
--$(RECURSIVE_CLEAN_TARGETS):
-+mostlyclean-recursive clean-recursive distclean-recursive \
-+maintainer-clean-recursive:
- 	@failcom='exit 1'; \
- 	for f in x $$MAKEFLAGS; do \
- 	  case $$f in \
-@@ -425,21 +447,22 @@
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	list='$(DISTFILES)'; \
--	  dist_files=`for file in $$list; do echo $$file; done | \
--	  sed -e "s|^$$srcdirstrip/||;t" \
--	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
--	case $$dist_files in \
--	  */*) $(MKDIR_P) `echo "$$dist_files" | \
--			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
--			   sort -u` ;; \
--	esac; \
--	for file in $$dist_files; do \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
- 	  if test -d $$d/$$file; then \
--	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- 	    fi; \
-@@ -453,7 +476,7 @@
- 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- 	  if test "$$subdir" = .; then :; else \
- 	    test -d "$(distdir)/$$subdir" \
--	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-+	    || $(mkdir_p) "$(distdir)/$$subdir" \
- 	    || exit 1; \
- 	    distdir=`$(am__cd) $(distdir) && pwd`; \
- 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-@@ -461,8 +484,6 @@
- 	      $(MAKE) $(AM_MAKEFLAGS) \
- 	        top_distdir="$$top_distdir" \
- 	        distdir="$$distdir/$$subdir" \
--		am__remove_distdir=: \
--		am__skip_length_check=: \
- 	        distdir) \
- 	      || exit 1; \
- 	  fi; \
-@@ -473,7 +494,7 @@
- installdirs: installdirs-recursive
- installdirs-am:
- 	for dir in "$(DESTDIR)$(htmldir)"; do \
--	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
- 	done
- install: install-recursive
- install-exec: install-exec-recursive
-@@ -506,7 +527,8 @@
- 
- distclean: distclean-recursive
- 	-rm -f Makefile
--distclean-am: clean-am distclean-generic distclean-tags
-+distclean-am: clean-am distclean-generic distclean-libtool \
-+	distclean-tags
- 
- dvi: dvi-recursive
- 
-@@ -520,20 +542,12 @@
- 
- install-data-am: install-dist_htmlDATA
- 
--install-dvi: install-dvi-recursive
--
- install-exec-am:
- 
--install-html: install-html-recursive
--
- install-info: install-info-recursive
- 
- install-man:
- 
--install-pdf: install-pdf-recursive
--
--install-ps: install-ps-recursive
--
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-recursive
-@@ -552,25 +566,23 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-dist_htmlDATA
-+uninstall-am: uninstall-dist_htmlDATA uninstall-info-am
- 
--.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
--	install-strip
-+uninstall-info: uninstall-info-recursive
- 
--.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
--	all all-am check check-am clean clean-generic clean-libtool \
--	ctags ctags-recursive distclean distclean-generic \
--	distclean-libtool distclean-tags distdir dvi dvi-am html \
-+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-+	clean clean-generic clean-libtool clean-recursive ctags \
-+	ctags-recursive distclean distclean-generic distclean-libtool \
-+	distclean-recursive distclean-tags distdir dvi dvi-am html \
- 	html-am info info-am install install-am install-data \
--	install-data-am install-dist_htmlDATA install-dvi \
--	install-dvi-am install-exec install-exec-am install-html \
--	install-html-am install-info install-info-am install-man \
--	install-pdf install-pdf-am install-ps install-ps-am \
-+	install-data-am install-dist_htmlDATA install-exec \
-+	install-exec-am install-info install-info-am install-man \
- 	install-strip installcheck installcheck-am installdirs \
- 	installdirs-am maintainer-clean maintainer-clean-generic \
--	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
--	ps ps-am tags tags-recursive uninstall uninstall-am \
--	uninstall-dist_htmlDATA
-+	maintainer-clean-recursive mostlyclean mostlyclean-generic \
-+	mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
-+	tags tags-recursive uninstall uninstall-am \
-+	uninstall-dist_htmlDATA uninstall-info-am
- 
- 
- #######################################################
 Index: pam/Linux-PAM/doc/adg/Makefile.in
 ===================================================================
 --- pam.orig/Linux-PAM/doc/adg/Makefile.in
 +++ pam/Linux-PAM/doc/adg/Makefile.in
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -17,11 +17,15 @@
- #
- # Copyright (c) 2006 Thorsten Kukuk <kukuk@thkukuk.de>
- #
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ../..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -56,6 +60,8 @@
- DIST_SOURCES =
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -80,6 +86,10 @@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
-+ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
-+ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
-+ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
-+ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -88,7 +98,18 @@
- GMSGFMT_015 = @GMSGFMT_015@
- GREP = @GREP@
- HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
--INSTALL = @INSTALL@
-+HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
-+HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
-+HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
-+HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
-+HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
-+HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
-+HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
-+HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
-+HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
-+HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
-+HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
-+HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -100,6 +121,7 @@
+@@ -100,6 +100,7 @@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
  LIBAUDIT = @LIBAUDIT@
@@ -5539,242 +4254,19 @@ Index: pam/Linux-PAM/doc/adg/Makefile.in
  LIBCRACK = @LIBCRACK@
  LIBCRYPT = @LIBCRYPT@
  LIBDB = @LIBDB@
-@@ -123,7 +145,6 @@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
--MKDIR_P = @MKDIR_P@
- MSGFMT = @MSGFMT@
- MSGFMT_015 = @MSGFMT_015@
- MSGMERGE = @MSGMERGE@
-@@ -142,8 +163,11 @@
+@@ -142,6 +143,7 @@
  RANLIB = @RANLIB@
  SCONFIGDIR = @SCONFIGDIR@
  SECUREDIR = @SECUREDIR@
 +SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
-+STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
-+STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
  STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -157,13 +181,13 @@
- XSLTPROC = @XSLTPROC@
- YACC = @YACC@
- YFLAGS = @YFLAGS@
--abs_builddir = @abs_builddir@
--abs_srcdir = @abs_srcdir@
--abs_top_builddir = @abs_top_builddir@
--abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -175,7 +199,6 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
--builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -206,11 +229,8 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_builddir = @top_builddir@
--top_srcdir = @top_srcdir@
- CLEANFILES = Linux-PAM_ADG.fo *~
- EXTRA_DIST = $(XMLS)
- XMLS = Linux-PAM_ADG.xml $(shell ls $(srcdir)/pam_*.xml)
-@@ -254,6 +274,10 @@
- 
- clean-libtool:
- 	-rm -rf .libs _libs
-+
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
- tags: TAGS
- TAGS:
- 
-@@ -262,21 +286,23 @@
- 
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	list='$(DISTFILES)'; \
--	  dist_files=`for file in $$list; do echo $$file; done | \
--	  sed -e "s|^$$srcdirstrip/||;t" \
--	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
--	case $$dist_files in \
--	  */*) $(MKDIR_P) `echo "$$dist_files" | \
--			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
--			   sort -u` ;; \
--	esac; \
--	for file in $$dist_files; do \
-+	$(mkdir_p) $(distdir)/$(srcdir)
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
- 	  if test -d $$d/$$file; then \
--	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- 	    fi; \
-@@ -324,7 +350,8 @@
- 
- distclean: distclean-am
- 	-rm -f Makefile
--distclean-am: clean-am distclean-generic distclean-local
-+distclean-am: clean-am distclean-generic distclean-libtool \
-+	distclean-local
- 
- dvi: dvi-am
- 
-@@ -338,20 +365,12 @@
- 
- install-data-am: install-data-local
- 
--install-dvi: install-dvi-am
--
- install-exec-am:
- 
--install-html: install-html-am
--
- install-info: install-info-am
- 
- install-man:
- 
--install-pdf: install-pdf-am
--
--install-ps: install-ps-am
--
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
-@@ -370,21 +389,18 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-local
--
--.MAKE: install-am install-strip
-+uninstall-am: uninstall-info-am uninstall-local
- 
- .PHONY: all all-am check check-am clean clean-generic clean-libtool \
- 	distclean distclean-generic distclean-libtool distclean-local \
- 	distdir dvi dvi-am html html-am info info-am install \
- 	install-am install-data install-data-am install-data-local \
--	install-dvi install-dvi-am install-exec install-exec-am \
--	install-html install-html-am install-info install-info-am \
--	install-man install-pdf install-pdf-am install-ps \
--	install-ps-am install-strip installcheck installcheck-am \
-+	install-exec install-exec-am install-info install-info-am \
-+	install-man install-strip installcheck installcheck-am \
- 	installdirs maintainer-clean maintainer-clean-generic \
- 	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
--	ps ps-am uninstall uninstall-am uninstall-local
-+	ps ps-am uninstall uninstall-am uninstall-info-am \
-+	uninstall-local
- 
- 
- @ENABLE_REGENERATE_MAN_TRUE@all: Linux-PAM_ADG.txt html/Linux-PAM_ADG.html Linux-PAM_ADG.pdf
 Index: pam/Linux-PAM/doc/man/Makefile.in
 ===================================================================
 --- pam.orig/Linux-PAM/doc/man/Makefile.in
 +++ pam/Linux-PAM/doc/man/Makefile.in
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -17,11 +17,15 @@
- #
- # Copyright (c) 2006 Thorsten Kukuk <kukuk@thkukuk.de>
- #
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ../..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -63,6 +67,8 @@
- MANS = $(man_MANS)
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -87,6 +93,10 @@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
-+ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
-+ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
-+ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
-+ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -95,7 +105,18 @@
- GMSGFMT_015 = @GMSGFMT_015@
- GREP = @GREP@
- HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
--INSTALL = @INSTALL@
-+HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
-+HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
-+HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
-+HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
-+HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
-+HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
-+HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
-+HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
-+HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
-+HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
-+HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
-+HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -107,6 +128,7 @@
+@@ -107,6 +107,7 @@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
  LIBAUDIT = @LIBAUDIT@
@@ -5782,274 +4274,19 @@ Index: pam/Linux-PAM/doc/man/Makefile.in
  LIBCRACK = @LIBCRACK@
  LIBCRYPT = @LIBCRYPT@
  LIBDB = @LIBDB@
-@@ -130,7 +152,6 @@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
--MKDIR_P = @MKDIR_P@
- MSGFMT = @MSGFMT@
- MSGFMT_015 = @MSGFMT_015@
- MSGMERGE = @MSGMERGE@
-@@ -149,8 +170,11 @@
+@@ -149,6 +150,7 @@
  RANLIB = @RANLIB@
  SCONFIGDIR = @SCONFIGDIR@
  SECUREDIR = @SECUREDIR@
 +SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
-+STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
-+STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
  STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -164,13 +188,13 @@
- XSLTPROC = @XSLTPROC@
- YACC = @YACC@
- YFLAGS = @YFLAGS@
--abs_builddir = @abs_builddir@
--abs_srcdir = @abs_srcdir@
--abs_top_builddir = @abs_top_builddir@
--abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -182,7 +206,6 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
--builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -213,11 +236,8 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_builddir = @top_builddir@
--top_srcdir = @top_srcdir@
- CLEANFILES = *~
- EXTRA_DIST = $(MANS) $(XMLS)
- man_MANS = pam.3 PAM.8 pam.8 pam.conf.5 pam.d.5 \
-@@ -296,9 +316,13 @@
- 
- clean-libtool:
- 	-rm -rf .libs _libs
-+
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
- install-man3: $(man3_MANS) $(man_MANS)
- 	@$(NORMAL_INSTALL)
--	test -z "$(man3dir)" || $(MKDIR_P) "$(DESTDIR)$(man3dir)"
-+	test -z "$(man3dir)" || $(mkdir_p) "$(DESTDIR)$(man3dir)"
- 	@list='$(man3_MANS) $(dist_man3_MANS) $(nodist_man3_MANS)'; \
- 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
- 	for i in $$l2; do \
-@@ -343,7 +367,7 @@
- 	done
- install-man5: $(man5_MANS) $(man_MANS)
- 	@$(NORMAL_INSTALL)
--	test -z "$(man5dir)" || $(MKDIR_P) "$(DESTDIR)$(man5dir)"
-+	test -z "$(man5dir)" || $(mkdir_p) "$(DESTDIR)$(man5dir)"
- 	@list='$(man5_MANS) $(dist_man5_MANS) $(nodist_man5_MANS)'; \
- 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
- 	for i in $$l2; do \
-@@ -388,7 +412,7 @@
- 	done
- install-man8: $(man8_MANS) $(man_MANS)
- 	@$(NORMAL_INSTALL)
--	test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
-+	test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
- 	@list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
- 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
- 	for i in $$l2; do \
-@@ -439,21 +463,22 @@
- 
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	list='$(DISTFILES)'; \
--	  dist_files=`for file in $$list; do echo $$file; done | \
--	  sed -e "s|^$$srcdirstrip/||;t" \
--	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
--	case $$dist_files in \
--	  */*) $(MKDIR_P) `echo "$$dist_files" | \
--			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
--			   sort -u` ;; \
--	esac; \
--	for file in $$dist_files; do \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
- 	  if test -d $$d/$$file; then \
--	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- 	    fi; \
-@@ -469,7 +494,7 @@
- all-am: Makefile $(MANS)
- installdirs:
- 	for dir in "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man8dir)"; do \
--	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
- 	done
- install: install-am
- install-exec: install-exec-am
-@@ -502,7 +527,7 @@
- 
- distclean: distclean-am
- 	-rm -f Makefile
--distclean-am: clean-am distclean-generic
-+distclean-am: clean-am distclean-generic distclean-libtool
- 
- dvi: dvi-am
- 
-@@ -516,20 +541,12 @@
- 
- install-data-am: install-man
- 
--install-dvi: install-dvi-am
--
- install-exec-am:
- 
--install-html: install-html-am
--
- install-info: install-info-am
- 
- install-man: install-man3 install-man5 install-man8
- 
--install-pdf: install-pdf-am
--
--install-ps: install-ps-am
--
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
-@@ -548,24 +565,21 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-man
-+uninstall-am: uninstall-info-am uninstall-man
- 
- uninstall-man: uninstall-man3 uninstall-man5 uninstall-man8
- 
--.MAKE: install-am install-strip
--
- .PHONY: all all-am check check-am clean clean-generic clean-libtool \
- 	distclean distclean-generic distclean-libtool distdir dvi \
- 	dvi-am html html-am info info-am install install-am \
--	install-data install-data-am install-dvi install-dvi-am \
--	install-exec install-exec-am install-html install-html-am \
-+	install-data install-data-am install-exec install-exec-am \
- 	install-info install-info-am install-man install-man3 \
--	install-man5 install-man8 install-pdf install-pdf-am \
--	install-ps install-ps-am install-strip installcheck \
-+	install-man5 install-man8 install-strip installcheck \
- 	installcheck-am installdirs maintainer-clean \
- 	maintainer-clean-generic mostlyclean mostlyclean-generic \
- 	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
--	uninstall-man uninstall-man3 uninstall-man5 uninstall-man8
-+	uninstall-info-am uninstall-man uninstall-man3 uninstall-man5 \
-+	uninstall-man8
- 
- 
- @ENABLE_REGENERATE_MAN_TRUE@pam_get_item.3: pam_item_types.inc.xml
 Index: pam/Linux-PAM/doc/mwg/Makefile.in
 ===================================================================
 --- pam.orig/Linux-PAM/doc/mwg/Makefile.in
 +++ pam/Linux-PAM/doc/mwg/Makefile.in
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -17,11 +17,15 @@
- #
- # Copyright (c) 2006 Thorsten Kukuk <kukuk@thkukuk.de>
- #
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ../..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -56,6 +60,8 @@
- DIST_SOURCES =
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -80,6 +86,10 @@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
-+ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
-+ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
-+ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
-+ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -88,7 +98,18 @@
- GMSGFMT_015 = @GMSGFMT_015@
- GREP = @GREP@
- HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
--INSTALL = @INSTALL@
-+HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
-+HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
-+HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
-+HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
-+HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
-+HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
-+HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
-+HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
-+HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
-+HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
-+HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
-+HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -100,6 +121,7 @@
+@@ -100,6 +100,7 @@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
  LIBAUDIT = @LIBAUDIT@
@@ -6057,242 +4294,19 @@ Index: pam/Linux-PAM/doc/mwg/Makefile.in
  LIBCRACK = @LIBCRACK@
  LIBCRYPT = @LIBCRYPT@
  LIBDB = @LIBDB@
-@@ -123,7 +145,6 @@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
--MKDIR_P = @MKDIR_P@
- MSGFMT = @MSGFMT@
- MSGFMT_015 = @MSGFMT_015@
- MSGMERGE = @MSGMERGE@
-@@ -142,8 +163,11 @@
+@@ -142,6 +143,7 @@
  RANLIB = @RANLIB@
  SCONFIGDIR = @SCONFIGDIR@
  SECUREDIR = @SECUREDIR@
 +SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
-+STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
-+STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
  STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -157,13 +181,13 @@
- XSLTPROC = @XSLTPROC@
- YACC = @YACC@
- YFLAGS = @YFLAGS@
--abs_builddir = @abs_builddir@
--abs_srcdir = @abs_srcdir@
--abs_top_builddir = @abs_top_builddir@
--abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -175,7 +199,6 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
--builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -206,11 +229,8 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_builddir = @top_builddir@
--top_srcdir = @top_srcdir@
- CLEANFILES = Linux-PAM_MWG.fo *~
- EXTRA_DIST = $(XMLS)
- XMLS = Linux-PAM_MWG.xml $(shell ls $(srcdir)/pam_*.xml)
-@@ -254,6 +274,10 @@
- 
- clean-libtool:
- 	-rm -rf .libs _libs
-+
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
- tags: TAGS
- TAGS:
- 
-@@ -262,21 +286,23 @@
- 
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	list='$(DISTFILES)'; \
--	  dist_files=`for file in $$list; do echo $$file; done | \
--	  sed -e "s|^$$srcdirstrip/||;t" \
--	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
--	case $$dist_files in \
--	  */*) $(MKDIR_P) `echo "$$dist_files" | \
--			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
--			   sort -u` ;; \
--	esac; \
--	for file in $$dist_files; do \
-+	$(mkdir_p) $(distdir)/$(srcdir)
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
- 	  if test -d $$d/$$file; then \
--	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- 	    fi; \
-@@ -324,7 +350,8 @@
- 
- distclean: distclean-am
- 	-rm -f Makefile
--distclean-am: clean-am distclean-generic distclean-local
-+distclean-am: clean-am distclean-generic distclean-libtool \
-+	distclean-local
- 
- dvi: dvi-am
- 
-@@ -338,20 +365,12 @@
- 
- install-data-am: install-data-local
- 
--install-dvi: install-dvi-am
--
- install-exec-am:
- 
--install-html: install-html-am
--
- install-info: install-info-am
- 
- install-man:
- 
--install-pdf: install-pdf-am
--
--install-ps: install-ps-am
--
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
-@@ -370,21 +389,18 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-local
--
--.MAKE: install-am install-strip
-+uninstall-am: uninstall-info-am uninstall-local
- 
- .PHONY: all all-am check check-am clean clean-generic clean-libtool \
- 	distclean distclean-generic distclean-libtool distclean-local \
- 	distdir dvi dvi-am html html-am info info-am install \
- 	install-am install-data install-data-am install-data-local \
--	install-dvi install-dvi-am install-exec install-exec-am \
--	install-html install-html-am install-info install-info-am \
--	install-man install-pdf install-pdf-am install-ps \
--	install-ps-am install-strip installcheck installcheck-am \
-+	install-exec install-exec-am install-info install-info-am \
-+	install-man install-strip installcheck installcheck-am \
- 	installdirs maintainer-clean maintainer-clean-generic \
- 	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
--	ps ps-am uninstall uninstall-am uninstall-local
-+	ps ps-am uninstall uninstall-am uninstall-info-am \
-+	uninstall-local
- 
- 
- @ENABLE_REGENERATE_MAN_TRUE@all: Linux-PAM_MWG.txt html/Linux-PAM_MWG.html Linux-PAM_MWG.pdf
 Index: pam/Linux-PAM/doc/sag/Makefile.in
 ===================================================================
 --- pam.orig/Linux-PAM/doc/sag/Makefile.in
 +++ pam/Linux-PAM/doc/sag/Makefile.in
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -17,11 +17,15 @@
- #
- # Copyright (c) 2006 Thorsten Kukuk <kukuk@thkukuk.de>
- #
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ../..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -56,6 +60,8 @@
- DIST_SOURCES =
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -80,6 +86,10 @@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
-+ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
-+ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
-+ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
-+ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -88,7 +98,18 @@
- GMSGFMT_015 = @GMSGFMT_015@
- GREP = @GREP@
- HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
--INSTALL = @INSTALL@
-+HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
-+HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
-+HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
-+HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
-+HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
-+HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
-+HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
-+HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
-+HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
-+HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
-+HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
-+HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -100,6 +121,7 @@
+@@ -100,6 +100,7 @@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
  LIBAUDIT = @LIBAUDIT@
@@ -6300,277 +4314,19 @@ Index: pam/Linux-PAM/doc/sag/Makefile.in
  LIBCRACK = @LIBCRACK@
  LIBCRYPT = @LIBCRYPT@
  LIBDB = @LIBDB@
-@@ -123,7 +145,6 @@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
--MKDIR_P = @MKDIR_P@
- MSGFMT = @MSGFMT@
- MSGFMT_015 = @MSGFMT_015@
- MSGMERGE = @MSGMERGE@
-@@ -142,8 +163,11 @@
+@@ -142,6 +143,7 @@
  RANLIB = @RANLIB@
  SCONFIGDIR = @SCONFIGDIR@
  SECUREDIR = @SECUREDIR@
 +SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
-+STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
-+STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
  STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -157,13 +181,13 @@
- XSLTPROC = @XSLTPROC@
- YACC = @YACC@
- YFLAGS = @YFLAGS@
--abs_builddir = @abs_builddir@
--abs_srcdir = @abs_srcdir@
--abs_top_builddir = @abs_top_builddir@
--abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -175,7 +199,6 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
--builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -206,11 +229,8 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_builddir = @top_builddir@
--top_srcdir = @top_srcdir@
- CLEANFILES = Linux-PAM_SAG.fo *~
- EXTRA_DIST = $(XMLS)
- XMLS = Linux-PAM_SAG.xml $(shell ls $(srcdir)/pam_*.xml)
-@@ -254,6 +274,10 @@
- 
- clean-libtool:
- 	-rm -rf .libs _libs
-+
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
- tags: TAGS
- TAGS:
- 
-@@ -262,21 +286,23 @@
- 
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	list='$(DISTFILES)'; \
--	  dist_files=`for file in $$list; do echo $$file; done | \
--	  sed -e "s|^$$srcdirstrip/||;t" \
--	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
--	case $$dist_files in \
--	  */*) $(MKDIR_P) `echo "$$dist_files" | \
--			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
--			   sort -u` ;; \
--	esac; \
--	for file in $$dist_files; do \
-+	$(mkdir_p) $(distdir)/$(srcdir)
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
- 	  if test -d $$d/$$file; then \
--	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- 	    fi; \
-@@ -324,7 +350,8 @@
- 
- distclean: distclean-am
- 	-rm -f Makefile
--distclean-am: clean-am distclean-generic distclean-local
-+distclean-am: clean-am distclean-generic distclean-libtool \
-+	distclean-local
- 
- dvi: dvi-am
- 
-@@ -338,20 +365,12 @@
- 
- install-data-am: install-data-local
- 
--install-dvi: install-dvi-am
--
- install-exec-am:
- 
--install-html: install-html-am
--
- install-info: install-info-am
- 
- install-man:
- 
--install-pdf: install-pdf-am
--
--install-ps: install-ps-am
--
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
-@@ -370,21 +389,18 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-local
--
--.MAKE: install-am install-strip
-+uninstall-am: uninstall-info-am uninstall-local
- 
- .PHONY: all all-am check check-am clean clean-generic clean-libtool \
- 	distclean distclean-generic distclean-libtool distclean-local \
- 	distdir dvi dvi-am html html-am info info-am install \
- 	install-am install-data install-data-am install-data-local \
--	install-dvi install-dvi-am install-exec install-exec-am \
--	install-html install-html-am install-info install-info-am \
--	install-man install-pdf install-pdf-am install-ps \
--	install-ps-am install-strip installcheck installcheck-am \
-+	install-exec install-exec-am install-info install-info-am \
-+	install-man install-strip installcheck installcheck-am \
- 	installdirs maintainer-clean maintainer-clean-generic \
- 	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
--	ps ps-am uninstall uninstall-am uninstall-local
-+	ps ps-am uninstall uninstall-am uninstall-info-am \
-+	uninstall-local
- 
- 
- @ENABLE_REGENERATE_MAN_TRUE@all: Linux-PAM_SAG.txt html/Linux-PAM_SAG.html Linux-PAM_SAG.pdf
 Index: pam/Linux-PAM/doc/specs/Makefile.in
 ===================================================================
 --- pam.orig/Linux-PAM/doc/specs/Makefile.in
 +++ pam/Linux-PAM/doc/specs/Makefile.in
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -19,11 +19,15 @@
- #
- 
- 
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ../..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -60,25 +64,22 @@
- am_padout_OBJECTS = parse_l.$(OBJEXT) parse_y.$(OBJEXT)
- padout_OBJECTS = $(am_padout_OBJECTS)
- padout_DEPENDENCIES =
--DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
--	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+	$(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
--	$(LDFLAGS) -o $@
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- LEXCOMPILE = $(LEX) $(LFLAGS) $(AM_LFLAGS)
--LTLEXCOMPILE = $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=compile $(LEX) $(LFLAGS) $(AM_LFLAGS)
--YLWRAP = $(top_srcdir)/ylwrap
-+LTLEXCOMPILE = $(LIBTOOL) --mode=compile $(LEX) $(LFLAGS) $(AM_LFLAGS)
- YACCCOMPILE = $(YACC) $(YFLAGS) $(AM_YFLAGS)
--LTYACCCOMPILE = $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=compile $(YACC) $(YFLAGS) $(AM_YFLAGS)
-+LTYACCCOMPILE = $(LIBTOOL) --mode=compile $(YACC) $(YFLAGS) \
-+	$(AM_YFLAGS)
- SOURCES = $(padout_SOURCES)
- DIST_SOURCES = $(padout_SOURCES)
- am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-@@ -94,6 +95,8 @@
- CTAGS = ctags
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -118,6 +121,10 @@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
-+ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
-+ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
-+ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
-+ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -126,7 +133,18 @@
- GMSGFMT_015 = @GMSGFMT_015@
- GREP = @GREP@
- HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
--INSTALL = @INSTALL@
-+HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
-+HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
-+HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
-+HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
-+HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
-+HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
-+HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
-+HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
-+HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
-+HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
-+HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
-+HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -138,6 +156,7 @@
+@@ -138,6 +138,7 @@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
  LIBAUDIT = @LIBAUDIT@
@@ -6578,352 +4334,19 @@ Index: pam/Linux-PAM/doc/specs/Makefile.in
  LIBCRACK = @LIBCRACK@
  LIBCRYPT = @LIBCRYPT@
  LIBDB = @LIBDB@
-@@ -161,7 +180,6 @@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
--MKDIR_P = @MKDIR_P@
- MSGFMT = @MSGFMT@
- MSGFMT_015 = @MSGFMT_015@
- MSGMERGE = @MSGMERGE@
-@@ -180,8 +198,11 @@
+@@ -180,6 +181,7 @@
  RANLIB = @RANLIB@
  SCONFIGDIR = @SCONFIGDIR@
  SECUREDIR = @SECUREDIR@
 +SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
-+STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
-+STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
  STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -195,13 +216,13 @@
- XSLTPROC = @XSLTPROC@
- YACC = @YACC@
- YFLAGS = @YFLAGS@
--abs_builddir = @abs_builddir@
--abs_srcdir = @abs_srcdir@
--abs_top_builddir = @abs_top_builddir@
--abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -213,7 +234,6 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
--builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -244,11 +264,8 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_builddir = @top_builddir@
--top_srcdir = @top_srcdir@
- CLEANFILES = draft-morgan-pam-current.txt *~
- EXTRA_DIST = draft-morgan-pam.raw std-agent-id.raw rfc86.0.txt
- AM_YFLAGS = -d
-@@ -300,11 +317,11 @@
- parse_y.h: parse_y.c
- 	@if test ! -f $@; then \
- 	  rm -f parse_y.c; \
--	  $(MAKE) $(AM_MAKEFLAGS) parse_y.c; \
-+	  $(MAKE) parse_y.c; \
- 	else :; fi
- padout$(EXEEXT): $(padout_OBJECTS) $(padout_DEPENDENCIES) 
- 	@rm -f padout$(EXEEXT)
--	$(LINK) $(padout_OBJECTS) $(padout_LDADD) $(LIBS)
-+	$(LINK) $(padout_LDFLAGS) $(padout_OBJECTS) $(padout_LDADD) $(LIBS)
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
-@@ -316,40 +333,64 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parse_y.Po@am__quote@
- 
- .c.o:
--@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c $<
- 
- .c.obj:
--@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
- 
- .c.lo:
--@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
- 
- .l.c:
--	$(am__skiplex) $(SHELL) $(YLWRAP) $< $(LEX_OUTPUT_ROOT).c $@ -- $(LEXCOMPILE)
-+	$(LEXCOMPILE) $<
-+	sed '/^#/ s|$(LEX_OUTPUT_ROOT)\.c|$@|' $(LEX_OUTPUT_ROOT).c >$@
-+	rm -f $(LEX_OUTPUT_ROOT).c
- 
- .y.c:
--	$(am__skipyacc) $(SHELL) $(YLWRAP) $< y.tab.c $@ y.tab.h $*.h y.output $*.output -- $(YACCCOMPILE)
-+	$(YACCCOMPILE) $<
-+	if test -f y.tab.h; then \
-+	  to=`echo "$*_H" | sed \
-+                -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \
-+                -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \
-+	  sed -e "/^#/!b" -e "s/Y_TAB_H/$$to/g" -e "s|y\.tab\.h|$*.h|" \
-+            y.tab.h >$*.ht; \
-+	  rm -f y.tab.h; \
-+	  if cmp -s $*.ht $*.h; then \
-+	    rm -f $*.ht ;\
-+	  else \
-+	    mv $*.ht $*.h; \
-+	  fi; \
-+	fi
-+	if test -f y.output; then \
-+	  mv y.output $*.output; \
-+	fi
-+	sed '/^#/ s|y\.tab\.c|$@|' y.tab.c >$@t && mv $@t $@
-+	rm -f y.tab.c
- 
- mostlyclean-libtool:
- 	-rm -f *.lo
- 
- clean-libtool:
- 	-rm -rf .libs _libs
-+
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
- install-docDATA: $(doc_DATA)
- 	@$(NORMAL_INSTALL)
--	test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)"
-+	test -z "$(docdir)" || $(mkdir_p) "$(DESTDIR)$(docdir)"
- 	@list='$(doc_DATA)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  f=$(am__strip_dir) \
-@@ -414,21 +455,22 @@
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	list='$(DISTFILES)'; \
--	  dist_files=`for file in $$list; do echo $$file; done | \
--	  sed -e "s|^$$srcdirstrip/||;t" \
--	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
--	case $$dist_files in \
--	  */*) $(MKDIR_P) `echo "$$dist_files" | \
--			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
--			   sort -u` ;; \
--	esac; \
--	for file in $$dist_files; do \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
- 	  if test -d $$d/$$file; then \
--	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- 	    fi; \
-@@ -445,7 +487,7 @@
- all-am: Makefile $(PROGRAMS) $(DATA)
- installdirs:
- 	for dir in "$(DESTDIR)$(docdir)"; do \
--	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
- 	done
- install: $(BUILT_SOURCES)
- 	$(MAKE) $(AM_MAKEFLAGS) install-am
-@@ -486,7 +528,7 @@
- 	-rm -rf ./$(DEPDIR)
- 	-rm -f Makefile
- distclean-am: clean-am distclean-compile distclean-generic \
--	distclean-tags
-+	distclean-libtool distclean-tags
- 
- dvi: dvi-am
- 
-@@ -500,20 +542,12 @@
- 
- install-data-am: install-docDATA
- 
--install-dvi: install-dvi-am
--
- install-exec-am:
- 
--install-html: install-html-am
--
- install-info: install-info-am
- 
- install-man:
- 
--install-pdf: install-pdf-am
--
--install-ps: install-ps-am
--
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
-@@ -534,23 +568,20 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-docDATA
--
--.MAKE: install-am install-strip
-+uninstall-am: uninstall-docDATA uninstall-info-am
- 
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- 	clean-libtool clean-noinstPROGRAMS ctags distclean \
- 	distclean-compile distclean-generic distclean-libtool \
- 	distclean-tags distdir dvi dvi-am html html-am info info-am \
- 	install install-am install-data install-data-am \
--	install-docDATA install-dvi install-dvi-am install-exec \
--	install-exec-am install-html install-html-am install-info \
--	install-info-am install-man install-pdf install-pdf-am \
--	install-ps install-ps-am install-strip installcheck \
-+	install-docDATA install-exec install-exec-am install-info \
-+	install-info-am install-man install-strip installcheck \
- 	installcheck-am installdirs maintainer-clean \
- 	maintainer-clean-generic mostlyclean mostlyclean-compile \
- 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
--	tags uninstall uninstall-am uninstall-docDATA
-+	tags uninstall uninstall-am uninstall-docDATA \
-+	uninstall-info-am
- 
- 
- draft-morgan-pam-current.txt: padout draft-morgan-pam.raw
 Index: pam/Linux-PAM/examples/Makefile.in
 ===================================================================
 --- pam.orig/Linux-PAM/examples/Makefile.in
 +++ pam/Linux-PAM/examples/Makefile.in
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -18,11 +18,15 @@
- # Copyright (c) 2005 Thorsten Kukuk <kukuk@suse.de>
- #
- 
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -68,24 +72,25 @@
- xsh_SOURCES = xsh.c
- xsh_OBJECTS = xsh.$(OBJEXT)
- xsh_LDADD = $(LDADD)
--DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
--	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+	$(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
--	$(LDFLAGS) -o $@
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = blank.c check_user.c vpass.c xsh.c
- DIST_SOURCES = blank.c check_user.c vpass.c xsh.c
- ETAGS = etags
- CTAGS = ctags
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -110,6 +115,10 @@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
-+ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
-+ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
-+ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
-+ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -118,7 +127,18 @@
- GMSGFMT_015 = @GMSGFMT_015@
- GREP = @GREP@
- HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
--INSTALL = @INSTALL@
-+HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
-+HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
-+HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
-+HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
-+HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
-+HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
-+HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
-+HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
-+HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
-+HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
-+HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
-+HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -130,6 +150,7 @@
+@@ -130,6 +130,7 @@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
  LIBAUDIT = @LIBAUDIT@
@@ -6931,322 +4354,19 @@ Index: pam/Linux-PAM/examples/Makefile.in
  LIBCRACK = @LIBCRACK@
  LIBCRYPT = @LIBCRYPT@
  LIBDB = @LIBDB@
-@@ -153,7 +174,6 @@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
--MKDIR_P = @MKDIR_P@
- MSGFMT = @MSGFMT@
- MSGFMT_015 = @MSGFMT_015@
- MSGMERGE = @MSGMERGE@
-@@ -172,8 +192,11 @@
+@@ -172,6 +173,7 @@
  RANLIB = @RANLIB@
  SCONFIGDIR = @SCONFIGDIR@
  SECUREDIR = @SECUREDIR@
 +SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
-+STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
-+STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
  STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -187,13 +210,13 @@
- XSLTPROC = @XSLTPROC@
- YACC = @YACC@
- YFLAGS = @YFLAGS@
--abs_builddir = @abs_builddir@
--abs_srcdir = @abs_srcdir@
--abs_top_builddir = @abs_top_builddir@
--abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -205,7 +228,6 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
--builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -236,11 +258,8 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_builddir = @top_builddir@
--top_srcdir = @top_srcdir@
- CLEANFILES = *~
- EXTRA_DIST = README
- AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \
-@@ -291,16 +310,16 @@
- 	done
- blank$(EXEEXT): $(blank_OBJECTS) $(blank_DEPENDENCIES) 
- 	@rm -f blank$(EXEEXT)
--	$(LINK) $(blank_OBJECTS) $(blank_LDADD) $(LIBS)
-+	$(LINK) $(blank_LDFLAGS) $(blank_OBJECTS) $(blank_LDADD) $(LIBS)
- check_user$(EXEEXT): $(check_user_OBJECTS) $(check_user_DEPENDENCIES) 
- 	@rm -f check_user$(EXEEXT)
--	$(LINK) $(check_user_OBJECTS) $(check_user_LDADD) $(LIBS)
-+	$(LINK) $(check_user_LDFLAGS) $(check_user_OBJECTS) $(check_user_LDADD) $(LIBS)
- vpass$(EXEEXT): $(vpass_OBJECTS) $(vpass_DEPENDENCIES) 
- 	@rm -f vpass$(EXEEXT)
--	$(LINK) $(vpass_OBJECTS) $(vpass_LDADD) $(LIBS)
-+	$(LINK) $(vpass_LDFLAGS) $(vpass_OBJECTS) $(vpass_LDADD) $(LIBS)
- xsh$(EXEEXT): $(xsh_OBJECTS) $(xsh_DEPENDENCIES) 
- 	@rm -f xsh$(EXEEXT)
--	$(LINK) $(xsh_OBJECTS) $(xsh_LDADD) $(LIBS)
-+	$(LINK) $(xsh_LDFLAGS) $(xsh_OBJECTS) $(xsh_LDADD) $(LIBS)
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
-@@ -314,22 +333,22 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xsh.Po@am__quote@
- 
- .c.o:
--@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c $<
- 
- .c.obj:
--@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
- 
- .c.lo:
--@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-@@ -340,6 +359,10 @@
- clean-libtool:
- 	-rm -rf .libs _libs
- 
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
-+
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- 	unique=`for i in $$list; do \
-@@ -389,21 +412,22 @@
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	list='$(DISTFILES)'; \
--	  dist_files=`for file in $$list; do echo $$file; done | \
--	  sed -e "s|^$$srcdirstrip/||;t" \
--	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
--	case $$dist_files in \
--	  */*) $(MKDIR_P) `echo "$$dist_files" | \
--			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
--			   sort -u` ;; \
--	esac; \
--	for file in $$dist_files; do \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
- 	  if test -d $$d/$$file; then \
--	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- 	    fi; \
-@@ -452,7 +476,7 @@
- 	-rm -rf ./$(DEPDIR)
- 	-rm -f Makefile
- distclean-am: clean-am distclean-compile distclean-generic \
--	distclean-tags
-+	distclean-libtool distclean-tags
- 
- dvi: dvi-am
- 
-@@ -466,20 +490,12 @@
- 
- install-data-am:
- 
--install-dvi: install-dvi-am
--
- install-exec-am:
- 
--install-html: install-html-am
--
- install-info: install-info-am
- 
- install-man:
- 
--install-pdf: install-pdf-am
--
--install-ps: install-ps-am
--
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
-@@ -500,22 +516,19 @@
- 
- ps-am:
- 
--uninstall-am:
--
--.MAKE: install-am install-strip
-+uninstall-am: uninstall-info-am
- 
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- 	clean-libtool clean-noinstPROGRAMS ctags distclean \
- 	distclean-compile distclean-generic distclean-libtool \
- 	distclean-tags distdir dvi dvi-am html html-am info info-am \
--	install install-am install-data install-data-am install-dvi \
--	install-dvi-am install-exec install-exec-am install-html \
--	install-html-am install-info install-info-am install-man \
--	install-pdf install-pdf-am install-ps install-ps-am \
-+	install install-am install-data install-data-am install-exec \
-+	install-exec-am install-info install-info-am install-man \
- 	install-strip installcheck installcheck-am installdirs \
- 	maintainer-clean maintainer-clean-generic mostlyclean \
- 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
--	pdf pdf-am ps ps-am tags uninstall uninstall-am
-+	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-+	uninstall-info-am
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
 Index: pam/Linux-PAM/libpam/Makefile.in
 ===================================================================
 --- pam.orig/Linux-PAM/libpam/Makefile.in
 +++ pam/Linux-PAM/libpam/Makefile.in
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -19,11 +19,15 @@
- #
- 
- 
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -79,23 +83,19 @@
- 	pam_modutil_ioloop.lo pam_modutil_getgrgid.lo \
- 	pam_modutil_getpwuid.lo pam_modutil_getgrnam.lo \
- 	pam_modutil_getspnam.lo pam_modutil_getlogin.lo \
--	pam_modutil_ingroup.lo
-+	pam_modutil_ingroup.lo pam_modutil_tty_secure.lo
- libpam_la_OBJECTS = $(am_libpam_la_OBJECTS)
--libpam_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
--	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
--	$(libpam_la_LDFLAGS) $(LDFLAGS) -o $@
--DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
--	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+	$(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
--	$(LDFLAGS) -o $@
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libpam_la_SOURCES)
- DIST_SOURCES = $(libpam_la_SOURCES)
- includeHEADERS_INSTALL = $(INSTALL_HEADER)
-@@ -104,6 +104,8 @@
- CTAGS = ctags
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -128,6 +130,10 @@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
-+ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
-+ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
-+ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
-+ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -136,7 +142,18 @@
- GMSGFMT_015 = @GMSGFMT_015@
- GREP = @GREP@
- HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
--INSTALL = @INSTALL@
-+HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
-+HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
-+HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
-+HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
-+HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
-+HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
-+HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
-+HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
-+HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
-+HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
-+HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
-+HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -148,6 +165,7 @@
+@@ -148,6 +148,7 @@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
  LIBAUDIT = @LIBAUDIT@
@@ -7254,363 +4374,19 @@ Index: pam/Linux-PAM/libpam/Makefile.in
  LIBCRACK = @LIBCRACK@
  LIBCRYPT = @LIBCRYPT@
  LIBDB = @LIBDB@
-@@ -171,7 +189,6 @@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
--MKDIR_P = @MKDIR_P@
- MSGFMT = @MSGFMT@
- MSGFMT_015 = @MSGFMT_015@
- MSGMERGE = @MSGMERGE@
-@@ -190,8 +207,11 @@
+@@ -190,6 +191,7 @@
  RANLIB = @RANLIB@
  SCONFIGDIR = @SCONFIGDIR@
  SECUREDIR = @SECUREDIR@
 +SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
-+STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
-+STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
  STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -205,13 +225,13 @@
- XSLTPROC = @XSLTPROC@
- YACC = @YACC@
- YFLAGS = @YFLAGS@
--abs_builddir = @abs_builddir@
--abs_srcdir = @abs_srcdir@
--abs_top_builddir = @abs_top_builddir@
--abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -223,7 +243,6 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
--builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -254,11 +273,8 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_builddir = @top_builddir@
--top_srcdir = @top_srcdir@
- AM_CFLAGS = -DDEFAULT_MODULE_PATH=\"$(SECUREDIR)/\" -DLIBPAM_COMPILE \
- 	-I$(srcdir)/include $(LIBPRELUDE_CFLAGS) \
- 	-DPAM_VERSION=\"$(VERSION)\" $(am__append_1)
-@@ -282,7 +298,8 @@
- 	pam_vprompt.c pam_syslog.c pam_dynamic.c pam_audit.c \
- 	pam_modutil_cleanup.c pam_modutil_getpwnam.c pam_modutil_ioloop.c \
- 	pam_modutil_getgrgid.c pam_modutil_getpwuid.c pam_modutil_getgrnam.c \
--	pam_modutil_getspnam.c pam_modutil_getlogin.c  pam_modutil_ingroup.c
-+	pam_modutil_getspnam.c pam_modutil_getlogin.c  pam_modutil_ingroup.c \
-+	pam_modutil_tty_secure.c
- 
- all: all-am
- 
-@@ -319,7 +336,7 @@
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-libLTLIBRARIES: $(lib_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
--	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
-+	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
- 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- 	  if test -f $$p; then \
- 	    f=$(am__strip_dir) \
-@@ -330,7 +347,7 @@
- 
- uninstall-libLTLIBRARIES:
- 	@$(NORMAL_UNINSTALL)
--	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-+	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- 	  p=$(am__strip_dir) \
- 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
- 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
-@@ -345,7 +362,7 @@
- 	  rm -f "$${dir}/so_locations"; \
- 	done
- libpam.la: $(libpam_la_OBJECTS) $(libpam_la_DEPENDENCIES) 
--	$(libpam_la_LINK) -rpath $(libdir) $(libpam_la_OBJECTS) $(libpam_la_LIBADD) $(LIBS)
-+	$(LINK) -rpath $(libdir) $(libpam_la_LDFLAGS) $(libpam_la_OBJECTS) $(libpam_la_LIBADD) $(LIBS)
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
-@@ -374,6 +391,7 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_modutil_getspnam.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_modutil_ingroup.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_modutil_ioloop.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_modutil_tty_secure.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_password.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_prelude.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_session.Plo@am__quote@
-@@ -384,22 +402,22 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_vprompt.Plo@am__quote@
- 
- .c.o:
--@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c $<
- 
- .c.obj:
--@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
- 
- .c.lo:
--@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-@@ -409,9 +427,13 @@
- 
- clean-libtool:
- 	-rm -rf .libs _libs
-+
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
- install-includeHEADERS: $(include_HEADERS)
- 	@$(NORMAL_INSTALL)
--	test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
-+	test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
- 	@list='$(include_HEADERS)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  f=$(am__strip_dir) \
-@@ -476,21 +498,23 @@
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	list='$(DISTFILES)'; \
--	  dist_files=`for file in $$list; do echo $$file; done | \
--	  sed -e "s|^$$srcdirstrip/||;t" \
--	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
--	case $$dist_files in \
--	  */*) $(MKDIR_P) `echo "$$dist_files" | \
--			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
--			   sort -u` ;; \
--	esac; \
--	for file in $$dist_files; do \
-+	$(mkdir_p) $(distdir)/include/security
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
- 	  if test -d $$d/$$file; then \
--	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- 	    fi; \
-@@ -506,7 +530,7 @@
- all-am: Makefile $(LTLIBRARIES) $(HEADERS)
- installdirs:
- 	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"; do \
--	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
- 	done
- install: install-am
- install-exec: install-exec-am
-@@ -542,7 +566,7 @@
- 	-rm -rf ./$(DEPDIR)
- 	-rm -f Makefile
- distclean-am: clean-am distclean-compile distclean-generic \
--	distclean-tags
-+	distclean-libtool distclean-tags
- 
- dvi: dvi-am
- 
-@@ -556,20 +580,12 @@
- 
- install-data-am: install-includeHEADERS
- 
--install-dvi: install-dvi-am
--
- install-exec-am: install-libLTLIBRARIES
- 
--install-html: install-html-am
--
- install-info: install-info-am
- 
- install-man:
- 
--install-pdf: install-pdf-am
--
--install-ps: install-ps-am
--
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
-@@ -590,23 +606,21 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-includeHEADERS uninstall-libLTLIBRARIES
--
--.MAKE: install-am install-strip
-+uninstall-am: uninstall-includeHEADERS uninstall-info-am \
-+	uninstall-libLTLIBRARIES
- 
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- 	clean-libLTLIBRARIES clean-libtool ctags distclean \
- 	distclean-compile distclean-generic distclean-libtool \
- 	distclean-tags distdir dvi dvi-am html html-am info info-am \
--	install install-am install-data install-data-am install-dvi \
--	install-dvi-am install-exec install-exec-am install-html \
--	install-html-am install-includeHEADERS install-info \
--	install-info-am install-libLTLIBRARIES install-man install-pdf \
--	install-pdf-am install-ps install-ps-am install-strip \
--	installcheck installcheck-am installdirs maintainer-clean \
--	maintainer-clean-generic mostlyclean mostlyclean-compile \
--	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
--	tags uninstall uninstall-am uninstall-includeHEADERS \
-+	install install-am install-data install-data-am install-exec \
-+	install-exec-am install-includeHEADERS install-info \
-+	install-info-am install-libLTLIBRARIES install-man \
-+	install-strip installcheck installcheck-am installdirs \
-+	maintainer-clean maintainer-clean-generic mostlyclean \
-+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-+	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-+	uninstall-includeHEADERS uninstall-info-am \
- 	uninstall-libLTLIBRARIES
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
 Index: pam/Linux-PAM/libpam_misc/Makefile.in
 ===================================================================
 --- pam.orig/Linux-PAM/libpam_misc/Makefile.in
 +++ pam/Linux-PAM/libpam_misc/Makefile.in
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -19,11 +19,15 @@
- #
- 
- 
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -68,21 +72,17 @@
- libpam_misc_la_DEPENDENCIES = $(top_builddir)/libpam/libpam.la
- am_libpam_misc_la_OBJECTS = help_env.lo misc_conv.lo
- libpam_misc_la_OBJECTS = $(am_libpam_misc_la_OBJECTS)
--libpam_misc_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
--	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
--	$(libpam_misc_la_LDFLAGS) $(LDFLAGS) -o $@
--DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
--	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+	$(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
--	$(LDFLAGS) -o $@
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libpam_misc_la_SOURCES)
- DIST_SOURCES = $(libpam_misc_la_SOURCES)
- includeHEADERS_INSTALL = $(INSTALL_HEADER)
-@@ -91,6 +91,8 @@
- CTAGS = ctags
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -115,6 +117,10 @@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
-+ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
-+ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
-+ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
-+ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -123,7 +129,18 @@
- GMSGFMT_015 = @GMSGFMT_015@
- GREP = @GREP@
- HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
--INSTALL = @INSTALL@
-+HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
-+HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
-+HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
-+HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
-+HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
-+HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
-+HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
-+HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
-+HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
-+HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
-+HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
-+HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -135,6 +152,7 @@
+@@ -135,6 +135,7 @@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
  LIBAUDIT = @LIBAUDIT@
@@ -7618,360 +4394,19 @@ Index: pam/Linux-PAM/libpam_misc/Makefile.in
  LIBCRACK = @LIBCRACK@
  LIBCRYPT = @LIBCRYPT@
  LIBDB = @LIBDB@
-@@ -158,7 +176,6 @@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
--MKDIR_P = @MKDIR_P@
- MSGFMT = @MSGFMT@
- MSGFMT_015 = @MSGFMT_015@
- MSGMERGE = @MSGMERGE@
-@@ -177,8 +194,11 @@
+@@ -177,6 +178,7 @@
  RANLIB = @RANLIB@
  SCONFIGDIR = @SCONFIGDIR@
  SECUREDIR = @SECUREDIR@
 +SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
-+STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
-+STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
  STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -192,13 +212,13 @@
- XSLTPROC = @XSLTPROC@
- YACC = @YACC@
- YFLAGS = @YFLAGS@
--abs_builddir = @abs_builddir@
--abs_srcdir = @abs_srcdir@
--abs_top_builddir = @abs_top_builddir@
--abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -210,7 +230,6 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
--builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -241,11 +260,8 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_builddir = @top_builddir@
--top_srcdir = @top_srcdir@
- CLEANFILES = *~
- EXTRA_DIST = libpam_misc.map
- include_HEADERS = include/security/pam_misc.h
-@@ -292,7 +308,7 @@
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-libLTLIBRARIES: $(lib_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
--	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
-+	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
- 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- 	  if test -f $$p; then \
- 	    f=$(am__strip_dir) \
-@@ -303,7 +319,7 @@
- 
- uninstall-libLTLIBRARIES:
- 	@$(NORMAL_UNINSTALL)
--	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-+	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- 	  p=$(am__strip_dir) \
- 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
- 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
-@@ -318,7 +334,7 @@
- 	  rm -f "$${dir}/so_locations"; \
- 	done
- libpam_misc.la: $(libpam_misc_la_OBJECTS) $(libpam_misc_la_DEPENDENCIES) 
--	$(libpam_misc_la_LINK) -rpath $(libdir) $(libpam_misc_la_OBJECTS) $(libpam_misc_la_LIBADD) $(LIBS)
-+	$(LINK) -rpath $(libdir) $(libpam_misc_la_LDFLAGS) $(libpam_misc_la_OBJECTS) $(libpam_misc_la_LIBADD) $(LIBS)
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
-@@ -330,22 +346,22 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/misc_conv.Plo@am__quote@
- 
- .c.o:
--@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c $<
- 
- .c.obj:
--@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
- 
- .c.lo:
--@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-@@ -355,9 +371,13 @@
- 
- clean-libtool:
- 	-rm -rf .libs _libs
-+
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
- install-includeHEADERS: $(include_HEADERS)
- 	@$(NORMAL_INSTALL)
--	test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
-+	test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
- 	@list='$(include_HEADERS)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  f=$(am__strip_dir) \
-@@ -422,21 +442,23 @@
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	list='$(DISTFILES)'; \
--	  dist_files=`for file in $$list; do echo $$file; done | \
--	  sed -e "s|^$$srcdirstrip/||;t" \
--	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
--	case $$dist_files in \
--	  */*) $(MKDIR_P) `echo "$$dist_files" | \
--			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
--			   sort -u` ;; \
--	esac; \
--	for file in $$dist_files; do \
-+	$(mkdir_p) $(distdir)/include/security
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
- 	  if test -d $$d/$$file; then \
--	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- 	    fi; \
-@@ -452,7 +474,7 @@
- all-am: Makefile $(LTLIBRARIES) $(HEADERS)
- installdirs:
- 	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"; do \
--	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
- 	done
- install: install-am
- install-exec: install-exec-am
-@@ -488,7 +510,7 @@
- 	-rm -rf ./$(DEPDIR)
- 	-rm -f Makefile
- distclean-am: clean-am distclean-compile distclean-generic \
--	distclean-tags
-+	distclean-libtool distclean-tags
- 
- dvi: dvi-am
- 
-@@ -502,20 +524,12 @@
- 
- install-data-am: install-includeHEADERS
- 
--install-dvi: install-dvi-am
--
- install-exec-am: install-libLTLIBRARIES
- 
--install-html: install-html-am
--
- install-info: install-info-am
- 
- install-man:
- 
--install-pdf: install-pdf-am
--
--install-ps: install-ps-am
--
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
-@@ -536,23 +550,21 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-includeHEADERS uninstall-libLTLIBRARIES
--
--.MAKE: install-am install-strip
-+uninstall-am: uninstall-includeHEADERS uninstall-info-am \
-+	uninstall-libLTLIBRARIES
- 
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- 	clean-libLTLIBRARIES clean-libtool ctags distclean \
- 	distclean-compile distclean-generic distclean-libtool \
- 	distclean-tags distdir dvi dvi-am html html-am info info-am \
--	install install-am install-data install-data-am install-dvi \
--	install-dvi-am install-exec install-exec-am install-html \
--	install-html-am install-includeHEADERS install-info \
--	install-info-am install-libLTLIBRARIES install-man install-pdf \
--	install-pdf-am install-ps install-ps-am install-strip \
--	installcheck installcheck-am installdirs maintainer-clean \
--	maintainer-clean-generic mostlyclean mostlyclean-compile \
--	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
--	tags uninstall uninstall-am uninstall-includeHEADERS \
-+	install install-am install-data install-data-am install-exec \
-+	install-exec-am install-includeHEADERS install-info \
-+	install-info-am install-libLTLIBRARIES install-man \
-+	install-strip installcheck installcheck-am installdirs \
-+	maintainer-clean maintainer-clean-generic mostlyclean \
-+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-+	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-+	uninstall-includeHEADERS uninstall-info-am \
- 	uninstall-libLTLIBRARIES
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
 Index: pam/Linux-PAM/libpamc/Makefile.in
 ===================================================================
 --- pam.orig/Linux-PAM/libpamc/Makefile.in
 +++ pam/Linux-PAM/libpamc/Makefile.in
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -19,11 +19,15 @@
- #
- 
- 
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -68,39 +72,34 @@
- libpamc_la_LIBADD =
- am_libpamc_la_OBJECTS = pamc_client.lo pamc_converse.lo pamc_load.lo
- libpamc_la_OBJECTS = $(am_libpamc_la_OBJECTS)
--libpamc_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
--	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
--	$(libpamc_la_LDFLAGS) $(LDFLAGS) -o $@
--DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
--	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+	$(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
--	$(LDFLAGS) -o $@
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libpamc_la_SOURCES)
- DIST_SOURCES = $(libpamc_la_SOURCES)
- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
- 	html-recursive info-recursive install-data-recursive \
--	install-dvi-recursive install-exec-recursive \
--	install-html-recursive install-info-recursive \
--	install-pdf-recursive install-ps-recursive install-recursive \
--	installcheck-recursive installdirs-recursive pdf-recursive \
--	ps-recursive uninstall-recursive
-+	install-exec-recursive install-info-recursive \
-+	install-recursive installcheck-recursive installdirs-recursive \
-+	pdf-recursive ps-recursive uninstall-info-recursive \
-+	uninstall-recursive
- includeHEADERS_INSTALL = $(INSTALL_HEADER)
- HEADERS = $(include_HEADERS) $(noinst_HEADERS)
--RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
--  distclean-recursive maintainer-clean-recursive
- ETAGS = etags
- CTAGS = ctags
- DIST_SUBDIRS = $(SUBDIRS)
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -125,6 +124,10 @@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
-+ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
-+ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
-+ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
-+ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -133,7 +136,18 @@
- GMSGFMT_015 = @GMSGFMT_015@
- GREP = @GREP@
- HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
--INSTALL = @INSTALL@
-+HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
-+HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
-+HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
-+HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
-+HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
-+HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
-+HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
-+HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
-+HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
-+HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
-+HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
-+HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -145,6 +159,7 @@
+@@ -145,6 +145,7 @@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
  LIBAUDIT = @LIBAUDIT@
@@ -7979,354 +4414,19 @@ Index: pam/Linux-PAM/libpamc/Makefile.in
  LIBCRACK = @LIBCRACK@
  LIBCRYPT = @LIBCRYPT@
  LIBDB = @LIBDB@
-@@ -168,7 +183,6 @@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
--MKDIR_P = @MKDIR_P@
- MSGFMT = @MSGFMT@
- MSGFMT_015 = @MSGFMT_015@
- MSGMERGE = @MSGMERGE@
-@@ -187,8 +201,11 @@
+@@ -187,6 +188,7 @@
  RANLIB = @RANLIB@
  SCONFIGDIR = @SCONFIGDIR@
  SECUREDIR = @SECUREDIR@
 +SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
-+STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
-+STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
  STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -202,13 +219,13 @@
- XSLTPROC = @XSLTPROC@
- YACC = @YACC@
- YFLAGS = @YFLAGS@
--abs_builddir = @abs_builddir@
--abs_srcdir = @abs_srcdir@
--abs_top_builddir = @abs_top_builddir@
--abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -220,7 +237,6 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
--builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -251,11 +267,8 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_builddir = @top_builddir@
--top_srcdir = @top_srcdir@
- SUBDIRS = test
- CLEANFILES = *~
- EXTRA_DIST = License libpamc.map
-@@ -301,7 +314,7 @@
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-libLTLIBRARIES: $(lib_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
--	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
-+	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
- 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- 	  if test -f $$p; then \
- 	    f=$(am__strip_dir) \
-@@ -312,7 +325,7 @@
- 
- uninstall-libLTLIBRARIES:
- 	@$(NORMAL_UNINSTALL)
--	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-+	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- 	  p=$(am__strip_dir) \
- 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
- 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
-@@ -327,7 +340,7 @@
- 	  rm -f "$${dir}/so_locations"; \
- 	done
- libpamc.la: $(libpamc_la_OBJECTS) $(libpamc_la_DEPENDENCIES) 
--	$(libpamc_la_LINK) -rpath $(libdir) $(libpamc_la_OBJECTS) $(libpamc_la_LIBADD) $(LIBS)
-+	$(LINK) -rpath $(libdir) $(libpamc_la_LDFLAGS) $(libpamc_la_OBJECTS) $(libpamc_la_LIBADD) $(LIBS)
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
-@@ -340,22 +353,22 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pamc_load.Plo@am__quote@
- 
- .c.o:
--@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c $<
- 
- .c.obj:
--@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
- 
- .c.lo:
--@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-@@ -365,9 +378,13 @@
- 
- clean-libtool:
- 	-rm -rf .libs _libs
-+
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
- install-includeHEADERS: $(include_HEADERS)
- 	@$(NORMAL_INSTALL)
--	test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
-+	test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
- 	@list='$(include_HEADERS)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  f=$(am__strip_dir) \
-@@ -414,7 +431,8 @@
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
- 	fi; test -z "$$fail"
- 
--$(RECURSIVE_CLEAN_TARGETS):
-+mostlyclean-recursive clean-recursive distclean-recursive \
-+maintainer-clean-recursive:
- 	@failcom='exit 1'; \
- 	for f in x $$MAKEFLAGS; do \
- 	  case $$f in \
-@@ -515,21 +533,23 @@
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	list='$(DISTFILES)'; \
--	  dist_files=`for file in $$list; do echo $$file; done | \
--	  sed -e "s|^$$srcdirstrip/||;t" \
--	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
--	case $$dist_files in \
--	  */*) $(MKDIR_P) `echo "$$dist_files" | \
--			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
--			   sort -u` ;; \
--	esac; \
--	for file in $$dist_files; do \
-+	$(mkdir_p) $(distdir)/include/security
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
- 	  if test -d $$d/$$file; then \
--	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- 	    fi; \
-@@ -543,7 +563,7 @@
- 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- 	  if test "$$subdir" = .; then :; else \
- 	    test -d "$(distdir)/$$subdir" \
--	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-+	    || $(mkdir_p) "$(distdir)/$$subdir" \
- 	    || exit 1; \
- 	    distdir=`$(am__cd) $(distdir) && pwd`; \
- 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-@@ -551,8 +571,6 @@
- 	      $(MAKE) $(AM_MAKEFLAGS) \
- 	        top_distdir="$$top_distdir" \
- 	        distdir="$$distdir/$$subdir" \
--		am__remove_distdir=: \
--		am__skip_length_check=: \
- 	        distdir) \
- 	      || exit 1; \
- 	  fi; \
-@@ -563,7 +581,7 @@
- installdirs: installdirs-recursive
- installdirs-am:
- 	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"; do \
--	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
- 	done
- install: install-recursive
- install-exec: install-exec-recursive
-@@ -599,7 +617,7 @@
- 	-rm -rf ./$(DEPDIR)
- 	-rm -f Makefile
- distclean-am: clean-am distclean-compile distclean-generic \
--	distclean-tags
-+	distclean-libtool distclean-tags
- 
- dvi: dvi-recursive
- 
-@@ -613,20 +631,12 @@
- 
- install-data-am: install-includeHEADERS
- 
--install-dvi: install-dvi-recursive
--
- install-exec-am: install-libLTLIBRARIES
- 
--install-html: install-html-recursive
--
- install-info: install-info-recursive
- 
- install-man:
- 
--install-pdf: install-pdf-recursive
--
--install-ps: install-ps-recursive
--
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-recursive
-@@ -647,27 +657,27 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-includeHEADERS uninstall-libLTLIBRARIES
-+uninstall-am: uninstall-includeHEADERS uninstall-info-am \
-+	uninstall-libLTLIBRARIES
- 
--.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
--	install-strip
-+uninstall-info: uninstall-info-recursive
- 
--.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
--	all all-am check check-am clean clean-generic \
--	clean-libLTLIBRARIES clean-libtool ctags ctags-recursive \
--	distclean distclean-compile distclean-generic \
--	distclean-libtool distclean-tags distdir dvi dvi-am html \
-+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-+	clean clean-generic clean-libLTLIBRARIES clean-libtool \
-+	clean-recursive ctags ctags-recursive distclean \
-+	distclean-compile distclean-generic distclean-libtool \
-+	distclean-recursive distclean-tags distdir dvi dvi-am html \
- 	html-am info info-am install install-am install-data \
--	install-data-am install-dvi install-dvi-am install-exec \
--	install-exec-am install-html install-html-am \
-+	install-data-am install-exec install-exec-am \
- 	install-includeHEADERS install-info install-info-am \
--	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
--	install-ps install-ps-am install-strip installcheck \
-+	install-libLTLIBRARIES install-man install-strip installcheck \
- 	installcheck-am installdirs installdirs-am maintainer-clean \
--	maintainer-clean-generic mostlyclean mostlyclean-compile \
--	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-+	maintainer-clean-generic maintainer-clean-recursive \
-+	mostlyclean mostlyclean-compile mostlyclean-generic \
-+	mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
- 	tags tags-recursive uninstall uninstall-am \
--	uninstall-includeHEADERS uninstall-libLTLIBRARIES
-+	uninstall-includeHEADERS uninstall-info-am \
-+	uninstall-libLTLIBRARIES
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
 Index: pam/Linux-PAM/libpamc/test/Makefile.in
 ===================================================================
 --- pam.orig/Linux-PAM/libpamc/test/Makefile.in
 +++ pam/Linux-PAM/libpamc/test/Makefile.in
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -17,11 +17,15 @@
- #
- # Copyright (c) 2005 Thorsten Kukuk <kukuk@suse.de>
- #
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ../..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -56,6 +60,8 @@
- DIST_SOURCES =
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -80,6 +86,10 @@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
-+ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
-+ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
-+ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
-+ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -88,7 +98,18 @@
- GMSGFMT_015 = @GMSGFMT_015@
- GREP = @GREP@
- HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
--INSTALL = @INSTALL@
-+HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
-+HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
-+HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
-+HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
-+HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
-+HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
-+HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
-+HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
-+HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
-+HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
-+HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
-+HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -100,6 +121,7 @@
+@@ -100,6 +100,7 @@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
  LIBAUDIT = @LIBAUDIT@
@@ -8334,256 +4434,19 @@ Index: pam/Linux-PAM/libpamc/test/Makefile.in
  LIBCRACK = @LIBCRACK@
  LIBCRYPT = @LIBCRYPT@
  LIBDB = @LIBDB@
-@@ -123,7 +145,6 @@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
--MKDIR_P = @MKDIR_P@
- MSGFMT = @MSGFMT@
- MSGFMT_015 = @MSGFMT_015@
- MSGMERGE = @MSGMERGE@
-@@ -142,8 +163,11 @@
+@@ -142,6 +143,7 @@
  RANLIB = @RANLIB@
  SCONFIGDIR = @SCONFIGDIR@
  SECUREDIR = @SECUREDIR@
 +SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
-+STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
-+STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
  STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -157,13 +181,13 @@
- XSLTPROC = @XSLTPROC@
- YACC = @YACC@
- YFLAGS = @YFLAGS@
--abs_builddir = @abs_builddir@
--abs_srcdir = @abs_srcdir@
--abs_top_builddir = @abs_top_builddir@
--abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -175,7 +199,6 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
--builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -206,11 +229,8 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_builddir = @top_builddir@
--top_srcdir = @top_srcdir@
- AUTOMAKE_OPTIONS = 1.6 gnits
- CLEANFILES = *~ */*~
- EXTRA_DIST = agents/secret@here modules/Makefile modules/pam_secret.c \
-@@ -255,6 +275,10 @@
- 
- clean-libtool:
- 	-rm -rf .libs _libs
-+
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
- tags: TAGS
- TAGS:
- 
-@@ -263,21 +287,23 @@
- 
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	list='$(DISTFILES)'; \
--	  dist_files=`for file in $$list; do echo $$file; done | \
--	  sed -e "s|^$$srcdirstrip/||;t" \
--	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
--	case $$dist_files in \
--	  */*) $(MKDIR_P) `echo "$$dist_files" | \
--			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
--			   sort -u` ;; \
--	esac; \
--	for file in $$dist_files; do \
-+	$(mkdir_p) $(distdir)/agents $(distdir)/modules $(distdir)/regress
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
- 	  if test -d $$d/$$file; then \
--	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- 	    fi; \
-@@ -323,7 +349,7 @@
- 
- distclean: distclean-am
- 	-rm -f Makefile
--distclean-am: clean-am distclean-generic
-+distclean-am: clean-am distclean-generic distclean-libtool
- 
- dvi: dvi-am
- 
-@@ -337,20 +363,12 @@
- 
- install-data-am:
- 
--install-dvi: install-dvi-am
--
- install-exec-am:
- 
--install-html: install-html-am
--
- install-info: install-info-am
- 
- install-man:
- 
--install-pdf: install-pdf-am
--
--install-ps: install-ps-am
--
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
-@@ -369,20 +387,17 @@
- 
- ps-am:
- 
--uninstall-am:
--
--.MAKE: install-am install-strip
-+uninstall-am: uninstall-info-am
- 
- .PHONY: all all-am check check-am clean clean-generic clean-libtool \
- 	distclean distclean-generic distclean-libtool distdir dvi \
- 	dvi-am html html-am info info-am install install-am \
--	install-data install-data-am install-dvi install-dvi-am \
--	install-exec install-exec-am install-html install-html-am \
--	install-info install-info-am install-man install-pdf \
--	install-pdf-am install-ps install-ps-am install-strip \
-+	install-data install-data-am install-exec install-exec-am \
-+	install-info install-info-am install-man install-strip \
- 	installcheck installcheck-am installdirs maintainer-clean \
- 	maintainer-clean-generic mostlyclean mostlyclean-generic \
--	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
-+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-+	uninstall-info-am
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
 Index: pam/Linux-PAM/modules/Makefile.in
 ===================================================================
 --- pam.orig/Linux-PAM/modules/Makefile.in
 +++ pam/Linux-PAM/modules/Makefile.in
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -17,11 +17,15 @@
- #
- # Copyright (c) 2005, 2006 Thorsten Kukuk <kukuk@thkukuk.de>
- #
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -56,18 +60,17 @@
- DIST_SOURCES =
- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
- 	html-recursive info-recursive install-data-recursive \
--	install-dvi-recursive install-exec-recursive \
--	install-html-recursive install-info-recursive \
--	install-pdf-recursive install-ps-recursive install-recursive \
--	installcheck-recursive installdirs-recursive pdf-recursive \
--	ps-recursive uninstall-recursive
--RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
--  distclean-recursive maintainer-clean-recursive
-+	install-exec-recursive install-info-recursive \
-+	install-recursive installcheck-recursive installdirs-recursive \
-+	pdf-recursive ps-recursive uninstall-info-recursive \
-+	uninstall-recursive
- ETAGS = etags
- CTAGS = ctags
- DIST_SUBDIRS = $(SUBDIRS)
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -92,6 +95,10 @@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
-+ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
-+ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
-+ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
-+ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -100,7 +107,18 @@
- GMSGFMT_015 = @GMSGFMT_015@
- GREP = @GREP@
- HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
--INSTALL = @INSTALL@
-+HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
-+HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
-+HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
-+HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
-+HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
-+HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
-+HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
-+HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
-+HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
-+HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
-+HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
-+HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -112,6 +130,7 @@
+@@ -112,6 +112,7 @@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
  LIBAUDIT = @LIBAUDIT@
@@ -8591,304 +4454,19 @@ Index: pam/Linux-PAM/modules/Makefile.in
  LIBCRACK = @LIBCRACK@
  LIBCRYPT = @LIBCRYPT@
  LIBDB = @LIBDB@
-@@ -135,7 +154,6 @@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
--MKDIR_P = @MKDIR_P@
- MSGFMT = @MSGFMT@
- MSGFMT_015 = @MSGFMT_015@
- MSGMERGE = @MSGMERGE@
-@@ -154,8 +172,11 @@
+@@ -154,6 +155,7 @@
  RANLIB = @RANLIB@
  SCONFIGDIR = @SCONFIGDIR@
  SECUREDIR = @SECUREDIR@
 +SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
-+STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
-+STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
  STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -169,13 +190,13 @@
- XSLTPROC = @XSLTPROC@
- YACC = @YACC@
- YFLAGS = @YFLAGS@
--abs_builddir = @abs_builddir@
--abs_srcdir = @abs_srcdir@
--abs_top_builddir = @abs_top_builddir@
--abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -187,7 +208,6 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
--builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -218,11 +238,8 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_builddir = @top_builddir@
--top_srcdir = @top_srcdir@
- SUBDIRS = pam_access pam_cracklib pam_debug pam_deny pam_echo \
- 	pam_env pam_filter pam_ftp pam_group pam_issue pam_keyinit \
- 	pam_lastlog pam_limits pam_listfile pam_localuser pam_mail \
-@@ -273,6 +290,10 @@
- clean-libtool:
- 	-rm -rf .libs _libs
- 
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
-+
- # This directory's subdirectories are mostly independent; you can cd
- # into them and run `make' without going through this Makefile.
- # To change the values of `make' variables: instead of editing Makefiles,
-@@ -304,7 +325,8 @@
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
- 	fi; test -z "$$fail"
- 
--$(RECURSIVE_CLEAN_TARGETS):
-+mostlyclean-recursive clean-recursive distclean-recursive \
-+maintainer-clean-recursive:
- 	@failcom='exit 1'; \
- 	for f in x $$MAKEFLAGS; do \
- 	  case $$f in \
-@@ -405,21 +427,22 @@
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	list='$(DISTFILES)'; \
--	  dist_files=`for file in $$list; do echo $$file; done | \
--	  sed -e "s|^$$srcdirstrip/||;t" \
--	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
--	case $$dist_files in \
--	  */*) $(MKDIR_P) `echo "$$dist_files" | \
--			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
--			   sort -u` ;; \
--	esac; \
--	for file in $$dist_files; do \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
- 	  if test -d $$d/$$file; then \
--	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- 	    fi; \
-@@ -433,7 +456,7 @@
- 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- 	  if test "$$subdir" = .; then :; else \
- 	    test -d "$(distdir)/$$subdir" \
--	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-+	    || $(mkdir_p) "$(distdir)/$$subdir" \
- 	    || exit 1; \
- 	    distdir=`$(am__cd) $(distdir) && pwd`; \
- 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-@@ -441,8 +464,6 @@
- 	      $(MAKE) $(AM_MAKEFLAGS) \
- 	        top_distdir="$$top_distdir" \
- 	        distdir="$$distdir/$$subdir" \
--		am__remove_distdir=: \
--		am__skip_length_check=: \
- 	        distdir) \
- 	      || exit 1; \
- 	  fi; \
-@@ -483,7 +504,8 @@
- 
- distclean: distclean-recursive
- 	-rm -f Makefile
--distclean-am: clean-am distclean-generic distclean-tags
-+distclean-am: clean-am distclean-generic distclean-libtool \
-+	distclean-tags
- 
- dvi: dvi-recursive
- 
-@@ -497,20 +519,12 @@
- 
- install-data-am:
- 
--install-dvi: install-dvi-recursive
--
- install-exec-am:
- 
--install-html: install-html-recursive
--
- install-info: install-info-recursive
- 
- install-man:
- 
--install-pdf: install-pdf-recursive
--
--install-ps: install-ps-recursive
--
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-recursive
-@@ -529,24 +543,22 @@
- 
- ps-am:
- 
--uninstall-am:
-+uninstall-am: uninstall-info-am
- 
--.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
--	install-strip
-+uninstall-info: uninstall-info-recursive
- 
--.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
--	all all-am check check-am clean clean-generic clean-libtool \
--	ctags ctags-recursive distclean distclean-generic \
--	distclean-libtool distclean-tags distdir dvi dvi-am html \
-+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-+	clean clean-generic clean-libtool clean-recursive ctags \
-+	ctags-recursive distclean distclean-generic distclean-libtool \
-+	distclean-recursive distclean-tags distdir dvi dvi-am html \
- 	html-am info info-am install install-am install-data \
--	install-data-am install-dvi install-dvi-am install-exec \
--	install-exec-am install-html install-html-am install-info \
--	install-info-am install-man install-pdf install-pdf-am \
--	install-ps install-ps-am install-strip installcheck \
-+	install-data-am install-exec install-exec-am install-info \
-+	install-info-am install-man install-strip installcheck \
- 	installcheck-am installdirs installdirs-am maintainer-clean \
--	maintainer-clean-generic mostlyclean mostlyclean-generic \
--	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
--	uninstall uninstall-am
-+	maintainer-clean-generic maintainer-clean-recursive \
-+	mostlyclean mostlyclean-generic mostlyclean-libtool \
-+	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-+	uninstall uninstall-am uninstall-info-am
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
 Index: pam/Linux-PAM/modules/pam_access/Makefile.in
 ===================================================================
 --- pam.orig/Linux-PAM/modules/pam_access/Makefile.in
 +++ pam/Linux-PAM/modules/pam_access/Makefile.in
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -19,11 +19,15 @@
- #
- 
- 
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ../..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -68,18 +72,17 @@
- pam_access_la_LIBADD =
- pam_access_la_SOURCES = pam_access.c
- pam_access_la_OBJECTS = pam_access.lo
--DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
--	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+	$(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
--	$(LDFLAGS) -o $@
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = pam_access.c
- DIST_SOURCES = pam_access.c
- man5dir = $(mandir)/man5
-@@ -92,6 +95,8 @@
- CTAGS = ctags
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -116,6 +121,10 @@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
-+ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
-+ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
-+ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
-+ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -124,7 +133,18 @@
- GMSGFMT_015 = @GMSGFMT_015@
- GREP = @GREP@
- HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
--INSTALL = @INSTALL@
-+HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
-+HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
-+HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
-+HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
-+HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
-+HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
-+HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
-+HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
-+HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
-+HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
-+HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
-+HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -136,6 +156,7 @@
+@@ -136,6 +136,7 @@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
  LIBAUDIT = @LIBAUDIT@
@@ -8896,390 +4474,19 @@ Index: pam/Linux-PAM/modules/pam_access/Makefile.in
  LIBCRACK = @LIBCRACK@
  LIBCRYPT = @LIBCRYPT@
  LIBDB = @LIBDB@
-@@ -159,7 +180,6 @@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
--MKDIR_P = @MKDIR_P@
- MSGFMT = @MSGFMT@
- MSGFMT_015 = @MSGFMT_015@
- MSGMERGE = @MSGMERGE@
-@@ -178,8 +198,11 @@
+@@ -178,6 +179,7 @@
  RANLIB = @RANLIB@
  SCONFIGDIR = @SCONFIGDIR@
  SECUREDIR = @SECUREDIR@
 +SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
-+STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
-+STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
  STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -193,13 +216,13 @@
- XSLTPROC = @XSLTPROC@
- YACC = @YACC@
- YFLAGS = @YFLAGS@
--abs_builddir = @abs_builddir@
--abs_srcdir = @abs_srcdir@
--abs_top_builddir = @abs_top_builddir@
--abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -211,7 +234,6 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
--builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -242,11 +264,8 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_builddir = @top_builddir@
--top_srcdir = @top_srcdir@
- CLEANFILES = *~
- EXTRA_DIST = README access.conf $(MANS) $(XMLS) tst-pam_access
- man_MANS = access.conf.5 pam_access.8
-@@ -297,7 +316,7 @@
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
--	test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
-+	test -z "$(securelibdir)" || $(mkdir_p) "$(DESTDIR)$(securelibdir)"
- 	@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
- 	  if test -f $$p; then \
- 	    f=$(am__strip_dir) \
-@@ -308,7 +327,7 @@
- 
- uninstall-securelibLTLIBRARIES:
- 	@$(NORMAL_UNINSTALL)
--	@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-+	@set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
- 	  p=$(am__strip_dir) \
- 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
- 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-@@ -323,7 +342,7 @@
- 	  rm -f "$${dir}/so_locations"; \
- 	done
- pam_access.la: $(pam_access_la_OBJECTS) $(pam_access_la_DEPENDENCIES) 
--	$(LINK) -rpath $(securelibdir) $(pam_access_la_OBJECTS) $(pam_access_la_LIBADD) $(LIBS)
-+	$(LINK) -rpath $(securelibdir) $(pam_access_la_LDFLAGS) $(pam_access_la_OBJECTS) $(pam_access_la_LIBADD) $(LIBS)
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
-@@ -334,22 +353,22 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_access.Plo@am__quote@
- 
- .c.o:
--@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c $<
- 
- .c.obj:
--@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
- 
- .c.lo:
--@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-@@ -359,9 +378,13 @@
- 
- clean-libtool:
- 	-rm -rf .libs _libs
-+
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
- install-man5: $(man5_MANS) $(man_MANS)
- 	@$(NORMAL_INSTALL)
--	test -z "$(man5dir)" || $(MKDIR_P) "$(DESTDIR)$(man5dir)"
-+	test -z "$(man5dir)" || $(mkdir_p) "$(DESTDIR)$(man5dir)"
- 	@list='$(man5_MANS) $(dist_man5_MANS) $(nodist_man5_MANS)'; \
- 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
- 	for i in $$l2; do \
-@@ -406,7 +429,7 @@
- 	done
- install-man8: $(man8_MANS) $(man_MANS)
- 	@$(NORMAL_INSTALL)
--	test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
-+	test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
- 	@list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
- 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
- 	for i in $$l2; do \
-@@ -451,7 +474,7 @@
- 	done
- install-secureconfDATA: $(secureconf_DATA)
- 	@$(NORMAL_INSTALL)
--	test -z "$(secureconfdir)" || $(MKDIR_P) "$(DESTDIR)$(secureconfdir)"
-+	test -z "$(secureconfdir)" || $(mkdir_p) "$(DESTDIR)$(secureconfdir)"
- 	@list='$(secureconf_DATA)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  f=$(am__strip_dir) \
-@@ -516,9 +539,9 @@
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
- check-TESTS: $(TESTS)
--	@failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[	 ]'; \
-+	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
- 	srcdir=$(srcdir); export srcdir; \
--	list=' $(TESTS) '; \
-+	list='$(TESTS)'; \
- 	if test -n "$$list"; then \
- 	  for tst in $$list; do \
- 	    if test -f ./$$tst; then dir=./; \
-@@ -527,7 +550,7 @@
- 	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
- 	      all=`expr $$all + 1`; \
- 	      case " $(XFAIL_TESTS) " in \
--	      *$$ws$$tst$$ws*) \
-+	      *" $$tst "*) \
- 		xpass=`expr $$xpass + 1`; \
- 		failed=`expr $$failed + 1`; \
- 		echo "XPASS: $$tst"; \
-@@ -539,7 +562,7 @@
- 	    elif test $$? -ne 77; then \
- 	      all=`expr $$all + 1`; \
- 	      case " $(XFAIL_TESTS) " in \
--	      *$$ws$$tst$$ws*) \
-+	      *" $$tst "*) \
- 		xfail=`expr $$xfail + 1`; \
- 		echo "XFAIL: $$tst"; \
- 	      ;; \
-@@ -589,21 +612,22 @@
- 	else :; fi
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	list='$(DISTFILES)'; \
--	  dist_files=`for file in $$list; do echo $$file; done | \
--	  sed -e "s|^$$srcdirstrip/||;t" \
--	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
--	case $$dist_files in \
--	  */*) $(MKDIR_P) `echo "$$dist_files" | \
--			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
--			   sort -u` ;; \
--	esac; \
--	for file in $$dist_files; do \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
- 	  if test -d $$d/$$file; then \
--	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- 	    fi; \
-@@ -620,7 +644,7 @@
- all-am: Makefile $(LTLIBRARIES) $(MANS) $(DATA)
- installdirs:
- 	for dir in "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(secureconfdir)"; do \
--	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
- 	done
- install: install-am
- install-exec: install-exec-am
-@@ -656,7 +680,7 @@
- 	-rm -rf ./$(DEPDIR)
- 	-rm -f Makefile
- distclean-am: clean-am distclean-compile distclean-generic \
--	distclean-tags
-+	distclean-libtool distclean-tags
- 
- dvi: dvi-am
- 
-@@ -671,20 +695,12 @@
- install-data-am: install-man install-secureconfDATA \
- 	install-securelibLTLIBRARIES
- 
--install-dvi: install-dvi-am
--
- install-exec-am:
- 
--install-html: install-html-am
--
- install-info: install-info-am
- 
- install-man: install-man5 install-man8
- 
--install-pdf: install-pdf-am
--
--install-ps: install-ps-am
--
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
-@@ -705,29 +721,25 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-man uninstall-secureconfDATA \
-+uninstall-am: uninstall-info-am uninstall-man uninstall-secureconfDATA \
- 	uninstall-securelibLTLIBRARIES
- 
- uninstall-man: uninstall-man5 uninstall-man8
- 
--.MAKE: install-am install-strip
--
- .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
- 	clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
- 	distclean distclean-compile distclean-generic \
- 	distclean-libtool distclean-tags distdir dvi dvi-am html \
- 	html-am info info-am install install-am install-data \
--	install-data-am install-dvi install-dvi-am install-exec \
--	install-exec-am install-html install-html-am install-info \
-+	install-data-am install-exec install-exec-am install-info \
- 	install-info-am install-man install-man5 install-man8 \
--	install-pdf install-pdf-am install-ps install-ps-am \
- 	install-secureconfDATA install-securelibLTLIBRARIES \
- 	install-strip installcheck installcheck-am installdirs \
- 	maintainer-clean maintainer-clean-generic mostlyclean \
- 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
--	pdf pdf-am ps ps-am tags uninstall uninstall-am uninstall-man \
--	uninstall-man5 uninstall-man8 uninstall-secureconfDATA \
--	uninstall-securelibLTLIBRARIES
-+	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-+	uninstall-info-am uninstall-man uninstall-man5 uninstall-man8 \
-+	uninstall-secureconfDATA uninstall-securelibLTLIBRARIES
- 
- 
- @ENABLE_REGENERATE_MAN_TRUE@README: pam_access.8.xml access.conf.5.xml
 Index: pam/Linux-PAM/modules/pam_cracklib/Makefile.in
 ===================================================================
 --- pam.orig/Linux-PAM/modules/pam_cracklib/Makefile.in
 +++ pam/Linux-PAM/modules/pam_cracklib/Makefile.in
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -19,11 +19,15 @@
- #
- 
- 
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ../..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -68,18 +72,17 @@
- pam_cracklib_la_SOURCES = pam_cracklib.c
- pam_cracklib_la_OBJECTS = pam_cracklib.lo
- @HAVE_LIBCRACK_TRUE@am_pam_cracklib_la_rpath = -rpath $(securelibdir)
--DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
--	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+	$(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
--	$(LDFLAGS) -o $@
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = pam_cracklib.c
- DIST_SOURCES = pam_cracklib.c
- man8dir = $(mandir)/man8
-@@ -90,6 +93,8 @@
- CTAGS = ctags
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -114,6 +119,10 @@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
-+ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
-+ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
-+ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
-+ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -122,7 +131,18 @@
- GMSGFMT_015 = @GMSGFMT_015@
- GREP = @GREP@
- HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
--INSTALL = @INSTALL@
-+HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
-+HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
-+HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
-+HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
-+HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
-+HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
-+HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
-+HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
-+HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
-+HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
-+HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
-+HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -134,6 +154,7 @@
+@@ -134,6 +134,7 @@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
  LIBAUDIT = @LIBAUDIT@
@@ -9287,371 +4494,19 @@ Index: pam/Linux-PAM/modules/pam_cracklib/Makefile.in
  LIBCRACK = @LIBCRACK@
  LIBCRYPT = @LIBCRYPT@
  LIBDB = @LIBDB@
-@@ -157,7 +178,6 @@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
--MKDIR_P = @MKDIR_P@
- MSGFMT = @MSGFMT@
- MSGFMT_015 = @MSGFMT_015@
- MSGMERGE = @MSGMERGE@
-@@ -176,8 +196,11 @@
+@@ -176,6 +177,7 @@
  RANLIB = @RANLIB@
  SCONFIGDIR = @SCONFIGDIR@
  SECUREDIR = @SECUREDIR@
 +SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
-+STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
-+STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
  STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -191,13 +214,13 @@
- XSLTPROC = @XSLTPROC@
- YACC = @YACC@
- YFLAGS = @YFLAGS@
--abs_builddir = @abs_builddir@
--abs_srcdir = @abs_srcdir@
--abs_top_builddir = @abs_top_builddir@
--abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -209,7 +232,6 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
--builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -240,11 +262,8 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_builddir = @top_builddir@
--top_srcdir = @top_srcdir@
- CLEANFILES = *~
- EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_cracklib
- man_MANS = pam_cracklib.8
-@@ -293,7 +312,7 @@
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
--	test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
-+	test -z "$(securelibdir)" || $(mkdir_p) "$(DESTDIR)$(securelibdir)"
- 	@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
- 	  if test -f $$p; then \
- 	    f=$(am__strip_dir) \
-@@ -304,7 +323,7 @@
- 
- uninstall-securelibLTLIBRARIES:
- 	@$(NORMAL_UNINSTALL)
--	@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-+	@set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
- 	  p=$(am__strip_dir) \
- 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
- 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-@@ -319,7 +338,7 @@
- 	  rm -f "$${dir}/so_locations"; \
- 	done
- pam_cracklib.la: $(pam_cracklib_la_OBJECTS) $(pam_cracklib_la_DEPENDENCIES) 
--	$(LINK) $(am_pam_cracklib_la_rpath) $(pam_cracklib_la_OBJECTS) $(pam_cracklib_la_LIBADD) $(LIBS)
-+	$(LINK) $(am_pam_cracklib_la_rpath) $(pam_cracklib_la_LDFLAGS) $(pam_cracklib_la_OBJECTS) $(pam_cracklib_la_LIBADD) $(LIBS)
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
-@@ -330,22 +349,22 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_cracklib.Plo@am__quote@
- 
- .c.o:
--@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c $<
- 
- .c.obj:
--@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
- 
- .c.lo:
--@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-@@ -355,9 +374,13 @@
- 
- clean-libtool:
- 	-rm -rf .libs _libs
-+
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
- install-man8: $(man8_MANS) $(man_MANS)
- 	@$(NORMAL_INSTALL)
--	test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
-+	test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
- 	@list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
- 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
- 	for i in $$l2; do \
-@@ -450,9 +473,9 @@
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
- check-TESTS: $(TESTS)
--	@failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[	 ]'; \
-+	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
- 	srcdir=$(srcdir); export srcdir; \
--	list=' $(TESTS) '; \
-+	list='$(TESTS)'; \
- 	if test -n "$$list"; then \
- 	  for tst in $$list; do \
- 	    if test -f ./$$tst; then dir=./; \
-@@ -461,7 +484,7 @@
- 	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
- 	      all=`expr $$all + 1`; \
- 	      case " $(XFAIL_TESTS) " in \
--	      *$$ws$$tst$$ws*) \
-+	      *" $$tst "*) \
- 		xpass=`expr $$xpass + 1`; \
- 		failed=`expr $$failed + 1`; \
- 		echo "XPASS: $$tst"; \
-@@ -473,7 +496,7 @@
- 	    elif test $$? -ne 77; then \
- 	      all=`expr $$all + 1`; \
- 	      case " $(XFAIL_TESTS) " in \
--	      *$$ws$$tst$$ws*) \
-+	      *" $$tst "*) \
- 		xfail=`expr $$xfail + 1`; \
- 		echo "XFAIL: $$tst"; \
- 	      ;; \
-@@ -523,21 +546,22 @@
- 	else :; fi
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	list='$(DISTFILES)'; \
--	  dist_files=`for file in $$list; do echo $$file; done | \
--	  sed -e "s|^$$srcdirstrip/||;t" \
--	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
--	case $$dist_files in \
--	  */*) $(MKDIR_P) `echo "$$dist_files" | \
--			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
--			   sort -u` ;; \
--	esac; \
--	for file in $$dist_files; do \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
- 	  if test -d $$d/$$file; then \
--	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- 	    fi; \
-@@ -554,7 +578,7 @@
- all-am: Makefile $(LTLIBRARIES) $(MANS) $(DATA)
- installdirs:
- 	for dir in "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man8dir)"; do \
--	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
- 	done
- install: install-am
- install-exec: install-exec-am
-@@ -590,7 +614,7 @@
- 	-rm -rf ./$(DEPDIR)
- 	-rm -f Makefile
- distclean-am: clean-am distclean-compile distclean-generic \
--	distclean-tags
-+	distclean-libtool distclean-tags
- 
- dvi: dvi-am
- 
-@@ -604,20 +628,12 @@
- 
- install-data-am: install-man install-securelibLTLIBRARIES
- 
--install-dvi: install-dvi-am
--
- install-exec-am:
- 
--install-html: install-html-am
--
- install-info: install-info-am
- 
- install-man: install-man8
- 
--install-pdf: install-pdf-am
--
--install-ps: install-ps-am
--
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
-@@ -638,27 +654,24 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-man uninstall-securelibLTLIBRARIES
-+uninstall-am: uninstall-info-am uninstall-man \
-+	uninstall-securelibLTLIBRARIES
- 
- uninstall-man: uninstall-man8
- 
--.MAKE: install-am install-strip
--
- .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
- 	clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
- 	distclean distclean-compile distclean-generic \
- 	distclean-libtool distclean-tags distdir dvi dvi-am html \
- 	html-am info info-am install install-am install-data \
--	install-data-am install-dvi install-dvi-am install-exec \
--	install-exec-am install-html install-html-am install-info \
--	install-info-am install-man install-man8 install-pdf \
--	install-pdf-am install-ps install-ps-am \
-+	install-data-am install-exec install-exec-am install-info \
-+	install-info-am install-man install-man8 \
- 	install-securelibLTLIBRARIES install-strip installcheck \
- 	installcheck-am installdirs maintainer-clean \
- 	maintainer-clean-generic mostlyclean mostlyclean-compile \
- 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
--	tags uninstall uninstall-am uninstall-man uninstall-man8 \
--	uninstall-securelibLTLIBRARIES
-+	tags uninstall uninstall-am uninstall-info-am uninstall-man \
-+	uninstall-man8 uninstall-securelibLTLIBRARIES
- 
- 
- @ENABLE_REGENERATE_MAN_TRUE@README: pam_cracklib.8.xml
 Index: pam/Linux-PAM/modules/pam_debug/Makefile.in
 ===================================================================
 --- pam.orig/Linux-PAM/modules/pam_debug/Makefile.in
 +++ pam/Linux-PAM/modules/pam_debug/Makefile.in
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -19,11 +19,15 @@
- #
- 
- 
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ../..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -67,18 +71,17 @@
- pam_debug_la_LIBADD =
- pam_debug_la_SOURCES = pam_debug.c
- pam_debug_la_OBJECTS = pam_debug.lo
--DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
--	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+	$(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
--	$(LDFLAGS) -o $@
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = pam_debug.c
- DIST_SOURCES = pam_debug.c
- man8dir = $(mandir)/man8
-@@ -89,6 +92,8 @@
- CTAGS = ctags
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -113,6 +118,10 @@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
-+ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
-+ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
-+ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
-+ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -121,7 +130,18 @@
- GMSGFMT_015 = @GMSGFMT_015@
- GREP = @GREP@
- HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
--INSTALL = @INSTALL@
-+HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
-+HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
-+HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
-+HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
-+HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
-+HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
-+HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
-+HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
-+HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
-+HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
-+HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
-+HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -133,6 +153,7 @@
+@@ -133,6 +133,7 @@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
  LIBAUDIT = @LIBAUDIT@
@@ -9659,371 +4514,19 @@ Index: pam/Linux-PAM/modules/pam_debug/Makefile.in
  LIBCRACK = @LIBCRACK@
  LIBCRYPT = @LIBCRYPT@
  LIBDB = @LIBDB@
-@@ -156,7 +177,6 @@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
--MKDIR_P = @MKDIR_P@
- MSGFMT = @MSGFMT@
- MSGFMT_015 = @MSGFMT_015@
- MSGMERGE = @MSGMERGE@
-@@ -175,8 +195,11 @@
+@@ -175,6 +176,7 @@
  RANLIB = @RANLIB@
  SCONFIGDIR = @SCONFIGDIR@
  SECUREDIR = @SECUREDIR@
 +SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
-+STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
-+STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
  STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -190,13 +213,13 @@
- XSLTPROC = @XSLTPROC@
- YACC = @YACC@
- YFLAGS = @YFLAGS@
--abs_builddir = @abs_builddir@
--abs_srcdir = @abs_srcdir@
--abs_top_builddir = @abs_top_builddir@
--abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -208,7 +231,6 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
--builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -239,11 +261,8 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_builddir = @top_builddir@
--top_srcdir = @top_srcdir@
- CLEANFILES = *~
- EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_debug
- man_MANS = pam_debug.8
-@@ -291,7 +310,7 @@
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
--	test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
-+	test -z "$(securelibdir)" || $(mkdir_p) "$(DESTDIR)$(securelibdir)"
- 	@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
- 	  if test -f $$p; then \
- 	    f=$(am__strip_dir) \
-@@ -302,7 +321,7 @@
- 
- uninstall-securelibLTLIBRARIES:
- 	@$(NORMAL_UNINSTALL)
--	@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-+	@set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
- 	  p=$(am__strip_dir) \
- 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
- 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-@@ -317,7 +336,7 @@
- 	  rm -f "$${dir}/so_locations"; \
- 	done
- pam_debug.la: $(pam_debug_la_OBJECTS) $(pam_debug_la_DEPENDENCIES) 
--	$(LINK) -rpath $(securelibdir) $(pam_debug_la_OBJECTS) $(pam_debug_la_LIBADD) $(LIBS)
-+	$(LINK) -rpath $(securelibdir) $(pam_debug_la_LDFLAGS) $(pam_debug_la_OBJECTS) $(pam_debug_la_LIBADD) $(LIBS)
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
-@@ -328,22 +347,22 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_debug.Plo@am__quote@
- 
- .c.o:
--@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c $<
- 
- .c.obj:
--@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
- 
- .c.lo:
--@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-@@ -353,9 +372,13 @@
- 
- clean-libtool:
- 	-rm -rf .libs _libs
-+
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
- install-man8: $(man8_MANS) $(man_MANS)
- 	@$(NORMAL_INSTALL)
--	test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
-+	test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
- 	@list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
- 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
- 	for i in $$l2; do \
-@@ -448,9 +471,9 @@
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
- check-TESTS: $(TESTS)
--	@failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[	 ]'; \
-+	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
- 	srcdir=$(srcdir); export srcdir; \
--	list=' $(TESTS) '; \
-+	list='$(TESTS)'; \
- 	if test -n "$$list"; then \
- 	  for tst in $$list; do \
- 	    if test -f ./$$tst; then dir=./; \
-@@ -459,7 +482,7 @@
- 	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
- 	      all=`expr $$all + 1`; \
- 	      case " $(XFAIL_TESTS) " in \
--	      *$$ws$$tst$$ws*) \
-+	      *" $$tst "*) \
- 		xpass=`expr $$xpass + 1`; \
- 		failed=`expr $$failed + 1`; \
- 		echo "XPASS: $$tst"; \
-@@ -471,7 +494,7 @@
- 	    elif test $$? -ne 77; then \
- 	      all=`expr $$all + 1`; \
- 	      case " $(XFAIL_TESTS) " in \
--	      *$$ws$$tst$$ws*) \
-+	      *" $$tst "*) \
- 		xfail=`expr $$xfail + 1`; \
- 		echo "XFAIL: $$tst"; \
- 	      ;; \
-@@ -521,21 +544,22 @@
- 	else :; fi
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	list='$(DISTFILES)'; \
--	  dist_files=`for file in $$list; do echo $$file; done | \
--	  sed -e "s|^$$srcdirstrip/||;t" \
--	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
--	case $$dist_files in \
--	  */*) $(MKDIR_P) `echo "$$dist_files" | \
--			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
--			   sort -u` ;; \
--	esac; \
--	for file in $$dist_files; do \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
- 	  if test -d $$d/$$file; then \
--	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- 	    fi; \
-@@ -552,7 +576,7 @@
- all-am: Makefile $(LTLIBRARIES) $(MANS) $(DATA)
- installdirs:
- 	for dir in "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man8dir)"; do \
--	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
- 	done
- install: install-am
- install-exec: install-exec-am
-@@ -588,7 +612,7 @@
- 	-rm -rf ./$(DEPDIR)
- 	-rm -f Makefile
- distclean-am: clean-am distclean-compile distclean-generic \
--	distclean-tags
-+	distclean-libtool distclean-tags
- 
- dvi: dvi-am
- 
-@@ -602,20 +626,12 @@
- 
- install-data-am: install-man install-securelibLTLIBRARIES
- 
--install-dvi: install-dvi-am
--
- install-exec-am:
- 
--install-html: install-html-am
--
- install-info: install-info-am
- 
- install-man: install-man8
- 
--install-pdf: install-pdf-am
--
--install-ps: install-ps-am
--
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
-@@ -636,27 +652,24 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-man uninstall-securelibLTLIBRARIES
-+uninstall-am: uninstall-info-am uninstall-man \
-+	uninstall-securelibLTLIBRARIES
- 
- uninstall-man: uninstall-man8
- 
--.MAKE: install-am install-strip
--
- .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
- 	clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
- 	distclean distclean-compile distclean-generic \
- 	distclean-libtool distclean-tags distdir dvi dvi-am html \
- 	html-am info info-am install install-am install-data \
--	install-data-am install-dvi install-dvi-am install-exec \
--	install-exec-am install-html install-html-am install-info \
--	install-info-am install-man install-man8 install-pdf \
--	install-pdf-am install-ps install-ps-am \
-+	install-data-am install-exec install-exec-am install-info \
-+	install-info-am install-man install-man8 \
- 	install-securelibLTLIBRARIES install-strip installcheck \
- 	installcheck-am installdirs maintainer-clean \
- 	maintainer-clean-generic mostlyclean mostlyclean-compile \
- 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
--	tags uninstall uninstall-am uninstall-man uninstall-man8 \
--	uninstall-securelibLTLIBRARIES
-+	tags uninstall uninstall-am uninstall-info-am uninstall-man \
-+	uninstall-man8 uninstall-securelibLTLIBRARIES
- 
- @ENABLE_REGENERATE_MAN_TRUE@README: pam_debug.8.xml
- @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
 Index: pam/Linux-PAM/modules/pam_deny/Makefile.in
 ===================================================================
 --- pam.orig/Linux-PAM/modules/pam_deny/Makefile.in
 +++ pam/Linux-PAM/modules/pam_deny/Makefile.in
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -19,11 +19,15 @@
- #
- 
- 
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ../..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -67,18 +71,17 @@
- pam_deny_la_LIBADD =
- pam_deny_la_SOURCES = pam_deny.c
- pam_deny_la_OBJECTS = pam_deny.lo
--DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
--	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+	$(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
--	$(LDFLAGS) -o $@
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = pam_deny.c
- DIST_SOURCES = pam_deny.c
- man8dir = $(mandir)/man8
-@@ -89,6 +92,8 @@
- CTAGS = ctags
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -113,6 +118,10 @@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
-+ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
-+ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
-+ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
-+ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -121,7 +130,18 @@
- GMSGFMT_015 = @GMSGFMT_015@
- GREP = @GREP@
- HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
--INSTALL = @INSTALL@
-+HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
-+HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
-+HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
-+HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
-+HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
-+HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
-+HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
-+HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
-+HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
-+HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
-+HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
-+HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -133,6 +153,7 @@
+@@ -133,6 +133,7 @@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
  LIBAUDIT = @LIBAUDIT@
@@ -10031,371 +4534,19 @@ Index: pam/Linux-PAM/modules/pam_deny/Makefile.in
  LIBCRACK = @LIBCRACK@
  LIBCRYPT = @LIBCRYPT@
  LIBDB = @LIBDB@
-@@ -156,7 +177,6 @@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
--MKDIR_P = @MKDIR_P@
- MSGFMT = @MSGFMT@
- MSGFMT_015 = @MSGFMT_015@
- MSGMERGE = @MSGMERGE@
-@@ -175,8 +195,11 @@
+@@ -175,6 +176,7 @@
  RANLIB = @RANLIB@
  SCONFIGDIR = @SCONFIGDIR@
  SECUREDIR = @SECUREDIR@
 +SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
-+STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
-+STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
  STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -190,13 +213,13 @@
- XSLTPROC = @XSLTPROC@
- YACC = @YACC@
- YFLAGS = @YFLAGS@
--abs_builddir = @abs_builddir@
--abs_srcdir = @abs_srcdir@
--abs_top_builddir = @abs_top_builddir@
--abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -208,7 +231,6 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
--builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -239,11 +261,8 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_builddir = @top_builddir@
--top_srcdir = @top_srcdir@
- CLEANFILES = *~
- EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_deny
- man_MANS = pam_deny.8
-@@ -291,7 +310,7 @@
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
--	test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
-+	test -z "$(securelibdir)" || $(mkdir_p) "$(DESTDIR)$(securelibdir)"
- 	@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
- 	  if test -f $$p; then \
- 	    f=$(am__strip_dir) \
-@@ -302,7 +321,7 @@
- 
- uninstall-securelibLTLIBRARIES:
- 	@$(NORMAL_UNINSTALL)
--	@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-+	@set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
- 	  p=$(am__strip_dir) \
- 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
- 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-@@ -317,7 +336,7 @@
- 	  rm -f "$${dir}/so_locations"; \
- 	done
- pam_deny.la: $(pam_deny_la_OBJECTS) $(pam_deny_la_DEPENDENCIES) 
--	$(LINK) -rpath $(securelibdir) $(pam_deny_la_OBJECTS) $(pam_deny_la_LIBADD) $(LIBS)
-+	$(LINK) -rpath $(securelibdir) $(pam_deny_la_LDFLAGS) $(pam_deny_la_OBJECTS) $(pam_deny_la_LIBADD) $(LIBS)
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
-@@ -328,22 +347,22 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_deny.Plo@am__quote@
- 
- .c.o:
--@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c $<
- 
- .c.obj:
--@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
- 
- .c.lo:
--@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-@@ -353,9 +372,13 @@
- 
- clean-libtool:
- 	-rm -rf .libs _libs
-+
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
- install-man8: $(man8_MANS) $(man_MANS)
- 	@$(NORMAL_INSTALL)
--	test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
-+	test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
- 	@list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
- 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
- 	for i in $$l2; do \
-@@ -448,9 +471,9 @@
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
- check-TESTS: $(TESTS)
--	@failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[	 ]'; \
-+	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
- 	srcdir=$(srcdir); export srcdir; \
--	list=' $(TESTS) '; \
-+	list='$(TESTS)'; \
- 	if test -n "$$list"; then \
- 	  for tst in $$list; do \
- 	    if test -f ./$$tst; then dir=./; \
-@@ -459,7 +482,7 @@
- 	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
- 	      all=`expr $$all + 1`; \
- 	      case " $(XFAIL_TESTS) " in \
--	      *$$ws$$tst$$ws*) \
-+	      *" $$tst "*) \
- 		xpass=`expr $$xpass + 1`; \
- 		failed=`expr $$failed + 1`; \
- 		echo "XPASS: $$tst"; \
-@@ -471,7 +494,7 @@
- 	    elif test $$? -ne 77; then \
- 	      all=`expr $$all + 1`; \
- 	      case " $(XFAIL_TESTS) " in \
--	      *$$ws$$tst$$ws*) \
-+	      *" $$tst "*) \
- 		xfail=`expr $$xfail + 1`; \
- 		echo "XFAIL: $$tst"; \
- 	      ;; \
-@@ -521,21 +544,22 @@
- 	else :; fi
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	list='$(DISTFILES)'; \
--	  dist_files=`for file in $$list; do echo $$file; done | \
--	  sed -e "s|^$$srcdirstrip/||;t" \
--	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
--	case $$dist_files in \
--	  */*) $(MKDIR_P) `echo "$$dist_files" | \
--			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
--			   sort -u` ;; \
--	esac; \
--	for file in $$dist_files; do \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
- 	  if test -d $$d/$$file; then \
--	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- 	    fi; \
-@@ -552,7 +576,7 @@
- all-am: Makefile $(LTLIBRARIES) $(MANS) $(DATA)
- installdirs:
- 	for dir in "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man8dir)"; do \
--	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
- 	done
- install: install-am
- install-exec: install-exec-am
-@@ -588,7 +612,7 @@
- 	-rm -rf ./$(DEPDIR)
- 	-rm -f Makefile
- distclean-am: clean-am distclean-compile distclean-generic \
--	distclean-tags
-+	distclean-libtool distclean-tags
- 
- dvi: dvi-am
- 
-@@ -602,20 +626,12 @@
- 
- install-data-am: install-man install-securelibLTLIBRARIES
- 
--install-dvi: install-dvi-am
--
- install-exec-am:
- 
--install-html: install-html-am
--
- install-info: install-info-am
- 
- install-man: install-man8
- 
--install-pdf: install-pdf-am
--
--install-ps: install-ps-am
--
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
-@@ -636,27 +652,24 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-man uninstall-securelibLTLIBRARIES
-+uninstall-am: uninstall-info-am uninstall-man \
-+	uninstall-securelibLTLIBRARIES
- 
- uninstall-man: uninstall-man8
- 
--.MAKE: install-am install-strip
--
- .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
- 	clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
- 	distclean distclean-compile distclean-generic \
- 	distclean-libtool distclean-tags distdir dvi dvi-am html \
- 	html-am info info-am install install-am install-data \
--	install-data-am install-dvi install-dvi-am install-exec \
--	install-exec-am install-html install-html-am install-info \
--	install-info-am install-man install-man8 install-pdf \
--	install-pdf-am install-ps install-ps-am \
-+	install-data-am install-exec install-exec-am install-info \
-+	install-info-am install-man install-man8 \
- 	install-securelibLTLIBRARIES install-strip installcheck \
- 	installcheck-am installdirs maintainer-clean \
- 	maintainer-clean-generic mostlyclean mostlyclean-compile \
- 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
--	tags uninstall uninstall-am uninstall-man uninstall-man8 \
--	uninstall-securelibLTLIBRARIES
-+	tags uninstall uninstall-am uninstall-info-am uninstall-man \
-+	uninstall-man8 uninstall-securelibLTLIBRARIES
- 
- 
- @ENABLE_REGENERATE_MAN_TRUE@README: pam_deny.8.xml
 Index: pam/Linux-PAM/modules/pam_echo/Makefile.in
 ===================================================================
 --- pam.orig/Linux-PAM/modules/pam_echo/Makefile.in
 +++ pam/Linux-PAM/modules/pam_echo/Makefile.in
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -19,11 +19,15 @@
- #
- 
- 
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ../..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -67,18 +71,17 @@
- pam_echo_la_LIBADD =
- pam_echo_la_SOURCES = pam_echo.c
- pam_echo_la_OBJECTS = pam_echo.lo
--DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
--	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+	$(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
--	$(LDFLAGS) -o $@
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = pam_echo.c
- DIST_SOURCES = pam_echo.c
- man8dir = $(mandir)/man8
-@@ -89,6 +92,8 @@
- CTAGS = ctags
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -113,6 +118,10 @@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
-+ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
-+ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
-+ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
-+ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -121,7 +130,18 @@
- GMSGFMT_015 = @GMSGFMT_015@
- GREP = @GREP@
- HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
--INSTALL = @INSTALL@
-+HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
-+HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
-+HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
-+HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
-+HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
-+HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
-+HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
-+HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
-+HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
-+HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
-+HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
-+HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -133,6 +153,7 @@
+@@ -133,6 +133,7 @@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
  LIBAUDIT = @LIBAUDIT@
@@ -10403,371 +4554,19 @@ Index: pam/Linux-PAM/modules/pam_echo/Makefile.in
  LIBCRACK = @LIBCRACK@
  LIBCRYPT = @LIBCRYPT@
  LIBDB = @LIBDB@
-@@ -156,7 +177,6 @@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
--MKDIR_P = @MKDIR_P@
- MSGFMT = @MSGFMT@
- MSGFMT_015 = @MSGFMT_015@
- MSGMERGE = @MSGMERGE@
-@@ -175,8 +195,11 @@
+@@ -175,6 +176,7 @@
  RANLIB = @RANLIB@
  SCONFIGDIR = @SCONFIGDIR@
  SECUREDIR = @SECUREDIR@
 +SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
-+STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
-+STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
  STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -190,13 +213,13 @@
- XSLTPROC = @XSLTPROC@
- YACC = @YACC@
- YFLAGS = @YFLAGS@
--abs_builddir = @abs_builddir@
--abs_srcdir = @abs_srcdir@
--abs_top_builddir = @abs_top_builddir@
--abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -208,7 +231,6 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
--builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -239,11 +261,8 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_builddir = @top_builddir@
--top_srcdir = @top_srcdir@
- CLEANFILES = *~
- EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_echo
- man_MANS = pam_echo.8
-@@ -291,7 +310,7 @@
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
--	test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
-+	test -z "$(securelibdir)" || $(mkdir_p) "$(DESTDIR)$(securelibdir)"
- 	@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
- 	  if test -f $$p; then \
- 	    f=$(am__strip_dir) \
-@@ -302,7 +321,7 @@
- 
- uninstall-securelibLTLIBRARIES:
- 	@$(NORMAL_UNINSTALL)
--	@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-+	@set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
- 	  p=$(am__strip_dir) \
- 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
- 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-@@ -317,7 +336,7 @@
- 	  rm -f "$${dir}/so_locations"; \
- 	done
- pam_echo.la: $(pam_echo_la_OBJECTS) $(pam_echo_la_DEPENDENCIES) 
--	$(LINK) -rpath $(securelibdir) $(pam_echo_la_OBJECTS) $(pam_echo_la_LIBADD) $(LIBS)
-+	$(LINK) -rpath $(securelibdir) $(pam_echo_la_LDFLAGS) $(pam_echo_la_OBJECTS) $(pam_echo_la_LIBADD) $(LIBS)
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
-@@ -328,22 +347,22 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_echo.Plo@am__quote@
- 
- .c.o:
--@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c $<
- 
- .c.obj:
--@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
- 
- .c.lo:
--@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-@@ -353,9 +372,13 @@
- 
- clean-libtool:
- 	-rm -rf .libs _libs
-+
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
- install-man8: $(man8_MANS) $(man_MANS)
- 	@$(NORMAL_INSTALL)
--	test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
-+	test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
- 	@list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
- 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
- 	for i in $$l2; do \
-@@ -448,9 +471,9 @@
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
- check-TESTS: $(TESTS)
--	@failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[	 ]'; \
-+	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
- 	srcdir=$(srcdir); export srcdir; \
--	list=' $(TESTS) '; \
-+	list='$(TESTS)'; \
- 	if test -n "$$list"; then \
- 	  for tst in $$list; do \
- 	    if test -f ./$$tst; then dir=./; \
-@@ -459,7 +482,7 @@
- 	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
- 	      all=`expr $$all + 1`; \
- 	      case " $(XFAIL_TESTS) " in \
--	      *$$ws$$tst$$ws*) \
-+	      *" $$tst "*) \
- 		xpass=`expr $$xpass + 1`; \
- 		failed=`expr $$failed + 1`; \
- 		echo "XPASS: $$tst"; \
-@@ -471,7 +494,7 @@
- 	    elif test $$? -ne 77; then \
- 	      all=`expr $$all + 1`; \
- 	      case " $(XFAIL_TESTS) " in \
--	      *$$ws$$tst$$ws*) \
-+	      *" $$tst "*) \
- 		xfail=`expr $$xfail + 1`; \
- 		echo "XFAIL: $$tst"; \
- 	      ;; \
-@@ -521,21 +544,22 @@
- 	else :; fi
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	list='$(DISTFILES)'; \
--	  dist_files=`for file in $$list; do echo $$file; done | \
--	  sed -e "s|^$$srcdirstrip/||;t" \
--	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
--	case $$dist_files in \
--	  */*) $(MKDIR_P) `echo "$$dist_files" | \
--			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
--			   sort -u` ;; \
--	esac; \
--	for file in $$dist_files; do \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
- 	  if test -d $$d/$$file; then \
--	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- 	    fi; \
-@@ -552,7 +576,7 @@
- all-am: Makefile $(LTLIBRARIES) $(MANS) $(DATA)
- installdirs:
- 	for dir in "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man8dir)"; do \
--	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
- 	done
- install: install-am
- install-exec: install-exec-am
-@@ -588,7 +612,7 @@
- 	-rm -rf ./$(DEPDIR)
- 	-rm -f Makefile
- distclean-am: clean-am distclean-compile distclean-generic \
--	distclean-tags
-+	distclean-libtool distclean-tags
- 
- dvi: dvi-am
- 
-@@ -602,20 +626,12 @@
- 
- install-data-am: install-man install-securelibLTLIBRARIES
- 
--install-dvi: install-dvi-am
--
- install-exec-am:
- 
--install-html: install-html-am
--
- install-info: install-info-am
- 
- install-man: install-man8
- 
--install-pdf: install-pdf-am
--
--install-ps: install-ps-am
--
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
-@@ -636,27 +652,24 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-man uninstall-securelibLTLIBRARIES
-+uninstall-am: uninstall-info-am uninstall-man \
-+	uninstall-securelibLTLIBRARIES
- 
- uninstall-man: uninstall-man8
- 
--.MAKE: install-am install-strip
--
- .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
- 	clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
- 	distclean distclean-compile distclean-generic \
- 	distclean-libtool distclean-tags distdir dvi dvi-am html \
- 	html-am info info-am install install-am install-data \
--	install-data-am install-dvi install-dvi-am install-exec \
--	install-exec-am install-html install-html-am install-info \
--	install-info-am install-man install-man8 install-pdf \
--	install-pdf-am install-ps install-ps-am \
-+	install-data-am install-exec install-exec-am install-info \
-+	install-info-am install-man install-man8 \
- 	install-securelibLTLIBRARIES install-strip installcheck \
- 	installcheck-am installdirs maintainer-clean \
- 	maintainer-clean-generic mostlyclean mostlyclean-compile \
- 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
--	tags uninstall uninstall-am uninstall-man uninstall-man8 \
--	uninstall-securelibLTLIBRARIES
-+	tags uninstall uninstall-am uninstall-info-am uninstall-man \
-+	uninstall-man8 uninstall-securelibLTLIBRARIES
- 
- @ENABLE_REGENERATE_MAN_TRUE@README: pam_echo.8.xml
- @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
 Index: pam/Linux-PAM/modules/pam_env/Makefile.in
 ===================================================================
 --- pam.orig/Linux-PAM/modules/pam_env/Makefile.in
 +++ pam/Linux-PAM/modules/pam_env/Makefile.in
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -19,11 +19,15 @@
- #
- 
- 
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ../..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -69,18 +73,17 @@
- pam_env_la_LIBADD =
- pam_env_la_SOURCES = pam_env.c
- pam_env_la_OBJECTS = pam_env.lo
--DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
--	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+	$(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
--	$(LDFLAGS) -o $@
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = pam_env.c
- DIST_SOURCES = pam_env.c
- man5dir = $(mandir)/man5
-@@ -94,6 +97,8 @@
- CTAGS = ctags
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -118,6 +123,10 @@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
-+ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
-+ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
-+ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
-+ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -126,7 +135,18 @@
- GMSGFMT_015 = @GMSGFMT_015@
- GREP = @GREP@
- HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
--INSTALL = @INSTALL@
-+HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
-+HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
-+HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
-+HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
-+HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
-+HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
-+HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
-+HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
-+HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
-+HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
-+HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
-+HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -138,6 +158,7 @@
+@@ -138,6 +138,7 @@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
  LIBAUDIT = @LIBAUDIT@
@@ -10775,400 +4574,19 @@ Index: pam/Linux-PAM/modules/pam_env/Makefile.in
  LIBCRACK = @LIBCRACK@
  LIBCRYPT = @LIBCRYPT@
  LIBDB = @LIBDB@
-@@ -161,7 +182,6 @@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
--MKDIR_P = @MKDIR_P@
- MSGFMT = @MSGFMT@
- MSGFMT_015 = @MSGFMT_015@
- MSGMERGE = @MSGMERGE@
-@@ -180,8 +200,11 @@
+@@ -180,6 +181,7 @@
  RANLIB = @RANLIB@
  SCONFIGDIR = @SCONFIGDIR@
  SECUREDIR = @SECUREDIR@
 +SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
-+STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
-+STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
  STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -195,13 +218,13 @@
- XSLTPROC = @XSLTPROC@
- YACC = @YACC@
- YFLAGS = @YFLAGS@
--abs_builddir = @abs_builddir@
--abs_srcdir = @abs_srcdir@
--abs_top_builddir = @abs_top_builddir@
--abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -213,7 +236,6 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
--builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -244,11 +266,8 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_builddir = @top_builddir@
--top_srcdir = @top_srcdir@
- CLEANFILES = *~
- EXTRA_DIST = README pam_env.conf $(MANS) $(XMLS) tst-pam_env environment
- man_MANS = pam_env.conf.5 pam_env.8
-@@ -300,7 +319,7 @@
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
--	test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
-+	test -z "$(securelibdir)" || $(mkdir_p) "$(DESTDIR)$(securelibdir)"
- 	@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
- 	  if test -f $$p; then \
- 	    f=$(am__strip_dir) \
-@@ -311,7 +330,7 @@
- 
- uninstall-securelibLTLIBRARIES:
- 	@$(NORMAL_UNINSTALL)
--	@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-+	@set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
- 	  p=$(am__strip_dir) \
- 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
- 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-@@ -326,7 +345,7 @@
- 	  rm -f "$${dir}/so_locations"; \
- 	done
- pam_env.la: $(pam_env_la_OBJECTS) $(pam_env_la_DEPENDENCIES) 
--	$(LINK) -rpath $(securelibdir) $(pam_env_la_OBJECTS) $(pam_env_la_LIBADD) $(LIBS)
-+	$(LINK) -rpath $(securelibdir) $(pam_env_la_LDFLAGS) $(pam_env_la_OBJECTS) $(pam_env_la_LIBADD) $(LIBS)
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
-@@ -337,22 +356,22 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_env.Plo@am__quote@
- 
- .c.o:
--@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c $<
- 
- .c.obj:
--@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
- 
- .c.lo:
--@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-@@ -362,9 +381,13 @@
- 
- clean-libtool:
- 	-rm -rf .libs _libs
-+
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
- install-man5: $(man5_MANS) $(man_MANS)
- 	@$(NORMAL_INSTALL)
--	test -z "$(man5dir)" || $(MKDIR_P) "$(DESTDIR)$(man5dir)"
-+	test -z "$(man5dir)" || $(mkdir_p) "$(DESTDIR)$(man5dir)"
- 	@list='$(man5_MANS) $(dist_man5_MANS) $(nodist_man5_MANS)'; \
- 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
- 	for i in $$l2; do \
-@@ -409,7 +432,7 @@
- 	done
- install-man8: $(man8_MANS) $(man_MANS)
- 	@$(NORMAL_INSTALL)
--	test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
-+	test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
- 	@list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
- 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
- 	for i in $$l2; do \
-@@ -454,7 +477,7 @@
- 	done
- install-secureconfDATA: $(secureconf_DATA)
- 	@$(NORMAL_INSTALL)
--	test -z "$(secureconfdir)" || $(MKDIR_P) "$(DESTDIR)$(secureconfdir)"
-+	test -z "$(secureconfdir)" || $(mkdir_p) "$(DESTDIR)$(secureconfdir)"
- 	@list='$(secureconf_DATA)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  f=$(am__strip_dir) \
-@@ -471,7 +494,7 @@
- 	done
- install-sysconfDATA: $(sysconf_DATA)
- 	@$(NORMAL_INSTALL)
--	test -z "$(sysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)"
-+	test -z "$(sysconfdir)" || $(mkdir_p) "$(DESTDIR)$(sysconfdir)"
- 	@list='$(sysconf_DATA)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  f=$(am__strip_dir) \
-@@ -536,9 +559,9 @@
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
- check-TESTS: $(TESTS)
--	@failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[	 ]'; \
-+	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
- 	srcdir=$(srcdir); export srcdir; \
--	list=' $(TESTS) '; \
-+	list='$(TESTS)'; \
- 	if test -n "$$list"; then \
- 	  for tst in $$list; do \
- 	    if test -f ./$$tst; then dir=./; \
-@@ -547,7 +570,7 @@
- 	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
- 	      all=`expr $$all + 1`; \
- 	      case " $(XFAIL_TESTS) " in \
--	      *$$ws$$tst$$ws*) \
-+	      *" $$tst "*) \
- 		xpass=`expr $$xpass + 1`; \
- 		failed=`expr $$failed + 1`; \
- 		echo "XPASS: $$tst"; \
-@@ -559,7 +582,7 @@
- 	    elif test $$? -ne 77; then \
- 	      all=`expr $$all + 1`; \
- 	      case " $(XFAIL_TESTS) " in \
--	      *$$ws$$tst$$ws*) \
-+	      *" $$tst "*) \
- 		xfail=`expr $$xfail + 1`; \
- 		echo "XFAIL: $$tst"; \
- 	      ;; \
-@@ -609,21 +632,22 @@
- 	else :; fi
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	list='$(DISTFILES)'; \
--	  dist_files=`for file in $$list; do echo $$file; done | \
--	  sed -e "s|^$$srcdirstrip/||;t" \
--	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
--	case $$dist_files in \
--	  */*) $(MKDIR_P) `echo "$$dist_files" | \
--			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
--			   sort -u` ;; \
--	esac; \
--	for file in $$dist_files; do \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
- 	  if test -d $$d/$$file; then \
--	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- 	    fi; \
-@@ -640,7 +664,7 @@
- all-am: Makefile $(LTLIBRARIES) $(MANS) $(DATA)
- installdirs:
- 	for dir in "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(secureconfdir)" "$(DESTDIR)$(sysconfdir)"; do \
--	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
- 	done
- install: install-am
- install-exec: install-exec-am
-@@ -676,7 +700,7 @@
- 	-rm -rf ./$(DEPDIR)
- 	-rm -f Makefile
- distclean-am: clean-am distclean-compile distclean-generic \
--	distclean-tags
-+	distclean-libtool distclean-tags
- 
- dvi: dvi-am
- 
-@@ -691,20 +715,12 @@
- install-data-am: install-man install-secureconfDATA \
- 	install-securelibLTLIBRARIES
- 
--install-dvi: install-dvi-am
--
- install-exec-am: install-sysconfDATA
- 
--install-html: install-html-am
--
- install-info: install-info-am
- 
- install-man: install-man5 install-man8
- 
--install-pdf: install-pdf-am
--
--install-ps: install-ps-am
--
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
-@@ -725,30 +741,26 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-man uninstall-secureconfDATA \
-+uninstall-am: uninstall-info-am uninstall-man uninstall-secureconfDATA \
- 	uninstall-securelibLTLIBRARIES uninstall-sysconfDATA
- 
- uninstall-man: uninstall-man5 uninstall-man8
- 
--.MAKE: install-am install-strip
--
- .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
- 	clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
- 	distclean distclean-compile distclean-generic \
- 	distclean-libtool distclean-tags distdir dvi dvi-am html \
- 	html-am info info-am install install-am install-data \
--	install-data-am install-dvi install-dvi-am install-exec \
--	install-exec-am install-html install-html-am install-info \
-+	install-data-am install-exec install-exec-am install-info \
- 	install-info-am install-man install-man5 install-man8 \
--	install-pdf install-pdf-am install-ps install-ps-am \
- 	install-secureconfDATA install-securelibLTLIBRARIES \
- 	install-strip install-sysconfDATA installcheck installcheck-am \
- 	installdirs maintainer-clean maintainer-clean-generic \
- 	mostlyclean mostlyclean-compile mostlyclean-generic \
- 	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
--	uninstall-am uninstall-man uninstall-man5 uninstall-man8 \
--	uninstall-secureconfDATA uninstall-securelibLTLIBRARIES \
--	uninstall-sysconfDATA
-+	uninstall-am uninstall-info-am uninstall-man uninstall-man5 \
-+	uninstall-man8 uninstall-secureconfDATA \
-+	uninstall-securelibLTLIBRARIES uninstall-sysconfDATA
- 
- @ENABLE_REGENERATE_MAN_TRUE@README: pam_env.8.xml pam_env.conf.5.xml
- @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
 Index: pam/Linux-PAM/modules/pam_exec/Makefile.in
 ===================================================================
 --- pam.orig/Linux-PAM/modules/pam_exec/Makefile.in
 +++ pam/Linux-PAM/modules/pam_exec/Makefile.in
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -19,11 +19,15 @@
- #
- 
- 
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ../..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -67,18 +71,17 @@
- pam_exec_la_LIBADD =
- pam_exec_la_SOURCES = pam_exec.c
- pam_exec_la_OBJECTS = pam_exec.lo
--DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
--	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+	$(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
--	$(LDFLAGS) -o $@
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = pam_exec.c
- DIST_SOURCES = pam_exec.c
- man8dir = $(mandir)/man8
-@@ -89,6 +92,8 @@
- CTAGS = ctags
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -113,6 +118,10 @@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
-+ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
-+ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
-+ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
-+ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -121,7 +130,18 @@
- GMSGFMT_015 = @GMSGFMT_015@
- GREP = @GREP@
- HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
--INSTALL = @INSTALL@
-+HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
-+HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
-+HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
-+HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
-+HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
-+HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
-+HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
-+HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
-+HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
-+HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
-+HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
-+HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -133,6 +153,7 @@
+@@ -133,6 +133,7 @@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
  LIBAUDIT = @LIBAUDIT@
@@ -11176,371 +4594,19 @@ Index: pam/Linux-PAM/modules/pam_exec/Makefile.in
  LIBCRACK = @LIBCRACK@
  LIBCRYPT = @LIBCRYPT@
  LIBDB = @LIBDB@
-@@ -156,7 +177,6 @@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
--MKDIR_P = @MKDIR_P@
- MSGFMT = @MSGFMT@
- MSGFMT_015 = @MSGFMT_015@
- MSGMERGE = @MSGMERGE@
-@@ -175,8 +195,11 @@
+@@ -175,6 +176,7 @@
  RANLIB = @RANLIB@
  SCONFIGDIR = @SCONFIGDIR@
  SECUREDIR = @SECUREDIR@
 +SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
-+STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
-+STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
  STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -190,13 +213,13 @@
- XSLTPROC = @XSLTPROC@
- YACC = @YACC@
- YFLAGS = @YFLAGS@
--abs_builddir = @abs_builddir@
--abs_srcdir = @abs_srcdir@
--abs_top_builddir = @abs_top_builddir@
--abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -208,7 +231,6 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
--builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -239,11 +261,8 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_builddir = @top_builddir@
--top_srcdir = @top_srcdir@
- CLEANFILES = *~
- EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_exec
- man_MANS = pam_exec.8
-@@ -291,7 +310,7 @@
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
--	test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
-+	test -z "$(securelibdir)" || $(mkdir_p) "$(DESTDIR)$(securelibdir)"
- 	@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
- 	  if test -f $$p; then \
- 	    f=$(am__strip_dir) \
-@@ -302,7 +321,7 @@
- 
- uninstall-securelibLTLIBRARIES:
- 	@$(NORMAL_UNINSTALL)
--	@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-+	@set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
- 	  p=$(am__strip_dir) \
- 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
- 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-@@ -317,7 +336,7 @@
- 	  rm -f "$${dir}/so_locations"; \
- 	done
- pam_exec.la: $(pam_exec_la_OBJECTS) $(pam_exec_la_DEPENDENCIES) 
--	$(LINK) -rpath $(securelibdir) $(pam_exec_la_OBJECTS) $(pam_exec_la_LIBADD) $(LIBS)
-+	$(LINK) -rpath $(securelibdir) $(pam_exec_la_LDFLAGS) $(pam_exec_la_OBJECTS) $(pam_exec_la_LIBADD) $(LIBS)
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
-@@ -328,22 +347,22 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_exec.Plo@am__quote@
- 
- .c.o:
--@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c $<
- 
- .c.obj:
--@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
- 
- .c.lo:
--@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-@@ -353,9 +372,13 @@
- 
- clean-libtool:
- 	-rm -rf .libs _libs
-+
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
- install-man8: $(man8_MANS) $(man_MANS)
- 	@$(NORMAL_INSTALL)
--	test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
-+	test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
- 	@list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
- 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
- 	for i in $$l2; do \
-@@ -448,9 +471,9 @@
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
- check-TESTS: $(TESTS)
--	@failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[	 ]'; \
-+	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
- 	srcdir=$(srcdir); export srcdir; \
--	list=' $(TESTS) '; \
-+	list='$(TESTS)'; \
- 	if test -n "$$list"; then \
- 	  for tst in $$list; do \
- 	    if test -f ./$$tst; then dir=./; \
-@@ -459,7 +482,7 @@
- 	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
- 	      all=`expr $$all + 1`; \
- 	      case " $(XFAIL_TESTS) " in \
--	      *$$ws$$tst$$ws*) \
-+	      *" $$tst "*) \
- 		xpass=`expr $$xpass + 1`; \
- 		failed=`expr $$failed + 1`; \
- 		echo "XPASS: $$tst"; \
-@@ -471,7 +494,7 @@
- 	    elif test $$? -ne 77; then \
- 	      all=`expr $$all + 1`; \
- 	      case " $(XFAIL_TESTS) " in \
--	      *$$ws$$tst$$ws*) \
-+	      *" $$tst "*) \
- 		xfail=`expr $$xfail + 1`; \
- 		echo "XFAIL: $$tst"; \
- 	      ;; \
-@@ -521,21 +544,22 @@
- 	else :; fi
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	list='$(DISTFILES)'; \
--	  dist_files=`for file in $$list; do echo $$file; done | \
--	  sed -e "s|^$$srcdirstrip/||;t" \
--	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
--	case $$dist_files in \
--	  */*) $(MKDIR_P) `echo "$$dist_files" | \
--			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
--			   sort -u` ;; \
--	esac; \
--	for file in $$dist_files; do \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
- 	  if test -d $$d/$$file; then \
--	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- 	    fi; \
-@@ -552,7 +576,7 @@
- all-am: Makefile $(LTLIBRARIES) $(MANS) $(DATA)
- installdirs:
- 	for dir in "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man8dir)"; do \
--	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
- 	done
- install: install-am
- install-exec: install-exec-am
-@@ -588,7 +612,7 @@
- 	-rm -rf ./$(DEPDIR)
- 	-rm -f Makefile
- distclean-am: clean-am distclean-compile distclean-generic \
--	distclean-tags
-+	distclean-libtool distclean-tags
- 
- dvi: dvi-am
- 
-@@ -602,20 +626,12 @@
- 
- install-data-am: install-man install-securelibLTLIBRARIES
- 
--install-dvi: install-dvi-am
--
- install-exec-am:
- 
--install-html: install-html-am
--
- install-info: install-info-am
- 
- install-man: install-man8
- 
--install-pdf: install-pdf-am
--
--install-ps: install-ps-am
--
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
-@@ -636,27 +652,24 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-man uninstall-securelibLTLIBRARIES
-+uninstall-am: uninstall-info-am uninstall-man \
-+	uninstall-securelibLTLIBRARIES
- 
- uninstall-man: uninstall-man8
- 
--.MAKE: install-am install-strip
--
- .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
- 	clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
- 	distclean distclean-compile distclean-generic \
- 	distclean-libtool distclean-tags distdir dvi dvi-am html \
- 	html-am info info-am install install-am install-data \
--	install-data-am install-dvi install-dvi-am install-exec \
--	install-exec-am install-html install-html-am install-info \
--	install-info-am install-man install-man8 install-pdf \
--	install-pdf-am install-ps install-ps-am \
-+	install-data-am install-exec install-exec-am install-info \
-+	install-info-am install-man install-man8 \
- 	install-securelibLTLIBRARIES install-strip installcheck \
- 	installcheck-am installdirs maintainer-clean \
- 	maintainer-clean-generic mostlyclean mostlyclean-compile \
- 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
--	tags uninstall uninstall-am uninstall-man uninstall-man8 \
--	uninstall-securelibLTLIBRARIES
-+	tags uninstall uninstall-am uninstall-info-am uninstall-man \
-+	uninstall-man8 uninstall-securelibLTLIBRARIES
- 
- 
- @ENABLE_REGENERATE_MAN_TRUE@README: pam_exec.8.xml
 Index: pam/Linux-PAM/modules/pam_faildelay/Makefile.in
 ===================================================================
 --- pam.orig/Linux-PAM/modules/pam_faildelay/Makefile.in
 +++ pam/Linux-PAM/modules/pam_faildelay/Makefile.in
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -19,11 +19,15 @@
- #
- 
- 
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ../..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -67,18 +71,17 @@
- pam_faildelay_la_LIBADD =
- pam_faildelay_la_SOURCES = pam_faildelay.c
- pam_faildelay_la_OBJECTS = pam_faildelay.lo
--DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
--	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+	$(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
--	$(LDFLAGS) -o $@
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = pam_faildelay.c
- DIST_SOURCES = pam_faildelay.c
- man8dir = $(mandir)/man8
-@@ -89,6 +92,8 @@
- CTAGS = ctags
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -113,6 +118,10 @@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
-+ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
-+ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
-+ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
-+ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -121,7 +130,18 @@
- GMSGFMT_015 = @GMSGFMT_015@
- GREP = @GREP@
- HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
--INSTALL = @INSTALL@
-+HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
-+HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
-+HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
-+HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
-+HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
-+HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
-+HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
-+HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
-+HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
-+HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
-+HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
-+HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -133,6 +153,7 @@
+@@ -133,6 +133,7 @@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
  LIBAUDIT = @LIBAUDIT@
@@ -11548,390 +4614,19 @@ Index: pam/Linux-PAM/modules/pam_faildelay/Makefile.in
  LIBCRACK = @LIBCRACK@
  LIBCRYPT = @LIBCRYPT@
  LIBDB = @LIBDB@
-@@ -156,7 +177,6 @@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
--MKDIR_P = @MKDIR_P@
- MSGFMT = @MSGFMT@
- MSGFMT_015 = @MSGFMT_015@
- MSGMERGE = @MSGMERGE@
-@@ -175,8 +195,11 @@
+@@ -175,6 +176,7 @@
  RANLIB = @RANLIB@
  SCONFIGDIR = @SCONFIGDIR@
  SECUREDIR = @SECUREDIR@
 +SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
-+STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
-+STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
  STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -190,13 +213,13 @@
- XSLTPROC = @XSLTPROC@
- YACC = @YACC@
- YFLAGS = @YFLAGS@
--abs_builddir = @abs_builddir@
--abs_srcdir = @abs_srcdir@
--abs_top_builddir = @abs_top_builddir@
--abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -208,7 +231,6 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
--builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -239,11 +261,8 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_builddir = @top_builddir@
--top_srcdir = @top_srcdir@
- CLEANFILES = *~
- EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_faildelay
- man_MANS = pam_faildelay.8
-@@ -291,7 +310,7 @@
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
--	test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
-+	test -z "$(securelibdir)" || $(mkdir_p) "$(DESTDIR)$(securelibdir)"
- 	@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
- 	  if test -f $$p; then \
- 	    f=$(am__strip_dir) \
-@@ -302,7 +321,7 @@
- 
- uninstall-securelibLTLIBRARIES:
- 	@$(NORMAL_UNINSTALL)
--	@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-+	@set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
- 	  p=$(am__strip_dir) \
- 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
- 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-@@ -317,7 +336,7 @@
- 	  rm -f "$${dir}/so_locations"; \
- 	done
- pam_faildelay.la: $(pam_faildelay_la_OBJECTS) $(pam_faildelay_la_DEPENDENCIES) 
--	$(LINK) -rpath $(securelibdir) $(pam_faildelay_la_OBJECTS) $(pam_faildelay_la_LIBADD) $(LIBS)
-+	$(LINK) -rpath $(securelibdir) $(pam_faildelay_la_LDFLAGS) $(pam_faildelay_la_OBJECTS) $(pam_faildelay_la_LIBADD) $(LIBS)
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
-@@ -328,22 +347,22 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_faildelay.Plo@am__quote@
- 
- .c.o:
--@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c $<
- 
- .c.obj:
--@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
- 
- .c.lo:
--@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-@@ -353,9 +372,13 @@
- 
- clean-libtool:
- 	-rm -rf .libs _libs
-+
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
- install-man8: $(man8_MANS) $(man_MANS)
- 	@$(NORMAL_INSTALL)
--	test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
-+	test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
- 	@list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
- 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
- 	for i in $$l2; do \
-@@ -448,9 +471,9 @@
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
- check-TESTS: $(TESTS)
--	@failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[	 ]'; \
-+	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
- 	srcdir=$(srcdir); export srcdir; \
--	list=' $(TESTS) '; \
-+	list='$(TESTS)'; \
- 	if test -n "$$list"; then \
- 	  for tst in $$list; do \
- 	    if test -f ./$$tst; then dir=./; \
-@@ -459,7 +482,7 @@
- 	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
- 	      all=`expr $$all + 1`; \
- 	      case " $(XFAIL_TESTS) " in \
--	      *$$ws$$tst$$ws*) \
-+	      *" $$tst "*) \
- 		xpass=`expr $$xpass + 1`; \
- 		failed=`expr $$failed + 1`; \
- 		echo "XPASS: $$tst"; \
-@@ -471,7 +494,7 @@
- 	    elif test $$? -ne 77; then \
- 	      all=`expr $$all + 1`; \
- 	      case " $(XFAIL_TESTS) " in \
--	      *$$ws$$tst$$ws*) \
-+	      *" $$tst "*) \
- 		xfail=`expr $$xfail + 1`; \
- 		echo "XFAIL: $$tst"; \
- 	      ;; \
-@@ -521,21 +544,22 @@
- 	else :; fi
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	list='$(DISTFILES)'; \
--	  dist_files=`for file in $$list; do echo $$file; done | \
--	  sed -e "s|^$$srcdirstrip/||;t" \
--	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
--	case $$dist_files in \
--	  */*) $(MKDIR_P) `echo "$$dist_files" | \
--			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
--			   sort -u` ;; \
--	esac; \
--	for file in $$dist_files; do \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
- 	  if test -d $$d/$$file; then \
--	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- 	    fi; \
-@@ -552,7 +576,7 @@
- all-am: Makefile $(LTLIBRARIES) $(MANS) $(DATA)
- installdirs:
- 	for dir in "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man8dir)"; do \
--	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
- 	done
- install: install-am
- install-exec: install-exec-am
-@@ -588,7 +612,7 @@
- 	-rm -rf ./$(DEPDIR)
- 	-rm -f Makefile
- distclean-am: clean-am distclean-compile distclean-generic \
--	distclean-tags
-+	distclean-libtool distclean-tags
- 
- dvi: dvi-am
- 
-@@ -602,20 +626,12 @@
- 
- install-data-am: install-man install-securelibLTLIBRARIES
- 
--install-dvi: install-dvi-am
--
- install-exec-am:
- 
--install-html: install-html-am
--
- install-info: install-info-am
- 
- install-man: install-man8
- 
--install-pdf: install-pdf-am
--
--install-ps: install-ps-am
--
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
-@@ -636,27 +652,24 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-man uninstall-securelibLTLIBRARIES
-+uninstall-am: uninstall-info-am uninstall-man \
-+	uninstall-securelibLTLIBRARIES
- 
- uninstall-man: uninstall-man8
- 
--.MAKE: install-am install-strip
--
- .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
- 	clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
- 	distclean distclean-compile distclean-generic \
- 	distclean-libtool distclean-tags distdir dvi dvi-am html \
- 	html-am info info-am install install-am install-data \
--	install-data-am install-dvi install-dvi-am install-exec \
--	install-exec-am install-html install-html-am install-info \
--	install-info-am install-man install-man8 install-pdf \
--	install-pdf-am install-ps install-ps-am \
-+	install-data-am install-exec install-exec-am install-info \
-+	install-info-am install-man install-man8 \
- 	install-securelibLTLIBRARIES install-strip installcheck \
- 	installcheck-am installdirs maintainer-clean \
- 	maintainer-clean-generic mostlyclean mostlyclean-compile \
- 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
--	tags uninstall uninstall-am uninstall-man uninstall-man8 \
--	uninstall-securelibLTLIBRARIES
-+	tags uninstall uninstall-am uninstall-info-am uninstall-man \
-+	uninstall-man8 uninstall-securelibLTLIBRARIES
- 
- @ENABLE_REGENERATE_MAN_TRUE@README: pam_faildelay.8.xml
- @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
 Index: pam/Linux-PAM/modules/pam_filter/Makefile.in
 ===================================================================
 --- pam.orig/Linux-PAM/modules/pam_filter/Makefile.in
 +++ pam/Linux-PAM/modules/pam_filter/Makefile.in
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -20,11 +20,15 @@
- 
- 
- 
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ../..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -70,40 +74,38 @@
- pam_filter_la_LIBADD =
- pam_filter_la_SOURCES = pam_filter.c
- pam_filter_la_OBJECTS = pam_filter.lo
--DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
--	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+	$(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
--	$(LDFLAGS) -o $@
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = pam_filter.c
- DIST_SOURCES = pam_filter.c
- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
- 	html-recursive info-recursive install-data-recursive \
--	install-dvi-recursive install-exec-recursive \
--	install-html-recursive install-info-recursive \
--	install-pdf-recursive install-ps-recursive install-recursive \
--	installcheck-recursive installdirs-recursive pdf-recursive \
--	ps-recursive uninstall-recursive
-+	install-exec-recursive install-info-recursive \
-+	install-recursive installcheck-recursive installdirs-recursive \
-+	pdf-recursive ps-recursive uninstall-info-recursive \
-+	uninstall-recursive
- man8dir = $(mandir)/man8
- NROFF = nroff
- MANS = $(man_MANS)
- DATA = $(noinst_DATA)
- includeHEADERS_INSTALL = $(INSTALL_HEADER)
- HEADERS = $(include_HEADERS)
--RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
--  distclean-recursive maintainer-clean-recursive
- ETAGS = etags
- CTAGS = ctags
- DIST_SUBDIRS = $(SUBDIRS)
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -128,6 +130,10 @@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
-+ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
-+ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
-+ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
-+ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -136,7 +142,18 @@
- GMSGFMT_015 = @GMSGFMT_015@
- GREP = @GREP@
- HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
--INSTALL = @INSTALL@
-+HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
-+HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
-+HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
-+HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
-+HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
-+HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
-+HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
-+HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
-+HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
-+HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
-+HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
-+HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -148,6 +165,7 @@
+@@ -148,6 +148,7 @@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
  LIBAUDIT = @LIBAUDIT@
@@ -11939,421 +4634,19 @@ Index: pam/Linux-PAM/modules/pam_filter/Makefile.in
  LIBCRACK = @LIBCRACK@
  LIBCRYPT = @LIBCRYPT@
  LIBDB = @LIBDB@
-@@ -171,7 +189,6 @@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
--MKDIR_P = @MKDIR_P@
- MSGFMT = @MSGFMT@
- MSGFMT_015 = @MSGFMT_015@
- MSGMERGE = @MSGMERGE@
-@@ -190,8 +207,11 @@
+@@ -190,6 +191,7 @@
  RANLIB = @RANLIB@
  SCONFIGDIR = @SCONFIGDIR@
  SECUREDIR = @SECUREDIR@
 +SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
-+STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
-+STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
  STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -205,13 +225,13 @@
- XSLTPROC = @XSLTPROC@
- YACC = @YACC@
- YFLAGS = @YFLAGS@
--abs_builddir = @abs_builddir@
--abs_srcdir = @abs_srcdir@
--abs_top_builddir = @abs_top_builddir@
--abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -223,7 +243,6 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
--builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -254,11 +273,8 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_builddir = @top_builddir@
--top_srcdir = @top_srcdir@
- SUBDIRS = upperLOWER
- CLEANFILES = *~
- EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_filter
-@@ -308,7 +324,7 @@
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
--	test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
-+	test -z "$(securelibdir)" || $(mkdir_p) "$(DESTDIR)$(securelibdir)"
- 	@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
- 	  if test -f $$p; then \
- 	    f=$(am__strip_dir) \
-@@ -319,7 +335,7 @@
- 
- uninstall-securelibLTLIBRARIES:
- 	@$(NORMAL_UNINSTALL)
--	@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-+	@set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
- 	  p=$(am__strip_dir) \
- 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
- 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-@@ -334,7 +350,7 @@
- 	  rm -f "$${dir}/so_locations"; \
- 	done
- pam_filter.la: $(pam_filter_la_OBJECTS) $(pam_filter_la_DEPENDENCIES) 
--	$(LINK) -rpath $(securelibdir) $(pam_filter_la_OBJECTS) $(pam_filter_la_LIBADD) $(LIBS)
-+	$(LINK) -rpath $(securelibdir) $(pam_filter_la_LDFLAGS) $(pam_filter_la_OBJECTS) $(pam_filter_la_LIBADD) $(LIBS)
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
-@@ -345,22 +361,22 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_filter.Plo@am__quote@
- 
- .c.o:
--@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c $<
- 
- .c.obj:
--@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
- 
- .c.lo:
--@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-@@ -370,9 +386,13 @@
- 
- clean-libtool:
- 	-rm -rf .libs _libs
-+
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
- install-man8: $(man8_MANS) $(man_MANS)
- 	@$(NORMAL_INSTALL)
--	test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
-+	test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
- 	@list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
- 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
- 	for i in $$l2; do \
-@@ -417,7 +437,7 @@
- 	done
- install-includeHEADERS: $(include_HEADERS)
- 	@$(NORMAL_INSTALL)
--	test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
-+	test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
- 	@list='$(include_HEADERS)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  f=$(am__strip_dir) \
-@@ -464,7 +484,8 @@
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
- 	fi; test -z "$$fail"
- 
--$(RECURSIVE_CLEAN_TARGETS):
-+mostlyclean-recursive clean-recursive distclean-recursive \
-+maintainer-clean-recursive:
- 	@failcom='exit 1'; \
- 	for f in x $$MAKEFLAGS; do \
- 	  case $$f in \
-@@ -565,9 +586,9 @@
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
- check-TESTS: $(TESTS)
--	@failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[	 ]'; \
-+	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
- 	srcdir=$(srcdir); export srcdir; \
--	list=' $(TESTS) '; \
-+	list='$(TESTS)'; \
- 	if test -n "$$list"; then \
- 	  for tst in $$list; do \
- 	    if test -f ./$$tst; then dir=./; \
-@@ -576,7 +597,7 @@
- 	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
- 	      all=`expr $$all + 1`; \
- 	      case " $(XFAIL_TESTS) " in \
--	      *$$ws$$tst$$ws*) \
-+	      *" $$tst "*) \
- 		xpass=`expr $$xpass + 1`; \
- 		failed=`expr $$failed + 1`; \
- 		echo "XPASS: $$tst"; \
-@@ -588,7 +609,7 @@
- 	    elif test $$? -ne 77; then \
- 	      all=`expr $$all + 1`; \
- 	      case " $(XFAIL_TESTS) " in \
--	      *$$ws$$tst$$ws*) \
-+	      *" $$tst "*) \
- 		xfail=`expr $$xfail + 1`; \
- 		echo "XFAIL: $$tst"; \
- 	      ;; \
-@@ -638,21 +659,22 @@
- 	else :; fi
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	list='$(DISTFILES)'; \
--	  dist_files=`for file in $$list; do echo $$file; done | \
--	  sed -e "s|^$$srcdirstrip/||;t" \
--	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
--	case $$dist_files in \
--	  */*) $(MKDIR_P) `echo "$$dist_files" | \
--			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
--			   sort -u` ;; \
--	esac; \
--	for file in $$dist_files; do \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
- 	  if test -d $$d/$$file; then \
--	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- 	    fi; \
-@@ -666,7 +688,7 @@
- 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- 	  if test "$$subdir" = .; then :; else \
- 	    test -d "$(distdir)/$$subdir" \
--	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-+	    || $(mkdir_p) "$(distdir)/$$subdir" \
- 	    || exit 1; \
- 	    distdir=`$(am__cd) $(distdir) && pwd`; \
- 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-@@ -674,8 +696,6 @@
- 	      $(MAKE) $(AM_MAKEFLAGS) \
- 	        top_distdir="$$top_distdir" \
- 	        distdir="$$distdir/$$subdir" \
--		am__remove_distdir=: \
--		am__skip_length_check=: \
- 	        distdir) \
- 	      || exit 1; \
- 	  fi; \
-@@ -687,7 +707,7 @@
- installdirs: installdirs-recursive
- installdirs-am:
- 	for dir in "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(includedir)"; do \
--	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
- 	done
- install: install-recursive
- install-exec: install-exec-recursive
-@@ -723,7 +743,7 @@
- 	-rm -rf ./$(DEPDIR)
- 	-rm -f Makefile
- distclean-am: clean-am distclean-compile distclean-generic \
--	distclean-tags
-+	distclean-libtool distclean-tags
- 
- dvi: dvi-recursive
- 
-@@ -738,20 +758,12 @@
- install-data-am: install-includeHEADERS install-man \
- 	install-securelibLTLIBRARIES
- 
--install-dvi: install-dvi-recursive
--
- install-exec-am:
- 
--install-html: install-html-recursive
--
- install-info: install-info-recursive
- 
- install-man: install-man8
- 
--install-pdf: install-pdf-recursive
--
--install-ps: install-ps-recursive
--
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-recursive
-@@ -772,31 +784,29 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-includeHEADERS uninstall-man \
-+uninstall-am: uninstall-includeHEADERS uninstall-info-am uninstall-man \
- 	uninstall-securelibLTLIBRARIES
- 
--uninstall-man: uninstall-man8
-+uninstall-info: uninstall-info-recursive
- 
--.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
--	install-strip
-+uninstall-man: uninstall-man8
- 
--.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
--	all all-am check check-TESTS check-am clean clean-generic \
--	clean-libtool clean-securelibLTLIBRARIES ctags ctags-recursive \
--	distclean distclean-compile distclean-generic \
--	distclean-libtool distclean-tags distdir dvi dvi-am html \
-+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-TESTS \
-+	check-am clean clean-generic clean-libtool clean-recursive \
-+	clean-securelibLTLIBRARIES ctags ctags-recursive distclean \
-+	distclean-compile distclean-generic distclean-libtool \
-+	distclean-recursive distclean-tags distdir dvi dvi-am html \
- 	html-am info info-am install install-am install-data \
--	install-data-am install-dvi install-dvi-am install-exec \
--	install-exec-am install-html install-html-am \
-+	install-data-am install-exec install-exec-am \
- 	install-includeHEADERS install-info install-info-am \
--	install-man install-man8 install-pdf install-pdf-am install-ps \
--	install-ps-am install-securelibLTLIBRARIES install-strip \
--	installcheck installcheck-am installdirs installdirs-am \
--	maintainer-clean maintainer-clean-generic mostlyclean \
--	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-+	install-man install-man8 install-securelibLTLIBRARIES \
-+	install-strip installcheck installcheck-am installdirs \
-+	installdirs-am maintainer-clean maintainer-clean-generic \
-+	maintainer-clean-recursive mostlyclean mostlyclean-compile \
-+	mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
- 	pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
--	uninstall-includeHEADERS uninstall-man uninstall-man8 \
--	uninstall-securelibLTLIBRARIES
-+	uninstall-includeHEADERS uninstall-info-am uninstall-man \
-+	uninstall-man8 uninstall-securelibLTLIBRARIES
- 
- @ENABLE_REGENERATE_MAN_TRUE@README: pam_filter.8.xml
- @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
 Index: pam/Linux-PAM/modules/pam_filter/upperLOWER/Makefile.in
 ===================================================================
 --- pam.orig/Linux-PAM/modules/pam_filter/upperLOWER/Makefile.in
 +++ pam/Linux-PAM/modules/pam_filter/upperLOWER/Makefile.in
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -18,11 +18,15 @@
- # Copyright (c) 2005 Thorsten Kukuk <kukuk@suse.de>
- #
- 
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ../../..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -60,24 +64,25 @@
- upperLOWER_SOURCES = upperLOWER.c
- upperLOWER_OBJECTS = upperLOWER.$(OBJEXT)
- upperLOWER_LDADD = $(LDADD)
--DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
--	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+	$(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
--	$(LDFLAGS) -o $@
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = upperLOWER.c
- DIST_SOURCES = upperLOWER.c
- ETAGS = etags
- CTAGS = ctags
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -102,6 +107,10 @@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
-+ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
-+ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
-+ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
-+ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -110,7 +119,18 @@
- GMSGFMT_015 = @GMSGFMT_015@
- GREP = @GREP@
- HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
--INSTALL = @INSTALL@
-+HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
-+HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
-+HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
-+HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
-+HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
-+HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
-+HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
-+HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
-+HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
-+HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
-+HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
-+HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -122,6 +142,7 @@
+@@ -122,6 +122,7 @@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
  LIBAUDIT = @LIBAUDIT@
@@ -12361,323 +4654,19 @@ Index: pam/Linux-PAM/modules/pam_filter/upperLOWER/Makefile.in
  LIBCRACK = @LIBCRACK@
  LIBCRYPT = @LIBCRYPT@
  LIBDB = @LIBDB@
-@@ -145,7 +166,6 @@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
--MKDIR_P = @MKDIR_P@
- MSGFMT = @MSGFMT@
- MSGFMT_015 = @MSGFMT_015@
- MSGMERGE = @MSGMERGE@
-@@ -164,8 +184,11 @@
+@@ -164,6 +165,7 @@
  RANLIB = @RANLIB@
  SCONFIGDIR = @SCONFIGDIR@
  SECUREDIR = @SECUREDIR@
 +SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
-+STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
-+STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
  STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -179,13 +202,13 @@
- XSLTPROC = @XSLTPROC@
- YACC = @YACC@
- YFLAGS = @YFLAGS@
--abs_builddir = @abs_builddir@
--abs_srcdir = @abs_srcdir@
--abs_top_builddir = @abs_top_builddir@
--abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -197,7 +220,6 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
--builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -228,11 +250,8 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_builddir = @top_builddir@
--top_srcdir = @top_srcdir@
- CLEANFILES = *~
- securelibfilterdir = $(SECUREDIR)/pam_filter
- AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \
-@@ -274,7 +293,7 @@
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-securelibfilterPROGRAMS: $(securelibfilter_PROGRAMS)
- 	@$(NORMAL_INSTALL)
--	test -z "$(securelibfilterdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibfilterdir)"
-+	test -z "$(securelibfilterdir)" || $(mkdir_p) "$(DESTDIR)$(securelibfilterdir)"
- 	@list='$(securelibfilter_PROGRAMS)'; for p in $$list; do \
- 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
- 	  if test -f $$p \
-@@ -302,7 +321,7 @@
- 	done
- upperLOWER$(EXEEXT): $(upperLOWER_OBJECTS) $(upperLOWER_DEPENDENCIES) 
- 	@rm -f upperLOWER$(EXEEXT)
--	$(LINK) $(upperLOWER_OBJECTS) $(upperLOWER_LDADD) $(LIBS)
-+	$(LINK) $(upperLOWER_LDFLAGS) $(upperLOWER_OBJECTS) $(upperLOWER_LDADD) $(LIBS)
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
-@@ -313,22 +332,22 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/upperLOWER.Po@am__quote@
- 
- .c.o:
--@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c $<
- 
- .c.obj:
--@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
- 
- .c.lo:
--@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-@@ -339,6 +358,10 @@
- clean-libtool:
- 	-rm -rf .libs _libs
- 
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
-+
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- 	unique=`for i in $$list; do \
-@@ -388,21 +411,22 @@
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	list='$(DISTFILES)'; \
--	  dist_files=`for file in $$list; do echo $$file; done | \
--	  sed -e "s|^$$srcdirstrip/||;t" \
--	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
--	case $$dist_files in \
--	  */*) $(MKDIR_P) `echo "$$dist_files" | \
--			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
--			   sort -u` ;; \
--	esac; \
--	for file in $$dist_files; do \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
- 	  if test -d $$d/$$file; then \
--	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- 	    fi; \
-@@ -418,7 +442,7 @@
- all-am: Makefile $(PROGRAMS)
- installdirs:
- 	for dir in "$(DESTDIR)$(securelibfilterdir)"; do \
--	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
- 	done
- install: install-am
- install-exec: install-exec-am
-@@ -454,7 +478,7 @@
- 	-rm -rf ./$(DEPDIR)
- 	-rm -f Makefile
- distclean-am: clean-am distclean-compile distclean-generic \
--	distclean-tags
-+	distclean-libtool distclean-tags
- 
- dvi: dvi-am
- 
-@@ -468,20 +492,12 @@
- 
- install-data-am: install-securelibfilterPROGRAMS
- 
--install-dvi: install-dvi-am
--
- install-exec-am:
- 
--install-html: install-html-am
--
- install-info: install-info-am
- 
- install-man:
- 
--install-pdf: install-pdf-am
--
--install-ps: install-ps-am
--
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
-@@ -502,23 +518,20 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-securelibfilterPROGRAMS
--
--.MAKE: install-am install-strip
-+uninstall-am: uninstall-info-am uninstall-securelibfilterPROGRAMS
- 
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- 	clean-libtool clean-securelibfilterPROGRAMS ctags distclean \
- 	distclean-compile distclean-generic distclean-libtool \
- 	distclean-tags distdir dvi dvi-am html html-am info info-am \
--	install install-am install-data install-data-am install-dvi \
--	install-dvi-am install-exec install-exec-am install-html \
--	install-html-am install-info install-info-am install-man \
--	install-pdf install-pdf-am install-ps install-ps-am \
-+	install install-am install-data install-data-am install-exec \
-+	install-exec-am install-info install-info-am install-man \
- 	install-securelibfilterPROGRAMS install-strip installcheck \
- 	installcheck-am installdirs maintainer-clean \
- 	maintainer-clean-generic mostlyclean mostlyclean-compile \
- 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
--	tags uninstall uninstall-am uninstall-securelibfilterPROGRAMS
-+	tags uninstall uninstall-am uninstall-info-am \
-+	uninstall-securelibfilterPROGRAMS
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
 Index: pam/Linux-PAM/modules/pam_ftp/Makefile.in
 ===================================================================
 --- pam.orig/Linux-PAM/modules/pam_ftp/Makefile.in
 +++ pam/Linux-PAM/modules/pam_ftp/Makefile.in
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -19,11 +19,15 @@
- #
- 
- 
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ../..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -67,18 +71,17 @@
- pam_ftp_la_LIBADD =
- pam_ftp_la_SOURCES = pam_ftp.c
- pam_ftp_la_OBJECTS = pam_ftp.lo
--DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
--	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+	$(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
--	$(LDFLAGS) -o $@
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = pam_ftp.c
- DIST_SOURCES = pam_ftp.c
- man8dir = $(mandir)/man8
-@@ -89,6 +92,8 @@
- CTAGS = ctags
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -113,6 +118,10 @@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
-+ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
-+ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
-+ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
-+ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -121,7 +130,18 @@
- GMSGFMT_015 = @GMSGFMT_015@
- GREP = @GREP@
- HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
--INSTALL = @INSTALL@
-+HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
-+HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
-+HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
-+HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
-+HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
-+HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
-+HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
-+HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
-+HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
-+HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
-+HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
-+HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -133,6 +153,7 @@
+@@ -133,6 +133,7 @@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
  LIBAUDIT = @LIBAUDIT@
@@ -12685,371 +4674,19 @@ Index: pam/Linux-PAM/modules/pam_ftp/Makefile.in
  LIBCRACK = @LIBCRACK@
  LIBCRYPT = @LIBCRYPT@
  LIBDB = @LIBDB@
-@@ -156,7 +177,6 @@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
--MKDIR_P = @MKDIR_P@
- MSGFMT = @MSGFMT@
- MSGFMT_015 = @MSGFMT_015@
- MSGMERGE = @MSGMERGE@
-@@ -175,8 +195,11 @@
+@@ -175,6 +176,7 @@
  RANLIB = @RANLIB@
  SCONFIGDIR = @SCONFIGDIR@
  SECUREDIR = @SECUREDIR@
 +SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
-+STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
-+STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
  STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -190,13 +213,13 @@
- XSLTPROC = @XSLTPROC@
- YACC = @YACC@
- YFLAGS = @YFLAGS@
--abs_builddir = @abs_builddir@
--abs_srcdir = @abs_srcdir@
--abs_top_builddir = @abs_top_builddir@
--abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -208,7 +231,6 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
--builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -239,11 +261,8 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_builddir = @top_builddir@
--top_srcdir = @top_srcdir@
- CLEANFILES = *~
- EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_ftp
- man_MANS = pam_ftp.8
-@@ -291,7 +310,7 @@
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
--	test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
-+	test -z "$(securelibdir)" || $(mkdir_p) "$(DESTDIR)$(securelibdir)"
- 	@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
- 	  if test -f $$p; then \
- 	    f=$(am__strip_dir) \
-@@ -302,7 +321,7 @@
- 
- uninstall-securelibLTLIBRARIES:
- 	@$(NORMAL_UNINSTALL)
--	@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-+	@set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
- 	  p=$(am__strip_dir) \
- 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
- 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-@@ -317,7 +336,7 @@
- 	  rm -f "$${dir}/so_locations"; \
- 	done
- pam_ftp.la: $(pam_ftp_la_OBJECTS) $(pam_ftp_la_DEPENDENCIES) 
--	$(LINK) -rpath $(securelibdir) $(pam_ftp_la_OBJECTS) $(pam_ftp_la_LIBADD) $(LIBS)
-+	$(LINK) -rpath $(securelibdir) $(pam_ftp_la_LDFLAGS) $(pam_ftp_la_OBJECTS) $(pam_ftp_la_LIBADD) $(LIBS)
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
-@@ -328,22 +347,22 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_ftp.Plo@am__quote@
- 
- .c.o:
--@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c $<
- 
- .c.obj:
--@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
- 
- .c.lo:
--@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-@@ -353,9 +372,13 @@
- 
- clean-libtool:
- 	-rm -rf .libs _libs
-+
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
- install-man8: $(man8_MANS) $(man_MANS)
- 	@$(NORMAL_INSTALL)
--	test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
-+	test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
- 	@list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
- 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
- 	for i in $$l2; do \
-@@ -448,9 +471,9 @@
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
- check-TESTS: $(TESTS)
--	@failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[	 ]'; \
-+	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
- 	srcdir=$(srcdir); export srcdir; \
--	list=' $(TESTS) '; \
-+	list='$(TESTS)'; \
- 	if test -n "$$list"; then \
- 	  for tst in $$list; do \
- 	    if test -f ./$$tst; then dir=./; \
-@@ -459,7 +482,7 @@
- 	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
- 	      all=`expr $$all + 1`; \
- 	      case " $(XFAIL_TESTS) " in \
--	      *$$ws$$tst$$ws*) \
-+	      *" $$tst "*) \
- 		xpass=`expr $$xpass + 1`; \
- 		failed=`expr $$failed + 1`; \
- 		echo "XPASS: $$tst"; \
-@@ -471,7 +494,7 @@
- 	    elif test $$? -ne 77; then \
- 	      all=`expr $$all + 1`; \
- 	      case " $(XFAIL_TESTS) " in \
--	      *$$ws$$tst$$ws*) \
-+	      *" $$tst "*) \
- 		xfail=`expr $$xfail + 1`; \
- 		echo "XFAIL: $$tst"; \
- 	      ;; \
-@@ -521,21 +544,22 @@
- 	else :; fi
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	list='$(DISTFILES)'; \
--	  dist_files=`for file in $$list; do echo $$file; done | \
--	  sed -e "s|^$$srcdirstrip/||;t" \
--	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
--	case $$dist_files in \
--	  */*) $(MKDIR_P) `echo "$$dist_files" | \
--			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
--			   sort -u` ;; \
--	esac; \
--	for file in $$dist_files; do \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
- 	  if test -d $$d/$$file; then \
--	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- 	    fi; \
-@@ -552,7 +576,7 @@
- all-am: Makefile $(LTLIBRARIES) $(MANS) $(DATA)
- installdirs:
- 	for dir in "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man8dir)"; do \
--	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
- 	done
- install: install-am
- install-exec: install-exec-am
-@@ -588,7 +612,7 @@
- 	-rm -rf ./$(DEPDIR)
- 	-rm -f Makefile
- distclean-am: clean-am distclean-compile distclean-generic \
--	distclean-tags
-+	distclean-libtool distclean-tags
- 
- dvi: dvi-am
- 
-@@ -602,20 +626,12 @@
- 
- install-data-am: install-man install-securelibLTLIBRARIES
- 
--install-dvi: install-dvi-am
--
- install-exec-am:
- 
--install-html: install-html-am
--
- install-info: install-info-am
- 
- install-man: install-man8
- 
--install-pdf: install-pdf-am
--
--install-ps: install-ps-am
--
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
-@@ -636,27 +652,24 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-man uninstall-securelibLTLIBRARIES
-+uninstall-am: uninstall-info-am uninstall-man \
-+	uninstall-securelibLTLIBRARIES
- 
- uninstall-man: uninstall-man8
- 
--.MAKE: install-am install-strip
--
- .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
- 	clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
- 	distclean distclean-compile distclean-generic \
- 	distclean-libtool distclean-tags distdir dvi dvi-am html \
- 	html-am info info-am install install-am install-data \
--	install-data-am install-dvi install-dvi-am install-exec \
--	install-exec-am install-html install-html-am install-info \
--	install-info-am install-man install-man8 install-pdf \
--	install-pdf-am install-ps install-ps-am \
-+	install-data-am install-exec install-exec-am install-info \
-+	install-info-am install-man install-man8 \
- 	install-securelibLTLIBRARIES install-strip installcheck \
- 	installcheck-am installdirs maintainer-clean \
- 	maintainer-clean-generic mostlyclean mostlyclean-compile \
- 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
--	tags uninstall uninstall-am uninstall-man uninstall-man8 \
--	uninstall-securelibLTLIBRARIES
-+	tags uninstall uninstall-am uninstall-info-am uninstall-man \
-+	uninstall-man8 uninstall-securelibLTLIBRARIES
- 
- @ENABLE_REGENERATE_MAN_TRUE@README: pam_ftp.8.xml
- @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
 Index: pam/Linux-PAM/modules/pam_group/Makefile.in
 ===================================================================
 --- pam.orig/Linux-PAM/modules/pam_group/Makefile.in
 +++ pam/Linux-PAM/modules/pam_group/Makefile.in
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -19,11 +19,15 @@
- #
- 
- 
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ../..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -68,18 +72,17 @@
- pam_group_la_LIBADD =
- pam_group_la_SOURCES = pam_group.c
- pam_group_la_OBJECTS = pam_group.lo
--DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
--	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+	$(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
--	$(LDFLAGS) -o $@
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = pam_group.c
- DIST_SOURCES = pam_group.c
- man5dir = $(mandir)/man5
-@@ -92,6 +95,8 @@
- CTAGS = ctags
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -116,6 +121,10 @@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
-+ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
-+ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
-+ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
-+ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -124,7 +133,18 @@
- GMSGFMT_015 = @GMSGFMT_015@
- GREP = @GREP@
- HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
--INSTALL = @INSTALL@
-+HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
-+HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
-+HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
-+HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
-+HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
-+HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
-+HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
-+HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
-+HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
-+HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
-+HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
-+HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -136,6 +156,7 @@
+@@ -136,6 +136,7 @@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
  LIBAUDIT = @LIBAUDIT@
@@ -13057,390 +4694,19 @@ Index: pam/Linux-PAM/modules/pam_group/Makefile.in
  LIBCRACK = @LIBCRACK@
  LIBCRYPT = @LIBCRYPT@
  LIBDB = @LIBDB@
-@@ -159,7 +180,6 @@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
--MKDIR_P = @MKDIR_P@
- MSGFMT = @MSGFMT@
- MSGFMT_015 = @MSGFMT_015@
- MSGMERGE = @MSGMERGE@
-@@ -178,8 +198,11 @@
+@@ -178,6 +179,7 @@
  RANLIB = @RANLIB@
  SCONFIGDIR = @SCONFIGDIR@
  SECUREDIR = @SECUREDIR@
 +SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
-+STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
-+STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
  STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -193,13 +216,13 @@
- XSLTPROC = @XSLTPROC@
- YACC = @YACC@
- YFLAGS = @YFLAGS@
--abs_builddir = @abs_builddir@
--abs_srcdir = @abs_srcdir@
--abs_top_builddir = @abs_top_builddir@
--abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -211,7 +234,6 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
--builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -242,11 +264,8 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_builddir = @top_builddir@
--top_srcdir = @top_srcdir@
- CLEANFILES = *~
- EXTRA_DIST = README group.conf $(MANS) $(XMLS) tst-pam_group
- man_MANS = group.conf.5 pam_group.8
-@@ -297,7 +316,7 @@
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
--	test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
-+	test -z "$(securelibdir)" || $(mkdir_p) "$(DESTDIR)$(securelibdir)"
- 	@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
- 	  if test -f $$p; then \
- 	    f=$(am__strip_dir) \
-@@ -308,7 +327,7 @@
- 
- uninstall-securelibLTLIBRARIES:
- 	@$(NORMAL_UNINSTALL)
--	@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-+	@set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
- 	  p=$(am__strip_dir) \
- 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
- 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-@@ -323,7 +342,7 @@
- 	  rm -f "$${dir}/so_locations"; \
- 	done
- pam_group.la: $(pam_group_la_OBJECTS) $(pam_group_la_DEPENDENCIES) 
--	$(LINK) -rpath $(securelibdir) $(pam_group_la_OBJECTS) $(pam_group_la_LIBADD) $(LIBS)
-+	$(LINK) -rpath $(securelibdir) $(pam_group_la_LDFLAGS) $(pam_group_la_OBJECTS) $(pam_group_la_LIBADD) $(LIBS)
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
-@@ -334,22 +353,22 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_group.Plo@am__quote@
- 
- .c.o:
--@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c $<
- 
- .c.obj:
--@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
- 
- .c.lo:
--@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-@@ -359,9 +378,13 @@
- 
- clean-libtool:
- 	-rm -rf .libs _libs
-+
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
- install-man5: $(man5_MANS) $(man_MANS)
- 	@$(NORMAL_INSTALL)
--	test -z "$(man5dir)" || $(MKDIR_P) "$(DESTDIR)$(man5dir)"
-+	test -z "$(man5dir)" || $(mkdir_p) "$(DESTDIR)$(man5dir)"
- 	@list='$(man5_MANS) $(dist_man5_MANS) $(nodist_man5_MANS)'; \
- 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
- 	for i in $$l2; do \
-@@ -406,7 +429,7 @@
- 	done
- install-man8: $(man8_MANS) $(man_MANS)
- 	@$(NORMAL_INSTALL)
--	test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
-+	test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
- 	@list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
- 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
- 	for i in $$l2; do \
-@@ -451,7 +474,7 @@
- 	done
- install-secureconfDATA: $(secureconf_DATA)
- 	@$(NORMAL_INSTALL)
--	test -z "$(secureconfdir)" || $(MKDIR_P) "$(DESTDIR)$(secureconfdir)"
-+	test -z "$(secureconfdir)" || $(mkdir_p) "$(DESTDIR)$(secureconfdir)"
- 	@list='$(secureconf_DATA)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  f=$(am__strip_dir) \
-@@ -516,9 +539,9 @@
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
- check-TESTS: $(TESTS)
--	@failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[	 ]'; \
-+	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
- 	srcdir=$(srcdir); export srcdir; \
--	list=' $(TESTS) '; \
-+	list='$(TESTS)'; \
- 	if test -n "$$list"; then \
- 	  for tst in $$list; do \
- 	    if test -f ./$$tst; then dir=./; \
-@@ -527,7 +550,7 @@
- 	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
- 	      all=`expr $$all + 1`; \
- 	      case " $(XFAIL_TESTS) " in \
--	      *$$ws$$tst$$ws*) \
-+	      *" $$tst "*) \
- 		xpass=`expr $$xpass + 1`; \
- 		failed=`expr $$failed + 1`; \
- 		echo "XPASS: $$tst"; \
-@@ -539,7 +562,7 @@
- 	    elif test $$? -ne 77; then \
- 	      all=`expr $$all + 1`; \
- 	      case " $(XFAIL_TESTS) " in \
--	      *$$ws$$tst$$ws*) \
-+	      *" $$tst "*) \
- 		xfail=`expr $$xfail + 1`; \
- 		echo "XFAIL: $$tst"; \
- 	      ;; \
-@@ -589,21 +612,22 @@
- 	else :; fi
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	list='$(DISTFILES)'; \
--	  dist_files=`for file in $$list; do echo $$file; done | \
--	  sed -e "s|^$$srcdirstrip/||;t" \
--	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
--	case $$dist_files in \
--	  */*) $(MKDIR_P) `echo "$$dist_files" | \
--			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
--			   sort -u` ;; \
--	esac; \
--	for file in $$dist_files; do \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
- 	  if test -d $$d/$$file; then \
--	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- 	    fi; \
-@@ -620,7 +644,7 @@
- all-am: Makefile $(LTLIBRARIES) $(MANS) $(DATA)
- installdirs:
- 	for dir in "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(secureconfdir)"; do \
--	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
- 	done
- install: install-am
- install-exec: install-exec-am
-@@ -656,7 +680,7 @@
- 	-rm -rf ./$(DEPDIR)
- 	-rm -f Makefile
- distclean-am: clean-am distclean-compile distclean-generic \
--	distclean-tags
-+	distclean-libtool distclean-tags
- 
- dvi: dvi-am
- 
-@@ -671,20 +695,12 @@
- install-data-am: install-man install-secureconfDATA \
- 	install-securelibLTLIBRARIES
- 
--install-dvi: install-dvi-am
--
- install-exec-am:
- 
--install-html: install-html-am
--
- install-info: install-info-am
- 
- install-man: install-man5 install-man8
- 
--install-pdf: install-pdf-am
--
--install-ps: install-ps-am
--
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
-@@ -705,29 +721,25 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-man uninstall-secureconfDATA \
-+uninstall-am: uninstall-info-am uninstall-man uninstall-secureconfDATA \
- 	uninstall-securelibLTLIBRARIES
- 
- uninstall-man: uninstall-man5 uninstall-man8
- 
--.MAKE: install-am install-strip
--
- .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
- 	clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
- 	distclean distclean-compile distclean-generic \
- 	distclean-libtool distclean-tags distdir dvi dvi-am html \
- 	html-am info info-am install install-am install-data \
--	install-data-am install-dvi install-dvi-am install-exec \
--	install-exec-am install-html install-html-am install-info \
-+	install-data-am install-exec install-exec-am install-info \
- 	install-info-am install-man install-man5 install-man8 \
--	install-pdf install-pdf-am install-ps install-ps-am \
- 	install-secureconfDATA install-securelibLTLIBRARIES \
- 	install-strip installcheck installcheck-am installdirs \
- 	maintainer-clean maintainer-clean-generic mostlyclean \
- 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
--	pdf pdf-am ps ps-am tags uninstall uninstall-am uninstall-man \
--	uninstall-man5 uninstall-man8 uninstall-secureconfDATA \
--	uninstall-securelibLTLIBRARIES
-+	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-+	uninstall-info-am uninstall-man uninstall-man5 uninstall-man8 \
-+	uninstall-secureconfDATA uninstall-securelibLTLIBRARIES
- 
- @ENABLE_REGENERATE_MAN_TRUE@README: pam_group.8.xml group.conf.5.xml
- @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
 Index: pam/Linux-PAM/modules/pam_issue/Makefile.in
 ===================================================================
 --- pam.orig/Linux-PAM/modules/pam_issue/Makefile.in
 +++ pam/Linux-PAM/modules/pam_issue/Makefile.in
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -19,11 +19,15 @@
- #
- 
- 
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ../..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -67,18 +71,17 @@
- pam_issue_la_LIBADD =
- pam_issue_la_SOURCES = pam_issue.c
- pam_issue_la_OBJECTS = pam_issue.lo
--DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
--	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+	$(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
--	$(LDFLAGS) -o $@
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = pam_issue.c
- DIST_SOURCES = pam_issue.c
- man8dir = $(mandir)/man8
-@@ -89,6 +92,8 @@
- CTAGS = ctags
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -113,6 +118,10 @@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
-+ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
-+ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
-+ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
-+ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -121,7 +130,18 @@
- GMSGFMT_015 = @GMSGFMT_015@
- GREP = @GREP@
- HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
--INSTALL = @INSTALL@
-+HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
-+HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
-+HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
-+HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
-+HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
-+HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
-+HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
-+HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
-+HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
-+HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
-+HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
-+HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -133,6 +153,7 @@
+@@ -133,6 +133,7 @@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
  LIBAUDIT = @LIBAUDIT@
@@ -13448,371 +4714,19 @@ Index: pam/Linux-PAM/modules/pam_issue/Makefile.in
  LIBCRACK = @LIBCRACK@
  LIBCRYPT = @LIBCRYPT@
  LIBDB = @LIBDB@
-@@ -156,7 +177,6 @@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
--MKDIR_P = @MKDIR_P@
- MSGFMT = @MSGFMT@
- MSGFMT_015 = @MSGFMT_015@
- MSGMERGE = @MSGMERGE@
-@@ -175,8 +195,11 @@
+@@ -175,6 +176,7 @@
  RANLIB = @RANLIB@
  SCONFIGDIR = @SCONFIGDIR@
  SECUREDIR = @SECUREDIR@
 +SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
-+STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
-+STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
  STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -190,13 +213,13 @@
- XSLTPROC = @XSLTPROC@
- YACC = @YACC@
- YFLAGS = @YFLAGS@
--abs_builddir = @abs_builddir@
--abs_srcdir = @abs_srcdir@
--abs_top_builddir = @abs_top_builddir@
--abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -208,7 +231,6 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
--builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -239,11 +261,8 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_builddir = @top_builddir@
--top_srcdir = @top_srcdir@
- CLEANFILES = *~
- EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_issue
- man_MANS = pam_issue.8
-@@ -291,7 +310,7 @@
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
--	test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
-+	test -z "$(securelibdir)" || $(mkdir_p) "$(DESTDIR)$(securelibdir)"
- 	@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
- 	  if test -f $$p; then \
- 	    f=$(am__strip_dir) \
-@@ -302,7 +321,7 @@
- 
- uninstall-securelibLTLIBRARIES:
- 	@$(NORMAL_UNINSTALL)
--	@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-+	@set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
- 	  p=$(am__strip_dir) \
- 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
- 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-@@ -317,7 +336,7 @@
- 	  rm -f "$${dir}/so_locations"; \
- 	done
- pam_issue.la: $(pam_issue_la_OBJECTS) $(pam_issue_la_DEPENDENCIES) 
--	$(LINK) -rpath $(securelibdir) $(pam_issue_la_OBJECTS) $(pam_issue_la_LIBADD) $(LIBS)
-+	$(LINK) -rpath $(securelibdir) $(pam_issue_la_LDFLAGS) $(pam_issue_la_OBJECTS) $(pam_issue_la_LIBADD) $(LIBS)
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
-@@ -328,22 +347,22 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_issue.Plo@am__quote@
- 
- .c.o:
--@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c $<
- 
- .c.obj:
--@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
- 
- .c.lo:
--@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-@@ -353,9 +372,13 @@
- 
- clean-libtool:
- 	-rm -rf .libs _libs
-+
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
- install-man8: $(man8_MANS) $(man_MANS)
- 	@$(NORMAL_INSTALL)
--	test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
-+	test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
- 	@list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
- 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
- 	for i in $$l2; do \
-@@ -448,9 +471,9 @@
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
- check-TESTS: $(TESTS)
--	@failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[	 ]'; \
-+	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
- 	srcdir=$(srcdir); export srcdir; \
--	list=' $(TESTS) '; \
-+	list='$(TESTS)'; \
- 	if test -n "$$list"; then \
- 	  for tst in $$list; do \
- 	    if test -f ./$$tst; then dir=./; \
-@@ -459,7 +482,7 @@
- 	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
- 	      all=`expr $$all + 1`; \
- 	      case " $(XFAIL_TESTS) " in \
--	      *$$ws$$tst$$ws*) \
-+	      *" $$tst "*) \
- 		xpass=`expr $$xpass + 1`; \
- 		failed=`expr $$failed + 1`; \
- 		echo "XPASS: $$tst"; \
-@@ -471,7 +494,7 @@
- 	    elif test $$? -ne 77; then \
- 	      all=`expr $$all + 1`; \
- 	      case " $(XFAIL_TESTS) " in \
--	      *$$ws$$tst$$ws*) \
-+	      *" $$tst "*) \
- 		xfail=`expr $$xfail + 1`; \
- 		echo "XFAIL: $$tst"; \
- 	      ;; \
-@@ -521,21 +544,22 @@
- 	else :; fi
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	list='$(DISTFILES)'; \
--	  dist_files=`for file in $$list; do echo $$file; done | \
--	  sed -e "s|^$$srcdirstrip/||;t" \
--	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
--	case $$dist_files in \
--	  */*) $(MKDIR_P) `echo "$$dist_files" | \
--			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
--			   sort -u` ;; \
--	esac; \
--	for file in $$dist_files; do \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
- 	  if test -d $$d/$$file; then \
--	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- 	    fi; \
-@@ -552,7 +576,7 @@
- all-am: Makefile $(LTLIBRARIES) $(MANS) $(DATA)
- installdirs:
- 	for dir in "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man8dir)"; do \
--	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
- 	done
- install: install-am
- install-exec: install-exec-am
-@@ -588,7 +612,7 @@
- 	-rm -rf ./$(DEPDIR)
- 	-rm -f Makefile
- distclean-am: clean-am distclean-compile distclean-generic \
--	distclean-tags
-+	distclean-libtool distclean-tags
- 
- dvi: dvi-am
- 
-@@ -602,20 +626,12 @@
- 
- install-data-am: install-man install-securelibLTLIBRARIES
- 
--install-dvi: install-dvi-am
--
- install-exec-am:
- 
--install-html: install-html-am
--
- install-info: install-info-am
- 
- install-man: install-man8
- 
--install-pdf: install-pdf-am
--
--install-ps: install-ps-am
--
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
-@@ -636,27 +652,24 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-man uninstall-securelibLTLIBRARIES
-+uninstall-am: uninstall-info-am uninstall-man \
-+	uninstall-securelibLTLIBRARIES
- 
- uninstall-man: uninstall-man8
- 
--.MAKE: install-am install-strip
--
- .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
- 	clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
- 	distclean distclean-compile distclean-generic \
- 	distclean-libtool distclean-tags distdir dvi dvi-am html \
- 	html-am info info-am install install-am install-data \
--	install-data-am install-dvi install-dvi-am install-exec \
--	install-exec-am install-html install-html-am install-info \
--	install-info-am install-man install-man8 install-pdf \
--	install-pdf-am install-ps install-ps-am \
-+	install-data-am install-exec install-exec-am install-info \
-+	install-info-am install-man install-man8 \
- 	install-securelibLTLIBRARIES install-strip installcheck \
- 	installcheck-am installdirs maintainer-clean \
- 	maintainer-clean-generic mostlyclean mostlyclean-compile \
- 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
--	tags uninstall uninstall-am uninstall-man uninstall-man8 \
--	uninstall-securelibLTLIBRARIES
-+	tags uninstall uninstall-am uninstall-info-am uninstall-man \
-+	uninstall-man8 uninstall-securelibLTLIBRARIES
- 
- @ENABLE_REGENERATE_MAN_TRUE@README: pam_issue.8.xml
- @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
 Index: pam/Linux-PAM/modules/pam_keyinit/Makefile.in
 ===================================================================
 --- pam.orig/Linux-PAM/modules/pam_keyinit/Makefile.in
 +++ pam/Linux-PAM/modules/pam_keyinit/Makefile.in
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -19,11 +19,15 @@
- #
- 
- 
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ../..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -69,18 +73,17 @@
- pam_keyinit_la_OBJECTS = pam_keyinit.lo
- @HAVE_KEY_MANAGEMENT_TRUE@am_pam_keyinit_la_rpath = -rpath \
- @HAVE_KEY_MANAGEMENT_TRUE@	$(securelibdir)
--DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
--	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+	$(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
--	$(LDFLAGS) -o $@
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = pam_keyinit.c
- DIST_SOURCES = pam_keyinit.c
- man8dir = $(mandir)/man8
-@@ -91,6 +94,8 @@
- CTAGS = ctags
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -115,6 +120,10 @@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
-+ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
-+ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
-+ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
-+ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -123,7 +132,18 @@
- GMSGFMT_015 = @GMSGFMT_015@
- GREP = @GREP@
- HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
--INSTALL = @INSTALL@
-+HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
-+HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
-+HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
-+HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
-+HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
-+HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
-+HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
-+HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
-+HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
-+HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
-+HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
-+HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -135,6 +155,7 @@
+@@ -135,6 +135,7 @@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
  LIBAUDIT = @LIBAUDIT@
@@ -13820,371 +4734,19 @@ Index: pam/Linux-PAM/modules/pam_keyinit/Makefile.in
  LIBCRACK = @LIBCRACK@
  LIBCRYPT = @LIBCRYPT@
  LIBDB = @LIBDB@
-@@ -158,7 +179,6 @@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
--MKDIR_P = @MKDIR_P@
- MSGFMT = @MSGFMT@
- MSGFMT_015 = @MSGFMT_015@
- MSGMERGE = @MSGMERGE@
-@@ -177,8 +197,11 @@
+@@ -177,6 +178,7 @@
  RANLIB = @RANLIB@
  SCONFIGDIR = @SCONFIGDIR@
  SECUREDIR = @SECUREDIR@
 +SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
-+STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
-+STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
  STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -192,13 +215,13 @@
- XSLTPROC = @XSLTPROC@
- YACC = @YACC@
- YFLAGS = @YFLAGS@
--abs_builddir = @abs_builddir@
--abs_srcdir = @abs_srcdir@
--abs_top_builddir = @abs_top_builddir@
--abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -210,7 +233,6 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
--builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -241,11 +263,8 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_builddir = @top_builddir@
--top_srcdir = @top_srcdir@
- CLEANFILES = *~
- EXTRA_DIST = README $(XMLS) pam_keyinit.8 tst-pam_keyinit
- XMLS = README.xml pam_keyinit.8.xml
-@@ -293,7 +312,7 @@
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
--	test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
-+	test -z "$(securelibdir)" || $(mkdir_p) "$(DESTDIR)$(securelibdir)"
- 	@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
- 	  if test -f $$p; then \
- 	    f=$(am__strip_dir) \
-@@ -304,7 +323,7 @@
- 
- uninstall-securelibLTLIBRARIES:
- 	@$(NORMAL_UNINSTALL)
--	@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-+	@set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
- 	  p=$(am__strip_dir) \
- 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
- 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-@@ -319,7 +338,7 @@
- 	  rm -f "$${dir}/so_locations"; \
- 	done
- pam_keyinit.la: $(pam_keyinit_la_OBJECTS) $(pam_keyinit_la_DEPENDENCIES) 
--	$(LINK) $(am_pam_keyinit_la_rpath) $(pam_keyinit_la_OBJECTS) $(pam_keyinit_la_LIBADD) $(LIBS)
-+	$(LINK) $(am_pam_keyinit_la_rpath) $(pam_keyinit_la_LDFLAGS) $(pam_keyinit_la_OBJECTS) $(pam_keyinit_la_LIBADD) $(LIBS)
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
-@@ -330,22 +349,22 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_keyinit.Plo@am__quote@
- 
- .c.o:
--@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c $<
- 
- .c.obj:
--@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
- 
- .c.lo:
--@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-@@ -355,9 +374,13 @@
- 
- clean-libtool:
- 	-rm -rf .libs _libs
-+
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
- install-man8: $(man8_MANS) $(man_MANS)
- 	@$(NORMAL_INSTALL)
--	test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
-+	test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
- 	@list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
- 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
- 	for i in $$l2; do \
-@@ -450,9 +473,9 @@
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
- check-TESTS: $(TESTS)
--	@failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[	 ]'; \
-+	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
- 	srcdir=$(srcdir); export srcdir; \
--	list=' $(TESTS) '; \
-+	list='$(TESTS)'; \
- 	if test -n "$$list"; then \
- 	  for tst in $$list; do \
- 	    if test -f ./$$tst; then dir=./; \
-@@ -461,7 +484,7 @@
- 	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
- 	      all=`expr $$all + 1`; \
- 	      case " $(XFAIL_TESTS) " in \
--	      *$$ws$$tst$$ws*) \
-+	      *" $$tst "*) \
- 		xpass=`expr $$xpass + 1`; \
- 		failed=`expr $$failed + 1`; \
- 		echo "XPASS: $$tst"; \
-@@ -473,7 +496,7 @@
- 	    elif test $$? -ne 77; then \
- 	      all=`expr $$all + 1`; \
- 	      case " $(XFAIL_TESTS) " in \
--	      *$$ws$$tst$$ws*) \
-+	      *" $$tst "*) \
- 		xfail=`expr $$xfail + 1`; \
- 		echo "XFAIL: $$tst"; \
- 	      ;; \
-@@ -523,21 +546,22 @@
- 	else :; fi
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	list='$(DISTFILES)'; \
--	  dist_files=`for file in $$list; do echo $$file; done | \
--	  sed -e "s|^$$srcdirstrip/||;t" \
--	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
--	case $$dist_files in \
--	  */*) $(MKDIR_P) `echo "$$dist_files" | \
--			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
--			   sort -u` ;; \
--	esac; \
--	for file in $$dist_files; do \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
- 	  if test -d $$d/$$file; then \
--	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- 	    fi; \
-@@ -554,7 +578,7 @@
- all-am: Makefile $(LTLIBRARIES) $(MANS) $(DATA)
- installdirs:
- 	for dir in "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man8dir)"; do \
--	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
- 	done
- install: install-am
- install-exec: install-exec-am
-@@ -590,7 +614,7 @@
- 	-rm -rf ./$(DEPDIR)
- 	-rm -f Makefile
- distclean-am: clean-am distclean-compile distclean-generic \
--	distclean-tags
-+	distclean-libtool distclean-tags
- 
- dvi: dvi-am
- 
-@@ -604,20 +628,12 @@
- 
- install-data-am: install-man install-securelibLTLIBRARIES
- 
--install-dvi: install-dvi-am
--
- install-exec-am:
- 
--install-html: install-html-am
--
- install-info: install-info-am
- 
- install-man: install-man8
- 
--install-pdf: install-pdf-am
--
--install-ps: install-ps-am
--
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
-@@ -638,27 +654,24 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-man uninstall-securelibLTLIBRARIES
-+uninstall-am: uninstall-info-am uninstall-man \
-+	uninstall-securelibLTLIBRARIES
- 
- uninstall-man: uninstall-man8
- 
--.MAKE: install-am install-strip
--
- .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
- 	clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
- 	distclean distclean-compile distclean-generic \
- 	distclean-libtool distclean-tags distdir dvi dvi-am html \
- 	html-am info info-am install install-am install-data \
--	install-data-am install-dvi install-dvi-am install-exec \
--	install-exec-am install-html install-html-am install-info \
--	install-info-am install-man install-man8 install-pdf \
--	install-pdf-am install-ps install-ps-am \
-+	install-data-am install-exec install-exec-am install-info \
-+	install-info-am install-man install-man8 \
- 	install-securelibLTLIBRARIES install-strip installcheck \
- 	installcheck-am installdirs maintainer-clean \
- 	maintainer-clean-generic mostlyclean mostlyclean-compile \
- 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
--	tags uninstall uninstall-am uninstall-man uninstall-man8 \
--	uninstall-securelibLTLIBRARIES
-+	tags uninstall uninstall-am uninstall-info-am uninstall-man \
-+	uninstall-man8 uninstall-securelibLTLIBRARIES
- 
- @ENABLE_REGENERATE_MAN_TRUE@README: pam_keyinit.8.xml
- @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
 Index: pam/Linux-PAM/modules/pam_lastlog/Makefile.in
 ===================================================================
 --- pam.orig/Linux-PAM/modules/pam_lastlog/Makefile.in
 +++ pam/Linux-PAM/modules/pam_lastlog/Makefile.in
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -19,11 +19,15 @@
- #
- 
- 
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ../..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -67,18 +71,17 @@
- pam_lastlog_la_LIBADD =
- pam_lastlog_la_SOURCES = pam_lastlog.c
- pam_lastlog_la_OBJECTS = pam_lastlog.lo
--DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
--	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+	$(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
--	$(LDFLAGS) -o $@
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = pam_lastlog.c
- DIST_SOURCES = pam_lastlog.c
- man8dir = $(mandir)/man8
-@@ -89,6 +92,8 @@
- CTAGS = ctags
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -113,6 +118,10 @@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
-+ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
-+ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
-+ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
-+ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -121,7 +130,18 @@
- GMSGFMT_015 = @GMSGFMT_015@
- GREP = @GREP@
- HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
--INSTALL = @INSTALL@
-+HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
-+HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
-+HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
-+HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
-+HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
-+HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
-+HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
-+HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
-+HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
-+HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
-+HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
-+HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -133,6 +153,7 @@
+@@ -133,6 +133,7 @@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
  LIBAUDIT = @LIBAUDIT@
@@ -14192,306 +4754,19 @@ Index: pam/Linux-PAM/modules/pam_lastlog/Makefile.in
  LIBCRACK = @LIBCRACK@
  LIBCRYPT = @LIBCRYPT@
  LIBDB = @LIBDB@
-@@ -156,7 +177,6 @@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
--MKDIR_P = @MKDIR_P@
- MSGFMT = @MSGFMT@
- MSGFMT_015 = @MSGFMT_015@
- MSGMERGE = @MSGMERGE@
-@@ -175,8 +195,11 @@
+@@ -175,6 +176,7 @@
  RANLIB = @RANLIB@
  SCONFIGDIR = @SCONFIGDIR@
  SECUREDIR = @SECUREDIR@
 +SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
-+STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
-+STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
  STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -190,13 +213,13 @@
- XSLTPROC = @XSLTPROC@
- YACC = @YACC@
- YFLAGS = @YFLAGS@
--abs_builddir = @abs_builddir@
--abs_srcdir = @abs_srcdir@
--abs_top_builddir = @abs_top_builddir@
--abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -208,7 +231,6 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
--builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -239,11 +261,8 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_builddir = @top_builddir@
--top_srcdir = @top_srcdir@
- CLEANFILES = *~
- securelibdir = $(SECUREDIR)
- secureconfdir = $(SCONFIGDIR)
-@@ -291,7 +310,7 @@
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
--	test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
-+	test -z "$(securelibdir)" || $(mkdir_p) "$(DESTDIR)$(securelibdir)"
- 	@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
- 	  if test -f $$p; then \
- 	    f=$(am__strip_dir) \
-@@ -302,7 +321,7 @@
- 
- uninstall-securelibLTLIBRARIES:
- 	@$(NORMAL_UNINSTALL)
--	@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-+	@set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
- 	  p=$(am__strip_dir) \
- 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
- 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-@@ -317,7 +336,7 @@
- 	  rm -f "$${dir}/so_locations"; \
- 	done
- pam_lastlog.la: $(pam_lastlog_la_OBJECTS) $(pam_lastlog_la_DEPENDENCIES) 
--	$(LINK) -rpath $(securelibdir) $(pam_lastlog_la_OBJECTS) $(pam_lastlog_la_LIBADD) $(LIBS)
-+	$(LINK) -rpath $(securelibdir) $(pam_lastlog_la_LDFLAGS) $(pam_lastlog_la_OBJECTS) $(pam_lastlog_la_LIBADD) $(LIBS)
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
-@@ -328,22 +347,22 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_lastlog.Plo@am__quote@
- 
- .c.o:
--@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c $<
- 
- .c.obj:
--@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
- 
- .c.lo:
--@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-@@ -353,9 +372,13 @@
- 
- clean-libtool:
- 	-rm -rf .libs _libs
-+
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
- install-man8: $(man8_MANS) $(man_MANS)
- 	@$(NORMAL_INSTALL)
--	test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
-+	test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
- 	@list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
- 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
- 	for i in $$l2; do \
-@@ -448,9 +471,9 @@
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
- check-TESTS: $(TESTS)
--	@failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[	 ]'; \
-+	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
- 	srcdir=$(srcdir); export srcdir; \
--	list=' $(TESTS) '; \
-+	list='$(TESTS)'; \
- 	if test -n "$$list"; then \
- 	  for tst in $$list; do \
- 	    if test -f ./$$tst; then dir=./; \
-@@ -459,7 +482,7 @@
- 	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
- 	      all=`expr $$all + 1`; \
- 	      case " $(XFAIL_TESTS) " in \
--	      *$$ws$$tst$$ws*) \
-+	      *" $$tst "*) \
- 		xpass=`expr $$xpass + 1`; \
- 		failed=`expr $$failed + 1`; \
- 		echo "XPASS: $$tst"; \
-@@ -471,7 +494,7 @@
- 	    elif test $$? -ne 77; then \
- 	      all=`expr $$all + 1`; \
- 	      case " $(XFAIL_TESTS) " in \
--	      *$$ws$$tst$$ws*) \
-+	      *" $$tst "*) \
- 		xfail=`expr $$xfail + 1`; \
- 		echo "XFAIL: $$tst"; \
- 	      ;; \
-@@ -521,21 +544,22 @@
- 	else :; fi
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	list='$(DISTFILES)'; \
--	  dist_files=`for file in $$list; do echo $$file; done | \
--	  sed -e "s|^$$srcdirstrip/||;t" \
--	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
--	case $$dist_files in \
--	  */*) $(MKDIR_P) `echo "$$dist_files" | \
--			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
--			   sort -u` ;; \
--	esac; \
--	for file in $$dist_files; do \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
- 	  if test -d $$d/$$file; then \
--	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- 	    fi; \
-@@ -552,7 +576,7 @@
- all-am: Makefile $(LTLIBRARIES) $(MANS) $(DATA)
- installdirs:
- 	for dir in "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man8dir)"; do \
--	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
- 	done
- install: install-am
- install-exec: install-exec-am
-@@ -588,7 +612,7 @@
- 	-rm -rf ./$(DEPDIR)
- 	-rm -f Makefile
- distclean-am: clean-am distclean-compile distclean-generic \
--	distclean-tags
-+	distclean-libtool distclean-tags
- 
- dvi: dvi-am
- 
-@@ -602,20 +626,12 @@
- 
- install-data-am: install-man install-securelibLTLIBRARIES
- 
--install-dvi: install-dvi-am
--
- install-exec-am:
- 
--install-html: install-html-am
--
- install-info: install-info-am
- 
- install-man: install-man8
- 
--install-pdf: install-pdf-am
--
--install-ps: install-ps-am
--
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
-@@ -636,27 +652,24 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-man uninstall-securelibLTLIBRARIES
-+uninstall-am: uninstall-info-am uninstall-man \
-+	uninstall-securelibLTLIBRARIES
- 
- uninstall-man: uninstall-man8
- 
--.MAKE: install-am install-strip
--
- .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
- 	clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
- 	distclean distclean-compile distclean-generic \
- 	distclean-libtool distclean-tags distdir dvi dvi-am html \
- 	html-am info info-am install install-am install-data \
--	install-data-am install-dvi install-dvi-am install-exec \
--	install-exec-am install-html install-html-am install-info \
--	install-info-am install-man install-man8 install-pdf \
--	install-pdf-am install-ps install-ps-am \
-+	install-data-am install-exec install-exec-am install-info \
-+	install-info-am install-man install-man8 \
- 	install-securelibLTLIBRARIES install-strip installcheck \
- 	installcheck-am installdirs maintainer-clean \
- 	maintainer-clean-generic mostlyclean mostlyclean-compile \
- 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
--	tags uninstall uninstall-am uninstall-man uninstall-man8 \
--	uninstall-securelibLTLIBRARIES
-+	tags uninstall uninstall-am uninstall-info-am uninstall-man \
-+	uninstall-man8 uninstall-securelibLTLIBRARIES
- 
- @ENABLE_REGENERATE_MAN_TRUE@README: pam_lastlog.8.xml
- @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
 Index: pam/Linux-PAM/modules/pam_limits/Makefile.in
 ===================================================================
 --- pam.orig/Linux-PAM/modules/pam_limits/Makefile.in
 +++ pam/Linux-PAM/modules/pam_limits/Makefile.in
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -19,11 +19,15 @@
- #
- 
- 
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ../..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -65,21 +69,20 @@
+@@ -65,7 +65,7 @@
  	"$(DESTDIR)$(man8dir)" "$(DESTDIR)$(secureconfdir)"
  securelibLTLIBRARIES_INSTALL = $(INSTALL)
  LTLIBRARIES = $(securelib_LTLIBRARIES)
@@ -14499,68 +4774,8 @@ Index: pam/Linux-PAM/modules/pam_limits/Makefile.in
 +pam_limits_la_DEPENDENCIES =
  pam_limits_la_SOURCES = pam_limits.c
  pam_limits_la_OBJECTS = pam_limits.lo
--DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
--	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+	$(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
--	$(LDFLAGS) -o $@
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = pam_limits.c
- DIST_SOURCES = pam_limits.c
- man5dir = $(mandir)/man5
-@@ -92,6 +95,8 @@
- CTAGS = ctags
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -116,6 +121,10 @@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
-+ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
-+ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
-+ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
-+ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -124,7 +133,18 @@
- GMSGFMT_015 = @GMSGFMT_015@
- GREP = @GREP@
- HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
--INSTALL = @INSTALL@
-+HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
-+HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
-+HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
-+HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
-+HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
-+HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
-+HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
-+HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
-+HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
-+HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
-+HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
-+HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -136,6 +156,7 @@
+ DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+@@ -136,6 +136,7 @@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
  LIBAUDIT = @LIBAUDIT@
@@ -14568,65 +4783,15 @@ Index: pam/Linux-PAM/modules/pam_limits/Makefile.in
  LIBCRACK = @LIBCRACK@
  LIBCRYPT = @LIBCRYPT@
  LIBDB = @LIBDB@
-@@ -159,7 +180,6 @@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
--MKDIR_P = @MKDIR_P@
- MSGFMT = @MSGFMT@
- MSGFMT_015 = @MSGFMT_015@
- MSGMERGE = @MSGMERGE@
-@@ -178,8 +198,11 @@
+@@ -178,6 +179,7 @@
  RANLIB = @RANLIB@
  SCONFIGDIR = @SCONFIGDIR@
  SECUREDIR = @SECUREDIR@
 +SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
-+STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
-+STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
  STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -193,13 +216,13 @@
- XSLTPROC = @XSLTPROC@
- YACC = @YACC@
- YFLAGS = @YFLAGS@
--abs_builddir = @abs_builddir@
--abs_srcdir = @abs_srcdir@
--abs_top_builddir = @abs_top_builddir@
--abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -211,7 +234,6 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
--builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -242,11 +264,8 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_builddir = @top_builddir@
--top_srcdir = @top_srcdir@
- CLEANFILES = *~
- EXTRA_DIST = README $(MANS) $(XMLS) limits.conf tst-pam_limits
- man_MANS = limits.conf.5 pam_limits.8
-@@ -261,6 +280,7 @@
+@@ -261,6 +263,7 @@
  	-L$(top_builddir)/libpam -lpam $(am__append_1)
  securelib_LTLIBRARIES = pam_limits.la
  secureconf_DATA = limits.conf
@@ -14634,332 +4799,11 @@ Index: pam/Linux-PAM/modules/pam_limits/Makefile.in
  @ENABLE_REGENERATE_MAN_TRUE@noinst_DATA = README
  all: all-am
  
-@@ -297,7 +317,7 @@
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
--	test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
-+	test -z "$(securelibdir)" || $(mkdir_p) "$(DESTDIR)$(securelibdir)"
- 	@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
- 	  if test -f $$p; then \
- 	    f=$(am__strip_dir) \
-@@ -308,7 +328,7 @@
- 
- uninstall-securelibLTLIBRARIES:
- 	@$(NORMAL_UNINSTALL)
--	@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-+	@set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
- 	  p=$(am__strip_dir) \
- 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
- 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-@@ -323,7 +343,7 @@
- 	  rm -f "$${dir}/so_locations"; \
- 	done
- pam_limits.la: $(pam_limits_la_OBJECTS) $(pam_limits_la_DEPENDENCIES) 
--	$(LINK) -rpath $(securelibdir) $(pam_limits_la_OBJECTS) $(pam_limits_la_LIBADD) $(LIBS)
-+	$(LINK) -rpath $(securelibdir) $(pam_limits_la_LDFLAGS) $(pam_limits_la_OBJECTS) $(pam_limits_la_LIBADD) $(LIBS)
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
-@@ -334,22 +354,22 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_limits.Plo@am__quote@
- 
- .c.o:
--@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c $<
- 
- .c.obj:
--@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
- 
- .c.lo:
--@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-@@ -359,9 +379,13 @@
- 
- clean-libtool:
- 	-rm -rf .libs _libs
-+
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
- install-man5: $(man5_MANS) $(man_MANS)
- 	@$(NORMAL_INSTALL)
--	test -z "$(man5dir)" || $(MKDIR_P) "$(DESTDIR)$(man5dir)"
-+	test -z "$(man5dir)" || $(mkdir_p) "$(DESTDIR)$(man5dir)"
- 	@list='$(man5_MANS) $(dist_man5_MANS) $(nodist_man5_MANS)'; \
- 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
- 	for i in $$l2; do \
-@@ -406,7 +430,7 @@
- 	done
- install-man8: $(man8_MANS) $(man_MANS)
- 	@$(NORMAL_INSTALL)
--	test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
-+	test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
- 	@list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
- 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
- 	for i in $$l2; do \
-@@ -451,7 +475,7 @@
- 	done
- install-secureconfDATA: $(secureconf_DATA)
- 	@$(NORMAL_INSTALL)
--	test -z "$(secureconfdir)" || $(MKDIR_P) "$(DESTDIR)$(secureconfdir)"
-+	test -z "$(secureconfdir)" || $(mkdir_p) "$(DESTDIR)$(secureconfdir)"
- 	@list='$(secureconf_DATA)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  f=$(am__strip_dir) \
-@@ -516,9 +540,9 @@
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
- check-TESTS: $(TESTS)
--	@failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[	 ]'; \
-+	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
- 	srcdir=$(srcdir); export srcdir; \
--	list=' $(TESTS) '; \
-+	list='$(TESTS)'; \
- 	if test -n "$$list"; then \
- 	  for tst in $$list; do \
- 	    if test -f ./$$tst; then dir=./; \
-@@ -527,7 +551,7 @@
- 	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
- 	      all=`expr $$all + 1`; \
- 	      case " $(XFAIL_TESTS) " in \
--	      *$$ws$$tst$$ws*) \
-+	      *" $$tst "*) \
- 		xpass=`expr $$xpass + 1`; \
- 		failed=`expr $$failed + 1`; \
- 		echo "XPASS: $$tst"; \
-@@ -539,7 +563,7 @@
- 	    elif test $$? -ne 77; then \
- 	      all=`expr $$all + 1`; \
- 	      case " $(XFAIL_TESTS) " in \
--	      *$$ws$$tst$$ws*) \
-+	      *" $$tst "*) \
- 		xfail=`expr $$xfail + 1`; \
- 		echo "XFAIL: $$tst"; \
- 	      ;; \
-@@ -589,21 +613,22 @@
- 	else :; fi
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	list='$(DISTFILES)'; \
--	  dist_files=`for file in $$list; do echo $$file; done | \
--	  sed -e "s|^$$srcdirstrip/||;t" \
--	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
--	case $$dist_files in \
--	  */*) $(MKDIR_P) `echo "$$dist_files" | \
--			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
--			   sort -u` ;; \
--	esac; \
--	for file in $$dist_files; do \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
- 	  if test -d $$d/$$file; then \
--	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- 	    fi; \
-@@ -620,7 +645,7 @@
- all-am: Makefile $(LTLIBRARIES) $(MANS) $(DATA)
- installdirs:
- 	for dir in "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(secureconfdir)"; do \
--	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
- 	done
- install: install-am
- install-exec: install-exec-am
-@@ -656,7 +681,7 @@
- 	-rm -rf ./$(DEPDIR)
- 	-rm -f Makefile
- distclean-am: clean-am distclean-compile distclean-generic \
--	distclean-tags
-+	distclean-libtool distclean-tags
- 
- dvi: dvi-am
- 
-@@ -671,20 +696,12 @@
- install-data-am: install-man install-secureconfDATA \
- 	install-securelibLTLIBRARIES
- 
--install-dvi: install-dvi-am
--
- install-exec-am:
- 
--install-html: install-html-am
--
- install-info: install-info-am
- 
- install-man: install-man5 install-man8
- 
--install-pdf: install-pdf-am
--
--install-ps: install-ps-am
--
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
-@@ -705,29 +722,25 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-man uninstall-secureconfDATA \
-+uninstall-am: uninstall-info-am uninstall-man uninstall-secureconfDATA \
- 	uninstall-securelibLTLIBRARIES
- 
- uninstall-man: uninstall-man5 uninstall-man8
- 
--.MAKE: install-am install-strip
--
- .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
- 	clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
- 	distclean distclean-compile distclean-generic \
- 	distclean-libtool distclean-tags distdir dvi dvi-am html \
- 	html-am info info-am install install-am install-data \
--	install-data-am install-dvi install-dvi-am install-exec \
--	install-exec-am install-html install-html-am install-info \
-+	install-data-am install-exec install-exec-am install-info \
- 	install-info-am install-man install-man5 install-man8 \
--	install-pdf install-pdf-am install-ps install-ps-am \
- 	install-secureconfDATA install-securelibLTLIBRARIES \
- 	install-strip installcheck installcheck-am installdirs \
- 	maintainer-clean maintainer-clean-generic mostlyclean \
- 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
--	pdf pdf-am ps ps-am tags uninstall uninstall-am uninstall-man \
--	uninstall-man5 uninstall-man8 uninstall-secureconfDATA \
--	uninstall-securelibLTLIBRARIES
-+	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-+	uninstall-info-am uninstall-man uninstall-man5 uninstall-man8 \
-+	uninstall-secureconfDATA uninstall-securelibLTLIBRARIES
- 
- @ENABLE_REGENERATE_MAN_TRUE@README: pam_limits.8.xml limits.conf.5.xml
- @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
 Index: pam/Linux-PAM/modules/pam_listfile/Makefile.in
 ===================================================================
 --- pam.orig/Linux-PAM/modules/pam_listfile/Makefile.in
 +++ pam/Linux-PAM/modules/pam_listfile/Makefile.in
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -19,11 +19,15 @@
- #
- 
- 
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ../..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -67,18 +71,17 @@
- pam_listfile_la_LIBADD =
- pam_listfile_la_SOURCES = pam_listfile.c
- pam_listfile_la_OBJECTS = pam_listfile.lo
--DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
--	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+	$(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
--	$(LDFLAGS) -o $@
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = pam_listfile.c
- DIST_SOURCES = pam_listfile.c
- man8dir = $(mandir)/man8
-@@ -89,6 +92,8 @@
- CTAGS = ctags
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -113,6 +118,10 @@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
-+ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
-+ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
-+ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
-+ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -121,7 +130,18 @@
- GMSGFMT_015 = @GMSGFMT_015@
- GREP = @GREP@
- HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
--INSTALL = @INSTALL@
-+HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
-+HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
-+HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
-+HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
-+HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
-+HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
-+HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
-+HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
-+HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
-+HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
-+HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
-+HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -133,6 +153,7 @@
+@@ -133,6 +133,7 @@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
  LIBAUDIT = @LIBAUDIT@
@@ -14967,371 +4811,19 @@ Index: pam/Linux-PAM/modules/pam_listfile/Makefile.in
  LIBCRACK = @LIBCRACK@
  LIBCRYPT = @LIBCRYPT@
  LIBDB = @LIBDB@
-@@ -156,7 +177,6 @@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
--MKDIR_P = @MKDIR_P@
- MSGFMT = @MSGFMT@
- MSGFMT_015 = @MSGFMT_015@
- MSGMERGE = @MSGMERGE@
-@@ -175,8 +195,11 @@
+@@ -175,6 +176,7 @@
  RANLIB = @RANLIB@
  SCONFIGDIR = @SCONFIGDIR@
  SECUREDIR = @SECUREDIR@
 +SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
-+STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
-+STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
  STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -190,13 +213,13 @@
- XSLTPROC = @XSLTPROC@
- YACC = @YACC@
- YFLAGS = @YFLAGS@
--abs_builddir = @abs_builddir@
--abs_srcdir = @abs_srcdir@
--abs_top_builddir = @abs_top_builddir@
--abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -208,7 +231,6 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
--builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -239,11 +261,8 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_builddir = @top_builddir@
--top_srcdir = @top_srcdir@
- CLEANFILES = *~
- EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_listfile
- man_MANS = pam_listfile.8
-@@ -291,7 +310,7 @@
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
--	test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
-+	test -z "$(securelibdir)" || $(mkdir_p) "$(DESTDIR)$(securelibdir)"
- 	@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
- 	  if test -f $$p; then \
- 	    f=$(am__strip_dir) \
-@@ -302,7 +321,7 @@
- 
- uninstall-securelibLTLIBRARIES:
- 	@$(NORMAL_UNINSTALL)
--	@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-+	@set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
- 	  p=$(am__strip_dir) \
- 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
- 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-@@ -317,7 +336,7 @@
- 	  rm -f "$${dir}/so_locations"; \
- 	done
- pam_listfile.la: $(pam_listfile_la_OBJECTS) $(pam_listfile_la_DEPENDENCIES) 
--	$(LINK) -rpath $(securelibdir) $(pam_listfile_la_OBJECTS) $(pam_listfile_la_LIBADD) $(LIBS)
-+	$(LINK) -rpath $(securelibdir) $(pam_listfile_la_LDFLAGS) $(pam_listfile_la_OBJECTS) $(pam_listfile_la_LIBADD) $(LIBS)
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
-@@ -328,22 +347,22 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_listfile.Plo@am__quote@
- 
- .c.o:
--@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c $<
- 
- .c.obj:
--@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
- 
- .c.lo:
--@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-@@ -353,9 +372,13 @@
- 
- clean-libtool:
- 	-rm -rf .libs _libs
-+
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
- install-man8: $(man8_MANS) $(man_MANS)
- 	@$(NORMAL_INSTALL)
--	test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
-+	test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
- 	@list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
- 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
- 	for i in $$l2; do \
-@@ -448,9 +471,9 @@
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
- check-TESTS: $(TESTS)
--	@failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[	 ]'; \
-+	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
- 	srcdir=$(srcdir); export srcdir; \
--	list=' $(TESTS) '; \
-+	list='$(TESTS)'; \
- 	if test -n "$$list"; then \
- 	  for tst in $$list; do \
- 	    if test -f ./$$tst; then dir=./; \
-@@ -459,7 +482,7 @@
- 	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
- 	      all=`expr $$all + 1`; \
- 	      case " $(XFAIL_TESTS) " in \
--	      *$$ws$$tst$$ws*) \
-+	      *" $$tst "*) \
- 		xpass=`expr $$xpass + 1`; \
- 		failed=`expr $$failed + 1`; \
- 		echo "XPASS: $$tst"; \
-@@ -471,7 +494,7 @@
- 	    elif test $$? -ne 77; then \
- 	      all=`expr $$all + 1`; \
- 	      case " $(XFAIL_TESTS) " in \
--	      *$$ws$$tst$$ws*) \
-+	      *" $$tst "*) \
- 		xfail=`expr $$xfail + 1`; \
- 		echo "XFAIL: $$tst"; \
- 	      ;; \
-@@ -521,21 +544,22 @@
- 	else :; fi
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	list='$(DISTFILES)'; \
--	  dist_files=`for file in $$list; do echo $$file; done | \
--	  sed -e "s|^$$srcdirstrip/||;t" \
--	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
--	case $$dist_files in \
--	  */*) $(MKDIR_P) `echo "$$dist_files" | \
--			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
--			   sort -u` ;; \
--	esac; \
--	for file in $$dist_files; do \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
- 	  if test -d $$d/$$file; then \
--	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- 	    fi; \
-@@ -552,7 +576,7 @@
- all-am: Makefile $(LTLIBRARIES) $(MANS) $(DATA)
- installdirs:
- 	for dir in "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man8dir)"; do \
--	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
- 	done
- install: install-am
- install-exec: install-exec-am
-@@ -588,7 +612,7 @@
- 	-rm -rf ./$(DEPDIR)
- 	-rm -f Makefile
- distclean-am: clean-am distclean-compile distclean-generic \
--	distclean-tags
-+	distclean-libtool distclean-tags
- 
- dvi: dvi-am
- 
-@@ -602,20 +626,12 @@
- 
- install-data-am: install-man install-securelibLTLIBRARIES
- 
--install-dvi: install-dvi-am
--
- install-exec-am:
- 
--install-html: install-html-am
--
- install-info: install-info-am
- 
- install-man: install-man8
- 
--install-pdf: install-pdf-am
--
--install-ps: install-ps-am
--
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
-@@ -636,27 +652,24 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-man uninstall-securelibLTLIBRARIES
-+uninstall-am: uninstall-info-am uninstall-man \
-+	uninstall-securelibLTLIBRARIES
- 
- uninstall-man: uninstall-man8
- 
--.MAKE: install-am install-strip
--
- .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
- 	clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
- 	distclean distclean-compile distclean-generic \
- 	distclean-libtool distclean-tags distdir dvi dvi-am html \
- 	html-am info info-am install install-am install-data \
--	install-data-am install-dvi install-dvi-am install-exec \
--	install-exec-am install-html install-html-am install-info \
--	install-info-am install-man install-man8 install-pdf \
--	install-pdf-am install-ps install-ps-am \
-+	install-data-am install-exec install-exec-am install-info \
-+	install-info-am install-man install-man8 \
- 	install-securelibLTLIBRARIES install-strip installcheck \
- 	installcheck-am installdirs maintainer-clean \
- 	maintainer-clean-generic mostlyclean mostlyclean-compile \
- 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
--	tags uninstall uninstall-am uninstall-man uninstall-man8 \
--	uninstall-securelibLTLIBRARIES
-+	tags uninstall uninstall-am uninstall-info-am uninstall-man \
-+	uninstall-man8 uninstall-securelibLTLIBRARIES
- 
- @ENABLE_REGENERATE_MAN_TRUE@README: pam_listfile.8.xml
- @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
 Index: pam/Linux-PAM/modules/pam_localuser/Makefile.in
 ===================================================================
 --- pam.orig/Linux-PAM/modules/pam_localuser/Makefile.in
 +++ pam/Linux-PAM/modules/pam_localuser/Makefile.in
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -19,11 +19,15 @@
- #
- 
- 
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ../..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -67,18 +71,17 @@
- pam_localuser_la_LIBADD =
- pam_localuser_la_SOURCES = pam_localuser.c
- pam_localuser_la_OBJECTS = pam_localuser.lo
--DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
--	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+	$(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
--	$(LDFLAGS) -o $@
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = pam_localuser.c
- DIST_SOURCES = pam_localuser.c
- man8dir = $(mandir)/man8
-@@ -89,6 +92,8 @@
- CTAGS = ctags
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -113,6 +118,10 @@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
-+ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
-+ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
-+ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
-+ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -121,7 +130,18 @@
- GMSGFMT_015 = @GMSGFMT_015@
- GREP = @GREP@
- HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
--INSTALL = @INSTALL@
-+HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
-+HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
-+HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
-+HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
-+HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
-+HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
-+HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
-+HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
-+HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
-+HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
-+HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
-+HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -133,6 +153,7 @@
+@@ -133,6 +133,7 @@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
  LIBAUDIT = @LIBAUDIT@
@@ -15339,371 +4831,19 @@ Index: pam/Linux-PAM/modules/pam_localuser/Makefile.in
  LIBCRACK = @LIBCRACK@
  LIBCRYPT = @LIBCRYPT@
  LIBDB = @LIBDB@
-@@ -156,7 +177,6 @@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
--MKDIR_P = @MKDIR_P@
- MSGFMT = @MSGFMT@
- MSGFMT_015 = @MSGFMT_015@
- MSGMERGE = @MSGMERGE@
-@@ -175,8 +195,11 @@
+@@ -175,6 +176,7 @@
  RANLIB = @RANLIB@
  SCONFIGDIR = @SCONFIGDIR@
  SECUREDIR = @SECUREDIR@
 +SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
-+STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
-+STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
  STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -190,13 +213,13 @@
- XSLTPROC = @XSLTPROC@
- YACC = @YACC@
- YFLAGS = @YFLAGS@
--abs_builddir = @abs_builddir@
--abs_srcdir = @abs_srcdir@
--abs_top_builddir = @abs_top_builddir@
--abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -208,7 +231,6 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
--builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -239,11 +261,8 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_builddir = @top_builddir@
--top_srcdir = @top_srcdir@
- CLEANFILES = *~
- EXTRA_DIST = README ${MANS} $(XMLS) tst-pam_localuser
- TESTS = tst-pam_localuser
-@@ -291,7 +310,7 @@
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
--	test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
-+	test -z "$(securelibdir)" || $(mkdir_p) "$(DESTDIR)$(securelibdir)"
- 	@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
- 	  if test -f $$p; then \
- 	    f=$(am__strip_dir) \
-@@ -302,7 +321,7 @@
- 
- uninstall-securelibLTLIBRARIES:
- 	@$(NORMAL_UNINSTALL)
--	@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-+	@set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
- 	  p=$(am__strip_dir) \
- 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
- 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-@@ -317,7 +336,7 @@
- 	  rm -f "$${dir}/so_locations"; \
- 	done
- pam_localuser.la: $(pam_localuser_la_OBJECTS) $(pam_localuser_la_DEPENDENCIES) 
--	$(LINK) -rpath $(securelibdir) $(pam_localuser_la_OBJECTS) $(pam_localuser_la_LIBADD) $(LIBS)
-+	$(LINK) -rpath $(securelibdir) $(pam_localuser_la_LDFLAGS) $(pam_localuser_la_OBJECTS) $(pam_localuser_la_LIBADD) $(LIBS)
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
-@@ -328,22 +347,22 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_localuser.Plo@am__quote@
- 
- .c.o:
--@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c $<
- 
- .c.obj:
--@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
- 
- .c.lo:
--@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-@@ -353,9 +372,13 @@
- 
- clean-libtool:
- 	-rm -rf .libs _libs
-+
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
- install-man8: $(man8_MANS) $(man_MANS)
- 	@$(NORMAL_INSTALL)
--	test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
-+	test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
- 	@list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
- 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
- 	for i in $$l2; do \
-@@ -448,9 +471,9 @@
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
- check-TESTS: $(TESTS)
--	@failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[	 ]'; \
-+	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
- 	srcdir=$(srcdir); export srcdir; \
--	list=' $(TESTS) '; \
-+	list='$(TESTS)'; \
- 	if test -n "$$list"; then \
- 	  for tst in $$list; do \
- 	    if test -f ./$$tst; then dir=./; \
-@@ -459,7 +482,7 @@
- 	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
- 	      all=`expr $$all + 1`; \
- 	      case " $(XFAIL_TESTS) " in \
--	      *$$ws$$tst$$ws*) \
-+	      *" $$tst "*) \
- 		xpass=`expr $$xpass + 1`; \
- 		failed=`expr $$failed + 1`; \
- 		echo "XPASS: $$tst"; \
-@@ -471,7 +494,7 @@
- 	    elif test $$? -ne 77; then \
- 	      all=`expr $$all + 1`; \
- 	      case " $(XFAIL_TESTS) " in \
--	      *$$ws$$tst$$ws*) \
-+	      *" $$tst "*) \
- 		xfail=`expr $$xfail + 1`; \
- 		echo "XFAIL: $$tst"; \
- 	      ;; \
-@@ -521,21 +544,22 @@
- 	else :; fi
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	list='$(DISTFILES)'; \
--	  dist_files=`for file in $$list; do echo $$file; done | \
--	  sed -e "s|^$$srcdirstrip/||;t" \
--	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
--	case $$dist_files in \
--	  */*) $(MKDIR_P) `echo "$$dist_files" | \
--			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
--			   sort -u` ;; \
--	esac; \
--	for file in $$dist_files; do \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
- 	  if test -d $$d/$$file; then \
--	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- 	    fi; \
-@@ -552,7 +576,7 @@
- all-am: Makefile $(LTLIBRARIES) $(MANS) $(DATA)
- installdirs:
- 	for dir in "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man8dir)"; do \
--	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
- 	done
- install: install-am
- install-exec: install-exec-am
-@@ -588,7 +612,7 @@
- 	-rm -rf ./$(DEPDIR)
- 	-rm -f Makefile
- distclean-am: clean-am distclean-compile distclean-generic \
--	distclean-tags
-+	distclean-libtool distclean-tags
- 
- dvi: dvi-am
- 
-@@ -602,20 +626,12 @@
- 
- install-data-am: install-man install-securelibLTLIBRARIES
- 
--install-dvi: install-dvi-am
--
- install-exec-am:
- 
--install-html: install-html-am
--
- install-info: install-info-am
- 
- install-man: install-man8
- 
--install-pdf: install-pdf-am
--
--install-ps: install-ps-am
--
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
-@@ -636,27 +652,24 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-man uninstall-securelibLTLIBRARIES
-+uninstall-am: uninstall-info-am uninstall-man \
-+	uninstall-securelibLTLIBRARIES
- 
- uninstall-man: uninstall-man8
- 
--.MAKE: install-am install-strip
--
- .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
- 	clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
- 	distclean distclean-compile distclean-generic \
- 	distclean-libtool distclean-tags distdir dvi dvi-am html \
- 	html-am info info-am install install-am install-data \
--	install-data-am install-dvi install-dvi-am install-exec \
--	install-exec-am install-html install-html-am install-info \
--	install-info-am install-man install-man8 install-pdf \
--	install-pdf-am install-ps install-ps-am \
-+	install-data-am install-exec install-exec-am install-info \
-+	install-info-am install-man install-man8 \
- 	install-securelibLTLIBRARIES install-strip installcheck \
- 	installcheck-am installdirs maintainer-clean \
- 	maintainer-clean-generic mostlyclean mostlyclean-compile \
- 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
--	tags uninstall uninstall-am uninstall-man uninstall-man8 \
--	uninstall-securelibLTLIBRARIES
-+	tags uninstall uninstall-am uninstall-info-am uninstall-man \
-+	uninstall-man8 uninstall-securelibLTLIBRARIES
- 
- @ENABLE_REGENERATE_MAN_TRUE@README: pam_localuser.8.xml
- @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
 Index: pam/Linux-PAM/modules/pam_loginuid/Makefile.in
 ===================================================================
 --- pam.orig/Linux-PAM/modules/pam_loginuid/Makefile.in
 +++ pam/Linux-PAM/modules/pam_loginuid/Makefile.in
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -19,11 +19,15 @@
- #
- 
- 
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ../..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -67,18 +71,17 @@
- pam_loginuid_la_LIBADD =
- pam_loginuid_la_SOURCES = pam_loginuid.c
- pam_loginuid_la_OBJECTS = pam_loginuid.lo
--DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
--	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+	$(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
--	$(LDFLAGS) -o $@
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = pam_loginuid.c
- DIST_SOURCES = pam_loginuid.c
- man8dir = $(mandir)/man8
-@@ -89,6 +92,8 @@
- CTAGS = ctags
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -113,6 +118,10 @@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
-+ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
-+ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
-+ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
-+ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -121,7 +130,18 @@
- GMSGFMT_015 = @GMSGFMT_015@
- GREP = @GREP@
- HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
--INSTALL = @INSTALL@
-+HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
-+HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
-+HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
-+HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
-+HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
-+HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
-+HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
-+HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
-+HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
-+HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
-+HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
-+HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -133,6 +153,7 @@
+@@ -133,6 +133,7 @@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
  LIBAUDIT = @LIBAUDIT@
@@ -15711,371 +4851,19 @@ Index: pam/Linux-PAM/modules/pam_loginuid/Makefile.in
  LIBCRACK = @LIBCRACK@
  LIBCRYPT = @LIBCRYPT@
  LIBDB = @LIBDB@
-@@ -156,7 +177,6 @@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
--MKDIR_P = @MKDIR_P@
- MSGFMT = @MSGFMT@
- MSGFMT_015 = @MSGFMT_015@
- MSGMERGE = @MSGMERGE@
-@@ -175,8 +195,11 @@
+@@ -175,6 +176,7 @@
  RANLIB = @RANLIB@
  SCONFIGDIR = @SCONFIGDIR@
  SECUREDIR = @SECUREDIR@
 +SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
-+STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
-+STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
  STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -190,13 +213,13 @@
- XSLTPROC = @XSLTPROC@
- YACC = @YACC@
- YFLAGS = @YFLAGS@
--abs_builddir = @abs_builddir@
--abs_srcdir = @abs_srcdir@
--abs_top_builddir = @abs_top_builddir@
--abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -208,7 +231,6 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
--builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -239,11 +261,8 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_builddir = @top_builddir@
--top_srcdir = @top_srcdir@
- CLEANFILES = *~
- EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_loginuid
- man_MANS = pam_loginuid.8
-@@ -291,7 +310,7 @@
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
--	test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
-+	test -z "$(securelibdir)" || $(mkdir_p) "$(DESTDIR)$(securelibdir)"
- 	@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
- 	  if test -f $$p; then \
- 	    f=$(am__strip_dir) \
-@@ -302,7 +321,7 @@
- 
- uninstall-securelibLTLIBRARIES:
- 	@$(NORMAL_UNINSTALL)
--	@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-+	@set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
- 	  p=$(am__strip_dir) \
- 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
- 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-@@ -317,7 +336,7 @@
- 	  rm -f "$${dir}/so_locations"; \
- 	done
- pam_loginuid.la: $(pam_loginuid_la_OBJECTS) $(pam_loginuid_la_DEPENDENCIES) 
--	$(LINK) -rpath $(securelibdir) $(pam_loginuid_la_OBJECTS) $(pam_loginuid_la_LIBADD) $(LIBS)
-+	$(LINK) -rpath $(securelibdir) $(pam_loginuid_la_LDFLAGS) $(pam_loginuid_la_OBJECTS) $(pam_loginuid_la_LIBADD) $(LIBS)
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
-@@ -328,22 +347,22 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_loginuid.Plo@am__quote@
- 
- .c.o:
--@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c $<
- 
- .c.obj:
--@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
- 
- .c.lo:
--@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-@@ -353,9 +372,13 @@
- 
- clean-libtool:
- 	-rm -rf .libs _libs
-+
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
- install-man8: $(man8_MANS) $(man_MANS)
- 	@$(NORMAL_INSTALL)
--	test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
-+	test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
- 	@list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
- 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
- 	for i in $$l2; do \
-@@ -448,9 +471,9 @@
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
- check-TESTS: $(TESTS)
--	@failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[	 ]'; \
-+	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
- 	srcdir=$(srcdir); export srcdir; \
--	list=' $(TESTS) '; \
-+	list='$(TESTS)'; \
- 	if test -n "$$list"; then \
- 	  for tst in $$list; do \
- 	    if test -f ./$$tst; then dir=./; \
-@@ -459,7 +482,7 @@
- 	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
- 	      all=`expr $$all + 1`; \
- 	      case " $(XFAIL_TESTS) " in \
--	      *$$ws$$tst$$ws*) \
-+	      *" $$tst "*) \
- 		xpass=`expr $$xpass + 1`; \
- 		failed=`expr $$failed + 1`; \
- 		echo "XPASS: $$tst"; \
-@@ -471,7 +494,7 @@
- 	    elif test $$? -ne 77; then \
- 	      all=`expr $$all + 1`; \
- 	      case " $(XFAIL_TESTS) " in \
--	      *$$ws$$tst$$ws*) \
-+	      *" $$tst "*) \
- 		xfail=`expr $$xfail + 1`; \
- 		echo "XFAIL: $$tst"; \
- 	      ;; \
-@@ -521,21 +544,22 @@
- 	else :; fi
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	list='$(DISTFILES)'; \
--	  dist_files=`for file in $$list; do echo $$file; done | \
--	  sed -e "s|^$$srcdirstrip/||;t" \
--	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
--	case $$dist_files in \
--	  */*) $(MKDIR_P) `echo "$$dist_files" | \
--			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
--			   sort -u` ;; \
--	esac; \
--	for file in $$dist_files; do \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
- 	  if test -d $$d/$$file; then \
--	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- 	    fi; \
-@@ -552,7 +576,7 @@
- all-am: Makefile $(LTLIBRARIES) $(MANS) $(DATA)
- installdirs:
- 	for dir in "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man8dir)"; do \
--	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
- 	done
- install: install-am
- install-exec: install-exec-am
-@@ -588,7 +612,7 @@
- 	-rm -rf ./$(DEPDIR)
- 	-rm -f Makefile
- distclean-am: clean-am distclean-compile distclean-generic \
--	distclean-tags
-+	distclean-libtool distclean-tags
- 
- dvi: dvi-am
- 
-@@ -602,20 +626,12 @@
- 
- install-data-am: install-man install-securelibLTLIBRARIES
- 
--install-dvi: install-dvi-am
--
- install-exec-am:
- 
--install-html: install-html-am
--
- install-info: install-info-am
- 
- install-man: install-man8
- 
--install-pdf: install-pdf-am
--
--install-ps: install-ps-am
--
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
-@@ -636,27 +652,24 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-man uninstall-securelibLTLIBRARIES
-+uninstall-am: uninstall-info-am uninstall-man \
-+	uninstall-securelibLTLIBRARIES
- 
- uninstall-man: uninstall-man8
- 
--.MAKE: install-am install-strip
--
- .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
- 	clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
- 	distclean distclean-compile distclean-generic \
- 	distclean-libtool distclean-tags distdir dvi dvi-am html \
- 	html-am info info-am install install-am install-data \
--	install-data-am install-dvi install-dvi-am install-exec \
--	install-exec-am install-html install-html-am install-info \
--	install-info-am install-man install-man8 install-pdf \
--	install-pdf-am install-ps install-ps-am \
-+	install-data-am install-exec install-exec-am install-info \
-+	install-info-am install-man install-man8 \
- 	install-securelibLTLIBRARIES install-strip installcheck \
- 	installcheck-am installdirs maintainer-clean \
- 	maintainer-clean-generic mostlyclean mostlyclean-compile \
- 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
--	tags uninstall uninstall-am uninstall-man uninstall-man8 \
--	uninstall-securelibLTLIBRARIES
-+	tags uninstall uninstall-am uninstall-info-am uninstall-man \
-+	uninstall-man8 uninstall-securelibLTLIBRARIES
- 
- 
- @ENABLE_REGENERATE_MAN_TRUE@README: pam_loginuid.8.xml
 Index: pam/Linux-PAM/modules/pam_mail/Makefile.in
 ===================================================================
 --- pam.orig/Linux-PAM/modules/pam_mail/Makefile.in
 +++ pam/Linux-PAM/modules/pam_mail/Makefile.in
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -19,11 +19,15 @@
- #
- 
- 
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ../..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -67,18 +71,17 @@
- pam_mail_la_LIBADD =
- pam_mail_la_SOURCES = pam_mail.c
- pam_mail_la_OBJECTS = pam_mail.lo
--DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
--	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+	$(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
--	$(LDFLAGS) -o $@
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = pam_mail.c
- DIST_SOURCES = pam_mail.c
- man8dir = $(mandir)/man8
-@@ -89,6 +92,8 @@
- CTAGS = ctags
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -113,6 +118,10 @@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
-+ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
-+ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
-+ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
-+ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -121,7 +130,18 @@
- GMSGFMT_015 = @GMSGFMT_015@
- GREP = @GREP@
- HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
--INSTALL = @INSTALL@
-+HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
-+HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
-+HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
-+HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
-+HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
-+HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
-+HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
-+HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
-+HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
-+HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
-+HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
-+HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -133,6 +153,7 @@
+@@ -133,6 +133,7 @@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
  LIBAUDIT = @LIBAUDIT@
@@ -16083,371 +4871,19 @@ Index: pam/Linux-PAM/modules/pam_mail/Makefile.in
  LIBCRACK = @LIBCRACK@
  LIBCRYPT = @LIBCRYPT@
  LIBDB = @LIBDB@
-@@ -156,7 +177,6 @@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
--MKDIR_P = @MKDIR_P@
- MSGFMT = @MSGFMT@
- MSGFMT_015 = @MSGFMT_015@
- MSGMERGE = @MSGMERGE@
-@@ -175,8 +195,11 @@
+@@ -175,6 +176,7 @@
  RANLIB = @RANLIB@
  SCONFIGDIR = @SCONFIGDIR@
  SECUREDIR = @SECUREDIR@
 +SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
-+STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
-+STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
  STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -190,13 +213,13 @@
- XSLTPROC = @XSLTPROC@
- YACC = @YACC@
- YFLAGS = @YFLAGS@
--abs_builddir = @abs_builddir@
--abs_srcdir = @abs_srcdir@
--abs_top_builddir = @abs_top_builddir@
--abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -208,7 +231,6 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
--builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -239,11 +261,8 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_builddir = @top_builddir@
--top_srcdir = @top_srcdir@
- CLEANFILES = *~
- EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_mail
- man_MANS = pam_mail.8
-@@ -291,7 +310,7 @@
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
--	test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
-+	test -z "$(securelibdir)" || $(mkdir_p) "$(DESTDIR)$(securelibdir)"
- 	@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
- 	  if test -f $$p; then \
- 	    f=$(am__strip_dir) \
-@@ -302,7 +321,7 @@
- 
- uninstall-securelibLTLIBRARIES:
- 	@$(NORMAL_UNINSTALL)
--	@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-+	@set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
- 	  p=$(am__strip_dir) \
- 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
- 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-@@ -317,7 +336,7 @@
- 	  rm -f "$${dir}/so_locations"; \
- 	done
- pam_mail.la: $(pam_mail_la_OBJECTS) $(pam_mail_la_DEPENDENCIES) 
--	$(LINK) -rpath $(securelibdir) $(pam_mail_la_OBJECTS) $(pam_mail_la_LIBADD) $(LIBS)
-+	$(LINK) -rpath $(securelibdir) $(pam_mail_la_LDFLAGS) $(pam_mail_la_OBJECTS) $(pam_mail_la_LIBADD) $(LIBS)
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
-@@ -328,22 +347,22 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_mail.Plo@am__quote@
- 
- .c.o:
--@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c $<
- 
- .c.obj:
--@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
- 
- .c.lo:
--@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-@@ -353,9 +372,13 @@
- 
- clean-libtool:
- 	-rm -rf .libs _libs
-+
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
- install-man8: $(man8_MANS) $(man_MANS)
- 	@$(NORMAL_INSTALL)
--	test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
-+	test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
- 	@list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
- 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
- 	for i in $$l2; do \
-@@ -448,9 +471,9 @@
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
- check-TESTS: $(TESTS)
--	@failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[	 ]'; \
-+	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
- 	srcdir=$(srcdir); export srcdir; \
--	list=' $(TESTS) '; \
-+	list='$(TESTS)'; \
- 	if test -n "$$list"; then \
- 	  for tst in $$list; do \
- 	    if test -f ./$$tst; then dir=./; \
-@@ -459,7 +482,7 @@
- 	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
- 	      all=`expr $$all + 1`; \
- 	      case " $(XFAIL_TESTS) " in \
--	      *$$ws$$tst$$ws*) \
-+	      *" $$tst "*) \
- 		xpass=`expr $$xpass + 1`; \
- 		failed=`expr $$failed + 1`; \
- 		echo "XPASS: $$tst"; \
-@@ -471,7 +494,7 @@
- 	    elif test $$? -ne 77; then \
- 	      all=`expr $$all + 1`; \
- 	      case " $(XFAIL_TESTS) " in \
--	      *$$ws$$tst$$ws*) \
-+	      *" $$tst "*) \
- 		xfail=`expr $$xfail + 1`; \
- 		echo "XFAIL: $$tst"; \
- 	      ;; \
-@@ -521,21 +544,22 @@
- 	else :; fi
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	list='$(DISTFILES)'; \
--	  dist_files=`for file in $$list; do echo $$file; done | \
--	  sed -e "s|^$$srcdirstrip/||;t" \
--	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
--	case $$dist_files in \
--	  */*) $(MKDIR_P) `echo "$$dist_files" | \
--			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
--			   sort -u` ;; \
--	esac; \
--	for file in $$dist_files; do \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
- 	  if test -d $$d/$$file; then \
--	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- 	    fi; \
-@@ -552,7 +576,7 @@
- all-am: Makefile $(LTLIBRARIES) $(MANS) $(DATA)
- installdirs:
- 	for dir in "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man8dir)"; do \
--	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
- 	done
- install: install-am
- install-exec: install-exec-am
-@@ -588,7 +612,7 @@
- 	-rm -rf ./$(DEPDIR)
- 	-rm -f Makefile
- distclean-am: clean-am distclean-compile distclean-generic \
--	distclean-tags
-+	distclean-libtool distclean-tags
- 
- dvi: dvi-am
- 
-@@ -602,20 +626,12 @@
- 
- install-data-am: install-man install-securelibLTLIBRARIES
- 
--install-dvi: install-dvi-am
--
- install-exec-am:
- 
--install-html: install-html-am
--
- install-info: install-info-am
- 
- install-man: install-man8
- 
--install-pdf: install-pdf-am
--
--install-ps: install-ps-am
--
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
-@@ -636,27 +652,24 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-man uninstall-securelibLTLIBRARIES
-+uninstall-am: uninstall-info-am uninstall-man \
-+	uninstall-securelibLTLIBRARIES
- 
- uninstall-man: uninstall-man8
- 
--.MAKE: install-am install-strip
--
- .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
- 	clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
- 	distclean distclean-compile distclean-generic \
- 	distclean-libtool distclean-tags distdir dvi dvi-am html \
- 	html-am info info-am install install-am install-data \
--	install-data-am install-dvi install-dvi-am install-exec \
--	install-exec-am install-html install-html-am install-info \
--	install-info-am install-man install-man8 install-pdf \
--	install-pdf-am install-ps install-ps-am \
-+	install-data-am install-exec install-exec-am install-info \
-+	install-info-am install-man install-man8 \
- 	install-securelibLTLIBRARIES install-strip installcheck \
- 	installcheck-am installdirs maintainer-clean \
- 	maintainer-clean-generic mostlyclean mostlyclean-compile \
- 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
--	tags uninstall uninstall-am uninstall-man uninstall-man8 \
--	uninstall-securelibLTLIBRARIES
-+	tags uninstall uninstall-am uninstall-info-am uninstall-man \
-+	uninstall-man8 uninstall-securelibLTLIBRARIES
- 
- @ENABLE_REGENERATE_MAN_TRUE@README: pam_mail.8.xml
- @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
 Index: pam/Linux-PAM/modules/pam_mkhomedir/Makefile.in
 ===================================================================
 --- pam.orig/Linux-PAM/modules/pam_mkhomedir/Makefile.in
 +++ pam/Linux-PAM/modules/pam_mkhomedir/Makefile.in
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -19,11 +19,15 @@
- #
- 
- 
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ../..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -67,18 +71,17 @@
- pam_mkhomedir_la_LIBADD =
- am_pam_mkhomedir_la_OBJECTS = pam_mkhomedir.lo
- pam_mkhomedir_la_OBJECTS = $(am_pam_mkhomedir_la_OBJECTS)
--DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
--	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+	$(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
--	$(LDFLAGS) -o $@
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(pam_mkhomedir_la_SOURCES)
- DIST_SOURCES = $(pam_mkhomedir_la_SOURCES)
- man8dir = $(mandir)/man8
-@@ -89,6 +92,8 @@
- CTAGS = ctags
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -113,6 +118,10 @@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
-+ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
-+ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
-+ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
-+ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -121,7 +130,18 @@
- GMSGFMT_015 = @GMSGFMT_015@
- GREP = @GREP@
- HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
--INSTALL = @INSTALL@
-+HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
-+HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
-+HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
-+HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
-+HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
-+HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
-+HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
-+HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
-+HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
-+HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
-+HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
-+HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -133,6 +153,7 @@
+@@ -133,6 +133,7 @@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
  LIBAUDIT = @LIBAUDIT@
@@ -16455,371 +4891,19 @@ Index: pam/Linux-PAM/modules/pam_mkhomedir/Makefile.in
  LIBCRACK = @LIBCRACK@
  LIBCRYPT = @LIBCRYPT@
  LIBDB = @LIBDB@
-@@ -156,7 +177,6 @@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
--MKDIR_P = @MKDIR_P@
- MSGFMT = @MSGFMT@
- MSGFMT_015 = @MSGFMT_015@
- MSGMERGE = @MSGMERGE@
-@@ -175,8 +195,11 @@
+@@ -175,6 +176,7 @@
  RANLIB = @RANLIB@
  SCONFIGDIR = @SCONFIGDIR@
  SECUREDIR = @SECUREDIR@
 +SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
-+STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
-+STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
  STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -190,13 +213,13 @@
- XSLTPROC = @XSLTPROC@
- YACC = @YACC@
- YFLAGS = @YFLAGS@
--abs_builddir = @abs_builddir@
--abs_srcdir = @abs_srcdir@
--abs_top_builddir = @abs_top_builddir@
--abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -208,7 +231,6 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
--builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -239,11 +261,8 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_builddir = @top_builddir@
--top_srcdir = @top_srcdir@
- CLEANFILES = *~
- EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_mkhomedir
- man_MANS = pam_mkhomedir.8
-@@ -292,7 +311,7 @@
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
--	test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
-+	test -z "$(securelibdir)" || $(mkdir_p) "$(DESTDIR)$(securelibdir)"
- 	@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
- 	  if test -f $$p; then \
- 	    f=$(am__strip_dir) \
-@@ -303,7 +322,7 @@
- 
- uninstall-securelibLTLIBRARIES:
- 	@$(NORMAL_UNINSTALL)
--	@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-+	@set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
- 	  p=$(am__strip_dir) \
- 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
- 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-@@ -318,7 +337,7 @@
- 	  rm -f "$${dir}/so_locations"; \
- 	done
- pam_mkhomedir.la: $(pam_mkhomedir_la_OBJECTS) $(pam_mkhomedir_la_DEPENDENCIES) 
--	$(LINK) -rpath $(securelibdir) $(pam_mkhomedir_la_OBJECTS) $(pam_mkhomedir_la_LIBADD) $(LIBS)
-+	$(LINK) -rpath $(securelibdir) $(pam_mkhomedir_la_LDFLAGS) $(pam_mkhomedir_la_OBJECTS) $(pam_mkhomedir_la_LIBADD) $(LIBS)
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
-@@ -329,22 +348,22 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_mkhomedir.Plo@am__quote@
- 
- .c.o:
--@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c $<
- 
- .c.obj:
--@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
- 
- .c.lo:
--@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-@@ -354,9 +373,13 @@
- 
- clean-libtool:
- 	-rm -rf .libs _libs
-+
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
- install-man8: $(man8_MANS) $(man_MANS)
- 	@$(NORMAL_INSTALL)
--	test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
-+	test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
- 	@list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
- 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
- 	for i in $$l2; do \
-@@ -449,9 +472,9 @@
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
- check-TESTS: $(TESTS)
--	@failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[	 ]'; \
-+	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
- 	srcdir=$(srcdir); export srcdir; \
--	list=' $(TESTS) '; \
-+	list='$(TESTS)'; \
- 	if test -n "$$list"; then \
- 	  for tst in $$list; do \
- 	    if test -f ./$$tst; then dir=./; \
-@@ -460,7 +483,7 @@
- 	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
- 	      all=`expr $$all + 1`; \
- 	      case " $(XFAIL_TESTS) " in \
--	      *$$ws$$tst$$ws*) \
-+	      *" $$tst "*) \
- 		xpass=`expr $$xpass + 1`; \
- 		failed=`expr $$failed + 1`; \
- 		echo "XPASS: $$tst"; \
-@@ -472,7 +495,7 @@
- 	    elif test $$? -ne 77; then \
- 	      all=`expr $$all + 1`; \
- 	      case " $(XFAIL_TESTS) " in \
--	      *$$ws$$tst$$ws*) \
-+	      *" $$tst "*) \
- 		xfail=`expr $$xfail + 1`; \
- 		echo "XFAIL: $$tst"; \
- 	      ;; \
-@@ -522,21 +545,22 @@
- 	else :; fi
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	list='$(DISTFILES)'; \
--	  dist_files=`for file in $$list; do echo $$file; done | \
--	  sed -e "s|^$$srcdirstrip/||;t" \
--	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
--	case $$dist_files in \
--	  */*) $(MKDIR_P) `echo "$$dist_files" | \
--			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
--			   sort -u` ;; \
--	esac; \
--	for file in $$dist_files; do \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
- 	  if test -d $$d/$$file; then \
--	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- 	    fi; \
-@@ -553,7 +577,7 @@
- all-am: Makefile $(LTLIBRARIES) $(MANS) $(DATA)
- installdirs:
- 	for dir in "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man8dir)"; do \
--	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
- 	done
- install: install-am
- install-exec: install-exec-am
-@@ -589,7 +613,7 @@
- 	-rm -rf ./$(DEPDIR)
- 	-rm -f Makefile
- distclean-am: clean-am distclean-compile distclean-generic \
--	distclean-tags
-+	distclean-libtool distclean-tags
- 
- dvi: dvi-am
- 
-@@ -603,20 +627,12 @@
- 
- install-data-am: install-man install-securelibLTLIBRARIES
- 
--install-dvi: install-dvi-am
--
- install-exec-am:
- 
--install-html: install-html-am
--
- install-info: install-info-am
- 
- install-man: install-man8
- 
--install-pdf: install-pdf-am
--
--install-ps: install-ps-am
--
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
-@@ -637,27 +653,24 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-man uninstall-securelibLTLIBRARIES
-+uninstall-am: uninstall-info-am uninstall-man \
-+	uninstall-securelibLTLIBRARIES
- 
- uninstall-man: uninstall-man8
- 
--.MAKE: install-am install-strip
--
- .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
- 	clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
- 	distclean distclean-compile distclean-generic \
- 	distclean-libtool distclean-tags distdir dvi dvi-am html \
- 	html-am info info-am install install-am install-data \
--	install-data-am install-dvi install-dvi-am install-exec \
--	install-exec-am install-html install-html-am install-info \
--	install-info-am install-man install-man8 install-pdf \
--	install-pdf-am install-ps install-ps-am \
-+	install-data-am install-exec install-exec-am install-info \
-+	install-info-am install-man install-man8 \
- 	install-securelibLTLIBRARIES install-strip installcheck \
- 	installcheck-am installdirs maintainer-clean \
- 	maintainer-clean-generic mostlyclean mostlyclean-compile \
- 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
--	tags uninstall uninstall-am uninstall-man uninstall-man8 \
--	uninstall-securelibLTLIBRARIES
-+	tags uninstall uninstall-am uninstall-info-am uninstall-man \
-+	uninstall-man8 uninstall-securelibLTLIBRARIES
- 
- @ENABLE_REGENERATE_MAN_TRUE@README: pam_mkhomedir.8.xml
- @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
 Index: pam/Linux-PAM/modules/pam_motd/Makefile.in
 ===================================================================
 --- pam.orig/Linux-PAM/modules/pam_motd/Makefile.in
 +++ pam/Linux-PAM/modules/pam_motd/Makefile.in
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -19,11 +19,15 @@
- #
- 
- 
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ../..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -67,18 +71,17 @@
- pam_motd_la_LIBADD =
- pam_motd_la_SOURCES = pam_motd.c
- pam_motd_la_OBJECTS = pam_motd.lo
--DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
--	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+	$(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
--	$(LDFLAGS) -o $@
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = pam_motd.c
- DIST_SOURCES = pam_motd.c
- man8dir = $(mandir)/man8
-@@ -89,6 +92,8 @@
- CTAGS = ctags
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -113,6 +118,10 @@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
-+ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
-+ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
-+ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
-+ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -121,7 +130,18 @@
- GMSGFMT_015 = @GMSGFMT_015@
- GREP = @GREP@
- HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
--INSTALL = @INSTALL@
-+HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
-+HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
-+HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
-+HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
-+HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
-+HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
-+HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
-+HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
-+HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
-+HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
-+HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
-+HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -133,6 +153,7 @@
+@@ -133,6 +133,7 @@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
  LIBAUDIT = @LIBAUDIT@
@@ -16827,371 +4911,19 @@ Index: pam/Linux-PAM/modules/pam_motd/Makefile.in
  LIBCRACK = @LIBCRACK@
  LIBCRYPT = @LIBCRYPT@
  LIBDB = @LIBDB@
-@@ -156,7 +177,6 @@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
--MKDIR_P = @MKDIR_P@
- MSGFMT = @MSGFMT@
- MSGFMT_015 = @MSGFMT_015@
- MSGMERGE = @MSGMERGE@
-@@ -175,8 +195,11 @@
+@@ -175,6 +176,7 @@
  RANLIB = @RANLIB@
  SCONFIGDIR = @SCONFIGDIR@
  SECUREDIR = @SECUREDIR@
 +SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
-+STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
-+STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
  STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -190,13 +213,13 @@
- XSLTPROC = @XSLTPROC@
- YACC = @YACC@
- YFLAGS = @YFLAGS@
--abs_builddir = @abs_builddir@
--abs_srcdir = @abs_srcdir@
--abs_top_builddir = @abs_top_builddir@
--abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -208,7 +231,6 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
--builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -239,11 +261,8 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_builddir = @top_builddir@
--top_srcdir = @top_srcdir@
- CLEANFILES = *~
- EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_motd
- man_MANS = pam_motd.8
-@@ -291,7 +310,7 @@
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
--	test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
-+	test -z "$(securelibdir)" || $(mkdir_p) "$(DESTDIR)$(securelibdir)"
- 	@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
- 	  if test -f $$p; then \
- 	    f=$(am__strip_dir) \
-@@ -302,7 +321,7 @@
- 
- uninstall-securelibLTLIBRARIES:
- 	@$(NORMAL_UNINSTALL)
--	@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-+	@set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
- 	  p=$(am__strip_dir) \
- 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
- 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-@@ -317,7 +336,7 @@
- 	  rm -f "$${dir}/so_locations"; \
- 	done
- pam_motd.la: $(pam_motd_la_OBJECTS) $(pam_motd_la_DEPENDENCIES) 
--	$(LINK) -rpath $(securelibdir) $(pam_motd_la_OBJECTS) $(pam_motd_la_LIBADD) $(LIBS)
-+	$(LINK) -rpath $(securelibdir) $(pam_motd_la_LDFLAGS) $(pam_motd_la_OBJECTS) $(pam_motd_la_LIBADD) $(LIBS)
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
-@@ -328,22 +347,22 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_motd.Plo@am__quote@
- 
- .c.o:
--@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c $<
- 
- .c.obj:
--@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
- 
- .c.lo:
--@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-@@ -353,9 +372,13 @@
- 
- clean-libtool:
- 	-rm -rf .libs _libs
-+
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
- install-man8: $(man8_MANS) $(man_MANS)
- 	@$(NORMAL_INSTALL)
--	test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
-+	test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
- 	@list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
- 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
- 	for i in $$l2; do \
-@@ -448,9 +471,9 @@
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
- check-TESTS: $(TESTS)
--	@failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[	 ]'; \
-+	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
- 	srcdir=$(srcdir); export srcdir; \
--	list=' $(TESTS) '; \
-+	list='$(TESTS)'; \
- 	if test -n "$$list"; then \
- 	  for tst in $$list; do \
- 	    if test -f ./$$tst; then dir=./; \
-@@ -459,7 +482,7 @@
- 	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
- 	      all=`expr $$all + 1`; \
- 	      case " $(XFAIL_TESTS) " in \
--	      *$$ws$$tst$$ws*) \
-+	      *" $$tst "*) \
- 		xpass=`expr $$xpass + 1`; \
- 		failed=`expr $$failed + 1`; \
- 		echo "XPASS: $$tst"; \
-@@ -471,7 +494,7 @@
- 	    elif test $$? -ne 77; then \
- 	      all=`expr $$all + 1`; \
- 	      case " $(XFAIL_TESTS) " in \
--	      *$$ws$$tst$$ws*) \
-+	      *" $$tst "*) \
- 		xfail=`expr $$xfail + 1`; \
- 		echo "XFAIL: $$tst"; \
- 	      ;; \
-@@ -521,21 +544,22 @@
- 	else :; fi
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	list='$(DISTFILES)'; \
--	  dist_files=`for file in $$list; do echo $$file; done | \
--	  sed -e "s|^$$srcdirstrip/||;t" \
--	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
--	case $$dist_files in \
--	  */*) $(MKDIR_P) `echo "$$dist_files" | \
--			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
--			   sort -u` ;; \
--	esac; \
--	for file in $$dist_files; do \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
- 	  if test -d $$d/$$file; then \
--	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- 	    fi; \
-@@ -552,7 +576,7 @@
- all-am: Makefile $(LTLIBRARIES) $(MANS) $(DATA)
- installdirs:
- 	for dir in "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man8dir)"; do \
--	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
- 	done
- install: install-am
- install-exec: install-exec-am
-@@ -588,7 +612,7 @@
- 	-rm -rf ./$(DEPDIR)
- 	-rm -f Makefile
- distclean-am: clean-am distclean-compile distclean-generic \
--	distclean-tags
-+	distclean-libtool distclean-tags
- 
- dvi: dvi-am
- 
-@@ -602,20 +626,12 @@
- 
- install-data-am: install-man install-securelibLTLIBRARIES
- 
--install-dvi: install-dvi-am
--
- install-exec-am:
- 
--install-html: install-html-am
--
- install-info: install-info-am
- 
- install-man: install-man8
- 
--install-pdf: install-pdf-am
--
--install-ps: install-ps-am
--
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
-@@ -636,27 +652,24 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-man uninstall-securelibLTLIBRARIES
-+uninstall-am: uninstall-info-am uninstall-man \
-+	uninstall-securelibLTLIBRARIES
- 
- uninstall-man: uninstall-man8
- 
--.MAKE: install-am install-strip
--
- .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
- 	clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
- 	distclean distclean-compile distclean-generic \
- 	distclean-libtool distclean-tags distdir dvi dvi-am html \
- 	html-am info info-am install install-am install-data \
--	install-data-am install-dvi install-dvi-am install-exec \
--	install-exec-am install-html install-html-am install-info \
--	install-info-am install-man install-man8 install-pdf \
--	install-pdf-am install-ps install-ps-am \
-+	install-data-am install-exec install-exec-am install-info \
-+	install-info-am install-man install-man8 \
- 	install-securelibLTLIBRARIES install-strip installcheck \
- 	installcheck-am installdirs maintainer-clean \
- 	maintainer-clean-generic mostlyclean mostlyclean-compile \
- 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
--	tags uninstall uninstall-am uninstall-man uninstall-man8 \
--	uninstall-securelibLTLIBRARIES
-+	tags uninstall uninstall-am uninstall-info-am uninstall-man \
-+	uninstall-man8 uninstall-securelibLTLIBRARIES
- 
- @ENABLE_REGENERATE_MAN_TRUE@README: pam_motd.8.xml
- @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
 Index: pam/Linux-PAM/modules/pam_namespace/Makefile.in
 ===================================================================
 --- pam.orig/Linux-PAM/modules/pam_namespace/Makefile.in
 +++ pam/Linux-PAM/modules/pam_namespace/Makefile.in
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -21,11 +21,15 @@
- 
- 
- 
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ../..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -78,18 +82,17 @@
- @HAVE_UNSHARE_TRUE@am_pam_namespace_la_rpath = -rpath $(securelibdir)
- secureconfSCRIPT_INSTALL = $(INSTALL_SCRIPT)
- SCRIPTS = $(secureconf_SCRIPTS)
--DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
--	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+	$(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
--	$(LDFLAGS) -o $@
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(pam_namespace_la_SOURCES)
- DIST_SOURCES = $(am__pam_namespace_la_SOURCES_DIST)
- man5dir = $(mandir)/man5
-@@ -103,6 +106,8 @@
- CTAGS = ctags
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -127,6 +132,10 @@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
-+ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
-+ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
-+ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
-+ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -135,7 +144,18 @@
- GMSGFMT_015 = @GMSGFMT_015@
- GREP = @GREP@
- HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
--INSTALL = @INSTALL@
-+HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
-+HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
-+HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
-+HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
-+HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
-+HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
-+HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
-+HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
-+HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
-+HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
-+HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
-+HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -147,6 +167,7 @@
+@@ -147,6 +147,7 @@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
  LIBAUDIT = @LIBAUDIT@
@@ -17199,393 +4931,19 @@ Index: pam/Linux-PAM/modules/pam_namespace/Makefile.in
  LIBCRACK = @LIBCRACK@
  LIBCRYPT = @LIBCRYPT@
  LIBDB = @LIBDB@
-@@ -170,7 +191,6 @@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
--MKDIR_P = @MKDIR_P@
- MSGFMT = @MSGFMT@
- MSGFMT_015 = @MSGFMT_015@
- MSGMERGE = @MSGMERGE@
-@@ -189,8 +209,11 @@
+@@ -189,6 +190,7 @@
  RANLIB = @RANLIB@
  SCONFIGDIR = @SCONFIGDIR@
  SECUREDIR = @SECUREDIR@
 +SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
-+STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
-+STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
  STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -204,13 +227,13 @@
- XSLTPROC = @XSLTPROC@
- YACC = @YACC@
- YFLAGS = @YFLAGS@
--abs_builddir = @abs_builddir@
--abs_srcdir = @abs_srcdir@
--abs_top_builddir = @abs_top_builddir@
--abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -222,7 +245,6 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
--builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -253,11 +275,8 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_builddir = @top_builddir@
--top_srcdir = @top_srcdir@
- CLEANFILES = *~
- MAN5 = namespace.conf.5
- MAN8 = pam_namespace.8
-@@ -313,7 +332,7 @@
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
--	test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
-+	test -z "$(securelibdir)" || $(mkdir_p) "$(DESTDIR)$(securelibdir)"
- 	@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
- 	  if test -f $$p; then \
- 	    f=$(am__strip_dir) \
-@@ -324,7 +343,7 @@
- 
- uninstall-securelibLTLIBRARIES:
- 	@$(NORMAL_UNINSTALL)
--	@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-+	@set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
- 	  p=$(am__strip_dir) \
- 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
- 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-@@ -339,10 +358,10 @@
- 	  rm -f "$${dir}/so_locations"; \
- 	done
- pam_namespace.la: $(pam_namespace_la_OBJECTS) $(pam_namespace_la_DEPENDENCIES) 
--	$(LINK) $(am_pam_namespace_la_rpath) $(pam_namespace_la_OBJECTS) $(pam_namespace_la_LIBADD) $(LIBS)
-+	$(LINK) $(am_pam_namespace_la_rpath) $(pam_namespace_la_LDFLAGS) $(pam_namespace_la_OBJECTS) $(pam_namespace_la_LIBADD) $(LIBS)
- install-secureconfSCRIPTS: $(secureconf_SCRIPTS)
- 	@$(NORMAL_INSTALL)
--	test -z "$(secureconfdir)" || $(MKDIR_P) "$(DESTDIR)$(secureconfdir)"
-+	test -z "$(secureconfdir)" || $(mkdir_p) "$(DESTDIR)$(secureconfdir)"
- 	@list='$(secureconf_SCRIPTS)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  if test -f $$d$$p; then \
-@@ -370,22 +389,22 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_namespace.Plo@am__quote@
- 
- .c.o:
--@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c $<
- 
- .c.obj:
--@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
- 
- .c.lo:
--@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-@@ -395,9 +414,13 @@
- 
- clean-libtool:
- 	-rm -rf .libs _libs
-+
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
- install-man5: $(man5_MANS) $(man_MANS)
- 	@$(NORMAL_INSTALL)
--	test -z "$(man5dir)" || $(MKDIR_P) "$(DESTDIR)$(man5dir)"
-+	test -z "$(man5dir)" || $(mkdir_p) "$(DESTDIR)$(man5dir)"
- 	@list='$(man5_MANS) $(dist_man5_MANS) $(nodist_man5_MANS)'; \
- 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
- 	for i in $$l2; do \
-@@ -442,7 +465,7 @@
- 	done
- install-man8: $(man8_MANS) $(man_MANS)
- 	@$(NORMAL_INSTALL)
--	test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
-+	test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
- 	@list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
- 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
- 	for i in $$l2; do \
-@@ -487,7 +510,7 @@
- 	done
- install-secureconfDATA: $(secureconf_DATA)
- 	@$(NORMAL_INSTALL)
--	test -z "$(secureconfdir)" || $(MKDIR_P) "$(DESTDIR)$(secureconfdir)"
-+	test -z "$(secureconfdir)" || $(mkdir_p) "$(DESTDIR)$(secureconfdir)"
- 	@list='$(secureconf_DATA)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  f=$(am__strip_dir) \
-@@ -552,9 +575,9 @@
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
- check-TESTS: $(TESTS)
--	@failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[	 ]'; \
-+	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
- 	srcdir=$(srcdir); export srcdir; \
--	list=' $(TESTS) '; \
-+	list='$(TESTS)'; \
- 	if test -n "$$list"; then \
- 	  for tst in $$list; do \
- 	    if test -f ./$$tst; then dir=./; \
-@@ -563,7 +586,7 @@
- 	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
- 	      all=`expr $$all + 1`; \
- 	      case " $(XFAIL_TESTS) " in \
--	      *$$ws$$tst$$ws*) \
-+	      *" $$tst "*) \
- 		xpass=`expr $$xpass + 1`; \
- 		failed=`expr $$failed + 1`; \
- 		echo "XPASS: $$tst"; \
-@@ -575,7 +598,7 @@
- 	    elif test $$? -ne 77; then \
- 	      all=`expr $$all + 1`; \
- 	      case " $(XFAIL_TESTS) " in \
--	      *$$ws$$tst$$ws*) \
-+	      *" $$tst "*) \
- 		xfail=`expr $$xfail + 1`; \
- 		echo "XFAIL: $$tst"; \
- 	      ;; \
-@@ -625,21 +648,22 @@
- 	else :; fi
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	list='$(DISTFILES)'; \
--	  dist_files=`for file in $$list; do echo $$file; done | \
--	  sed -e "s|^$$srcdirstrip/||;t" \
--	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
--	case $$dist_files in \
--	  */*) $(MKDIR_P) `echo "$$dist_files" | \
--			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
--			   sort -u` ;; \
--	esac; \
--	for file in $$dist_files; do \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
- 	  if test -d $$d/$$file; then \
--	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- 	    fi; \
-@@ -656,7 +680,7 @@
- all-am: Makefile $(LTLIBRARIES) $(SCRIPTS) $(MANS) $(DATA) $(HEADERS)
- installdirs:
- 	for dir in "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(secureconfdir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(secureconfdir)"; do \
--	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
- 	done
- install: install-am
- install-exec: install-exec-am
-@@ -692,7 +716,7 @@
- 	-rm -rf ./$(DEPDIR)
- 	-rm -f Makefile
- distclean-am: clean-am distclean-compile distclean-generic \
--	distclean-tags
-+	distclean-libtool distclean-tags
- 
- dvi: dvi-am
- 
-@@ -707,20 +731,12 @@
- install-data-am: install-man install-secureconfDATA \
- 	install-secureconfSCRIPTS install-securelibLTLIBRARIES
- 
--install-dvi: install-dvi-am
--
- install-exec-am:
- 
--install-html: install-html-am
--
- install-info: install-info-am
- 
- install-man: install-man5 install-man8
- 
--install-pdf: install-pdf-am
--
--install-ps: install-ps-am
--
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
-@@ -741,29 +757,25 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-man uninstall-secureconfDATA \
-+uninstall-am: uninstall-info-am uninstall-man uninstall-secureconfDATA \
- 	uninstall-secureconfSCRIPTS uninstall-securelibLTLIBRARIES
- 
- uninstall-man: uninstall-man5 uninstall-man8
- 
--.MAKE: install-am install-strip
--
- .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
- 	clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
- 	distclean distclean-compile distclean-generic \
- 	distclean-libtool distclean-tags distdir dvi dvi-am html \
- 	html-am info info-am install install-am install-data \
--	install-data-am install-dvi install-dvi-am install-exec \
--	install-exec-am install-html install-html-am install-info \
-+	install-data-am install-exec install-exec-am install-info \
- 	install-info-am install-man install-man5 install-man8 \
--	install-pdf install-pdf-am install-ps install-ps-am \
- 	install-secureconfDATA install-secureconfSCRIPTS \
- 	install-securelibLTLIBRARIES install-strip installcheck \
- 	installcheck-am installdirs maintainer-clean \
- 	maintainer-clean-generic mostlyclean mostlyclean-compile \
- 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
--	tags uninstall uninstall-am uninstall-man uninstall-man5 \
--	uninstall-man8 uninstall-secureconfDATA \
-+	tags uninstall uninstall-am uninstall-info-am uninstall-man \
-+	uninstall-man5 uninstall-man8 uninstall-secureconfDATA \
- 	uninstall-secureconfSCRIPTS uninstall-securelibLTLIBRARIES
- 
- @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
 Index: pam/Linux-PAM/modules/pam_nologin/Makefile.in
 ===================================================================
 --- pam.orig/Linux-PAM/modules/pam_nologin/Makefile.in
 +++ pam/Linux-PAM/modules/pam_nologin/Makefile.in
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -19,11 +19,15 @@
- #
- 
- 
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ../..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -67,18 +71,17 @@
- pam_nologin_la_LIBADD =
- pam_nologin_la_SOURCES = pam_nologin.c
- pam_nologin_la_OBJECTS = pam_nologin.lo
--DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
--	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+	$(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
--	$(LDFLAGS) -o $@
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = pam_nologin.c
- DIST_SOURCES = pam_nologin.c
- man8dir = $(mandir)/man8
-@@ -89,6 +92,8 @@
- CTAGS = ctags
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -113,6 +118,10 @@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
-+ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
-+ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
-+ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
-+ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -121,7 +130,18 @@
- GMSGFMT_015 = @GMSGFMT_015@
- GREP = @GREP@
- HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
--INSTALL = @INSTALL@
-+HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
-+HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
-+HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
-+HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
-+HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
-+HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
-+HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
-+HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
-+HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
-+HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
-+HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
-+HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -133,6 +153,7 @@
+@@ -133,6 +133,7 @@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
  LIBAUDIT = @LIBAUDIT@
@@ -17593,371 +4951,19 @@ Index: pam/Linux-PAM/modules/pam_nologin/Makefile.in
  LIBCRACK = @LIBCRACK@
  LIBCRYPT = @LIBCRYPT@
  LIBDB = @LIBDB@
-@@ -156,7 +177,6 @@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
--MKDIR_P = @MKDIR_P@
- MSGFMT = @MSGFMT@
- MSGFMT_015 = @MSGFMT_015@
- MSGMERGE = @MSGMERGE@
-@@ -175,8 +195,11 @@
+@@ -175,6 +176,7 @@
  RANLIB = @RANLIB@
  SCONFIGDIR = @SCONFIGDIR@
  SECUREDIR = @SECUREDIR@
 +SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
-+STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
-+STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
  STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -190,13 +213,13 @@
- XSLTPROC = @XSLTPROC@
- YACC = @YACC@
- YFLAGS = @YFLAGS@
--abs_builddir = @abs_builddir@
--abs_srcdir = @abs_srcdir@
--abs_top_builddir = @abs_top_builddir@
--abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -208,7 +231,6 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
--builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -239,11 +261,8 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_builddir = @top_builddir@
--top_srcdir = @top_srcdir@
- CLEANFILES = *~
- EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_nologin
- TESTS = tst-pam_nologin
-@@ -291,7 +310,7 @@
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
--	test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
-+	test -z "$(securelibdir)" || $(mkdir_p) "$(DESTDIR)$(securelibdir)"
- 	@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
- 	  if test -f $$p; then \
- 	    f=$(am__strip_dir) \
-@@ -302,7 +321,7 @@
- 
- uninstall-securelibLTLIBRARIES:
- 	@$(NORMAL_UNINSTALL)
--	@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-+	@set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
- 	  p=$(am__strip_dir) \
- 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
- 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-@@ -317,7 +336,7 @@
- 	  rm -f "$${dir}/so_locations"; \
- 	done
- pam_nologin.la: $(pam_nologin_la_OBJECTS) $(pam_nologin_la_DEPENDENCIES) 
--	$(LINK) -rpath $(securelibdir) $(pam_nologin_la_OBJECTS) $(pam_nologin_la_LIBADD) $(LIBS)
-+	$(LINK) -rpath $(securelibdir) $(pam_nologin_la_LDFLAGS) $(pam_nologin_la_OBJECTS) $(pam_nologin_la_LIBADD) $(LIBS)
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
-@@ -328,22 +347,22 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_nologin.Plo@am__quote@
- 
- .c.o:
--@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c $<
- 
- .c.obj:
--@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
- 
- .c.lo:
--@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-@@ -353,9 +372,13 @@
- 
- clean-libtool:
- 	-rm -rf .libs _libs
-+
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
- install-man8: $(man8_MANS) $(man_MANS)
- 	@$(NORMAL_INSTALL)
--	test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
-+	test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
- 	@list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
- 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
- 	for i in $$l2; do \
-@@ -448,9 +471,9 @@
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
- check-TESTS: $(TESTS)
--	@failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[	 ]'; \
-+	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
- 	srcdir=$(srcdir); export srcdir; \
--	list=' $(TESTS) '; \
-+	list='$(TESTS)'; \
- 	if test -n "$$list"; then \
- 	  for tst in $$list; do \
- 	    if test -f ./$$tst; then dir=./; \
-@@ -459,7 +482,7 @@
- 	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
- 	      all=`expr $$all + 1`; \
- 	      case " $(XFAIL_TESTS) " in \
--	      *$$ws$$tst$$ws*) \
-+	      *" $$tst "*) \
- 		xpass=`expr $$xpass + 1`; \
- 		failed=`expr $$failed + 1`; \
- 		echo "XPASS: $$tst"; \
-@@ -471,7 +494,7 @@
- 	    elif test $$? -ne 77; then \
- 	      all=`expr $$all + 1`; \
- 	      case " $(XFAIL_TESTS) " in \
--	      *$$ws$$tst$$ws*) \
-+	      *" $$tst "*) \
- 		xfail=`expr $$xfail + 1`; \
- 		echo "XFAIL: $$tst"; \
- 	      ;; \
-@@ -521,21 +544,22 @@
- 	else :; fi
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	list='$(DISTFILES)'; \
--	  dist_files=`for file in $$list; do echo $$file; done | \
--	  sed -e "s|^$$srcdirstrip/||;t" \
--	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
--	case $$dist_files in \
--	  */*) $(MKDIR_P) `echo "$$dist_files" | \
--			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
--			   sort -u` ;; \
--	esac; \
--	for file in $$dist_files; do \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
- 	  if test -d $$d/$$file; then \
--	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- 	    fi; \
-@@ -552,7 +576,7 @@
- all-am: Makefile $(LTLIBRARIES) $(MANS) $(DATA)
- installdirs:
- 	for dir in "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man8dir)"; do \
--	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
- 	done
- install: install-am
- install-exec: install-exec-am
-@@ -588,7 +612,7 @@
- 	-rm -rf ./$(DEPDIR)
- 	-rm -f Makefile
- distclean-am: clean-am distclean-compile distclean-generic \
--	distclean-tags
-+	distclean-libtool distclean-tags
- 
- dvi: dvi-am
- 
-@@ -602,20 +626,12 @@
- 
- install-data-am: install-man install-securelibLTLIBRARIES
- 
--install-dvi: install-dvi-am
--
- install-exec-am:
- 
--install-html: install-html-am
--
- install-info: install-info-am
- 
- install-man: install-man8
- 
--install-pdf: install-pdf-am
--
--install-ps: install-ps-am
--
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
-@@ -636,27 +652,24 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-man uninstall-securelibLTLIBRARIES
-+uninstall-am: uninstall-info-am uninstall-man \
-+	uninstall-securelibLTLIBRARIES
- 
- uninstall-man: uninstall-man8
- 
--.MAKE: install-am install-strip
--
- .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
- 	clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
- 	distclean distclean-compile distclean-generic \
- 	distclean-libtool distclean-tags distdir dvi dvi-am html \
- 	html-am info info-am install install-am install-data \
--	install-data-am install-dvi install-dvi-am install-exec \
--	install-exec-am install-html install-html-am install-info \
--	install-info-am install-man install-man8 install-pdf \
--	install-pdf-am install-ps install-ps-am \
-+	install-data-am install-exec install-exec-am install-info \
-+	install-info-am install-man install-man8 \
- 	install-securelibLTLIBRARIES install-strip installcheck \
- 	installcheck-am installdirs maintainer-clean \
- 	maintainer-clean-generic mostlyclean mostlyclean-compile \
- 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
--	tags uninstall uninstall-am uninstall-man uninstall-man8 \
--	uninstall-securelibLTLIBRARIES
-+	tags uninstall uninstall-am uninstall-info-am uninstall-man \
-+	uninstall-man8 uninstall-securelibLTLIBRARIES
- 
- @ENABLE_REGENERATE_MAN_TRUE@README: pam_nologin.8.xml
- @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
 Index: pam/Linux-PAM/modules/pam_permit/Makefile.in
 ===================================================================
 --- pam.orig/Linux-PAM/modules/pam_permit/Makefile.in
 +++ pam/Linux-PAM/modules/pam_permit/Makefile.in
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -19,11 +19,15 @@
- #
- 
- 
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ../..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -67,18 +71,17 @@
- pam_permit_la_LIBADD =
- pam_permit_la_SOURCES = pam_permit.c
- pam_permit_la_OBJECTS = pam_permit.lo
--DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
--	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+	$(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
--	$(LDFLAGS) -o $@
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = pam_permit.c
- DIST_SOURCES = pam_permit.c
- man8dir = $(mandir)/man8
-@@ -89,6 +92,8 @@
- CTAGS = ctags
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -113,6 +118,10 @@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
-+ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
-+ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
-+ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
-+ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -121,7 +130,18 @@
- GMSGFMT_015 = @GMSGFMT_015@
- GREP = @GREP@
- HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
--INSTALL = @INSTALL@
-+HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
-+HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
-+HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
-+HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
-+HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
-+HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
-+HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
-+HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
-+HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
-+HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
-+HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
-+HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -133,6 +153,7 @@
+@@ -133,6 +133,7 @@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
  LIBAUDIT = @LIBAUDIT@
@@ -17965,371 +4971,19 @@ Index: pam/Linux-PAM/modules/pam_permit/Makefile.in
  LIBCRACK = @LIBCRACK@
  LIBCRYPT = @LIBCRYPT@
  LIBDB = @LIBDB@
-@@ -156,7 +177,6 @@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
--MKDIR_P = @MKDIR_P@
- MSGFMT = @MSGFMT@
- MSGFMT_015 = @MSGFMT_015@
- MSGMERGE = @MSGMERGE@
-@@ -175,8 +195,11 @@
+@@ -175,6 +176,7 @@
  RANLIB = @RANLIB@
  SCONFIGDIR = @SCONFIGDIR@
  SECUREDIR = @SECUREDIR@
 +SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
-+STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
-+STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
  STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -190,13 +213,13 @@
- XSLTPROC = @XSLTPROC@
- YACC = @YACC@
- YFLAGS = @YFLAGS@
--abs_builddir = @abs_builddir@
--abs_srcdir = @abs_srcdir@
--abs_top_builddir = @abs_top_builddir@
--abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -208,7 +231,6 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
--builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -239,11 +261,8 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_builddir = @top_builddir@
--top_srcdir = @top_srcdir@
- CLEANFILES = *~
- EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_permit
- man_MANS = pam_permit.8
-@@ -291,7 +310,7 @@
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
--	test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
-+	test -z "$(securelibdir)" || $(mkdir_p) "$(DESTDIR)$(securelibdir)"
- 	@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
- 	  if test -f $$p; then \
- 	    f=$(am__strip_dir) \
-@@ -302,7 +321,7 @@
- 
- uninstall-securelibLTLIBRARIES:
- 	@$(NORMAL_UNINSTALL)
--	@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-+	@set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
- 	  p=$(am__strip_dir) \
- 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
- 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-@@ -317,7 +336,7 @@
- 	  rm -f "$${dir}/so_locations"; \
- 	done
- pam_permit.la: $(pam_permit_la_OBJECTS) $(pam_permit_la_DEPENDENCIES) 
--	$(LINK) -rpath $(securelibdir) $(pam_permit_la_OBJECTS) $(pam_permit_la_LIBADD) $(LIBS)
-+	$(LINK) -rpath $(securelibdir) $(pam_permit_la_LDFLAGS) $(pam_permit_la_OBJECTS) $(pam_permit_la_LIBADD) $(LIBS)
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
-@@ -328,22 +347,22 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_permit.Plo@am__quote@
- 
- .c.o:
--@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c $<
- 
- .c.obj:
--@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
- 
- .c.lo:
--@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-@@ -353,9 +372,13 @@
- 
- clean-libtool:
- 	-rm -rf .libs _libs
-+
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
- install-man8: $(man8_MANS) $(man_MANS)
- 	@$(NORMAL_INSTALL)
--	test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
-+	test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
- 	@list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
- 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
- 	for i in $$l2; do \
-@@ -448,9 +471,9 @@
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
- check-TESTS: $(TESTS)
--	@failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[	 ]'; \
-+	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
- 	srcdir=$(srcdir); export srcdir; \
--	list=' $(TESTS) '; \
-+	list='$(TESTS)'; \
- 	if test -n "$$list"; then \
- 	  for tst in $$list; do \
- 	    if test -f ./$$tst; then dir=./; \
-@@ -459,7 +482,7 @@
- 	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
- 	      all=`expr $$all + 1`; \
- 	      case " $(XFAIL_TESTS) " in \
--	      *$$ws$$tst$$ws*) \
-+	      *" $$tst "*) \
- 		xpass=`expr $$xpass + 1`; \
- 		failed=`expr $$failed + 1`; \
- 		echo "XPASS: $$tst"; \
-@@ -471,7 +494,7 @@
- 	    elif test $$? -ne 77; then \
- 	      all=`expr $$all + 1`; \
- 	      case " $(XFAIL_TESTS) " in \
--	      *$$ws$$tst$$ws*) \
-+	      *" $$tst "*) \
- 		xfail=`expr $$xfail + 1`; \
- 		echo "XFAIL: $$tst"; \
- 	      ;; \
-@@ -521,21 +544,22 @@
- 	else :; fi
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	list='$(DISTFILES)'; \
--	  dist_files=`for file in $$list; do echo $$file; done | \
--	  sed -e "s|^$$srcdirstrip/||;t" \
--	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
--	case $$dist_files in \
--	  */*) $(MKDIR_P) `echo "$$dist_files" | \
--			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
--			   sort -u` ;; \
--	esac; \
--	for file in $$dist_files; do \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
- 	  if test -d $$d/$$file; then \
--	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- 	    fi; \
-@@ -552,7 +576,7 @@
- all-am: Makefile $(LTLIBRARIES) $(MANS) $(DATA)
- installdirs:
- 	for dir in "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man8dir)"; do \
--	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
- 	done
- install: install-am
- install-exec: install-exec-am
-@@ -588,7 +612,7 @@
- 	-rm -rf ./$(DEPDIR)
- 	-rm -f Makefile
- distclean-am: clean-am distclean-compile distclean-generic \
--	distclean-tags
-+	distclean-libtool distclean-tags
- 
- dvi: dvi-am
- 
-@@ -602,20 +626,12 @@
- 
- install-data-am: install-man install-securelibLTLIBRARIES
- 
--install-dvi: install-dvi-am
--
- install-exec-am:
- 
--install-html: install-html-am
--
- install-info: install-info-am
- 
- install-man: install-man8
- 
--install-pdf: install-pdf-am
--
--install-ps: install-ps-am
--
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
-@@ -636,27 +652,24 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-man uninstall-securelibLTLIBRARIES
-+uninstall-am: uninstall-info-am uninstall-man \
-+	uninstall-securelibLTLIBRARIES
- 
- uninstall-man: uninstall-man8
- 
--.MAKE: install-am install-strip
--
- .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
- 	clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
- 	distclean distclean-compile distclean-generic \
- 	distclean-libtool distclean-tags distdir dvi dvi-am html \
- 	html-am info info-am install install-am install-data \
--	install-data-am install-dvi install-dvi-am install-exec \
--	install-exec-am install-html install-html-am install-info \
--	install-info-am install-man install-man8 install-pdf \
--	install-pdf-am install-ps install-ps-am \
-+	install-data-am install-exec install-exec-am install-info \
-+	install-info-am install-man install-man8 \
- 	install-securelibLTLIBRARIES install-strip installcheck \
- 	installcheck-am installdirs maintainer-clean \
- 	maintainer-clean-generic mostlyclean mostlyclean-compile \
- 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
--	tags uninstall uninstall-am uninstall-man uninstall-man8 \
--	uninstall-securelibLTLIBRARIES
-+	tags uninstall uninstall-am uninstall-info-am uninstall-man \
-+	uninstall-man8 uninstall-securelibLTLIBRARIES
- 
- @ENABLE_REGENERATE_MAN_TRUE@README: pam_permit.8.xml
- @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
 Index: pam/Linux-PAM/modules/pam_rhosts/Makefile.in
 ===================================================================
 --- pam.orig/Linux-PAM/modules/pam_rhosts/Makefile.in
 +++ pam/Linux-PAM/modules/pam_rhosts/Makefile.in
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -19,11 +19,15 @@
- #
- 
- 
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ../..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -70,18 +74,17 @@
- pam_rhosts_auth_la_LIBADD =
- pam_rhosts_auth_la_SOURCES = pam_rhosts_auth.c
- pam_rhosts_auth_la_OBJECTS = pam_rhosts_auth.lo
--DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
--	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+	$(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
--	$(LDFLAGS) -o $@
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = pam_rhosts.c pam_rhosts_auth.c
- DIST_SOURCES = pam_rhosts.c pam_rhosts_auth.c
- man8dir = $(mandir)/man8
-@@ -92,6 +95,8 @@
- CTAGS = ctags
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -116,6 +121,10 @@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
-+ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
-+ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
-+ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
-+ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -124,7 +133,18 @@
- GMSGFMT_015 = @GMSGFMT_015@
- GREP = @GREP@
- HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
--INSTALL = @INSTALL@
-+HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
-+HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
-+HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
-+HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
-+HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
-+HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
-+HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
-+HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
-+HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
-+HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
-+HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
-+HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -136,6 +156,7 @@
+@@ -136,6 +136,7 @@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
  LIBAUDIT = @LIBAUDIT@
@@ -18337,374 +4991,19 @@ Index: pam/Linux-PAM/modules/pam_rhosts/Makefile.in
  LIBCRACK = @LIBCRACK@
  LIBCRYPT = @LIBCRYPT@
  LIBDB = @LIBDB@
-@@ -159,7 +180,6 @@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
--MKDIR_P = @MKDIR_P@
- MSGFMT = @MSGFMT@
- MSGFMT_015 = @MSGFMT_015@
- MSGMERGE = @MSGMERGE@
-@@ -178,8 +198,11 @@
+@@ -178,6 +179,7 @@
  RANLIB = @RANLIB@
  SCONFIGDIR = @SCONFIGDIR@
  SECUREDIR = @SECUREDIR@
 +SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
-+STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
-+STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
  STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -193,13 +216,13 @@
- XSLTPROC = @XSLTPROC@
- YACC = @YACC@
- YFLAGS = @YFLAGS@
--abs_builddir = @abs_builddir@
--abs_srcdir = @abs_srcdir@
--abs_top_builddir = @abs_top_builddir@
--abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -211,7 +234,6 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
--builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -242,11 +264,8 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_builddir = @top_builddir@
--top_srcdir = @top_srcdir@
- CLEANFILES = *~
- EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_rhosts_auth tst-pam_rhosts
- TESTS = tst-pam_rhosts_auth tst-pam_rhosts
-@@ -294,7 +313,7 @@
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
--	test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
-+	test -z "$(securelibdir)" || $(mkdir_p) "$(DESTDIR)$(securelibdir)"
- 	@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
- 	  if test -f $$p; then \
- 	    f=$(am__strip_dir) \
-@@ -305,7 +324,7 @@
- 
- uninstall-securelibLTLIBRARIES:
- 	@$(NORMAL_UNINSTALL)
--	@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-+	@set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
- 	  p=$(am__strip_dir) \
- 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
- 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-@@ -320,9 +339,9 @@
- 	  rm -f "$${dir}/so_locations"; \
- 	done
- pam_rhosts.la: $(pam_rhosts_la_OBJECTS) $(pam_rhosts_la_DEPENDENCIES) 
--	$(LINK) -rpath $(securelibdir) $(pam_rhosts_la_OBJECTS) $(pam_rhosts_la_LIBADD) $(LIBS)
-+	$(LINK) -rpath $(securelibdir) $(pam_rhosts_la_LDFLAGS) $(pam_rhosts_la_OBJECTS) $(pam_rhosts_la_LIBADD) $(LIBS)
- pam_rhosts_auth.la: $(pam_rhosts_auth_la_OBJECTS) $(pam_rhosts_auth_la_DEPENDENCIES) 
--	$(LINK) -rpath $(securelibdir) $(pam_rhosts_auth_la_OBJECTS) $(pam_rhosts_auth_la_LIBADD) $(LIBS)
-+	$(LINK) -rpath $(securelibdir) $(pam_rhosts_auth_la_LDFLAGS) $(pam_rhosts_auth_la_OBJECTS) $(pam_rhosts_auth_la_LIBADD) $(LIBS)
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
-@@ -334,22 +353,22 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_rhosts_auth.Plo@am__quote@
- 
- .c.o:
--@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c $<
- 
- .c.obj:
--@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
- 
- .c.lo:
--@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-@@ -359,9 +378,13 @@
- 
- clean-libtool:
- 	-rm -rf .libs _libs
-+
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
- install-man8: $(man8_MANS) $(man_MANS)
- 	@$(NORMAL_INSTALL)
--	test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
-+	test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
- 	@list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
- 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
- 	for i in $$l2; do \
-@@ -454,9 +477,9 @@
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
- check-TESTS: $(TESTS)
--	@failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[	 ]'; \
-+	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
- 	srcdir=$(srcdir); export srcdir; \
--	list=' $(TESTS) '; \
-+	list='$(TESTS)'; \
- 	if test -n "$$list"; then \
- 	  for tst in $$list; do \
- 	    if test -f ./$$tst; then dir=./; \
-@@ -465,7 +488,7 @@
- 	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
- 	      all=`expr $$all + 1`; \
- 	      case " $(XFAIL_TESTS) " in \
--	      *$$ws$$tst$$ws*) \
-+	      *" $$tst "*) \
- 		xpass=`expr $$xpass + 1`; \
- 		failed=`expr $$failed + 1`; \
- 		echo "XPASS: $$tst"; \
-@@ -477,7 +500,7 @@
- 	    elif test $$? -ne 77; then \
- 	      all=`expr $$all + 1`; \
- 	      case " $(XFAIL_TESTS) " in \
--	      *$$ws$$tst$$ws*) \
-+	      *" $$tst "*) \
- 		xfail=`expr $$xfail + 1`; \
- 		echo "XFAIL: $$tst"; \
- 	      ;; \
-@@ -527,21 +550,22 @@
- 	else :; fi
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	list='$(DISTFILES)'; \
--	  dist_files=`for file in $$list; do echo $$file; done | \
--	  sed -e "s|^$$srcdirstrip/||;t" \
--	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
--	case $$dist_files in \
--	  */*) $(MKDIR_P) `echo "$$dist_files" | \
--			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
--			   sort -u` ;; \
--	esac; \
--	for file in $$dist_files; do \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
- 	  if test -d $$d/$$file; then \
--	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- 	    fi; \
-@@ -558,7 +582,7 @@
- all-am: Makefile $(LTLIBRARIES) $(MANS) $(DATA)
- installdirs:
- 	for dir in "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man8dir)"; do \
--	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
- 	done
- install: install-am
- install-exec: install-exec-am
-@@ -594,7 +618,7 @@
- 	-rm -rf ./$(DEPDIR)
- 	-rm -f Makefile
- distclean-am: clean-am distclean-compile distclean-generic \
--	distclean-tags
-+	distclean-libtool distclean-tags
- 
- dvi: dvi-am
- 
-@@ -608,20 +632,12 @@
- 
- install-data-am: install-man install-securelibLTLIBRARIES
- 
--install-dvi: install-dvi-am
--
- install-exec-am:
- 
--install-html: install-html-am
--
- install-info: install-info-am
- 
- install-man: install-man8
- 
--install-pdf: install-pdf-am
--
--install-ps: install-ps-am
--
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
-@@ -642,27 +658,24 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-man uninstall-securelibLTLIBRARIES
-+uninstall-am: uninstall-info-am uninstall-man \
-+	uninstall-securelibLTLIBRARIES
- 
- uninstall-man: uninstall-man8
- 
--.MAKE: install-am install-strip
--
- .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
- 	clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
- 	distclean distclean-compile distclean-generic \
- 	distclean-libtool distclean-tags distdir dvi dvi-am html \
- 	html-am info info-am install install-am install-data \
--	install-data-am install-dvi install-dvi-am install-exec \
--	install-exec-am install-html install-html-am install-info \
--	install-info-am install-man install-man8 install-pdf \
--	install-pdf-am install-ps install-ps-am \
-+	install-data-am install-exec install-exec-am install-info \
-+	install-info-am install-man install-man8 \
- 	install-securelibLTLIBRARIES install-strip installcheck \
- 	installcheck-am installdirs maintainer-clean \
- 	maintainer-clean-generic mostlyclean mostlyclean-compile \
- 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
--	tags uninstall uninstall-am uninstall-man uninstall-man8 \
--	uninstall-securelibLTLIBRARIES
-+	tags uninstall uninstall-am uninstall-info-am uninstall-man \
-+	uninstall-man8 uninstall-securelibLTLIBRARIES
- 
- @ENABLE_REGENERATE_MAN_TRUE@README: pam_rhosts.8.xml
- @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
 Index: pam/Linux-PAM/modules/pam_rootok/Makefile.in
 ===================================================================
 --- pam.orig/Linux-PAM/modules/pam_rootok/Makefile.in
 +++ pam/Linux-PAM/modules/pam_rootok/Makefile.in
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -19,11 +19,15 @@
- #
- 
- 
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ../..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -68,18 +72,17 @@
- pam_rootok_la_LIBADD =
- pam_rootok_la_SOURCES = pam_rootok.c
- pam_rootok_la_OBJECTS = pam_rootok.lo
--DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
--	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+	$(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
--	$(LDFLAGS) -o $@
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = pam_rootok.c
- DIST_SOURCES = pam_rootok.c
- man8dir = $(mandir)/man8
-@@ -90,6 +93,8 @@
- CTAGS = ctags
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -114,6 +119,10 @@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
-+ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
-+ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
-+ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
-+ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -122,7 +131,18 @@
- GMSGFMT_015 = @GMSGFMT_015@
- GREP = @GREP@
- HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
--INSTALL = @INSTALL@
-+HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
-+HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
-+HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
-+HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
-+HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
-+HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
-+HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
-+HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
-+HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
-+HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
-+HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
-+HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -134,6 +154,7 @@
+@@ -134,6 +134,7 @@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
  LIBAUDIT = @LIBAUDIT@
@@ -18712,371 +5011,41 @@ Index: pam/Linux-PAM/modules/pam_rootok/Makefile.in
  LIBCRACK = @LIBCRACK@
  LIBCRYPT = @LIBCRYPT@
  LIBDB = @LIBDB@
-@@ -157,7 +178,6 @@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
--MKDIR_P = @MKDIR_P@
- MSGFMT = @MSGFMT@
- MSGFMT_015 = @MSGFMT_015@
- MSGMERGE = @MSGMERGE@
-@@ -176,8 +196,11 @@
+@@ -176,6 +177,7 @@
  RANLIB = @RANLIB@
  SCONFIGDIR = @SCONFIGDIR@
  SECUREDIR = @SECUREDIR@
 +SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
-+STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
-+STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
  STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -191,13 +214,13 @@
- XSLTPROC = @XSLTPROC@
- YACC = @YACC@
- YFLAGS = @YFLAGS@
--abs_builddir = @abs_builddir@
--abs_srcdir = @abs_srcdir@
--abs_top_builddir = @abs_top_builddir@
--abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -209,7 +232,6 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
--builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -240,11 +262,8 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_builddir = @top_builddir@
--top_srcdir = @top_srcdir@
- CLEANFILES = *~
- EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_rootok
- man_MANS = pam_rootok.8
-@@ -293,7 +312,7 @@
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
--	test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
-+	test -z "$(securelibdir)" || $(mkdir_p) "$(DESTDIR)$(securelibdir)"
- 	@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
- 	  if test -f $$p; then \
- 	    f=$(am__strip_dir) \
-@@ -304,7 +323,7 @@
- 
- uninstall-securelibLTLIBRARIES:
- 	@$(NORMAL_UNINSTALL)
--	@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-+	@set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
- 	  p=$(am__strip_dir) \
- 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
- 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-@@ -319,7 +338,7 @@
- 	  rm -f "$${dir}/so_locations"; \
- 	done
- pam_rootok.la: $(pam_rootok_la_OBJECTS) $(pam_rootok_la_DEPENDENCIES) 
--	$(LINK) -rpath $(securelibdir) $(pam_rootok_la_OBJECTS) $(pam_rootok_la_LIBADD) $(LIBS)
-+	$(LINK) -rpath $(securelibdir) $(pam_rootok_la_LDFLAGS) $(pam_rootok_la_OBJECTS) $(pam_rootok_la_LIBADD) $(LIBS)
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
-@@ -330,22 +349,22 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_rootok.Plo@am__quote@
- 
- .c.o:
--@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c $<
- 
- .c.obj:
--@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
- 
- .c.lo:
--@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-@@ -355,9 +374,13 @@
- 
- clean-libtool:
- 	-rm -rf .libs _libs
-+
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
- install-man8: $(man8_MANS) $(man_MANS)
- 	@$(NORMAL_INSTALL)
--	test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
-+	test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
- 	@list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
- 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
- 	for i in $$l2; do \
-@@ -450,9 +473,9 @@
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
- check-TESTS: $(TESTS)
--	@failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[	 ]'; \
-+	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
- 	srcdir=$(srcdir); export srcdir; \
--	list=' $(TESTS) '; \
-+	list='$(TESTS)'; \
- 	if test -n "$$list"; then \
- 	  for tst in $$list; do \
- 	    if test -f ./$$tst; then dir=./; \
-@@ -461,7 +484,7 @@
- 	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
- 	      all=`expr $$all + 1`; \
- 	      case " $(XFAIL_TESTS) " in \
--	      *$$ws$$tst$$ws*) \
-+	      *" $$tst "*) \
- 		xpass=`expr $$xpass + 1`; \
- 		failed=`expr $$failed + 1`; \
- 		echo "XPASS: $$tst"; \
-@@ -473,7 +496,7 @@
- 	    elif test $$? -ne 77; then \
- 	      all=`expr $$all + 1`; \
- 	      case " $(XFAIL_TESTS) " in \
--	      *$$ws$$tst$$ws*) \
-+	      *" $$tst "*) \
- 		xfail=`expr $$xfail + 1`; \
- 		echo "XFAIL: $$tst"; \
- 	      ;; \
-@@ -523,21 +546,22 @@
- 	else :; fi
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	list='$(DISTFILES)'; \
--	  dist_files=`for file in $$list; do echo $$file; done | \
--	  sed -e "s|^$$srcdirstrip/||;t" \
--	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
--	case $$dist_files in \
--	  */*) $(MKDIR_P) `echo "$$dist_files" | \
--			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
--			   sort -u` ;; \
--	esac; \
--	for file in $$dist_files; do \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
- 	  if test -d $$d/$$file; then \
--	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- 	    fi; \
-@@ -554,7 +578,7 @@
- all-am: Makefile $(LTLIBRARIES) $(MANS) $(DATA)
- installdirs:
- 	for dir in "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man8dir)"; do \
--	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
- 	done
- install: install-am
- install-exec: install-exec-am
-@@ -590,7 +614,7 @@
- 	-rm -rf ./$(DEPDIR)
- 	-rm -f Makefile
- distclean-am: clean-am distclean-compile distclean-generic \
--	distclean-tags
-+	distclean-libtool distclean-tags
- 
- dvi: dvi-am
- 
-@@ -604,20 +628,12 @@
- 
- install-data-am: install-man install-securelibLTLIBRARIES
- 
--install-dvi: install-dvi-am
--
- install-exec-am:
- 
--install-html: install-html-am
--
- install-info: install-info-am
- 
- install-man: install-man8
- 
--install-pdf: install-pdf-am
--
--install-ps: install-ps-am
--
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
-@@ -638,27 +654,24 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-man uninstall-securelibLTLIBRARIES
-+uninstall-am: uninstall-info-am uninstall-man \
-+	uninstall-securelibLTLIBRARIES
- 
- uninstall-man: uninstall-man8
- 
--.MAKE: install-am install-strip
--
- .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
- 	clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
- 	distclean distclean-compile distclean-generic \
- 	distclean-libtool distclean-tags distdir dvi dvi-am html \
- 	html-am info info-am install install-am install-data \
--	install-data-am install-dvi install-dvi-am install-exec \
--	install-exec-am install-html install-html-am install-info \
--	install-info-am install-man install-man8 install-pdf \
--	install-pdf-am install-ps install-ps-am \
-+	install-data-am install-exec install-exec-am install-info \
-+	install-info-am install-man install-man8 \
- 	install-securelibLTLIBRARIES install-strip installcheck \
- 	installcheck-am installdirs maintainer-clean \
- 	maintainer-clean-generic mostlyclean mostlyclean-compile \
- 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
--	tags uninstall uninstall-am uninstall-man uninstall-man8 \
--	uninstall-securelibLTLIBRARIES
-+	tags uninstall uninstall-am uninstall-info-am uninstall-man \
-+	uninstall-man8 uninstall-securelibLTLIBRARIES
- 
- @ENABLE_REGENERATE_MAN_TRUE@README: pam_rootok.8.xml
- @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
 Index: pam/Linux-PAM/modules/pam_securetty/Makefile.in
 ===================================================================
 --- pam.orig/Linux-PAM/modules/pam_securetty/Makefile.in
 +++ pam/Linux-PAM/modules/pam_securetty/Makefile.in
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -19,11 +19,15 @@
- #
- 
- 
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ../..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -67,18 +71,17 @@
+@@ -65,8 +65,8 @@
+ securelibLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(securelib_LTLIBRARIES)
  pam_securetty_la_LIBADD =
- pam_securetty_la_SOURCES = pam_securetty.c
- pam_securetty_la_OBJECTS = pam_securetty.lo
--DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+-pam_securetty_la_SOURCES = pam_securetty.c
+-pam_securetty_la_OBJECTS = pam_securetty.lo
++am_pam_securetty_la_OBJECTS = pam_securetty.lo tty_secure.lo
++pam_securetty_la_OBJECTS = $(am_pam_securetty_la_OBJECTS)
+ DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
  depcomp = $(SHELL) $(top_srcdir)/depcomp
  am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
--	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+	$(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
--	$(LDFLAGS) -o $@
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = pam_securetty.c
- DIST_SOURCES = pam_securetty.c
+@@ -79,8 +79,8 @@
+ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+ 	$(LDFLAGS) -o $@
+-SOURCES = pam_securetty.c
+-DIST_SOURCES = pam_securetty.c
++SOURCES = $(pam_securetty_la_SOURCES)
++DIST_SOURCES = $(pam_securetty_la_SOURCES)
  man8dir = $(mandir)/man8
-@@ -89,6 +92,8 @@
- CTAGS = ctags
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -113,6 +118,10 @@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
-+ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
-+ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
-+ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
-+ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -121,7 +130,18 @@
- GMSGFMT_015 = @GMSGFMT_015@
- GREP = @GREP@
- HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
--INSTALL = @INSTALL@
-+HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
-+HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
-+HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
-+HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
-+HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
-+HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
-+HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
-+HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
-+HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
-+HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
-+HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
-+HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -133,6 +153,7 @@
+ NROFF = nroff
+ MANS = $(man_MANS)
+@@ -133,6 +133,7 @@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
  LIBAUDIT = @LIBAUDIT@
@@ -19084,382 +5053,38 @@ Index: pam/Linux-PAM/modules/pam_securetty/Makefile.in
  LIBCRACK = @LIBCRACK@
  LIBCRYPT = @LIBCRYPT@
  LIBDB = @LIBDB@
-@@ -156,7 +177,6 @@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
--MKDIR_P = @MKDIR_P@
- MSGFMT = @MSGFMT@
- MSGFMT_015 = @MSGFMT_015@
- MSGMERGE = @MSGMERGE@
-@@ -175,8 +195,11 @@
+@@ -175,6 +176,7 @@
  RANLIB = @RANLIB@
  SCONFIGDIR = @SCONFIGDIR@
  SECUREDIR = @SECUREDIR@
 +SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
-+STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
-+STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
  STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -190,13 +213,13 @@
- XSLTPROC = @XSLTPROC@
- YACC = @YACC@
- YFLAGS = @YFLAGS@
--abs_builddir = @abs_builddir@
--abs_srcdir = @abs_srcdir@
--abs_top_builddir = @abs_top_builddir@
--abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -208,7 +231,6 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
--builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -239,11 +261,8 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_builddir = @top_builddir@
--top_srcdir = @top_srcdir@
- CLEANFILES = *~
- EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_securetty
- TESTS = tst-pam_securetty
-@@ -291,7 +310,7 @@
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
--	test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
-+	test -z "$(securelibdir)" || $(mkdir_p) "$(DESTDIR)$(securelibdir)"
- 	@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
- 	  if test -f $$p; then \
- 	    f=$(am__strip_dir) \
-@@ -302,7 +321,7 @@
- 
- uninstall-securelibLTLIBRARIES:
- 	@$(NORMAL_UNINSTALL)
--	@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-+	@set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
- 	  p=$(am__strip_dir) \
- 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
- 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-@@ -317,7 +336,7 @@
- 	  rm -f "$${dir}/so_locations"; \
- 	done
- pam_securetty.la: $(pam_securetty_la_OBJECTS) $(pam_securetty_la_DEPENDENCIES) 
--	$(LINK) -rpath $(securelibdir) $(pam_securetty_la_OBJECTS) $(pam_securetty_la_LIBADD) $(LIBS)
-+	$(LINK) -rpath $(securelibdir) $(pam_securetty_la_LDFLAGS) $(pam_securetty_la_OBJECTS) $(pam_securetty_la_LIBADD) $(LIBS)
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
-@@ -328,22 +347,22 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_securetty.Plo@am__quote@
- 
- .c.o:
--@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c $<
- 
- .c.obj:
--@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
- 
- .c.lo:
--@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-@@ -353,9 +372,13 @@
- 
- clean-libtool:
- 	-rm -rf .libs _libs
+@@ -255,6 +257,10 @@
+ AM_LDFLAGS = -no-undefined -avoid-version -module \
+ 	-L$(top_builddir)/libpam -lpam $(am__append_1)
+ securelib_LTLIBRARIES = pam_securetty.la
++pam_securetty_la_SOURCES = \
++	pam_securetty.c		\
++	tty_secure.c
 +
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
- install-man8: $(man8_MANS) $(man_MANS)
- 	@$(NORMAL_INSTALL)
--	test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
-+	test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
- 	@list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
- 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
- 	for i in $$l2; do \
-@@ -448,9 +471,9 @@
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
- check-TESTS: $(TESTS)
--	@failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[	 ]'; \
-+	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
- 	srcdir=$(srcdir); export srcdir; \
--	list=' $(TESTS) '; \
-+	list='$(TESTS)'; \
- 	if test -n "$$list"; then \
- 	  for tst in $$list; do \
- 	    if test -f ./$$tst; then dir=./; \
-@@ -459,7 +482,7 @@
- 	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
- 	      all=`expr $$all + 1`; \
- 	      case " $(XFAIL_TESTS) " in \
--	      *$$ws$$tst$$ws*) \
-+	      *" $$tst "*) \
- 		xpass=`expr $$xpass + 1`; \
- 		failed=`expr $$failed + 1`; \
- 		echo "XPASS: $$tst"; \
-@@ -471,7 +494,7 @@
- 	    elif test $$? -ne 77; then \
- 	      all=`expr $$all + 1`; \
- 	      case " $(XFAIL_TESTS) " in \
--	      *$$ws$$tst$$ws*) \
-+	      *" $$tst "*) \
- 		xfail=`expr $$xfail + 1`; \
- 		echo "XFAIL: $$tst"; \
- 	      ;; \
-@@ -521,21 +544,22 @@
- 	else :; fi
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	list='$(DISTFILES)'; \
--	  dist_files=`for file in $$list; do echo $$file; done | \
--	  sed -e "s|^$$srcdirstrip/||;t" \
--	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
--	case $$dist_files in \
--	  */*) $(MKDIR_P) `echo "$$dist_files" | \
--			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
--			   sort -u` ;; \
--	esac; \
--	for file in $$dist_files; do \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
- 	  if test -d $$d/$$file; then \
--	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- 	    fi; \
-@@ -552,7 +576,7 @@
- all-am: Makefile $(LTLIBRARIES) $(MANS) $(DATA)
- installdirs:
- 	for dir in "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man8dir)"; do \
--	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
- 	done
- install: install-am
- install-exec: install-exec-am
-@@ -588,7 +612,7 @@
- 	-rm -rf ./$(DEPDIR)
- 	-rm -f Makefile
- distclean-am: clean-am distclean-compile distclean-generic \
--	distclean-tags
-+	distclean-libtool distclean-tags
- 
- dvi: dvi-am
- 
-@@ -602,20 +626,12 @@
- 
- install-data-am: install-man install-securelibLTLIBRARIES
- 
--install-dvi: install-dvi-am
--
- install-exec-am:
- 
--install-html: install-html-am
--
- install-info: install-info-am
- 
- install-man: install-man8
- 
--install-pdf: install-pdf-am
--
--install-ps: install-ps-am
--
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
-@@ -636,27 +652,24 @@
- 
- ps-am:
+ @ENABLE_REGENERATE_MAN_TRUE@noinst_DATA = README
+ all: all-am
  
--uninstall-am: uninstall-man uninstall-securelibLTLIBRARIES
-+uninstall-am: uninstall-info-am uninstall-man \
-+	uninstall-securelibLTLIBRARIES
+@@ -326,6 +332,7 @@
+ 	-rm -f *.tab.c
  
- uninstall-man: uninstall-man8
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_securetty.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tty_secure.Plo@am__quote@
  
--.MAKE: install-am install-strip
--
- .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
- 	clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
- 	distclean distclean-compile distclean-generic \
- 	distclean-libtool distclean-tags distdir dvi dvi-am html \
- 	html-am info info-am install install-am install-data \
--	install-data-am install-dvi install-dvi-am install-exec \
--	install-exec-am install-html install-html-am install-info \
--	install-info-am install-man install-man8 install-pdf \
--	install-pdf-am install-ps install-ps-am \
-+	install-data-am install-exec install-exec-am install-info \
-+	install-info-am install-man install-man8 \
- 	install-securelibLTLIBRARIES install-strip installcheck \
- 	installcheck-am installdirs maintainer-clean \
- 	maintainer-clean-generic mostlyclean mostlyclean-compile \
- 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
--	tags uninstall uninstall-am uninstall-man uninstall-man8 \
--	uninstall-securelibLTLIBRARIES
-+	tags uninstall uninstall-am uninstall-info-am uninstall-man \
-+	uninstall-man8 uninstall-securelibLTLIBRARIES
- 
- @ENABLE_REGENERATE_MAN_TRUE@README: pam_securetty.8.xml
- @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
+ .c.o:
+ @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 Index: pam/Linux-PAM/modules/pam_selinux/Makefile.in
 ===================================================================
 --- pam.orig/Linux-PAM/modules/pam_selinux/Makefile.in
 +++ pam/Linux-PAM/modules/pam_selinux/Makefile.in
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -20,11 +20,15 @@
- 
- 
- 
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ../..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -71,29 +75,22 @@
- pam_selinux_la_LIBADD =
- pam_selinux_la_SOURCES = pam_selinux.c
- pam_selinux_la_OBJECTS = pam_selinux.lo
--pam_selinux_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
--	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
--	$(pam_selinux_la_LDFLAGS) $(LDFLAGS) -o $@
- @HAVE_LIBSELINUX_TRUE@am_pam_selinux_la_rpath = -rpath $(securelibdir)
- PROGRAMS = $(noinst_PROGRAMS)
- pam_selinux_check_SOURCES = pam_selinux_check.c
- pam_selinux_check_OBJECTS = pam_selinux_check.$(OBJEXT)
- pam_selinux_check_LDADD = $(LDADD)
--pam_selinux_check_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
--	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
--	$(pam_selinux_check_LDFLAGS) $(LDFLAGS) -o $@
--DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
--	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+	$(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
--	$(LDFLAGS) -o $@
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = pam_selinux.c pam_selinux_check.c
- DIST_SOURCES = pam_selinux.c pam_selinux_check.c
- man8dir = $(mandir)/man8
-@@ -104,6 +101,8 @@
- CTAGS = ctags
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -128,6 +127,10 @@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
-+ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
-+ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
-+ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
-+ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -136,7 +139,18 @@
- GMSGFMT_015 = @GMSGFMT_015@
- GREP = @GREP@
- HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
--INSTALL = @INSTALL@
-+HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
-+HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
-+HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
-+HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
-+HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
-+HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
-+HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
-+HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
-+HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
-+HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
-+HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
-+HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -148,6 +162,7 @@
+@@ -148,6 +148,7 @@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
  LIBAUDIT = @LIBAUDIT@
@@ -19467,379 +5092,19 @@ Index: pam/Linux-PAM/modules/pam_selinux/Makefile.in
  LIBCRACK = @LIBCRACK@
  LIBCRYPT = @LIBCRYPT@
  LIBDB = @LIBDB@
-@@ -171,7 +186,6 @@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
--MKDIR_P = @MKDIR_P@
- MSGFMT = @MSGFMT@
- MSGFMT_015 = @MSGFMT_015@
- MSGMERGE = @MSGMERGE@
-@@ -190,8 +204,11 @@
+@@ -190,6 +191,7 @@
  RANLIB = @RANLIB@
  SCONFIGDIR = @SCONFIGDIR@
  SECUREDIR = @SECUREDIR@
 +SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
-+STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
-+STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
  STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -205,13 +222,13 @@
- XSLTPROC = @XSLTPROC@
- YACC = @YACC@
- YFLAGS = @YFLAGS@
--abs_builddir = @abs_builddir@
--abs_srcdir = @abs_srcdir@
--abs_top_builddir = @abs_top_builddir@
--abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -223,7 +240,6 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
--builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -254,11 +270,8 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_builddir = @top_builddir@
--top_srcdir = @top_srcdir@
- CLEANFILES = *~
- EXTRA_DIST = README $(XMLS) pam_selinux.8 pam_selinux_check.8 \
- 		tst-pam_selinux
-@@ -313,7 +326,7 @@
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
--	test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
-+	test -z "$(securelibdir)" || $(mkdir_p) "$(DESTDIR)$(securelibdir)"
- 	@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
- 	  if test -f $$p; then \
- 	    f=$(am__strip_dir) \
-@@ -324,7 +337,7 @@
- 
- uninstall-securelibLTLIBRARIES:
- 	@$(NORMAL_UNINSTALL)
--	@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-+	@set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
- 	  p=$(am__strip_dir) \
- 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
- 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-@@ -339,7 +352,7 @@
- 	  rm -f "$${dir}/so_locations"; \
- 	done
- pam_selinux.la: $(pam_selinux_la_OBJECTS) $(pam_selinux_la_DEPENDENCIES) 
--	$(pam_selinux_la_LINK) $(am_pam_selinux_la_rpath) $(pam_selinux_la_OBJECTS) $(pam_selinux_la_LIBADD) $(LIBS)
-+	$(LINK) $(am_pam_selinux_la_rpath) $(pam_selinux_la_LDFLAGS) $(pam_selinux_la_OBJECTS) $(pam_selinux_la_LIBADD) $(LIBS)
- 
- clean-noinstPROGRAMS:
- 	@list='$(noinst_PROGRAMS)'; for p in $$list; do \
-@@ -349,7 +362,7 @@
- 	done
- pam_selinux_check$(EXEEXT): $(pam_selinux_check_OBJECTS) $(pam_selinux_check_DEPENDENCIES) 
- 	@rm -f pam_selinux_check$(EXEEXT)
--	$(pam_selinux_check_LINK) $(pam_selinux_check_OBJECTS) $(pam_selinux_check_LDADD) $(LIBS)
-+	$(LINK) $(pam_selinux_check_LDFLAGS) $(pam_selinux_check_OBJECTS) $(pam_selinux_check_LDADD) $(LIBS)
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
-@@ -361,22 +374,22 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_selinux_check.Po@am__quote@
- 
- .c.o:
--@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c $<
- 
- .c.obj:
--@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
- 
- .c.lo:
--@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-@@ -386,9 +399,13 @@
- 
- clean-libtool:
- 	-rm -rf .libs _libs
-+
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
- install-man8: $(man8_MANS) $(man_MANS)
- 	@$(NORMAL_INSTALL)
--	test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
-+	test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
- 	@list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
- 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
- 	for i in $$l2; do \
-@@ -481,9 +498,9 @@
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
- check-TESTS: $(TESTS)
--	@failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[	 ]'; \
-+	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
- 	srcdir=$(srcdir); export srcdir; \
--	list=' $(TESTS) '; \
-+	list='$(TESTS)'; \
- 	if test -n "$$list"; then \
- 	  for tst in $$list; do \
- 	    if test -f ./$$tst; then dir=./; \
-@@ -492,7 +509,7 @@
- 	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
- 	      all=`expr $$all + 1`; \
- 	      case " $(XFAIL_TESTS) " in \
--	      *$$ws$$tst$$ws*) \
-+	      *" $$tst "*) \
- 		xpass=`expr $$xpass + 1`; \
- 		failed=`expr $$failed + 1`; \
- 		echo "XPASS: $$tst"; \
-@@ -504,7 +521,7 @@
- 	    elif test $$? -ne 77; then \
- 	      all=`expr $$all + 1`; \
- 	      case " $(XFAIL_TESTS) " in \
--	      *$$ws$$tst$$ws*) \
-+	      *" $$tst "*) \
- 		xfail=`expr $$xfail + 1`; \
- 		echo "XFAIL: $$tst"; \
- 	      ;; \
-@@ -554,21 +571,22 @@
- 	else :; fi
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	list='$(DISTFILES)'; \
--	  dist_files=`for file in $$list; do echo $$file; done | \
--	  sed -e "s|^$$srcdirstrip/||;t" \
--	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
--	case $$dist_files in \
--	  */*) $(MKDIR_P) `echo "$$dist_files" | \
--			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
--			   sort -u` ;; \
--	esac; \
--	for file in $$dist_files; do \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
- 	  if test -d $$d/$$file; then \
--	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- 	    fi; \
-@@ -585,7 +603,7 @@
- all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(MANS) $(DATA)
- installdirs:
- 	for dir in "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man8dir)"; do \
--	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
- 	done
- install: install-am
- install-exec: install-exec-am
-@@ -621,7 +639,7 @@
- 	-rm -rf ./$(DEPDIR)
- 	-rm -f Makefile
- distclean-am: clean-am distclean-compile distclean-generic \
--	distclean-tags
-+	distclean-libtool distclean-tags
- 
- dvi: dvi-am
- 
-@@ -635,20 +653,12 @@
- 
- install-data-am: install-man install-securelibLTLIBRARIES
- 
--install-dvi: install-dvi-am
--
- install-exec-am:
- 
--install-html: install-html-am
--
- install-info: install-info-am
- 
- install-man: install-man8
- 
--install-pdf: install-pdf-am
--
--install-ps: install-ps-am
--
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
-@@ -669,27 +679,24 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-man uninstall-securelibLTLIBRARIES
-+uninstall-am: uninstall-info-am uninstall-man \
-+	uninstall-securelibLTLIBRARIES
- 
- uninstall-man: uninstall-man8
- 
--.MAKE: install-am install-strip
--
- .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
- 	clean-generic clean-libtool clean-noinstPROGRAMS \
- 	clean-securelibLTLIBRARIES ctags distclean distclean-compile \
- 	distclean-generic distclean-libtool distclean-tags distdir dvi \
- 	dvi-am html html-am info info-am install install-am \
--	install-data install-data-am install-dvi install-dvi-am \
--	install-exec install-exec-am install-html install-html-am \
-+	install-data install-data-am install-exec install-exec-am \
- 	install-info install-info-am install-man install-man8 \
--	install-pdf install-pdf-am install-ps install-ps-am \
- 	install-securelibLTLIBRARIES install-strip installcheck \
- 	installcheck-am installdirs maintainer-clean \
- 	maintainer-clean-generic mostlyclean mostlyclean-compile \
- 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
--	tags uninstall uninstall-am uninstall-man uninstall-man8 \
--	uninstall-securelibLTLIBRARIES
-+	tags uninstall uninstall-am uninstall-info-am uninstall-man \
-+	uninstall-man8 uninstall-securelibLTLIBRARIES
- 
- @ENABLE_REGENERATE_MAN_TRUE@README: pam_selinux.8.xml
- @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
 Index: pam/Linux-PAM/modules/pam_shells/Makefile.in
 ===================================================================
 --- pam.orig/Linux-PAM/modules/pam_shells/Makefile.in
 +++ pam/Linux-PAM/modules/pam_shells/Makefile.in
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -19,11 +19,15 @@
- #
- 
- 
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ../..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -67,18 +71,17 @@
- pam_shells_la_LIBADD =
- pam_shells_la_SOURCES = pam_shells.c
- pam_shells_la_OBJECTS = pam_shells.lo
--DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
--	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+	$(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
--	$(LDFLAGS) -o $@
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = pam_shells.c
- DIST_SOURCES = pam_shells.c
- man8dir = $(mandir)/man8
-@@ -89,6 +92,8 @@
- CTAGS = ctags
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -113,6 +118,10 @@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
-+ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
-+ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
-+ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
-+ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -121,7 +130,18 @@
- GMSGFMT_015 = @GMSGFMT_015@
- GREP = @GREP@
- HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
--INSTALL = @INSTALL@
-+HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
-+HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
-+HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
-+HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
-+HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
-+HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
-+HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
-+HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
-+HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
-+HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
-+HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
-+HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -133,6 +153,7 @@
+@@ -133,6 +133,7 @@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
  LIBAUDIT = @LIBAUDIT@
@@ -19847,370 +5112,19 @@ Index: pam/Linux-PAM/modules/pam_shells/Makefile.in
  LIBCRACK = @LIBCRACK@
  LIBCRYPT = @LIBCRYPT@
  LIBDB = @LIBDB@
-@@ -156,7 +177,6 @@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
--MKDIR_P = @MKDIR_P@
- MSGFMT = @MSGFMT@
- MSGFMT_015 = @MSGFMT_015@
- MSGMERGE = @MSGMERGE@
-@@ -175,8 +195,11 @@
+@@ -175,6 +176,7 @@
  RANLIB = @RANLIB@
  SCONFIGDIR = @SCONFIGDIR@
  SECUREDIR = @SECUREDIR@
 +SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
-+STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
-+STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
  STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -190,13 +213,13 @@
- XSLTPROC = @XSLTPROC@
- YACC = @YACC@
- YFLAGS = @YFLAGS@
--abs_builddir = @abs_builddir@
--abs_srcdir = @abs_srcdir@
--abs_top_builddir = @abs_top_builddir@
--abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -208,7 +231,6 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
--builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -239,11 +261,8 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_builddir = @top_builddir@
--top_srcdir = @top_srcdir@
- CLEANFILES = *~
- EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_shells
- man_MANS = pam_shells.8
-@@ -291,7 +310,7 @@
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
--	test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
-+	test -z "$(securelibdir)" || $(mkdir_p) "$(DESTDIR)$(securelibdir)"
- 	@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
- 	  if test -f $$p; then \
- 	    f=$(am__strip_dir) \
-@@ -302,7 +321,7 @@
- 
- uninstall-securelibLTLIBRARIES:
- 	@$(NORMAL_UNINSTALL)
--	@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-+	@set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
- 	  p=$(am__strip_dir) \
- 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
- 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-@@ -317,7 +336,7 @@
- 	  rm -f "$${dir}/so_locations"; \
- 	done
- pam_shells.la: $(pam_shells_la_OBJECTS) $(pam_shells_la_DEPENDENCIES) 
--	$(LINK) -rpath $(securelibdir) $(pam_shells_la_OBJECTS) $(pam_shells_la_LIBADD) $(LIBS)
-+	$(LINK) -rpath $(securelibdir) $(pam_shells_la_LDFLAGS) $(pam_shells_la_OBJECTS) $(pam_shells_la_LIBADD) $(LIBS)
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
-@@ -328,22 +347,22 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_shells.Plo@am__quote@
- 
- .c.o:
--@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c $<
- 
- .c.obj:
--@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
- 
- .c.lo:
--@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-@@ -353,9 +372,13 @@
- 
- clean-libtool:
- 	-rm -rf .libs _libs
-+
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
- install-man8: $(man8_MANS) $(man_MANS)
- 	@$(NORMAL_INSTALL)
--	test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
-+	test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
- 	@list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
- 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
- 	for i in $$l2; do \
-@@ -448,9 +471,9 @@
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
- check-TESTS: $(TESTS)
--	@failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[	 ]'; \
-+	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
- 	srcdir=$(srcdir); export srcdir; \
--	list=' $(TESTS) '; \
-+	list='$(TESTS)'; \
- 	if test -n "$$list"; then \
- 	  for tst in $$list; do \
- 	    if test -f ./$$tst; then dir=./; \
-@@ -459,7 +482,7 @@
- 	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
- 	      all=`expr $$all + 1`; \
- 	      case " $(XFAIL_TESTS) " in \
--	      *$$ws$$tst$$ws*) \
-+	      *" $$tst "*) \
- 		xpass=`expr $$xpass + 1`; \
- 		failed=`expr $$failed + 1`; \
- 		echo "XPASS: $$tst"; \
-@@ -471,7 +494,7 @@
- 	    elif test $$? -ne 77; then \
- 	      all=`expr $$all + 1`; \
- 	      case " $(XFAIL_TESTS) " in \
--	      *$$ws$$tst$$ws*) \
-+	      *" $$tst "*) \
- 		xfail=`expr $$xfail + 1`; \
- 		echo "XFAIL: $$tst"; \
- 	      ;; \
-@@ -521,21 +544,22 @@
- 	else :; fi
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	list='$(DISTFILES)'; \
--	  dist_files=`for file in $$list; do echo $$file; done | \
--	  sed -e "s|^$$srcdirstrip/||;t" \
--	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
--	case $$dist_files in \
--	  */*) $(MKDIR_P) `echo "$$dist_files" | \
--			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
--			   sort -u` ;; \
--	esac; \
--	for file in $$dist_files; do \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
- 	  if test -d $$d/$$file; then \
--	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- 	    fi; \
-@@ -552,7 +576,7 @@
- all-am: Makefile $(LTLIBRARIES) $(MANS) $(DATA)
- installdirs:
- 	for dir in "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man8dir)"; do \
--	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
- 	done
- install: install-am
- install-exec: install-exec-am
-@@ -588,7 +612,7 @@
- 	-rm -rf ./$(DEPDIR)
- 	-rm -f Makefile
- distclean-am: clean-am distclean-compile distclean-generic \
--	distclean-tags
-+	distclean-libtool distclean-tags
- 
- dvi: dvi-am
- 
-@@ -602,20 +626,12 @@
- 
- install-data-am: install-man install-securelibLTLIBRARIES
- 
--install-dvi: install-dvi-am
--
- install-exec-am:
- 
--install-html: install-html-am
--
- install-info: install-info-am
- 
- install-man: install-man8
- 
--install-pdf: install-pdf-am
--
--install-ps: install-ps-am
--
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
-@@ -636,27 +652,24 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-man uninstall-securelibLTLIBRARIES
-+uninstall-am: uninstall-info-am uninstall-man \
-+	uninstall-securelibLTLIBRARIES
- 
- uninstall-man: uninstall-man8
- 
--.MAKE: install-am install-strip
--
- .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
- 	clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
- 	distclean distclean-compile distclean-generic \
- 	distclean-libtool distclean-tags distdir dvi dvi-am html \
- 	html-am info info-am install install-am install-data \
--	install-data-am install-dvi install-dvi-am install-exec \
--	install-exec-am install-html install-html-am install-info \
--	install-info-am install-man install-man8 install-pdf \
--	install-pdf-am install-ps install-ps-am \
-+	install-data-am install-exec install-exec-am install-info \
-+	install-info-am install-man install-man8 \
- 	install-securelibLTLIBRARIES install-strip installcheck \
- 	installcheck-am installdirs maintainer-clean \
- 	maintainer-clean-generic mostlyclean mostlyclean-compile \
- 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
--	tags uninstall uninstall-am uninstall-man uninstall-man8 \
--	uninstall-securelibLTLIBRARIES
-+	tags uninstall uninstall-am uninstall-info-am uninstall-man \
-+	uninstall-man8 uninstall-securelibLTLIBRARIES
- 
- @ENABLE_REGENERATE_MAN_TRUE@README: pam_shells.8.xml
- @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
 Index: pam/Linux-PAM/modules/pam_stress/Makefile.in
 ===================================================================
 --- pam.orig/Linux-PAM/modules/pam_stress/Makefile.in
 +++ pam/Linux-PAM/modules/pam_stress/Makefile.in
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -18,11 +18,15 @@
- # Copyright (c) 2005, 2006 Thorsten Kukuk <kukuk@suse.de>
- #
- 
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ../..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -66,24 +70,25 @@
- pam_stress_la_LIBADD =
- pam_stress_la_SOURCES = pam_stress.c
- pam_stress_la_OBJECTS = pam_stress.lo
--DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
--	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+	$(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
--	$(LDFLAGS) -o $@
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = pam_stress.c
- DIST_SOURCES = pam_stress.c
- ETAGS = etags
- CTAGS = ctags
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -108,6 +113,10 @@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
-+ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
-+ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
-+ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
-+ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -116,7 +125,18 @@
- GMSGFMT_015 = @GMSGFMT_015@
- GREP = @GREP@
- HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
--INSTALL = @INSTALL@
-+HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
-+HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
-+HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
-+HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
-+HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
-+HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
-+HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
-+HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
-+HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
-+HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
-+HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
-+HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -128,6 +148,7 @@
+@@ -128,6 +128,7 @@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
  LIBAUDIT = @LIBAUDIT@
@@ -20218,362 +5132,19 @@ Index: pam/Linux-PAM/modules/pam_stress/Makefile.in
  LIBCRACK = @LIBCRACK@
  LIBCRYPT = @LIBCRYPT@
  LIBDB = @LIBDB@
-@@ -151,7 +172,6 @@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
--MKDIR_P = @MKDIR_P@
- MSGFMT = @MSGFMT@
- MSGFMT_015 = @MSGFMT_015@
- MSGMERGE = @MSGMERGE@
-@@ -170,8 +190,11 @@
+@@ -170,6 +171,7 @@
  RANLIB = @RANLIB@
  SCONFIGDIR = @SCONFIGDIR@
  SECUREDIR = @SECUREDIR@
 +SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
-+STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
-+STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
  STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -185,13 +208,13 @@
- XSLTPROC = @XSLTPROC@
- YACC = @YACC@
- YFLAGS = @YFLAGS@
--abs_builddir = @abs_builddir@
--abs_srcdir = @abs_srcdir@
--abs_top_builddir = @abs_top_builddir@
--abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -203,7 +226,6 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
--builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -234,11 +256,8 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_builddir = @top_builddir@
--top_srcdir = @top_srcdir@
- CLEANFILES = *~
- EXTRA_DIST = README tst-pam_stress
- TESTS = tst-pam_stress
-@@ -283,7 +302,7 @@
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
--	test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
-+	test -z "$(securelibdir)" || $(mkdir_p) "$(DESTDIR)$(securelibdir)"
- 	@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
- 	  if test -f $$p; then \
- 	    f=$(am__strip_dir) \
-@@ -294,7 +313,7 @@
- 
- uninstall-securelibLTLIBRARIES:
- 	@$(NORMAL_UNINSTALL)
--	@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-+	@set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
- 	  p=$(am__strip_dir) \
- 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
- 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-@@ -309,7 +328,7 @@
- 	  rm -f "$${dir}/so_locations"; \
- 	done
- pam_stress.la: $(pam_stress_la_OBJECTS) $(pam_stress_la_DEPENDENCIES) 
--	$(LINK) -rpath $(securelibdir) $(pam_stress_la_OBJECTS) $(pam_stress_la_LIBADD) $(LIBS)
-+	$(LINK) -rpath $(securelibdir) $(pam_stress_la_LDFLAGS) $(pam_stress_la_OBJECTS) $(pam_stress_la_LIBADD) $(LIBS)
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
-@@ -320,22 +339,22 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_stress.Plo@am__quote@
- 
- .c.o:
--@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c $<
- 
- .c.obj:
--@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
- 
- .c.lo:
--@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-@@ -346,6 +365,10 @@
- clean-libtool:
- 	-rm -rf .libs _libs
- 
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
-+
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- 	unique=`for i in $$list; do \
-@@ -395,9 +418,9 @@
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
- check-TESTS: $(TESTS)
--	@failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[	 ]'; \
-+	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
- 	srcdir=$(srcdir); export srcdir; \
--	list=' $(TESTS) '; \
-+	list='$(TESTS)'; \
- 	if test -n "$$list"; then \
- 	  for tst in $$list; do \
- 	    if test -f ./$$tst; then dir=./; \
-@@ -406,7 +429,7 @@
- 	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
- 	      all=`expr $$all + 1`; \
- 	      case " $(XFAIL_TESTS) " in \
--	      *$$ws$$tst$$ws*) \
-+	      *" $$tst "*) \
- 		xpass=`expr $$xpass + 1`; \
- 		failed=`expr $$failed + 1`; \
- 		echo "XPASS: $$tst"; \
-@@ -418,7 +441,7 @@
- 	    elif test $$? -ne 77; then \
- 	      all=`expr $$all + 1`; \
- 	      case " $(XFAIL_TESTS) " in \
--	      *$$ws$$tst$$ws*) \
-+	      *" $$tst "*) \
- 		xfail=`expr $$xfail + 1`; \
- 		echo "XFAIL: $$tst"; \
- 	      ;; \
-@@ -468,21 +491,22 @@
- 	else :; fi
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	list='$(DISTFILES)'; \
--	  dist_files=`for file in $$list; do echo $$file; done | \
--	  sed -e "s|^$$srcdirstrip/||;t" \
--	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
--	case $$dist_files in \
--	  */*) $(MKDIR_P) `echo "$$dist_files" | \
--			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
--			   sort -u` ;; \
--	esac; \
--	for file in $$dist_files; do \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
- 	  if test -d $$d/$$file; then \
--	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- 	    fi; \
-@@ -499,7 +523,7 @@
- all-am: Makefile $(LTLIBRARIES)
- installdirs:
- 	for dir in "$(DESTDIR)$(securelibdir)"; do \
--	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
- 	done
- install: install-am
- install-exec: install-exec-am
-@@ -535,7 +559,7 @@
- 	-rm -rf ./$(DEPDIR)
- 	-rm -f Makefile
- distclean-am: clean-am distclean-compile distclean-generic \
--	distclean-tags
-+	distclean-libtool distclean-tags
- 
- dvi: dvi-am
- 
-@@ -549,20 +573,12 @@
- 
- install-data-am: install-securelibLTLIBRARIES
- 
--install-dvi: install-dvi-am
--
- install-exec-am:
- 
--install-html: install-html-am
--
- install-info: install-info-am
- 
- install-man:
- 
--install-pdf: install-pdf-am
--
--install-ps: install-ps-am
--
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
-@@ -583,24 +599,20 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-securelibLTLIBRARIES
--
--.MAKE: install-am install-strip
-+uninstall-am: uninstall-info-am uninstall-securelibLTLIBRARIES
- 
- .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
- 	clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
- 	distclean distclean-compile distclean-generic \
- 	distclean-libtool distclean-tags distdir dvi dvi-am html \
- 	html-am info info-am install install-am install-data \
--	install-data-am install-dvi install-dvi-am install-exec \
--	install-exec-am install-html install-html-am install-info \
--	install-info-am install-man install-pdf install-pdf-am \
--	install-ps install-ps-am install-securelibLTLIBRARIES \
-+	install-data-am install-exec install-exec-am install-info \
-+	install-info-am install-man install-securelibLTLIBRARIES \
- 	install-strip installcheck installcheck-am installdirs \
- 	maintainer-clean maintainer-clean-generic mostlyclean \
- 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
- 	pdf pdf-am ps ps-am tags uninstall uninstall-am \
--	uninstall-securelibLTLIBRARIES
-+	uninstall-info-am uninstall-securelibLTLIBRARIES
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
 Index: pam/Linux-PAM/modules/pam_succeed_if/Makefile.in
 ===================================================================
 --- pam.orig/Linux-PAM/modules/pam_succeed_if/Makefile.in
 +++ pam/Linux-PAM/modules/pam_succeed_if/Makefile.in
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -19,11 +19,15 @@
- #
- 
- 
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ../..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -67,18 +71,17 @@
- pam_succeed_if_la_LIBADD =
- pam_succeed_if_la_SOURCES = pam_succeed_if.c
- pam_succeed_if_la_OBJECTS = pam_succeed_if.lo
--DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
--	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+	$(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
--	$(LDFLAGS) -o $@
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = pam_succeed_if.c
- DIST_SOURCES = pam_succeed_if.c
- man8dir = $(mandir)/man8
-@@ -89,6 +92,8 @@
- CTAGS = ctags
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -113,6 +118,10 @@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
-+ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
-+ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
-+ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
-+ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -121,7 +130,18 @@
- GMSGFMT_015 = @GMSGFMT_015@
- GREP = @GREP@
- HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
--INSTALL = @INSTALL@
-+HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
-+HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
-+HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
-+HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
-+HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
-+HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
-+HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
-+HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
-+HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
-+HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
-+HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
-+HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -133,6 +153,7 @@
+@@ -133,6 +133,7 @@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
  LIBAUDIT = @LIBAUDIT@
@@ -20581,382 +5152,19 @@ Index: pam/Linux-PAM/modules/pam_succeed_if/Makefile.in
  LIBCRACK = @LIBCRACK@
  LIBCRYPT = @LIBCRYPT@
  LIBDB = @LIBDB@
-@@ -156,7 +177,6 @@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
--MKDIR_P = @MKDIR_P@
- MSGFMT = @MSGFMT@
- MSGFMT_015 = @MSGFMT_015@
- MSGMERGE = @MSGMERGE@
-@@ -175,8 +195,11 @@
+@@ -175,6 +176,7 @@
  RANLIB = @RANLIB@
  SCONFIGDIR = @SCONFIGDIR@
  SECUREDIR = @SECUREDIR@
 +SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
-+STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
-+STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
  STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -190,13 +213,13 @@
- XSLTPROC = @XSLTPROC@
- YACC = @YACC@
- YFLAGS = @YFLAGS@
--abs_builddir = @abs_builddir@
--abs_srcdir = @abs_srcdir@
--abs_top_builddir = @abs_top_builddir@
--abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -208,7 +231,6 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
--builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -239,11 +261,8 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_builddir = @top_builddir@
--top_srcdir = @top_srcdir@
- CLEANFILES = *~
- EXTRA_DIST = README ${MANS} ${XMLS} tst-pam_succeed_if
- TESTS = tst-pam_succeed_if
-@@ -291,7 +310,7 @@
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
--	test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
-+	test -z "$(securelibdir)" || $(mkdir_p) "$(DESTDIR)$(securelibdir)"
- 	@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
- 	  if test -f $$p; then \
- 	    f=$(am__strip_dir) \
-@@ -302,7 +321,7 @@
- 
- uninstall-securelibLTLIBRARIES:
- 	@$(NORMAL_UNINSTALL)
--	@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-+	@set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
- 	  p=$(am__strip_dir) \
- 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
- 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-@@ -317,7 +336,7 @@
- 	  rm -f "$${dir}/so_locations"; \
- 	done
- pam_succeed_if.la: $(pam_succeed_if_la_OBJECTS) $(pam_succeed_if_la_DEPENDENCIES) 
--	$(LINK) -rpath $(securelibdir) $(pam_succeed_if_la_OBJECTS) $(pam_succeed_if_la_LIBADD) $(LIBS)
-+	$(LINK) -rpath $(securelibdir) $(pam_succeed_if_la_LDFLAGS) $(pam_succeed_if_la_OBJECTS) $(pam_succeed_if_la_LIBADD) $(LIBS)
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
-@@ -328,22 +347,22 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_succeed_if.Plo@am__quote@
- 
- .c.o:
--@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c $<
- 
- .c.obj:
--@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
- 
- .c.lo:
--@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-@@ -353,9 +372,13 @@
- 
- clean-libtool:
- 	-rm -rf .libs _libs
-+
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
- install-man8: $(man8_MANS) $(man_MANS)
- 	@$(NORMAL_INSTALL)
--	test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
-+	test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
- 	@list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
- 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
- 	for i in $$l2; do \
-@@ -448,9 +471,9 @@
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
- check-TESTS: $(TESTS)
--	@failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[	 ]'; \
-+	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
- 	srcdir=$(srcdir); export srcdir; \
--	list=' $(TESTS) '; \
-+	list='$(TESTS)'; \
- 	if test -n "$$list"; then \
- 	  for tst in $$list; do \
- 	    if test -f ./$$tst; then dir=./; \
-@@ -459,7 +482,7 @@
- 	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
- 	      all=`expr $$all + 1`; \
- 	      case " $(XFAIL_TESTS) " in \
--	      *$$ws$$tst$$ws*) \
-+	      *" $$tst "*) \
- 		xpass=`expr $$xpass + 1`; \
- 		failed=`expr $$failed + 1`; \
- 		echo "XPASS: $$tst"; \
-@@ -471,7 +494,7 @@
- 	    elif test $$? -ne 77; then \
- 	      all=`expr $$all + 1`; \
- 	      case " $(XFAIL_TESTS) " in \
--	      *$$ws$$tst$$ws*) \
-+	      *" $$tst "*) \
- 		xfail=`expr $$xfail + 1`; \
- 		echo "XFAIL: $$tst"; \
- 	      ;; \
-@@ -521,21 +544,22 @@
- 	else :; fi
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	list='$(DISTFILES)'; \
--	  dist_files=`for file in $$list; do echo $$file; done | \
--	  sed -e "s|^$$srcdirstrip/||;t" \
--	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
--	case $$dist_files in \
--	  */*) $(MKDIR_P) `echo "$$dist_files" | \
--			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
--			   sort -u` ;; \
--	esac; \
--	for file in $$dist_files; do \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
- 	  if test -d $$d/$$file; then \
--	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- 	    fi; \
-@@ -552,7 +576,7 @@
- all-am: Makefile $(LTLIBRARIES) $(MANS) $(DATA)
- installdirs:
- 	for dir in "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man8dir)"; do \
--	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
- 	done
- install: install-am
- install-exec: install-exec-am
-@@ -588,7 +612,7 @@
- 	-rm -rf ./$(DEPDIR)
- 	-rm -f Makefile
- distclean-am: clean-am distclean-compile distclean-generic \
--	distclean-tags
-+	distclean-libtool distclean-tags
- 
- dvi: dvi-am
- 
-@@ -602,20 +626,12 @@
- 
- install-data-am: install-man install-securelibLTLIBRARIES
- 
--install-dvi: install-dvi-am
--
- install-exec-am:
- 
--install-html: install-html-am
--
- install-info: install-info-am
- 
- install-man: install-man8
- 
--install-pdf: install-pdf-am
--
--install-ps: install-ps-am
--
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
-@@ -636,27 +652,24 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-man uninstall-securelibLTLIBRARIES
-+uninstall-am: uninstall-info-am uninstall-man \
-+	uninstall-securelibLTLIBRARIES
- 
- uninstall-man: uninstall-man8
- 
--.MAKE: install-am install-strip
--
- .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
- 	clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
- 	distclean distclean-compile distclean-generic \
- 	distclean-libtool distclean-tags distdir dvi dvi-am html \
- 	html-am info info-am install install-am install-data \
--	install-data-am install-dvi install-dvi-am install-exec \
--	install-exec-am install-html install-html-am install-info \
--	install-info-am install-man install-man8 install-pdf \
--	install-pdf-am install-ps install-ps-am \
-+	install-data-am install-exec install-exec-am install-info \
-+	install-info-am install-man install-man8 \
- 	install-securelibLTLIBRARIES install-strip installcheck \
- 	installcheck-am installdirs maintainer-clean \
- 	maintainer-clean-generic mostlyclean mostlyclean-compile \
- 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
--	tags uninstall uninstall-am uninstall-man uninstall-man8 \
--	uninstall-securelibLTLIBRARIES
-+	tags uninstall uninstall-am uninstall-info-am uninstall-man \
-+	uninstall-man8 uninstall-securelibLTLIBRARIES
- 
- @ENABLE_REGENERATE_MAN_TRUE@README: pam_succeed_if.8.xml
- @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
 Index: pam/Linux-PAM/modules/pam_tally/Makefile.in
 ===================================================================
 --- pam.orig/Linux-PAM/modules/pam_tally/Makefile.in
 +++ pam/Linux-PAM/modules/pam_tally/Makefile.in
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -21,11 +21,15 @@
- 
- 
- 
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ../..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -72,29 +76,22 @@
- pam_tally_la_LIBADD =
- pam_tally_la_SOURCES = pam_tally.c
- pam_tally_la_OBJECTS = pam_tally.lo
--pam_tally_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
--	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
--	$(pam_tally_la_LDFLAGS) $(LDFLAGS) -o $@
- sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
- PROGRAMS = $(sbin_PROGRAMS)
- am_pam_tally_OBJECTS = pam_tally_app.$(OBJEXT)
- pam_tally_OBJECTS = $(am_pam_tally_OBJECTS)
- pam_tally_LDADD = $(LDADD)
--pam_tally_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
--	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
--	$(pam_tally_LDFLAGS) $(LDFLAGS) -o $@
--DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
--	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+	$(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
--	$(LDFLAGS) -o $@
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = pam_tally.c $(pam_tally_SOURCES)
- DIST_SOURCES = pam_tally.c $(pam_tally_SOURCES)
- man8dir = $(mandir)/man8
-@@ -106,6 +103,8 @@
- CTAGS = ctags
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -130,6 +129,10 @@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
-+ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
-+ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
-+ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
-+ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -138,7 +141,18 @@
- GMSGFMT_015 = @GMSGFMT_015@
- GREP = @GREP@
- HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
--INSTALL = @INSTALL@
-+HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
-+HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
-+HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
-+HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
-+HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
-+HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
-+HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
-+HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
-+HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
-+HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
-+HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
-+HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -150,6 +164,7 @@
+@@ -150,6 +150,7 @@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
  LIBAUDIT = @LIBAUDIT@
@@ -20964,385 +5172,19 @@ Index: pam/Linux-PAM/modules/pam_tally/Makefile.in
  LIBCRACK = @LIBCRACK@
  LIBCRYPT = @LIBCRYPT@
  LIBDB = @LIBDB@
-@@ -173,7 +188,6 @@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
--MKDIR_P = @MKDIR_P@
- MSGFMT = @MSGFMT@
- MSGFMT_015 = @MSGFMT_015@
- MSGMERGE = @MSGMERGE@
-@@ -192,8 +206,11 @@
+@@ -192,6 +193,7 @@
  RANLIB = @RANLIB@
  SCONFIGDIR = @SCONFIGDIR@
  SECUREDIR = @SECUREDIR@
 +SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
-+STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
-+STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
  STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -207,13 +224,13 @@
- XSLTPROC = @XSLTPROC@
- YACC = @YACC@
- YFLAGS = @YFLAGS@
--abs_builddir = @abs_builddir@
--abs_srcdir = @abs_srcdir@
--abs_top_builddir = @abs_top_builddir@
--abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -225,7 +242,6 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
--builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -256,11 +272,8 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_builddir = @top_builddir@
--top_srcdir = @top_srcdir@
- CLEANFILES = *~
- EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_tally
- man_MANS = pam_tally.8
-@@ -311,7 +324,7 @@
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
--	test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
-+	test -z "$(securelibdir)" || $(mkdir_p) "$(DESTDIR)$(securelibdir)"
- 	@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
- 	  if test -f $$p; then \
- 	    f=$(am__strip_dir) \
-@@ -322,7 +335,7 @@
- 
- uninstall-securelibLTLIBRARIES:
- 	@$(NORMAL_UNINSTALL)
--	@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-+	@set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
- 	  p=$(am__strip_dir) \
- 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
- 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-@@ -337,10 +350,10 @@
- 	  rm -f "$${dir}/so_locations"; \
- 	done
- pam_tally.la: $(pam_tally_la_OBJECTS) $(pam_tally_la_DEPENDENCIES) 
--	$(pam_tally_la_LINK) -rpath $(securelibdir) $(pam_tally_la_OBJECTS) $(pam_tally_la_LIBADD) $(LIBS)
-+	$(LINK) -rpath $(securelibdir) $(pam_tally_la_LDFLAGS) $(pam_tally_la_OBJECTS) $(pam_tally_la_LIBADD) $(LIBS)
- install-sbinPROGRAMS: $(sbin_PROGRAMS)
- 	@$(NORMAL_INSTALL)
--	test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)"
-+	test -z "$(sbindir)" || $(mkdir_p) "$(DESTDIR)$(sbindir)"
- 	@list='$(sbin_PROGRAMS)'; for p in $$list; do \
- 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
- 	  if test -f $$p \
-@@ -368,7 +381,7 @@
- 	done
- pam_tally$(EXEEXT): $(pam_tally_OBJECTS) $(pam_tally_DEPENDENCIES) 
- 	@rm -f pam_tally$(EXEEXT)
--	$(pam_tally_LINK) $(pam_tally_OBJECTS) $(pam_tally_LDADD) $(LIBS)
-+	$(LINK) $(pam_tally_LDFLAGS) $(pam_tally_OBJECTS) $(pam_tally_LDADD) $(LIBS)
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
-@@ -380,22 +393,22 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_tally_app.Po@am__quote@
- 
- .c.o:
--@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c $<
- 
- .c.obj:
--@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
- 
- .c.lo:
--@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-@@ -405,9 +418,13 @@
- 
- clean-libtool:
- 	-rm -rf .libs _libs
-+
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
- install-man8: $(man8_MANS) $(man_MANS)
- 	@$(NORMAL_INSTALL)
--	test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
-+	test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
- 	@list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
- 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
- 	for i in $$l2; do \
-@@ -500,9 +517,9 @@
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
- check-TESTS: $(TESTS)
--	@failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[	 ]'; \
-+	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
- 	srcdir=$(srcdir); export srcdir; \
--	list=' $(TESTS) '; \
-+	list='$(TESTS)'; \
- 	if test -n "$$list"; then \
- 	  for tst in $$list; do \
- 	    if test -f ./$$tst; then dir=./; \
-@@ -511,7 +528,7 @@
- 	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
- 	      all=`expr $$all + 1`; \
- 	      case " $(XFAIL_TESTS) " in \
--	      *$$ws$$tst$$ws*) \
-+	      *" $$tst "*) \
- 		xpass=`expr $$xpass + 1`; \
- 		failed=`expr $$failed + 1`; \
- 		echo "XPASS: $$tst"; \
-@@ -523,7 +540,7 @@
- 	    elif test $$? -ne 77; then \
- 	      all=`expr $$all + 1`; \
- 	      case " $(XFAIL_TESTS) " in \
--	      *$$ws$$tst$$ws*) \
-+	      *" $$tst "*) \
- 		xfail=`expr $$xfail + 1`; \
- 		echo "XFAIL: $$tst"; \
- 	      ;; \
-@@ -573,21 +590,22 @@
- 	else :; fi
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	list='$(DISTFILES)'; \
--	  dist_files=`for file in $$list; do echo $$file; done | \
--	  sed -e "s|^$$srcdirstrip/||;t" \
--	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
--	case $$dist_files in \
--	  */*) $(MKDIR_P) `echo "$$dist_files" | \
--			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
--			   sort -u` ;; \
--	esac; \
--	for file in $$dist_files; do \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
- 	  if test -d $$d/$$file; then \
--	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- 	    fi; \
-@@ -604,7 +622,7 @@
- all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(MANS) $(DATA) $(HEADERS)
- installdirs:
- 	for dir in "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man8dir)"; do \
--	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
- 	done
- install: install-am
- install-exec: install-exec-am
-@@ -640,7 +658,7 @@
- 	-rm -rf ./$(DEPDIR)
- 	-rm -f Makefile
- distclean-am: clean-am distclean-compile distclean-generic \
--	distclean-tags
-+	distclean-libtool distclean-tags
- 
- dvi: dvi-am
- 
-@@ -654,20 +672,12 @@
- 
- install-data-am: install-man install-securelibLTLIBRARIES
- 
--install-dvi: install-dvi-am
--
- install-exec-am: install-sbinPROGRAMS
- 
--install-html: install-html-am
--
- install-info: install-info-am
- 
- install-man: install-man8
- 
--install-pdf: install-pdf-am
--
--install-ps: install-ps-am
--
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
-@@ -688,29 +698,25 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-man uninstall-sbinPROGRAMS \
-+uninstall-am: uninstall-info-am uninstall-man uninstall-sbinPROGRAMS \
- 	uninstall-securelibLTLIBRARIES
- 
- uninstall-man: uninstall-man8
- 
--.MAKE: install-am install-strip
--
- .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
- 	clean-generic clean-libtool clean-sbinPROGRAMS \
- 	clean-securelibLTLIBRARIES ctags distclean distclean-compile \
- 	distclean-generic distclean-libtool distclean-tags distdir dvi \
- 	dvi-am html html-am info info-am install install-am \
--	install-data install-data-am install-dvi install-dvi-am \
--	install-exec install-exec-am install-html install-html-am \
-+	install-data install-data-am install-exec install-exec-am \
- 	install-info install-info-am install-man install-man8 \
--	install-pdf install-pdf-am install-ps install-ps-am \
- 	install-sbinPROGRAMS install-securelibLTLIBRARIES \
- 	install-strip installcheck installcheck-am installdirs \
- 	maintainer-clean maintainer-clean-generic mostlyclean \
- 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
--	pdf pdf-am ps ps-am tags uninstall uninstall-am uninstall-man \
--	uninstall-man8 uninstall-sbinPROGRAMS \
--	uninstall-securelibLTLIBRARIES
-+	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-+	uninstall-info-am uninstall-man uninstall-man8 \
-+	uninstall-sbinPROGRAMS uninstall-securelibLTLIBRARIES
- 
- @ENABLE_REGENERATE_MAN_TRUE@README: pam_tally.8.xml
- @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
 Index: pam/Linux-PAM/modules/pam_time/Makefile.in
 ===================================================================
 --- pam.orig/Linux-PAM/modules/pam_time/Makefile.in
 +++ pam/Linux-PAM/modules/pam_time/Makefile.in
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -19,11 +19,15 @@
- #
- 
- 
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ../..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -68,18 +72,17 @@
- pam_time_la_LIBADD =
- pam_time_la_SOURCES = pam_time.c
- pam_time_la_OBJECTS = pam_time.lo
--DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
--	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+	$(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
--	$(LDFLAGS) -o $@
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = pam_time.c
- DIST_SOURCES = pam_time.c
- man5dir = $(mandir)/man5
-@@ -92,6 +95,8 @@
- CTAGS = ctags
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -116,6 +121,10 @@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
-+ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
-+ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
-+ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
-+ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -124,7 +133,18 @@
- GMSGFMT_015 = @GMSGFMT_015@
- GREP = @GREP@
- HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
--INSTALL = @INSTALL@
-+HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
-+HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
-+HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
-+HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
-+HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
-+HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
-+HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
-+HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
-+HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
-+HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
-+HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
-+HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -136,6 +156,7 @@
+@@ -136,6 +136,7 @@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
  LIBAUDIT = @LIBAUDIT@
@@ -21350,390 +5192,19 @@ Index: pam/Linux-PAM/modules/pam_time/Makefile.in
  LIBCRACK = @LIBCRACK@
  LIBCRYPT = @LIBCRYPT@
  LIBDB = @LIBDB@
-@@ -159,7 +180,6 @@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
--MKDIR_P = @MKDIR_P@
- MSGFMT = @MSGFMT@
- MSGFMT_015 = @MSGFMT_015@
- MSGMERGE = @MSGMERGE@
-@@ -178,8 +198,11 @@
+@@ -178,6 +179,7 @@
  RANLIB = @RANLIB@
  SCONFIGDIR = @SCONFIGDIR@
  SECUREDIR = @SECUREDIR@
 +SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
-+STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
-+STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
  STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -193,13 +216,13 @@
- XSLTPROC = @XSLTPROC@
- YACC = @YACC@
- YFLAGS = @YFLAGS@
--abs_builddir = @abs_builddir@
--abs_srcdir = @abs_srcdir@
--abs_top_builddir = @abs_top_builddir@
--abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -211,7 +234,6 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
--builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -242,11 +264,8 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_builddir = @top_builddir@
--top_srcdir = @top_srcdir@
- CLEANFILES = *~
- EXTRA_DIST = README $(MANS) $(XMLS) time.conf tst-pam_time
- man_MANS = time.conf.5 pam_time.8
-@@ -297,7 +316,7 @@
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
--	test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
-+	test -z "$(securelibdir)" || $(mkdir_p) "$(DESTDIR)$(securelibdir)"
- 	@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
- 	  if test -f $$p; then \
- 	    f=$(am__strip_dir) \
-@@ -308,7 +327,7 @@
- 
- uninstall-securelibLTLIBRARIES:
- 	@$(NORMAL_UNINSTALL)
--	@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-+	@set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
- 	  p=$(am__strip_dir) \
- 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
- 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-@@ -323,7 +342,7 @@
- 	  rm -f "$${dir}/so_locations"; \
- 	done
- pam_time.la: $(pam_time_la_OBJECTS) $(pam_time_la_DEPENDENCIES) 
--	$(LINK) -rpath $(securelibdir) $(pam_time_la_OBJECTS) $(pam_time_la_LIBADD) $(LIBS)
-+	$(LINK) -rpath $(securelibdir) $(pam_time_la_LDFLAGS) $(pam_time_la_OBJECTS) $(pam_time_la_LIBADD) $(LIBS)
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
-@@ -334,22 +353,22 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_time.Plo@am__quote@
- 
- .c.o:
--@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c $<
- 
- .c.obj:
--@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
- 
- .c.lo:
--@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-@@ -359,9 +378,13 @@
- 
- clean-libtool:
- 	-rm -rf .libs _libs
-+
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
- install-man5: $(man5_MANS) $(man_MANS)
- 	@$(NORMAL_INSTALL)
--	test -z "$(man5dir)" || $(MKDIR_P) "$(DESTDIR)$(man5dir)"
-+	test -z "$(man5dir)" || $(mkdir_p) "$(DESTDIR)$(man5dir)"
- 	@list='$(man5_MANS) $(dist_man5_MANS) $(nodist_man5_MANS)'; \
- 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
- 	for i in $$l2; do \
-@@ -406,7 +429,7 @@
- 	done
- install-man8: $(man8_MANS) $(man_MANS)
- 	@$(NORMAL_INSTALL)
--	test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
-+	test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
- 	@list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
- 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
- 	for i in $$l2; do \
-@@ -451,7 +474,7 @@
- 	done
- install-secureconfDATA: $(secureconf_DATA)
- 	@$(NORMAL_INSTALL)
--	test -z "$(secureconfdir)" || $(MKDIR_P) "$(DESTDIR)$(secureconfdir)"
-+	test -z "$(secureconfdir)" || $(mkdir_p) "$(DESTDIR)$(secureconfdir)"
- 	@list='$(secureconf_DATA)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  f=$(am__strip_dir) \
-@@ -516,9 +539,9 @@
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
- check-TESTS: $(TESTS)
--	@failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[	 ]'; \
-+	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
- 	srcdir=$(srcdir); export srcdir; \
--	list=' $(TESTS) '; \
-+	list='$(TESTS)'; \
- 	if test -n "$$list"; then \
- 	  for tst in $$list; do \
- 	    if test -f ./$$tst; then dir=./; \
-@@ -527,7 +550,7 @@
- 	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
- 	      all=`expr $$all + 1`; \
- 	      case " $(XFAIL_TESTS) " in \
--	      *$$ws$$tst$$ws*) \
-+	      *" $$tst "*) \
- 		xpass=`expr $$xpass + 1`; \
- 		failed=`expr $$failed + 1`; \
- 		echo "XPASS: $$tst"; \
-@@ -539,7 +562,7 @@
- 	    elif test $$? -ne 77; then \
- 	      all=`expr $$all + 1`; \
- 	      case " $(XFAIL_TESTS) " in \
--	      *$$ws$$tst$$ws*) \
-+	      *" $$tst "*) \
- 		xfail=`expr $$xfail + 1`; \
- 		echo "XFAIL: $$tst"; \
- 	      ;; \
-@@ -589,21 +612,22 @@
- 	else :; fi
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	list='$(DISTFILES)'; \
--	  dist_files=`for file in $$list; do echo $$file; done | \
--	  sed -e "s|^$$srcdirstrip/||;t" \
--	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
--	case $$dist_files in \
--	  */*) $(MKDIR_P) `echo "$$dist_files" | \
--			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
--			   sort -u` ;; \
--	esac; \
--	for file in $$dist_files; do \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
- 	  if test -d $$d/$$file; then \
--	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- 	    fi; \
-@@ -620,7 +644,7 @@
- all-am: Makefile $(LTLIBRARIES) $(MANS) $(DATA)
- installdirs:
- 	for dir in "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(secureconfdir)"; do \
--	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
- 	done
- install: install-am
- install-exec: install-exec-am
-@@ -656,7 +680,7 @@
- 	-rm -rf ./$(DEPDIR)
- 	-rm -f Makefile
- distclean-am: clean-am distclean-compile distclean-generic \
--	distclean-tags
-+	distclean-libtool distclean-tags
- 
- dvi: dvi-am
- 
-@@ -671,20 +695,12 @@
- install-data-am: install-man install-secureconfDATA \
- 	install-securelibLTLIBRARIES
- 
--install-dvi: install-dvi-am
--
- install-exec-am:
- 
--install-html: install-html-am
--
- install-info: install-info-am
- 
- install-man: install-man5 install-man8
- 
--install-pdf: install-pdf-am
--
--install-ps: install-ps-am
--
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
-@@ -705,29 +721,25 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-man uninstall-secureconfDATA \
-+uninstall-am: uninstall-info-am uninstall-man uninstall-secureconfDATA \
- 	uninstall-securelibLTLIBRARIES
- 
- uninstall-man: uninstall-man5 uninstall-man8
- 
--.MAKE: install-am install-strip
--
- .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
- 	clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
- 	distclean distclean-compile distclean-generic \
- 	distclean-libtool distclean-tags distdir dvi dvi-am html \
- 	html-am info info-am install install-am install-data \
--	install-data-am install-dvi install-dvi-am install-exec \
--	install-exec-am install-html install-html-am install-info \
-+	install-data-am install-exec install-exec-am install-info \
- 	install-info-am install-man install-man5 install-man8 \
--	install-pdf install-pdf-am install-ps install-ps-am \
- 	install-secureconfDATA install-securelibLTLIBRARIES \
- 	install-strip installcheck installcheck-am installdirs \
- 	maintainer-clean maintainer-clean-generic mostlyclean \
- 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
--	pdf pdf-am ps ps-am tags uninstall uninstall-am uninstall-man \
--	uninstall-man5 uninstall-man8 uninstall-secureconfDATA \
--	uninstall-securelibLTLIBRARIES
-+	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-+	uninstall-info-am uninstall-man uninstall-man5 uninstall-man8 \
-+	uninstall-secureconfDATA uninstall-securelibLTLIBRARIES
- 
- @ENABLE_REGENERATE_MAN_TRUE@README: pam_time.8.xml time.conf.5.xml
- @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
 Index: pam/Linux-PAM/modules/pam_umask/Makefile.in
 ===================================================================
 --- pam.orig/Linux-PAM/modules/pam_umask/Makefile.in
 +++ pam/Linux-PAM/modules/pam_umask/Makefile.in
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -19,11 +19,15 @@
- #
- 
- 
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ../..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -67,18 +71,17 @@
- pam_umask_la_LIBADD =
- pam_umask_la_SOURCES = pam_umask.c
- pam_umask_la_OBJECTS = pam_umask.lo
--DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
--	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+	$(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
--	$(LDFLAGS) -o $@
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = pam_umask.c
- DIST_SOURCES = pam_umask.c
- man8dir = $(mandir)/man8
-@@ -89,6 +92,8 @@
- CTAGS = ctags
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -113,6 +118,10 @@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
-+ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
-+ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
-+ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
-+ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -121,7 +130,18 @@
- GMSGFMT_015 = @GMSGFMT_015@
- GREP = @GREP@
- HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
--INSTALL = @INSTALL@
-+HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
-+HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
-+HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
-+HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
-+HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
-+HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
-+HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
-+HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
-+HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
-+HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
-+HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
-+HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -133,6 +153,7 @@
+@@ -133,6 +133,7 @@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
  LIBAUDIT = @LIBAUDIT@
@@ -21741,392 +5212,42 @@ Index: pam/Linux-PAM/modules/pam_umask/Makefile.in
  LIBCRACK = @LIBCRACK@
  LIBCRYPT = @LIBCRYPT@
  LIBDB = @LIBDB@
-@@ -156,7 +177,6 @@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
--MKDIR_P = @MKDIR_P@
- MSGFMT = @MSGFMT@
- MSGFMT_015 = @MSGFMT_015@
- MSGMERGE = @MSGMERGE@
-@@ -175,8 +195,11 @@
+@@ -175,6 +176,7 @@
  RANLIB = @RANLIB@
  SCONFIGDIR = @SCONFIGDIR@
  SECUREDIR = @SECUREDIR@
 +SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
-+STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
-+STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
  STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -190,13 +213,13 @@
- XSLTPROC = @XSLTPROC@
- YACC = @YACC@
- YFLAGS = @YFLAGS@
--abs_builddir = @abs_builddir@
--abs_srcdir = @abs_srcdir@
--abs_top_builddir = @abs_top_builddir@
--abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -208,7 +231,6 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
--builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -239,11 +261,8 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_builddir = @top_builddir@
--top_srcdir = @top_srcdir@
- CLEANFILES = *~
- EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_umask
- man_MANS = pam_umask.8
-@@ -291,7 +310,7 @@
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
--	test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
-+	test -z "$(securelibdir)" || $(mkdir_p) "$(DESTDIR)$(securelibdir)"
- 	@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
- 	  if test -f $$p; then \
- 	    f=$(am__strip_dir) \
-@@ -302,7 +321,7 @@
- 
- uninstall-securelibLTLIBRARIES:
- 	@$(NORMAL_UNINSTALL)
--	@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-+	@set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
- 	  p=$(am__strip_dir) \
- 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
- 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-@@ -317,7 +336,7 @@
- 	  rm -f "$${dir}/so_locations"; \
- 	done
- pam_umask.la: $(pam_umask_la_OBJECTS) $(pam_umask_la_DEPENDENCIES) 
--	$(LINK) -rpath $(securelibdir) $(pam_umask_la_OBJECTS) $(pam_umask_la_LIBADD) $(LIBS)
-+	$(LINK) -rpath $(securelibdir) $(pam_umask_la_LDFLAGS) $(pam_umask_la_OBJECTS) $(pam_umask_la_LIBADD) $(LIBS)
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
-@@ -328,22 +347,22 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_umask.Plo@am__quote@
- 
- .c.o:
--@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c $<
- 
- .c.obj:
--@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
- 
- .c.lo:
--@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-@@ -353,9 +372,13 @@
- 
- clean-libtool:
- 	-rm -rf .libs _libs
-+
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
- install-man8: $(man8_MANS) $(man_MANS)
- 	@$(NORMAL_INSTALL)
--	test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
-+	test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
- 	@list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
- 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
- 	for i in $$l2; do \
-@@ -448,9 +471,9 @@
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
- check-TESTS: $(TESTS)
--	@failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[	 ]'; \
-+	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
- 	srcdir=$(srcdir); export srcdir; \
--	list=' $(TESTS) '; \
-+	list='$(TESTS)'; \
- 	if test -n "$$list"; then \
- 	  for tst in $$list; do \
- 	    if test -f ./$$tst; then dir=./; \
-@@ -459,7 +482,7 @@
- 	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
- 	      all=`expr $$all + 1`; \
- 	      case " $(XFAIL_TESTS) " in \
--	      *$$ws$$tst$$ws*) \
-+	      *" $$tst "*) \
- 		xpass=`expr $$xpass + 1`; \
- 		failed=`expr $$failed + 1`; \
- 		echo "XPASS: $$tst"; \
-@@ -471,7 +494,7 @@
- 	    elif test $$? -ne 77; then \
- 	      all=`expr $$all + 1`; \
- 	      case " $(XFAIL_TESTS) " in \
--	      *$$ws$$tst$$ws*) \
-+	      *" $$tst "*) \
- 		xfail=`expr $$xfail + 1`; \
- 		echo "XFAIL: $$tst"; \
- 	      ;; \
-@@ -521,21 +544,22 @@
- 	else :; fi
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	list='$(DISTFILES)'; \
--	  dist_files=`for file in $$list; do echo $$file; done | \
--	  sed -e "s|^$$srcdirstrip/||;t" \
--	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
--	case $$dist_files in \
--	  */*) $(MKDIR_P) `echo "$$dist_files" | \
--			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
--			   sort -u` ;; \
--	esac; \
--	for file in $$dist_files; do \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
- 	  if test -d $$d/$$file; then \
--	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- 	    fi; \
-@@ -552,7 +576,7 @@
- all-am: Makefile $(LTLIBRARIES) $(MANS) $(DATA)
- installdirs:
- 	for dir in "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man8dir)"; do \
--	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
- 	done
- install: install-am
- install-exec: install-exec-am
-@@ -588,7 +612,7 @@
- 	-rm -rf ./$(DEPDIR)
- 	-rm -f Makefile
- distclean-am: clean-am distclean-compile distclean-generic \
--	distclean-tags
-+	distclean-libtool distclean-tags
- 
- dvi: dvi-am
- 
-@@ -602,20 +626,12 @@
- 
- install-data-am: install-man install-securelibLTLIBRARIES
- 
--install-dvi: install-dvi-am
--
- install-exec-am:
- 
--install-html: install-html-am
--
- install-info: install-info-am
- 
- install-man: install-man8
- 
--install-pdf: install-pdf-am
--
--install-ps: install-ps-am
--
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
-@@ -636,27 +652,24 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-man uninstall-securelibLTLIBRARIES
-+uninstall-am: uninstall-info-am uninstall-man \
-+	uninstall-securelibLTLIBRARIES
- 
- uninstall-man: uninstall-man8
- 
--.MAKE: install-am install-strip
--
- .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
- 	clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
- 	distclean distclean-compile distclean-generic \
- 	distclean-libtool distclean-tags distdir dvi dvi-am html \
- 	html-am info info-am install install-am install-data \
--	install-data-am install-dvi install-dvi-am install-exec \
--	install-exec-am install-html install-html-am install-info \
--	install-info-am install-man install-man8 install-pdf \
--	install-pdf-am install-ps install-ps-am \
-+	install-data-am install-exec install-exec-am install-info \
-+	install-info-am install-man install-man8 \
- 	install-securelibLTLIBRARIES install-strip installcheck \
- 	installcheck-am installdirs maintainer-clean \
- 	maintainer-clean-generic mostlyclean mostlyclean-compile \
- 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
--	tags uninstall uninstall-am uninstall-man uninstall-man8 \
--	uninstall-securelibLTLIBRARIES
-+	tags uninstall uninstall-am uninstall-info-am uninstall-man \
-+	uninstall-man8 uninstall-securelibLTLIBRARIES
- 
- @ENABLE_REGENERATE_MAN_TRUE@README: pam_umask.8.xml
- @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
 Index: pam/Linux-PAM/modules/pam_unix/Makefile.in
 ===================================================================
 --- pam.orig/Linux-PAM/modules/pam_unix/Makefile.in
 +++ pam/Linux-PAM/modules/pam_unix/Makefile.in
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -21,11 +21,15 @@
- 
- 
- 
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ../..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -77,39 +81,29 @@
+@@ -40,8 +40,7 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ @HAVE_LIBSELINUX_TRUE@am__append_1 = -D"WITH_SELINUX"
+-@HAVE_LIBCRACK_TRUE@am__append_2 = -D"USE_CRACKLIB"
+-@HAVE_VERSIONING_TRUE@am__append_3 = -Wl,--version-script=$(srcdir)/../modules.map
++@HAVE_VERSIONING_TRUE@am__append_2 = -Wl,--version-script=$(srcdir)/../modules.map
+ sbin_PROGRAMS = unix_chkpwd$(EXEEXT)
+ noinst_PROGRAMS = bigcrypt$(EXEEXT)
+ subdir = modules/pam_unix
+@@ -72,10 +71,10 @@
+ 	"$(DESTDIR)$(man8dir)"
+ securelibLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(securelib_LTLIBRARIES)
+-pam_unix_la_LIBADD =
++pam_unix_la_DEPENDENCIES = ../pam_securetty/tty_secure.lo
+ am_pam_unix_la_OBJECTS = bigcrypt.lo pam_unix_acct.lo pam_unix_auth.lo \
  	pam_unix_passwd.lo pam_unix_sess.lo support.lo yppasswd_xdr.lo \
- 	md5_good.lo md5_broken.lo
+-	md5_good.lo md5_broken.lo
++	md5_good.lo md5_broken.lo obscure.lo
  pam_unix_la_OBJECTS = $(am_pam_unix_la_OBJECTS)
--pam_unix_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
--	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
--	$(pam_unix_la_LDFLAGS) $(LDFLAGS) -o $@
- sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
- PROGRAMS = $(noinst_PROGRAMS) $(sbin_PROGRAMS)
- am_bigcrypt_OBJECTS = bigcrypt-bigcrypt.$(OBJEXT) \
- 	bigcrypt-bigcrypt_main.$(OBJEXT)
- bigcrypt_OBJECTS = $(am_bigcrypt_OBJECTS)
- bigcrypt_LDADD = $(LDADD)
--bigcrypt_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=link $(CCLD) $(bigcrypt_CFLAGS) $(CFLAGS) \
--	$(bigcrypt_LDFLAGS) $(LDFLAGS) -o $@
- am_unix_chkpwd_OBJECTS = unix_chkpwd-unix_chkpwd.$(OBJEXT) \
- 	unix_chkpwd-md5_good.$(OBJEXT) \
- 	unix_chkpwd-md5_broken.$(OBJEXT) \
- 	unix_chkpwd-bigcrypt.$(OBJEXT)
- unix_chkpwd_OBJECTS = $(am_unix_chkpwd_OBJECTS)
- unix_chkpwd_LDADD = $(LDADD)
--unix_chkpwd_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
--	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(unix_chkpwd_CFLAGS) \
--	$(CFLAGS) $(unix_chkpwd_LDFLAGS) $(LDFLAGS) -o $@
--DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
--	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+	$(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
--	$(LDFLAGS) -o $@
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(pam_unix_la_SOURCES) $(bigcrypt_SOURCES) \
- 	$(unix_chkpwd_SOURCES)
- DIST_SOURCES = $(pam_unix_la_SOURCES) $(bigcrypt_SOURCES) \
-@@ -123,6 +117,8 @@
- CTAGS = ctags
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -147,6 +143,10 @@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
-+ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
-+ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
-+ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
-+ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -155,7 +155,18 @@
- GMSGFMT_015 = @GMSGFMT_015@
- GREP = @GREP@
- HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
--INSTALL = @INSTALL@
-+HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
-+HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
-+HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
-+HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
-+HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
-+HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
-+HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
-+HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
-+HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
-+HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
-+HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
-+HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -167,6 +178,7 @@
+ pam_unix_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+ 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+@@ -167,6 +166,7 @@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
  LIBAUDIT = @LIBAUDIT@
@@ -22134,505 +5255,51 @@ Index: pam/Linux-PAM/modules/pam_unix/Makefile.in
  LIBCRACK = @LIBCRACK@
  LIBCRYPT = @LIBCRYPT@
  LIBDB = @LIBDB@
-@@ -190,7 +202,6 @@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
--MKDIR_P = @MKDIR_P@
- MSGFMT = @MSGFMT@
- MSGFMT_015 = @MSGFMT_015@
- MSGMERGE = @MSGMERGE@
-@@ -209,8 +220,11 @@
+@@ -209,6 +209,7 @@
  RANLIB = @RANLIB@
  SCONFIGDIR = @SCONFIGDIR@
  SECUREDIR = @SECUREDIR@
 +SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
-+STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
-+STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
  STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -224,13 +238,13 @@
- XSLTPROC = @XSLTPROC@
- YACC = @YACC@
- YFLAGS = @YFLAGS@
--abs_builddir = @abs_builddir@
--abs_srcdir = @abs_srcdir@
--abs_top_builddir = @abs_top_builddir@
--abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -242,7 +256,6 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
--builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -273,11 +286,8 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_builddir = @top_builddir@
--top_srcdir = @top_srcdir@
- CLEANFILES = *~
- EXTRA_DIST = README md5.c md5_crypt.c lckpwdf.-c $(MANS) CHANGELOG \
- 		tst-pam_unix $(XMLS) 
-@@ -344,7 +354,7 @@
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
--	test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
-+	test -z "$(securelibdir)" || $(mkdir_p) "$(DESTDIR)$(securelibdir)"
- 	@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
- 	  if test -f $$p; then \
- 	    f=$(am__strip_dir) \
-@@ -355,7 +365,7 @@
- 
- uninstall-securelibLTLIBRARIES:
- 	@$(NORMAL_UNINSTALL)
--	@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-+	@set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
- 	  p=$(am__strip_dir) \
- 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
- 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-@@ -370,7 +380,7 @@
- 	  rm -f "$${dir}/so_locations"; \
- 	done
- pam_unix.la: $(pam_unix_la_OBJECTS) $(pam_unix_la_DEPENDENCIES) 
--	$(pam_unix_la_LINK) -rpath $(securelibdir) $(pam_unix_la_OBJECTS) $(pam_unix_la_LIBADD) $(LIBS)
-+	$(LINK) -rpath $(securelibdir) $(pam_unix_la_LDFLAGS) $(pam_unix_la_OBJECTS) $(pam_unix_la_LIBADD) $(LIBS)
- 
- clean-noinstPROGRAMS:
- 	@list='$(noinst_PROGRAMS)'; for p in $$list; do \
-@@ -380,7 +390,7 @@
- 	done
- install-sbinPROGRAMS: $(sbin_PROGRAMS)
- 	@$(NORMAL_INSTALL)
--	test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)"
-+	test -z "$(sbindir)" || $(mkdir_p) "$(DESTDIR)$(sbindir)"
- 	@list='$(sbin_PROGRAMS)'; for p in $$list; do \
- 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
- 	  if test -f $$p \
-@@ -408,10 +418,10 @@
- 	done
- bigcrypt$(EXEEXT): $(bigcrypt_OBJECTS) $(bigcrypt_DEPENDENCIES) 
- 	@rm -f bigcrypt$(EXEEXT)
--	$(bigcrypt_LINK) $(bigcrypt_OBJECTS) $(bigcrypt_LDADD) $(LIBS)
-+	$(LINK) $(bigcrypt_LDFLAGS) $(bigcrypt_OBJECTS) $(bigcrypt_LDADD) $(LIBS)
- unix_chkpwd$(EXEEXT): $(unix_chkpwd_OBJECTS) $(unix_chkpwd_DEPENDENCIES) 
- 	@rm -f unix_chkpwd$(EXEEXT)
--	$(unix_chkpwd_LINK) $(unix_chkpwd_OBJECTS) $(unix_chkpwd_LDADD) $(LIBS)
-+	$(LINK) $(unix_chkpwd_LDFLAGS) $(unix_chkpwd_OBJECTS) $(unix_chkpwd_LDADD) $(LIBS)
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
-@@ -436,106 +446,106 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/yppasswd_xdr.Plo@am__quote@
- 
- .c.o:
--@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c $<
- 
- .c.obj:
--@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
- 
- .c.lo:
--@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
- 
- bigcrypt-bigcrypt.o: bigcrypt.c
--@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bigcrypt_CFLAGS) $(CFLAGS) -MT bigcrypt-bigcrypt.o -MD -MP -MF $(DEPDIR)/bigcrypt-bigcrypt.Tpo -c -o bigcrypt-bigcrypt.o `test -f 'bigcrypt.c' || echo '$(srcdir)/'`bigcrypt.c
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/bigcrypt-bigcrypt.Tpo $(DEPDIR)/bigcrypt-bigcrypt.Po
-+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bigcrypt_CFLAGS) $(CFLAGS) -MT bigcrypt-bigcrypt.o -MD -MP -MF "$(DEPDIR)/bigcrypt-bigcrypt.Tpo" -c -o bigcrypt-bigcrypt.o `test -f 'bigcrypt.c' || echo '$(srcdir)/'`bigcrypt.c; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/bigcrypt-bigcrypt.Tpo" "$(DEPDIR)/bigcrypt-bigcrypt.Po"; else rm -f "$(DEPDIR)/bigcrypt-bigcrypt.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='bigcrypt.c' object='bigcrypt-bigcrypt.o' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bigcrypt_CFLAGS) $(CFLAGS) -c -o bigcrypt-bigcrypt.o `test -f 'bigcrypt.c' || echo '$(srcdir)/'`bigcrypt.c
- 
- bigcrypt-bigcrypt.obj: bigcrypt.c
--@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bigcrypt_CFLAGS) $(CFLAGS) -MT bigcrypt-bigcrypt.obj -MD -MP -MF $(DEPDIR)/bigcrypt-bigcrypt.Tpo -c -o bigcrypt-bigcrypt.obj `if test -f 'bigcrypt.c'; then $(CYGPATH_W) 'bigcrypt.c'; else $(CYGPATH_W) '$(srcdir)/bigcrypt.c'; fi`
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/bigcrypt-bigcrypt.Tpo $(DEPDIR)/bigcrypt-bigcrypt.Po
-+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bigcrypt_CFLAGS) $(CFLAGS) -MT bigcrypt-bigcrypt.obj -MD -MP -MF "$(DEPDIR)/bigcrypt-bigcrypt.Tpo" -c -o bigcrypt-bigcrypt.obj `if test -f 'bigcrypt.c'; then $(CYGPATH_W) 'bigcrypt.c'; else $(CYGPATH_W) '$(srcdir)/bigcrypt.c'; fi`; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/bigcrypt-bigcrypt.Tpo" "$(DEPDIR)/bigcrypt-bigcrypt.Po"; else rm -f "$(DEPDIR)/bigcrypt-bigcrypt.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='bigcrypt.c' object='bigcrypt-bigcrypt.obj' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bigcrypt_CFLAGS) $(CFLAGS) -c -o bigcrypt-bigcrypt.obj `if test -f 'bigcrypt.c'; then $(CYGPATH_W) 'bigcrypt.c'; else $(CYGPATH_W) '$(srcdir)/bigcrypt.c'; fi`
- 
- bigcrypt-bigcrypt_main.o: bigcrypt_main.c
--@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bigcrypt_CFLAGS) $(CFLAGS) -MT bigcrypt-bigcrypt_main.o -MD -MP -MF $(DEPDIR)/bigcrypt-bigcrypt_main.Tpo -c -o bigcrypt-bigcrypt_main.o `test -f 'bigcrypt_main.c' || echo '$(srcdir)/'`bigcrypt_main.c
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/bigcrypt-bigcrypt_main.Tpo $(DEPDIR)/bigcrypt-bigcrypt_main.Po
-+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bigcrypt_CFLAGS) $(CFLAGS) -MT bigcrypt-bigcrypt_main.o -MD -MP -MF "$(DEPDIR)/bigcrypt-bigcrypt_main.Tpo" -c -o bigcrypt-bigcrypt_main.o `test -f 'bigcrypt_main.c' || echo '$(srcdir)/'`bigcrypt_main.c; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/bigcrypt-bigcrypt_main.Tpo" "$(DEPDIR)/bigcrypt-bigcrypt_main.Po"; else rm -f "$(DEPDIR)/bigcrypt-bigcrypt_main.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='bigcrypt_main.c' object='bigcrypt-bigcrypt_main.o' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bigcrypt_CFLAGS) $(CFLAGS) -c -o bigcrypt-bigcrypt_main.o `test -f 'bigcrypt_main.c' || echo '$(srcdir)/'`bigcrypt_main.c
- 
- bigcrypt-bigcrypt_main.obj: bigcrypt_main.c
--@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bigcrypt_CFLAGS) $(CFLAGS) -MT bigcrypt-bigcrypt_main.obj -MD -MP -MF $(DEPDIR)/bigcrypt-bigcrypt_main.Tpo -c -o bigcrypt-bigcrypt_main.obj `if test -f 'bigcrypt_main.c'; then $(CYGPATH_W) 'bigcrypt_main.c'; else $(CYGPATH_W) '$(srcdir)/bigcrypt_main.c'; fi`
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/bigcrypt-bigcrypt_main.Tpo $(DEPDIR)/bigcrypt-bigcrypt_main.Po
-+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bigcrypt_CFLAGS) $(CFLAGS) -MT bigcrypt-bigcrypt_main.obj -MD -MP -MF "$(DEPDIR)/bigcrypt-bigcrypt_main.Tpo" -c -o bigcrypt-bigcrypt_main.obj `if test -f 'bigcrypt_main.c'; then $(CYGPATH_W) 'bigcrypt_main.c'; else $(CYGPATH_W) '$(srcdir)/bigcrypt_main.c'; fi`; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/bigcrypt-bigcrypt_main.Tpo" "$(DEPDIR)/bigcrypt-bigcrypt_main.Po"; else rm -f "$(DEPDIR)/bigcrypt-bigcrypt_main.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='bigcrypt_main.c' object='bigcrypt-bigcrypt_main.obj' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bigcrypt_CFLAGS) $(CFLAGS) -c -o bigcrypt-bigcrypt_main.obj `if test -f 'bigcrypt_main.c'; then $(CYGPATH_W) 'bigcrypt_main.c'; else $(CYGPATH_W) '$(srcdir)/bigcrypt_main.c'; fi`
- 
- unix_chkpwd-unix_chkpwd.o: unix_chkpwd.c
--@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unix_chkpwd_CFLAGS) $(CFLAGS) -MT unix_chkpwd-unix_chkpwd.o -MD -MP -MF $(DEPDIR)/unix_chkpwd-unix_chkpwd.Tpo -c -o unix_chkpwd-unix_chkpwd.o `test -f 'unix_chkpwd.c' || echo '$(srcdir)/'`unix_chkpwd.c
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/unix_chkpwd-unix_chkpwd.Tpo $(DEPDIR)/unix_chkpwd-unix_chkpwd.Po
-+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unix_chkpwd_CFLAGS) $(CFLAGS) -MT unix_chkpwd-unix_chkpwd.o -MD -MP -MF "$(DEPDIR)/unix_chkpwd-unix_chkpwd.Tpo" -c -o unix_chkpwd-unix_chkpwd.o `test -f 'unix_chkpwd.c' || echo '$(srcdir)/'`unix_chkpwd.c; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/unix_chkpwd-unix_chkpwd.Tpo" "$(DEPDIR)/unix_chkpwd-unix_chkpwd.Po"; else rm -f "$(DEPDIR)/unix_chkpwd-unix_chkpwd.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='unix_chkpwd.c' object='unix_chkpwd-unix_chkpwd.o' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unix_chkpwd_CFLAGS) $(CFLAGS) -c -o unix_chkpwd-unix_chkpwd.o `test -f 'unix_chkpwd.c' || echo '$(srcdir)/'`unix_chkpwd.c
- 
- unix_chkpwd-unix_chkpwd.obj: unix_chkpwd.c
--@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unix_chkpwd_CFLAGS) $(CFLAGS) -MT unix_chkpwd-unix_chkpwd.obj -MD -MP -MF $(DEPDIR)/unix_chkpwd-unix_chkpwd.Tpo -c -o unix_chkpwd-unix_chkpwd.obj `if test -f 'unix_chkpwd.c'; then $(CYGPATH_W) 'unix_chkpwd.c'; else $(CYGPATH_W) '$(srcdir)/unix_chkpwd.c'; fi`
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/unix_chkpwd-unix_chkpwd.Tpo $(DEPDIR)/unix_chkpwd-unix_chkpwd.Po
-+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unix_chkpwd_CFLAGS) $(CFLAGS) -MT unix_chkpwd-unix_chkpwd.obj -MD -MP -MF "$(DEPDIR)/unix_chkpwd-unix_chkpwd.Tpo" -c -o unix_chkpwd-unix_chkpwd.obj `if test -f 'unix_chkpwd.c'; then $(CYGPATH_W) 'unix_chkpwd.c'; else $(CYGPATH_W) '$(srcdir)/unix_chkpwd.c'; fi`; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/unix_chkpwd-unix_chkpwd.Tpo" "$(DEPDIR)/unix_chkpwd-unix_chkpwd.Po"; else rm -f "$(DEPDIR)/unix_chkpwd-unix_chkpwd.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='unix_chkpwd.c' object='unix_chkpwd-unix_chkpwd.obj' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unix_chkpwd_CFLAGS) $(CFLAGS) -c -o unix_chkpwd-unix_chkpwd.obj `if test -f 'unix_chkpwd.c'; then $(CYGPATH_W) 'unix_chkpwd.c'; else $(CYGPATH_W) '$(srcdir)/unix_chkpwd.c'; fi`
- 
- unix_chkpwd-md5_good.o: md5_good.c
--@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unix_chkpwd_CFLAGS) $(CFLAGS) -MT unix_chkpwd-md5_good.o -MD -MP -MF $(DEPDIR)/unix_chkpwd-md5_good.Tpo -c -o unix_chkpwd-md5_good.o `test -f 'md5_good.c' || echo '$(srcdir)/'`md5_good.c
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/unix_chkpwd-md5_good.Tpo $(DEPDIR)/unix_chkpwd-md5_good.Po
-+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unix_chkpwd_CFLAGS) $(CFLAGS) -MT unix_chkpwd-md5_good.o -MD -MP -MF "$(DEPDIR)/unix_chkpwd-md5_good.Tpo" -c -o unix_chkpwd-md5_good.o `test -f 'md5_good.c' || echo '$(srcdir)/'`md5_good.c; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/unix_chkpwd-md5_good.Tpo" "$(DEPDIR)/unix_chkpwd-md5_good.Po"; else rm -f "$(DEPDIR)/unix_chkpwd-md5_good.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='md5_good.c' object='unix_chkpwd-md5_good.o' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unix_chkpwd_CFLAGS) $(CFLAGS) -c -o unix_chkpwd-md5_good.o `test -f 'md5_good.c' || echo '$(srcdir)/'`md5_good.c
- 
- unix_chkpwd-md5_good.obj: md5_good.c
--@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unix_chkpwd_CFLAGS) $(CFLAGS) -MT unix_chkpwd-md5_good.obj -MD -MP -MF $(DEPDIR)/unix_chkpwd-md5_good.Tpo -c -o unix_chkpwd-md5_good.obj `if test -f 'md5_good.c'; then $(CYGPATH_W) 'md5_good.c'; else $(CYGPATH_W) '$(srcdir)/md5_good.c'; fi`
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/unix_chkpwd-md5_good.Tpo $(DEPDIR)/unix_chkpwd-md5_good.Po
-+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unix_chkpwd_CFLAGS) $(CFLAGS) -MT unix_chkpwd-md5_good.obj -MD -MP -MF "$(DEPDIR)/unix_chkpwd-md5_good.Tpo" -c -o unix_chkpwd-md5_good.obj `if test -f 'md5_good.c'; then $(CYGPATH_W) 'md5_good.c'; else $(CYGPATH_W) '$(srcdir)/md5_good.c'; fi`; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/unix_chkpwd-md5_good.Tpo" "$(DEPDIR)/unix_chkpwd-md5_good.Po"; else rm -f "$(DEPDIR)/unix_chkpwd-md5_good.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='md5_good.c' object='unix_chkpwd-md5_good.obj' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unix_chkpwd_CFLAGS) $(CFLAGS) -c -o unix_chkpwd-md5_good.obj `if test -f 'md5_good.c'; then $(CYGPATH_W) 'md5_good.c'; else $(CYGPATH_W) '$(srcdir)/md5_good.c'; fi`
- 
- unix_chkpwd-md5_broken.o: md5_broken.c
--@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unix_chkpwd_CFLAGS) $(CFLAGS) -MT unix_chkpwd-md5_broken.o -MD -MP -MF $(DEPDIR)/unix_chkpwd-md5_broken.Tpo -c -o unix_chkpwd-md5_broken.o `test -f 'md5_broken.c' || echo '$(srcdir)/'`md5_broken.c
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/unix_chkpwd-md5_broken.Tpo $(DEPDIR)/unix_chkpwd-md5_broken.Po
-+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unix_chkpwd_CFLAGS) $(CFLAGS) -MT unix_chkpwd-md5_broken.o -MD -MP -MF "$(DEPDIR)/unix_chkpwd-md5_broken.Tpo" -c -o unix_chkpwd-md5_broken.o `test -f 'md5_broken.c' || echo '$(srcdir)/'`md5_broken.c; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/unix_chkpwd-md5_broken.Tpo" "$(DEPDIR)/unix_chkpwd-md5_broken.Po"; else rm -f "$(DEPDIR)/unix_chkpwd-md5_broken.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='md5_broken.c' object='unix_chkpwd-md5_broken.o' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unix_chkpwd_CFLAGS) $(CFLAGS) -c -o unix_chkpwd-md5_broken.o `test -f 'md5_broken.c' || echo '$(srcdir)/'`md5_broken.c
- 
- unix_chkpwd-md5_broken.obj: md5_broken.c
--@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unix_chkpwd_CFLAGS) $(CFLAGS) -MT unix_chkpwd-md5_broken.obj -MD -MP -MF $(DEPDIR)/unix_chkpwd-md5_broken.Tpo -c -o unix_chkpwd-md5_broken.obj `if test -f 'md5_broken.c'; then $(CYGPATH_W) 'md5_broken.c'; else $(CYGPATH_W) '$(srcdir)/md5_broken.c'; fi`
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/unix_chkpwd-md5_broken.Tpo $(DEPDIR)/unix_chkpwd-md5_broken.Po
-+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unix_chkpwd_CFLAGS) $(CFLAGS) -MT unix_chkpwd-md5_broken.obj -MD -MP -MF "$(DEPDIR)/unix_chkpwd-md5_broken.Tpo" -c -o unix_chkpwd-md5_broken.obj `if test -f 'md5_broken.c'; then $(CYGPATH_W) 'md5_broken.c'; else $(CYGPATH_W) '$(srcdir)/md5_broken.c'; fi`; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/unix_chkpwd-md5_broken.Tpo" "$(DEPDIR)/unix_chkpwd-md5_broken.Po"; else rm -f "$(DEPDIR)/unix_chkpwd-md5_broken.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='md5_broken.c' object='unix_chkpwd-md5_broken.obj' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unix_chkpwd_CFLAGS) $(CFLAGS) -c -o unix_chkpwd-md5_broken.obj `if test -f 'md5_broken.c'; then $(CYGPATH_W) 'md5_broken.c'; else $(CYGPATH_W) '$(srcdir)/md5_broken.c'; fi`
- 
- unix_chkpwd-bigcrypt.o: bigcrypt.c
--@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unix_chkpwd_CFLAGS) $(CFLAGS) -MT unix_chkpwd-bigcrypt.o -MD -MP -MF $(DEPDIR)/unix_chkpwd-bigcrypt.Tpo -c -o unix_chkpwd-bigcrypt.o `test -f 'bigcrypt.c' || echo '$(srcdir)/'`bigcrypt.c
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/unix_chkpwd-bigcrypt.Tpo $(DEPDIR)/unix_chkpwd-bigcrypt.Po
-+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unix_chkpwd_CFLAGS) $(CFLAGS) -MT unix_chkpwd-bigcrypt.o -MD -MP -MF "$(DEPDIR)/unix_chkpwd-bigcrypt.Tpo" -c -o unix_chkpwd-bigcrypt.o `test -f 'bigcrypt.c' || echo '$(srcdir)/'`bigcrypt.c; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/unix_chkpwd-bigcrypt.Tpo" "$(DEPDIR)/unix_chkpwd-bigcrypt.Po"; else rm -f "$(DEPDIR)/unix_chkpwd-bigcrypt.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='bigcrypt.c' object='unix_chkpwd-bigcrypt.o' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unix_chkpwd_CFLAGS) $(CFLAGS) -c -o unix_chkpwd-bigcrypt.o `test -f 'bigcrypt.c' || echo '$(srcdir)/'`bigcrypt.c
- 
- unix_chkpwd-bigcrypt.obj: bigcrypt.c
--@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unix_chkpwd_CFLAGS) $(CFLAGS) -MT unix_chkpwd-bigcrypt.obj -MD -MP -MF $(DEPDIR)/unix_chkpwd-bigcrypt.Tpo -c -o unix_chkpwd-bigcrypt.obj `if test -f 'bigcrypt.c'; then $(CYGPATH_W) 'bigcrypt.c'; else $(CYGPATH_W) '$(srcdir)/bigcrypt.c'; fi`
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/unix_chkpwd-bigcrypt.Tpo $(DEPDIR)/unix_chkpwd-bigcrypt.Po
-+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unix_chkpwd_CFLAGS) $(CFLAGS) -MT unix_chkpwd-bigcrypt.obj -MD -MP -MF "$(DEPDIR)/unix_chkpwd-bigcrypt.Tpo" -c -o unix_chkpwd-bigcrypt.obj `if test -f 'bigcrypt.c'; then $(CYGPATH_W) 'bigcrypt.c'; else $(CYGPATH_W) '$(srcdir)/bigcrypt.c'; fi`; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/unix_chkpwd-bigcrypt.Tpo" "$(DEPDIR)/unix_chkpwd-bigcrypt.Po"; else rm -f "$(DEPDIR)/unix_chkpwd-bigcrypt.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='bigcrypt.c' object='unix_chkpwd-bigcrypt.obj' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unix_chkpwd_CFLAGS) $(CFLAGS) -c -o unix_chkpwd-bigcrypt.obj `if test -f 'bigcrypt.c'; then $(CYGPATH_W) 'bigcrypt.c'; else $(CYGPATH_W) '$(srcdir)/bigcrypt.c'; fi`
-@@ -545,9 +555,13 @@
- 
- clean-libtool:
- 	-rm -rf .libs _libs
+@@ -289,16 +290,18 @@
+ secureconfdir = $(SCONFIGDIR)
+ AM_CFLAGS = -I$(top_srcdir)/libpam/include \
+ 	-I$(top_srcdir)/libpamc/include \
+-	-DCHKPWD_HELPER=\"$(sbindir)/unix_chkpwd\" $(am__append_1) \
++	-DCHKPWD_HELPER=\"$(sbindir)/unix_chkpwd\" $(am__append_1)
++pam_unix_la_LDFLAGS = -no-undefined -avoid-version -module @LIBNSL@ \
++	-L$(top_builddir)/libpam -lpam @LIBCRYPT@ @LIBSELINUX@ \
+ 	$(am__append_2)
+-pam_unix_la_LDFLAGS = -no-undefined -avoid-version -module @LIBCRACK@ \
+-	@LIBNSL@ -L$(top_builddir)/libpam -lpam @LIBCRYPT@ \
+-	@LIBSELINUX@ $(am__append_3)
+ securelib_LTLIBRARIES = pam_unix.la
+ noinst_HEADERS = md5.h support.h yppasswd.h bigcrypt.h
+ pam_unix_la_SOURCES = bigcrypt.c pam_unix_acct.c \
+ 	pam_unix_auth.c pam_unix_passwd.c pam_unix_sess.c support.c \
+-	yppasswd_xdr.c md5_good.c md5_broken.c
++	yppasswd_xdr.c md5_good.c md5_broken.c obscure.c
 +
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
- install-man8: $(man8_MANS) $(man_MANS)
- 	@$(NORMAL_INSTALL)
--	test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
-+	test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
- 	@list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
- 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
- 	for i in $$l2; do \
-@@ -640,9 +654,9 @@
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
- check-TESTS: $(TESTS)
--	@failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[	 ]'; \
-+	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
- 	srcdir=$(srcdir); export srcdir; \
--	list=' $(TESTS) '; \
-+	list='$(TESTS)'; \
- 	if test -n "$$list"; then \
- 	  for tst in $$list; do \
- 	    if test -f ./$$tst; then dir=./; \
-@@ -651,7 +665,7 @@
- 	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
- 	      all=`expr $$all + 1`; \
- 	      case " $(XFAIL_TESTS) " in \
--	      *$$ws$$tst$$ws*) \
-+	      *" $$tst "*) \
- 		xpass=`expr $$xpass + 1`; \
- 		failed=`expr $$failed + 1`; \
- 		echo "XPASS: $$tst"; \
-@@ -663,7 +677,7 @@
- 	    elif test $$? -ne 77; then \
- 	      all=`expr $$all + 1`; \
- 	      case " $(XFAIL_TESTS) " in \
--	      *$$ws$$tst$$ws*) \
-+	      *" $$tst "*) \
- 		xfail=`expr $$xfail + 1`; \
- 		echo "XFAIL: $$tst"; \
- 	      ;; \
-@@ -713,21 +727,22 @@
- 	else :; fi
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	list='$(DISTFILES)'; \
--	  dist_files=`for file in $$list; do echo $$file; done | \
--	  sed -e "s|^$$srcdirstrip/||;t" \
--	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
--	case $$dist_files in \
--	  */*) $(MKDIR_P) `echo "$$dist_files" | \
--			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
--			   sort -u` ;; \
--	esac; \
--	for file in $$dist_files; do \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
- 	  if test -d $$d/$$file; then \
--	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- 	    fi; \
-@@ -744,7 +759,7 @@
- all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(MANS) $(DATA) $(HEADERS)
- installdirs:
- 	for dir in "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man8dir)"; do \
--	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
- 	done
- install: install-am
- install-exec: install-exec-am
-@@ -780,7 +795,7 @@
- 	-rm -rf ./$(DEPDIR)
- 	-rm -f Makefile
- distclean-am: clean-am distclean-compile distclean-generic \
--	distclean-tags
-+	distclean-libtool distclean-tags
- 
- dvi: dvi-am
- 
-@@ -794,20 +809,12 @@
- 
- install-data-am: install-man install-securelibLTLIBRARIES
- 
--install-dvi: install-dvi-am
--
- install-exec-am: install-sbinPROGRAMS
- 
--install-html: install-html-am
--
- install-info: install-info-am
- 
- install-man: install-man8
- 
--install-pdf: install-pdf-am
--
--install-ps: install-ps-am
--
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
-@@ -828,28 +835,24 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-man uninstall-sbinPROGRAMS \
-+uninstall-am: uninstall-info-am uninstall-man uninstall-sbinPROGRAMS \
- 	uninstall-securelibLTLIBRARIES
- 
- uninstall-man: uninstall-man8
- 
--.MAKE: install-am install-strip
--
- .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
- 	clean-generic clean-libtool clean-noinstPROGRAMS \
- 	clean-sbinPROGRAMS clean-securelibLTLIBRARIES ctags distclean \
- 	distclean-compile distclean-generic distclean-libtool \
- 	distclean-tags distdir dvi dvi-am html html-am info info-am \
--	install install-am install-data install-data-am install-dvi \
--	install-dvi-am install-exec install-exec-am install-html \
--	install-html-am install-info install-info-am install-man \
--	install-man8 install-pdf install-pdf-am install-ps \
--	install-ps-am install-sbinPROGRAMS \
--	install-securelibLTLIBRARIES install-strip installcheck \
--	installcheck-am installdirs maintainer-clean \
--	maintainer-clean-generic mostlyclean mostlyclean-compile \
--	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
--	tags uninstall uninstall-am uninstall-man uninstall-man8 \
-+	install install-am install-data install-data-am install-exec \
-+	install-exec-am install-info install-info-am install-man \
-+	install-man8 install-sbinPROGRAMS install-securelibLTLIBRARIES \
-+	install-strip installcheck installcheck-am installdirs \
-+	maintainer-clean maintainer-clean-generic mostlyclean \
-+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-+	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-+	uninstall-info-am uninstall-man uninstall-man8 \
- 	uninstall-sbinPROGRAMS uninstall-securelibLTLIBRARIES
- 
- @ENABLE_REGENERATE_MAN_TRUE@README: pam_unix.8.xml
++pam_unix_la_LIBADD = \
++	../pam_securetty/tty_secure.lo
+ 
+ bigcrypt_SOURCES = bigcrypt.c bigcrypt_main.c
+ bigcrypt_CFLAGS = $(AM_CFLAGS)
+@@ -424,6 +427,7 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bigcrypt.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/md5_broken.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/md5_good.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/obscure.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_unix_acct.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_unix_auth.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_unix_passwd.Plo@am__quote@
 Index: pam/Linux-PAM/modules/pam_userdb/Makefile.in
 ===================================================================
 --- pam.orig/Linux-PAM/modules/pam_userdb/Makefile.in
 +++ pam/Linux-PAM/modules/pam_userdb/Makefile.in
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -20,11 +20,15 @@
- 
- 
- 
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ../..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -70,18 +74,17 @@
- pam_userdb_la_SOURCES = pam_userdb.c
- pam_userdb_la_OBJECTS = pam_userdb.lo
- @HAVE_LIBDB_TRUE@am_pam_userdb_la_rpath = -rpath $(securelibdir)
--DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
--	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+	$(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
--	$(LDFLAGS) -o $@
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = pam_userdb.c
- DIST_SOURCES = pam_userdb.c
- man8dir = $(mandir)/man8
-@@ -93,6 +96,8 @@
- CTAGS = ctags
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -117,6 +122,10 @@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
-+ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
-+ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
-+ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
-+ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -125,7 +134,18 @@
- GMSGFMT_015 = @GMSGFMT_015@
- GREP = @GREP@
- HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
--INSTALL = @INSTALL@
-+HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
-+HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
-+HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
-+HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
-+HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
-+HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
-+HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
-+HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
-+HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
-+HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
-+HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
-+HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -137,6 +157,7 @@
+@@ -137,6 +137,7 @@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
  LIBAUDIT = @LIBAUDIT@
@@ -22640,371 +5307,19 @@ Index: pam/Linux-PAM/modules/pam_userdb/Makefile.in
  LIBCRACK = @LIBCRACK@
  LIBCRYPT = @LIBCRYPT@
  LIBDB = @LIBDB@
-@@ -160,7 +181,6 @@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
--MKDIR_P = @MKDIR_P@
- MSGFMT = @MSGFMT@
- MSGFMT_015 = @MSGFMT_015@
- MSGMERGE = @MSGMERGE@
-@@ -179,8 +199,11 @@
+@@ -179,6 +180,7 @@
  RANLIB = @RANLIB@
  SCONFIGDIR = @SCONFIGDIR@
  SECUREDIR = @SECUREDIR@
 +SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
-+STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
-+STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
  STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -194,13 +217,13 @@
- XSLTPROC = @XSLTPROC@
- YACC = @YACC@
- YFLAGS = @YFLAGS@
--abs_builddir = @abs_builddir@
--abs_srcdir = @abs_srcdir@
--abs_top_builddir = @abs_top_builddir@
--abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -212,7 +235,6 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
--builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -243,11 +265,8 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_builddir = @top_builddir@
--top_srcdir = @top_srcdir@
- CLEANFILES = *~
- EXTRA_DIST = README $(MANS) $(XMLS) create.pl tst-pam_userdb
- man_MANS = pam_userdb.8
-@@ -297,7 +316,7 @@
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
--	test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
-+	test -z "$(securelibdir)" || $(mkdir_p) "$(DESTDIR)$(securelibdir)"
- 	@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
- 	  if test -f $$p; then \
- 	    f=$(am__strip_dir) \
-@@ -308,7 +327,7 @@
- 
- uninstall-securelibLTLIBRARIES:
- 	@$(NORMAL_UNINSTALL)
--	@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-+	@set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
- 	  p=$(am__strip_dir) \
- 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
- 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-@@ -323,7 +342,7 @@
- 	  rm -f "$${dir}/so_locations"; \
- 	done
- pam_userdb.la: $(pam_userdb_la_OBJECTS) $(pam_userdb_la_DEPENDENCIES) 
--	$(LINK) $(am_pam_userdb_la_rpath) $(pam_userdb_la_OBJECTS) $(pam_userdb_la_LIBADD) $(LIBS)
-+	$(LINK) $(am_pam_userdb_la_rpath) $(pam_userdb_la_LDFLAGS) $(pam_userdb_la_OBJECTS) $(pam_userdb_la_LIBADD) $(LIBS)
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
-@@ -334,22 +353,22 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_userdb.Plo@am__quote@
- 
- .c.o:
--@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c $<
- 
- .c.obj:
--@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
- 
- .c.lo:
--@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-@@ -359,9 +378,13 @@
- 
- clean-libtool:
- 	-rm -rf .libs _libs
-+
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
- install-man8: $(man8_MANS) $(man_MANS)
- 	@$(NORMAL_INSTALL)
--	test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
-+	test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
- 	@list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
- 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
- 	for i in $$l2; do \
-@@ -454,9 +477,9 @@
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
- check-TESTS: $(TESTS)
--	@failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[	 ]'; \
-+	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
- 	srcdir=$(srcdir); export srcdir; \
--	list=' $(TESTS) '; \
-+	list='$(TESTS)'; \
- 	if test -n "$$list"; then \
- 	  for tst in $$list; do \
- 	    if test -f ./$$tst; then dir=./; \
-@@ -465,7 +488,7 @@
- 	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
- 	      all=`expr $$all + 1`; \
- 	      case " $(XFAIL_TESTS) " in \
--	      *$$ws$$tst$$ws*) \
-+	      *" $$tst "*) \
- 		xpass=`expr $$xpass + 1`; \
- 		failed=`expr $$failed + 1`; \
- 		echo "XPASS: $$tst"; \
-@@ -477,7 +500,7 @@
- 	    elif test $$? -ne 77; then \
- 	      all=`expr $$all + 1`; \
- 	      case " $(XFAIL_TESTS) " in \
--	      *$$ws$$tst$$ws*) \
-+	      *" $$tst "*) \
- 		xfail=`expr $$xfail + 1`; \
- 		echo "XFAIL: $$tst"; \
- 	      ;; \
-@@ -527,21 +550,22 @@
- 	else :; fi
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	list='$(DISTFILES)'; \
--	  dist_files=`for file in $$list; do echo $$file; done | \
--	  sed -e "s|^$$srcdirstrip/||;t" \
--	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
--	case $$dist_files in \
--	  */*) $(MKDIR_P) `echo "$$dist_files" | \
--			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
--			   sort -u` ;; \
--	esac; \
--	for file in $$dist_files; do \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
- 	  if test -d $$d/$$file; then \
--	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- 	    fi; \
-@@ -558,7 +582,7 @@
- all-am: Makefile $(LTLIBRARIES) $(MANS) $(DATA) $(HEADERS)
- installdirs:
- 	for dir in "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man8dir)"; do \
--	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
- 	done
- install: install-am
- install-exec: install-exec-am
-@@ -594,7 +618,7 @@
- 	-rm -rf ./$(DEPDIR)
- 	-rm -f Makefile
- distclean-am: clean-am distclean-compile distclean-generic \
--	distclean-tags
-+	distclean-libtool distclean-tags
- 
- dvi: dvi-am
- 
-@@ -608,20 +632,12 @@
- 
- install-data-am: install-man install-securelibLTLIBRARIES
- 
--install-dvi: install-dvi-am
--
- install-exec-am:
- 
--install-html: install-html-am
--
- install-info: install-info-am
- 
- install-man: install-man8
- 
--install-pdf: install-pdf-am
--
--install-ps: install-ps-am
--
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
-@@ -642,27 +658,24 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-man uninstall-securelibLTLIBRARIES
-+uninstall-am: uninstall-info-am uninstall-man \
-+	uninstall-securelibLTLIBRARIES
- 
- uninstall-man: uninstall-man8
- 
--.MAKE: install-am install-strip
--
- .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
- 	clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
- 	distclean distclean-compile distclean-generic \
- 	distclean-libtool distclean-tags distdir dvi dvi-am html \
- 	html-am info info-am install install-am install-data \
--	install-data-am install-dvi install-dvi-am install-exec \
--	install-exec-am install-html install-html-am install-info \
--	install-info-am install-man install-man8 install-pdf \
--	install-pdf-am install-ps install-ps-am \
-+	install-data-am install-exec install-exec-am install-info \
-+	install-info-am install-man install-man8 \
- 	install-securelibLTLIBRARIES install-strip installcheck \
- 	installcheck-am installdirs maintainer-clean \
- 	maintainer-clean-generic mostlyclean mostlyclean-compile \
- 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
--	tags uninstall uninstall-am uninstall-man uninstall-man8 \
--	uninstall-securelibLTLIBRARIES
-+	tags uninstall uninstall-am uninstall-info-am uninstall-man \
-+	uninstall-man8 uninstall-securelibLTLIBRARIES
- 
- @ENABLE_REGENERATE_MAN_TRUE@README: pam_userdb.8.xml
- @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
 Index: pam/Linux-PAM/modules/pam_warn/Makefile.in
 ===================================================================
 --- pam.orig/Linux-PAM/modules/pam_warn/Makefile.in
 +++ pam/Linux-PAM/modules/pam_warn/Makefile.in
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -19,11 +19,15 @@
- #
- 
- 
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ../..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -67,18 +71,17 @@
- pam_warn_la_LIBADD =
- pam_warn_la_SOURCES = pam_warn.c
- pam_warn_la_OBJECTS = pam_warn.lo
--DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
--	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+	$(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
--	$(LDFLAGS) -o $@
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = pam_warn.c
- DIST_SOURCES = pam_warn.c
- man8dir = $(mandir)/man8
-@@ -89,6 +92,8 @@
- CTAGS = ctags
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -113,6 +118,10 @@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
-+ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
-+ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
-+ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
-+ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -121,7 +130,18 @@
- GMSGFMT_015 = @GMSGFMT_015@
- GREP = @GREP@
- HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
--INSTALL = @INSTALL@
-+HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
-+HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
-+HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
-+HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
-+HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
-+HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
-+HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
-+HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
-+HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
-+HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
-+HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
-+HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -133,6 +153,7 @@
+@@ -133,6 +133,7 @@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
  LIBAUDIT = @LIBAUDIT@
@@ -23012,371 +5327,19 @@ Index: pam/Linux-PAM/modules/pam_warn/Makefile.in
  LIBCRACK = @LIBCRACK@
  LIBCRYPT = @LIBCRYPT@
  LIBDB = @LIBDB@
-@@ -156,7 +177,6 @@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
--MKDIR_P = @MKDIR_P@
- MSGFMT = @MSGFMT@
- MSGFMT_015 = @MSGFMT_015@
- MSGMERGE = @MSGMERGE@
-@@ -175,8 +195,11 @@
+@@ -175,6 +176,7 @@
  RANLIB = @RANLIB@
  SCONFIGDIR = @SCONFIGDIR@
  SECUREDIR = @SECUREDIR@
 +SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
-+STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
-+STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
  STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -190,13 +213,13 @@
- XSLTPROC = @XSLTPROC@
- YACC = @YACC@
- YFLAGS = @YFLAGS@
--abs_builddir = @abs_builddir@
--abs_srcdir = @abs_srcdir@
--abs_top_builddir = @abs_top_builddir@
--abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -208,7 +231,6 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
--builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -239,11 +261,8 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_builddir = @top_builddir@
--top_srcdir = @top_srcdir@
- CLEANFILES = *~
- EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_warn
- man_MANS = pam_warn.8
-@@ -291,7 +310,7 @@
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
--	test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
-+	test -z "$(securelibdir)" || $(mkdir_p) "$(DESTDIR)$(securelibdir)"
- 	@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
- 	  if test -f $$p; then \
- 	    f=$(am__strip_dir) \
-@@ -302,7 +321,7 @@
- 
- uninstall-securelibLTLIBRARIES:
- 	@$(NORMAL_UNINSTALL)
--	@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-+	@set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
- 	  p=$(am__strip_dir) \
- 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
- 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-@@ -317,7 +336,7 @@
- 	  rm -f "$${dir}/so_locations"; \
- 	done
- pam_warn.la: $(pam_warn_la_OBJECTS) $(pam_warn_la_DEPENDENCIES) 
--	$(LINK) -rpath $(securelibdir) $(pam_warn_la_OBJECTS) $(pam_warn_la_LIBADD) $(LIBS)
-+	$(LINK) -rpath $(securelibdir) $(pam_warn_la_LDFLAGS) $(pam_warn_la_OBJECTS) $(pam_warn_la_LIBADD) $(LIBS)
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
-@@ -328,22 +347,22 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_warn.Plo@am__quote@
- 
- .c.o:
--@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c $<
- 
- .c.obj:
--@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
- 
- .c.lo:
--@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-@@ -353,9 +372,13 @@
- 
- clean-libtool:
- 	-rm -rf .libs _libs
-+
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
- install-man8: $(man8_MANS) $(man_MANS)
- 	@$(NORMAL_INSTALL)
--	test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
-+	test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
- 	@list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
- 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
- 	for i in $$l2; do \
-@@ -448,9 +471,9 @@
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
- check-TESTS: $(TESTS)
--	@failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[	 ]'; \
-+	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
- 	srcdir=$(srcdir); export srcdir; \
--	list=' $(TESTS) '; \
-+	list='$(TESTS)'; \
- 	if test -n "$$list"; then \
- 	  for tst in $$list; do \
- 	    if test -f ./$$tst; then dir=./; \
-@@ -459,7 +482,7 @@
- 	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
- 	      all=`expr $$all + 1`; \
- 	      case " $(XFAIL_TESTS) " in \
--	      *$$ws$$tst$$ws*) \
-+	      *" $$tst "*) \
- 		xpass=`expr $$xpass + 1`; \
- 		failed=`expr $$failed + 1`; \
- 		echo "XPASS: $$tst"; \
-@@ -471,7 +494,7 @@
- 	    elif test $$? -ne 77; then \
- 	      all=`expr $$all + 1`; \
- 	      case " $(XFAIL_TESTS) " in \
--	      *$$ws$$tst$$ws*) \
-+	      *" $$tst "*) \
- 		xfail=`expr $$xfail + 1`; \
- 		echo "XFAIL: $$tst"; \
- 	      ;; \
-@@ -521,21 +544,22 @@
- 	else :; fi
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	list='$(DISTFILES)'; \
--	  dist_files=`for file in $$list; do echo $$file; done | \
--	  sed -e "s|^$$srcdirstrip/||;t" \
--	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
--	case $$dist_files in \
--	  */*) $(MKDIR_P) `echo "$$dist_files" | \
--			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
--			   sort -u` ;; \
--	esac; \
--	for file in $$dist_files; do \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
- 	  if test -d $$d/$$file; then \
--	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- 	    fi; \
-@@ -552,7 +576,7 @@
- all-am: Makefile $(LTLIBRARIES) $(MANS) $(DATA)
- installdirs:
- 	for dir in "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man8dir)"; do \
--	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
- 	done
- install: install-am
- install-exec: install-exec-am
-@@ -588,7 +612,7 @@
- 	-rm -rf ./$(DEPDIR)
- 	-rm -f Makefile
- distclean-am: clean-am distclean-compile distclean-generic \
--	distclean-tags
-+	distclean-libtool distclean-tags
- 
- dvi: dvi-am
- 
-@@ -602,20 +626,12 @@
- 
- install-data-am: install-man install-securelibLTLIBRARIES
- 
--install-dvi: install-dvi-am
--
- install-exec-am:
- 
--install-html: install-html-am
--
- install-info: install-info-am
- 
- install-man: install-man8
- 
--install-pdf: install-pdf-am
--
--install-ps: install-ps-am
--
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
-@@ -636,27 +652,24 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-man uninstall-securelibLTLIBRARIES
-+uninstall-am: uninstall-info-am uninstall-man \
-+	uninstall-securelibLTLIBRARIES
- 
- uninstall-man: uninstall-man8
- 
--.MAKE: install-am install-strip
--
- .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
- 	clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
- 	distclean distclean-compile distclean-generic \
- 	distclean-libtool distclean-tags distdir dvi dvi-am html \
- 	html-am info info-am install install-am install-data \
--	install-data-am install-dvi install-dvi-am install-exec \
--	install-exec-am install-html install-html-am install-info \
--	install-info-am install-man install-man8 install-pdf \
--	install-pdf-am install-ps install-ps-am \
-+	install-data-am install-exec install-exec-am install-info \
-+	install-info-am install-man install-man8 \
- 	install-securelibLTLIBRARIES install-strip installcheck \
- 	installcheck-am installdirs maintainer-clean \
- 	maintainer-clean-generic mostlyclean mostlyclean-compile \
- 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
--	tags uninstall uninstall-am uninstall-man uninstall-man8 \
--	uninstall-securelibLTLIBRARIES
-+	tags uninstall uninstall-am uninstall-info-am uninstall-man \
-+	uninstall-man8 uninstall-securelibLTLIBRARIES
- 
- @ENABLE_REGENERATE_MAN_TRUE@README: pam_warn.8.xml
- @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
 Index: pam/Linux-PAM/modules/pam_wheel/Makefile.in
 ===================================================================
 --- pam.orig/Linux-PAM/modules/pam_wheel/Makefile.in
 +++ pam/Linux-PAM/modules/pam_wheel/Makefile.in
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -19,11 +19,15 @@
- #
- 
- 
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ../..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -67,18 +71,17 @@
- pam_wheel_la_LIBADD =
- pam_wheel_la_SOURCES = pam_wheel.c
- pam_wheel_la_OBJECTS = pam_wheel.lo
--DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
--	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+	$(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
--	$(LDFLAGS) -o $@
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = pam_wheel.c
- DIST_SOURCES = pam_wheel.c
- man8dir = $(mandir)/man8
-@@ -89,6 +92,8 @@
- CTAGS = ctags
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -113,6 +118,10 @@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
-+ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
-+ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
-+ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
-+ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -121,7 +130,18 @@
- GMSGFMT_015 = @GMSGFMT_015@
- GREP = @GREP@
- HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
--INSTALL = @INSTALL@
-+HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
-+HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
-+HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
-+HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
-+HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
-+HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
-+HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
-+HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
-+HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
-+HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
-+HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
-+HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -133,6 +153,7 @@
+@@ -133,6 +133,7 @@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
  LIBAUDIT = @LIBAUDIT@
@@ -23384,371 +5347,19 @@ Index: pam/Linux-PAM/modules/pam_wheel/Makefile.in
  LIBCRACK = @LIBCRACK@
  LIBCRYPT = @LIBCRYPT@
  LIBDB = @LIBDB@
-@@ -156,7 +177,6 @@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
--MKDIR_P = @MKDIR_P@
- MSGFMT = @MSGFMT@
- MSGFMT_015 = @MSGFMT_015@
- MSGMERGE = @MSGMERGE@
-@@ -175,8 +195,11 @@
+@@ -175,6 +176,7 @@
  RANLIB = @RANLIB@
  SCONFIGDIR = @SCONFIGDIR@
  SECUREDIR = @SECUREDIR@
 +SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
-+STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
-+STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
  STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -190,13 +213,13 @@
- XSLTPROC = @XSLTPROC@
- YACC = @YACC@
- YFLAGS = @YFLAGS@
--abs_builddir = @abs_builddir@
--abs_srcdir = @abs_srcdir@
--abs_top_builddir = @abs_top_builddir@
--abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -208,7 +231,6 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
--builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -239,11 +261,8 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_builddir = @top_builddir@
--top_srcdir = @top_srcdir@
- CLEANFILES = *~
- EXTRA_DIST = README ${MANS} $(XMLS) tst-pam_wheel
- man_MANS = pam_wheel.8
-@@ -291,7 +310,7 @@
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
--	test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
-+	test -z "$(securelibdir)" || $(mkdir_p) "$(DESTDIR)$(securelibdir)"
- 	@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
- 	  if test -f $$p; then \
- 	    f=$(am__strip_dir) \
-@@ -302,7 +321,7 @@
- 
- uninstall-securelibLTLIBRARIES:
- 	@$(NORMAL_UNINSTALL)
--	@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-+	@set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
- 	  p=$(am__strip_dir) \
- 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
- 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-@@ -317,7 +336,7 @@
- 	  rm -f "$${dir}/so_locations"; \
- 	done
- pam_wheel.la: $(pam_wheel_la_OBJECTS) $(pam_wheel_la_DEPENDENCIES) 
--	$(LINK) -rpath $(securelibdir) $(pam_wheel_la_OBJECTS) $(pam_wheel_la_LIBADD) $(LIBS)
-+	$(LINK) -rpath $(securelibdir) $(pam_wheel_la_LDFLAGS) $(pam_wheel_la_OBJECTS) $(pam_wheel_la_LIBADD) $(LIBS)
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
-@@ -328,22 +347,22 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_wheel.Plo@am__quote@
- 
- .c.o:
--@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c $<
- 
- .c.obj:
--@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
- 
- .c.lo:
--@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-@@ -353,9 +372,13 @@
- 
- clean-libtool:
- 	-rm -rf .libs _libs
-+
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
- install-man8: $(man8_MANS) $(man_MANS)
- 	@$(NORMAL_INSTALL)
--	test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
-+	test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
- 	@list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
- 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
- 	for i in $$l2; do \
-@@ -448,9 +471,9 @@
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
- check-TESTS: $(TESTS)
--	@failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[	 ]'; \
-+	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
- 	srcdir=$(srcdir); export srcdir; \
--	list=' $(TESTS) '; \
-+	list='$(TESTS)'; \
- 	if test -n "$$list"; then \
- 	  for tst in $$list; do \
- 	    if test -f ./$$tst; then dir=./; \
-@@ -459,7 +482,7 @@
- 	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
- 	      all=`expr $$all + 1`; \
- 	      case " $(XFAIL_TESTS) " in \
--	      *$$ws$$tst$$ws*) \
-+	      *" $$tst "*) \
- 		xpass=`expr $$xpass + 1`; \
- 		failed=`expr $$failed + 1`; \
- 		echo "XPASS: $$tst"; \
-@@ -471,7 +494,7 @@
- 	    elif test $$? -ne 77; then \
- 	      all=`expr $$all + 1`; \
- 	      case " $(XFAIL_TESTS) " in \
--	      *$$ws$$tst$$ws*) \
-+	      *" $$tst "*) \
- 		xfail=`expr $$xfail + 1`; \
- 		echo "XFAIL: $$tst"; \
- 	      ;; \
-@@ -521,21 +544,22 @@
- 	else :; fi
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	list='$(DISTFILES)'; \
--	  dist_files=`for file in $$list; do echo $$file; done | \
--	  sed -e "s|^$$srcdirstrip/||;t" \
--	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
--	case $$dist_files in \
--	  */*) $(MKDIR_P) `echo "$$dist_files" | \
--			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
--			   sort -u` ;; \
--	esac; \
--	for file in $$dist_files; do \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
- 	  if test -d $$d/$$file; then \
--	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- 	    fi; \
-@@ -552,7 +576,7 @@
- all-am: Makefile $(LTLIBRARIES) $(MANS) $(DATA)
- installdirs:
- 	for dir in "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man8dir)"; do \
--	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
- 	done
- install: install-am
- install-exec: install-exec-am
-@@ -588,7 +612,7 @@
- 	-rm -rf ./$(DEPDIR)
- 	-rm -f Makefile
- distclean-am: clean-am distclean-compile distclean-generic \
--	distclean-tags
-+	distclean-libtool distclean-tags
- 
- dvi: dvi-am
- 
-@@ -602,20 +626,12 @@
- 
- install-data-am: install-man install-securelibLTLIBRARIES
- 
--install-dvi: install-dvi-am
--
- install-exec-am:
- 
--install-html: install-html-am
--
- install-info: install-info-am
- 
- install-man: install-man8
- 
--install-pdf: install-pdf-am
--
--install-ps: install-ps-am
--
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
-@@ -636,27 +652,24 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-man uninstall-securelibLTLIBRARIES
-+uninstall-am: uninstall-info-am uninstall-man \
-+	uninstall-securelibLTLIBRARIES
- 
- uninstall-man: uninstall-man8
- 
--.MAKE: install-am install-strip
--
- .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
- 	clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
- 	distclean distclean-compile distclean-generic \
- 	distclean-libtool distclean-tags distdir dvi dvi-am html \
- 	html-am info info-am install install-am install-data \
--	install-data-am install-dvi install-dvi-am install-exec \
--	install-exec-am install-html install-html-am install-info \
--	install-info-am install-man install-man8 install-pdf \
--	install-pdf-am install-ps install-ps-am \
-+	install-data-am install-exec install-exec-am install-info \
-+	install-info-am install-man install-man8 \
- 	install-securelibLTLIBRARIES install-strip installcheck \
- 	installcheck-am installdirs maintainer-clean \
- 	maintainer-clean-generic mostlyclean mostlyclean-compile \
- 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
--	tags uninstall uninstall-am uninstall-man uninstall-man8 \
--	uninstall-securelibLTLIBRARIES
-+	tags uninstall uninstall-am uninstall-info-am uninstall-man \
-+	uninstall-man8 uninstall-securelibLTLIBRARIES
- 
- @ENABLE_REGENERATE_MAN_TRUE@README: pam_wheel.8.xml
- @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
 Index: pam/Linux-PAM/modules/pam_xauth/Makefile.in
 ===================================================================
 --- pam.orig/Linux-PAM/modules/pam_xauth/Makefile.in
 +++ pam/Linux-PAM/modules/pam_xauth/Makefile.in
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -19,11 +19,15 @@
- #
- 
- 
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ../..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -67,18 +71,17 @@
- pam_xauth_la_LIBADD =
- pam_xauth_la_SOURCES = pam_xauth.c
- pam_xauth_la_OBJECTS = pam_xauth.lo
--DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
--	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+	$(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
--	$(LDFLAGS) -o $@
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = pam_xauth.c
- DIST_SOURCES = pam_xauth.c
- man8dir = $(mandir)/man8
-@@ -89,6 +92,8 @@
- CTAGS = ctags
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -113,6 +118,10 @@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
-+ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
-+ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
-+ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
-+ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -121,7 +130,18 @@
- GMSGFMT_015 = @GMSGFMT_015@
- GREP = @GREP@
- HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
--INSTALL = @INSTALL@
-+HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
-+HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
-+HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
-+HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
-+HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
-+HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
-+HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
-+HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
-+HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
-+HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
-+HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
-+HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -133,6 +153,7 @@
+@@ -133,6 +133,7 @@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
  LIBAUDIT = @LIBAUDIT@
@@ -23756,385 +5367,19 @@ Index: pam/Linux-PAM/modules/pam_xauth/Makefile.in
  LIBCRACK = @LIBCRACK@
  LIBCRYPT = @LIBCRYPT@
  LIBDB = @LIBDB@
-@@ -156,7 +177,6 @@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
--MKDIR_P = @MKDIR_P@
- MSGFMT = @MSGFMT@
- MSGFMT_015 = @MSGFMT_015@
- MSGMERGE = @MSGMERGE@
-@@ -175,8 +195,11 @@
+@@ -175,6 +176,7 @@
  RANLIB = @RANLIB@
  SCONFIGDIR = @SCONFIGDIR@
  SECUREDIR = @SECUREDIR@
 +SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
-+STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
-+STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
  STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -190,13 +213,13 @@
- XSLTPROC = @XSLTPROC@
- YACC = @YACC@
- YFLAGS = @YFLAGS@
--abs_builddir = @abs_builddir@
--abs_srcdir = @abs_srcdir@
--abs_top_builddir = @abs_top_builddir@
--abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -208,7 +231,6 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
--builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -239,11 +261,8 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_builddir = @top_builddir@
--top_srcdir = @top_srcdir@
- CLEANFILES = *~
- EXTRA_DIST = README ${MANS} $(XMLS) tst-pam_xauth
- man_MANS = pam_xauth.8
-@@ -291,7 +310,7 @@
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
--	test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
-+	test -z "$(securelibdir)" || $(mkdir_p) "$(DESTDIR)$(securelibdir)"
- 	@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
- 	  if test -f $$p; then \
- 	    f=$(am__strip_dir) \
-@@ -302,7 +321,7 @@
- 
- uninstall-securelibLTLIBRARIES:
- 	@$(NORMAL_UNINSTALL)
--	@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-+	@set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
- 	  p=$(am__strip_dir) \
- 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
- 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-@@ -317,7 +336,7 @@
- 	  rm -f "$${dir}/so_locations"; \
- 	done
- pam_xauth.la: $(pam_xauth_la_OBJECTS) $(pam_xauth_la_DEPENDENCIES) 
--	$(LINK) -rpath $(securelibdir) $(pam_xauth_la_OBJECTS) $(pam_xauth_la_LIBADD) $(LIBS)
-+	$(LINK) -rpath $(securelibdir) $(pam_xauth_la_LDFLAGS) $(pam_xauth_la_OBJECTS) $(pam_xauth_la_LIBADD) $(LIBS)
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
-@@ -328,22 +347,22 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_xauth.Plo@am__quote@
- 
- .c.o:
--@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c $<
- 
- .c.obj:
--@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
- 
- .c.lo:
--@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-@@ -353,9 +372,13 @@
- 
- clean-libtool:
- 	-rm -rf .libs _libs
-+
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
- install-man8: $(man8_MANS) $(man_MANS)
- 	@$(NORMAL_INSTALL)
--	test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
-+	test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
- 	@list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
- 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
- 	for i in $$l2; do \
-@@ -448,9 +471,9 @@
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
- check-TESTS: $(TESTS)
--	@failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[	 ]'; \
-+	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
- 	srcdir=$(srcdir); export srcdir; \
--	list=' $(TESTS) '; \
-+	list='$(TESTS)'; \
- 	if test -n "$$list"; then \
- 	  for tst in $$list; do \
- 	    if test -f ./$$tst; then dir=./; \
-@@ -459,7 +482,7 @@
- 	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
- 	      all=`expr $$all + 1`; \
- 	      case " $(XFAIL_TESTS) " in \
--	      *$$ws$$tst$$ws*) \
-+	      *" $$tst "*) \
- 		xpass=`expr $$xpass + 1`; \
- 		failed=`expr $$failed + 1`; \
- 		echo "XPASS: $$tst"; \
-@@ -471,7 +494,7 @@
- 	    elif test $$? -ne 77; then \
- 	      all=`expr $$all + 1`; \
- 	      case " $(XFAIL_TESTS) " in \
--	      *$$ws$$tst$$ws*) \
-+	      *" $$tst "*) \
- 		xfail=`expr $$xfail + 1`; \
- 		echo "XFAIL: $$tst"; \
- 	      ;; \
-@@ -521,21 +544,22 @@
- 	else :; fi
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	list='$(DISTFILES)'; \
--	  dist_files=`for file in $$list; do echo $$file; done | \
--	  sed -e "s|^$$srcdirstrip/||;t" \
--	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
--	case $$dist_files in \
--	  */*) $(MKDIR_P) `echo "$$dist_files" | \
--			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
--			   sort -u` ;; \
--	esac; \
--	for file in $$dist_files; do \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
- 	  if test -d $$d/$$file; then \
--	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- 	    fi; \
-@@ -552,7 +576,7 @@
- all-am: Makefile $(LTLIBRARIES) $(MANS) $(DATA)
- installdirs:
- 	for dir in "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man8dir)"; do \
--	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
- 	done
- install: install-am
- install-exec: install-exec-am
-@@ -588,7 +612,7 @@
- 	-rm -rf ./$(DEPDIR)
- 	-rm -f Makefile
- distclean-am: clean-am distclean-compile distclean-generic \
--	distclean-tags
-+	distclean-libtool distclean-tags
- 
- dvi: dvi-am
- 
-@@ -602,20 +626,12 @@
- 
- install-data-am: install-man install-securelibLTLIBRARIES
- 
--install-dvi: install-dvi-am
--
- install-exec-am:
- 
--install-html: install-html-am
--
- install-info: install-info-am
- 
- install-man: install-man8
- 
--install-pdf: install-pdf-am
--
--install-ps: install-ps-am
--
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
-@@ -636,27 +652,24 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-man uninstall-securelibLTLIBRARIES
-+uninstall-am: uninstall-info-am uninstall-man \
-+	uninstall-securelibLTLIBRARIES
- 
- uninstall-man: uninstall-man8
- 
--.MAKE: install-am install-strip
--
- .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
- 	clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
- 	distclean distclean-compile distclean-generic \
- 	distclean-libtool distclean-tags distdir dvi dvi-am html \
- 	html-am info info-am install install-am install-data \
--	install-data-am install-dvi install-dvi-am install-exec \
--	install-exec-am install-html install-html-am install-info \
--	install-info-am install-man install-man8 install-pdf \
--	install-pdf-am install-ps install-ps-am \
-+	install-data-am install-exec install-exec-am install-info \
-+	install-info-am install-man install-man8 \
- 	install-securelibLTLIBRARIES install-strip installcheck \
- 	installcheck-am installdirs maintainer-clean \
- 	maintainer-clean-generic mostlyclean mostlyclean-compile \
- 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
--	tags uninstall uninstall-am uninstall-man uninstall-man8 \
--	uninstall-securelibLTLIBRARIES
-+	tags uninstall uninstall-am uninstall-info-am uninstall-man \
-+	uninstall-man8 uninstall-securelibLTLIBRARIES
- 
- @ENABLE_REGENERATE_MAN_TRUE@README: pam_xauth.8.xml
- @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
 Index: pam/Linux-PAM/tests/Makefile.in
 ===================================================================
 --- pam.orig/Linux-PAM/tests/Makefile.in
 +++ pam/Linux-PAM/tests/Makefile.in
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -17,11 +17,15 @@
- #
- # Copyright (c) 2006 Thorsten Kukuk <kukuk@suse.de>
- #
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -35,13 +39,6 @@
- POST_UNINSTALL = :
- build_triplet = @build@
- host_triplet = @host@
--TESTS = tst-pam_start$(EXEEXT) tst-pam_end$(EXEEXT) \
--	tst-pam_fail_delay$(EXEEXT) tst-pam_open_session$(EXEEXT) \
--	tst-pam_close_session$(EXEEXT) tst-pam_acct_mgmt$(EXEEXT) \
--	tst-pam_authenticate$(EXEEXT) tst-pam_chauthtok$(EXEEXT) \
--	tst-pam_setcred$(EXEEXT) tst-pam_get_item$(EXEEXT) \
--	tst-pam_set_item$(EXEEXT) tst-pam_getenvlist$(EXEEXT) \
--	tst-pam_get_user$(EXEEXT) tst-pam_set_data$(EXEEXT)
- check_PROGRAMS = $(am__EXEEXT_1) tst-dlopen$(EXEEXT)
- subdir = tests
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-@@ -112,18 +109,17 @@
- tst_pam_start_SOURCES = tst-pam_start.c
- tst_pam_start_OBJECTS = tst-pam_start.$(OBJEXT)
- tst_pam_start_LDADD = $(LDADD)
--DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
--	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+	$(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
--	$(LDFLAGS) -o $@
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = tst-dlopen.c tst-pam_acct_mgmt.c tst-pam_authenticate.c \
- 	tst-pam_chauthtok.c tst-pam_close_session.c tst-pam_end.c \
- 	tst-pam_fail_delay.c tst-pam_get_item.c tst-pam_get_user.c \
-@@ -138,6 +134,8 @@
- CTAGS = ctags
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -162,6 +160,10 @@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
-+ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
-+ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
-+ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
-+ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -170,7 +172,18 @@
- GMSGFMT_015 = @GMSGFMT_015@
- GREP = @GREP@
- HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
--INSTALL = @INSTALL@
-+HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
-+HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
-+HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
-+HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
-+HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
-+HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
-+HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
-+HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
-+HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
-+HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
-+HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
-+HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -182,6 +195,7 @@
+@@ -182,6 +182,7 @@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
  LIBAUDIT = @LIBAUDIT@
@@ -24142,400 +5387,19 @@ Index: pam/Linux-PAM/tests/Makefile.in
  LIBCRACK = @LIBCRACK@
  LIBCRYPT = @LIBCRYPT@
  LIBDB = @LIBDB@
-@@ -205,7 +219,6 @@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
--MKDIR_P = @MKDIR_P@
- MSGFMT = @MSGFMT@
- MSGFMT_015 = @MSGFMT_015@
- MSGMERGE = @MSGMERGE@
-@@ -224,8 +237,11 @@
+@@ -224,6 +225,7 @@
  RANLIB = @RANLIB@
  SCONFIGDIR = @SCONFIGDIR@
  SECUREDIR = @SECUREDIR@
 +SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
-+STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
-+STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
  STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -239,13 +255,13 @@
- XSLTPROC = @XSLTPROC@
- YACC = @YACC@
- YFLAGS = @YFLAGS@
--abs_builddir = @abs_builddir@
--abs_srcdir = @abs_srcdir@
--abs_top_builddir = @abs_top_builddir@
--abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -257,7 +273,6 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
--builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -288,16 +303,18 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_builddir = @top_builddir@
--top_srcdir = @top_srcdir@
- AM_CFLAGS = -DLIBPAM_COMPILE -I$(top_srcdir)/libpam/include \
- 		-I$(top_srcdir)/libpam
- 
- AM_LDFLAGS = -L$(top_builddir)/libpam -lpam
- CLEANFILES = *~
-+TESTS = tst-pam_start tst-pam_end tst-pam_fail_delay tst-pam_open_session \
-+	tst-pam_close_session tst-pam_acct_mgmt tst-pam_authenticate \
-+	tst-pam_chauthtok tst-pam_setcred tst-pam_get_item tst-pam_set_item \
-+	tst-pam_getenvlist tst-pam_get_user tst-pam_set_data
-+
- tst_dlopen_LDADD = -L$(top_builddir)/libpam -lpam -ldl
- all: all-am
- 
-@@ -341,49 +358,49 @@
- 	done
- tst-dlopen$(EXEEXT): $(tst_dlopen_OBJECTS) $(tst_dlopen_DEPENDENCIES) 
- 	@rm -f tst-dlopen$(EXEEXT)
--	$(LINK) $(tst_dlopen_OBJECTS) $(tst_dlopen_LDADD) $(LIBS)
-+	$(LINK) $(tst_dlopen_LDFLAGS) $(tst_dlopen_OBJECTS) $(tst_dlopen_LDADD) $(LIBS)
- tst-pam_acct_mgmt$(EXEEXT): $(tst_pam_acct_mgmt_OBJECTS) $(tst_pam_acct_mgmt_DEPENDENCIES) 
- 	@rm -f tst-pam_acct_mgmt$(EXEEXT)
--	$(LINK) $(tst_pam_acct_mgmt_OBJECTS) $(tst_pam_acct_mgmt_LDADD) $(LIBS)
-+	$(LINK) $(tst_pam_acct_mgmt_LDFLAGS) $(tst_pam_acct_mgmt_OBJECTS) $(tst_pam_acct_mgmt_LDADD) $(LIBS)
- tst-pam_authenticate$(EXEEXT): $(tst_pam_authenticate_OBJECTS) $(tst_pam_authenticate_DEPENDENCIES) 
- 	@rm -f tst-pam_authenticate$(EXEEXT)
--	$(LINK) $(tst_pam_authenticate_OBJECTS) $(tst_pam_authenticate_LDADD) $(LIBS)
-+	$(LINK) $(tst_pam_authenticate_LDFLAGS) $(tst_pam_authenticate_OBJECTS) $(tst_pam_authenticate_LDADD) $(LIBS)
- tst-pam_chauthtok$(EXEEXT): $(tst_pam_chauthtok_OBJECTS) $(tst_pam_chauthtok_DEPENDENCIES) 
- 	@rm -f tst-pam_chauthtok$(EXEEXT)
--	$(LINK) $(tst_pam_chauthtok_OBJECTS) $(tst_pam_chauthtok_LDADD) $(LIBS)
-+	$(LINK) $(tst_pam_chauthtok_LDFLAGS) $(tst_pam_chauthtok_OBJECTS) $(tst_pam_chauthtok_LDADD) $(LIBS)
- tst-pam_close_session$(EXEEXT): $(tst_pam_close_session_OBJECTS) $(tst_pam_close_session_DEPENDENCIES) 
- 	@rm -f tst-pam_close_session$(EXEEXT)
--	$(LINK) $(tst_pam_close_session_OBJECTS) $(tst_pam_close_session_LDADD) $(LIBS)
-+	$(LINK) $(tst_pam_close_session_LDFLAGS) $(tst_pam_close_session_OBJECTS) $(tst_pam_close_session_LDADD) $(LIBS)
- tst-pam_end$(EXEEXT): $(tst_pam_end_OBJECTS) $(tst_pam_end_DEPENDENCIES) 
- 	@rm -f tst-pam_end$(EXEEXT)
--	$(LINK) $(tst_pam_end_OBJECTS) $(tst_pam_end_LDADD) $(LIBS)
-+	$(LINK) $(tst_pam_end_LDFLAGS) $(tst_pam_end_OBJECTS) $(tst_pam_end_LDADD) $(LIBS)
- tst-pam_fail_delay$(EXEEXT): $(tst_pam_fail_delay_OBJECTS) $(tst_pam_fail_delay_DEPENDENCIES) 
- 	@rm -f tst-pam_fail_delay$(EXEEXT)
--	$(LINK) $(tst_pam_fail_delay_OBJECTS) $(tst_pam_fail_delay_LDADD) $(LIBS)
-+	$(LINK) $(tst_pam_fail_delay_LDFLAGS) $(tst_pam_fail_delay_OBJECTS) $(tst_pam_fail_delay_LDADD) $(LIBS)
- tst-pam_get_item$(EXEEXT): $(tst_pam_get_item_OBJECTS) $(tst_pam_get_item_DEPENDENCIES) 
- 	@rm -f tst-pam_get_item$(EXEEXT)
--	$(LINK) $(tst_pam_get_item_OBJECTS) $(tst_pam_get_item_LDADD) $(LIBS)
-+	$(LINK) $(tst_pam_get_item_LDFLAGS) $(tst_pam_get_item_OBJECTS) $(tst_pam_get_item_LDADD) $(LIBS)
- tst-pam_get_user$(EXEEXT): $(tst_pam_get_user_OBJECTS) $(tst_pam_get_user_DEPENDENCIES) 
- 	@rm -f tst-pam_get_user$(EXEEXT)
--	$(LINK) $(tst_pam_get_user_OBJECTS) $(tst_pam_get_user_LDADD) $(LIBS)
-+	$(LINK) $(tst_pam_get_user_LDFLAGS) $(tst_pam_get_user_OBJECTS) $(tst_pam_get_user_LDADD) $(LIBS)
- tst-pam_getenvlist$(EXEEXT): $(tst_pam_getenvlist_OBJECTS) $(tst_pam_getenvlist_DEPENDENCIES) 
- 	@rm -f tst-pam_getenvlist$(EXEEXT)
--	$(LINK) $(tst_pam_getenvlist_OBJECTS) $(tst_pam_getenvlist_LDADD) $(LIBS)
-+	$(LINK) $(tst_pam_getenvlist_LDFLAGS) $(tst_pam_getenvlist_OBJECTS) $(tst_pam_getenvlist_LDADD) $(LIBS)
- tst-pam_open_session$(EXEEXT): $(tst_pam_open_session_OBJECTS) $(tst_pam_open_session_DEPENDENCIES) 
- 	@rm -f tst-pam_open_session$(EXEEXT)
--	$(LINK) $(tst_pam_open_session_OBJECTS) $(tst_pam_open_session_LDADD) $(LIBS)
-+	$(LINK) $(tst_pam_open_session_LDFLAGS) $(tst_pam_open_session_OBJECTS) $(tst_pam_open_session_LDADD) $(LIBS)
- tst-pam_set_data$(EXEEXT): $(tst_pam_set_data_OBJECTS) $(tst_pam_set_data_DEPENDENCIES) 
- 	@rm -f tst-pam_set_data$(EXEEXT)
--	$(LINK) $(tst_pam_set_data_OBJECTS) $(tst_pam_set_data_LDADD) $(LIBS)
-+	$(LINK) $(tst_pam_set_data_LDFLAGS) $(tst_pam_set_data_OBJECTS) $(tst_pam_set_data_LDADD) $(LIBS)
- tst-pam_set_item$(EXEEXT): $(tst_pam_set_item_OBJECTS) $(tst_pam_set_item_DEPENDENCIES) 
- 	@rm -f tst-pam_set_item$(EXEEXT)
--	$(LINK) $(tst_pam_set_item_OBJECTS) $(tst_pam_set_item_LDADD) $(LIBS)
-+	$(LINK) $(tst_pam_set_item_LDFLAGS) $(tst_pam_set_item_OBJECTS) $(tst_pam_set_item_LDADD) $(LIBS)
- tst-pam_setcred$(EXEEXT): $(tst_pam_setcred_OBJECTS) $(tst_pam_setcred_DEPENDENCIES) 
- 	@rm -f tst-pam_setcred$(EXEEXT)
--	$(LINK) $(tst_pam_setcred_OBJECTS) $(tst_pam_setcred_LDADD) $(LIBS)
-+	$(LINK) $(tst_pam_setcred_LDFLAGS) $(tst_pam_setcred_OBJECTS) $(tst_pam_setcred_LDADD) $(LIBS)
- tst-pam_start$(EXEEXT): $(tst_pam_start_OBJECTS) $(tst_pam_start_DEPENDENCIES) 
- 	@rm -f tst-pam_start$(EXEEXT)
--	$(LINK) $(tst_pam_start_OBJECTS) $(tst_pam_start_LDADD) $(LIBS)
-+	$(LINK) $(tst_pam_start_LDFLAGS) $(tst_pam_start_OBJECTS) $(tst_pam_start_LDADD) $(LIBS)
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
-@@ -408,22 +425,22 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tst-pam_start.Po@am__quote@
- 
- .c.o:
--@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c $<
- 
- .c.obj:
--@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
- 
- .c.lo:
--@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-@@ -434,6 +451,10 @@
- clean-libtool:
- 	-rm -rf .libs _libs
- 
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
-+
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- 	unique=`for i in $$list; do \
-@@ -483,9 +504,9 @@
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
- check-TESTS: $(TESTS)
--	@failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[	 ]'; \
-+	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
- 	srcdir=$(srcdir); export srcdir; \
--	list=' $(TESTS) '; \
-+	list='$(TESTS)'; \
- 	if test -n "$$list"; then \
- 	  for tst in $$list; do \
- 	    if test -f ./$$tst; then dir=./; \
-@@ -494,7 +515,7 @@
- 	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
- 	      all=`expr $$all + 1`; \
- 	      case " $(XFAIL_TESTS) " in \
--	      *$$ws$$tst$$ws*) \
-+	      *" $$tst "*) \
- 		xpass=`expr $$xpass + 1`; \
- 		failed=`expr $$failed + 1`; \
- 		echo "XPASS: $$tst"; \
-@@ -506,7 +527,7 @@
- 	    elif test $$? -ne 77; then \
- 	      all=`expr $$all + 1`; \
- 	      case " $(XFAIL_TESTS) " in \
--	      *$$ws$$tst$$ws*) \
-+	      *" $$tst "*) \
- 		xfail=`expr $$xfail + 1`; \
- 		echo "XFAIL: $$tst"; \
- 	      ;; \
-@@ -556,21 +577,22 @@
- 	else :; fi
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	list='$(DISTFILES)'; \
--	  dist_files=`for file in $$list; do echo $$file; done | \
--	  sed -e "s|^$$srcdirstrip/||;t" \
--	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
--	case $$dist_files in \
--	  */*) $(MKDIR_P) `echo "$$dist_files" | \
--			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
--			   sort -u` ;; \
--	esac; \
--	for file in $$dist_files; do \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
- 	  if test -d $$d/$$file; then \
--	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- 	    fi; \
-@@ -621,7 +643,7 @@
- 	-rm -rf ./$(DEPDIR)
- 	-rm -f Makefile
- distclean-am: clean-am distclean-compile distclean-generic \
--	distclean-tags
-+	distclean-libtool distclean-tags
- 
- dvi: dvi-am
- 
-@@ -635,20 +657,12 @@
- 
- install-data-am:
- 
--install-dvi: install-dvi-am
--
- install-exec-am:
- 
--install-html: install-html-am
--
- install-info: install-info-am
- 
- install-man:
- 
--install-pdf: install-pdf-am
--
--install-ps: install-ps-am
--
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
-@@ -669,23 +683,19 @@
- 
- ps-am:
- 
--uninstall-am:
--
--.MAKE: install-am install-strip
-+uninstall-am: uninstall-info-am
- 
- .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
- 	clean-checkPROGRAMS clean-generic clean-libtool ctags \
- 	distclean distclean-compile distclean-generic \
- 	distclean-libtool distclean-tags distdir dvi dvi-am html \
- 	html-am info info-am install install-am install-data \
--	install-data-am install-dvi install-dvi-am install-exec \
--	install-exec-am install-html install-html-am install-info \
--	install-info-am install-man install-pdf install-pdf-am \
--	install-ps install-ps-am install-strip installcheck \
-+	install-data-am install-exec install-exec-am install-info \
-+	install-info-am install-man install-strip installcheck \
- 	installcheck-am installdirs maintainer-clean \
- 	maintainer-clean-generic mostlyclean mostlyclean-compile \
- 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
--	tags uninstall uninstall-am
-+	tags uninstall uninstall-am uninstall-info-am
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
 Index: pam/Linux-PAM/xtests/Makefile.in
 ===================================================================
 --- pam.orig/Linux-PAM/xtests/Makefile.in
 +++ pam/Linux-PAM/xtests/Makefile.in
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -18,11 +18,15 @@
- # Copyright (c) 2006 Thorsten Kukuk <kukuk@suse.de>
- #
- 
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -73,18 +77,17 @@
- tst_pam_dispatch4_SOURCES = tst-pam_dispatch4.c
- tst_pam_dispatch4_OBJECTS = tst-pam_dispatch4.$(OBJEXT)
- tst_pam_dispatch4_LDADD = $(LDADD)
--DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
--	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+	$(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
--	$(LDFLAGS) -o $@
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = tst-pam_cracklib1.c tst-pam_dispatch1.c tst-pam_dispatch2.c \
- 	tst-pam_dispatch3.c tst-pam_dispatch4.c
- DIST_SOURCES = tst-pam_cracklib1.c tst-pam_dispatch1.c \
-@@ -93,6 +96,8 @@
- CTAGS = ctags
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -117,6 +122,10 @@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
-+ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
-+ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
-+ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
-+ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-@@ -125,7 +134,18 @@
- GMSGFMT_015 = @GMSGFMT_015@
- GREP = @GREP@
- HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
--INSTALL = @INSTALL@
-+HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
-+HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
-+HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
-+HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
-+HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
-+HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
-+HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
-+HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
-+HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
-+HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
-+HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
-+HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -137,6 +157,7 @@
+@@ -137,6 +137,7 @@
  LEXLIB = @LEXLIB@
  LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
  LIBAUDIT = @LIBAUDIT@
@@ -24543,220 +5407,11 @@ Index: pam/Linux-PAM/xtests/Makefile.in
  LIBCRACK = @LIBCRACK@
  LIBCRYPT = @LIBCRYPT@
  LIBDB = @LIBDB@
-@@ -160,7 +181,6 @@
- LTLIBINTL = @LTLIBINTL@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
--MKDIR_P = @MKDIR_P@
- MSGFMT = @MSGFMT@
- MSGFMT_015 = @MSGFMT_015@
- MSGMERGE = @MSGMERGE@
-@@ -179,8 +199,11 @@
+@@ -179,6 +180,7 @@
  RANLIB = @RANLIB@
  SCONFIGDIR = @SCONFIGDIR@
  SECUREDIR = @SECUREDIR@
 +SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
-+STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
-+STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
  STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -194,13 +217,13 @@
- XSLTPROC = @XSLTPROC@
- YACC = @YACC@
- YFLAGS = @YFLAGS@
--abs_builddir = @abs_builddir@
--abs_srcdir = @abs_srcdir@
--abs_top_builddir = @abs_top_builddir@
--abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -212,7 +235,6 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
--builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -243,11 +265,8 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
--srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_builddir = @top_builddir@
--top_srcdir = @top_srcdir@
- AM_CFLAGS = -DLIBPAM_COMPILE -I$(top_srcdir)/libpam/include \
- 	-I$(top_srcdir)/libpamc/include -I$(top_srcdir)/libpam_misc/include
- 
-@@ -304,19 +323,19 @@
- 	done
- tst-pam_cracklib1$(EXEEXT): $(tst_pam_cracklib1_OBJECTS) $(tst_pam_cracklib1_DEPENDENCIES) 
- 	@rm -f tst-pam_cracklib1$(EXEEXT)
--	$(LINK) $(tst_pam_cracklib1_OBJECTS) $(tst_pam_cracklib1_LDADD) $(LIBS)
-+	$(LINK) $(tst_pam_cracklib1_LDFLAGS) $(tst_pam_cracklib1_OBJECTS) $(tst_pam_cracklib1_LDADD) $(LIBS)
- tst-pam_dispatch1$(EXEEXT): $(tst_pam_dispatch1_OBJECTS) $(tst_pam_dispatch1_DEPENDENCIES) 
- 	@rm -f tst-pam_dispatch1$(EXEEXT)
--	$(LINK) $(tst_pam_dispatch1_OBJECTS) $(tst_pam_dispatch1_LDADD) $(LIBS)
-+	$(LINK) $(tst_pam_dispatch1_LDFLAGS) $(tst_pam_dispatch1_OBJECTS) $(tst_pam_dispatch1_LDADD) $(LIBS)
- tst-pam_dispatch2$(EXEEXT): $(tst_pam_dispatch2_OBJECTS) $(tst_pam_dispatch2_DEPENDENCIES) 
- 	@rm -f tst-pam_dispatch2$(EXEEXT)
--	$(LINK) $(tst_pam_dispatch2_OBJECTS) $(tst_pam_dispatch2_LDADD) $(LIBS)
-+	$(LINK) $(tst_pam_dispatch2_LDFLAGS) $(tst_pam_dispatch2_OBJECTS) $(tst_pam_dispatch2_LDADD) $(LIBS)
- tst-pam_dispatch3$(EXEEXT): $(tst_pam_dispatch3_OBJECTS) $(tst_pam_dispatch3_DEPENDENCIES) 
- 	@rm -f tst-pam_dispatch3$(EXEEXT)
--	$(LINK) $(tst_pam_dispatch3_OBJECTS) $(tst_pam_dispatch3_LDADD) $(LIBS)
-+	$(LINK) $(tst_pam_dispatch3_LDFLAGS) $(tst_pam_dispatch3_OBJECTS) $(tst_pam_dispatch3_LDADD) $(LIBS)
- tst-pam_dispatch4$(EXEEXT): $(tst_pam_dispatch4_OBJECTS) $(tst_pam_dispatch4_DEPENDENCIES) 
- 	@rm -f tst-pam_dispatch4$(EXEEXT)
--	$(LINK) $(tst_pam_dispatch4_OBJECTS) $(tst_pam_dispatch4_LDADD) $(LIBS)
-+	$(LINK) $(tst_pam_dispatch4_LDFLAGS) $(tst_pam_dispatch4_OBJECTS) $(tst_pam_dispatch4_LDADD) $(LIBS)
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
-@@ -331,22 +350,22 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tst-pam_dispatch4.Po@am__quote@
- 
- .c.o:
--@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c $<
- 
- .c.obj:
--@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
- 
- .c.lo:
--@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-@@ -357,6 +376,10 @@
- clean-libtool:
- 	-rm -rf .libs _libs
- 
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
-+
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- 	unique=`for i in $$list; do \
-@@ -406,21 +429,22 @@
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--	list='$(DISTFILES)'; \
--	  dist_files=`for file in $$list; do echo $$file; done | \
--	  sed -e "s|^$$srcdirstrip/||;t" \
--	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
--	case $$dist_files in \
--	  */*) $(MKDIR_P) `echo "$$dist_files" | \
--			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
--			   sort -u` ;; \
--	esac; \
--	for file in $$dist_files; do \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
- 	  if test -d $$d/$$file; then \
--	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- 	    fi; \
-@@ -469,7 +493,7 @@
- 	-rm -rf ./$(DEPDIR)
- 	-rm -f Makefile
- distclean-am: clean-am distclean-compile distclean-generic \
--	distclean-tags
-+	distclean-libtool distclean-tags
- 
- dvi: dvi-am
- 
-@@ -483,20 +507,12 @@
- 
- install-data-am:
- 
--install-dvi: install-dvi-am
--
- install-exec-am:
- 
--install-html: install-html-am
--
- install-info: install-info-am
- 
- install-man:
- 
--install-pdf: install-pdf-am
--
--install-ps: install-ps-am
--
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
-@@ -517,22 +533,19 @@
- 
- ps-am:
- 
--uninstall-am:
--
--.MAKE: install-am install-strip
-+uninstall-am: uninstall-info-am
- 
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- 	clean-libtool clean-noinstPROGRAMS ctags distclean \
- 	distclean-compile distclean-generic distclean-libtool \
- 	distclean-tags distdir dvi dvi-am html html-am info info-am \
--	install install-am install-data install-data-am install-dvi \
--	install-dvi-am install-exec install-exec-am install-html \
--	install-html-am install-info install-info-am install-man \
--	install-pdf install-pdf-am install-ps install-ps-am \
-+	install install-am install-data install-data-am install-exec \
-+	install-exec-am install-info install-info-am install-man \
- 	install-strip installcheck installcheck-am installdirs \
- 	maintainer-clean maintainer-clean-generic mostlyclean \
- 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
--	pdf pdf-am ps ps-am tags uninstall uninstall-am
-+	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-+	uninstall-info-am
- 
- 
- xtests: $(XTESTS) run-xtests.sh