diff options
| author | Steve Langasek <vorlon@debian.org> | 2008-07-22 17:35:49 -0700 |
|---|---|---|
| committer | Steve Langasek <steve.langasek@ubuntu.com> | 2019-01-03 16:11:45 -0800 |
| commit | 093d9fbff93d76118b3f7a0968f8f7c34e73619e (patch) | |
| tree | a7b9315eb7af1948f25601e265ddbcab66eaeee0 | |
| parent | ee01e5306bbc46353470453b6622722bd93d4d12 (diff) | |
refresh autoconf.patch again, but with a newer automake to reduce the diff
| -rw-r--r-- | debian/patches-applied/autoconf.patch | 22333 |
1 files changed, 3183 insertions, 19150 deletions
diff --git a/debian/patches-applied/autoconf.patch b/debian/patches-applied/autoconf.patch index 24e6e701..87baa56f 100644 --- a/debian/patches-applied/autoconf.patch +++ b/debian/patches-applied/autoconf.patch @@ -13,82 +13,16 @@ Index: pam.debian/Makefile.in +++ pam.debian/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. ++# Makefile.in generated by automake 1.10.1 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. ++# 2003, 2004, 2005, 2006, 2007, 2008 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 = . - 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 \ - 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@ -@@ -104,11 +107,16 @@ +@@ -104,6 +104,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -96,40 +30,7 @@ Index: pam.debian/Makefile.in ECHO = @ECHO@ ECHO_C = @ECHO_C@ 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 +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@ -@@ -152,10 +171,10 @@ - LTLIBINTL = @LTLIBINTL@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ --MKDIR_P = @MKDIR_P@ +@@ -156,6 +157,7 @@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ @@ -137,233 +38,90 @@ Index: pam.debian/Makefile.in OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -@@ -174,6 +193,8 @@ - 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 +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@ -@@ -205,7 +226,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - datadir = @datadir@ - datarootdir = @datarootdir@ - docdir = @docdir@ -@@ -236,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@ - 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 -@@ -301,7 +318,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 -@@ -323,6 +340,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. -@@ -355,7 +373,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 \ -@@ -463,22 +482,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; \ -@@ -492,7 +513,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`; \ -@@ -500,8 +521,6 @@ - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$top_distdir" \ - distdir="$$distdir/$$subdir" \ -- am__remove_distdir=: \ -- am__skip_length_check=: \ - distdir) \ - || exit 1; \ - fi; \ -@@ -509,7 +528,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 -@@ -584,7 +603,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 \ -@@ -655,20 +674,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 -@@ -689,26 +700,24 @@ - - ps-am: - --uninstall-am: -+uninstall-am: uninstall-info-am +@@ -399,8 +401,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS --.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ -- install-strip -+uninstall-info: uninstall-info-recursive +@@ -425,8 +427,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -436,13 +438,12 @@ + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique +@@ -518,6 +519,10 @@ + tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 + $(am__remove_distdir) --.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-lzma: distdir ++ tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma ++ $(am__remove_distdir) ++ + dist-tarZ: distdir + tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z + $(am__remove_distdir) +@@ -545,6 +550,8 @@ + GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ + *.tar.bz2*) \ + bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ ++ *.tar.lzma*) \ ++ unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ + *.tar.Z*) \ + uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ + *.shar.gz*) \ +@@ -697,8 +704,8 @@ + .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 +- distclean-generic distclean-hdr distclean-libtool \ ++ dist-gzip dist-lzma 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 \ Index: pam.debian/aclocal.m4 =================================================================== --- pam.debian.orig/aclocal.m4 +++ pam.debian/aclocal.m4 @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.10 -*- Autoconf -*- -+# generated automatically by aclocal 1.9.6 -*- Autoconf -*- ++# generated automatically by aclocal 1.10.1 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006 Free Software Foundation, Inc. -+# 2005 Free Software Foundation, Inc. ++# 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This file 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. -@@ -11,14 +11,9 @@ +@@ -11,14 +11,17 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. @@ -371,7 +129,14 @@ Index: pam.debian/aclocal.m4 -[m4_fatal([this file was generated for autoconf 2.61. -You have another version of autoconf. If you want to use that, -you should regenerate the build system entirely.], [63])]) -- ++m4_ifndef([AC_AUTOCONF_VERSION], ++ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl ++m4_if(AC_AUTOCONF_VERSION, [2.61],, ++[m4_warning([this file was generated for autoconf 2.61. ++You have another version of autoconf. It may work, but is not guaranteed to. ++If you have problems, you may need to regenerate the build system entirely. ++To do so, use the procedure documented by the package, typically `autoreconf'.])]) + # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- -# serial 51 AC_PROG_LIBTOOL @@ -379,7 +144,7 @@ Index: pam.debian/aclocal.m4 # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) -@@ -106,7 +101,6 @@ +@@ -106,7 +109,6 @@ AC_REQUIRE([AC_OBJEXT])dnl AC_REQUIRE([AC_EXEEXT])dnl dnl @@ -387,7 +152,7 @@ Index: pam.debian/aclocal.m4 AC_LIBTOOL_SYS_MAX_CMD_LEN AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE AC_LIBTOOL_OBJDIR -@@ -208,6 +202,8 @@ +@@ -208,6 +210,8 @@ ;; esac @@ -396,7 +161,7 @@ Index: pam.debian/aclocal.m4 AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no) AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], enable_win32_dll=yes, enable_win32_dll=no) -@@ -287,9 +283,80 @@ +@@ -287,9 +291,80 @@ echo "$lt_simple_link_test_code" >conftest.$ac_ext eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_linker_boilerplate=`cat conftest.err` @@ -478,7 +243,7 @@ Index: pam.debian/aclocal.m4 # _LT_AC_SYS_LIBPATH_AIX # ---------------------- -@@ -614,7 +681,11 @@ +@@ -614,7 +689,11 @@ *64-bit*) case $lt_cv_prog_gnu_ld in yes*) LD="${LD-ld} -m elf64_sparc" ;; @@ -491,7 +256,7 @@ Index: pam.debian/aclocal.m4 esac ;; esac -@@ -707,7 +778,7 @@ +@@ -707,7 +786,7 @@ $2=yes fi fi @@ -500,7 +265,7 @@ Index: pam.debian/aclocal.m4 LDFLAGS="$save_LDFLAGS" ]) -@@ -978,7 +1049,7 @@ +@@ -978,7 +1057,7 @@ AC_CHECK_FUNC([shl_load], [lt_cv_dlopen="shl_load"], [AC_CHECK_LIB([dld], [shl_load], @@ -509,7 +274,7 @@ Index: pam.debian/aclocal.m4 [AC_CHECK_FUNC([dlopen], [lt_cv_dlopen="dlopen"], [AC_CHECK_LIB([dl], [dlopen], -@@ -986,7 +1057,7 @@ +@@ -986,7 +1065,7 @@ [AC_CHECK_LIB([svld], [dlopen], [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], [AC_CHECK_LIB([dld], [dld_link], @@ -518,7 +283,7 @@ Index: pam.debian/aclocal.m4 ]) ]) ]) -@@ -1303,7 +1374,7 @@ +@@ -1303,7 +1382,7 @@ soname_spec='${libname}${release}${shared_ext}$major' ;; @@ -527,7 +292,7 @@ Index: pam.debian/aclocal.m4 version_type=linux need_lib_prefix=no need_version=no -@@ -1644,6 +1715,18 @@ +@@ -1644,6 +1723,18 @@ dynamic_linker='GNU/Linux ld.so' ;; @@ -546,7 +311,7 @@ Index: pam.debian/aclocal.m4 netbsd*) version_type=sunos need_lib_prefix=no -@@ -1824,6 +1907,13 @@ +@@ -1824,6 +1915,13 @@ AC_MSG_RESULT([$dynamic_linker]) test "$dynamic_linker" = no && can_build_shared=no @@ -560,7 +325,7 @@ Index: pam.debian/aclocal.m4 variables_saved_for_relink="PATH $shlibpath_var $runpath_var" if test "$GCC" = yes; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -@@ -2323,7 +2413,7 @@ +@@ -2323,7 +2421,7 @@ # whether `pass_all' will *always* work, you probably want this one. case $host_os in @@ -569,7 +334,7 @@ Index: pam.debian/aclocal.m4 lt_cv_deplibs_check_method=pass_all ;; -@@ -2418,7 +2508,7 @@ +@@ -2418,7 +2516,7 @@ lt_cv_deplibs_check_method=pass_all ;; @@ -578,7 +343,7 @@ Index: pam.debian/aclocal.m4 if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' else -@@ -2759,7 +2849,7 @@ +@@ -2759,7 +2857,7 @@ fi ;; @@ -587,7 +352,7 @@ Index: pam.debian/aclocal.m4 if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then test "$enable_shared" = yes && enable_static=no fi -@@ -2816,6 +2906,7 @@ +@@ -2816,6 +2914,7 @@ _LT_AC_TAGVAR(predeps, $1)= _LT_AC_TAGVAR(postdeps, $1)= _LT_AC_TAGVAR(compiler_lib_search_path, $1)= @@ -595,7 +360,7 @@ Index: pam.debian/aclocal.m4 # Source file extension for C++ test sources. ac_ext=cpp -@@ -2925,7 +3016,7 @@ +@@ -2925,7 +3024,7 @@ # FIXME: insert proper C++ library support _LT_AC_TAGVAR(ld_shlibs, $1)=no ;; @@ -604,7 +369,7 @@ Index: pam.debian/aclocal.m4 if test "$host_cpu" = ia64; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. -@@ -2938,7 +3029,7 @@ +@@ -2938,7 +3037,7 @@ # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we # need to do runtime linking. @@ -613,7 +378,7 @@ Index: pam.debian/aclocal.m4 for ld_flag in $LDFLAGS; do case $ld_flag in *-brtl*) -@@ -3084,51 +3175,23 @@ +@@ -3084,51 +3183,23 @@ fi ;; darwin* | rhapsody*) @@ -674,7 +439,7 @@ Index: pam.debian/aclocal.m4 else case $cc_basename in xlc*) -@@ -3379,7 +3442,7 @@ +@@ -3379,7 +3450,7 @@ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' ;; @@ -683,7 +448,7 @@ Index: pam.debian/aclocal.m4 # Portland Group C++ compiler _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' -@@ -3452,7 +3515,7 @@ +@@ -3452,7 +3523,7 @@ ;; esac ;; @@ -692,7 +457,7 @@ Index: pam.debian/aclocal.m4 if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' wlarc= -@@ -3814,7 +3877,8 @@ +@@ -3814,7 +3885,8 @@ # compiler output when linking a shared library. # Parse the compiler output and extract the necessary # objects, libraries and library flags. @@ -702,7 +467,7 @@ Index: pam.debian/aclocal.m4 dnl we can't use the lt_simple_compile_test_code here, dnl because it contains code intended for an executable, dnl not a library. It's possible we should let each -@@ -3939,6 +4003,11 @@ +@@ -3939,6 +4011,11 @@ $rm -f confest.$objext @@ -714,7 +479,7 @@ Index: pam.debian/aclocal.m4 # PORTME: override above test on systems where it is broken ifelse([$1],[CXX], [case $host_os in -@@ -3995,7 +4064,6 @@ +@@ -3995,7 +4072,6 @@ ;; esac ]) @@ -722,7 +487,7 @@ Index: pam.debian/aclocal.m4 case " $_LT_AC_TAGVAR(postdeps, $1) " in *" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;; esac -@@ -4080,7 +4148,7 @@ +@@ -4080,7 +4156,7 @@ postinstall_cmds='$RANLIB $lib' fi ;; @@ -731,7 +496,7 @@ Index: pam.debian/aclocal.m4 if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then test "$enable_shared" = yes && enable_static=no fi -@@ -4257,6 +4325,7 @@ +@@ -4257,6 +4333,7 @@ _LT_AC_TAGVAR(predeps, $1) \ _LT_AC_TAGVAR(postdeps, $1) \ _LT_AC_TAGVAR(compiler_lib_search_path, $1) \ @@ -739,7 +504,7 @@ Index: pam.debian/aclocal.m4 _LT_AC_TAGVAR(archive_cmds, $1) \ _LT_AC_TAGVAR(archive_expsym_cmds, $1) \ _LT_AC_TAGVAR(postinstall_cmds, $1) \ -@@ -4319,7 +4388,7 @@ +@@ -4319,7 +4396,7 @@ # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP) # NOTE: Changes made to this file will be lost: look at ltmain.sh. # @@ -748,7 +513,7 @@ Index: pam.debian/aclocal.m4 # Free Software Foundation, Inc. # # This file is part of GNU Libtool: -@@ -4556,6 +4625,10 @@ +@@ -4556,6 +4633,10 @@ # shared library. postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1) @@ -759,7 +524,7 @@ Index: pam.debian/aclocal.m4 # The library search path used internally by the compiler when linking # a shared library. compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) -@@ -4905,7 +4978,7 @@ +@@ -4905,7 +4986,7 @@ echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD cat conftest.$ac_ext >&5 fi @@ -768,7 +533,7 @@ Index: pam.debian/aclocal.m4 # Do not use the global_symbol_pipe unless it works. if test "$pipe_works" = yes; then -@@ -4962,7 +5035,8 @@ +@@ -4962,7 +5043,8 @@ # built for inclusion in a dll (and should export symbols for example). # Although the cygwin gcc ignores -fPIC, still need this for old-style # (--disable-auto-import) libraries @@ -778,7 +543,7 @@ Index: pam.debian/aclocal.m4 ;; darwin* | rhapsody*) # PIC is the default on this platform -@@ -4999,7 +5073,7 @@ +@@ -4999,7 +5081,7 @@ esac else case $host_os in @@ -787,7 +552,7 @@ Index: pam.debian/aclocal.m4 # All AIX code is PIC. if test "$host_cpu" = ia64; then # AIX 5 now supports IA64 processor -@@ -5095,7 +5169,7 @@ +@@ -5095,7 +5177,7 @@ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' ;; @@ -796,7 +561,7 @@ Index: pam.debian/aclocal.m4 # Portland Group C++ compiler. _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' -@@ -5133,7 +5207,7 @@ +@@ -5133,7 +5215,7 @@ ;; esac ;; @@ -805,7 +570,7 @@ Index: pam.debian/aclocal.m4 ;; osf3* | osf4* | osf5*) case $cc_basename in -@@ -5246,7 +5320,8 @@ +@@ -5246,7 +5328,8 @@ # built for inclusion in a dll (and should export symbols for example). # Although the cygwin gcc ignores -fPIC, still need this for old-style # (--disable-auto-import) libraries @@ -815,7 +580,7 @@ Index: pam.debian/aclocal.m4 ;; darwin* | rhapsody*) -@@ -5316,7 +5391,8 @@ +@@ -5316,7 +5399,8 @@ mingw* | cygwin* | pw32* | os2*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). @@ -825,7 +590,7 @@ Index: pam.debian/aclocal.m4 ;; hpux9* | hpux10* | hpux11*) -@@ -5453,7 +5529,7 @@ +@@ -5453,7 +5537,7 @@ # if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works], @@ -834,7 +599,7 @@ Index: pam.debian/aclocal.m4 [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [], [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in "" | " "*) ;; -@@ -5477,7 +5553,7 @@ +@@ -5477,7 +5561,7 @@ # wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\" AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], @@ -843,7 +608,7 @@ Index: pam.debian/aclocal.m4 $lt_tmp_static_flag, [], [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=]) -@@ -5493,7 +5569,7 @@ +@@ -5493,7 +5577,7 @@ ifelse([$1],[CXX],[ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' case $host_os in @@ -852,7 +617,7 @@ Index: pam.debian/aclocal.m4 # If we're using GNU nm, then we don't want the "-C" option. # -C means demangle to AIX nm, but means don't demangle with GNU nm if $NM -V 2>&1 | grep 'GNU' > /dev/null; then -@@ -5508,10 +5584,14 @@ +@@ -5508,10 +5592,14 @@ cygwin* | mingw*) _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' ;; @@ -867,7 +632,7 @@ Index: pam.debian/aclocal.m4 ],[ runpath_var= _LT_AC_TAGVAR(allow_undefined_flag, $1)= -@@ -5542,12 +5622,14 @@ +@@ -5542,12 +5630,14 @@ # it will be wrapped by ` (' and `)$', so one must not match beginning or # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', # as well as any symbol that contains `d'. @@ -883,7 +648,7 @@ Index: pam.debian/aclocal.m4 extract_expsyms_cmds= # Just being paranoid about ensuring that cc_basename is set. _LT_CC_BASENAME([$compiler]) -@@ -5597,7 +5679,7 @@ +@@ -5597,7 +5687,7 @@ # See if GNU ld supports shared libraries. case $host_os in @@ -892,7 +657,7 @@ Index: pam.debian/aclocal.m4 # On AIX/PPC, the GNU linker is very broken if test "$host_cpu" != ia64; then _LT_AC_TAGVAR(ld_shlibs, $1)=no -@@ -5713,12 +5795,13 @@ +@@ -5713,12 +5803,13 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' fi @@ -907,7 +672,7 @@ Index: pam.debian/aclocal.m4 if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= -@@ -5816,7 +5899,7 @@ +@@ -5816,7 +5907,7 @@ fi ;; @@ -916,7 +681,7 @@ Index: pam.debian/aclocal.m4 if test "$host_cpu" = ia64; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. -@@ -5836,7 +5919,7 @@ +@@ -5836,7 +5927,7 @@ # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we # need to do runtime linking. @@ -925,7 +690,7 @@ Index: pam.debian/aclocal.m4 for ld_flag in $LDFLAGS; do if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then aix_use_runtimelinking=yes -@@ -5996,11 +6079,10 @@ +@@ -5996,11 +6087,10 @@ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes if test "$GCC" = yes ; then output_verbose_link_cmd='echo' @@ -941,7 +706,7 @@ Index: pam.debian/aclocal.m4 else case $cc_basename in xlc*) -@@ -6150,7 +6232,7 @@ +@@ -6150,7 +6240,7 @@ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ;; @@ -950,425 +715,107 @@ Index: pam.debian/aclocal.m4 if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else -@@ -6581,7 +6663,7 @@ +@@ -6581,7 +6671,7 @@ AC_MSG_RESULT([$SED]) ]) -# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc. -+# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc. ++# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, -@@ -6591,29 +6673,14 @@ - # ---------------------------- - # Automake X.Y traces this macro to ensure aclocal.m4 has been - # generated from the m4 files accompanying Automake X.Y. --# (This private macro should not be called outside this file.) --AC_DEFUN([AM_AUTOMAKE_VERSION], --[am__api_version='1.10' --dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to --dnl require some minimum version. Point them to the right macro. +@@ -6596,7 +6686,7 @@ + [am__api_version='1.10' + dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to + dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.10], [], -- [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl --]) -- --# _AM_AUTOCONF_VERSION(VERSION) --# ----------------------------- --# aclocal traces this macro to find the Autoconf version. --# This is a private macro too. Using m4_define simplifies --# the logic in aclocal, which can simply ignore this definition. --m4_define([_AM_AUTOCONF_VERSION], []) -+AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"]) - - # AM_SET_CURRENT_AUTOMAKE_VERSION - # ------------------------------- --# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. -+# Call AM_AUTOMAKE_VERSION so it can be traced. ++m4_if([$1], [1.10.1], [], + [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl + ]) + +@@ -6612,8 +6702,10 @@ + # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.10])dnl -_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)]) -+ [AM_AUTOMAKE_VERSION([1.9.6])]) ++[AM_AUTOMAKE_VERSION([1.10.1])dnl ++m4_ifndef([AC_AUTOCONF_VERSION], ++ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl ++_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -@@ -6670,14 +6737,14 @@ - - # AM_CONDITIONAL -*- Autoconf -*- - --# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006 -+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005 - # Free Software Foundation, Inc. - # - # This file 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. - --# serial 8 -+# serial 7 - - # AM_CONDITIONAL(NAME, SHELL-CONDITION) - # ------------------------------------- -@@ -6686,10 +6753,8 @@ - [AC_PREREQ(2.52)dnl - ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], - [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl --AC_SUBST([$1_TRUE])dnl --AC_SUBST([$1_FALSE])dnl --_AM_SUBST_NOTMAKE([$1_TRUE])dnl --_AM_SUBST_NOTMAKE([$1_FALSE])dnl -+AC_SUBST([$1_TRUE]) -+AC_SUBST([$1_FALSE]) - if $2; then - $1_TRUE= - $1_FALSE='#' -@@ -6703,14 +6768,15 @@ - Usually this means the macro was only invoked conditionally.]]) - fi])]) - --# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 -+ -+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 - # Free Software Foundation, Inc. - # - # This file 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. - --# serial 9 -+# serial 8 - - # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be - # written in clear, in which case automake, when reading aclocal.m4, -@@ -6738,7 +6804,6 @@ - ifelse([$1], CC, [depcc="$CC" am_compiler_list=], - [$1], CXX, [depcc="$CXX" am_compiler_list=], - [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], -- [$1], UPC, [depcc="$UPC" am_compiler_list=], - [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], - [depcc="$$1" am_compiler_list=]) - -@@ -6804,7 +6869,6 @@ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ - >/dev/null 2>conftest.err && -- grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then -@@ -6857,8 +6921,7 @@ - AMDEPBACKSLASH='\' - fi - AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) --AC_SUBST([AMDEPBACKSLASH])dnl --_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl -+AC_SUBST([AMDEPBACKSLASH]) - ]) - - # Generate code to set up dependency tracking. -*- Autoconf -*- -@@ -6883,9 +6946,8 @@ - # some people rename them; so instead we look at the file content. - # Grep'ing the first line is not enough: some people post-process +@@ -6885,7 +6977,7 @@ # each Makefile.in and add a new line on top of each file to say so. -- # Grep'ing the whole file is not good either: AIX grep has a line -- # limit of 2048, but all sed's we know have understand at least 4000. + # Grep'ing the whole file is not good either: AIX grep has a line + # limit of 2048, but all sed's we know have understand at least 4000. - if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then -+ # So let's grep whole file. -+ if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then ++ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then dirpart=`AS_DIRNAME("$mf")` else continue -@@ -6944,8 +7006,8 @@ - +@@ -6945,13 +7037,13 @@ # Do all the work for Automake. -*- Autoconf -*- --# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, + # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006 Free Software Foundation, Inc. -+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -+# Free Software Foundation, Inc. - # - # This file is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, -@@ -6968,20 +7030,16 @@ - # arguments mandatory, and then we can depend on a new Autoconf - # release and drop the old call support. - AC_DEFUN([AM_INIT_AUTOMAKE], --[AC_PREREQ([2.60])dnl -+[AC_PREREQ([2.58])dnl - dnl Autoconf wants to disallow AM_ names. We explicitly allow - dnl the ones we care about. - m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl - AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl - AC_REQUIRE([AC_PROG_INSTALL])dnl --if test "`cd $srcdir && pwd`" != "`pwd`"; then -- # Use -I$(srcdir) only when $(srcdir) != ., so that make's output -- # is not polluted with repeated "-I." -- AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl -- # test to see if srcdir already configured -- if test -f $srcdir/config.status; then -- AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) -- fi -+# test to see if srcdir already configured -+if test "`cd $srcdir && pwd`" != "`pwd`" && -+ test -f $srcdir/config.status; then -+ AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) - fi - - # test whether we have cygpath -@@ -7001,9 +7059,6 @@ - AC_SUBST([PACKAGE], [$1])dnl - AC_SUBST([VERSION], [$2])], - [_AM_SET_OPTIONS([$1])dnl --dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. --m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, -- [m4_fatal([AC_INIT should be called with package and version arguments])])dnl - AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl - AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl - -@@ -7039,10 +7094,6 @@ - [_AM_DEPENDENCIES(CXX)], - [define([AC_PROG_CXX], - defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl --AC_PROVIDE_IFELSE([AC_PROG_OBJC], -- [_AM_DEPENDENCIES(OBJC)], -- [define([AC_PROG_OBJC], -- defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl - ]) - ]) - -@@ -7078,7 +7129,7 @@ - # Define $install_sh. - AC_DEFUN([AM_PROG_INSTALL_SH], - [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl --install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} -+install_sh=${install_sh-"$am_aux_dir/install-sh"} - AC_SUBST(install_sh)]) - - # Copyright (C) 2003, 2005 Free Software Foundation, Inc. -@@ -7175,14 +7226,13 @@ - rm -f confinc confmf - ]) - --# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005 --# Free Software Foundation, Inc. -+# Copyright (C) 1999, 2000, 2001, 2003, 2005 Free Software Foundation, Inc. ++# 2005, 2006, 2008 Free Software Foundation, Inc. # # This file 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. --# serial 5 -+# serial 3 - - # AM_PROG_CC_C_O - # -------------- -@@ -7190,7 +7240,6 @@ - AC_DEFUN([AM_PROG_CC_C_O], - [AC_REQUIRE([AC_PROG_CC_C_O])dnl - AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl --AC_REQUIRE_AUX_FILE([compile])dnl - # FIXME: we rely on the cache variable name because - # there is no other way. - set dummy $CC -@@ -7203,22 +7252,18 @@ - # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" - CC="$am_aux_dir/compile $CC" - fi --dnl Make sure AC_PROG_CC is never called again, or it will override our --dnl setting of CC. --m4_define([AC_PROG_CC], -- [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])]) - ]) - - # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- +-# serial 12 ++# serial 13 + + # This macro actually does too much. Some checks are only needed if + # your package does certain things. But this isn't really a big deal. +@@ -7056,16 +7148,17 @@ + # our stamp files there. + AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], + [# Compute $1's index in $config_headers. ++_am_arg=$1 + _am_stamp_count=1 + for _am_header in $config_headers :; do + case $_am_header in +- $1 | $1:* ) ++ $_am_arg | $_am_arg:* ) + break ;; + * ) + _am_stamp_count=`expr $_am_stamp_count + 1` ;; + esac + done +-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) ++echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) --# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005 -+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005 - # Free Software Foundation, Inc. + # Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. # - # This file 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. - --# serial 5 -+# serial 4 - - # AM_MISSING_PROG(NAME, PROGRAM) - # ------------------------------ -@@ -7234,7 +7279,6 @@ - # If it does, set am_missing_run to use it, otherwise, to nothing. - AC_DEFUN([AM_MISSING_HAS_RUN], - [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl --AC_REQUIRE_AUX_FILE([missing])dnl - test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" - # Use eval to expand $SHELL - if eval "$MISSING --run true"; then -@@ -7245,7 +7289,7 @@ - fi - ]) +@@ -7392,7 +7485,7 @@ --# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. - # - # This file is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, -@@ -7253,23 +7297,60 @@ - - # AM_PROG_MKDIR_P - # --------------- --# Check for `mkdir -p'. -+# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise. -+# -+# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories -+# created by `make install' are always world readable, even if the -+# installer happens to have an overly restrictive umask (e.g. 077). -+# This was a mistake. There are at least two reasons why we must not -+# use `-m 0755': -+# - it causes special bits like SGID to be ignored, -+# - it may be too restrictive (some setups expect 775 directories). -+# -+# Do not use -m 0755 and let people choose whatever they expect by -+# setting umask. -+# -+# We cannot accept any implementation of `mkdir' that recognizes `-p'. -+# Some implementations (such as Solaris 8's) are not thread-safe: if a -+# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c' -+# concurrently, both version can detect that a/ is missing, but only -+# one can create it and the other will error out. Consequently we -+# restrict ourselves to GNU make (using the --version option ensures -+# this.) - AC_DEFUN([AM_PROG_MKDIR_P], --[AC_PREREQ([2.60])dnl --AC_REQUIRE([AC_PROG_MKDIR_P])dnl --dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, --dnl while keeping a definition of mkdir_p for backward compatibility. --dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. --dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of --dnl Makefile.ins that do not define MKDIR_P, so we do our own --dnl adjustment using top_builddir (which is defined more often than --dnl MKDIR_P). --AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl --case $mkdir_p in -- [[\\/$]]* | ?:[[\\/]]*) ;; -- */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; --esac --]) -+[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then -+ # We used to keeping the `.' as first argument, in order to -+ # allow $(mkdir_p) to be used without argument. As in -+ # $(mkdir_p) $(somedir) -+ # where $(somedir) is conditionally defined. However this is wrong -+ # for two reasons: -+ # 1. if the package is installed by a user who cannot write `.' -+ # make install will fail, -+ # 2. the above comment should most certainly read -+ # $(mkdir_p) $(DESTDIR)$(somedir) -+ # so it does not work when $(somedir) is undefined and -+ # $(DESTDIR) is not. -+ # To support the latter case, we have to write -+ # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), -+ # so the `.' trick is pointless. -+ mkdir_p='mkdir -p --' -+else -+ # On NextStep and OpenStep, the `mkdir' command does not -+ # recognize any option. It will interpret all options as -+ # directories to create, and then abort because `.' already -+ # exists. -+ for d in ./-p ./--version; -+ do -+ test -d $d && rmdir $d -+ done -+ # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. -+ if test -f "$ac_aux_dir/mkinstalldirs"; then -+ mkdir_p='$(mkinstalldirs)' -+ else -+ mkdir_p='$(install_sh) -d' -+ fi -+fi -+AC_SUBST([mkdir_p])]) - - # Helper functions for option handling. -*- Autoconf -*- - -@@ -7381,21 +7462,9 @@ - if test "$cross_compiling" != no; then - AC_CHECK_TOOL([STRIP], [strip], :) - fi --INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" -+INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" - AC_SUBST([INSTALL_STRIP_PROGRAM])]) - --# Copyright (C) 2006 Free Software Foundation, Inc. --# --# This file 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. -- --# _AM_SUBST_NOTMAKE(VARIABLE) --# --------------------------- + # _AM_SUBST_NOTMAKE(VARIABLE) + # --------------------------- -# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in. --# This macro is traced by Automake. --AC_DEFUN([_AM_SUBST_NOTMAKE]) -- - # Check how to create a tarball. -*- Autoconf -*- ++# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. + # This macro is traced by Automake. + AC_DEFUN([_AM_SUBST_NOTMAKE]) - # Copyright (C) 2004, 2005 Free Software Foundation, Inc. Index: pam.debian/conf/Makefile.in =================================================================== --- pam.debian.orig/conf/Makefile.in +++ pam.debian/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. ++# Makefile.in generated by automake 1.10.1 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. ++# 2003, 2004, 2005, 2006, 2007, 2008 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@ -@@ -83,11 +86,16 @@ +@@ -83,6 +83,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -1376,40 +823,7 @@ Index: pam.debian/conf/Makefile.in ECHO = @ECHO@ ECHO_C = @ECHO_C@ 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 +104,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@ -@@ -131,10 +150,10 @@ - LTLIBINTL = @LTLIBINTL@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ --MKDIR_P = @MKDIR_P@ +@@ -135,6 +136,7 @@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ @@ -1417,271 +831,69 @@ Index: pam.debian/conf/Makefile.in OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -@@ -153,6 +172,8 @@ - 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@ -@@ -166,13 +187,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@ -@@ -184,7 +205,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - datadir = @datadir@ - datarootdir = @datarootdir@ - docdir = @docdir@ -@@ -215,11 +235,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 -@@ -262,6 +279,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, -@@ -293,7 +314,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 \ -@@ -394,21 +416,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; \ -@@ -422,7 +445,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`; \ -@@ -430,8 +453,6 @@ - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$top_distdir" \ - distdir="$$distdir/$$subdir" \ -- am__remove_distdir=: \ -- am__skip_length_check=: \ - distdir) \ - || exit 1; \ - fi; \ -@@ -472,7 +493,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 - -@@ -486,20 +508,12 @@ - - install-data-am: - --install-dvi: install-dvi-recursive -- - install-exec-am: - --install-html: install-html-recursive -- - install-info: install-info-recursive - - install-man: +@@ -337,8 +339,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS --install-pdf: install-pdf-recursive -- --install-ps: install-ps-recursive -- - installcheck-am: - - maintainer-clean: maintainer-clean-recursive -@@ -518,24 +532,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. +@@ -363,8 +365,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -374,13 +376,12 @@ + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique Index: pam.debian/conf/pam_conv1/Makefile.in =================================================================== --- pam.debian.orig/conf/pam_conv1/Makefile.in +++ pam.debian/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. ++# Makefile.in generated by automake 1.10.1 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. ++# 2003, 2004, 2005, 2006, 2007, 2008 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 @@ +@@ -59,7 +59,7 @@ 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) ++DEFAULT_INCLUDES = -I.@am__isrc@ -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@ -@@ -103,11 +106,16 @@ +@@ -103,6 +103,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -1689,40 +901,7 @@ Index: pam.debian/conf/pam_conv1/Makefile.in ECHO = @ECHO@ ECHO_C = @ECHO_C@ 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 +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@ -@@ -151,10 +170,10 @@ - LTLIBINTL = @LTLIBINTL@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ --MKDIR_P = @MKDIR_P@ +@@ -155,6 +156,7 @@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ @@ -1730,245 +909,49 @@ Index: pam.debian/conf/pam_conv1/Makefile.in OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -@@ -173,6 +192,8 @@ - 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@ - CLEANFILES = *~ - EXTRA_DIST = README - AM_YFLAGS = -d -@@ -290,11 +307,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) -@@ -306,31 +323,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 -@@ -338,6 +375,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)'; \ +@@ -343,8 +345,8 @@ unique=`for i in $$list; do \ -@@ -387,21 +428,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; \ -@@ -456,7 +498,7 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - - dvi: dvi-am - -@@ -470,20 +512,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 -@@ -504,22 +538,19 @@ - - ps-am: + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS --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. +@@ -356,8 +358,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -367,13 +369,12 @@ + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique Index: pam.debian/configure =================================================================== --- pam.debian.orig/configure +++ pam.debian/configure -@@ -808,7 +808,6 @@ - INSTALL_PROGRAM - INSTALL_SCRIPT - INSTALL_DATA --am__isrc - CYGPATH_W - PACKAGE - VERSION -@@ -865,6 +864,8 @@ +@@ -865,6 +865,8 @@ ECHO AR RANLIB @@ -1977,188 +960,7 @@ Index: pam.debian/configure CPP CXX CXXFLAGS -@@ -2033,8 +2034,7 @@ - ac_compiler_gnu=$ac_cv_c_compiler_gnu - - --am__api_version='1.10' -- -+am__api_version="1.9" - ac_aux_dir= - for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do - if test -f "$ac_dir/install-sh"; then -@@ -2217,53 +2217,38 @@ - echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} - fi - --{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5 --echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; } --if test -z "$MKDIR_P"; then -- if test "${ac_cv_path_mkdir+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_prog in mkdir gmkdir; do -- for ac_exec_ext in '' $ac_executable_extensions; do -- { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue -- case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( -- 'mkdir (GNU coreutils) '* | \ -- 'mkdir (coreutils) '* | \ -- 'mkdir (fileutils) '4.1*) -- ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext -- break 3;; -- esac -- done -- done --done --IFS=$as_save_IFS -- --fi -- -- if test "${ac_cv_path_mkdir+set}" = set; then -- MKDIR_P="$ac_cv_path_mkdir -p" -+if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then -+ # We used to keeping the `.' as first argument, in order to -+ # allow $(mkdir_p) to be used without argument. As in -+ # $(mkdir_p) $(somedir) -+ # where $(somedir) is conditionally defined. However this is wrong -+ # for two reasons: -+ # 1. if the package is installed by a user who cannot write `.' -+ # make install will fail, -+ # 2. the above comment should most certainly read -+ # $(mkdir_p) $(DESTDIR)$(somedir) -+ # so it does not work when $(somedir) is undefined and -+ # $(DESTDIR) is not. -+ # To support the latter case, we have to write -+ # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), -+ # so the `.' trick is pointless. -+ mkdir_p='mkdir -p --' -+else -+ # On NextStep and OpenStep, the `mkdir' command does not -+ # recognize any option. It will interpret all options as -+ # directories to create, and then abort because `.' already -+ # exists. -+ for d in ./-p ./--version; -+ do -+ test -d $d && rmdir $d -+ done -+ # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. -+ if test -f "$ac_aux_dir/mkinstalldirs"; then -+ mkdir_p='$(mkinstalldirs)' - else -- # As a last resort, use the slow shell script. Don't cache a -- # value for MKDIR_P within a source directory, because that will -- # break other packages using the cache if that directory is -- # removed, or if the value is a relative name. -- test -d ./--version && rmdir ./--version -- MKDIR_P="$ac_install_sh -d" -+ mkdir_p='$(install_sh) -d' - fi - fi --{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5 --echo "${ECHO_T}$MKDIR_P" >&6; } -- --mkdir_p="$MKDIR_P" --case $mkdir_p in -- [\\/$]* | ?:[\\/]*) ;; -- */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; --esac - - for ac_prog in gawk mawk nawk awk - do -@@ -2346,16 +2331,12 @@ - fi - rmdir .tst 2>/dev/null - --if test "`cd $srcdir && pwd`" != "`pwd`"; then -- # Use -I$(srcdir) only when $(srcdir) != ., so that make's output -- # is not polluted with repeated "-I." -- am__isrc=' -I$(srcdir)' -- # test to see if srcdir already configured -- if test -f $srcdir/config.status; then -- { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 -+# test to see if srcdir already configured -+if test "`cd $srcdir && pwd`" != "`pwd`" && -+ test -f $srcdir/config.status; then -+ { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 - echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} - { (exit 1); exit 1; }; } -- fi - fi - - # test whether we have cygpath -@@ -2398,7 +2379,7 @@ - - MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} - --install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} -+install_sh=${install_sh-"$am_aux_dir/install-sh"} - - # Installed binaries are usually stripped using `strip' when the user - # run `make install-strip'. However `strip' might not be the right -@@ -2502,7 +2483,7 @@ - fi - - fi --INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" -+INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" - - # We need awk for the "check" target. The system "awk" is bad on - # some platforms. -@@ -2746,7 +2727,9 @@ - - - fi -- if test "$STATIC_MODULES" != "no"; then -+ -+ -+if test "$STATIC_MODULES" != "no"; then - STATIC_MODULES_TRUE= - STATIC_MODULES_FALSE='#' - else -@@ -3732,7 +3715,9 @@ - am_depcomp="$ac_aux_dir/depcomp" - AMDEPBACKSLASH='\' - fi -- if test "x$enable_dependency_tracking" != xno; then -+ -+ -+if test "x$enable_dependency_tracking" != xno; then - AMDEP_TRUE= - AMDEP_FALSE='#' - else -@@ -3742,6 +3727,7 @@ - - - -+ - depcc="$CC" am_compiler_list= - - { echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 -@@ -3809,7 +3795,6 @@ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ - >/dev/null 2>conftest.err && -- grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then -@@ -3839,7 +3824,9 @@ - echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; } - CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type - -- if -+ -+ -+if - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then - am__fastdepCC_TRUE= -@@ -4672,7 +4659,7 @@ +@@ -4672,7 +4674,7 @@ # whether `pass_all' will *always* work, you probably want this one. case $host_os in @@ -2167,7 +969,7 @@ Index: pam.debian/configure lt_cv_deplibs_check_method=pass_all ;; -@@ -4767,7 +4754,7 @@ +@@ -4767,7 +4769,7 @@ lt_cv_deplibs_check_method=pass_all ;; @@ -2176,16 +978,16 @@ Index: pam.debian/configure if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' else -@@ -4887,7 +4874,7 @@ +@@ -4887,7 +4889,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 4890 "configure"' > conftest.$ac_ext -+ echo '#line 4877 "configure"' > conftest.$ac_ext ++ echo '#line 4892 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? -@@ -5059,7 +5046,11 @@ +@@ -5059,7 +5061,11 @@ *64-bit*) case $lt_cv_prog_gnu_ld in yes*) LD="${LD-ld} -m elf64_sparc" ;; @@ -2198,26 +1000,7 @@ Index: pam.debian/configure esac ;; esac -@@ -6118,7 +6109,6 @@ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ - >/dev/null 2>conftest.err && -- grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then -@@ -6148,7 +6138,9 @@ - echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; } - CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type - -- if -+ -+ -+if - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then - am__fastdepCXX_TRUE= -@@ -6656,7 +6648,6 @@ +@@ -6656,7 +6662,6 @@ # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! @@ -2225,7 +1008,7 @@ Index: pam.debian/configure # find the maximum length of command line arguments { echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5 echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; } -@@ -6971,7 +6962,7 @@ +@@ -6971,7 +6976,7 @@ echo "$progname: failed program was:" >&5 cat conftest.$ac_ext >&5 fi @@ -2234,7 +1017,7 @@ Index: pam.debian/configure # Do not use the global_symbol_pipe unless it works. if test "$pipe_works" = yes; then -@@ -7531,6 +7522,318 @@ +@@ -7531,6 +7536,318 @@ ;; esac @@ -2553,7 +1336,7 @@ Index: pam.debian/configure enable_dlopen=no enable_win32_dll=no -@@ -7596,7 +7899,7 @@ +@@ -7596,7 +7913,7 @@ echo "$lt_simple_link_test_code" >conftest.$ac_ext eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_linker_boilerplate=`cat conftest.err` @@ -2562,21 +1345,21 @@ Index: pam.debian/configure -@@ -7624,11 +7927,11 @@ +@@ -7624,11 +7941,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7627: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:7930: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:7944: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7631: \$? = $ac_status" >&5 -+ echo "$as_me:7934: \$? = $ac_status" >&5 ++ echo "$as_me:7948: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. -@@ -7898,10 +8201,10 @@ +@@ -7898,10 +8215,10 @@ { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; } @@ -2589,17 +1372,17 @@ Index: pam.debian/configure ac_outfile=conftest.$ac_objext echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="$lt_prog_compiler_pic -DPIC" -@@ -7914,27 +8217,27 @@ +@@ -7914,27 +8231,27 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7917: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:8220: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8234: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7921: \$? = $ac_status" >&5 -+ echo "$as_me:8224: \$? = $ac_status" >&5 ++ echo "$as_me:8238: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -2623,7 +1406,7 @@ Index: pam.debian/configure case $lt_prog_compiler_pic in "" | " "*) ;; *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;; -@@ -7961,10 +8264,10 @@ +@@ -7961,10 +8278,10 @@ wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } @@ -2636,7 +1419,7 @@ Index: pam.debian/configure save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS $lt_tmp_static_flag" echo "$lt_simple_link_test_code" > conftest.$ac_ext -@@ -7977,20 +8280,20 @@ +@@ -7977,20 +8294,20 @@ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if diff conftest.exp conftest.er2 >/dev/null; then @@ -2663,21 +1446,21 @@ Index: pam.debian/configure : else lt_prog_compiler_static= -@@ -8018,11 +8321,11 @@ +@@ -8018,11 +8335,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8021: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:8324: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8338: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8025: \$? = $ac_status" >&5 -+ echo "$as_me:8328: \$? = $ac_status" >&5 ++ echo "$as_me:8342: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized -@@ -8102,12 +8405,13 @@ +@@ -8102,12 +8419,13 @@ # it will be wrapped by ` (' and `)$', so one must not match beginning or # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', # as well as any symbol that contains `d'. @@ -2692,7 +1475,7 @@ Index: pam.debian/configure extract_expsyms_cmds= # Just being paranoid about ensuring that cc_basename is set. for cc_temp in $compiler""; do -@@ -8166,7 +8470,7 @@ +@@ -8166,7 +8484,7 @@ # See if GNU ld supports shared libraries. case $host_os in @@ -2701,7 +1484,7 @@ Index: pam.debian/configure # On AIX/PPC, the GNU linker is very broken if test "$host_cpu" != ia64; then ld_shlibs=no -@@ -8282,12 +8586,13 @@ +@@ -8282,12 +8600,13 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' fi @@ -2716,7 +1499,7 @@ Index: pam.debian/configure if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= -@@ -8385,7 +8690,7 @@ +@@ -8385,7 +8704,7 @@ fi ;; @@ -2725,7 +1508,7 @@ Index: pam.debian/configure if test "$host_cpu" = ia64; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. -@@ -8405,7 +8710,7 @@ +@@ -8405,7 +8724,7 @@ # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we # need to do runtime linking. @@ -2734,7 +1517,7 @@ Index: pam.debian/configure for ld_flag in $LDFLAGS; do if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then aix_use_runtimelinking=yes -@@ -8677,11 +8982,10 @@ +@@ -8677,11 +8996,10 @@ link_all_deplibs=yes if test "$GCC" = yes ; then output_verbose_link_cmd='echo' @@ -2750,7 +1533,7 @@ Index: pam.debian/configure else case $cc_basename in xlc*) -@@ -8831,7 +9135,7 @@ +@@ -8831,7 +9149,7 @@ link_all_deplibs=yes ;; @@ -2759,7 +1542,7 @@ Index: pam.debian/configure if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else -@@ -9201,7 +9505,7 @@ +@@ -9201,7 +9519,7 @@ soname_spec='${libname}${release}${shared_ext}$major' ;; @@ -2768,7 +1551,7 @@ Index: pam.debian/configure version_type=linux need_lib_prefix=no need_version=no -@@ -9542,6 +9846,18 @@ +@@ -9542,6 +9860,18 @@ dynamic_linker='GNU/Linux ld.so' ;; @@ -2787,7 +1570,7 @@ Index: pam.debian/configure netbsd*) version_type=sunos need_lib_prefix=no -@@ -9723,6 +10039,21 @@ +@@ -9723,6 +10053,21 @@ echo "${ECHO_T}$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no @@ -2809,7 +1592,7 @@ Index: pam.debian/configure variables_saved_for_relink="PATH $shlibpath_var $runpath_var" if test "$GCC" = yes; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -@@ -10042,7 +10373,7 @@ +@@ -10042,7 +10387,7 @@ { echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; } if test $ac_cv_lib_dld_shl_load = yes; then @@ -2818,7 +1601,7 @@ Index: pam.debian/configure else { echo "$as_me:$LINENO: checking for dlopen" >&5 echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; } -@@ -10318,7 +10649,7 @@ +@@ -10318,7 +10663,7 @@ { echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; } if test $ac_cv_lib_dld_dld_link = yes; then @@ -2827,25 +1610,25 @@ Index: pam.debian/configure fi -@@ -10367,7 +10698,7 @@ +@@ -10367,7 +10712,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 10370 "configure" -+#line 10701 "configure" ++#line 10715 "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -10467,7 +10798,7 @@ +@@ -10467,7 +10812,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 10470 "configure" -+#line 10801 "configure" ++#line 10815 "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -10594,7 +10925,7 @@ +@@ -10594,7 +10939,7 @@ fi ;; @@ -2854,7 +1637,7 @@ Index: pam.debian/configure if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then test "$enable_shared" = yes && enable_static=no fi -@@ -10650,6 +10981,7 @@ +@@ -10650,6 +10995,7 @@ predeps \ postdeps \ compiler_lib_search_path \ @@ -2862,7 +1645,7 @@ Index: pam.debian/configure archive_cmds \ archive_expsym_cmds \ postinstall_cmds \ -@@ -10710,7 +11042,7 @@ +@@ -10710,7 +11056,7 @@ # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP) # NOTE: Changes made to this file will be lost: look at ltmain.sh. # @@ -2871,7 +1654,7 @@ Index: pam.debian/configure # Free Software Foundation, Inc. # # This file is part of GNU Libtool: -@@ -10946,6 +11278,10 @@ +@@ -10946,6 +11292,10 @@ # shared library. postdeps=$lt_postdeps @@ -2882,7 +1665,7 @@ Index: pam.debian/configure # The library search path used internally by the compiler when linking # a shared library. compiler_lib_search_path=$lt_compiler_lib_search_path -@@ -11194,6 +11530,7 @@ +@@ -11194,6 +11544,7 @@ predeps_CXX= postdeps_CXX= compiler_lib_search_path_CXX= @@ -2890,7 +1673,7 @@ Index: pam.debian/configure # Source file extension for C++ test sources. ac_ext=cpp -@@ -11231,7 +11568,7 @@ +@@ -11231,7 +11582,7 @@ echo "$lt_simple_link_test_code" >conftest.$ac_ext eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_linker_boilerplate=`cat conftest.err` @@ -2899,7 +1682,7 @@ Index: pam.debian/configure # Allow CC to be a program name with arguments. -@@ -11438,7 +11775,7 @@ +@@ -11438,7 +11789,7 @@ # FIXME: insert proper C++ library support ld_shlibs_CXX=no ;; @@ -2908,7 +1691,7 @@ Index: pam.debian/configure if test "$host_cpu" = ia64; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. -@@ -11451,7 +11788,7 @@ +@@ -11451,7 +11802,7 @@ # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we # need to do runtime linking. @@ -2917,7 +1700,7 @@ Index: pam.debian/configure for ld_flag in $LDFLAGS; do case $ld_flag in *-brtl*) -@@ -11709,51 +12046,23 @@ +@@ -11709,51 +12060,23 @@ fi ;; darwin* | rhapsody*) @@ -2978,7 +1761,7 @@ Index: pam.debian/configure else case $cc_basename in xlc*) -@@ -12004,7 +12313,7 @@ +@@ -12004,7 +12327,7 @@ export_dynamic_flag_spec_CXX='${wl}--export-dynamic' whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive' ;; @@ -2987,7 +1770,7 @@ Index: pam.debian/configure # Portland Group C++ compiler archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' -@@ -12077,7 +12386,7 @@ +@@ -12077,7 +12400,7 @@ ;; esac ;; @@ -2996,7 +1779,7 @@ Index: pam.debian/configure if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' wlarc= -@@ -12411,7 +12720,6 @@ +@@ -12411,7 +12734,6 @@ GCC_CXX="$GXX" LD_CXX="$LD" @@ -3004,7 +1787,7 @@ Index: pam.debian/configure cat > conftest.$ac_ext <<EOF class Foo { -@@ -12513,6 +12821,11 @@ +@@ -12513,6 +12835,11 @@ $rm -f confest.$objext @@ -3016,7 +1799,7 @@ Index: pam.debian/configure # PORTME: override above test on systems where it is broken case $host_os in interix[3-9]*) -@@ -12568,7 +12881,6 @@ +@@ -12568,7 +12895,6 @@ ;; esac @@ -3024,7 +1807,7 @@ Index: pam.debian/configure case " $postdeps_CXX " in *" -lc "*) archive_cmds_need_lc_CXX=no ;; esac -@@ -12644,7 +12956,7 @@ +@@ -12644,7 +12970,7 @@ esac else case $host_os in @@ -3033,7 +1816,7 @@ Index: pam.debian/configure # All AIX code is PIC. if test "$host_cpu" = ia64; then # AIX 5 now supports IA64 processor -@@ -12740,7 +13052,7 @@ +@@ -12740,7 +13066,7 @@ lt_prog_compiler_pic_CXX='-KPIC' lt_prog_compiler_static_CXX='-static' ;; @@ -3042,7 +1825,7 @@ Index: pam.debian/configure # Portland Group C++ compiler. lt_prog_compiler_wl_CXX='-Wl,' lt_prog_compiler_pic_CXX='-fpic' -@@ -12778,7 +13090,7 @@ +@@ -12778,7 +13104,7 @@ ;; esac ;; @@ -3051,7 +1834,7 @@ Index: pam.debian/configure ;; osf3* | osf4* | osf5*) case $cc_basename in -@@ -12871,10 +13183,10 @@ +@@ -12871,10 +13197,10 @@ { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; } @@ -3064,17 +1847,17 @@ Index: pam.debian/configure ac_outfile=conftest.$ac_objext echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC" -@@ -12887,27 +13199,27 @@ +@@ -12887,27 +13213,27 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12890: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:13202: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:13216: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:12894: \$? = $ac_status" >&5 -+ echo "$as_me:13206: \$? = $ac_status" >&5 ++ echo "$as_me:13220: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -3098,7 +1881,7 @@ Index: pam.debian/configure case $lt_prog_compiler_pic_CXX in "" | " "*) ;; *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;; -@@ -12934,10 +13246,10 @@ +@@ -12934,10 +13260,10 @@ wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\" { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } @@ -3111,7 +1894,7 @@ Index: pam.debian/configure save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS $lt_tmp_static_flag" echo "$lt_simple_link_test_code" > conftest.$ac_ext -@@ -12950,20 +13262,20 @@ +@@ -12950,20 +13276,20 @@ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if diff conftest.exp conftest.er2 >/dev/null; then @@ -3138,21 +1921,21 @@ Index: pam.debian/configure : else lt_prog_compiler_static_CXX= -@@ -12991,11 +13303,11 @@ +@@ -12991,11 +13317,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12994: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:13306: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:13320: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:12998: \$? = $ac_status" >&5 -+ echo "$as_me:13310: \$? = $ac_status" >&5 ++ echo "$as_me:13324: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized -@@ -13048,7 +13360,7 @@ +@@ -13048,7 +13374,7 @@ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' case $host_os in @@ -3161,7 +1944,7 @@ Index: pam.debian/configure # If we're using GNU nm, then we don't want the "-C" option. # -C means demangle to AIX nm, but means don't demangle with GNU nm if $NM -V 2>&1 | grep 'GNU' > /dev/null; then -@@ -13063,10 +13375,14 @@ +@@ -13063,10 +13389,14 @@ cygwin* | mingw*) export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' ;; @@ -3176,7 +1959,7 @@ Index: pam.debian/configure { echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 echo "${ECHO_T}$ld_shlibs_CXX" >&6; } -@@ -13168,7 +13484,7 @@ +@@ -13168,7 +13498,7 @@ soname_spec='${libname}${release}${shared_ext}$major' ;; @@ -3185,7 +1968,7 @@ Index: pam.debian/configure version_type=linux need_lib_prefix=no need_version=no -@@ -13508,6 +13824,18 @@ +@@ -13508,6 +13838,18 @@ dynamic_linker='GNU/Linux ld.so' ;; @@ -3204,7 +1987,7 @@ Index: pam.debian/configure netbsd*) version_type=sunos need_lib_prefix=no -@@ -13689,6 +14017,21 @@ +@@ -13689,6 +14031,21 @@ echo "${ECHO_T}$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no @@ -3226,7 +2009,7 @@ Index: pam.debian/configure variables_saved_for_relink="PATH $shlibpath_var $runpath_var" if test "$GCC" = yes; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -@@ -13772,6 +14115,7 @@ +@@ -13772,6 +14129,7 @@ predeps_CXX \ postdeps_CXX \ compiler_lib_search_path_CXX \ @@ -3234,7 +2017,7 @@ Index: pam.debian/configure archive_cmds_CXX \ archive_expsym_cmds_CXX \ postinstall_cmds_CXX \ -@@ -14020,6 +14364,10 @@ +@@ -14020,6 +14378,10 @@ # shared library. postdeps=$lt_postdeps_CXX @@ -3245,7 +2028,7 @@ Index: pam.debian/configure # The library search path used internally by the compiler when linking # a shared library. compiler_lib_search_path=$lt_compiler_lib_search_path_CXX -@@ -14234,7 +14582,7 @@ +@@ -14234,7 +14596,7 @@ echo "$lt_simple_link_test_code" >conftest.$ac_ext eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_linker_boilerplate=`cat conftest.err` @@ -3254,7 +2037,7 @@ Index: pam.debian/configure # Allow CC to be a program name with arguments. -@@ -14272,7 +14620,7 @@ +@@ -14272,7 +14634,7 @@ postinstall_cmds='$RANLIB $lib' fi ;; @@ -3263,7 +2046,7 @@ Index: pam.debian/configure if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then test "$enable_shared" = yes && enable_static=no fi -@@ -14537,10 +14885,10 @@ +@@ -14537,10 +14899,10 @@ { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5 echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; } @@ -3276,17 +2059,17 @@ Index: pam.debian/configure ac_outfile=conftest.$ac_objext echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="$lt_prog_compiler_pic_F77" -@@ -14553,27 +14901,27 @@ +@@ -14553,27 +14915,27 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14556: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:14904: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:14918: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14560: \$? = $ac_status" >&5 -+ echo "$as_me:14908: \$? = $ac_status" >&5 ++ echo "$as_me:14922: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -3310,7 +2093,7 @@ Index: pam.debian/configure case $lt_prog_compiler_pic_F77 in "" | " "*) ;; *) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;; -@@ -14600,10 +14948,10 @@ +@@ -14600,10 +14962,10 @@ wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\" { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } @@ -3323,7 +2106,7 @@ Index: pam.debian/configure save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS $lt_tmp_static_flag" echo "$lt_simple_link_test_code" > conftest.$ac_ext -@@ -14616,20 +14964,20 @@ +@@ -14616,20 +14978,20 @@ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if diff conftest.exp conftest.er2 >/dev/null; then @@ -3350,21 +2133,21 @@ Index: pam.debian/configure : else lt_prog_compiler_static_F77= -@@ -14657,11 +15005,11 @@ +@@ -14657,11 +15019,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14660: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:15008: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:15022: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14664: \$? = $ac_status" >&5 -+ echo "$as_me:15012: \$? = $ac_status" >&5 ++ echo "$as_me:15026: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized -@@ -14741,12 +15089,13 @@ +@@ -14741,12 +15103,13 @@ # it will be wrapped by ` (' and `)$', so one must not match beginning or # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', # as well as any symbol that contains `d'. @@ -3379,7 +2162,7 @@ Index: pam.debian/configure extract_expsyms_cmds= # Just being paranoid about ensuring that cc_basename is set. for cc_temp in $compiler""; do -@@ -14805,7 +15154,7 @@ +@@ -14805,7 +15168,7 @@ # See if GNU ld supports shared libraries. case $host_os in @@ -3388,7 +2171,7 @@ Index: pam.debian/configure # On AIX/PPC, the GNU linker is very broken if test "$host_cpu" != ia64; then ld_shlibs_F77=no -@@ -14921,12 +15270,13 @@ +@@ -14921,12 +15284,13 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' fi @@ -3403,7 +2186,7 @@ Index: pam.debian/configure if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= -@@ -15024,7 +15374,7 @@ +@@ -15024,7 +15388,7 @@ fi ;; @@ -3412,7 +2195,7 @@ Index: pam.debian/configure if test "$host_cpu" = ia64; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. -@@ -15044,7 +15394,7 @@ +@@ -15044,7 +15408,7 @@ # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we # need to do runtime linking. @@ -3421,7 +2204,7 @@ Index: pam.debian/configure for ld_flag in $LDFLAGS; do if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then aix_use_runtimelinking=yes -@@ -15296,11 +15646,10 @@ +@@ -15296,11 +15660,10 @@ link_all_deplibs_F77=yes if test "$GCC" = yes ; then output_verbose_link_cmd='echo' @@ -3437,7 +2220,7 @@ Index: pam.debian/configure else case $cc_basename in xlc*) -@@ -15450,7 +15799,7 @@ +@@ -15450,7 +15813,7 @@ link_all_deplibs_F77=yes ;; @@ -3446,7 +2229,7 @@ Index: pam.debian/configure if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else -@@ -15769,7 +16118,7 @@ +@@ -15769,7 +16132,7 @@ soname_spec='${libname}${release}${shared_ext}$major' ;; @@ -3455,7 +2238,7 @@ Index: pam.debian/configure version_type=linux need_lib_prefix=no need_version=no -@@ -16109,6 +16458,18 @@ +@@ -16109,6 +16472,18 @@ dynamic_linker='GNU/Linux ld.so' ;; @@ -3474,7 +2257,7 @@ Index: pam.debian/configure netbsd*) version_type=sunos need_lib_prefix=no -@@ -16290,6 +16651,21 @@ +@@ -16290,6 +16665,21 @@ echo "${ECHO_T}$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no @@ -3496,7 +2279,7 @@ Index: pam.debian/configure variables_saved_for_relink="PATH $shlibpath_var $runpath_var" if test "$GCC" = yes; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -@@ -16373,6 +16749,7 @@ +@@ -16373,6 +16763,7 @@ predeps_F77 \ postdeps_F77 \ compiler_lib_search_path_F77 \ @@ -3504,7 +2287,7 @@ Index: pam.debian/configure archive_cmds_F77 \ archive_expsym_cmds_F77 \ postinstall_cmds_F77 \ -@@ -16621,6 +16998,10 @@ +@@ -16621,6 +17012,10 @@ # shared library. postdeps=$lt_postdeps_F77 @@ -3515,7 +2298,7 @@ Index: pam.debian/configure # The library search path used internally by the compiler when linking # a shared library. compiler_lib_search_path=$lt_compiler_lib_search_path_F77 -@@ -16795,7 +17176,7 @@ +@@ -16795,7 +17190,7 @@ echo "$lt_simple_link_test_code" >conftest.$ac_ext eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_linker_boilerplate=`cat conftest.err` @@ -3524,21 +2307,21 @@ Index: pam.debian/configure # Allow CC to be a program name with arguments. -@@ -16844,11 +17225,11 @@ +@@ -16844,11 +17239,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16847: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:17228: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:17242: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16851: \$? = $ac_status" >&5 -+ echo "$as_me:17232: \$? = $ac_status" >&5 ++ echo "$as_me:17246: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. -@@ -16908,7 +17289,7 @@ +@@ -16908,7 +17303,7 @@ # built for inclusion in a dll (and should export symbols for example). # Although the cygwin gcc ignores -fPIC, still need this for old-style # (--disable-auto-import) libraries @@ -3547,7 +2330,7 @@ Index: pam.debian/configure ;; darwin* | rhapsody*) -@@ -16978,7 +17359,7 @@ +@@ -16978,7 +17373,7 @@ mingw* | cygwin* | pw32* | os2*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). @@ -3556,7 +2339,7 @@ Index: pam.debian/configure ;; hpux9* | hpux10* | hpux11*) -@@ -17118,10 +17499,10 @@ +@@ -17118,10 +17513,10 @@ { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5 echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; } @@ -3569,17 +2352,17 @@ Index: pam.debian/configure ac_outfile=conftest.$ac_objext echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="$lt_prog_compiler_pic_GCJ" -@@ -17134,27 +17515,27 @@ +@@ -17134,27 +17529,27 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17137: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:17518: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:17532: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:17141: \$? = $ac_status" >&5 -+ echo "$as_me:17522: \$? = $ac_status" >&5 ++ echo "$as_me:17536: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -3603,7 +2386,7 @@ Index: pam.debian/configure case $lt_prog_compiler_pic_GCJ in "" | " "*) ;; *) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;; -@@ -17181,10 +17562,10 @@ +@@ -17181,10 +17576,10 @@ wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\" { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } @@ -3616,7 +2399,7 @@ Index: pam.debian/configure save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS $lt_tmp_static_flag" echo "$lt_simple_link_test_code" > conftest.$ac_ext -@@ -17197,20 +17578,20 @@ +@@ -17197,20 +17592,20 @@ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if diff conftest.exp conftest.er2 >/dev/null; then @@ -3643,21 +2426,21 @@ Index: pam.debian/configure : else lt_prog_compiler_static_GCJ= -@@ -17238,11 +17619,11 @@ +@@ -17238,11 +17633,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17241: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:17622: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:17636: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:17245: \$? = $ac_status" >&5 -+ echo "$as_me:17626: \$? = $ac_status" >&5 ++ echo "$as_me:17640: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized -@@ -17322,12 +17703,13 @@ +@@ -17322,12 +17717,13 @@ # it will be wrapped by ` (' and `)$', so one must not match beginning or # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', # as well as any symbol that contains `d'. @@ -3672,7 +2455,7 @@ Index: pam.debian/configure extract_expsyms_cmds= # Just being paranoid about ensuring that cc_basename is set. for cc_temp in $compiler""; do -@@ -17386,7 +17768,7 @@ +@@ -17386,7 +17782,7 @@ # See if GNU ld supports shared libraries. case $host_os in @@ -3681,7 +2464,7 @@ Index: pam.debian/configure # On AIX/PPC, the GNU linker is very broken if test "$host_cpu" != ia64; then ld_shlibs_GCJ=no -@@ -17502,12 +17884,13 @@ +@@ -17502,12 +17898,13 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' fi @@ -3696,7 +2479,7 @@ Index: pam.debian/configure if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= -@@ -17605,7 +17988,7 @@ +@@ -17605,7 +18002,7 @@ fi ;; @@ -3705,7 +2488,7 @@ Index: pam.debian/configure if test "$host_cpu" = ia64; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. -@@ -17625,7 +18008,7 @@ +@@ -17625,7 +18022,7 @@ # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we # need to do runtime linking. @@ -3714,7 +2497,7 @@ Index: pam.debian/configure for ld_flag in $LDFLAGS; do if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then aix_use_runtimelinking=yes -@@ -17897,11 +18280,10 @@ +@@ -17897,11 +18294,10 @@ link_all_deplibs_GCJ=yes if test "$GCC" = yes ; then output_verbose_link_cmd='echo' @@ -3730,7 +2513,7 @@ Index: pam.debian/configure else case $cc_basename in xlc*) -@@ -18051,7 +18433,7 @@ +@@ -18051,7 +18447,7 @@ link_all_deplibs_GCJ=yes ;; @@ -3739,7 +2522,7 @@ Index: pam.debian/configure if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else -@@ -18370,7 +18752,7 @@ +@@ -18370,7 +18766,7 @@ soname_spec='${libname}${release}${shared_ext}$major' ;; @@ -3748,7 +2531,7 @@ Index: pam.debian/configure version_type=linux need_lib_prefix=no need_version=no -@@ -18710,6 +19092,18 @@ +@@ -18710,6 +19106,18 @@ dynamic_linker='GNU/Linux ld.so' ;; @@ -3767,7 +2550,7 @@ Index: pam.debian/configure netbsd*) version_type=sunos need_lib_prefix=no -@@ -18891,6 +19285,21 @@ +@@ -18891,6 +19299,21 @@ echo "${ECHO_T}$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no @@ -3789,7 +2572,7 @@ Index: pam.debian/configure variables_saved_for_relink="PATH $shlibpath_var $runpath_var" if test "$GCC" = yes; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -@@ -18974,6 +19383,7 @@ +@@ -18974,6 +19397,7 @@ predeps_GCJ \ postdeps_GCJ \ compiler_lib_search_path_GCJ \ @@ -3797,7 +2580,7 @@ Index: pam.debian/configure archive_cmds_GCJ \ archive_expsym_cmds_GCJ \ postinstall_cmds_GCJ \ -@@ -19222,6 +19632,10 @@ +@@ -19222,6 +19646,10 @@ # shared library. postdeps=$lt_postdeps_GCJ @@ -3808,7 +2591,7 @@ Index: pam.debian/configure # The library search path used internally by the compiler when linking # a shared library. compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ -@@ -19395,7 +19809,7 @@ +@@ -19395,7 +19823,7 @@ echo "$lt_simple_link_test_code" >conftest.$ac_ext eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_linker_boilerplate=`cat conftest.err` @@ -3817,7 +2600,7 @@ Index: pam.debian/configure # Allow CC to be a program name with arguments. -@@ -19455,6 +19869,7 @@ +@@ -19455,6 +19883,7 @@ predeps_RC \ postdeps_RC \ compiler_lib_search_path_RC \ @@ -3825,7 +2608,7 @@ Index: pam.debian/configure archive_cmds_RC \ archive_expsym_cmds_RC \ postinstall_cmds_RC \ -@@ -19703,6 +20118,10 @@ +@@ -19703,6 +20132,10 @@ # shared library. postdeps=$lt_postdeps_RC @@ -3836,172 +2619,60 @@ Index: pam.debian/configure # The library search path used internally by the compiler when linking # a shared library. compiler_lib_search_path=$lt_compiler_lib_search_path_RC -@@ -20016,7 +20435,6 @@ - fi - - -- - { echo "$as_me:$LINENO: checking whether ld supports --as-needed" >&5 - echo $ECHO_N "checking whether ld supports --as-needed... $ECHO_C" >&6; } - if test "${pam_cv_ld_as_needed+set}" = set; then -@@ -20624,7 +21042,9 @@ - fi - { echo "$as_me:$LINENO: result: $libc_cv_ld_version_script_option" >&5 - echo "${ECHO_T}$libc_cv_ld_version_script_option" >&6; } -- if test "$libc_cv_ld_version_script_option" = "yes"; then -+ -+ -+if test "$libc_cv_ld_version_script_option" = "yes"; then - HAVE_VERSIONING_TRUE= - HAVE_VERSIONING_FALSE='#' - else -@@ -21616,7 +22036,9 @@ - LIBCRACK="" - fi - -- if test ! -z "$LIBCRACK"; then -+ -+ -+if test ! -z "$LIBCRACK"; then - HAVE_LIBCRACK_TRUE= - HAVE_LIBCRACK_FALSE='#' - else -@@ -22441,7 +22863,9 @@ - fi - fi - -- if test ! -z "$LIBDB"; then -+ -+ -+if test ! -z "$LIBDB"; then - HAVE_LIBDB_TRUE= - HAVE_LIBDB_FALSE='#' - else -@@ -22694,7 +23118,9 @@ - LIBSELINUX="" - fi - -- if test ! -z "$LIBSELINUX"; then -+ -+ -+if test ! -z "$LIBSELINUX"; then - HAVE_LIBSELINUX_TRUE= - HAVE_LIBSELINUX_FALSE='#' - else -@@ -25329,7 +25755,9 @@ - fi - done - -- if test "$UNSHARE" = yes; then -+ -+ -+if test "$UNSHARE" = yes; then - HAVE_UNSHARE_TRUE= - HAVE_UNSHARE_FALSE='#' - else -@@ -25621,7 +26049,9 @@ - - - -- if test x$enable_man != xno; then -+ -+ -+if test x$enable_man != xno; then - ENABLE_REGENERATE_MAN_TRUE= - ENABLE_REGENERATE_MAN_FALSE='#' - else -@@ -25629,7 +26059,9 @@ - ENABLE_REGENERATE_MAN_FALSE= - fi - -- if test ! -z "$FO2PDF"; then -+ -+ -+if test ! -z "$FO2PDF"; then - ENABLE_GENERATE_PDF_TRUE= - ENABLE_GENERATE_PDF_FALSE='#' - else -@@ -27721,7 +28153,9 @@ - HAVE_KEY_MANAGEMENT=$HAVE_KEY_MANAGEMENT - - -- if test "$have_key_syscalls" = 1; then -+ -+ -+if test "$have_key_syscalls" = 1; then - HAVE_KEY_MANAGEMENT_TRUE= - HAVE_KEY_MANAGEMENT_FALSE='#' - else -@@ -28276,7 +28710,6 @@ - ac_pwd='$ac_pwd' - srcdir='$srcdir' - INSTALL='$INSTALL' --MKDIR_P='$MKDIR_P' - _ACEOF - - cat >>$CONFIG_STATUS <<\_ACEOF -@@ -28549,7 +28982,6 @@ - INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim - INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim - INSTALL_DATA!$INSTALL_DATA$ac_delim --am__isrc!$am__isrc$ac_delim - CYGPATH_W!$CYGPATH_W$ac_delim - PACKAGE!$PACKAGE$ac_delim - VERSION!$VERSION$ac_delim -@@ -28606,6 +29038,7 @@ - ECHO!$ECHO$ac_delim - AR!$AR$ac_delim - RANLIB!$RANLIB$ac_delim -+DSYMUTIL!$DSYMUTIL$ac_delim - _ACEOF - - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then -@@ -28647,6 +29080,7 @@ +@@ -28647,6 +29080,8 @@ ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF ++DSYMUTIL!$DSYMUTIL$ac_delim +NMEDIT!$NMEDIT$ac_delim CPP!$CPP$ac_delim CXX!$CXX$ac_delim CXXFLAGS!$CXXFLAGS$ac_delim -@@ -28725,7 +29159,7 @@ +@@ -28725,7 +29160,7 @@ LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 76; then -+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 77; then ++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 78; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -@@ -28952,11 +29386,6 @@ - [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; - *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; +@@ -29126,21 +29561,22 @@ + fi + rm -f "$tmp/out12" + # Compute $ac_file's index in $config_headers. ++_am_arg=$ac_file + _am_stamp_count=1 + for _am_header in $config_headers :; do + case $_am_header in +- $ac_file | $ac_file:* ) ++ $_am_arg | $_am_arg:* ) + break ;; + * ) + _am_stamp_count=`expr $_am_stamp_count + 1` ;; esac -- ac_MKDIR_P=$MKDIR_P -- case $MKDIR_P in -- [\\/$]* | ?:[\\/]* ) ;; -- */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;; -- esac - _ACEOF - - cat >>$CONFIG_STATUS <<\_ACEOF -@@ -29010,7 +29439,6 @@ - s&@abs_builddir@&$ac_abs_builddir&;t t - s&@abs_top_builddir@&$ac_abs_top_builddir&;t t - s&@INSTALL@&$ac_INSTALL&;t t --s&@MKDIR_P@&$ac_MKDIR_P&;t t - $ac_datarootdir_hack - " $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out - -@@ -29175,9 +29603,8 @@ - # some people rename them; so instead we look at the file content. - # Grep'ing the first line is not enough: some people post-process + done +-echo "timestamp for $ac_file" >`$as_dirname -- $ac_file || +-$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ +- X$ac_file : 'X\(//\)[^/]' \| \ +- X$ac_file : 'X\(//\)$' \| \ +- X$ac_file : 'X\(/\)' \| . 2>/dev/null || +-echo X$ac_file | ++echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" || ++$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ++ X"$_am_arg" : 'X\(//\)[^/]' \| \ ++ X"$_am_arg" : 'X\(//\)$' \| \ ++ X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null || ++echo X"$_am_arg" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q +@@ -29177,7 +29613,7 @@ # each Makefile.in and add a new line on top of each file to say so. -- # Grep'ing the whole file is not good either: AIX grep has a line -- # limit of 2048, but all sed's we know have understand at least 4000. + # Grep'ing the whole file is not good either: AIX grep has a line + # limit of 2048, but all sed's we know have understand at least 4000. - if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then -+ # So let's grep whole file. -+ if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then ++ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then dirpart=`$as_dirname -- "$mf" || $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$mf" : 'X\(//\)[^/]' \| \ @@ -4011,64 +2682,16 @@ Index: pam.debian/doc/Makefile.in +++ pam.debian/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. ++# Makefile.in generated by automake 1.10.1 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. ++# 2003, 2004, 2005, 2006, 2007, 2008 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@ -@@ -98,11 +101,16 @@ +@@ -98,6 +98,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -4076,40 +2699,7 @@ Index: pam.debian/doc/Makefile.in ECHO = @ECHO@ ECHO_C = @ECHO_C@ 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 +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@ -@@ -146,10 +165,10 @@ - LTLIBINTL = @LTLIBINTL@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ --MKDIR_P = @MKDIR_P@ +@@ -150,6 +151,7 @@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ @@ -4117,251 +2707,60 @@ Index: pam.debian/doc/Makefile.in OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -@@ -168,6 +187,8 @@ - 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@ -@@ -181,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@ -@@ -199,7 +220,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - datadir = @datadir@ - datarootdir = @datarootdir@ - docdir = @docdir@ -@@ -230,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@ - SUBDIRS = man specs sag adg mwg - CLEANFILES = *~ - dist_html_DATA = index.html -@@ -276,9 +293,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) \ -@@ -325,7 +346,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 \ -@@ -426,21 +448,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; \ -@@ -454,7 +477,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`; \ -@@ -462,8 +485,6 @@ - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$top_distdir" \ - distdir="$$distdir/$$subdir" \ -- am__remove_distdir=: \ -- am__skip_length_check=: \ - distdir) \ - || exit 1; \ - fi; \ -@@ -474,7 +495,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 -@@ -507,7 +528,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 - -@@ -521,20 +543,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: +@@ -369,8 +371,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS --install-pdf: install-pdf-recursive -- --install-ps: install-ps-recursive -- - installcheck-am: - - maintainer-clean: maintainer-clean-recursive -@@ -553,25 +567,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 - - - ####################################################### +@@ -395,8 +397,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -406,13 +408,12 @@ + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique Index: pam.debian/doc/adg/Makefile.in =================================================================== --- pam.debian.orig/doc/adg/Makefile.in +++ pam.debian/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. ++# Makefile.in generated by automake 1.10.1 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. ++# 2003, 2004, 2005, 2006, 2007, 2008 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@ -@@ -75,11 +81,16 @@ +@@ -75,6 +75,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -4369,40 +2768,7 @@ Index: pam.debian/doc/adg/Makefile.in ECHO = @ECHO@ ECHO_C = @ECHO_C@ 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 +99,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,10 +145,10 @@ - LTLIBINTL = @LTLIBINTL@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ --MKDIR_P = @MKDIR_P@ +@@ -127,6 +128,7 @@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ @@ -4410,200 +2776,22 @@ Index: pam.debian/doc/adg/Makefile.in OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -@@ -145,6 +167,8 @@ - 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@ -@@ -158,13 +182,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@ -@@ -176,7 +200,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - datadir = @datadir@ - datarootdir = @datarootdir@ - docdir = @docdir@ -@@ -207,11 +230,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) -@@ -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)/$(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; \ -@@ -325,7 +351,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 - -@@ -339,20 +366,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 -@@ -371,21 +390,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.debian/doc/man/Makefile.in =================================================================== --- pam.debian.orig/doc/man/Makefile.in +++ pam.debian/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. ++# Makefile.in generated by automake 1.10.1 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. ++# 2003, 2004, 2005, 2006, 2007, 2008 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@ -@@ -82,11 +88,16 @@ +@@ -82,6 +82,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -4611,40 +2799,7 @@ Index: pam.debian/doc/man/Makefile.in ECHO = @ECHO@ ECHO_C = @ECHO_C@ 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 +106,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,10 +152,10 @@ - LTLIBINTL = @LTLIBINTL@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ --MKDIR_P = @MKDIR_P@ +@@ -134,6 +135,7 @@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ @@ -4652,232 +2807,22 @@ Index: pam.debian/doc/man/Makefile.in OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -@@ -152,6 +174,8 @@ - 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 +189,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 +207,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - datadir = @datadir@ - datarootdir = @datarootdir@ - docdir = @docdir@ -@@ -214,11 +237,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 \ -@@ -297,9 +317,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 \ -@@ -344,7 +368,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 \ -@@ -389,7 +413,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 \ -@@ -440,21 +464,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; \ -@@ -470,7 +495,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 -@@ -503,7 +528,7 @@ - - distclean: distclean-am - -rm -f Makefile --distclean-am: clean-am distclean-generic -+distclean-am: clean-am distclean-generic distclean-libtool - - dvi: dvi-am - -@@ -517,20 +542,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 -@@ -549,24 +566,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.debian/doc/mwg/Makefile.in =================================================================== --- pam.debian.orig/doc/mwg/Makefile.in +++ pam.debian/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. ++# Makefile.in generated by automake 1.10.1 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. ++# 2003, 2004, 2005, 2006, 2007, 2008 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@ -@@ -75,11 +81,16 @@ +@@ -75,6 +75,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -4885,40 +2830,7 @@ Index: pam.debian/doc/mwg/Makefile.in ECHO = @ECHO@ ECHO_C = @ECHO_C@ 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 +99,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,10 +145,10 @@ - LTLIBINTL = @LTLIBINTL@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ --MKDIR_P = @MKDIR_P@ +@@ -127,6 +128,7 @@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ @@ -4926,200 +2838,22 @@ Index: pam.debian/doc/mwg/Makefile.in OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -@@ -145,6 +167,8 @@ - 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@ -@@ -158,13 +182,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@ -@@ -176,7 +200,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - datadir = @datadir@ - datarootdir = @datarootdir@ - docdir = @docdir@ -@@ -207,11 +230,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) -@@ -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)/$(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; \ -@@ -325,7 +351,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 - -@@ -339,20 +366,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 -@@ -371,21 +390,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.debian/doc/sag/Makefile.in =================================================================== --- pam.debian.orig/doc/sag/Makefile.in +++ pam.debian/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. ++# Makefile.in generated by automake 1.10.1 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. ++# 2003, 2004, 2005, 2006, 2007, 2008 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@ -@@ -75,11 +81,16 @@ +@@ -75,6 +75,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -5127,40 +2861,7 @@ Index: pam.debian/doc/sag/Makefile.in ECHO = @ECHO@ ECHO_C = @ECHO_C@ 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 +99,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,10 +145,10 @@ - LTLIBINTL = @LTLIBINTL@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ --MKDIR_P = @MKDIR_P@ +@@ -127,6 +128,7 @@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ @@ -5168,235 +2869,31 @@ Index: pam.debian/doc/sag/Makefile.in OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -@@ -145,6 +167,8 @@ - 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@ -@@ -158,13 +182,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@ -@@ -176,7 +200,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - datadir = @datadir@ - datarootdir = @datarootdir@ - docdir = @docdir@ -@@ -207,11 +230,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) -@@ -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)/$(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; \ -@@ -325,7 +351,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 - -@@ -339,20 +366,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 -@@ -371,21 +390,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.debian/doc/specs/Makefile.in =================================================================== --- pam.debian.orig/doc/specs/Makefile.in +++ pam.debian/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. ++# Makefile.in generated by automake 1.10.1 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. ++# 2003, 2004, 2005, 2006, 2007, 2008 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 @@ +@@ -60,7 +60,7 @@ 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) ++DEFAULT_INCLUDES = -I.@am__isrc@ -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@ -@@ -113,11 +116,16 @@ +@@ -113,6 +113,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -5404,40 +2901,7 @@ Index: pam.debian/doc/specs/Makefile.in ECHO = @ECHO@ ECHO_C = @ECHO_C@ 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 +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@ -@@ -161,10 +180,10 @@ - LTLIBINTL = @LTLIBINTL@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ --MKDIR_P = @MKDIR_P@ +@@ -165,6 +166,7 @@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ @@ -5445,310 +2909,69 @@ Index: pam.debian/doc/specs/Makefile.in OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -@@ -183,6 +202,8 @@ - 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@ -@@ -196,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@ -@@ -214,7 +235,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - datadir = @datadir@ - datarootdir = @datarootdir@ - docdir = @docdir@ -@@ -245,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 = draft-morgan-pam-current.txt *~ - EXTRA_DIST = draft-morgan-pam.raw std-agent-id.raw rfc86.0.txt - AM_YFLAGS = -d -@@ -301,11 +318,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) -@@ -317,40 +334,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) \ -@@ -415,21 +456,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; \ -@@ -446,7 +488,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 -@@ -487,7 +529,7 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - - dvi: dvi-am - -@@ -501,20 +543,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 -@@ -535,23 +569,20 @@ - - ps-am: +@@ -371,8 +373,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS --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 +@@ -384,8 +386,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -395,13 +397,12 @@ + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique Index: pam.debian/examples/Makefile.in =================================================================== --- pam.debian.orig/examples/Makefile.in +++ pam.debian/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. ++# Makefile.in generated by automake 1.10.1 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. ++# 2003, 2004, 2005, 2006, 2007, 2008 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 -@@ -72,24 +76,25 @@ +@@ -72,7 +72,7 @@ xsh_OBJECTS = xsh.$(OBJEXT) xsh_LDADD = $(LDADD) xsh_DEPENDENCIES = -DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ -+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++DEFAULT_INCLUDES = -I.@am__isrc@ -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@ -@@ -109,11 +114,16 @@ +@@ -109,6 +109,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -5756,40 +2979,7 @@ Index: pam.debian/examples/Makefile.in ECHO = @ECHO@ ECHO_C = @ECHO_C@ 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 +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@ -@@ -157,10 +178,10 @@ - LTLIBINTL = @LTLIBINTL@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ --MKDIR_P = @MKDIR_P@ +@@ -161,6 +162,7 @@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ @@ -5797,277 +2987,69 @@ Index: pam.debian/examples/Makefile.in OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -@@ -179,6 +200,8 @@ - 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 - AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \ -@@ -296,16 +315,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) -@@ -319,22 +338,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 $@ $< -@@ -345,6 +364,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)'; \ +@@ -350,8 +352,8 @@ unique=`for i in $$list; do \ -@@ -394,21 +417,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; \ -@@ -457,7 +481,7 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - - dvi: dvi-am - -@@ -471,20 +495,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 -@@ -505,22 +521,19 @@ - - ps-am: + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS --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. +@@ -363,8 +365,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -374,13 +376,12 @@ + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique Index: pam.debian/libpam/Makefile.in =================================================================== --- pam.debian.orig/libpam/Makefile.in +++ pam.debian/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. ++# Makefile.in generated by automake 1.10.1 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. ++# 2003, 2004, 2005, 2006, 2007, 2008 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 -@@ -83,21 +87,17 @@ - pam_modutil_getspnam.lo pam_modutil_getlogin.lo \ - pam_modutil_ingroup.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 $@ +@@ -86,7 +86,7 @@ + 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) ++DEFAULT_INCLUDES = -I.@am__isrc@ -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) -@@ -106,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@ -@@ -125,11 +127,16 @@ +@@ -125,6 +125,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -6075,40 +3057,7 @@ Index: pam.debian/libpam/Makefile.in ECHO = @ECHO@ ECHO_C = @ECHO_C@ 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 +145,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@ -@@ -173,10 +191,10 @@ - LTLIBINTL = @LTLIBINTL@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ --MKDIR_P = @MKDIR_P@ +@@ -177,6 +178,7 @@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ @@ -6116,303 +3065,91 @@ Index: pam.debian/libpam/Makefile.in OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -@@ -195,6 +213,8 @@ - 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@ -@@ -208,13 +228,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@ -@@ -226,7 +246,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - datadir = @datadir@ - datarootdir = @datarootdir@ - docdir = @docdir@ -@@ -257,11 +276,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) -@@ -324,7 +340,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)" +@@ -328,8 +330,8 @@ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ -@@ -335,7 +351,7 @@ +- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ + else :; fi; \ + done - uninstall-libLTLIBRARIES: +@@ -337,8 +339,8 @@ @$(NORMAL_UNINSTALL) -- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ -+ @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + @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"; \ -@@ -350,7 +366,7 @@ - rm -f "$${dir}/so_locations"; \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ 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) -@@ -389,22 +405,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 $@ $< -@@ -414,9 +430,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) \ -@@ -481,21 +501,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; \ -@@ -511,7 +533,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 -@@ -547,7 +569,7 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - - dvi: dvi-am -@@ -561,20 +583,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 -@@ -595,23 +609,21 @@ - - ps-am: + clean-libLTLIBRARIES: +@@ -437,8 +439,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS --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. +@@ -450,8 +452,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -461,13 +463,12 @@ + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique Index: pam.debian/libpam_misc/Makefile.in =================================================================== --- pam.debian.orig/libpam_misc/Makefile.in +++ pam.debian/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. ++# Makefile.in generated by automake 1.10.1 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. ++# 2003, 2004, 2005, 2006, 2007, 2008 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 $@ +@@ -71,7 +71,7 @@ + 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) ++DEFAULT_INCLUDES = -I.@am__isrc@ -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@ -@@ -110,11 +112,16 @@ +@@ -110,6 +110,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -6420,40 +3157,7 @@ Index: pam.debian/libpam_misc/Makefile.in ECHO = @ECHO@ ECHO_C = @ECHO_C@ 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 +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@ -@@ -158,10 +176,10 @@ - LTLIBINTL = @LTLIBINTL@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ --MKDIR_P = @MKDIR_P@ +@@ -162,6 +163,7 @@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ @@ -6461,318 +3165,91 @@ Index: pam.debian/libpam_misc/Makefile.in OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -@@ -180,6 +198,8 @@ - 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 +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@ -@@ -211,7 +231,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - datadir = @datadir@ - datarootdir = @datarootdir@ - docdir = @docdir@ -@@ -242,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 = libpam_misc.map - include_HEADERS = include/security/pam_misc.h -@@ -293,7 +309,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)" +@@ -297,8 +299,8 @@ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ -@@ -304,7 +320,7 @@ +- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ + else :; fi; \ + done - uninstall-libLTLIBRARIES: +@@ -306,8 +308,8 @@ @$(NORMAL_UNINSTALL) -- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ -+ @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + @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"; \ -@@ -319,7 +335,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) -@@ -331,22 +347,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 $@ $< -@@ -356,9 +372,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) \ -@@ -423,21 +443,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; \ -@@ -453,7 +475,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"; \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ done - install: install-am - install-exec: install-exec-am -@@ -489,7 +511,7 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - dvi: dvi-am - -@@ -503,20 +525,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 -@@ -537,23 +551,21 @@ - - ps-am: + clean-libLTLIBRARIES: +@@ -379,8 +381,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS --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. +@@ -392,8 +394,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -403,13 +405,12 @@ + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique Index: pam.debian/libpamc/Makefile.in =================================================================== --- pam.debian.orig/libpamc/Makefile.in +++ pam.debian/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. ++# Makefile.in generated by automake 1.10.1 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. ++# 2003, 2004, 2005, 2006, 2007, 2008 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 $@ +@@ -71,7 +71,7 @@ + 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) ++DEFAULT_INCLUDES = -I.@am__isrc@ -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@ -@@ -120,11 +119,16 @@ +@@ -120,6 +120,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -6780,40 +3257,7 @@ Index: pam.debian/libpamc/Makefile.in ECHO = @ECHO@ ECHO_C = @ECHO_C@ 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 +137,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@ -@@ -168,10 +183,10 @@ - LTLIBINTL = @LTLIBINTL@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ --MKDIR_P = @MKDIR_P@ +@@ -172,6 +173,7 @@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ @@ -6821,312 +3265,82 @@ Index: pam.debian/libpamc/Makefile.in OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -@@ -190,6 +205,8 @@ - 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@ -@@ -203,13 +220,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@ -@@ -221,7 +238,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - datadir = @datadir@ - datarootdir = @datarootdir@ - docdir = @docdir@ -@@ -252,11 +268,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 -@@ -302,7 +315,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)" +@@ -306,8 +308,8 @@ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ -@@ -313,7 +326,7 @@ +- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ + else :; fi; \ + done - uninstall-libLTLIBRARIES: +@@ -315,8 +317,8 @@ @$(NORMAL_UNINSTALL) -- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ -+ @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + @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"; \ -@@ -328,7 +341,7 @@ - rm -f "$${dir}/so_locations"; \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ 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) -@@ -341,22 +354,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 $@ $< -@@ -366,9 +379,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) \ -@@ -415,7 +432,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 \ -@@ -516,21 +534,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; \ -@@ -544,7 +564,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`; \ -@@ -552,8 +572,6 @@ - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$top_distdir" \ - distdir="$$distdir/$$subdir" \ -- am__remove_distdir=: \ -- am__skip_length_check=: \ - distdir) \ - || exit 1; \ - fi; \ -@@ -564,7 +582,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 -@@ -600,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-recursive - -@@ -614,20 +632,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: + clean-libLTLIBRARIES: +@@ -459,8 +461,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS --install-pdf: install-pdf-recursive -- --install-ps: install-ps-recursive -- - installcheck-am: - - maintainer-clean: maintainer-clean-recursive -@@ -648,27 +658,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. +@@ -485,8 +487,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -496,13 +498,12 @@ + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique Index: pam.debian/libpamc/test/Makefile.in =================================================================== --- pam.debian.orig/libpamc/test/Makefile.in +++ pam.debian/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. ++# Makefile.in generated by automake 1.10.1 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. ++# 2003, 2004, 2005, 2006, 2007, 2008 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@ -@@ -75,11 +81,16 @@ +@@ -75,6 +75,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -7134,40 +3348,7 @@ Index: pam.debian/libpamc/test/Makefile.in ECHO = @ECHO@ ECHO_C = @ECHO_C@ 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 +99,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,10 +145,10 @@ - LTLIBINTL = @LTLIBINTL@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ --MKDIR_P = @MKDIR_P@ +@@ -127,6 +128,7 @@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ @@ -7175,214 +3356,22 @@ Index: pam.debian/libpamc/test/Makefile.in OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -@@ -145,6 +167,8 @@ - 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@ -@@ -158,13 +182,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@ -@@ -176,7 +200,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - datadir = @datadir@ - datarootdir = @datarootdir@ - docdir = @docdir@ -@@ -207,11 +230,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 \ -@@ -256,6 +276,10 @@ - - clean-libtool: - -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: - tags: TAGS - TAGS: - -@@ -264,21 +288,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; \ -@@ -324,7 +350,7 @@ - - distclean: distclean-am - -rm -f Makefile --distclean-am: clean-am distclean-generic -+distclean-am: clean-am distclean-generic distclean-libtool - - dvi: dvi-am - -@@ -338,20 +364,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 -@@ -370,20 +388,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.debian/modules/Makefile.in =================================================================== --- pam.debian.orig/modules/Makefile.in +++ pam.debian/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. ++# Makefile.in generated by automake 1.10.1 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. ++# 2003, 2004, 2005, 2006, 2007, 2008 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@ -@@ -87,11 +90,16 @@ +@@ -87,6 +87,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -7390,40 +3379,7 @@ Index: pam.debian/modules/Makefile.in ECHO = @ECHO@ ECHO_C = @ECHO_C@ 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 +108,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,10 +154,10 @@ - LTLIBINTL = @LTLIBINTL@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ --MKDIR_P = @MKDIR_P@ +@@ -139,6 +140,7 @@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ @@ -7431,262 +3387,69 @@ Index: pam.debian/modules/Makefile.in OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -@@ -157,6 +176,8 @@ - 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@ -@@ -170,13 +191,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@ -@@ -188,7 +209,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - datadir = @datadir@ - datarootdir = @datarootdir@ - docdir = @docdir@ -@@ -219,11 +239,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 \ -@@ -274,6 +291,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, -@@ -305,7 +326,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 \ -@@ -406,21 +428,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; \ -@@ -434,7 +457,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`; \ -@@ -442,8 +465,6 @@ - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$top_distdir" \ - distdir="$$distdir/$$subdir" \ -- am__remove_distdir=: \ -- am__skip_length_check=: \ - distdir) \ - || exit 1; \ - fi; \ -@@ -484,7 +505,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 - -@@ -498,20 +520,12 @@ - - install-data-am: - --install-dvi: install-dvi-recursive -- - install-exec-am: - --install-html: install-html-recursive -- - install-info: install-info-recursive - - install-man: +@@ -349,8 +351,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS --install-pdf: install-pdf-recursive -- --install-ps: install-ps-recursive -- - installcheck-am: - - maintainer-clean: maintainer-clean-recursive -@@ -530,24 +544,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. +@@ -375,8 +377,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -386,13 +388,12 @@ + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique Index: pam.debian/modules/pam_access/Makefile.in =================================================================== --- pam.debian.orig/modules/pam_access/Makefile.in +++ pam.debian/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. ++# Makefile.in generated by automake 1.10.1 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. ++# 2003, 2004, 2005, 2006, 2007, 2008 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 @@ +@@ -68,7 +68,7 @@ pam_access_la_DEPENDENCIES = 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) ++DEFAULT_INCLUDES = -I.@am__isrc@ -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@ -@@ -111,11 +116,16 @@ +@@ -111,6 +111,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -7694,40 +3457,7 @@ Index: pam.debian/modules/pam_access/Makefile.in ECHO = @ECHO@ ECHO_C = @ECHO_C@ 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 +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@ -@@ -159,10 +180,10 @@ - LTLIBINTL = @LTLIBINTL@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ --MKDIR_P = @MKDIR_P@ +@@ -163,6 +164,7 @@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ @@ -7735,348 +3465,91 @@ Index: pam.debian/modules/pam_access/Makefile.in OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -@@ -181,6 +202,8 @@ - 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 access.conf $(MANS) $(XMLS) tst-pam_access - man_MANS = access.conf.5 pam_access.8 -@@ -298,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)" +@@ -302,8 +304,8 @@ @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ -@@ -309,7 +328,7 @@ +- echo " $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \ + else :; fi; \ + done - uninstall-securelibLTLIBRARIES: +@@ -311,8 +313,8 @@ @$(NORMAL_UNINSTALL) -- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ -+ @set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ + @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"; \ -@@ -324,7 +343,7 @@ - rm -f "$${dir}/so_locations"; \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \ 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) -@@ -335,22 +354,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 $@ $< -@@ -360,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 \ -@@ -407,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 \ -@@ -452,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) \ -@@ -517,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=./; \ -@@ -528,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"; \ -@@ -540,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"; \ - ;; \ -@@ -590,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; \ -@@ -621,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 -@@ -657,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 - -@@ -672,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 -@@ -706,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 + clean-securelibLTLIBRARIES: +@@ -473,8 +475,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS --.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 +@@ -486,8 +488,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -497,13 +499,12 @@ + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique Index: pam.debian/modules/pam_cracklib/Makefile.in =================================================================== --- pam.debian.orig/modules/pam_cracklib/Makefile.in +++ pam.debian/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. ++# Makefile.in generated by automake 1.10.1 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. ++# 2003, 2004, 2005, 2006, 2007, 2008 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 @@ +@@ -68,7 +68,7 @@ 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) ++DEFAULT_INCLUDES = -I.@am__isrc@ -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@ -@@ -109,11 +114,16 @@ +@@ -109,6 +109,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -8084,40 +3557,7 @@ Index: pam.debian/modules/pam_cracklib/Makefile.in ECHO = @ECHO@ ECHO_C = @ECHO_C@ 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 +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@ -@@ -157,10 +178,10 @@ - LTLIBINTL = @LTLIBINTL@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ --MKDIR_P = @MKDIR_P@ +@@ -161,6 +162,7 @@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ @@ -8125,329 +3565,91 @@ Index: pam.debian/modules/pam_cracklib/Makefile.in OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -@@ -179,6 +200,8 @@ - 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 $(MANS) $(XMLS) tst-pam_cracklib - man_MANS = pam_cracklib.8 -@@ -295,7 +314,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)" +@@ -299,8 +301,8 @@ @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ -@@ -306,7 +325,7 @@ +- echo " $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \ + else :; fi; \ + done - uninstall-securelibLTLIBRARIES: +@@ -308,8 +310,8 @@ @$(NORMAL_UNINSTALL) -- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ -+ @set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ + @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"; \ -@@ -321,7 +340,7 @@ - rm -f "$${dir}/so_locations"; \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \ 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) -@@ -332,22 +351,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 $@ $< -@@ -357,9 +376,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 \ -@@ -452,9 +475,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=./; \ -@@ -463,7 +486,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"; \ -@@ -475,7 +498,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"; \ - ;; \ -@@ -525,21 +548,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; \ -@@ -556,7 +580,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 -@@ -592,7 +616,7 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - - dvi: dvi-am - -@@ -606,20 +630,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 -@@ -640,27 +656,24 @@ - - ps-am: - --uninstall-am: uninstall-man uninstall-securelibLTLIBRARIES -+uninstall-am: uninstall-info-am uninstall-man \ -+ uninstall-securelibLTLIBRARIES - - uninstall-man: uninstall-man8 + clean-securelibLTLIBRARIES: +@@ -408,8 +410,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS --.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 +@@ -421,8 +423,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -432,13 +434,12 @@ + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique Index: pam.debian/modules/pam_debug/Makefile.in =================================================================== --- pam.debian.orig/modules/pam_debug/Makefile.in +++ pam.debian/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. ++# Makefile.in generated by automake 1.10.1 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. ++# 2003, 2004, 2005, 2006, 2007, 2008 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 @@ +@@ -67,7 +67,7 @@ pam_debug_la_DEPENDENCIES = 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) ++DEFAULT_INCLUDES = -I.@am__isrc@ -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@ -@@ -108,11 +113,16 @@ +@@ -108,6 +108,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -8455,40 +3657,7 @@ Index: pam.debian/modules/pam_debug/Makefile.in ECHO = @ECHO@ ECHO_C = @ECHO_C@ 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 +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@ -@@ -156,10 +177,10 @@ - LTLIBINTL = @LTLIBINTL@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ --MKDIR_P = @MKDIR_P@ +@@ -160,6 +161,7 @@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ @@ -8496,329 +3665,91 @@ Index: pam.debian/modules/pam_debug/Makefile.in OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -@@ -178,6 +199,8 @@ - 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_debug - man_MANS = pam_debug.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)" +@@ -296,8 +298,8 @@ @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ -@@ -303,7 +322,7 @@ +- echo " $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \ + else :; fi; \ + done - uninstall-securelibLTLIBRARIES: +@@ -305,8 +307,8 @@ @$(NORMAL_UNINSTALL) -- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ -+ @set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ + @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"; \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \ 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) -@@ -329,22 +348,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 $@ $< -@@ -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 + clean-securelibLTLIBRARIES: +@@ -405,8 +407,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS --.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 +@@ -418,8 +420,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -429,13 +431,12 @@ + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique Index: pam.debian/modules/pam_deny/Makefile.in =================================================================== --- pam.debian.orig/modules/pam_deny/Makefile.in +++ pam.debian/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. ++# Makefile.in generated by automake 1.10.1 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. ++# 2003, 2004, 2005, 2006, 2007, 2008 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 @@ +@@ -67,7 +67,7 @@ pam_deny_la_DEPENDENCIES = 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) ++DEFAULT_INCLUDES = -I.@am__isrc@ -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@ -@@ -108,11 +113,16 @@ +@@ -108,6 +108,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -8826,40 +3757,7 @@ Index: pam.debian/modules/pam_deny/Makefile.in ECHO = @ECHO@ ECHO_C = @ECHO_C@ 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 +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@ -@@ -156,10 +177,10 @@ - LTLIBINTL = @LTLIBINTL@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ --MKDIR_P = @MKDIR_P@ +@@ -160,6 +161,7 @@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ @@ -8867,329 +3765,91 @@ Index: pam.debian/modules/pam_deny/Makefile.in OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -@@ -178,6 +199,8 @@ - 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_deny - man_MANS = pam_deny.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)" +@@ -296,8 +298,8 @@ @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ -@@ -303,7 +322,7 @@ +- echo " $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \ + else :; fi; \ + done - uninstall-securelibLTLIBRARIES: +@@ -305,8 +307,8 @@ @$(NORMAL_UNINSTALL) -- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ -+ @set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ + @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_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) -@@ -329,22 +348,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 $@ $< -@@ -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"; \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \ 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 + clean-securelibLTLIBRARIES: +@@ -405,8 +407,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS --.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 +@@ -418,8 +420,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -429,13 +431,12 @@ + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique Index: pam.debian/modules/pam_echo/Makefile.in =================================================================== --- pam.debian.orig/modules/pam_echo/Makefile.in +++ pam.debian/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. ++# Makefile.in generated by automake 1.10.1 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. ++# 2003, 2004, 2005, 2006, 2007, 2008 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 @@ +@@ -67,7 +67,7 @@ pam_echo_la_DEPENDENCIES = 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) ++DEFAULT_INCLUDES = -I.@am__isrc@ -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@ -@@ -108,11 +113,16 @@ +@@ -108,6 +108,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -9197,40 +3857,7 @@ Index: pam.debian/modules/pam_echo/Makefile.in ECHO = @ECHO@ ECHO_C = @ECHO_C@ 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 +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@ -@@ -156,10 +177,10 @@ - LTLIBINTL = @LTLIBINTL@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ --MKDIR_P = @MKDIR_P@ +@@ -160,6 +161,7 @@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ @@ -9238,329 +3865,91 @@ Index: pam.debian/modules/pam_echo/Makefile.in OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -@@ -178,6 +199,8 @@ - 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_echo - man_MANS = pam_echo.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)" +@@ -296,8 +298,8 @@ @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ -@@ -303,7 +322,7 @@ +- echo " $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \ + else :; fi; \ + done - uninstall-securelibLTLIBRARIES: +@@ -305,8 +307,8 @@ @$(NORMAL_UNINSTALL) -- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ -+ @set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ + @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"; \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \ 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) -@@ -329,22 +348,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 $@ $< -@@ -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 + clean-securelibLTLIBRARIES: +@@ -405,8 +407,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS --.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 +@@ -418,8 +420,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -429,13 +431,12 @@ + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique Index: pam.debian/modules/pam_env/Makefile.in =================================================================== --- pam.debian.orig/modules/pam_env/Makefile.in +++ pam.debian/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. ++# Makefile.in generated by automake 1.10.1 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. ++# 2003, 2004, 2005, 2006, 2007, 2008 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 @@ +@@ -69,7 +69,7 @@ pam_env_la_DEPENDENCIES = 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) ++DEFAULT_INCLUDES = -I.@am__isrc@ -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@ -@@ -113,11 +118,16 @@ +@@ -113,6 +113,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -9568,40 +3957,7 @@ Index: pam.debian/modules/pam_env/Makefile.in ECHO = @ECHO@ ECHO_C = @ECHO_C@ 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 +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@ -@@ -161,10 +182,10 @@ - LTLIBINTL = @LTLIBINTL@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ --MKDIR_P = @MKDIR_P@ +@@ -165,6 +166,7 @@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ @@ -9609,358 +3965,91 @@ Index: pam.debian/modules/pam_env/Makefile.in OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -@@ -183,6 +204,8 @@ - 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@ -@@ -196,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@ -@@ -214,7 +237,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - datadir = @datadir@ - datarootdir = @datarootdir@ - docdir = @docdir@ -@@ -245,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@ - CLEANFILES = *~ - EXTRA_DIST = README pam_env.conf $(MANS) $(XMLS) tst-pam_env environment - man_MANS = pam_env.conf.5 pam_env.8 -@@ -301,7 +320,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)" +@@ -305,8 +307,8 @@ @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ -@@ -312,7 +331,7 @@ +- echo " $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \ + else :; fi; \ + done - uninstall-securelibLTLIBRARIES: +@@ -314,8 +316,8 @@ @$(NORMAL_UNINSTALL) -- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ -+ @set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ + @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"; \ -@@ -327,7 +346,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) -@@ -338,22 +357,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 $@ $< -@@ -363,9 +382,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 \ -@@ -410,7 +433,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 \ -@@ -455,7 +478,7 @@ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \ 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) \ -@@ -472,7 +495,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) \ -@@ -537,9 +560,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=./; \ -@@ -548,7 +571,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"; \ -@@ -560,7 +583,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"; \ - ;; \ -@@ -610,21 +633,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; \ -@@ -641,7 +665,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 -@@ -677,7 +701,7 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - - dvi: dvi-am - -@@ -692,20 +716,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 -@@ -726,30 +742,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 + clean-securelibLTLIBRARIES: +@@ -493,8 +495,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS --.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 +@@ -506,8 +508,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -517,13 +519,12 @@ + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique Index: pam.debian/modules/pam_exec/Makefile.in =================================================================== --- pam.debian.orig/modules/pam_exec/Makefile.in +++ pam.debian/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. ++# Makefile.in generated by automake 1.10.1 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. ++# 2003, 2004, 2005, 2006, 2007, 2008 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 @@ +@@ -67,7 +67,7 @@ pam_exec_la_DEPENDENCIES = 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) ++DEFAULT_INCLUDES = -I.@am__isrc@ -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@ -@@ -108,11 +113,16 @@ +@@ -108,6 +108,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -9968,40 +4057,7 @@ Index: pam.debian/modules/pam_exec/Makefile.in ECHO = @ECHO@ ECHO_C = @ECHO_C@ 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 +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@ -@@ -156,10 +177,10 @@ - LTLIBINTL = @LTLIBINTL@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ --MKDIR_P = @MKDIR_P@ +@@ -160,6 +161,7 @@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ @@ -10009,329 +4065,91 @@ Index: pam.debian/modules/pam_exec/Makefile.in OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -@@ -178,6 +199,8 @@ - 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_exec - man_MANS = pam_exec.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)" +@@ -296,8 +298,8 @@ @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ -@@ -303,7 +322,7 @@ +- echo " $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \ + else :; fi; \ + done - uninstall-securelibLTLIBRARIES: +@@ -305,8 +307,8 @@ @$(NORMAL_UNINSTALL) -- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ -+ @set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ + @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"; \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \ 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) -@@ -329,22 +348,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 $@ $< -@@ -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 + clean-securelibLTLIBRARIES: +@@ -405,8 +407,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS --.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 +@@ -418,8 +420,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -429,13 +431,12 @@ + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique Index: pam.debian/modules/pam_faildelay/Makefile.in =================================================================== --- pam.debian.orig/modules/pam_faildelay/Makefile.in +++ pam.debian/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. ++# Makefile.in generated by automake 1.10.1 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. ++# 2003, 2004, 2005, 2006, 2007, 2008 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 @@ +@@ -67,7 +67,7 @@ pam_faildelay_la_DEPENDENCIES = 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) ++DEFAULT_INCLUDES = -I.@am__isrc@ -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@ -@@ -108,11 +113,16 @@ +@@ -108,6 +108,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -10339,40 +4157,7 @@ Index: pam.debian/modules/pam_faildelay/Makefile.in ECHO = @ECHO@ ECHO_C = @ECHO_C@ 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 +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@ -@@ -156,10 +177,10 @@ - LTLIBINTL = @LTLIBINTL@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ --MKDIR_P = @MKDIR_P@ +@@ -160,6 +161,7 @@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ @@ -10380,348 +4165,91 @@ Index: pam.debian/modules/pam_faildelay/Makefile.in OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -@@ -178,6 +199,8 @@ - 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_faildelay - man_MANS = pam_faildelay.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)" +@@ -296,8 +298,8 @@ @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ -@@ -303,7 +322,7 @@ +- echo " $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \ + else :; fi; \ + done - uninstall-securelibLTLIBRARIES: +@@ -305,8 +307,8 @@ @$(NORMAL_UNINSTALL) -- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ -+ @set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ + @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"; \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \ 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) -@@ -329,22 +348,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 $@ $< -@@ -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 + clean-securelibLTLIBRARIES: +@@ -405,8 +407,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS --.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 +@@ -418,8 +420,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -429,13 +431,12 @@ + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique Index: pam.debian/modules/pam_filter/Makefile.in =================================================================== --- pam.debian.orig/modules/pam_filter/Makefile.in +++ pam.debian/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. ++# Makefile.in generated by automake 1.10.1 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. ++# 2003, 2004, 2005, 2006, 2007, 2008 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 @@ +@@ -70,7 +70,7 @@ pam_filter_la_DEPENDENCIES = 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) ++DEFAULT_INCLUDES = -I.@am__isrc@ -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@ -@@ -123,11 +125,16 @@ +@@ -123,6 +123,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -10729,40 +4257,7 @@ Index: pam.debian/modules/pam_filter/Makefile.in ECHO = @ECHO@ ECHO_C = @ECHO_C@ 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 +143,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@ -@@ -171,10 +189,10 @@ - LTLIBINTL = @LTLIBINTL@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ --MKDIR_P = @MKDIR_P@ +@@ -175,6 +176,7 @@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ @@ -10770,379 +4265,91 @@ Index: pam.debian/modules/pam_filter/Makefile.in OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -@@ -193,6 +211,8 @@ - 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@ -@@ -206,13 +226,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@ -@@ -224,7 +244,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - datadir = @datadir@ - datarootdir = @datarootdir@ - docdir = @docdir@ -@@ -255,11 +274,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 -@@ -309,7 +325,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)" +@@ -313,8 +315,8 @@ @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ -@@ -320,7 +336,7 @@ +- echo " $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \ + else :; fi; \ + done - uninstall-securelibLTLIBRARIES: +@@ -322,8 +324,8 @@ @$(NORMAL_UNINSTALL) -- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ -+ @set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ + @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"; \ -@@ -335,7 +351,7 @@ - rm -f "$${dir}/so_locations"; \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \ 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) -@@ -346,22 +362,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 $@ $< -@@ -371,9 +387,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 \ -@@ -418,7 +438,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) \ -@@ -465,7 +485,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 \ -@@ -566,9 +587,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=./; \ -@@ -577,7 +598,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"; \ -@@ -589,7 +610,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"; \ - ;; \ -@@ -639,21 +660,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; \ -@@ -667,7 +689,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`; \ -@@ -675,8 +697,6 @@ - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$top_distdir" \ - distdir="$$distdir/$$subdir" \ -- am__remove_distdir=: \ -- am__skip_length_check=: \ - distdir) \ - || exit 1; \ - fi; \ -@@ -688,7 +708,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 -@@ -724,7 +744,7 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - - dvi: dvi-recursive - -@@ -739,20 +759,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 + clean-securelibLTLIBRARIES: +@@ -509,8 +511,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS --install-pdf: install-pdf-recursive -- --install-ps: install-ps-recursive -- - installcheck-am: - - maintainer-clean: maintainer-clean-recursive -@@ -773,31 +785,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 +@@ -535,8 +537,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -546,13 +548,12 @@ + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique Index: pam.debian/modules/pam_filter/upperLOWER/Makefile.in =================================================================== --- pam.debian.orig/modules/pam_filter/upperLOWER/Makefile.in +++ pam.debian/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. ++# Makefile.in generated by automake 1.10.1 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. ++# 2003, 2004, 2005, 2006, 2007, 2008 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 -@@ -61,24 +65,25 @@ +@@ -61,7 +61,7 @@ upperLOWER_OBJECTS = upperLOWER.$(OBJEXT) upperLOWER_LDADD = $(LDADD) upperLOWER_DEPENDENCIES = -DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ -+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++DEFAULT_INCLUDES = -I.@am__isrc@ -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@ -@@ -98,11 +103,16 @@ +@@ -98,6 +98,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -11150,40 +4357,7 @@ Index: pam.debian/modules/pam_filter/upperLOWER/Makefile.in ECHO = @ECHO@ ECHO_C = @ECHO_C@ 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 +121,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@ -@@ -146,10 +167,10 @@ - LTLIBINTL = @LTLIBINTL@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ --MKDIR_P = @MKDIR_P@ +@@ -150,6 +151,7 @@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ @@ -11191,281 +4365,80 @@ Index: pam.debian/modules/pam_filter/upperLOWER/Makefile.in OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -@@ -168,6 +189,8 @@ - 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@ -@@ -181,13 +204,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@ -@@ -199,7 +222,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - datadir = @datadir@ - datarootdir = @datarootdir@ - docdir = @docdir@ -@@ -230,11 +252,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 \ -@@ -277,7 +296,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 \ -@@ -305,7 +324,7 @@ +@@ -284,8 +286,8 @@ + || test -f $$p1 \ + ; then \ + f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ +- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(securelibfilterPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(securelibfilterdir)/$$f'"; \ +- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(securelibfilterPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(securelibfilterdir)/$$f" || exit 1; \ ++ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibfilterPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(securelibfilterdir)/$$f'"; \ ++ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibfilterPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(securelibfilterdir)/$$f" || exit 1; \ + else :; fi; \ 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) -@@ -316,22 +335,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 $@ $< -@@ -342,6 +361,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)'; \ +@@ -347,8 +349,8 @@ unique=`for i in $$list; do \ -@@ -391,21 +414,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 +445,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 -@@ -457,7 +481,7 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - - dvi: dvi-am - -@@ -471,20 +495,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 -@@ -505,23 +521,20 @@ - - ps-am: + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS --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. +@@ -360,8 +362,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -371,13 +373,12 @@ + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique Index: pam.debian/modules/pam_ftp/Makefile.in =================================================================== --- pam.debian.orig/modules/pam_ftp/Makefile.in +++ pam.debian/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. ++# Makefile.in generated by automake 1.10.1 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. ++# 2003, 2004, 2005, 2006, 2007, 2008 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 @@ +@@ -67,7 +67,7 @@ pam_ftp_la_DEPENDENCIES = 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) ++DEFAULT_INCLUDES = -I.@am__isrc@ -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@ -@@ -108,11 +113,16 @@ +@@ -108,6 +108,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -11473,40 +4446,7 @@ Index: pam.debian/modules/pam_ftp/Makefile.in ECHO = @ECHO@ ECHO_C = @ECHO_C@ 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 +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@ -@@ -156,10 +177,10 @@ - LTLIBINTL = @LTLIBINTL@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ --MKDIR_P = @MKDIR_P@ +@@ -160,6 +161,7 @@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ @@ -11514,329 +4454,91 @@ Index: pam.debian/modules/pam_ftp/Makefile.in OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -@@ -178,6 +199,8 @@ - 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_ftp - man_MANS = pam_ftp.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)" +@@ -296,8 +298,8 @@ @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ -@@ -303,7 +322,7 @@ +- echo " $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \ + else :; fi; \ + done - uninstall-securelibLTLIBRARIES: +@@ -305,8 +307,8 @@ @$(NORMAL_UNINSTALL) -- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ -+ @set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ + @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"; \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \ 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) -@@ -329,22 +348,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 $@ $< -@@ -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 + clean-securelibLTLIBRARIES: +@@ -405,8 +407,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS --.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 +@@ -418,8 +420,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -429,13 +431,12 @@ + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique Index: pam.debian/modules/pam_group/Makefile.in =================================================================== --- pam.debian.orig/modules/pam_group/Makefile.in +++ pam.debian/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. ++# Makefile.in generated by automake 1.10.1 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. ++# 2003, 2004, 2005, 2006, 2007, 2008 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 @@ +@@ -68,7 +68,7 @@ pam_group_la_DEPENDENCIES = 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) ++DEFAULT_INCLUDES = -I.@am__isrc@ -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@ -@@ -111,11 +116,16 @@ +@@ -111,6 +111,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -11844,40 +4546,7 @@ Index: pam.debian/modules/pam_group/Makefile.in ECHO = @ECHO@ ECHO_C = @ECHO_C@ 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 +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@ -@@ -159,10 +180,10 @@ - LTLIBINTL = @LTLIBINTL@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ --MKDIR_P = @MKDIR_P@ +@@ -163,6 +164,7 @@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ @@ -11885,348 +4554,91 @@ Index: pam.debian/modules/pam_group/Makefile.in OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -@@ -181,6 +202,8 @@ - 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 group.conf $(MANS) $(XMLS) tst-pam_group - man_MANS = group.conf.5 pam_group.8 -@@ -298,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)" +@@ -302,8 +304,8 @@ @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ -@@ -309,7 +328,7 @@ +- echo " $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \ + else :; fi; \ + done - uninstall-securelibLTLIBRARIES: +@@ -311,8 +313,8 @@ @$(NORMAL_UNINSTALL) -- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ -+ @set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ + @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"; \ -@@ -324,7 +343,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) -@@ -335,22 +354,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 $@ $< -@@ -360,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 \ -@@ -407,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 \ -@@ -452,7 +475,7 @@ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \ 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) \ -@@ -517,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=./; \ -@@ -528,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"; \ -@@ -540,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"; \ - ;; \ -@@ -590,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; \ -@@ -621,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 -@@ -657,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 - -@@ -672,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 -@@ -706,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 + clean-securelibLTLIBRARIES: +@@ -473,8 +475,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS --.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 +@@ -486,8 +488,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -497,13 +499,12 @@ + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique Index: pam.debian/modules/pam_issue/Makefile.in =================================================================== --- pam.debian.orig/modules/pam_issue/Makefile.in +++ pam.debian/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. ++# Makefile.in generated by automake 1.10.1 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. ++# 2003, 2004, 2005, 2006, 2007, 2008 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 @@ +@@ -67,7 +67,7 @@ pam_issue_la_DEPENDENCIES = 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) ++DEFAULT_INCLUDES = -I.@am__isrc@ -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@ -@@ -108,11 +113,16 @@ +@@ -108,6 +108,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -12234,40 +4646,7 @@ Index: pam.debian/modules/pam_issue/Makefile.in ECHO = @ECHO@ ECHO_C = @ECHO_C@ 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 +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@ -@@ -156,10 +177,10 @@ - LTLIBINTL = @LTLIBINTL@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ --MKDIR_P = @MKDIR_P@ +@@ -160,6 +161,7 @@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ @@ -12275,329 +4654,91 @@ Index: pam.debian/modules/pam_issue/Makefile.in OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -@@ -178,6 +199,8 @@ - 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_issue - man_MANS = pam_issue.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)" +@@ -296,8 +298,8 @@ @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ -@@ -303,7 +322,7 @@ +- echo " $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \ + else :; fi; \ + done - uninstall-securelibLTLIBRARIES: +@@ -305,8 +307,8 @@ @$(NORMAL_UNINSTALL) -- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ -+ @set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ + @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"; \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \ 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) -@@ -329,22 +348,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 $@ $< -@@ -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 + clean-securelibLTLIBRARIES: +@@ -405,8 +407,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS --.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 +@@ -418,8 +420,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -429,13 +431,12 @@ + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique Index: pam.debian/modules/pam_keyinit/Makefile.in =================================================================== --- pam.debian.orig/modules/pam_keyinit/Makefile.in +++ pam.debian/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. ++# Makefile.in generated by automake 1.10.1 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. ++# 2003, 2004, 2005, 2006, 2007, 2008 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 @@ +@@ -69,7 +69,7 @@ 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) ++DEFAULT_INCLUDES = -I.@am__isrc@ -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@ -@@ -110,11 +115,16 @@ +@@ -110,6 +110,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -12605,40 +4746,7 @@ Index: pam.debian/modules/pam_keyinit/Makefile.in ECHO = @ECHO@ ECHO_C = @ECHO_C@ 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 +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@ -@@ -158,10 +179,10 @@ - LTLIBINTL = @LTLIBINTL@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ --MKDIR_P = @MKDIR_P@ +@@ -162,6 +163,7 @@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ @@ -12646,329 +4754,91 @@ Index: pam.debian/modules/pam_keyinit/Makefile.in OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -@@ -180,6 +201,8 @@ - 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 $(XMLS) pam_keyinit.8 tst-pam_keyinit - XMLS = README.xml pam_keyinit.8.xml -@@ -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)" +@@ -298,8 +300,8 @@ @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ -@@ -305,7 +324,7 @@ +- echo " $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \ + else :; fi; \ + done - uninstall-securelibLTLIBRARIES: +@@ -307,8 +309,8 @@ @$(NORMAL_UNINSTALL) -- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ -+ @set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ + @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,7 +339,7 @@ - rm -f "$${dir}/so_locations"; \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \ 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) -@@ -331,22 +350,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 $@ $< -@@ -356,9 +375,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 \ -@@ -451,9 +474,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=./; \ -@@ -462,7 +485,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"; \ -@@ -474,7 +497,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"; \ - ;; \ -@@ -524,21 +547,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; \ -@@ -555,7 +579,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 -@@ -591,7 +615,7 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - - dvi: dvi-am - -@@ -605,20 +629,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 -@@ -639,27 +655,24 @@ - - ps-am: - --uninstall-am: uninstall-man uninstall-securelibLTLIBRARIES -+uninstall-am: uninstall-info-am uninstall-man \ -+ uninstall-securelibLTLIBRARIES - - uninstall-man: uninstall-man8 + clean-securelibLTLIBRARIES: +@@ -407,8 +409,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS --.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 +@@ -420,8 +422,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -431,13 +433,12 @@ + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique Index: pam.debian/modules/pam_lastlog/Makefile.in =================================================================== --- pam.debian.orig/modules/pam_lastlog/Makefile.in +++ pam.debian/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. ++# Makefile.in generated by automake 1.10.1 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. ++# 2003, 2004, 2005, 2006, 2007, 2008 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 @@ +@@ -67,7 +67,7 @@ pam_lastlog_la_DEPENDENCIES = 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) ++DEFAULT_INCLUDES = -I.@am__isrc@ -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@ -@@ -108,11 +113,16 @@ +@@ -108,6 +108,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -12976,40 +4846,7 @@ Index: pam.debian/modules/pam_lastlog/Makefile.in ECHO = @ECHO@ ECHO_C = @ECHO_C@ 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 +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@ -@@ -156,10 +177,10 @@ - LTLIBINTL = @LTLIBINTL@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ --MKDIR_P = @MKDIR_P@ +@@ -160,6 +161,7 @@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ @@ -13017,329 +4854,91 @@ Index: pam.debian/modules/pam_lastlog/Makefile.in OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -@@ -178,6 +199,8 @@ - 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 = *~ - securelibdir = $(SECUREDIR) - secureconfdir = $(SCONFIGDIR) -@@ -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)" +@@ -296,8 +298,8 @@ @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ -@@ -303,7 +322,7 @@ +- echo " $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \ + else :; fi; \ + done - uninstall-securelibLTLIBRARIES: +@@ -305,8 +307,8 @@ @$(NORMAL_UNINSTALL) -- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ -+ @set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ + @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_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) -@@ -329,22 +348,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 $@ $< -@@ -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"; \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \ 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 + clean-securelibLTLIBRARIES: +@@ -405,8 +407,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS --.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 +@@ -418,8 +420,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -429,13 +431,12 @@ + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique Index: pam.debian/modules/pam_limits/Makefile.in =================================================================== --- pam.debian.orig/modules/pam_limits/Makefile.in +++ pam.debian/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. ++# Makefile.in generated by automake 1.10.1 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. ++# 2003, 2004, 2005, 2006, 2007, 2008 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 @@ +@@ -68,7 +68,7 @@ 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) ++DEFAULT_INCLUDES = -I.@am__isrc@ -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@ -@@ -111,11 +116,16 @@ +@@ -111,6 +111,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -13347,40 +4946,7 @@ Index: pam.debian/modules/pam_limits/Makefile.in ECHO = @ECHO@ ECHO_C = @ECHO_C@ 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 +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@ -@@ -159,10 +180,10 @@ - LTLIBINTL = @LTLIBINTL@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ --MKDIR_P = @MKDIR_P@ +@@ -163,6 +164,7 @@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ @@ -13388,349 +4954,91 @@ Index: pam.debian/modules/pam_limits/Makefile.in OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -@@ -181,6 +202,8 @@ - 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) limits.conf tst-pam_limits - man_MANS = limits.conf.5 pam_limits.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)" +@@ -304,8 +306,8 @@ @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ -@@ -311,7 +330,7 @@ +- echo " $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \ + else :; fi; \ + done - uninstall-securelibLTLIBRARIES: +@@ -313,8 +315,8 @@ @$(NORMAL_UNINSTALL) -- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ -+ @set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ + @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"; \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \ 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) -@@ -337,22 +356,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 $@ $< -@@ -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) \ -@@ -519,9 +542,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=./; \ -@@ -530,7 +553,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"; \ -@@ -542,7 +565,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"; \ - ;; \ -@@ -592,21 +615,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; \ -@@ -623,7 +647,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 -@@ -659,7 +683,7 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - - dvi: dvi-am - -@@ -674,20 +698,12 @@ - install-data-am: install-data-local 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 -@@ -708,29 +724,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 + clean-securelibLTLIBRARIES: +@@ -475,8 +477,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS --.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-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-man5 \ -- install-man8 install-pdf install-pdf-am install-ps \ -- install-ps-am install-secureconfDATA \ -+ install-data-am install-data-local install-exec \ -+ install-exec-am install-info install-info-am install-man \ -+ install-man5 install-man8 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 \ -+ 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 +@@ -488,8 +490,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -499,13 +501,12 @@ + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique Index: pam.debian/modules/pam_listfile/Makefile.in =================================================================== --- pam.debian.orig/modules/pam_listfile/Makefile.in +++ pam.debian/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. ++# Makefile.in generated by automake 1.10.1 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. ++# 2003, 2004, 2005, 2006, 2007, 2008 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 @@ +@@ -67,7 +67,7 @@ pam_listfile_la_DEPENDENCIES = 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) ++DEFAULT_INCLUDES = -I.@am__isrc@ -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@ -@@ -108,11 +113,16 @@ +@@ -108,6 +108,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -13738,40 +5046,7 @@ Index: pam.debian/modules/pam_listfile/Makefile.in ECHO = @ECHO@ ECHO_C = @ECHO_C@ 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 +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@ -@@ -156,10 +177,10 @@ - LTLIBINTL = @LTLIBINTL@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ --MKDIR_P = @MKDIR_P@ +@@ -160,6 +161,7 @@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ @@ -13779,329 +5054,91 @@ Index: pam.debian/modules/pam_listfile/Makefile.in OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -@@ -178,6 +199,8 @@ - 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_listfile - man_MANS = pam_listfile.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)" +@@ -296,8 +298,8 @@ @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ -@@ -303,7 +322,7 @@ +- echo " $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \ + else :; fi; \ + done - uninstall-securelibLTLIBRARIES: +@@ -305,8 +307,8 @@ @$(NORMAL_UNINSTALL) -- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ -+ @set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ + @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_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) -@@ -329,22 +348,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 $@ $< -@@ -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"; \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \ 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 + clean-securelibLTLIBRARIES: +@@ -405,8 +407,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS --.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 +@@ -418,8 +420,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -429,13 +431,12 @@ + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique Index: pam.debian/modules/pam_localuser/Makefile.in =================================================================== --- pam.debian.orig/modules/pam_localuser/Makefile.in +++ pam.debian/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. ++# Makefile.in generated by automake 1.10.1 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. ++# 2003, 2004, 2005, 2006, 2007, 2008 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 @@ +@@ -67,7 +67,7 @@ pam_localuser_la_DEPENDENCIES = 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) ++DEFAULT_INCLUDES = -I.@am__isrc@ -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@ -@@ -108,11 +113,16 @@ +@@ -108,6 +108,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -14109,40 +5146,7 @@ Index: pam.debian/modules/pam_localuser/Makefile.in ECHO = @ECHO@ ECHO_C = @ECHO_C@ 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 +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@ -@@ -156,10 +177,10 @@ - LTLIBINTL = @LTLIBINTL@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ --MKDIR_P = @MKDIR_P@ +@@ -160,6 +161,7 @@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ @@ -14150,329 +5154,91 @@ Index: pam.debian/modules/pam_localuser/Makefile.in OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -@@ -178,6 +199,8 @@ - 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_localuser - TESTS = tst-pam_localuser -@@ -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)" +@@ -296,8 +298,8 @@ @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ -@@ -303,7 +322,7 @@ +- echo " $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \ + else :; fi; \ + done - uninstall-securelibLTLIBRARIES: +@@ -305,8 +307,8 @@ @$(NORMAL_UNINSTALL) -- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ -+ @set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ + @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"; \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \ 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) -@@ -329,22 +348,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 $@ $< -@@ -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 + clean-securelibLTLIBRARIES: +@@ -405,8 +407,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS --.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 +@@ -418,8 +420,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -429,13 +431,12 @@ + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique Index: pam.debian/modules/pam_loginuid/Makefile.in =================================================================== --- pam.debian.orig/modules/pam_loginuid/Makefile.in +++ pam.debian/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. ++# Makefile.in generated by automake 1.10.1 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. ++# 2003, 2004, 2005, 2006, 2007, 2008 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 @@ +@@ -67,7 +67,7 @@ pam_loginuid_la_DEPENDENCIES = 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) ++DEFAULT_INCLUDES = -I.@am__isrc@ -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@ -@@ -108,11 +113,16 @@ +@@ -108,6 +108,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -14480,40 +5246,7 @@ Index: pam.debian/modules/pam_loginuid/Makefile.in ECHO = @ECHO@ ECHO_C = @ECHO_C@ 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 +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@ -@@ -156,10 +177,10 @@ - LTLIBINTL = @LTLIBINTL@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ --MKDIR_P = @MKDIR_P@ +@@ -160,6 +161,7 @@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ @@ -14521,329 +5254,91 @@ Index: pam.debian/modules/pam_loginuid/Makefile.in OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -@@ -178,6 +199,8 @@ - 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_loginuid - man_MANS = pam_loginuid.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)" +@@ -296,8 +298,8 @@ @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ -@@ -303,7 +322,7 @@ +- echo " $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \ + else :; fi; \ + done - uninstall-securelibLTLIBRARIES: +@@ -305,8 +307,8 @@ @$(NORMAL_UNINSTALL) -- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ -+ @set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ + @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"; \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \ 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) -@@ -329,22 +348,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 $@ $< -@@ -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 + clean-securelibLTLIBRARIES: +@@ -405,8 +407,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS --.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 +@@ -418,8 +420,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -429,13 +431,12 @@ + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique Index: pam.debian/modules/pam_mail/Makefile.in =================================================================== --- pam.debian.orig/modules/pam_mail/Makefile.in +++ pam.debian/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. ++# Makefile.in generated by automake 1.10.1 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. ++# 2003, 2004, 2005, 2006, 2007, 2008 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 @@ +@@ -67,7 +67,7 @@ pam_mail_la_DEPENDENCIES = 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) ++DEFAULT_INCLUDES = -I.@am__isrc@ -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@ -@@ -108,11 +113,16 @@ +@@ -108,6 +108,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -14851,40 +5346,7 @@ Index: pam.debian/modules/pam_mail/Makefile.in ECHO = @ECHO@ ECHO_C = @ECHO_C@ 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 +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@ -@@ -156,10 +177,10 @@ - LTLIBINTL = @LTLIBINTL@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ --MKDIR_P = @MKDIR_P@ +@@ -160,6 +161,7 @@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ @@ -14892,329 +5354,91 @@ Index: pam.debian/modules/pam_mail/Makefile.in OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -@@ -178,6 +199,8 @@ - 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_mail - man_MANS = pam_mail.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)" +@@ -296,8 +298,8 @@ @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ -@@ -303,7 +322,7 @@ +- echo " $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \ + else :; fi; \ + done - uninstall-securelibLTLIBRARIES: +@@ -305,8 +307,8 @@ @$(NORMAL_UNINSTALL) -- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ -+ @set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ + @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_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) -@@ -329,22 +348,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 $@ $< -@@ -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"; \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \ 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 + clean-securelibLTLIBRARIES: +@@ -405,8 +407,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS --.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 +@@ -418,8 +420,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -429,13 +431,12 @@ + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique Index: pam.debian/modules/pam_mkhomedir/Makefile.in =================================================================== --- pam.debian.orig/modules/pam_mkhomedir/Makefile.in +++ pam.debian/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. ++# Makefile.in generated by automake 1.10.1 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. ++# 2003, 2004, 2005, 2006, 2007, 2008 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 @@ +@@ -67,7 +67,7 @@ pam_mkhomedir_la_DEPENDENCIES = 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) ++DEFAULT_INCLUDES = -I.@am__isrc@ -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@ -@@ -108,11 +113,16 @@ +@@ -108,6 +108,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -15222,40 +5446,7 @@ Index: pam.debian/modules/pam_mkhomedir/Makefile.in ECHO = @ECHO@ ECHO_C = @ECHO_C@ 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 +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@ -@@ -156,10 +177,10 @@ - LTLIBINTL = @LTLIBINTL@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ --MKDIR_P = @MKDIR_P@ +@@ -160,6 +161,7 @@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ @@ -15263,329 +5454,91 @@ Index: pam.debian/modules/pam_mkhomedir/Makefile.in OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -@@ -178,6 +199,8 @@ - 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_mkhomedir - man_MANS = pam_mkhomedir.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)" +@@ -297,8 +299,8 @@ @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ -@@ -304,7 +323,7 @@ +- echo " $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \ + else :; fi; \ + done - uninstall-securelibLTLIBRARIES: +@@ -306,8 +308,8 @@ @$(NORMAL_UNINSTALL) -- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ -+ @set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ + @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"; \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \ 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) -@@ -330,22 +349,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 $@ $< -@@ -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 + clean-securelibLTLIBRARIES: +@@ -406,8 +408,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS --.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 +@@ -419,8 +421,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -430,13 +432,12 @@ + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique Index: pam.debian/modules/pam_motd/Makefile.in =================================================================== --- pam.debian.orig/modules/pam_motd/Makefile.in +++ pam.debian/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. ++# Makefile.in generated by automake 1.10.1 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. ++# 2003, 2004, 2005, 2006, 2007, 2008 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 @@ +@@ -67,7 +67,7 @@ pam_motd_la_DEPENDENCIES = 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) ++DEFAULT_INCLUDES = -I.@am__isrc@ -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@ -@@ -108,11 +113,16 @@ +@@ -108,6 +108,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -15593,40 +5546,7 @@ Index: pam.debian/modules/pam_motd/Makefile.in ECHO = @ECHO@ ECHO_C = @ECHO_C@ 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 +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@ -@@ -156,10 +177,10 @@ - LTLIBINTL = @LTLIBINTL@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ --MKDIR_P = @MKDIR_P@ +@@ -160,6 +161,7 @@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ @@ -15634,329 +5554,91 @@ Index: pam.debian/modules/pam_motd/Makefile.in OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -@@ -178,6 +199,8 @@ - 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_motd - man_MANS = pam_motd.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)" +@@ -296,8 +298,8 @@ @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ -@@ -303,7 +322,7 @@ +- echo " $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \ + else :; fi; \ + done - uninstall-securelibLTLIBRARIES: +@@ -305,8 +307,8 @@ @$(NORMAL_UNINSTALL) -- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ -+ @set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ + @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_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) -@@ -329,22 +348,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 $@ $< -@@ -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"; \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \ 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 + clean-securelibLTLIBRARIES: +@@ -405,8 +407,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS --.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 +@@ -418,8 +420,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -429,13 +431,12 @@ + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique Index: pam.debian/modules/pam_namespace/Makefile.in =================================================================== --- pam.debian.orig/modules/pam_namespace/Makefile.in +++ pam.debian/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. ++# Makefile.in generated by automake 1.10.1 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. ++# 2003, 2004, 2005, 2006, 2007, 2008 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 @@ +@@ -78,7 +78,7 @@ @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) ++DEFAULT_INCLUDES = -I.@am__isrc@ -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@ -@@ -122,11 +127,16 @@ +@@ -122,6 +122,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -15964,40 +5646,7 @@ Index: pam.debian/modules/pam_namespace/Makefile.in ECHO = @ECHO@ ECHO_C = @ECHO_C@ 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 +145,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@ -@@ -170,10 +191,10 @@ - LTLIBINTL = @LTLIBINTL@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ --MKDIR_P = @MKDIR_P@ +@@ -174,6 +175,7 @@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ @@ -16005,351 +5654,91 @@ Index: pam.debian/modules/pam_namespace/Makefile.in OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -@@ -192,6 +213,8 @@ - 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 +228,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 +246,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - datadir = @datadir@ - datarootdir = @datarootdir@ - docdir = @docdir@ -@@ -254,11 +276,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 -@@ -314,7 +333,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)" +@@ -318,8 +320,8 @@ @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ -@@ -325,7 +344,7 @@ +- echo " $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \ + else :; fi; \ + done - uninstall-securelibLTLIBRARIES: +@@ -327,8 +329,8 @@ @$(NORMAL_UNINSTALL) -- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ -+ @set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ + @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"; \ -@@ -340,10 +359,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 \ -@@ -371,22 +390,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 $@ $< -@@ -396,9 +415,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 \ -@@ -443,7 +466,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 \ -@@ -488,7 +511,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) \ -@@ -553,9 +576,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=./; \ -@@ -564,7 +587,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"; \ -@@ -576,7 +599,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"; \ - ;; \ -@@ -626,21 +649,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; \ -@@ -657,7 +681,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"; \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \ done - install: install-am - install-exec: install-exec-am -@@ -693,7 +717,7 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - - dvi: dvi-am - -@@ -708,20 +732,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 -@@ -742,29 +758,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 + clean-securelibLTLIBRARIES: +@@ -509,8 +511,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS --.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 +@@ -522,8 +524,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -533,13 +535,12 @@ + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique Index: pam.debian/modules/pam_nologin/Makefile.in =================================================================== --- pam.debian.orig/modules/pam_nologin/Makefile.in +++ pam.debian/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. ++# Makefile.in generated by automake 1.10.1 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. ++# 2003, 2004, 2005, 2006, 2007, 2008 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 @@ +@@ -67,7 +67,7 @@ pam_nologin_la_DEPENDENCIES = 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) ++DEFAULT_INCLUDES = -I.@am__isrc@ -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@ -@@ -108,11 +113,16 @@ +@@ -108,6 +108,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -16357,40 +5746,7 @@ Index: pam.debian/modules/pam_nologin/Makefile.in ECHO = @ECHO@ ECHO_C = @ECHO_C@ 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 +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@ -@@ -156,10 +177,10 @@ - LTLIBINTL = @LTLIBINTL@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ --MKDIR_P = @MKDIR_P@ +@@ -160,6 +161,7 @@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ @@ -16398,329 +5754,91 @@ Index: pam.debian/modules/pam_nologin/Makefile.in OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -@@ -178,6 +199,8 @@ - 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_nologin - TESTS = tst-pam_nologin -@@ -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)" +@@ -296,8 +298,8 @@ @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ -@@ -303,7 +322,7 @@ +- echo " $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \ + else :; fi; \ + done - uninstall-securelibLTLIBRARIES: +@@ -305,8 +307,8 @@ @$(NORMAL_UNINSTALL) -- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ -+ @set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ + @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"; \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \ 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) -@@ -329,22 +348,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 $@ $< -@@ -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 + clean-securelibLTLIBRARIES: +@@ -405,8 +407,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS --.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 +@@ -418,8 +420,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -429,13 +431,12 @@ + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique Index: pam.debian/modules/pam_permit/Makefile.in =================================================================== --- pam.debian.orig/modules/pam_permit/Makefile.in +++ pam.debian/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. ++# Makefile.in generated by automake 1.10.1 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. ++# 2003, 2004, 2005, 2006, 2007, 2008 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 @@ +@@ -67,7 +67,7 @@ pam_permit_la_DEPENDENCIES = 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) ++DEFAULT_INCLUDES = -I.@am__isrc@ -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@ -@@ -108,11 +113,16 @@ +@@ -108,6 +108,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -16728,40 +5846,7 @@ Index: pam.debian/modules/pam_permit/Makefile.in ECHO = @ECHO@ ECHO_C = @ECHO_C@ 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 +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@ -@@ -156,10 +177,10 @@ - LTLIBINTL = @LTLIBINTL@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ --MKDIR_P = @MKDIR_P@ +@@ -160,6 +161,7 @@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ @@ -16769,329 +5854,91 @@ Index: pam.debian/modules/pam_permit/Makefile.in OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -@@ -178,6 +199,8 @@ - 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_permit - man_MANS = pam_permit.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)" +@@ -296,8 +298,8 @@ @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ -@@ -303,7 +322,7 @@ +- echo " $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \ + else :; fi; \ + done - uninstall-securelibLTLIBRARIES: +@@ -305,8 +307,8 @@ @$(NORMAL_UNINSTALL) -- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ -+ @set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ + @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"; \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \ 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) -@@ -329,22 +348,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 $@ $< -@@ -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 + clean-securelibLTLIBRARIES: +@@ -405,8 +407,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS --.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 +@@ -418,8 +420,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -429,13 +431,12 @@ + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique Index: pam.debian/modules/pam_rhosts/Makefile.in =================================================================== --- pam.debian.orig/modules/pam_rhosts/Makefile.in +++ pam.debian/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. ++# Makefile.in generated by automake 1.10.1 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. ++# 2003, 2004, 2005, 2006, 2007, 2008 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 @@ +@@ -70,7 +70,7 @@ pam_rhosts_auth_la_DEPENDENCIES = 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) ++DEFAULT_INCLUDES = -I.@am__isrc@ -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@ -@@ -111,11 +116,16 @@ +@@ -111,6 +111,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -17099,40 +5946,7 @@ Index: pam.debian/modules/pam_rhosts/Makefile.in ECHO = @ECHO@ ECHO_C = @ECHO_C@ 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 +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@ -@@ -159,10 +180,10 @@ - LTLIBINTL = @LTLIBINTL@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ --MKDIR_P = @MKDIR_P@ +@@ -163,6 +164,7 @@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ @@ -17140,332 +5954,91 @@ Index: pam.debian/modules/pam_rhosts/Makefile.in OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -@@ -181,6 +202,8 @@ - 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) tst-pam_rhosts_auth tst-pam_rhosts - TESTS = tst-pam_rhosts_auth tst-pam_rhosts -@@ -296,7 +315,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)" +@@ -300,8 +302,8 @@ @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ -@@ -307,7 +326,7 @@ +- echo " $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \ + else :; fi; \ + done - uninstall-securelibLTLIBRARIES: +@@ -309,8 +311,8 @@ @$(NORMAL_UNINSTALL) -- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ -+ @set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ + @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"; \ -@@ -322,9 +341,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) -@@ -336,22 +355,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 $@ $< -@@ -361,9 +380,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 \ -@@ -456,9 +479,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=./; \ -@@ -467,7 +490,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"; \ -@@ -479,7 +502,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"; \ - ;; \ -@@ -529,21 +552,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; \ -@@ -560,7 +584,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"; \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \ done - install: install-am - install-exec: install-exec-am -@@ -596,7 +620,7 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - - dvi: dvi-am -@@ -610,20 +634,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 -@@ -644,27 +660,24 @@ - - ps-am: - --uninstall-am: uninstall-man uninstall-securelibLTLIBRARIES -+uninstall-am: uninstall-info-am uninstall-man \ -+ uninstall-securelibLTLIBRARIES - - uninstall-man: uninstall-man8 + clean-securelibLTLIBRARIES: +@@ -412,8 +414,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS --.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 +@@ -425,8 +427,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -436,13 +438,12 @@ + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique Index: pam.debian/modules/pam_rootok/Makefile.in =================================================================== --- pam.debian.orig/modules/pam_rootok/Makefile.in +++ pam.debian/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. ++# Makefile.in generated by automake 1.10.1 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. ++# 2003, 2004, 2005, 2006, 2007, 2008 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 @@ +@@ -68,7 +68,7 @@ pam_rootok_la_DEPENDENCIES = 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) ++DEFAULT_INCLUDES = -I.@am__isrc@ -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@ -@@ -109,11 +114,16 @@ +@@ -109,6 +109,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -17473,40 +6046,7 @@ Index: pam.debian/modules/pam_rootok/Makefile.in ECHO = @ECHO@ ECHO_C = @ECHO_C@ 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 +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@ -@@ -157,10 +178,10 @@ - LTLIBINTL = @LTLIBINTL@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ --MKDIR_P = @MKDIR_P@ +@@ -161,6 +162,7 @@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ @@ -17514,295 +6054,82 @@ Index: pam.debian/modules/pam_rootok/Makefile.in OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -@@ -179,6 +200,8 @@ - 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 $(MANS) $(XMLS) tst-pam_rootok - man_MANS = pam_rootok.8 -@@ -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)" +@@ -298,8 +300,8 @@ @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ -@@ -305,7 +324,7 @@ +- echo " $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \ + else :; fi; \ + done - uninstall-securelibLTLIBRARIES: +@@ -307,8 +309,8 @@ @$(NORMAL_UNINSTALL) -- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ -+ @set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ + @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,7 +339,7 @@ - rm -f "$${dir}/so_locations"; \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \ 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) -@@ -331,22 +350,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 $@ $< -@@ -356,9 +375,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 \ -@@ -451,9 +474,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=./; \ -@@ -462,7 +485,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"; \ -@@ -474,7 +497,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"; \ - ;; \ -@@ -524,21 +547,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; \ -@@ -555,7 +579,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 -@@ -591,7 +615,7 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - - dvi: dvi-am - -@@ -605,20 +629,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 -@@ -639,27 +655,24 @@ - - ps-am: - --uninstall-am: uninstall-man uninstall-securelibLTLIBRARIES -+uninstall-am: uninstall-info-am uninstall-man \ -+ uninstall-securelibLTLIBRARIES - - uninstall-man: uninstall-man8 + clean-securelibLTLIBRARIES: +@@ -407,8 +409,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS --.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 +@@ -420,8 +422,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -431,13 +433,12 @@ + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique Index: pam.debian/modules/pam_securetty/Makefile.in =================================================================== --- pam.debian.orig/modules/pam_securetty/Makefile.in +++ pam.debian/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. ++# Makefile.in generated by automake 1.10.1 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. ++# 2003, 2004, 2005, 2006, 2007, 2008 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,22 +69,21 @@ +@@ -65,9 +65,9 @@ securelibLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(securelib_LTLIBRARIES) pam_securetty_la_DEPENDENCIES = @@ -17811,40 +6138,22 @@ Index: pam.debian/modules/pam_securetty/Makefile.in -DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ +am_pam_securetty_la_OBJECTS = pam_securetty.lo tty_secure.lo +pam_securetty_la_OBJECTS = $(am_pam_securetty_la_OBJECTS) -+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++DEFAULT_INCLUDES = -I.@am__isrc@ -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 $@ +@@ -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 -+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ +SOURCES = $(pam_securetty_la_SOURCES) +DIST_SOURCES = $(pam_securetty_la_SOURCES) man8dir = $(mandir)/man8 NROFF = nroff MANS = $(man_MANS) -@@ -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@ -@@ -108,11 +113,16 @@ +@@ -108,6 +108,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -17852,40 +6161,7 @@ Index: pam.debian/modules/pam_securetty/Makefile.in ECHO = @ECHO@ ECHO_C = @ECHO_C@ 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 +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@ -@@ -156,10 +177,10 @@ - LTLIBINTL = @LTLIBINTL@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ --MKDIR_P = @MKDIR_P@ +@@ -160,6 +161,7 @@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ @@ -17893,54 +6169,7 @@ Index: pam.debian/modules/pam_securetty/Makefile.in OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -@@ -178,6 +199,8 @@ - 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_securetty - TESTS = tst-pam_securetty -@@ -256,6 +275,10 @@ +@@ -256,6 +258,10 @@ AM_LDFLAGS = -no-undefined -avoid-version -module $(am__append_1) securelib_LTLIBRARIES = pam_securetty.la pam_securetty_la_LIBADD = -L$(top_builddir)/libpam -lpam @@ -17951,296 +6180,99 @@ Index: pam.debian/modules/pam_securetty/Makefile.in @ENABLE_REGENERATE_MAN_TRUE@noinst_DATA = README all: all-am -@@ -292,7 +315,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)" +@@ -296,8 +302,8 @@ @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ -@@ -303,7 +326,7 @@ +- echo " $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \ + else :; fi; \ + done - uninstall-securelibLTLIBRARIES: +@@ -305,8 +311,8 @@ @$(NORMAL_UNINSTALL) -- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ -+ @set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ + @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 +341,7 @@ - rm -f "$${dir}/so_locations"; \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \ 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) -@@ -327,24 +350,25 @@ + clean-securelibLTLIBRARIES: +@@ -327,6 +333,7 @@ -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_securetty.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tty_secure.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 +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 \ -@@ -449,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=./; \ -@@ -460,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"; \ -@@ -472,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"; \ - ;; \ -@@ -522,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; \ -@@ -553,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 -@@ -589,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 - -@@ -603,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 -@@ -637,27 +658,24 @@ - - ps-am: - --uninstall-am: uninstall-man uninstall-securelibLTLIBRARIES -+uninstall-am: uninstall-info-am uninstall-man \ -+ uninstall-securelibLTLIBRARIES - - uninstall-man: uninstall-man8 + @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@@ -405,8 +412,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS --.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 +@@ -418,8 +425,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -429,13 +436,12 @@ + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique Index: pam.debian/modules/pam_selinux/Makefile.in =================================================================== --- pam.debian.orig/modules/pam_selinux/Makefile.in +++ pam.debian/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. ++# Makefile.in generated by automake 1.10.1 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. ++# 2003, 2004, 2005, 2006, 2007, 2008 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 -@@ -69,29 +73,22 @@ - pam_selinux_la_DEPENDENCIES = - 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 $@ +@@ -80,7 +80,7 @@ + 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) ++DEFAULT_INCLUDES = -I.@am__isrc@ -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 -@@ -102,6 +99,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@ -@@ -121,11 +120,16 @@ +@@ -121,6 +121,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -18248,40 +6280,7 @@ Index: pam.debian/modules/pam_selinux/Makefile.in ECHO = @ECHO@ ECHO_C = @ECHO_C@ 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@ -@@ -134,7 +138,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@ -@@ -169,10 +184,10 @@ - LTLIBINTL = @LTLIBINTL@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ --MKDIR_P = @MKDIR_P@ +@@ -173,6 +174,7 @@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ @@ -18289,337 +6288,91 @@ Index: pam.debian/modules/pam_selinux/Makefile.in OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -@@ -191,6 +206,8 @@ - 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 +221,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 +239,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - datadir = @datadir@ - datarootdir = @datarootdir@ - docdir = @docdir@ -@@ -253,11 +269,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 -@@ -314,7 +327,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)" +@@ -318,8 +320,8 @@ @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ -@@ -325,7 +338,7 @@ +- echo " $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \ + else :; fi; \ + done - uninstall-securelibLTLIBRARIES: +@@ -327,8 +329,8 @@ @$(NORMAL_UNINSTALL) -- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ -+ @set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ + @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"; \ -@@ -340,7 +353,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 \ -@@ -350,7 +363,7 @@ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \ 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) -@@ -362,22 +375,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 $@ $< -@@ -387,9 +400,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 \ -@@ -482,9 +499,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=./; \ -@@ -493,7 +510,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"; \ -@@ -505,7 +522,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"; \ - ;; \ -@@ -555,21 +572,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; \ -@@ -586,7 +604,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 -@@ -622,7 +640,7 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - - dvi: dvi-am - -@@ -636,20 +654,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 -@@ -670,27 +680,24 @@ - - ps-am: - --uninstall-am: uninstall-man uninstall-securelibLTLIBRARIES -+uninstall-am: uninstall-info-am uninstall-man \ -+ uninstall-securelibLTLIBRARIES - - uninstall-man: uninstall-man8 + clean-securelibLTLIBRARIES: +@@ -438,8 +440,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS --.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 +@@ -451,8 +453,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -462,13 +464,12 @@ + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique Index: pam.debian/modules/pam_shells/Makefile.in =================================================================== --- pam.debian.orig/modules/pam_shells/Makefile.in +++ pam.debian/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. ++# Makefile.in generated by automake 1.10.1 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. ++# 2003, 2004, 2005, 2006, 2007, 2008 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 @@ +@@ -67,7 +67,7 @@ pam_shells_la_DEPENDENCIES = 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) ++DEFAULT_INCLUDES = -I.@am__isrc@ -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@ -@@ -108,11 +113,16 @@ +@@ -108,6 +108,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -18627,40 +6380,7 @@ Index: pam.debian/modules/pam_shells/Makefile.in ECHO = @ECHO@ ECHO_C = @ECHO_C@ 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 +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@ -@@ -156,10 +177,10 @@ - LTLIBINTL = @LTLIBINTL@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ --MKDIR_P = @MKDIR_P@ +@@ -160,6 +161,7 @@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ @@ -18668,328 +6388,91 @@ Index: pam.debian/modules/pam_shells/Makefile.in OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -@@ -178,6 +199,8 @@ - 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_shells - man_MANS = pam_shells.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)" +@@ -296,8 +298,8 @@ @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ -@@ -303,7 +322,7 @@ +- echo " $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \ + else :; fi; \ + done - uninstall-securelibLTLIBRARIES: +@@ -305,8 +307,8 @@ @$(NORMAL_UNINSTALL) -- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ -+ @set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ + @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_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) -@@ -329,22 +348,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 $@ $< -@@ -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"; \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \ 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 + clean-securelibLTLIBRARIES: +@@ -405,8 +407,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS --.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 +@@ -418,8 +420,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -429,13 +431,12 @@ + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique Index: pam.debian/modules/pam_stress/Makefile.in =================================================================== --- pam.debian.orig/modules/pam_stress/Makefile.in +++ pam.debian/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. ++# Makefile.in generated by automake 1.10.1 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. ++# 2003, 2004, 2005, 2006, 2007, 2008 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 @@ +@@ -66,7 +66,7 @@ pam_stress_la_DEPENDENCIES = 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) ++DEFAULT_INCLUDES = -I.@am__isrc@ -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@ -@@ -103,11 +108,16 @@ +@@ -103,6 +103,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -18997,40 +6480,7 @@ Index: pam.debian/modules/pam_stress/Makefile.in ECHO = @ECHO@ ECHO_C = @ECHO_C@ 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 +126,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@ -@@ -151,10 +172,10 @@ - LTLIBINTL = @LTLIBINTL@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ --MKDIR_P = @MKDIR_P@ +@@ -155,6 +156,7 @@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ @@ -19038,320 +6488,91 @@ Index: pam.debian/modules/pam_stress/Makefile.in OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -@@ -173,6 +194,8 @@ - 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 +209,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 +227,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - datadir = @datadir@ - datarootdir = @datarootdir@ - docdir = @docdir@ -@@ -235,11 +257,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 -@@ -284,7 +303,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)" +@@ -288,8 +290,8 @@ @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ -@@ -295,7 +314,7 @@ +- echo " $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \ + else :; fi; \ + done - uninstall-securelibLTLIBRARIES: +@@ -297,8 +299,8 @@ @$(NORMAL_UNINSTALL) -- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ -+ @set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ + @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"; \ -@@ -310,7 +329,7 @@ - rm -f "$${dir}/so_locations"; \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \ 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) -@@ -321,22 +340,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 $@ $< -@@ -347,6 +366,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)'; \ + clean-securelibLTLIBRARIES: +@@ -352,8 +354,8 @@ unique=`for i in $$list; do \ -@@ -396,9 +419,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=./; \ -@@ -407,7 +430,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"; \ -@@ -419,7 +442,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"; \ - ;; \ -@@ -469,21 +492,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; \ -@@ -500,7 +524,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 -@@ -536,7 +560,7 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - - dvi: dvi-am - -@@ -550,20 +574,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 -@@ -584,24 +600,20 @@ - - ps-am: + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS --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. +@@ -365,8 +367,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -376,13 +378,12 @@ + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique Index: pam.debian/modules/pam_succeed_if/Makefile.in =================================================================== --- pam.debian.orig/modules/pam_succeed_if/Makefile.in +++ pam.debian/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. ++# Makefile.in generated by automake 1.10.1 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. ++# 2003, 2004, 2005, 2006, 2007, 2008 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 @@ +@@ -67,7 +67,7 @@ pam_succeed_if_la_DEPENDENCIES = 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) ++DEFAULT_INCLUDES = -I.@am__isrc@ -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@ -@@ -108,11 +113,16 @@ +@@ -108,6 +108,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -19359,40 +6580,7 @@ Index: pam.debian/modules/pam_succeed_if/Makefile.in ECHO = @ECHO@ ECHO_C = @ECHO_C@ 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 +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@ -@@ -156,10 +177,10 @@ - LTLIBINTL = @LTLIBINTL@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ --MKDIR_P = @MKDIR_P@ +@@ -160,6 +161,7 @@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ @@ -19400,337 +6588,91 @@ Index: pam.debian/modules/pam_succeed_if/Makefile.in OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -@@ -178,6 +199,8 @@ - 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_succeed_if - TESTS = tst-pam_succeed_if -@@ -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)" +@@ -296,8 +298,8 @@ @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ -@@ -303,7 +322,7 @@ +- echo " $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \ + else :; fi; \ + done - uninstall-securelibLTLIBRARIES: +@@ -305,8 +307,8 @@ @$(NORMAL_UNINSTALL) -- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ -+ @set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ + @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_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) -@@ -329,22 +348,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 $@ $< -@@ -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"; \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \ 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 + clean-securelibLTLIBRARIES: +@@ -405,8 +407,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS --.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 +@@ -418,8 +420,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -429,13 +431,12 @@ + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique Index: pam.debian/modules/pam_tally/Makefile.in =================================================================== --- pam.debian.orig/modules/pam_tally/Makefile.in +++ pam.debian/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. ++# Makefile.in generated by automake 1.10.1 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. ++# 2003, 2004, 2005, 2006, 2007, 2008 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,26 +76,22 @@ - pam_tally_la_DEPENDENCIES = - 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) +@@ -80,7 +80,7 @@ am_pam_tally_OBJECTS = pam_tally_app.$(OBJEXT) pam_tally_OBJECTS = $(am_pam_tally_OBJECTS) pam_tally_DEPENDENCIES = -DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ -+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++DEFAULT_INCLUDES = -I.@am__isrc@ -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 -@@ -103,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@ -@@ -122,11 +124,16 @@ +@@ -122,6 +122,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -19738,40 +6680,7 @@ Index: pam.debian/modules/pam_tally/Makefile.in ECHO = @ECHO@ ECHO_C = @ECHO_C@ 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 +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@ -@@ -170,10 +188,10 @@ - LTLIBINTL = @LTLIBINTL@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ --MKDIR_P = @MKDIR_P@ +@@ -174,6 +175,7 @@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ @@ -19779,343 +6688,102 @@ Index: pam.debian/modules/pam_tally/Makefile.in OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -@@ -192,6 +210,8 @@ - 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@ - CLEANFILES = *~ - EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_tally - man_MANS = pam_tally.8 -@@ -310,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)" +@@ -314,8 +316,8 @@ @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ -@@ -321,7 +337,7 @@ +- echo " $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \ + else :; fi; \ + done - uninstall-securelibLTLIBRARIES: +@@ -323,8 +325,8 @@ @$(NORMAL_UNINSTALL) -- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ -+ @set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ + @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"; \ -@@ -336,10 +352,10 @@ - rm -f "$${dir}/so_locations"; \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \ 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 \ -@@ -367,7 +383,7 @@ - done - pam_tally$(EXEEXT): $(pam_tally_OBJECTS) $(pam_tally_DEPENDENCIES) - @rm -f pam_tally$(EXEEXT) -- $(LINK) $(pam_tally_OBJECTS) $(pam_tally_LDADD) $(LIBS) -+ $(LINK) $(pam_tally_LDFLAGS) $(pam_tally_OBJECTS) $(pam_tally_LDADD) $(LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) -@@ -379,22 +395,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 $@ $< -@@ -404,9 +420,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 \ -@@ -499,9 +519,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=./; \ -@@ -510,7 +530,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"; \ -@@ -522,7 +542,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"; \ - ;; \ -@@ -572,21 +592,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; \ -@@ -603,7 +624,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"; \ + clean-securelibLTLIBRARIES: +@@ -346,8 +348,8 @@ + || test -f $$p1 \ + ; then \ + f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ +- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(sbindir)/$$f'"; \ +- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(sbindir)/$$f" || exit 1; \ ++ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(sbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(sbindir)/$$f'"; \ ++ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(sbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(sbindir)/$$f" || exit 1; \ + else :; fi; \ done - install: install-am - install-exec: install-exec-am -@@ -639,7 +660,7 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - - dvi: dvi-am - -@@ -653,20 +674,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 -@@ -687,29 +700,25 @@ - - ps-am: - --uninstall-am: uninstall-man uninstall-sbinPROGRAMS \ -+uninstall-am: uninstall-info-am uninstall-man uninstall-sbinPROGRAMS \ - uninstall-securelibLTLIBRARIES - - uninstall-man: uninstall-man8 +@@ -455,8 +457,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS --.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 +@@ -468,8 +470,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -479,13 +481,12 @@ + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique Index: pam.debian/modules/pam_time/Makefile.in =================================================================== --- pam.debian.orig/modules/pam_time/Makefile.in +++ pam.debian/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. ++# Makefile.in generated by automake 1.10.1 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. ++# 2003, 2004, 2005, 2006, 2007, 2008 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 @@ +@@ -68,7 +68,7 @@ pam_time_la_DEPENDENCIES = 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) ++DEFAULT_INCLUDES = -I.@am__isrc@ -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@ -@@ -111,11 +116,16 @@ +@@ -111,6 +111,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -20123,40 +6791,7 @@ Index: pam.debian/modules/pam_time/Makefile.in ECHO = @ECHO@ ECHO_C = @ECHO_C@ 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 +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@ -@@ -159,10 +180,10 @@ - LTLIBINTL = @LTLIBINTL@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ --MKDIR_P = @MKDIR_P@ +@@ -163,6 +164,7 @@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ @@ -20164,348 +6799,91 @@ Index: pam.debian/modules/pam_time/Makefile.in OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -@@ -181,6 +202,8 @@ - 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) time.conf tst-pam_time - man_MANS = time.conf.5 pam_time.8 -@@ -298,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)" +@@ -302,8 +304,8 @@ @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ -@@ -309,7 +328,7 @@ +- echo " $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \ + else :; fi; \ + done - uninstall-securelibLTLIBRARIES: +@@ -311,8 +313,8 @@ @$(NORMAL_UNINSTALL) -- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ -+ @set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ + @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"; \ -@@ -324,7 +343,7 @@ - rm -f "$${dir}/so_locations"; \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \ 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) -@@ -335,22 +354,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 $@ $< -@@ -360,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 \ -@@ -407,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 \ -@@ -452,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) \ -@@ -517,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=./; \ -@@ -528,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"; \ -@@ -540,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"; \ - ;; \ -@@ -590,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; \ -@@ -621,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 -@@ -657,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 - -@@ -672,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 -@@ -706,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 + clean-securelibLTLIBRARIES: +@@ -473,8 +475,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS --.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 +@@ -486,8 +488,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -497,13 +499,12 @@ + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique Index: pam.debian/modules/pam_umask/Makefile.in =================================================================== --- pam.debian.orig/modules/pam_umask/Makefile.in +++ pam.debian/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. ++# Makefile.in generated by automake 1.10.1 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. ++# 2003, 2004, 2005, 2006, 2007, 2008 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 @@ +@@ -67,7 +67,7 @@ pam_umask_la_DEPENDENCIES = 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) ++DEFAULT_INCLUDES = -I.@am__isrc@ -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@ -@@ -108,11 +113,16 @@ +@@ -108,6 +108,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -20513,40 +6891,7 @@ Index: pam.debian/modules/pam_umask/Makefile.in ECHO = @ECHO@ ECHO_C = @ECHO_C@ 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 +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@ -@@ -156,10 +177,10 @@ - LTLIBINTL = @LTLIBINTL@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ --MKDIR_P = @MKDIR_P@ +@@ -160,6 +161,7 @@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ @@ -20554,295 +6899,82 @@ Index: pam.debian/modules/pam_umask/Makefile.in OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -@@ -178,6 +199,8 @@ - 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_umask - man_MANS = pam_umask.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)" +@@ -296,8 +298,8 @@ @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ -@@ -303,7 +322,7 @@ +- echo " $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \ + else :; fi; \ + done - uninstall-securelibLTLIBRARIES: +@@ -305,8 +307,8 @@ @$(NORMAL_UNINSTALL) -- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ -+ @set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ + @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_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) -@@ -329,22 +348,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 $@ $< -@@ -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"; \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \ 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 + clean-securelibLTLIBRARIES: +@@ -405,8 +407,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS --.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 +@@ -418,8 +420,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -429,13 +431,12 @@ + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique Index: pam.debian/modules/pam_unix/Makefile.in =================================================================== --- pam.debian.orig/modules/pam_unix/Makefile.in +++ pam.debian/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. ++# Makefile.in generated by automake 1.10.1 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. ++# 2003, 2004, 2005, 2006, 2007, 2008 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 -@@ -40,8 +44,7 @@ +@@ -40,8 +40,7 @@ build_triplet = @build@ host_triplet = @host@ @HAVE_LIBSELINUX_TRUE@am__append_1 = -D"WITH_SELINUX" @@ -20852,7 +6984,7 @@ Index: pam.debian/modules/pam_unix/Makefile.in sbin_PROGRAMS = unix_chkpwd$(EXEEXT) noinst_PROGRAMS = bigcrypt$(EXEEXT) subdir = modules/pam_unix -@@ -72,44 +75,34 @@ +@@ -72,10 +71,10 @@ "$(DESTDIR)$(man8dir)" securelibLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(securelib_LTLIBRARIES) @@ -20863,58 +6995,18 @@ Index: pam.debian/modules/pam_unix/Makefile.in - 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_DEPENDENCIES = --bigcrypt_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(bigcrypt_CFLAGS) $(CFLAGS) $(AM_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_DEPENDENCIES = --unix_chkpwd_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(unix_chkpwd_CFLAGS) \ -- $(CFLAGS) $(unix_chkpwd_LDFLAGS) $(LDFLAGS) -o $@ + pam_unix_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +@@ -98,7 +97,7 @@ + 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) ++DEFAULT_INCLUDES = -I.@am__isrc@ -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 +116,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@ -@@ -142,11 +137,16 @@ +@@ -142,6 +141,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -20922,40 +7014,7 @@ Index: pam.debian/modules/pam_unix/Makefile.in ECHO = @ECHO@ ECHO_C = @ECHO_C@ 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@ -@@ -190,10 +201,10 @@ - LTLIBINTL = @LTLIBINTL@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ --MKDIR_P = @MKDIR_P@ +@@ -194,6 +194,7 @@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ @@ -20963,54 +7022,7 @@ Index: pam.debian/modules/pam_unix/Makefile.in OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -@@ -212,6 +223,8 @@ - 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@ -@@ -225,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@ -@@ -243,7 +256,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - datadir = @datadir@ - datarootdir = @datarootdir@ - docdir = @docdir@ -@@ -274,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) -@@ -290,18 +299,18 @@ +@@ -290,18 +291,18 @@ secureconfdir = $(SCONFIGDIR) AM_CFLAGS = -I$(top_srcdir)/libpam/include \ -I$(top_srcdir)/libpamc/include \ @@ -21035,56 +7047,40 @@ Index: pam.debian/modules/pam_unix/Makefile.in bigcrypt_SOURCES = bigcrypt.c bigcrypt_main.c bigcrypt_CFLAGS = $(AM_CFLAGS) -@@ -346,7 +355,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)" +@@ -350,8 +351,8 @@ @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ -@@ -357,7 +366,7 @@ +- echo " $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \ + else :; fi; \ + done - uninstall-securelibLTLIBRARIES: +@@ -359,8 +360,8 @@ @$(NORMAL_UNINSTALL) -- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ -+ @set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ + @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"; \ -@@ -372,7 +381,7 @@ - rm -f "$${dir}/so_locations"; \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \ 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 \ -@@ -382,7 +391,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 \ -@@ -410,10 +419,10 @@ + clean-securelibLTLIBRARIES: +@@ -389,8 +390,8 @@ + || test -f $$p1 \ + ; then \ + f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ +- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(sbindir)/$$f'"; \ +- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(sbindir)/$$f" || exit 1; \ ++ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(sbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(sbindir)/$$f'"; \ ++ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(sbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(sbindir)/$$f" || exit 1; \ + else :; fi; \ 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) -@@ -426,6 +435,7 @@ + +@@ -426,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@ @@ -21092,367 +7088,69 @@ Index: pam.debian/modules/pam_unix/Makefile.in @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@ -@@ -438,106 +448,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` -@@ -547,9 +557,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 \ -@@ -642,9 +656,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=./; \ -@@ -653,7 +667,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"; \ -@@ -665,7 +679,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"; \ - ;; \ -@@ -715,21 +729,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; \ -@@ -746,7 +761,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 -@@ -782,7 +797,7 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - - dvi: dvi-am - -@@ -796,20 +811,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 -@@ -830,28 +837,24 @@ - - ps-am: - --uninstall-am: uninstall-man uninstall-sbinPROGRAMS \ -+uninstall-am: uninstall-info-am uninstall-man uninstall-sbinPROGRAMS \ - uninstall-securelibLTLIBRARIES - - uninstall-man: uninstall-man8 +@@ -598,8 +600,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS --.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 +@@ -611,8 +613,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -622,13 +624,12 @@ + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique Index: pam.debian/modules/pam_userdb/Makefile.in =================================================================== --- pam.debian.orig/modules/pam_userdb/Makefile.in +++ pam.debian/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. ++# Makefile.in generated by automake 1.10.1 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. ++# 2003, 2004, 2005, 2006, 2007, 2008 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 @@ +@@ -70,7 +70,7 @@ 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) ++DEFAULT_INCLUDES = -I.@am__isrc@ -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@ -@@ -112,11 +117,16 @@ +@@ -112,6 +112,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -21460,40 +7158,7 @@ Index: pam.debian/modules/pam_userdb/Makefile.in ECHO = @ECHO@ ECHO_C = @ECHO_C@ 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 +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@ -@@ -160,10 +181,10 @@ - LTLIBINTL = @LTLIBINTL@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ --MKDIR_P = @MKDIR_P@ +@@ -164,6 +165,7 @@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ @@ -21501,329 +7166,91 @@ Index: pam.debian/modules/pam_userdb/Makefile.in OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -@@ -182,6 +203,8 @@ - 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 $(MANS) $(XMLS) create.pl tst-pam_userdb - man_MANS = pam_userdb.8 -@@ -298,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)" +@@ -302,8 +304,8 @@ @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ -@@ -309,7 +328,7 @@ +- echo " $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \ + else :; fi; \ + done - uninstall-securelibLTLIBRARIES: +@@ -311,8 +313,8 @@ @$(NORMAL_UNINSTALL) -- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ -+ @set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ + @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"; \ -@@ -324,7 +343,7 @@ - rm -f "$${dir}/so_locations"; \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \ 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) -@@ -335,22 +354,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 $@ $< -@@ -360,9 +379,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 \ -@@ -455,9 +478,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=./; \ -@@ -466,7 +489,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"; \ -@@ -478,7 +501,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"; \ - ;; \ -@@ -528,21 +551,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; \ -@@ -559,7 +583,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 -@@ -595,7 +619,7 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - - dvi: dvi-am - -@@ -609,20 +633,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 -@@ -643,27 +659,24 @@ - - ps-am: - --uninstall-am: uninstall-man uninstall-securelibLTLIBRARIES -+uninstall-am: uninstall-info-am uninstall-man \ -+ uninstall-securelibLTLIBRARIES - - uninstall-man: uninstall-man8 + clean-securelibLTLIBRARIES: +@@ -411,8 +413,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS --.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 +@@ -424,8 +426,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -435,13 +437,12 @@ + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique Index: pam.debian/modules/pam_warn/Makefile.in =================================================================== --- pam.debian.orig/modules/pam_warn/Makefile.in +++ pam.debian/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. ++# Makefile.in generated by automake 1.10.1 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. ++# 2003, 2004, 2005, 2006, 2007, 2008 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 @@ +@@ -67,7 +67,7 @@ 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) ++DEFAULT_INCLUDES = -I.@am__isrc@ -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@ -@@ -108,11 +113,16 @@ +@@ -108,6 +108,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -21831,40 +7258,7 @@ Index: pam.debian/modules/pam_warn/Makefile.in ECHO = @ECHO@ ECHO_C = @ECHO_C@ 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 +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@ -@@ -156,10 +177,10 @@ - LTLIBINTL = @LTLIBINTL@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ --MKDIR_P = @MKDIR_P@ +@@ -160,6 +161,7 @@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ @@ -21872,329 +7266,91 @@ Index: pam.debian/modules/pam_warn/Makefile.in OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -@@ -178,6 +199,8 @@ - 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_warn - man_MANS = pam_warn.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)" +@@ -296,8 +298,8 @@ @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ -@@ -303,7 +322,7 @@ +- echo " $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \ + else :; fi; \ + done - uninstall-securelibLTLIBRARIES: +@@ -305,8 +307,8 @@ @$(NORMAL_UNINSTALL) -- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ -+ @set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ + @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"; \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \ 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) -@@ -329,22 +348,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 $@ $< -@@ -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 + clean-securelibLTLIBRARIES: +@@ -405,8 +407,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS --.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 +@@ -418,8 +420,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -429,13 +431,12 @@ + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique Index: pam.debian/modules/pam_wheel/Makefile.in =================================================================== --- pam.debian.orig/modules/pam_wheel/Makefile.in +++ pam.debian/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. ++# Makefile.in generated by automake 1.10.1 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. ++# 2003, 2004, 2005, 2006, 2007, 2008 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 @@ +@@ -67,7 +67,7 @@ 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) ++DEFAULT_INCLUDES = -I.@am__isrc@ -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@ -@@ -108,11 +113,16 @@ +@@ -108,6 +108,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -22202,40 +7358,7 @@ Index: pam.debian/modules/pam_wheel/Makefile.in ECHO = @ECHO@ ECHO_C = @ECHO_C@ 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 +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@ -@@ -156,10 +177,10 @@ - LTLIBINTL = @LTLIBINTL@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ --MKDIR_P = @MKDIR_P@ +@@ -160,6 +161,7 @@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ @@ -22243,329 +7366,91 @@ Index: pam.debian/modules/pam_wheel/Makefile.in OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -@@ -178,6 +199,8 @@ - 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_wheel - man_MANS = pam_wheel.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)" +@@ -296,8 +298,8 @@ @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ -@@ -303,7 +322,7 @@ +- echo " $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \ + else :; fi; \ + done - uninstall-securelibLTLIBRARIES: +@@ -305,8 +307,8 @@ @$(NORMAL_UNINSTALL) -- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ -+ @set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ + @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"; \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \ 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) -@@ -329,22 +348,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 $@ $< -@@ -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 + clean-securelibLTLIBRARIES: +@@ -405,8 +407,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS --.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 +@@ -418,8 +420,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -429,13 +431,12 @@ + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique Index: pam.debian/modules/pam_xauth/Makefile.in =================================================================== --- pam.debian.orig/modules/pam_xauth/Makefile.in +++ pam.debian/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. ++# Makefile.in generated by automake 1.10.1 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. ++# 2003, 2004, 2005, 2006, 2007, 2008 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 @@ +@@ -67,7 +67,7 @@ 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) ++DEFAULT_INCLUDES = -I.@am__isrc@ -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@ -@@ -108,11 +113,16 @@ +@@ -108,6 +108,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -22573,40 +7458,7 @@ Index: pam.debian/modules/pam_xauth/Makefile.in ECHO = @ECHO@ ECHO_C = @ECHO_C@ 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 +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@ -@@ -156,10 +177,10 @@ - LTLIBINTL = @LTLIBINTL@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ --MKDIR_P = @MKDIR_P@ +@@ -160,6 +161,7 @@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ @@ -22614,343 +7466,91 @@ Index: pam.debian/modules/pam_xauth/Makefile.in OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -@@ -178,6 +199,8 @@ - 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_xauth - man_MANS = pam_xauth.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)" +@@ -296,8 +298,8 @@ @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ -@@ -303,7 +322,7 @@ +- echo " $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \ + else :; fi; \ + done - uninstall-securelibLTLIBRARIES: +@@ -305,8 +307,8 @@ @$(NORMAL_UNINSTALL) -- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ -+ @set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ + @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"; \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \ 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) -@@ -329,22 +348,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 $@ $< -@@ -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 + clean-securelibLTLIBRARIES: +@@ -405,8 +407,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS --.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 +@@ -418,8 +420,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -429,13 +431,12 @@ + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique Index: pam.debian/tests/Makefile.in =================================================================== --- pam.debian.orig/tests/Makefile.in +++ pam.debian/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. ++# Makefile.in generated by automake 1.10.1 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. ++# 2003, 2004, 2005, 2006, 2007, 2008 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 -@@ -126,18 +123,17 @@ +@@ -126,7 +126,7 @@ tst_pam_start_OBJECTS = tst-pam_start.$(OBJEXT) tst_pam_start_LDADD = $(LDADD) tst_pam_start_DEPENDENCIES = -DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ -+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++DEFAULT_INCLUDES = -I.@am__isrc@ -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 \ -@@ -152,6 +148,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@ -@@ -171,11 +169,16 @@ +@@ -171,6 +171,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -22958,40 +7558,7 @@ Index: pam.debian/tests/Makefile.in ECHO = @ECHO@ ECHO_C = @ECHO_C@ 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@ -@@ -184,7 +187,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@ -@@ -219,10 +233,10 @@ - LTLIBINTL = @LTLIBINTL@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ --MKDIR_P = @MKDIR_P@ +@@ -223,6 +224,7 @@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ @@ -22999,358 +7566,69 @@ Index: pam.debian/tests/Makefile.in OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -@@ -241,6 +255,8 @@ - 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@ -@@ -254,13 +270,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@ -@@ -272,7 +288,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - datadir = @datadir@ - datarootdir = @datarootdir@ - docdir = @docdir@ -@@ -303,16 +318,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 - - LDADD = -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 = -ldl - all: all-am - -@@ -356,49 +373,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) -@@ -423,22 +440,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 $@ $< -@@ -449,6 +466,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)'; \ +@@ -454,8 +456,8 @@ unique=`for i in $$list; do \ -@@ -498,9 +519,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=./; \ -@@ -509,7 +530,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"; \ -@@ -521,7 +542,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"; \ - ;; \ -@@ -571,21 +592,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; \ -@@ -636,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 - -@@ -650,20 +672,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 -@@ -684,23 +698,19 @@ - - ps-am: + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS --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. +@@ -467,8 +469,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -478,13 +480,12 @@ + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique Index: pam.debian/xtests/Makefile.in =================================================================== --- pam.debian.orig/xtests/Makefile.in +++ pam.debian/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. ++# Makefile.in generated by automake 1.10.1 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. ++# 2003, 2004, 2005, 2006, 2007, 2008 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 -@@ -111,18 +115,17 @@ +@@ -111,7 +111,7 @@ tst_pam_unix3_SOURCES = tst-pam_unix3.c tst_pam_unix3_OBJECTS = tst-pam_unix3.$(OBJEXT) tst_pam_unix3_LDADD = $(LDADD) -DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ -+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ++DEFAULT_INCLUDES = -I.@am__isrc@ -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_access1.c tst-pam_access2.c tst-pam_access3.c \ - tst-pam_access4.c tst-pam_cracklib1.c tst-pam_cracklib2.c \ - tst-pam_dispatch1.c tst-pam_dispatch2.c tst-pam_dispatch3.c \ -@@ -139,6 +142,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@ -@@ -158,11 +163,16 @@ +@@ -158,6 +158,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -23358,40 +7636,7 @@ Index: pam.debian/xtests/Makefile.in ECHO = @ECHO@ ECHO_C = @ECHO_C@ 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@ -@@ -171,7 +181,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@ -@@ -206,10 +227,10 @@ - LTLIBINTL = @LTLIBINTL@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ --MKDIR_P = @MKDIR_P@ +@@ -210,6 +211,7 @@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ @@ -23399,253 +7644,41 @@ Index: pam.debian/xtests/Makefile.in OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -@@ -228,6 +249,8 @@ - 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@ -@@ -241,13 +264,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@ -@@ -259,7 +282,6 @@ - build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ --builddir = @builddir@ - datadir = @datadir@ - datarootdir = @datarootdir@ - docdir = @docdir@ -@@ -290,11 +312,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 - -@@ -364,52 +383,52 @@ - done - tst-pam_access1$(EXEEXT): $(tst_pam_access1_OBJECTS) $(tst_pam_access1_DEPENDENCIES) - @rm -f tst-pam_access1$(EXEEXT) -- $(LINK) $(tst_pam_access1_OBJECTS) $(tst_pam_access1_LDADD) $(LIBS) -+ $(LINK) $(tst_pam_access1_LDFLAGS) $(tst_pam_access1_OBJECTS) $(tst_pam_access1_LDADD) $(LIBS) - tst-pam_access2$(EXEEXT): $(tst_pam_access2_OBJECTS) $(tst_pam_access2_DEPENDENCIES) - @rm -f tst-pam_access2$(EXEEXT) -- $(LINK) $(tst_pam_access2_OBJECTS) $(tst_pam_access2_LDADD) $(LIBS) -+ $(LINK) $(tst_pam_access2_LDFLAGS) $(tst_pam_access2_OBJECTS) $(tst_pam_access2_LDADD) $(LIBS) - tst-pam_access3$(EXEEXT): $(tst_pam_access3_OBJECTS) $(tst_pam_access3_DEPENDENCIES) - @rm -f tst-pam_access3$(EXEEXT) -- $(LINK) $(tst_pam_access3_OBJECTS) $(tst_pam_access3_LDADD) $(LIBS) -+ $(LINK) $(tst_pam_access3_LDFLAGS) $(tst_pam_access3_OBJECTS) $(tst_pam_access3_LDADD) $(LIBS) - tst-pam_access4$(EXEEXT): $(tst_pam_access4_OBJECTS) $(tst_pam_access4_DEPENDENCIES) - @rm -f tst-pam_access4$(EXEEXT) -- $(LINK) $(tst_pam_access4_OBJECTS) $(tst_pam_access4_LDADD) $(LIBS) -+ $(LINK) $(tst_pam_access4_LDFLAGS) $(tst_pam_access4_OBJECTS) $(tst_pam_access4_LDADD) $(LIBS) - 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_cracklib2$(EXEEXT): $(tst_pam_cracklib2_OBJECTS) $(tst_pam_cracklib2_DEPENDENCIES) - @rm -f tst-pam_cracklib2$(EXEEXT) -- $(LINK) $(tst_pam_cracklib2_OBJECTS) $(tst_pam_cracklib2_LDADD) $(LIBS) -+ $(LINK) $(tst_pam_cracklib2_LDFLAGS) $(tst_pam_cracklib2_OBJECTS) $(tst_pam_cracklib2_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) - tst-pam_group1$(EXEEXT): $(tst_pam_group1_OBJECTS) $(tst_pam_group1_DEPENDENCIES) - @rm -f tst-pam_group1$(EXEEXT) -- $(LINK) $(tst_pam_group1_OBJECTS) $(tst_pam_group1_LDADD) $(LIBS) -+ $(LINK) $(tst_pam_group1_LDFLAGS) $(tst_pam_group1_OBJECTS) $(tst_pam_group1_LDADD) $(LIBS) - tst-pam_limits1$(EXEEXT): $(tst_pam_limits1_OBJECTS) $(tst_pam_limits1_DEPENDENCIES) - @rm -f tst-pam_limits1$(EXEEXT) -- $(LINK) $(tst_pam_limits1_OBJECTS) $(tst_pam_limits1_LDADD) $(LIBS) -+ $(LINK) $(tst_pam_limits1_LDFLAGS) $(tst_pam_limits1_OBJECTS) $(tst_pam_limits1_LDADD) $(LIBS) - tst-pam_succeed_if1$(EXEEXT): $(tst_pam_succeed_if1_OBJECTS) $(tst_pam_succeed_if1_DEPENDENCIES) - @rm -f tst-pam_succeed_if1$(EXEEXT) -- $(LINK) $(tst_pam_succeed_if1_OBJECTS) $(tst_pam_succeed_if1_LDADD) $(LIBS) -+ $(LINK) $(tst_pam_succeed_if1_LDFLAGS) $(tst_pam_succeed_if1_OBJECTS) $(tst_pam_succeed_if1_LDADD) $(LIBS) - tst-pam_unix1$(EXEEXT): $(tst_pam_unix1_OBJECTS) $(tst_pam_unix1_DEPENDENCIES) - @rm -f tst-pam_unix1$(EXEEXT) -- $(LINK) $(tst_pam_unix1_OBJECTS) $(tst_pam_unix1_LDADD) $(LIBS) -+ $(LINK) $(tst_pam_unix1_LDFLAGS) $(tst_pam_unix1_OBJECTS) $(tst_pam_unix1_LDADD) $(LIBS) - tst-pam_unix2$(EXEEXT): $(tst_pam_unix2_OBJECTS) $(tst_pam_unix2_DEPENDENCIES) - @rm -f tst-pam_unix2$(EXEEXT) -- $(LINK) $(tst_pam_unix2_OBJECTS) $(tst_pam_unix2_LDADD) $(LIBS) -+ $(LINK) $(tst_pam_unix2_LDFLAGS) $(tst_pam_unix2_OBJECTS) $(tst_pam_unix2_LDADD) $(LIBS) - tst-pam_unix3$(EXEEXT): $(tst_pam_unix3_OBJECTS) $(tst_pam_unix3_DEPENDENCIES) - @rm -f tst-pam_unix3$(EXEEXT) -- $(LINK) $(tst_pam_unix3_OBJECTS) $(tst_pam_unix3_LDADD) $(LIBS) -+ $(LINK) $(tst_pam_unix3_LDFLAGS) $(tst_pam_unix3_OBJECTS) $(tst_pam_unix3_LDADD) $(LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) -@@ -435,22 +454,22 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tst-pam_unix3.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 $@ $< -@@ -461,6 +480,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)'; \ +@@ -466,8 +468,8 @@ unique=`for i in $$list; do \ -@@ -510,21 +533,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; \ -@@ -573,7 +597,7 @@ - -rm -rf ./$(DEPDIR) - -rm -f Makefile - distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-tags -+ distclean-libtool distclean-tags - - dvi: dvi-am - -@@ -587,20 +611,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 -@@ -621,22 +637,19 @@ - - ps-am: + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS --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 +@@ -479,8 +481,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -490,13 +492,12 @@ + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ +- here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ ++ END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique |