From e0504e0fcc40f29f3c9ec165bf2d6d40489542dd Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Thu, 3 Sep 2009 16:00:43 -0700 Subject: use dh_listpackages instead of DH_INTERNAL_OPTIONS, per Joey --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/rules b/debian/rules index b0c0e1ca..e5f8ffbe 100755 --- a/debian/rules +++ b/debian/rules @@ -49,7 +49,7 @@ override_dh_installman: # dh_fixperms doesn't want override_dh_fixperms: dh_fixperms -ifeq (,$(findstring -i, $(DH_INTERNAL_OPTIONS))) +ifeq (,$(findstring libpam-modules, $(shell dh_listpackages))) chgrp shadow $(d)/libpam-modules/sbin/unix_chkpwd chmod 02755 $(d)/libpam-modules/sbin/unix_chkpwd endif -- cgit v1.2.3 From f27f8b1bd4906cd4c4050d64e53bc00ccfb6047b Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Thu, 3 Sep 2009 16:39:53 -0700 Subject: Drop dh_makeshlibs -V; everything from lenny on should use the .symbols file instead, making the shlibs redundant so we don't need to care what version gets listed there. --- debian/changelog | 3 +++ debian/rules | 6 ------ 2 files changed, 3 insertions(+), 6 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 95bfc702..2a4857e9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,6 +24,9 @@ pam (1.1.0-3) UNRELEASED; urgency=low library linkage in the modules. * Move pam_cracklib manpage to the libpam-cracklib package, and add the requisite Replaces + * Drop dh_makeshlibs -V; everything from lenny on should use the .symbols + file instead, making the shlibs redundant so we don't need to care what + version gets listed there. -- Steve Langasek Tue, 01 Sep 2009 22:23:47 -0700 diff --git a/debian/rules b/debian/rules index e5f8ffbe..bb26739c 100755 --- a/debian/rules +++ b/debian/rules @@ -53,9 +53,3 @@ ifeq (,$(findstring libpam-modules, $(shell dh_listpackages))) chgrp shadow $(d)/libpam-modules/sbin/unix_chkpwd chmod 02755 $(d)/libpam-modules/sbin/unix_chkpwd endif - -# ideally, dh_makeshlibs could compute this from the symbols file; or we -# could drop it since anyone building against this package should have a -# dpkg-shlibdeps available that knows about symbols files? -override_dh_makeshlibs: - dh_makeshlibs -V "libpam0g (>= 1.1.0)" -- cgit v1.2.3 From b3bbdebae5e1a22ef9a98e3b6eccd3dedc0f3212 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Mon, 7 Sep 2009 11:48:03 -0700 Subject: guard the other libpam-modules-specific bit, and get the sense of the dh_listpackages check right --- debian/rules | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/rules b/debian/rules index bb26739c..d8cc37ed 100755 --- a/debian/rules +++ b/debian/rules @@ -34,7 +34,9 @@ override_dh_compress: # .install files don't have "except for" handling, so we need to exclude # our module that doesn't match right here override_dh_install: +ifneq (,$(findstring libpam-modules, $(shell dh_listpackages))) dh_install -plibpam-modules -Xpam_cracklib +endif dh_install -Nlibpam-modules # again, excluding files by hand; also, build our local manpage for pam_getenv @@ -49,7 +51,7 @@ override_dh_installman: # dh_fixperms doesn't want override_dh_fixperms: dh_fixperms -ifeq (,$(findstring libpam-modules, $(shell dh_listpackages))) +ifneq (,$(findstring libpam-modules, $(shell dh_listpackages))) chgrp shadow $(d)/libpam-modules/sbin/unix_chkpwd chmod 02755 $(d)/libpam-modules/sbin/unix_chkpwd endif -- cgit v1.2.3 From 317a18674abe5024e9690b9488d9ede415ff3622 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Mon, 7 Sep 2009 18:47:56 -0700 Subject: releasing version 1.1.0-3 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 2a4857e9..f75d1e5f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -pam (1.1.0-3) UNRELEASED; urgency=low +pam (1.1.0-3) unstable; urgency=low * Bump debian/compat to 7, so we can use sane contents in debian/*.install * Switch all packages over to dh_install @@ -28,7 +28,7 @@ pam (1.1.0-3) UNRELEASED; urgency=low file instead, making the shlibs redundant so we don't need to care what version gets listed there. - -- Steve Langasek Tue, 01 Sep 2009 22:23:47 -0700 + -- Steve Langasek Mon, 07 Sep 2009 18:47:45 -0700 pam (1.1.0-2) unstable; urgency=low -- cgit v1.2.3 From c47d70c3fbfe9a26150323751e7c935f37dc21b8 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Thu, 10 Sep 2009 03:25:42 -0700 Subject: =?UTF-8?q?debian/patches/pam=5Fsecuretty=5Ftty=5Fcheck=5Fbefore?= =?UTF-8?q?=5Fuser=5Fcheck:=20new=20patch,=20to=20make=20pam=5Fsecuretty?= =?UTF-8?q?=20always=20return=20success=20on=20a=20secure=20tty=20regardle?= =?UTF-8?q?ss=20of=20what=20username=20was=20passed.=20=20Thanks=20to=20Ni?= =?UTF-8?q?colas=20Fran=C3=A7ois=20=20fo?= =?UTF-8?q?r=20the=20patch.=20=20Closes:=20#537848?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- debian/changelog | 9 +++++ .../pam_securetty_tty_check_before_user_check | 40 ++++++++++++++++++++++ debian/patches-applied/series | 1 + 3 files changed, 50 insertions(+) create mode 100644 debian/patches-applied/pam_securetty_tty_check_before_user_check (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index f75d1e5f..7e03fb7a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +pam (1.1.0-4) UNRELEASED; urgency=low + + * debian/patches/pam_securetty_tty_check_before_user_check: new patch, + to make pam_securetty always return success on a secure tty regardless + of what username was passed. Thanks to Nicolas François + for the patch. Closes: #537848 + + -- Steve Langasek Thu, 10 Sep 2009 03:20:33 -0700 + pam (1.1.0-3) unstable; urgency=low * Bump debian/compat to 7, so we can use sane contents in debian/*.install diff --git a/debian/patches-applied/pam_securetty_tty_check_before_user_check b/debian/patches-applied/pam_securetty_tty_check_before_user_check new file mode 100644 index 00000000..5f976ab5 --- /dev/null +++ b/debian/patches-applied/pam_securetty_tty_check_before_user_check @@ -0,0 +1,40 @@ +Patch for Debian bug #537848 + +pam_securetty should not return PAM_USER_UNKNOWN when the tty is secure. +regardless of what was entered as a username. + +Authors: Nicolas François + +Upstream status: committed to CVS + +Index: sid/modules/pam_securetty/pam_securetty.c +=================================================================== +--- sid.orig/modules/pam_securetty/pam_securetty.c 2009-07-23 17:39:36.904158303 +0200 ++++ sid/modules/pam_securetty/pam_securetty.c 2009-07-23 17:48:55.596157670 +0200 +@@ -82,13 +82,11 @@ + } + + user_pwd = pam_modutil_getpwnam(pamh, username); +- if (user_pwd == NULL) { +- return PAM_USER_UNKNOWN; +- } else if (user_pwd->pw_uid != 0) { /* If the user is not root, +- securetty's does not apply +- to them */ ++ if (user_pwd != NULL && user_pwd->pw_uid != 0) { ++ /* If the user is not root, securetty's does not apply to them */ + return PAM_SUCCESS; + } ++ /* The user is now either root or an invalid / mistyped username */ + + retval = pam_get_item(pamh, PAM_TTY, &void_uttyname); + uttyname = void_uttyname; +@@ -102,6 +100,9 @@ + pam_syslog(pamh, LOG_DEBUG, "access allowed for '%s' on '%s'", + username, uttyname); + } else if (retval != PAM_SUCCESS) { ++ if (user_pwd == NULL) { ++ retval = PAM_USER_UNKNOWN; ++ } + pam_syslog(pamh, LOG_WARNING, "access denied: tty '%s' is not secure !", + uttyname); + } diff --git a/debian/patches-applied/series b/debian/patches-applied/series index e7f8120c..dde1da8f 100644 --- a/debian/patches-applied/series +++ b/debian/patches-applied/series @@ -21,3 +21,4 @@ autoconf.patch update-motd fix-man-crud namespace_with_awk_not_gawk +pam_securetty_tty_check_before_user_check -- cgit v1.2.3 From 6e4cf2ad59d9985eedd1f4d77351cdd0156586fb Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Sat, 12 Sep 2009 15:18:44 -0700 Subject: debian/local/pam-auth-update: only reset the seen flag on the template when there's new information; this avoids reprompting users for the same information on upgrade, regardless of the debconf priority used. Closes: #544805. --- debian/changelog | 4 ++++ debian/local/pam-auth-update | 25 ++++++++++++++++++------- 2 files changed, 22 insertions(+), 7 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 7e03fb7a..cd50eb8a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,10 @@ pam (1.1.0-4) UNRELEASED; urgency=low to make pam_securetty always return success on a secure tty regardless of what username was passed. Thanks to Nicolas François for the patch. Closes: #537848 + * debian/local/pam-auth-update: only reset the seen flag on the template + when there's new information; this avoids reprompting users for the same + information on upgrade, regardless of the debconf priority used. + Closes: #544805. -- Steve Langasek Thu, 10 Sep 2009 03:20:33 -0700 diff --git a/debian/local/pam-auth-update b/debian/local/pam-auth-update index acfb4002..1a1a452d 100755 --- a/debian/local/pam-auth-update +++ b/debian/local/pam-auth-update @@ -38,8 +38,9 @@ my $overridetemplate = 'libpam-runtime/override'; my $blanktemplate = 'libpam-runtime/no_profiles_chosen'; my $confdir = '/etc/pam.d'; my $savedir = '/var/lib/pam'; -my (%profiles, @sorted, @enabled, @conflicts, %removals); +my (%profiles, @sorted, @enabled, @conflicts, @new, %removals); my $force = 0; +my $package = 0; my $priority = 'high'; my %md5sums = ( 'auth' => ['8d4fe17e66ba25de16a117035d1396aa'], @@ -79,17 +80,19 @@ while ($#ARGV >= 0) { if ($opt eq '--force') { $force = 1; } elsif ($opt eq '--package') { - $priority = 'medium'; + $package = 1; } elsif ($opt eq '--remove') { while ($#ARGV >= 0) { last if ($ARGV[0] =~ /^--/); $removals{shift @ARGV} = 1; } # --remove implies --package - $priority = 'medium' if (keys(%removals)); + $package = 1 if (keys(%removals)); } } +$priority = 'medium' if ($package); + x_loadtemplatefile('/var/lib/dpkg/info/libpam-runtime.templates','libpam-runtime'); # always sort by priority, so we have consistency and don't have to @@ -141,9 +144,9 @@ push(@enabled, my $prev = ''; @enabled = grep { $_ ne $prev && (($prev) = $_) } @enabled; - -fset($template,'seen','false'); -set($template,join(', ', @enabled)); +# Do we have any new options to show? If not, we shouldn't reprompt the +# user, at any priority level, unless explicitly called. +@new = grep { !$seen{$_} } @sorted; # if diff_profiles() fails, and we weren't passed a 'force' argument # (because this isn't an upgrade from an old version, or the checksum @@ -170,6 +173,12 @@ umask(0022); do { @conflicts = (); + + if (@new || !$package) { + fset($template,'seen','false'); + } + set($template,join(', ', @enabled)); + input($priority,$template); go(); @@ -194,10 +203,12 @@ do { subst($errtemplate, 'conflicts', join("\n", @conflicts)); input('high',$errtemplate); } - fset($template,'seen','false'); set($template, join(', ', @enabled)); if (!@enabled) { input('high',$blanktemplate); + # we can only end up here by user error, but give them another + # shot at selecting a correct config anyway. + fset($template,'seen','false'); } } while (@conflicts || !@enabled); -- cgit v1.2.3 From 3c412248afdc0993273644694fa02d706f61f74d Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Sat, 12 Sep 2009 15:28:12 -0700 Subject: libpam0g no longer depends on libpam-runtime; packages that use /etc/pam.d/common-* must depend directly on libpam-runtime, and most do (including the Essential: yes ones), so let's break this circular dependency. Closes: #545086, LP: #424566. --- debian/changelog | 4 ++++ debian/control | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index cd50eb8a..fc406222 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,10 @@ pam (1.1.0-4) UNRELEASED; urgency=low when there's new information; this avoids reprompting users for the same information on upgrade, regardless of the debconf priority used. Closes: #544805. + * libpam0g no longer depends on libpam-runtime; packages that use + /etc/pam.d/common-* must depend directly on libpam-runtime, and most do + (including the Essential: yes ones), so let's break this circular + dependency. Closes: #545086, LP: #424566. -- Steve Langasek Thu, 10 Sep 2009 03:20:33 -0700 diff --git a/debian/control b/debian/control index ad3223a8..bd65eda2 100644 --- a/debian/control +++ b/debian/control @@ -15,7 +15,7 @@ Package: libpam0g Priority: required Architecture: any Replaces: libpam0g-util -Depends: ${shlibs:Depends}, ${misc:Depends}, libpam-runtime +Depends: ${shlibs:Depends}, ${misc:Depends} Suggests: libpam-doc Description: Pluggable Authentication Modules library Contains the C shared library for Linux-PAM, a suite of shared -- cgit v1.2.3 From add00ae2708d60a45419d7a34324c389e8123691 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Mon, 14 Sep 2009 18:47:30 -0700 Subject: releasing version 1.1.0-4 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index fc406222..fcc5e058 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -pam (1.1.0-4) UNRELEASED; urgency=low +pam (1.1.0-4) unstable; urgency=low * debian/patches/pam_securetty_tty_check_before_user_check: new patch, to make pam_securetty always return success on a secure tty regardless @@ -13,7 +13,7 @@ pam (1.1.0-4) UNRELEASED; urgency=low (including the Essential: yes ones), so let's break this circular dependency. Closes: #545086, LP: #424566. - -- Steve Langasek Thu, 10 Sep 2009 03:20:33 -0700 + -- Steve Langasek Mon, 14 Sep 2009 18:47:25 -0700 pam (1.1.0-3) unstable; urgency=low -- cgit v1.2.3 From f1c23e5217a17cd9588d48e654e378ec96064d98 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Wed, 16 Sep 2009 15:26:10 -0700 Subject: * Updated debconf translations: - French, thanks to Jean-Baka Domelevo Entfellner (closes: #547039) --- debian/changelog | 8 ++++++++ debian/po/fr.po | 27 ++++++++++++++++++++++----- 2 files changed, 30 insertions(+), 5 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index fcc5e058..7f5b63d7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +pam (1.1.0-5) UNRELEASED; urgency=low + + * Updated debconf translations: + - French, thanks to Jean-Baka Domelevo Entfellner + (closes: #547039) + + -- Steve Langasek Wed, 16 Sep 2009 15:25:40 -0700 + pam (1.1.0-4) unstable; urgency=low * debian/patches/pam_securetty_tty_check_before_user_check: new patch, diff --git a/debian/po/fr.po b/debian/po/fr.po index fe38922b..95fe6e8e 100644 --- a/debian/po/fr.po +++ b/debian/po/fr.po @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: pam\n" "Report-Msgid-Bugs-To: pam@packages.debian.org\n" "POT-Creation-Date: 2009-08-18 18:30-0700\n" -"PO-Revision-Date: 2009-03-26 11:21+0100\n" -"Last-Translator: Jean-Baka Domelevo Entfellner \n" +"PO-Revision-Date: 2009-09-16 22:59+0100\n" +"Last-Translator: Jean-Baka Domelevo-Entfellner \n" "Language-Team: French \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -164,9 +164,8 @@ msgstr "" #. Type: error #. Description #: ../libpam-runtime.templates:4001 -#, fuzzy msgid "No PAM profiles have been selected." -msgstr "Profils PAM incompatibles" +msgstr "Aucun profil PAM n'a été choisi." #. Type: error #. Description @@ -176,12 +175,16 @@ msgid "" "all users access without authenticating, and is not allowed. Please select " "at least one PAM profile from the available list." msgstr "" +"Aucun profil PAM n'a été mis en place pour ce système. N'en utiliser aucun " +"donnerait à tous les utilisateurs un accès sans authentification, ce qui " +"n'est pas autorisé. Merci de bien vouloir choisir au moins un profil PAM " +"dans la liste proposée." #. Type: error #. Description #: ../libpam-runtime.templates:5001 msgid "Your system allowed access without a password!" -msgstr "" +msgstr "Votre système a autorisé un accès sans mot de passe !" #. Type: error #. Description @@ -196,6 +199,16 @@ msgid "" "this system from scratch or obtain the services of a skilled system " "administrator. For more information, see:" msgstr "" +"À cause d'un bogue dans une version précédente de libpam-runtime, aucun " +"profil PAM n'a été mis en place sur ce système. Ainsi, pendant un certain " +"temps, l'accès à votre machine a été autorisé pour tous les utilisateurs, " +"avec ou sans mot de passe valide. Tout spécialement si ce système est " +"accessible depuis Internet, il est vraisemblable qu'il aura été l'objet " +"d'une attaque. À moins que vous ne soyez à l'aise avec la récupération d'un " +"système victime d'une faille de sécurité, de virus ou de logiciels " +"malveillants, nous vous recommandons de réinstaller complètement le système " +"ou de recourir aux services d'un administrateur système compétent. Pour plus " +"d'informations, lire :" #. Type: error #. Description @@ -206,6 +219,10 @@ msgid "" "apologize that previous versions of libpam-runtime did not detect and " "prevent this situation." msgstr "" +"Le bogue autorisant cette configuration erronée a été corrigé dans la " +"version actuelle de libpam-runtime, et votre configuration a maintenant été " +"rétablie. Nous tenons à nous excuser pour le fait que les versions " +"précédentes de libpam-runtime n'aient pas détecté et empêché cette situation." #. Type: error #. Description -- cgit v1.2.3 From c90534619a36ab6d202b79a70626e9524d93085f Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Sun, 22 Nov 2009 00:39:17 -0600 Subject: debian/patches/sys-types-include.patch: fix pam_modutil.h so that it can be included directly, without having to include sys/types.h first. Closes: #556203. --- debian/changelog | 3 +++ debian/patches-applied/series | 1 + debian/patches-applied/sys-types-include.patch | 21 +++++++++++++++++++++ 3 files changed, 25 insertions(+) create mode 100644 debian/patches-applied/sys-types-include.patch (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 7f5b63d7..1b1ba96c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,9 @@ pam (1.1.0-5) UNRELEASED; urgency=low * Updated debconf translations: - French, thanks to Jean-Baka Domelevo Entfellner (closes: #547039) + * debian/patches/sys-types-include.patch: fix pam_modutil.h so that it can + be included directly, without having to include sys/types.h first. + Closes: #556203. -- Steve Langasek Wed, 16 Sep 2009 15:25:40 -0700 diff --git a/debian/patches-applied/series b/debian/patches-applied/series index dde1da8f..bf13a538 100644 --- a/debian/patches-applied/series +++ b/debian/patches-applied/series @@ -22,3 +22,4 @@ update-motd fix-man-crud namespace_with_awk_not_gawk pam_securetty_tty_check_before_user_check +sys-types-include.patch diff --git a/debian/patches-applied/sys-types-include.patch b/debian/patches-applied/sys-types-include.patch new file mode 100644 index 00000000..fbcb70d3 --- /dev/null +++ b/debian/patches-applied/sys-types-include.patch @@ -0,0 +1,21 @@ +Patch for Debian bug #556203 + +pam_modutil.h should include sys/types.h, so that it stands alone without +callers having to do additional busywork. + +Authors: Russ Allbery + +Upstream status: not yet submitted + +Index: pam.debian/libpam/include/security/pam_modutil.h +=================================================================== +--- pam.debian.orig/libpam/include/security/pam_modutil.h ++++ pam.debian/libpam/include/security/pam_modutil.h +@@ -51,6 +51,7 @@ + extern "C" { + #endif + ++#include + #include + + extern struct passwd * PAM_NONNULL((1,2)) -- cgit v1.2.3 From 3e8164234c494ef8aef88f1f59acf2218c40cf28 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Mon, 28 Dec 2009 14:36:50 -0800 Subject: Bulgarian, thanks to Damyan Ivanov (closes: #562835) --- debian/changelog | 1 + debian/po/bg.po | 20 +++++++++++++++----- 2 files changed, 16 insertions(+), 5 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 1b1ba96c..46eedb29 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ pam (1.1.0-5) UNRELEASED; urgency=low * Updated debconf translations: - French, thanks to Jean-Baka Domelevo Entfellner (closes: #547039) + - Bulgarian, thanks to Damyan Ivanov (closes: #562835) * debian/patches/sys-types-include.patch: fix pam_modutil.h so that it can be included directly, without having to include sys/types.h first. Closes: #556203. diff --git a/debian/po/bg.po b/debian/po/bg.po index c7b1231c..5d8f920e 100644 --- a/debian/po/bg.po +++ b/debian/po/bg.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: bg\n" "Report-Msgid-Bugs-To: pam@packages.debian.org\n" "POT-Creation-Date: 2009-08-18 18:30-0700\n" -"PO-Revision-Date: 2009-03-04 22:54+0200\n" +"PO-Revision-Date: 2009-12-28 14:57+0200\n" "Last-Translator: Damyan Ivanov \n" "Language-Team: Bulgarian \n" "MIME-Version: 1.0\n" @@ -152,10 +152,8 @@ msgstr "" #. Type: error #. Description #: ../libpam-runtime.templates:4001 -#, fuzzy -#| msgid "Incompatible PAM profiles selected." msgid "No PAM profiles have been selected." -msgstr "Избрани са несъвместими PAM профили." +msgstr "Не са избрани PAM профили." #. Type: error #. Description @@ -165,12 +163,15 @@ msgid "" "all users access without authenticating, and is not allowed. Please select " "at least one PAM profile from the available list." msgstr "" +"Няма избрани PAM профили. Това ще разреши достъпа на всички потребители без " +"удостоверяване на самоличността и не е позволено. Изберете поне един профил " +"от списъка." #. Type: error #. Description #: ../libpam-runtime.templates:5001 msgid "Your system allowed access without a password!" -msgstr "" +msgstr "Системата е била достъпна без парола!" #. Type: error #. Description @@ -185,6 +186,13 @@ msgid "" "this system from scratch or obtain the services of a skilled system " "administrator. For more information, see:" msgstr "" +"Грешка в предишна версия на пакета libpam-runtime е изключила PAM профилите " +"на системата. В резултат на това, системата е била достъпна и без " +"предоставяне на валидна парола. Има вероятноств системата да е било " +"проникнато, особено ако е достъпна от Интернет. Ако нямате опит във " +"възстановяване след пробив в сигурността или проникване на вируси е най-" +"добре да инсталирате цялата операционна система на чисто или да потърсите " +"услугите на опитен системен администратор. За повече информация вижте:" #. Type: error #. Description @@ -195,6 +203,8 @@ msgid "" "apologize that previous versions of libpam-runtime did not detect and " "prevent this situation." msgstr "" +"Грешката, която позволява неправилната настройка е поправена в текущата " +"версия на libpam-runtime. Приемете извиненията ни." #. Type: error #. Description -- cgit v1.2.3 From 2ab8d085227ff8e0a4ab662edeb24ab9deb0e1ed Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Mon, 4 Jan 2010 12:45:53 -0800 Subject: Add postgresql-8.3 to the list of services in need of restart on upgrade. Closes: #563674. --- debian/changelog | 2 ++ debian/libpam0g.postinst | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 46eedb29..07fa39d0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,8 @@ pam (1.1.0-5) UNRELEASED; urgency=low * debian/patches/sys-types-include.patch: fix pam_modutil.h so that it can be included directly, without having to include sys/types.h first. Closes: #556203. + * Add postgresql-8.3 to the list of services in need of restart on upgrade. + Closes: #563674. -- Steve Langasek Wed, 16 Sep 2009 15:25:40 -0700 diff --git a/debian/libpam0g.postinst b/debian/libpam0g.postinst index 3cbbb994..287d1f95 100644 --- a/debian/libpam0g.postinst +++ b/debian/libpam0g.postinst @@ -98,7 +98,7 @@ then check="$check kannel linesrv linesrv-mysql lsh-server" check="$check muddleftpd netatalk nuauth partimage-server" check="$check perdition pgpool popa3d postgresql-7.4" - check="$check postgresql-8.1 postgresql-8.2 proftpd pure-ftpd" + check="$check postgresql-8.1 postgresql-8.2 postgresql-8.3 proftpd pure-ftpd" check="$check pure-ftpd-ldap pure-ftpd-mysql" check="$check pure-ftpd-postgresql racoon samba sasl2-bin" check="$check sfs-server solid-pop3d squid squid3 tac-plus" -- cgit v1.2.3 From c84ac54e5fe152693248f674b6294759f338c4a2 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Mon, 4 Jan 2010 12:50:11 -0800 Subject: And drop postgresql-{7.4,8.1} from the list, neither of which is present in stable. --- debian/changelog | 2 ++ debian/libpam0g.postinst | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 07fa39d0..722d1957 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,8 @@ pam (1.1.0-5) UNRELEASED; urgency=low Closes: #556203. * Add postgresql-8.3 to the list of services in need of restart on upgrade. Closes: #563674. + * And drop postgresql-{7.4,8.1} from the list, neither of which is present + in stable. -- Steve Langasek Wed, 16 Sep 2009 15:25:40 -0700 diff --git a/debian/libpam0g.postinst b/debian/libpam0g.postinst index 287d1f95..8c72cf65 100644 --- a/debian/libpam0g.postinst +++ b/debian/libpam0g.postinst @@ -97,8 +97,8 @@ then check="$check heartbeat-2 hylafax-server iiimf-server inn2" check="$check kannel linesrv linesrv-mysql lsh-server" check="$check muddleftpd netatalk nuauth partimage-server" - check="$check perdition pgpool popa3d postgresql-7.4" - check="$check postgresql-8.1 postgresql-8.2 postgresql-8.3 proftpd pure-ftpd" + check="$check perdition pgpool popa3d" + check="$check postgresql-8.2 postgresql-8.3 proftpd pure-ftpd" check="$check pure-ftpd-ldap pure-ftpd-mysql" check="$check pure-ftpd-postgresql racoon samba sasl2-bin" check="$check sfs-server solid-pop3d squid squid3 tac-plus" -- cgit v1.2.3 From bd01c7eaabdecde8fbf697b17d70e3596aeaf83f Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Fri, 8 Jan 2010 16:48:41 -0800 Subject: debian/patches/007_modules_pam_unix: recognize that *all* of the password hashes other than traditional crypt handle passwords >8 chars in length. LP: #356766. --- debian/changelog | 3 ++ debian/patches-applied/007_modules_pam_unix | 71 +++++++++++++++-------------- 2 files changed, 39 insertions(+), 35 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 722d1957..52e5773e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,9 @@ pam (1.1.0-5) UNRELEASED; urgency=low Closes: #563674. * And drop postgresql-{7.4,8.1} from the list, neither of which is present in stable. + * debian/patches/007_modules_pam_unix: recognize that *all* of the password + hashes other than traditional crypt handle passwords >8 chars in length. + LP: #356766. -- Steve Langasek Wed, 16 Sep 2009 15:25:40 -0700 diff --git a/debian/patches-applied/007_modules_pam_unix b/debian/patches-applied/007_modules_pam_unix index 8eedeaea..e03be949 100644 --- a/debian/patches-applied/007_modules_pam_unix +++ b/debian/patches-applied/007_modules_pam_unix @@ -1,7 +1,7 @@ -Index: pam.deb/modules/pam_unix/pam_unix_passwd.c +Index: pam.debian/modules/pam_unix/pam_unix_passwd.c =================================================================== ---- pam.deb.orig/modules/pam_unix/pam_unix_passwd.c -+++ pam.deb/modules/pam_unix/pam_unix_passwd.c +--- pam.debian.orig/modules/pam_unix/pam_unix_passwd.c ++++ pam.debian/modules/pam_unix/pam_unix_passwd.c @@ -88,6 +88,9 @@ unsigned long versnum, unsigned int proto); #endif /* GNU libc 2.1 */ @@ -81,10 +81,10 @@ Index: pam.deb/modules/pam_unix/pam_unix_passwd.c if (retval != PAM_SUCCESS) { pam_syslog(pamh, LOG_NOTICE, "new password not acceptable 2"); -Index: pam.deb/modules/pam_unix/pam_unix_acct.c +Index: pam.debian/modules/pam_unix/pam_unix_acct.c =================================================================== ---- pam.deb.orig/modules/pam_unix/pam_unix_acct.c -+++ pam.deb/modules/pam_unix/pam_unix_acct.c +--- pam.debian.orig/modules/pam_unix/pam_unix_acct.c ++++ pam.debian/modules/pam_unix/pam_unix_acct.c @@ -191,7 +191,7 @@ D(("called.")); @@ -94,10 +94,10 @@ Index: pam.deb/modules/pam_unix/pam_unix_acct.c retval = pam_get_item(pamh, PAM_USER, &void_uname); uname = void_uname; -Index: pam.deb/modules/pam_unix/support.c +Index: pam.debian/modules/pam_unix/support.c =================================================================== ---- pam.deb.orig/modules/pam_unix/support.c -+++ pam.deb/modules/pam_unix/support.c +--- pam.debian.orig/modules/pam_unix/support.c ++++ pam.debian/modules/pam_unix/support.c @@ -53,7 +53,7 @@ */ @@ -151,23 +151,22 @@ Index: pam.deb/modules/pam_unix/support.c if (rounds != NULL && j == UNIX_ALGO_ROUNDS) *rounds = strtol(*argv + 7, NULL, 10); } -@@ -116,6 +119,11 @@ +@@ -116,6 +119,10 @@ ++argv; /* step to next argument */ } -+ if (off(UNIX_BIGCRYPT|UNIX_MD5_PASS|UNIX_SHA256_PASS|UNIX_SHA512_PASS, -+ ctrl) ++ if (off(UNIX_HASH_MASK,ctrl) + && pass_min_len && *pass_min_len > 8) + *pass_min_len = 8; + if (flags & PAM_DISALLOW_NULL_AUTHTOK) { D(("DISALLOW_NULL_AUTHTOK")); set(UNIX__NONULL, ctrl); -Index: pam.deb/modules/pam_unix/support.h +Index: pam.debian/modules/pam_unix/support.h =================================================================== ---- pam.deb.orig/modules/pam_unix/support.h -+++ pam.deb/modules/pam_unix/support.h -@@ -89,41 +89,47 @@ +--- pam.debian.orig/modules/pam_unix/support.h ++++ pam.debian/modules/pam_unix/support.h +@@ -89,41 +89,49 @@ #define UNIX_ALGO_ROUNDS 25 /* optional number of rounds for new password hash algorithms */ #define UNIX_BLOWFISH_PASS 26 /* new password hashes will use blowfish */ @@ -177,6 +176,8 @@ Index: pam.deb/modules/pam_unix/support.h /* -------------- */ -#define UNIX_CTRLS_ 27 /* number of ctrl arguments defined */ +#define UNIX_CTRLS_ 30 /* number of ctrl arguments defined */ ++ ++#define UNIX_HASH_MASK (UNIX_MD5_PASS|UNIX_BIGCRYPT|UNIX_SHA256_PASS|UNIX_SHA512_PASS|UNIX_BLOWFISH_PASS) static const UNIX_Ctrls unix_args[UNIX_CTRLS_] = { @@ -243,7 +244,7 @@ Index: pam.deb/modules/pam_unix/support.h }; #define UNIX_DEFAULTS (unix_args[UNIX__NONULL].flag) -@@ -141,7 +147,7 @@ +@@ -141,7 +149,7 @@ extern int _make_remark(pam_handle_t * pamh, unsigned int ctrl ,int type, const char *text); extern int _set_ctrl(pam_handle_t * pamh, int flags, int *remember, int *rounds, @@ -252,10 +253,10 @@ Index: pam.deb/modules/pam_unix/support.h extern int _unix_getpwnam (pam_handle_t *pamh, const char *name, int files, int nis, struct passwd **ret); -Index: pam.deb/modules/pam_unix/pam_unix.8.xml +Index: pam.debian/modules/pam_unix/pam_unix.8.xml =================================================================== ---- pam.deb.orig/modules/pam_unix/pam_unix.8.xml -+++ pam.deb/modules/pam_unix/pam_unix.8.xml +--- pam.debian.orig/modules/pam_unix/pam_unix.8.xml ++++ pam.debian/modules/pam_unix/pam_unix.8.xml @@ -326,6 +326,90 @@ @@ -347,10 +348,10 @@ Index: pam.deb/modules/pam_unix/pam_unix.8.xml Invalid arguments are logged with -Index: pam.deb/modules/pam_unix/obscure.c +Index: pam.debian/modules/pam_unix/obscure.c =================================================================== --- /dev/null -+++ pam.deb/modules/pam_unix/obscure.c ++++ pam.debian/modules/pam_unix/obscure.c @@ -0,0 +1,198 @@ +/* + * Copyright 1989 - 1994, Julianne Frances Haugh @@ -534,7 +535,7 @@ Index: pam.deb/modules/pam_unix/obscure.c + Example: "password$%^&*123". So check it again, this time + truncated to the maximum length. Idea from npasswd. --marekm */ + -+ if (on(UNIX_MD5_PASS,ctrl) || on(UNIX_BIGCRYPT,ctrl)) ++ if (on(UNIX_HASH_MASK,ctrl)) + return NULL; /* unlimited password length */ + + if (oldlen <= 8 && newlen <= 8) @@ -550,10 +551,10 @@ Index: pam.deb/modules/pam_unix/obscure.c + + return msg; +} -Index: pam.deb/modules/pam_unix/Makefile.am +Index: pam.debian/modules/pam_unix/Makefile.am =================================================================== ---- pam.deb.orig/modules/pam_unix/Makefile.am -+++ pam.deb/modules/pam_unix/Makefile.am +--- pam.debian.orig/modules/pam_unix/Makefile.am ++++ pam.debian/modules/pam_unix/Makefile.am @@ -40,7 +40,7 @@ pam_unix_la_SOURCES = bigcrypt.c pam_unix_acct.c \ @@ -563,10 +564,10 @@ Index: pam.deb/modules/pam_unix/Makefile.am bigcrypt_SOURCES = bigcrypt.c bigcrypt_main.c bigcrypt_CFLAGS = $(AM_CFLAGS) -Index: pam.deb/modules/pam_unix/pam_unix_auth.c +Index: pam.debian/modules/pam_unix/pam_unix_auth.c =================================================================== ---- pam.deb.orig/modules/pam_unix/pam_unix_auth.c -+++ pam.deb/modules/pam_unix/pam_unix_auth.c +--- pam.debian.orig/modules/pam_unix/pam_unix_auth.c ++++ pam.debian/modules/pam_unix/pam_unix_auth.c @@ -111,7 +111,7 @@ D(("called.")); @@ -576,10 +577,10 @@ Index: pam.deb/modules/pam_unix/pam_unix_auth.c /* Get a few bytes so we can pass our return value to pam_sm_setcred(). */ -Index: pam.deb/modules/pam_unix/pam_unix_sess.c +Index: pam.debian/modules/pam_unix/pam_unix_sess.c =================================================================== ---- pam.deb.orig/modules/pam_unix/pam_unix_sess.c -+++ pam.deb/modules/pam_unix/pam_unix_sess.c +--- pam.debian.orig/modules/pam_unix/pam_unix_sess.c ++++ pam.debian/modules/pam_unix/pam_unix_sess.c @@ -73,7 +73,7 @@ D(("called.")); @@ -598,10 +599,10 @@ Index: pam.deb/modules/pam_unix/pam_unix_sess.c retval = pam_get_item(pamh, PAM_USER, (void *) &user_name); if (user_name == NULL || *user_name == '\0' || retval != PAM_SUCCESS) { -Index: pam.deb/modules/pam_unix/pam_unix.8 +Index: pam.debian/modules/pam_unix/pam_unix.8 =================================================================== ---- pam.deb.orig/modules/pam_unix/pam_unix.8 -+++ pam.deb/modules/pam_unix/pam_unix.8 +--- pam.debian.orig/modules/pam_unix/pam_unix.8 ++++ pam.debian/modules/pam_unix/pam_unix.8 @@ -1,161 +1,13 @@ +'\" t .\" Title: pam_unix -- cgit v1.2.3 From 16c056d4c09e4158661c6476849ec1286f902437 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Sat, 30 Jan 2010 15:37:25 -0800 Subject: Drop patches pam.d-manpage-section, namespace_with_awk_not_gawk, and pam_securetty_tty_check_before_user_check, which are included upstream. --- debian/changelog | 7 +++- debian/patches-applied/namespace_with_awk_not_gawk | 23 ------------- debian/patches-applied/pam.d-manpage-section | 35 ------------------- .../pam_securetty_tty_check_before_user_check | 40 ---------------------- debian/patches-applied/series | 3 -- 5 files changed, 6 insertions(+), 102 deletions(-) delete mode 100644 debian/patches-applied/namespace_with_awk_not_gawk delete mode 100644 debian/patches-applied/pam.d-manpage-section delete mode 100644 debian/patches-applied/pam_securetty_tty_check_before_user_check (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 52e5773e..fb8fc32e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,10 @@ -pam (1.1.0-5) UNRELEASED; urgency=low +pam (1.1.1-1) UNRELEASED; urgency=low + * New upstream version. + - restore proper netgroup handling in pam_access. + Closes: #567385, LP: #513955. + * Drop patches pam.d-manpage-section, namespace_with_awk_not_gawk, and + pam_securetty_tty_check_before_user_check, which are included upstream. * Updated debconf translations: - French, thanks to Jean-Baka Domelevo Entfellner (closes: #547039) diff --git a/debian/patches-applied/namespace_with_awk_not_gawk b/debian/patches-applied/namespace_with_awk_not_gawk deleted file mode 100644 index 976c9373..00000000 --- a/debian/patches-applied/namespace_with_awk_not_gawk +++ /dev/null @@ -1,23 +0,0 @@ -Patch for Debian bug #518908 - -The default namespace.init depends on GNU awk extensions. Make this portable -to POSIX awk. - -Authors: Steve Langasek - -Upstream status: committed to CVS - -Index: pam.deb/modules/pam_namespace/namespace.init -=================================================================== ---- pam.deb.orig/modules/pam_namespace/namespace.init -+++ pam.deb/modules/pam_namespace/namespace.init -@@ -15,7 +15,8 @@ - gid=$(echo "$passwd" | cut -f4 -d":") - cp -rT /etc/skel "$homedir" - chown -R "$user":"$gid" "$homedir" -- mode=$(awk '/^UMASK/{gsub("#.*$", "", $2); printf "%o", and(0777,compl(strtonum("0" $2))); exit}' /etc/login.defs) -+ mask=$(awk '/^UMASK/{gsub("#.*$", "", $2); print $2; exit}' /etc/login.defs) -+ mode=$(printf "%o" $((0777 & ~$mask))) - chmod ${mode:-700} "$homedir" - [ -x /sbin/restorecon ] && /sbin/restorecon -R "$homedir" - fi diff --git a/debian/patches-applied/pam.d-manpage-section b/debian/patches-applied/pam.d-manpage-section deleted file mode 100644 index 1708e6aa..00000000 --- a/debian/patches-applied/pam.d-manpage-section +++ /dev/null @@ -1,35 +0,0 @@ -Patch for Debian bug #470137 - -pam.d is a directory, so it's in section 5, not in section 8. Update -the manpage references. - -Authors: Steve Langasek - -Upstream status: committed to CVS - -Index: pam.deb/modules/pam_sepermit/pam_sepermit.8 -=================================================================== ---- pam.deb.orig/modules/pam_sepermit/pam_sepermit.8 -+++ pam.deb/modules/pam_sepermit/pam_sepermit.8 -@@ -103,7 +103,7 @@ - .PP - - \fBpam.conf\fR(5), --\fBpam.d\fR(8), -+\fBpam.d\fR(5), - \fBpam\fR(7) - .SH "AUTHOR" - .PP -Index: pam.deb/modules/pam_sepermit/pam_sepermit.8.xml -=================================================================== ---- pam.deb.orig/modules/pam_sepermit/pam_sepermit.8.xml -+++ pam.deb/modules/pam_sepermit/pam_sepermit.8.xml -@@ -171,7 +171,7 @@ - pam.conf5 - , - -- pam.d8 -+ pam.d5 - , - - pam7 diff --git a/debian/patches-applied/pam_securetty_tty_check_before_user_check b/debian/patches-applied/pam_securetty_tty_check_before_user_check deleted file mode 100644 index 5f976ab5..00000000 --- a/debian/patches-applied/pam_securetty_tty_check_before_user_check +++ /dev/null @@ -1,40 +0,0 @@ -Patch for Debian bug #537848 - -pam_securetty should not return PAM_USER_UNKNOWN when the tty is secure. -regardless of what was entered as a username. - -Authors: Nicolas François - -Upstream status: committed to CVS - -Index: sid/modules/pam_securetty/pam_securetty.c -=================================================================== ---- sid.orig/modules/pam_securetty/pam_securetty.c 2009-07-23 17:39:36.904158303 +0200 -+++ sid/modules/pam_securetty/pam_securetty.c 2009-07-23 17:48:55.596157670 +0200 -@@ -82,13 +82,11 @@ - } - - user_pwd = pam_modutil_getpwnam(pamh, username); -- if (user_pwd == NULL) { -- return PAM_USER_UNKNOWN; -- } else if (user_pwd->pw_uid != 0) { /* If the user is not root, -- securetty's does not apply -- to them */ -+ if (user_pwd != NULL && user_pwd->pw_uid != 0) { -+ /* If the user is not root, securetty's does not apply to them */ - return PAM_SUCCESS; - } -+ /* The user is now either root or an invalid / mistyped username */ - - retval = pam_get_item(pamh, PAM_TTY, &void_uttyname); - uttyname = void_uttyname; -@@ -102,6 +100,9 @@ - pam_syslog(pamh, LOG_DEBUG, "access allowed for '%s' on '%s'", - username, uttyname); - } else if (retval != PAM_SUCCESS) { -+ if (user_pwd == NULL) { -+ retval = PAM_USER_UNKNOWN; -+ } - pam_syslog(pamh, LOG_WARNING, "access denied: tty '%s' is not secure !", - uttyname); - } diff --git a/debian/patches-applied/series b/debian/patches-applied/series index bf13a538..1d1a6034 100644 --- a/debian/patches-applied/series +++ b/debian/patches-applied/series @@ -16,10 +16,7 @@ hurd_no_setfsuid 054_pam_security_abstract_securetty_handling 055_pam_unix_nullok_secure PAM-manpage-section -pam.d-manpage-section autoconf.patch update-motd fix-man-crud -namespace_with_awk_not_gawk -pam_securetty_tty_check_before_user_check sys-types-include.patch -- cgit v1.2.3 From 2aaa3adecff5ac8132d4abcec8ae96e0a776ba85 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Mon, 1 Feb 2010 00:53:46 -0800 Subject: debian/patches/026_pam_unix_passwd_unknown_user: don't return PAM_USER_UNKNOWN on password change of a user that has no shadow entry, upstream now implements auto-creating the shadow entry in this case. --- debian/changelog | 3 ++ .../026_pam_unix_passwd_unknown_user | 36 +++------------------- 2 files changed, 8 insertions(+), 31 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index fb8fc32e..05893feb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,9 @@ pam (1.1.1-1) UNRELEASED; urgency=low Closes: #567385, LP: #513955. * Drop patches pam.d-manpage-section, namespace_with_awk_not_gawk, and pam_securetty_tty_check_before_user_check, which are included upstream. + * debian/patches/026_pam_unix_passwd_unknown_user: don't return + PAM_USER_UNKNOWN on password change of a user that has no shadow entry, + upstream now implements auto-creating the shadow entry in this case. * Updated debconf translations: - French, thanks to Jean-Baka Domelevo Entfellner (closes: #547039) diff --git a/debian/patches-applied/026_pam_unix_passwd_unknown_user b/debian/patches-applied/026_pam_unix_passwd_unknown_user index 0c9a88c1..564bab66 100644 --- a/debian/patches-applied/026_pam_unix_passwd_unknown_user +++ b/debian/patches-applied/026_pam_unix_passwd_unknown_user @@ -1,10 +1,10 @@ Patch from Martin Schwenke -Index: debian-pkg-pam/modules/pam_unix/passverify.c +Index: pam.deb/modules/pam_unix/passverify.c =================================================================== ---- debian-pkg-pam.orig/modules/pam_unix/passverify.c 2009-04-17 12:46:54.000000000 -0700 -+++ debian-pkg-pam/modules/pam_unix/passverify.c 2009-04-17 12:46:58.000000000 -0700 -@@ -720,7 +720,7 @@ +--- pam.deb.orig/modules/pam_unix/passverify.c ++++ pam.deb/modules/pam_unix/passverify.c +@@ -719,7 +719,7 @@ struct passwd *tmpent = NULL; struct stat st; FILE *pwfile, *opwfile; @@ -13,7 +13,7 @@ Index: debian-pkg-pam/modules/pam_unix/passverify.c int oldmask; #ifdef WITH_SELINUX security_context_t prev_context=NULL; -@@ -791,6 +791,7 @@ +@@ -790,6 +790,7 @@ tmpent->pw_passwd = assigned_passwd.charp; err = 0; @@ -30,29 +30,3 @@ Index: debian-pkg-pam/modules/pam_unix/passverify.c } } -@@ -847,7 +848,7 @@ - struct spwd *spwdent = NULL, *stmpent = NULL; - struct stat st; - FILE *pwfile, *opwfile; -- int err = 1; -+ int err = 1, found = 0; - int oldmask; - #ifdef WITH_SELINUX - security_context_t prev_context=NULL; -@@ -918,6 +919,7 @@ - stmpent->sp_pwdp = towhat; - stmpent->sp_lstchg = time(NULL) / (60 * 60 * 24); - err = 0; -+ found = 1; - D(("Set password %s for %s", stmpent->sp_pwdp, forwho)); - } - -@@ -964,7 +966,7 @@ - return PAM_SUCCESS; - } else { - unlink(SH_TMPFILE); -- return PAM_AUTHTOK_ERR; -+ return found ? PAM_AUTHTOK_ERR : PAM_USER_UNKNOWN; - } - } - -- cgit v1.2.3 From 3f570e87baf0dcf4982a9383191e458e0dcab679 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Mon, 1 Feb 2010 00:55:09 -0800 Subject: refresh other patches for new upstream version --- debian/patches-applied/007_modules_pam_unix | 266 +-- .../054_pam_security_abstract_securetty_handling | 28 +- debian/patches-applied/055_pam_unix_nullok_secure | 24 +- debian/patches-applied/PAM-manpage-section | 727 +++----- debian/patches-applied/autoconf.patch | 1847 ++++++++++---------- debian/patches-applied/fix-man-crud | 713 +------- debian/patches-applied/hurd_no_setfsuid | 24 +- 7 files changed, 1311 insertions(+), 2318 deletions(-) (limited to 'debian') diff --git a/debian/patches-applied/007_modules_pam_unix b/debian/patches-applied/007_modules_pam_unix index e03be949..a0c1857a 100644 --- a/debian/patches-applied/007_modules_pam_unix +++ b/debian/patches-applied/007_modules_pam_unix @@ -1,8 +1,8 @@ -Index: pam.debian/modules/pam_unix/pam_unix_passwd.c +Index: pam.deb/modules/pam_unix/pam_unix_passwd.c =================================================================== ---- pam.debian.orig/modules/pam_unix/pam_unix_passwd.c -+++ pam.debian/modules/pam_unix/pam_unix_passwd.c -@@ -88,6 +88,9 @@ +--- pam.deb.orig/modules/pam_unix/pam_unix_passwd.c ++++ pam.deb/modules/pam_unix/pam_unix_passwd.c +@@ -87,6 +87,9 @@ unsigned long versnum, unsigned int proto); #endif /* GNU libc 2.1 */ @@ -12,7 +12,7 @@ Index: pam.debian/modules/pam_unix/pam_unix_passwd.c /* How it works: Gets in username (has to be done) from the calling program -@@ -430,7 +433,8 @@ +@@ -457,7 +460,8 @@ static int _pam_unix_approve_pass(pam_handle_t * pamh ,unsigned int ctrl ,const char *pass_old @@ -22,7 +22,7 @@ Index: pam.debian/modules/pam_unix/pam_unix_passwd.c { const void *user; const char *remark = NULL; -@@ -461,7 +465,7 @@ +@@ -488,7 +492,7 @@ } } if (off(UNIX__IAMROOT, ctrl)) { @@ -31,7 +31,7 @@ Index: pam.debian/modules/pam_unix/pam_unix_passwd.c remark = _("You must choose a longer password"); D(("length check [%s]", remark)); if (on(UNIX_REMEMBER_PASSWD, ctrl)) { -@@ -473,6 +477,11 @@ +@@ -500,6 +504,11 @@ return retval; } } @@ -43,7 +43,7 @@ Index: pam.debian/modules/pam_unix/pam_unix_passwd.c } if (remark) { _make_remark(pamh, ctrl, PAM_ERROR_MSG, remark); -@@ -489,6 +498,7 @@ +@@ -516,6 +525,7 @@ int retval; int remember = -1; int rounds = -1; @@ -51,7 +51,7 @@ Index: pam.debian/modules/pam_unix/pam_unix_passwd.c /* */ const char *user; -@@ -497,7 +507,8 @@ +@@ -524,7 +534,8 @@ D(("called.")); @@ -61,17 +61,17 @@ Index: pam.debian/modules/pam_unix/pam_unix_passwd.c /* * First get the name of a user -@@ -697,7 +708,8 @@ +@@ -724,7 +735,8 @@ if (*(const char *)pass_new == '\0') { /* "\0" password = NULL */ pass_new = NULL; } - retval = _pam_unix_approve_pass(pamh, ctrl, pass_old, pass_new); + retval = _pam_unix_approve_pass(pamh, ctrl, pass_old, + pass_new, pass_min_len); - + if (retval != PAM_SUCCESS && off(UNIX_NOT_SET_PASS, ctrl)) { pam_set_item(pamh, PAM_AUTHTOK, NULL); -@@ -730,7 +742,8 @@ +@@ -757,7 +769,8 @@ return retval; } @@ -81,10 +81,10 @@ Index: pam.debian/modules/pam_unix/pam_unix_passwd.c if (retval != PAM_SUCCESS) { pam_syslog(pamh, LOG_NOTICE, "new password not acceptable 2"); -Index: pam.debian/modules/pam_unix/pam_unix_acct.c +Index: pam.deb/modules/pam_unix/pam_unix_acct.c =================================================================== ---- pam.debian.orig/modules/pam_unix/pam_unix_acct.c -+++ pam.debian/modules/pam_unix/pam_unix_acct.c +--- pam.deb.orig/modules/pam_unix/pam_unix_acct.c ++++ pam.deb/modules/pam_unix/pam_unix_acct.c @@ -191,7 +191,7 @@ D(("called.")); @@ -94,11 +94,11 @@ Index: pam.debian/modules/pam_unix/pam_unix_acct.c retval = pam_get_item(pamh, PAM_USER, &void_uname); uname = void_uname; -Index: pam.debian/modules/pam_unix/support.c +Index: pam.deb/modules/pam_unix/support.c =================================================================== ---- pam.debian.orig/modules/pam_unix/support.c -+++ pam.debian/modules/pam_unix/support.c -@@ -53,7 +53,7 @@ +--- pam.deb.orig/modules/pam_unix/support.c ++++ pam.deb/modules/pam_unix/support.c +@@ -55,7 +55,7 @@ */ int _set_ctrl(pam_handle_t *pamh, int flags, int *remember, int *rounds, @@ -107,7 +107,7 @@ Index: pam.debian/modules/pam_unix/support.c { unsigned int ctrl; -@@ -79,6 +79,7 @@ +@@ -81,6 +81,7 @@ D(("SILENT")); set(UNIX__QUIET, ctrl); } @@ -115,7 +115,7 @@ Index: pam.debian/modules/pam_unix/support.c /* now parse the arguments to this module */ while (argc-- > 0) { -@@ -88,7 +89,8 @@ +@@ -90,7 +91,8 @@ for (j = 0; j < UNIX_CTRLS_; ++j) { if (unix_args[j].token @@ -125,7 +125,7 @@ Index: pam.debian/modules/pam_unix/support.c break; } } -@@ -100,15 +102,16 @@ +@@ -102,15 +104,16 @@ ctrl &= unix_args[j].mask; /* for turning things off */ ctrl |= unix_args[j].flag; /* for turning things on */ @@ -151,7 +151,7 @@ Index: pam.debian/modules/pam_unix/support.c if (rounds != NULL && j == UNIX_ALGO_ROUNDS) *rounds = strtol(*argv + 7, NULL, 10); } -@@ -116,6 +119,10 @@ +@@ -118,6 +121,10 @@ ++argv; /* step to next argument */ } @@ -162,10 +162,10 @@ Index: pam.debian/modules/pam_unix/support.c if (flags & PAM_DISALLOW_NULL_AUTHTOK) { D(("DISALLOW_NULL_AUTHTOK")); set(UNIX__NONULL, ctrl); -Index: pam.debian/modules/pam_unix/support.h +Index: pam.deb/modules/pam_unix/support.h =================================================================== ---- pam.debian.orig/modules/pam_unix/support.h -+++ pam.debian/modules/pam_unix/support.h +--- pam.deb.orig/modules/pam_unix/support.h ++++ pam.deb/modules/pam_unix/support.h @@ -89,41 +89,49 @@ #define UNIX_ALGO_ROUNDS 25 /* optional number of rounds for new password hash algorithms */ @@ -253,10 +253,10 @@ Index: pam.debian/modules/pam_unix/support.h extern int _unix_getpwnam (pam_handle_t *pamh, const char *name, int files, int nis, struct passwd **ret); -Index: pam.debian/modules/pam_unix/pam_unix.8.xml +Index: pam.deb/modules/pam_unix/pam_unix.8.xml =================================================================== ---- pam.debian.orig/modules/pam_unix/pam_unix.8.xml -+++ pam.debian/modules/pam_unix/pam_unix.8.xml +--- pam.deb.orig/modules/pam_unix/pam_unix.8.xml ++++ pam.deb/modules/pam_unix/pam_unix.8.xml @@ -326,6 +326,90 @@ @@ -348,10 +348,10 @@ Index: pam.debian/modules/pam_unix/pam_unix.8.xml Invalid arguments are logged with -Index: pam.debian/modules/pam_unix/obscure.c +Index: pam.deb/modules/pam_unix/obscure.c =================================================================== --- /dev/null -+++ pam.debian/modules/pam_unix/obscure.c ++++ pam.deb/modules/pam_unix/obscure.c @@ -0,0 +1,198 @@ +/* + * Copyright 1989 - 1994, Julianne Frances Haugh @@ -551,11 +551,11 @@ Index: pam.debian/modules/pam_unix/obscure.c + + return msg; +} -Index: pam.debian/modules/pam_unix/Makefile.am +Index: pam.deb/modules/pam_unix/Makefile.am =================================================================== ---- pam.debian.orig/modules/pam_unix/Makefile.am -+++ pam.debian/modules/pam_unix/Makefile.am -@@ -40,7 +40,7 @@ +--- pam.deb.orig/modules/pam_unix/Makefile.am ++++ pam.deb/modules/pam_unix/Makefile.am +@@ -41,7 +41,7 @@ pam_unix_la_SOURCES = bigcrypt.c pam_unix_acct.c \ pam_unix_auth.c pam_unix_passwd.c pam_unix_sess.c support.c \ @@ -564,11 +564,11 @@ Index: pam.debian/modules/pam_unix/Makefile.am bigcrypt_SOURCES = bigcrypt.c bigcrypt_main.c bigcrypt_CFLAGS = $(AM_CFLAGS) -Index: pam.debian/modules/pam_unix/pam_unix_auth.c +Index: pam.deb/modules/pam_unix/pam_unix_auth.c =================================================================== ---- pam.debian.orig/modules/pam_unix/pam_unix_auth.c -+++ pam.debian/modules/pam_unix/pam_unix_auth.c -@@ -111,7 +111,7 @@ +--- pam.deb.orig/modules/pam_unix/pam_unix_auth.c ++++ pam.deb/modules/pam_unix/pam_unix_auth.c +@@ -109,7 +109,7 @@ D(("called.")); @@ -577,10 +577,10 @@ Index: pam.debian/modules/pam_unix/pam_unix_auth.c /* Get a few bytes so we can pass our return value to pam_sm_setcred(). */ -Index: pam.debian/modules/pam_unix/pam_unix_sess.c +Index: pam.deb/modules/pam_unix/pam_unix_sess.c =================================================================== ---- pam.debian.orig/modules/pam_unix/pam_unix_sess.c -+++ pam.debian/modules/pam_unix/pam_unix_sess.c +--- pam.deb.orig/modules/pam_unix/pam_unix_sess.c ++++ pam.deb/modules/pam_unix/pam_unix_sess.c @@ -73,7 +73,7 @@ D(("called.")); @@ -599,177 +599,11 @@ Index: pam.debian/modules/pam_unix/pam_unix_sess.c retval = pam_get_item(pamh, PAM_USER, (void *) &user_name); if (user_name == NULL || *user_name == '\0' || retval != PAM_SUCCESS) { -Index: pam.debian/modules/pam_unix/pam_unix.8 +Index: pam.deb/modules/pam_unix/pam_unix.8 =================================================================== ---- pam.debian.orig/modules/pam_unix/pam_unix.8 -+++ pam.debian/modules/pam_unix/pam_unix.8 -@@ -1,161 +1,13 @@ -+'\" t - .\" Title: pam_unix - .\" Author: [see the "AUTHOR" section] --.\" Generator: DocBook XSL Stylesheets v1.74.0 --.\" Date: 06/16/2009 -+.\" Generator: DocBook XSL Stylesheets v1.75.2 -+.\" Date: 08/24/2009 - .\" Manual: Linux-PAM Manual - .\" Source: Linux-PAM Manual - .\" Language: English - .\" --.TH "PAM_UNIX" "8" "06/16/2009" "Linux-PAM Manual" "Linux\-PAM Manual" --.\" ----------------------------------------------------------------- --.\" * (re)Define some macros --.\" ----------------------------------------------------------------- --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --.\" toupper - uppercase a string (locale-aware) --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --.de toupper --.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ --\\$* --.tr aabbccddeeffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz --.. --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --.\" SH-xref - format a cross-reference to an SH section --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --.de SH-xref --.ie n \{\ --.\} --.toupper \\$* --.el \{\ --\\$* --.\} --.. --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --.\" SH - level-one heading that works better for non-TTY output --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --.de1 SH --.\" put an extra blank line of space above the head in non-TTY output --.if t \{\ --.sp 1 --.\} --.sp \\n[PD]u --.nr an-level 1 --.set-an-margin --.nr an-prevailing-indent \\n[IN] --.fi --.in \\n[an-margin]u --.ti 0 --.HTML-TAG ".NH \\n[an-level]" --.it 1 an-trap --.nr an-no-space-flag 1 --.nr an-break-flag 1 --\." make the size of the head bigger --.ps +3 --.ft B --.ne (2v + 1u) --.ie n \{\ --.\" if n (TTY output), use uppercase --.toupper \\$* --.\} --.el \{\ --.nr an-break-flag 0 --.\" if not n (not TTY), use normal case (not uppercase) --\\$1 --.in \\n[an-margin]u --.ti 0 --.\" if not n (not TTY), put a border/line under subheading --.sp -.6 --\l'\n(.lu' --.\} --.. --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --.\" SS - level-two heading that works better for non-TTY output --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --.de1 SS --.sp \\n[PD]u --.nr an-level 1 --.set-an-margin --.nr an-prevailing-indent \\n[IN] --.fi --.in \\n[IN]u --.ti \\n[SN]u --.it 1 an-trap --.nr an-no-space-flag 1 --.nr an-break-flag 1 --.ps \\n[PS-SS]u --\." make the size of the head bigger --.ps +2 --.ft B --.ne (2v + 1u) --.if \\n[.$] \&\\$* --.. --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --.\" BB/BE - put background/screen (filled box) around block of text --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --.de BB --.if t \{\ --.sp -.5 --.br --.in +2n --.ll -2n --.gcolor red --.di BX --.\} --.. --.de EB --.if t \{\ --.if "\\$2"adjust-for-leading-newline" \{\ --.sp -1 --.\} --.br --.di --.in --.ll --.gcolor --.nr BW \\n(.lu-\\n(.i --.nr BH \\n(dn+.5v --.ne \\n(BHu+.5v --.ie "\\$2"adjust-for-leading-newline" \{\ --\M[\\$1]\h'1n'\v'+.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] --.\} --.el \{\ --\M[\\$1]\h'1n'\v'-.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] --.\} --.in 0 --.sp -.5v --.nf --.BX --.in --.sp .5v --.fi --.\} --.. --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --.\" BM/EM - put colored marker in margin next to block of text --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --.de BM --.if t \{\ --.br --.ll -2n --.gcolor red --.di BX --.\} --.. --.de EM --.if t \{\ --.br --.di --.ll --.gcolor --.nr BH \\n(dn --.ne \\n(BHu --\M[\\$1]\D'P -.75n 0 0 \\n(BHu -(\\n[.i]u - \\n(INu - .75n) 0 0 -\\n(BHu'\M[] --.in 0 --.nf --.BX --.in --.fi --.\} --.. -+.TH "PAM_UNIX" "8" "08/24/2009" "Linux-PAM Manual" "Linux\-PAM Manual" - .\" ----------------------------------------------------------------- - .\" * set default formatting - .\" ----------------------------------------------------------------- -@@ -166,13 +18,11 @@ +--- pam.deb.orig/modules/pam_unix/pam_unix.8 ++++ pam.deb/modules/pam_unix/pam_unix.8 +@@ -166,13 +166,11 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- @@ -785,7 +619,7 @@ Index: pam.debian/modules/pam_unix/pam_unix.8 .SH "DESCRIPTION" .PP This is the standard Unix authentication module\&. It uses standard calls from the system\'s libraries to retrieve and set account information as well as authentication\&. Usually this is obtained from the /etc/passwd and the /etc/shadow file as well if shadow is enabled\&. -@@ -264,7 +114,7 @@ +@@ -264,7 +262,7 @@ The last \fIn\fR passwords for each user are saved in @@ -794,7 +628,7 @@ Index: pam.debian/modules/pam_unix/pam_unix.8 in order to force password change history and keep the user from alternating between the same password too frequently\&. .RE .PP -@@ -315,6 +165,44 @@ +@@ -315,6 +313,44 @@ Ignore errors reading shadow information for users in the account management module\&. .RE .PP @@ -839,7 +673,7 @@ Index: pam.debian/modules/pam_unix/pam_unix.8 Invalid arguments are logged with \fBsyslog\fR(3)\&. .SH "MODULE TYPES PROVIDED" -@@ -333,21 +221,13 @@ +@@ -333,21 +369,13 @@ .SH "EXAMPLES" .PP An example usage for @@ -862,7 +696,7 @@ Index: pam.debian/modules/pam_unix/pam_unix.8 # Authenticate the user auth required pam_unix\&.so # Ensure users account and password are still active -@@ -358,13 +238,7 @@ +@@ -358,13 +386,7 @@ password required pam_unix\&.so use_authtok nullok md5 session required pam_unix\&.so diff --git a/debian/patches-applied/054_pam_security_abstract_securetty_handling b/debian/patches-applied/054_pam_security_abstract_securetty_handling index d5048cb2..8c3ce2c0 100644 --- a/debian/patches-applied/054_pam_security_abstract_securetty_handling +++ b/debian/patches-applied/054_pam_security_abstract_securetty_handling @@ -33,7 +33,7 @@ Index: pam.deb/modules/pam_securetty/pam_securetty.c /* log a trail for debugging */ if (ctrl & PAM_DEBUG_ARG) { -@@ -101,63 +97,13 @@ +@@ -99,51 +95,7 @@ return PAM_SERVICE_ERR; } @@ -82,28 +82,10 @@ Index: pam.deb/modules/pam_securetty/pam_securetty.c - } - fclose(ttyfile); - -- if (retval) { -- pam_syslog(pamh, LOG_WARNING, "access denied: tty '%s' is not secure !", -- uttyname); -- -- retval = PAM_AUTH_ERR; -- } else { -- if (ctrl & PAM_DEBUG_ARG) { -- pam_syslog(pamh, LOG_DEBUG, "access allowed for '%s' on '%s'", -- username, uttyname); -- } -- retval = PAM_SUCCESS; -- + retval = _pammodutil_tty_secure(pamh, uttyname); -+ if ((retval == PAM_SUCCESS) && (ctrl & PAM_DEBUG_ARG)) { -+ pam_syslog(pamh, LOG_DEBUG, "access allowed for '%s' on '%s'", -+ username, uttyname); -+ } else if (retval != PAM_SUCCESS) { -+ pam_syslog(pamh, LOG_WARNING, "access denied: tty '%s' is not secure !", -+ uttyname); - } - - return retval; + if (retval) { + pam_syslog(pamh, LOG_WARNING, "access denied: tty '%s' is not secure !", + uttyname); Index: pam.deb/modules/pam_securetty/tty_secure.c =================================================================== --- /dev/null @@ -203,7 +185,7 @@ Index: pam.deb/modules/pam_securetty/Makefile.am =================================================================== --- pam.deb.orig/modules/pam_securetty/Makefile.am +++ pam.deb/modules/pam_securetty/Makefile.am -@@ -23,6 +23,10 @@ +@@ -24,6 +24,10 @@ securelib_LTLIBRARIES = pam_securetty.la pam_securetty_la_LIBADD = -L$(top_builddir)/libpam -lpam diff --git a/debian/patches-applied/055_pam_unix_nullok_secure b/debian/patches-applied/055_pam_unix_nullok_secure index 1fd1bf12..27415915 100644 --- a/debian/patches-applied/055_pam_unix_nullok_secure +++ b/debian/patches-applied/055_pam_unix_nullok_secure @@ -11,7 +11,7 @@ Index: pam.deb/modules/pam_unix/support.c =================================================================== --- pam.deb.orig/modules/pam_unix/support.c +++ pam.deb/modules/pam_unix/support.c -@@ -83,15 +83,22 @@ +@@ -85,15 +85,22 @@ /* now parse the arguments to this module */ while (argc-- > 0) { @@ -39,7 +39,7 @@ Index: pam.deb/modules/pam_unix/support.c } } -@@ -443,6 +450,7 @@ +@@ -449,6 +456,7 @@ child = fork(); if (child == 0) { int i=0; @@ -47,7 +47,7 @@ Index: pam.deb/modules/pam_unix/support.c struct rlimit rlim; static char *envp[] = { NULL }; char *args[] = { NULL, NULL, NULL, NULL }; -@@ -470,7 +478,18 @@ +@@ -476,7 +484,18 @@ /* exec binary helper */ args[0] = strdup(CHKPWD_HELPER); args[1] = x_strdup(user); @@ -67,7 +67,7 @@ Index: pam.deb/modules/pam_unix/support.c args[2]=strdup("nullok"); } else { args[2]=strdup("nonull"); -@@ -551,6 +570,17 @@ +@@ -557,6 +576,17 @@ if (on(UNIX__NONULL, ctrl)) return 0; /* will fail but don't let on yet */ @@ -85,7 +85,7 @@ Index: pam.deb/modules/pam_unix/support.c /* UNIX passwords area */ retval = get_pwd_hash(pamh, name, &pwd, &salt); -@@ -637,7 +667,8 @@ +@@ -643,7 +673,8 @@ } } } else { @@ -108,9 +108,9 @@ Index: pam.deb/modules/pam_unix/support.h -#define UNIX_CTRLS_ 30 /* number of ctrl arguments defined */ +#define UNIX_CTRLS_ 31 /* number of ctrl arguments defined */ - static const UNIX_Ctrls unix_args[UNIX_CTRLS_] = - { -@@ -109,7 +110,7 @@ + #define UNIX_HASH_MASK (UNIX_MD5_PASS|UNIX_BIGCRYPT|UNIX_SHA256_PASS|UNIX_SHA512_PASS|UNIX_BLOWFISH_PASS) + +@@ -111,7 +112,7 @@ /* UNIX_NOT_SET_PASS */ {"not_set_pass", _ALL_ON_, 0x40}, /* UNIX__PRELIM */ {NULL, _ALL_ON_^(0x180), 0x80}, /* UNIX__UPDATE */ {NULL, _ALL_ON_^(0x180), 0x100}, @@ -119,7 +119,7 @@ Index: pam.deb/modules/pam_unix/support.h /* UNIX__QUIET */ {NULL, _ALL_ON_, 0x400}, /* UNIX_USE_AUTHTOK */ {"use_authtok", _ALL_ON_, 0x800}, /* UNIX_SHADOW */ {"shadow", _ALL_ON_, 0x1000}, -@@ -130,6 +131,7 @@ +@@ -132,6 +133,7 @@ /* UNIX_MAX_PASS_LEN */ {"max=", _ALL_ON_, 0}, /* UNIX_MIN_PASS_LEN */ {"min=", _ALL_ON_, 0x4000000}, /* UNIX_OBSCURE_CHECKS */ {"obscure", _ALL_ON_, 0x8000000}, @@ -127,7 +127,7 @@ Index: pam.deb/modules/pam_unix/support.h }; #define UNIX_DEFAULTS (unix_args[UNIX__NONULL].flag) -@@ -165,6 +167,9 @@ +@@ -167,6 +169,9 @@ ,const char *data_name ,const void **pass); @@ -141,7 +141,7 @@ Index: pam.deb/modules/pam_unix/Makefile.am =================================================================== --- pam.deb.orig/modules/pam_unix/Makefile.am +++ pam.deb/modules/pam_unix/Makefile.am -@@ -28,7 +28,8 @@ +@@ -29,7 +29,8 @@ pam_unix_la_LDFLAGS += -Wl,--version-script=$(srcdir)/../modules.map endif pam_unix_la_LIBADD = @LIBNSL@ -L$(top_builddir)/libpam -lpam \ @@ -177,7 +177,7 @@ Index: pam.deb/modules/pam_unix/pam_unix.8 =================================================================== --- pam.deb.orig/modules/pam_unix/pam_unix.8 +++ pam.deb/modules/pam_unix/pam_unix.8 -@@ -62,7 +62,14 @@ +@@ -218,7 +218,14 @@ .RS 4 The default action of this module is to not permit the user access to a service if their official password is blank\&. The \fBnullok\fR diff --git a/debian/patches-applied/PAM-manpage-section b/debian/patches-applied/PAM-manpage-section index a602614d..0106037a 100644 --- a/debian/patches-applied/PAM-manpage-section +++ b/debian/patches-applied/PAM-manpage-section @@ -261,217 +261,7 @@ Index: pam.deb/modules/pam_access/access.conf.5 =================================================================== --- pam.deb.orig/modules/pam_access/access.conf.5 +++ pam.deb/modules/pam_access/access.conf.5 -@@ -1,161 +1,13 @@ -+'\" t - .\" Title: access.conf - .\" Author: [see the "AUTHORS" section] --.\" Generator: DocBook XSL Stylesheets v1.74.0 --.\" Date: 03/02/2009 -+.\" Generator: DocBook XSL Stylesheets v1.75.2 -+.\" Date: 08/24/2009 - .\" Manual: Linux-PAM Manual - .\" Source: Linux-PAM Manual - .\" Language: English - .\" --.TH "ACCESS\&.CONF" "5" "03/02/2009" "Linux-PAM Manual" "Linux\-PAM Manual" --.\" ----------------------------------------------------------------- --.\" * (re)Define some macros --.\" ----------------------------------------------------------------- --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --.\" toupper - uppercase a string (locale-aware) --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --.de toupper --.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ --\\$* --.tr aabbccddeeffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz --.. --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --.\" SH-xref - format a cross-reference to an SH section --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --.de SH-xref --.ie n \{\ --.\} --.toupper \\$* --.el \{\ --\\$* --.\} --.. --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --.\" SH - level-one heading that works better for non-TTY output --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --.de1 SH --.\" put an extra blank line of space above the head in non-TTY output --.if t \{\ --.sp 1 --.\} --.sp \\n[PD]u --.nr an-level 1 --.set-an-margin --.nr an-prevailing-indent \\n[IN] --.fi --.in \\n[an-margin]u --.ti 0 --.HTML-TAG ".NH \\n[an-level]" --.it 1 an-trap --.nr an-no-space-flag 1 --.nr an-break-flag 1 --\." make the size of the head bigger --.ps +3 --.ft B --.ne (2v + 1u) --.ie n \{\ --.\" if n (TTY output), use uppercase --.toupper \\$* --.\} --.el \{\ --.nr an-break-flag 0 --.\" if not n (not TTY), use normal case (not uppercase) --\\$1 --.in \\n[an-margin]u --.ti 0 --.\" if not n (not TTY), put a border/line under subheading --.sp -.6 --\l'\n(.lu' --.\} --.. --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --.\" SS - level-two heading that works better for non-TTY output --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --.de1 SS --.sp \\n[PD]u --.nr an-level 1 --.set-an-margin --.nr an-prevailing-indent \\n[IN] --.fi --.in \\n[IN]u --.ti \\n[SN]u --.it 1 an-trap --.nr an-no-space-flag 1 --.nr an-break-flag 1 --.ps \\n[PS-SS]u --\." make the size of the head bigger --.ps +2 --.ft B --.ne (2v + 1u) --.if \\n[.$] \&\\$* --.. --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --.\" BB/BE - put background/screen (filled box) around block of text --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --.de BB --.if t \{\ --.sp -.5 --.br --.in +2n --.ll -2n --.gcolor red --.di BX --.\} --.. --.de EB --.if t \{\ --.if "\\$2"adjust-for-leading-newline" \{\ --.sp -1 --.\} --.br --.di --.in --.ll --.gcolor --.nr BW \\n(.lu-\\n(.i --.nr BH \\n(dn+.5v --.ne \\n(BHu+.5v --.ie "\\$2"adjust-for-leading-newline" \{\ --\M[\\$1]\h'1n'\v'+.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] --.\} --.el \{\ --\M[\\$1]\h'1n'\v'-.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] --.\} --.in 0 --.sp -.5v --.nf --.BX --.in --.sp .5v --.fi --.\} --.. --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --.\" BM/EM - put colored marker in margin next to block of text --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --.de BM --.if t \{\ --.br --.ll -2n --.gcolor red --.di BX --.\} --.. --.de EM --.if t \{\ --.br --.di --.ll --.gcolor --.nr BH \\n(dn --.ne \\n(BHu --\M[\\$1]\D'P -.75n 0 0 \\n(BHu -(\\n[.i]u - \\n(INu - .75n) 0 0 -\\n(BHu'\M[] --.in 0 --.nf --.BX --.in --.fi --.\} --.. -+.TH "ACCESS\&.CONF" "5" "08/24/2009" "Linux-PAM Manual" "Linux\-PAM Manual" - .\" ----------------------------------------------------------------- - .\" * set default formatting - .\" ----------------------------------------------------------------- -@@ -166,19 +18,19 @@ - .\" ----------------------------------------------------------------- - .\" * MAIN CONTENT STARTS HERE * - .\" ----------------------------------------------------------------- --.SH "Name" -+.SH "NAME" - access.conf \- the login access control table file - .SH "DESCRIPTION" - .PP - The --\FC/etc/security/access\&.conf\F[] -+/etc/security/access\&.conf - file specifies (\fIuser/group\fR, - \fIhost\fR), (\fIuser/group\fR, - \fInetwork/netmask\fR) or (\fIuser/group\fR, - \fItty\fR) combinations for which a login will be either accepted or refused\&. - .PP - When someone logs in, the file --\FCaccess\&.conf\F[] -+access\&.conf - is scanned for the first entry that matches the (\fIuser/group\fR, - \fIhost\fR) or (\fIuser/group\fR, - \fInetwork/netmask\fR) combination, or, in case of non\-networked logins, the first entry that matches the (\fIuser/group\fR, -@@ -228,7 +80,7 @@ - .SH "EXAMPLES" - .PP - These are some example lines which might be specified in --\FC/etc/security/access\&.conf\F[]\&. -+/etc/security/access\&.conf\&. - .PP - User - \fIroot\fR -@@ -252,9 +104,9 @@ - User - \fIroot\fR - should get access from network --\FC192\&.168\&.201\&.\F[] -+192\&.168\&.201\&. - where the term will be evaluated by string matching\&. But it might be better to use network/netmask instead\&. The same meaning of --\FC192\&.168\&.201\&.\F[] -+192\&.168\&.201\&. - is - \fI192\&.168\&.201\&.0/24\fR - or -@@ -320,7 +172,7 @@ +@@ -174,7 +174,7 @@ \fBpam_access\fR(8), \fBpam.d\fR(5), @@ -484,7 +274,7 @@ Index: pam.deb/modules/pam_access/access.conf.5.xml =================================================================== --- pam.deb.orig/modules/pam_access/access.conf.5.xml +++ pam.deb/modules/pam_access/access.conf.5.xml -@@ -186,7 +186,7 @@ +@@ -191,7 +191,7 @@ pam_access8, pam.d5, @@ -3172,7 +2962,7 @@ Index: pam.deb/modules/pam_exec/pam_exec.8 -.\" Generator: DocBook XSL Stylesheets v1.74.0 -.\" Date: 06/16/2009 +.\" Generator: DocBook XSL Stylesheets v1.75.2 -+.\" Date: 08/24/2009 ++.\" Date: 02/01/2010 .\" Manual: Linux-PAM Manual .\" Source: Linux-PAM Manual .\" Language: English @@ -3327,7 +3117,7 @@ Index: pam.deb/modules/pam_exec/pam_exec.8 -.fi -.\} -.. -+.TH "PAM_EXEC" "8" "08/24/2009" "Linux-PAM Manual" "Linux\-PAM Manual" ++.TH "PAM_EXEC" "8" "02/01/2010" "Linux-PAM Manual" "Linux\-PAM Manual" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- @@ -7293,7 +7083,7 @@ Index: pam.deb/modules/pam_nologin/pam_nologin.8 -.\" Generator: DocBook XSL Stylesheets v1.74.0 -.\" Date: 03/02/2009 +.\" Generator: DocBook XSL Stylesheets v1.75.2 -+.\" Date: 08/24/2009 ++.\" Date: 02/01/2010 .\" Manual: Linux-PAM Manual .\" Source: Linux-PAM Manual .\" Language: English @@ -7448,7 +7238,7 @@ Index: pam.deb/modules/pam_nologin/pam_nologin.8 -.fi -.\} -.. -+.TH "PAM_NOLOGIN" "8" "08/24/2009" "Linux-PAM Manual" "Linux\-PAM Manual" ++.TH "PAM_NOLOGIN" "8" "02/01/2010" "Linux-PAM Manual" "Linux\-PAM Manual" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- @@ -8583,7 +8373,7 @@ Index: pam.deb/modules/pam_selinux/pam_selinux.8 -.\" Generator: DocBook XSL Stylesheets v1.74.0 -.\" Date: 06/16/2009 +.\" Generator: DocBook XSL Stylesheets v1.75.2 -+.\" Date: 08/24/2009 ++.\" Date: 02/01/2010 .\" Manual: Linux-PAM Manual .\" Source: Linux-PAM Manual .\" Language: English @@ -8738,7 +8528,7 @@ Index: pam.deb/modules/pam_selinux/pam_selinux.8 -.fi -.\} -.. -+.TH "PAM_SELINUX" "8" "08/24/2009" "Linux-PAM Manual" "Linux\-PAM Manual" ++.TH "PAM_SELINUX" "8" "02/01/2010" "Linux-PAM Manual" "Linux\-PAM Manual" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- @@ -8811,9 +8601,35 @@ Index: pam.deb/modules/pam_sepermit/pam_sepermit.8 =================================================================== --- pam.deb.orig/modules/pam_sepermit/pam_sepermit.8 +++ pam.deb/modules/pam_sepermit/pam_sepermit.8 +@@ -116,7 +116,7 @@ + \fBsepermit.conf\fR(5), + \fBpam.conf\fR(5), + \fBpam.d\fR(5), +-\fBpam\fR(8) ++\fBpam\fR(7) + \fBselinux\fR(8) + .SH "AUTHOR" + .PP +Index: pam.deb/modules/pam_sepermit/pam_sepermit.8.xml +=================================================================== +--- pam.deb.orig/modules/pam_sepermit/pam_sepermit.8.xml ++++ pam.deb/modules/pam_sepermit/pam_sepermit.8.xml +@@ -176,7 +176,7 @@ + pam.d5 + , + +- pam8 ++ pam7 + + + selinux8 +Index: pam.deb/modules/pam_shells/pam_shells.8 +=================================================================== +--- pam.deb.orig/modules/pam_shells/pam_shells.8 ++++ pam.deb/modules/pam_shells/pam_shells.8 @@ -1,161 +1,13 @@ +'\" t - .\" Title: pam_sepermit + .\" Title: pam_shells .\" Author: [see the "AUTHOR" section] -.\" Generator: DocBook XSL Stylesheets v1.74.0 -.\" Date: 03/02/2009 @@ -8823,7 +8639,7 @@ Index: pam.deb/modules/pam_sepermit/pam_sepermit.8 .\" Source: Linux-PAM Manual .\" Language: English .\" --.TH "PAM_SEPERMIT" "8" "03/02/2009" "Linux-PAM Manual" "Linux\-PAM Manual" +-.TH "PAM_SHELLS" "8" "03/02/2009" "Linux-PAM Manual" "Linux\-PAM Manual" -.\" ----------------------------------------------------------------- -.\" * (re)Define some macros -.\" ----------------------------------------------------------------- @@ -8973,36 +8789,45 @@ Index: pam.deb/modules/pam_sepermit/pam_sepermit.8 -.fi -.\} -.. -+.TH "PAM_SEPERMIT" "8" "08/24/2009" "Linux-PAM Manual" "Linux\-PAM Manual" ++.TH "PAM_SHELLS" "8" "08/24/2009" "Linux-PAM Manual" "Linux\-PAM Manual" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- -@@ -166,13 +18,11 @@ +@@ -166,20 +18,18 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- -.SH "Name" +.SH "NAME" - pam_sepermit \- PAM module to allow/deny login depending on SELinux enforcement state + pam_shells \- PAM module to check for valid login shell -.SH "Synopsis" -.fam C +.SH "SYNOPSIS" - .HP \w'\fBpam_sepermit\&.so\fR\ 'u - \fBpam_sepermit\&.so\fR [debug] [conf=\fI/path/to/config/file\fR] + .HP \w'\fBpam_shells\&.so\fR\ 'u + \fBpam_shells\&.so\fR -.fam .SH "DESCRIPTION" .PP - The pam_sepermit module allows or denies login depending on SELinux enforcement state\&. -@@ -242,7 +92,7 @@ - .RE - .SH "FILES" + pam_shells is a PAM module that only allows access to the system if the users shell is listed in +-\FC/etc/shells\F[]\&. ++/etc/shells\&. + .PP + It also checks if +-\FC/etc/shells\F[] ++/etc/shells + is a plain file and not world writable\&. + .SH "OPTIONS" .PP --\FC/etc/security/sepermit\&.conf\F[] -+/etc/security/sepermit\&.conf +@@ -201,7 +51,7 @@ + PAM_SUCCESS .RS 4 - Default configuration file + The users login shell was listed as valid shell in +-\FC/etc/shells\F[]\&. ++/etc/shells\&. .RE -@@ -251,27 +101,13 @@ + .PP + PAM_SERVICE_ERR +@@ -215,24 +65,10 @@ .if n \{\ .RS 4 .\} @@ -9015,11 +8840,8 @@ Index: pam.deb/modules/pam_sepermit/pam_sepermit.8 -.BB lightgray adjust-for-leading-newline -.sp -1 - - auth [success=done ignore=ignore default=bad] pam_sepermit\&.so - auth required pam_unix\&.so - account required pam_unix\&.so - session required pam_permit\&.so - + auth required pam_shells\&.so + -.EB lightgray adjust-for-leading-newline -.if t \{\ -.sp 1 @@ -9030,267 +8852,16 @@ Index: pam.deb/modules/pam_sepermit/pam_sepermit.8 .if n \{\ .RE .\} -@@ -280,7 +116,7 @@ - +@@ -243,7 +79,7 @@ + \fBshells\fR(5), \fBpam.conf\fR(5), - \fBpam.d\fR(8), + \fBpam.d\fR(5), -\fBpam\fR(8) +\fBpam\fR(7) .SH "AUTHOR" .PP - pam_sepermit was written by Tomas Mraz \&. -Index: pam.deb/modules/pam_sepermit/pam_sepermit.8.xml -=================================================================== ---- pam.deb.orig/modules/pam_sepermit/pam_sepermit.8.xml -+++ pam.deb/modules/pam_sepermit/pam_sepermit.8.xml -@@ -174,7 +174,7 @@ - pam.d8 - , - -- pam8 -+ pam7 - - - -Index: pam.deb/modules/pam_shells/pam_shells.8 -=================================================================== ---- pam.deb.orig/modules/pam_shells/pam_shells.8 -+++ pam.deb/modules/pam_shells/pam_shells.8 -@@ -1,161 +1,13 @@ -+'\" t - .\" Title: pam_shells - .\" Author: [see the "AUTHOR" section] --.\" Generator: DocBook XSL Stylesheets v1.74.0 --.\" Date: 03/02/2009 -+.\" Generator: DocBook XSL Stylesheets v1.75.2 -+.\" Date: 08/24/2009 - .\" Manual: Linux-PAM Manual - .\" Source: Linux-PAM Manual - .\" Language: English - .\" --.TH "PAM_SHELLS" "8" "03/02/2009" "Linux-PAM Manual" "Linux\-PAM Manual" --.\" ----------------------------------------------------------------- --.\" * (re)Define some macros --.\" ----------------------------------------------------------------- --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --.\" toupper - uppercase a string (locale-aware) --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --.de toupper --.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ --\\$* --.tr aabbccddeeffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz --.. --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --.\" SH-xref - format a cross-reference to an SH section --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --.de SH-xref --.ie n \{\ --.\} --.toupper \\$* --.el \{\ --\\$* --.\} --.. --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --.\" SH - level-one heading that works better for non-TTY output --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --.de1 SH --.\" put an extra blank line of space above the head in non-TTY output --.if t \{\ --.sp 1 --.\} --.sp \\n[PD]u --.nr an-level 1 --.set-an-margin --.nr an-prevailing-indent \\n[IN] --.fi --.in \\n[an-margin]u --.ti 0 --.HTML-TAG ".NH \\n[an-level]" --.it 1 an-trap --.nr an-no-space-flag 1 --.nr an-break-flag 1 --\." make the size of the head bigger --.ps +3 --.ft B --.ne (2v + 1u) --.ie n \{\ --.\" if n (TTY output), use uppercase --.toupper \\$* --.\} --.el \{\ --.nr an-break-flag 0 --.\" if not n (not TTY), use normal case (not uppercase) --\\$1 --.in \\n[an-margin]u --.ti 0 --.\" if not n (not TTY), put a border/line under subheading --.sp -.6 --\l'\n(.lu' --.\} --.. --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --.\" SS - level-two heading that works better for non-TTY output --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --.de1 SS --.sp \\n[PD]u --.nr an-level 1 --.set-an-margin --.nr an-prevailing-indent \\n[IN] --.fi --.in \\n[IN]u --.ti \\n[SN]u --.it 1 an-trap --.nr an-no-space-flag 1 --.nr an-break-flag 1 --.ps \\n[PS-SS]u --\." make the size of the head bigger --.ps +2 --.ft B --.ne (2v + 1u) --.if \\n[.$] \&\\$* --.. --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --.\" BB/BE - put background/screen (filled box) around block of text --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --.de BB --.if t \{\ --.sp -.5 --.br --.in +2n --.ll -2n --.gcolor red --.di BX --.\} --.. --.de EB --.if t \{\ --.if "\\$2"adjust-for-leading-newline" \{\ --.sp -1 --.\} --.br --.di --.in --.ll --.gcolor --.nr BW \\n(.lu-\\n(.i --.nr BH \\n(dn+.5v --.ne \\n(BHu+.5v --.ie "\\$2"adjust-for-leading-newline" \{\ --\M[\\$1]\h'1n'\v'+.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] --.\} --.el \{\ --\M[\\$1]\h'1n'\v'-.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] --.\} --.in 0 --.sp -.5v --.nf --.BX --.in --.sp .5v --.fi --.\} --.. --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --.\" BM/EM - put colored marker in margin next to block of text --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --.de BM --.if t \{\ --.br --.ll -2n --.gcolor red --.di BX --.\} --.. --.de EM --.if t \{\ --.br --.di --.ll --.gcolor --.nr BH \\n(dn --.ne \\n(BHu --\M[\\$1]\D'P -.75n 0 0 \\n(BHu -(\\n[.i]u - \\n(INu - .75n) 0 0 -\\n(BHu'\M[] --.in 0 --.nf --.BX --.in --.fi --.\} --.. -+.TH "PAM_SHELLS" "8" "08/24/2009" "Linux-PAM Manual" "Linux\-PAM Manual" - .\" ----------------------------------------------------------------- - .\" * set default formatting - .\" ----------------------------------------------------------------- -@@ -166,20 +18,18 @@ - .\" ----------------------------------------------------------------- - .\" * MAIN CONTENT STARTS HERE * - .\" ----------------------------------------------------------------- --.SH "Name" -+.SH "NAME" - pam_shells \- PAM module to check for valid login shell --.SH "Synopsis" --.fam C -+.SH "SYNOPSIS" - .HP \w'\fBpam_shells\&.so\fR\ 'u - \fBpam_shells\&.so\fR --.fam - .SH "DESCRIPTION" - .PP - pam_shells is a PAM module that only allows access to the system if the users shell is listed in --\FC/etc/shells\F[]\&. -+/etc/shells\&. - .PP - It also checks if --\FC/etc/shells\F[] -+/etc/shells - is a plain file and not world writable\&. - .SH "OPTIONS" - .PP -@@ -201,7 +51,7 @@ - PAM_SUCCESS - .RS 4 - The users login shell was listed as valid shell in --\FC/etc/shells\F[]\&. -+/etc/shells\&. - .RE - .PP - PAM_SERVICE_ERR -@@ -215,24 +65,10 @@ - .if n \{\ - .RS 4 - .\} --.fam C --.ps -1 - .nf --.if t \{\ --.sp -1 --.\} --.BB lightgray adjust-for-leading-newline --.sp -1 -- - auth required pam_shells\&.so - --.EB lightgray adjust-for-leading-newline --.if t \{\ --.sp 1 --.\} - .fi --.fam --.ps +1 - .if n \{\ - .RE - .\} -@@ -243,7 +79,7 @@ - \fBshells\fR(5), - \fBpam.conf\fR(5), - \fBpam.d\fR(5), --\fBpam\fR(8) -+\fBpam\fR(7) - .SH "AUTHOR" - .PP - pam_shells was written by Erik Troan \&. -Index: pam.deb/modules/pam_shells/pam_shells.8.xml + pam_shells was written by Erik Troan \&. +Index: pam.deb/modules/pam_shells/pam_shells.8.xml =================================================================== --- pam.deb.orig/modules/pam_shells/pam_shells.8.xml +++ pam.deb/modules/pam_shells/pam_shells.8.xml @@ -10356,7 +9927,173 @@ Index: pam.deb/modules/pam_unix/pam_unix.8 =================================================================== --- pam.deb.orig/modules/pam_unix/pam_unix.8 +++ pam.deb/modules/pam_unix/pam_unix.8 -@@ -255,7 +255,7 @@ +@@ -1,161 +1,13 @@ ++'\" t + .\" Title: pam_unix + .\" Author: [see the "AUTHOR" section] +-.\" Generator: DocBook XSL Stylesheets v1.74.0 +-.\" Date: 06/29/2009 ++.\" Generator: DocBook XSL Stylesheets v1.75.2 ++.\" Date: 02/01/2010 + .\" Manual: Linux-PAM Manual + .\" Source: Linux-PAM Manual + .\" Language: English + .\" +-.TH "PAM_UNIX" "8" "06/29/2009" "Linux-PAM Manual" "Linux\-PAM Manual" +-.\" ----------------------------------------------------------------- +-.\" * (re)Define some macros +-.\" ----------------------------------------------------------------- +-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +-.\" toupper - uppercase a string (locale-aware) +-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +-.de toupper +-.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ +-\\$* +-.tr aabbccddeeffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz +-.. +-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +-.\" SH-xref - format a cross-reference to an SH section +-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +-.de SH-xref +-.ie n \{\ +-.\} +-.toupper \\$* +-.el \{\ +-\\$* +-.\} +-.. +-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +-.\" SH - level-one heading that works better for non-TTY output +-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +-.de1 SH +-.\" put an extra blank line of space above the head in non-TTY output +-.if t \{\ +-.sp 1 +-.\} +-.sp \\n[PD]u +-.nr an-level 1 +-.set-an-margin +-.nr an-prevailing-indent \\n[IN] +-.fi +-.in \\n[an-margin]u +-.ti 0 +-.HTML-TAG ".NH \\n[an-level]" +-.it 1 an-trap +-.nr an-no-space-flag 1 +-.nr an-break-flag 1 +-\." make the size of the head bigger +-.ps +3 +-.ft B +-.ne (2v + 1u) +-.ie n \{\ +-.\" if n (TTY output), use uppercase +-.toupper \\$* +-.\} +-.el \{\ +-.nr an-break-flag 0 +-.\" if not n (not TTY), use normal case (not uppercase) +-\\$1 +-.in \\n[an-margin]u +-.ti 0 +-.\" if not n (not TTY), put a border/line under subheading +-.sp -.6 +-\l'\n(.lu' +-.\} +-.. +-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +-.\" SS - level-two heading that works better for non-TTY output +-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +-.de1 SS +-.sp \\n[PD]u +-.nr an-level 1 +-.set-an-margin +-.nr an-prevailing-indent \\n[IN] +-.fi +-.in \\n[IN]u +-.ti \\n[SN]u +-.it 1 an-trap +-.nr an-no-space-flag 1 +-.nr an-break-flag 1 +-.ps \\n[PS-SS]u +-\." make the size of the head bigger +-.ps +2 +-.ft B +-.ne (2v + 1u) +-.if \\n[.$] \&\\$* +-.. +-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +-.\" BB/BE - put background/screen (filled box) around block of text +-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +-.de BB +-.if t \{\ +-.sp -.5 +-.br +-.in +2n +-.ll -2n +-.gcolor red +-.di BX +-.\} +-.. +-.de EB +-.if t \{\ +-.if "\\$2"adjust-for-leading-newline" \{\ +-.sp -1 +-.\} +-.br +-.di +-.in +-.ll +-.gcolor +-.nr BW \\n(.lu-\\n(.i +-.nr BH \\n(dn+.5v +-.ne \\n(BHu+.5v +-.ie "\\$2"adjust-for-leading-newline" \{\ +-\M[\\$1]\h'1n'\v'+.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] +-.\} +-.el \{\ +-\M[\\$1]\h'1n'\v'-.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] +-.\} +-.in 0 +-.sp -.5v +-.nf +-.BX +-.in +-.sp .5v +-.fi +-.\} +-.. +-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +-.\" BM/EM - put colored marker in margin next to block of text +-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +-.de BM +-.if t \{\ +-.br +-.ll -2n +-.gcolor red +-.di BX +-.\} +-.. +-.de EM +-.if t \{\ +-.br +-.di +-.ll +-.gcolor +-.nr BH \\n(dn +-.ne \\n(BHu +-\M[\\$1]\D'P -.75n 0 0 \\n(BHu -(\\n[.i]u - \\n(INu - .75n) 0 0 -\\n(BHu'\M[] +-.in 0 +-.nf +-.BX +-.in +-.fi +-.\} +-.. ++.TH "PAM_UNIX" "8" "02/01/2010" "Linux-PAM Manual" "Linux\-PAM Manual" + .\" ----------------------------------------------------------------- + .\" * set default formatting + .\" ----------------------------------------------------------------- +@@ -403,7 +255,7 @@ \fBpam.conf\fR(5), \fBpam.d\fR(5), diff --git a/debian/patches-applied/autoconf.patch b/debian/patches-applied/autoconf.patch index 4e5066c3..89b63723 100644 --- a/debian/patches-applied/autoconf.patch +++ b/debian/patches-applied/autoconf.patch @@ -7,41 +7,195 @@ The process for refreshing this patch is: quilt refresh find . -name '*.rej' | xargs rm -Index: pam.deb/Makefile.in +Index: pam.deb/ltmain.sh =================================================================== ---- pam.deb.orig/Makefile.in -+++ pam.deb/Makefile.in -@@ -39,12 +39,11 @@ - DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/config.h.in \ - $(top_srcdir)/configure ABOUT-NLS AUTHORS COPYING ChangeLog \ -- INSTALL NEWS compile config.guess config.rpath config.sub \ -+ INSTALL NEWS TODO compile config.guess config.rpath config.sub \ - depcomp install-sh ltmain.sh missing mkinstalldirs ylwrap - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ -- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ - $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ - $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ -@@ -53,7 +52,7 @@ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ -- $(top_srcdir)/configure.in -+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ -@@ -169,6 +168,7 @@ - PACKAGE_NAME = @PACKAGE_NAME@ - PACKAGE_STRING = @PACKAGE_STRING@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PIE_CFLAGS = @PIE_CFLAGS@ +--- pam.deb.orig/ltmain.sh ++++ pam.deb/ltmain.sh +@@ -65,7 +65,7 @@ + # compiler: $LTCC + # compiler flags: $LTCFLAGS + # linker: $LD (gnu? $with_gnu_ld) +-# $progname: (GNU libtool) 2.2.6 ++# $progname: (GNU libtool) 2.2.6 Debian-2.2.6a-4 + # automake: $automake_version + # autoconf: $autoconf_version + # +@@ -73,7 +73,7 @@ + + PROGRAM=ltmain.sh + PACKAGE=libtool +-VERSION=2.2.6 ++VERSION="2.2.6 Debian-2.2.6a-4" + TIMESTAMP="" + package_revision=1.3012 + +@@ -116,15 +116,15 @@ + + : ${CP="cp -f"} + : ${ECHO="echo"} +-: ${EGREP="/usr/bin/grep -E"} +-: ${FGREP="/usr/bin/grep -F"} +-: ${GREP="/usr/bin/grep"} ++: ${EGREP="/bin/grep -E"} ++: ${FGREP="/bin/grep -F"} ++: ${GREP="/bin/grep"} + : ${LN_S="ln -s"} + : ${MAKE="make"} + : ${MKDIR="mkdir"} + : ${MV="mv -f"} + : ${RM="rm -f"} +-: ${SED="/opt/local/bin/gsed"} ++: ${SED="/bin/sed"} + : ${SHELL="${CONFIG_SHELL-/bin/sh}"} + : ${Xsed="$SED -e 1s/^X//"} + +@@ -5033,7 +5033,10 @@ + case $pass in + dlopen) libs="$dlfiles" ;; + dlpreopen) libs="$dlprefiles" ;; +- link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; ++ link) ++ libs="$deplibs %DEPLIBS%" ++ test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs" ++ ;; + esac + fi + if test "$linkmode,$pass" = "lib,dlpreopen"; then +@@ -5344,19 +5347,19 @@ + # It is a libtool convenience library, so add in its objects. + convenience="$convenience $ladir/$objdir/$old_library" + old_convenience="$old_convenience $ladir/$objdir/$old_library" ++ tmp_libs= ++ for deplib in $dependency_libs; do ++ deplibs="$deplib $deplibs" ++ if $opt_duplicate_deps ; then ++ case "$tmp_libs " in ++ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; ++ esac ++ fi ++ tmp_libs="$tmp_libs $deplib" ++ done + elif test "$linkmode" != prog && test "$linkmode" != lib; then + func_fatal_error "\`$lib' is not a convenience library" + fi +- tmp_libs= +- for deplib in $dependency_libs; do +- deplibs="$deplib $deplibs" +- if $opt_duplicate_deps ; then +- case "$tmp_libs " in +- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; +- esac +- fi +- tmp_libs="$tmp_libs $deplib" +- done + continue + fi # $pass = conv + +@@ -5893,6 +5896,7 @@ + if test "$link_all_deplibs" != no; then + # Add the search paths of all dependency libraries + for deplib in $dependency_libs; do ++ path= + case $deplib in + -L*) path="$deplib" ;; + *.la) +@@ -6206,6 +6210,9 @@ + revision="$number_minor" + lt_irix_increment=no + ;; ++ *) ++ func_fatal_configuration "$modename: unknown library version type \`$version_type'" ++ ;; + esac + ;; + no) +Index: pam.deb/m4/libtool.m4 +=================================================================== +--- pam.deb.orig/m4/libtool.m4 ++++ pam.deb/m4/libtool.m4 +@@ -2485,6 +2485,18 @@ + dynamic_linker='GNU/Linux ld.so' + ;; + ++netbsdelf*-gnu) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ dynamic_linker='NetBSD ld.elf_so' ++ ;; ++ + netbsd*) + version_type=sunos + need_lib_prefix=no +@@ -3076,7 +3088,7 @@ + lt_cv_deplibs_check_method=pass_all + ;; + +-netbsd*) ++netbsd* | netbsdelf*-gnu) + 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 +@@ -3757,7 +3769,7 @@ + ;; + esac + ;; +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + ;; + *qnx* | *nto*) + # QNX uses GNU C++, but need to define -shared option too, otherwise +@@ -4182,6 +4194,9 @@ + cygwin* | mingw* | cegcc*) + _LT_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' + ;; ++ linux* | k*bsd*-gnu) ++ _LT_TAGVAR(link_all_deplibs, $1)=no ++ ;; + *) + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + ;; +@@ -4246,6 +4261,9 @@ + openbsd*) + with_gnu_ld=no + ;; ++ linux* | k*bsd*-gnu) ++ _LT_TAGVAR(link_all_deplibs, $1)=no ++ ;; + esac + + _LT_TAGVAR(ld_shlibs, $1)=yes +@@ -4428,7 +4446,7 @@ + fi + ;; + +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= +@@ -4603,6 +4621,7 @@ + if test "$aix_use_runtimelinking" = yes; then + shared_flag="$shared_flag "'${wl}-G' + fi ++ _LT_TAGVAR(link_all_deplibs, $1)=no + else + # not using gcc + if test "$host_cpu" = ia64; then +@@ -4841,7 +4860,7 @@ + _LT_TAGVAR(link_all_deplibs, $1)=yes + ;; + +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out + else Index: pam.deb/aclocal.m4 =================================================================== --- pam.deb.orig/aclocal.m4 @@ -57,7 +211,7 @@ Index: pam.deb/aclocal.m4 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'.])]) -@@ -934,7 +934,6 @@ +@@ -1008,7 +1008,6 @@ m4_include([m4/gettext.m4]) m4_include([m4/iconv.m4]) m4_include([m4/intlmacosx.m4]) @@ -65,11 +219,25 @@ Index: pam.deb/aclocal.m4 m4_include([m4/jh_path_xml_catalog.m4]) m4_include([m4/ld-O1.m4]) m4_include([m4/ld-as-needed.m4]) -@@ -950,3 +949,4 @@ +@@ -1024,3 +1023,4 @@ m4_include([m4/nls.m4]) m4_include([m4/po.m4]) m4_include([m4/progtest.m4]) +m4_include([acinclude.m4]) +Index: pam.deb/config.h.in +=================================================================== +--- pam.deb.orig/config.h.in ++++ pam.deb/config.h.in +@@ -294,6 +294,9 @@ + /* Define to the one symbol short name of this package. */ + #undef PACKAGE_TARNAME + ++/* Define to the home page for this package. */ ++#undef PACKAGE_URL ++ + /* Define to the version of this package. */ + #undef PACKAGE_VERSION + Index: pam.deb/configure =================================================================== --- pam.deb.orig/configure @@ -875,7 +1043,7 @@ Index: pam.deb/configure ac_unique_file="conf/pam_conv1/pam_conv_y.y" ac_default_prefix=/usr -@@ -955,6 +908,7 @@ +@@ -957,6 +910,7 @@ program_transform_name prefix exec_prefix @@ -883,7 +1051,7 @@ Index: pam.deb/configure PACKAGE_BUGREPORT PACKAGE_STRING PACKAGE_VERSION -@@ -1117,8 +1071,7 @@ +@@ -1120,8 +1074,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && @@ -893,7 +1061,7 @@ Index: pam.deb/configure ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in -@@ -1144,8 +1097,7 @@ +@@ -1147,8 +1100,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && @@ -903,7 +1071,7 @@ Index: pam.deb/configure ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in -@@ -1349,8 +1301,7 @@ +@@ -1352,8 +1304,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && @@ -913,7 +1081,7 @@ Index: pam.deb/configure ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in -@@ -1366,8 +1317,7 @@ +@@ -1369,8 +1320,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && @@ -923,7 +1091,7 @@ Index: pam.deb/configure ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in -@@ -1397,17 +1347,17 @@ +@@ -1400,17 +1350,17 @@ | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; @@ -947,7 +1115,7 @@ Index: pam.deb/configure eval $ac_envvar=\$ac_optarg export $ac_envvar ;; -@@ -1424,15 +1374,13 @@ +@@ -1427,15 +1377,13 @@ if test -n "$ac_prev"; then ac_option=--`echo $ac_prev | sed 's/_/-/g'` @@ -965,7 +1133,7 @@ Index: pam.deb/configure *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; esac fi -@@ -1455,8 +1403,7 @@ +@@ -1458,8 +1406,7 @@ [\\/$]* | ?:[\\/]* ) continue;; NONE | '' ) case $ac_var in *prefix ) continue;; esac;; esac @@ -975,7 +1143,7 @@ Index: pam.deb/configure done # There might be people who depend on the old broken behavior: `$host' -@@ -1486,11 +1433,9 @@ +@@ -1489,11 +1436,9 @@ ac_pwd=`pwd` && test -n "$ac_pwd" && ac_ls_di=`ls -di .` && ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || @@ -989,7 +1157,7 @@ Index: pam.deb/configure # Find the source files, if location was not specified. -@@ -1529,13 +1474,11 @@ +@@ -1532,13 +1477,11 @@ fi if test ! -r "$srcdir/$ac_unique_file"; then test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." @@ -1005,7 +1173,7 @@ Index: pam.deb/configure pwd)` # When building in place, set srcdir=. if test "$ac_abs_confdir" = "$ac_pwd"; then -@@ -1712,6 +1655,7 @@ +@@ -1717,6 +1660,7 @@ Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. @@ -1013,7 +1181,7 @@ Index: pam.deb/configure _ACEOF ac_status=$? fi -@@ -1775,21 +1719,465 @@ +@@ -1780,21 +1724,465 @@ if $ac_init_version; then cat <<\_ACEOF configure @@ -1483,7 +1651,7 @@ Index: pam.deb/configure $ $0 $@ -@@ -1825,8 +2213,8 @@ +@@ -1830,8 +2218,8 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -1494,7 +1662,7 @@ Index: pam.deb/configure IFS=$as_save_IFS } >&5 -@@ -1863,9 +2251,9 @@ +@@ -1868,9 +2256,9 @@ ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; esac case $ac_pass in @@ -1506,7 +1674,7 @@ Index: pam.deb/configure if test $ac_must_keep_next = true; then ac_must_keep_next=false # Got value, back to normal. else -@@ -1881,13 +2269,13 @@ +@@ -1886,13 +2274,13 @@ -* ) ac_must_keep_next=true ;; esac fi @@ -1523,7 +1691,7 @@ Index: pam.deb/configure # When interrupted or exit'd, cleanup temporary files, and complete # config.log. We remove comments because anyway the quotes in there -@@ -1912,13 +2300,13 @@ +@@ -1917,13 +2305,13 @@ case $ac_val in #( *${as_nl}*) case $ac_var in #( @@ -1539,7 +1707,7 @@ Index: pam.deb/configure esac ;; esac done -@@ -1990,39 +2378,41 @@ +@@ -1995,39 +2383,41 @@ exit $exit_status ' 0 for ac_signal in 1 2 13 15; do @@ -1586,7 +1754,7 @@ Index: pam.deb/configure # Let the site file select an alternate cache file if it wants to. # Prefer an explicitly selected file to automatically selected ones. -@@ -2041,7 +2431,7 @@ +@@ -2046,7 +2436,7 @@ do test "x$ac_site_file" = xNONE && continue if test -r "$ac_site_file"; then @@ -1595,7 +1763,7 @@ Index: pam.deb/configure $as_echo "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 . "$ac_site_file" -@@ -2052,7 +2442,7 @@ +@@ -2057,7 +2447,7 @@ # Some versions of bash will fail to source /dev/null (special # files actually), so we avoid doing that. if test -f "$cache_file"; then @@ -1604,7 +1772,7 @@ Index: pam.deb/configure $as_echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in [\\/]* | ?:[\\/]* ) . "$cache_file";; -@@ -2060,7 +2450,7 @@ +@@ -2065,7 +2455,7 @@ esac fi else @@ -1613,7 +1781,7 @@ Index: pam.deb/configure $as_echo "$as_me: creating cache $cache_file" >&6;} >$cache_file fi -@@ -2076,11 +2466,11 @@ +@@ -2081,11 +2471,11 @@ eval ac_new_val=\$ac_env_${ac_var}_value case $ac_old_set,$ac_new_set in set,) @@ -1627,7 +1795,7 @@ Index: pam.deb/configure $as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_cache_corrupted=: ;; ,);; -@@ -2090,17 +2480,17 @@ +@@ -2095,17 +2485,17 @@ ac_old_val_w=`echo x $ac_old_val` ac_new_val_w=`echo x $ac_new_val` if test "$ac_old_val_w" != "$ac_new_val_w"; then @@ -1649,7 +1817,7 @@ Index: pam.deb/configure $as_echo "$as_me: current value: \`$ac_new_val'" >&2;} fi;; esac -@@ -2112,35 +2502,20 @@ +@@ -2117,35 +2507,20 @@ esac case " $ac_configure_args " in *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. @@ -1692,7 +1860,7 @@ Index: pam.deb/configure ac_ext=c ac_cpp='$CPP $CPPFLAGS' -@@ -2154,24 +2529,16 @@ +@@ -2159,24 +2534,16 @@ ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do @@ -1725,7 +1893,7 @@ Index: pam.deb/configure fi # These three variables are undocumented and unsupported, -@@ -2197,10 +2564,10 @@ +@@ -2202,10 +2569,10 @@ # OS/2's system install, which has a completely different semantic # ./install, which can be erroneously created by make from ./install.sh. # Reject install programs that cannot install multiple files. @@ -1738,7 +1906,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -@@ -2208,11 +2575,11 @@ +@@ -2213,11 +2580,11 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -1754,7 +1922,7 @@ Index: pam.deb/configure /usr/ucb/* ) ;; *) # OSF1 and SCO ODT 3.0 have their own names for install. -@@ -2249,7 +2616,7 @@ +@@ -2254,7 +2621,7 @@ ;; esac @@ -1763,7 +1931,7 @@ Index: pam.deb/configure IFS=$as_save_IFS rm -rf conftest.one conftest.two conftest.dir -@@ -2265,7 +2632,7 @@ +@@ -2270,7 +2637,7 @@ INSTALL=$ac_install_sh fi fi @@ -1772,7 +1940,7 @@ Index: pam.deb/configure $as_echo "$INSTALL" >&6; } # Use test -z because SunOS4 sh mishandles braces in ${var-val}. -@@ -2276,7 +2643,7 @@ +@@ -2281,7 +2648,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' @@ -1781,7 +1949,25 @@ Index: pam.deb/configure $as_echo_n "checking whether build environment is sane... " >&6; } # Just in case sleep 1 -@@ -2300,11 +2667,8 @@ +@@ -2292,15 +2659,11 @@ + ' + case `pwd` in + *[\\\"\#\$\&\'\`$am_lf]*) +- { { $as_echo "$as_me:$LINENO: error: unsafe absolute working directory name" >&5 +-$as_echo "$as_me: error: unsafe absolute working directory name" >&2;} +- { (exit 1); exit 1; }; };; ++ as_fn_error "unsafe absolute working directory name" "$LINENO" 5;; + esac + case $srcdir in + *[\\\"\#\$\&\'\`$am_lf\ \ ]*) +- { { $as_echo "$as_me:$LINENO: error: unsafe srcdir value: \`$srcdir'" >&5 +-$as_echo "$as_me: error: unsafe srcdir value: \`$srcdir'" >&2;} +- { (exit 1); exit 1; }; };; ++ as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; + esac + + # Do `set' in a subshell so we don't clobber the current shell's +@@ -2322,11 +2685,8 @@ # if, for instance, CONFIG_SHELL is bash and it inherits a # broken ls alias from the environment. This has actually # happened. Such a system could not be considered "sane". @@ -1795,7 +1981,7 @@ Index: pam.deb/configure fi test "$2" = conftest.file -@@ -2313,13 +2677,10 @@ +@@ -2335,13 +2695,10 @@ # Ok. : else @@ -1812,7 +1998,7 @@ Index: pam.deb/configure $as_echo "yes" >&6; } test "$program_prefix" != NONE && program_transform_name="s&^&$program_prefix&;$program_transform_name" -@@ -2340,14 +2701,14 @@ +@@ -2369,7 +2726,7 @@ am_missing_run="$MISSING --run " else am_missing_run= @@ -1821,6 +2007,103 @@ Index: pam.deb/configure $as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} fi +@@ -2390,9 +2747,9 @@ + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. + set dummy ${ac_tool_prefix}strip; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_STRIP+set}" = set; then ++if test "${ac_cv_prog_STRIP+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$STRIP"; then +@@ -2403,24 +2760,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_STRIP="${ac_tool_prefix}strip" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + STRIP=$ac_cv_prog_STRIP + if test -n "$STRIP"; then +- { $as_echo "$as_me:$LINENO: result: $STRIP" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 + $as_echo "$STRIP" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -2430,9 +2787,9 @@ + ac_ct_STRIP=$STRIP + # Extract the first word of "strip", so it can be a program name with args. + set dummy strip; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then ++if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$ac_ct_STRIP"; then +@@ -2443,24 +2800,24 @@ + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do ++ for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_STRIP="strip" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done +-done ++ done + IFS=$as_save_IFS + + fi + fi + ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP + if test -n "$ac_ct_STRIP"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 + $as_echo "$ac_ct_STRIP" >&6; } + else +- { $as_echo "$as_me:$LINENO: result: no" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + fi + +@@ -2469,7 +2826,7 @@ + else + case $cross_compiling:$ac_tool_warned in + yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 + $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} + ac_tool_warned=yes ;; + esac +@@ -2482,10 +2839,10 @@ + fi + INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" + -{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 $as_echo_n "checking for a thread-safe mkdir -p... " >&6; } @@ -1830,7 +2113,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -@@ -2355,7 +2716,7 @@ +@@ -2493,7 +2850,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -1839,7 +2122,7 @@ Index: pam.deb/configure 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 #( -@@ -2367,7 +2728,7 @@ +@@ -2505,7 +2862,7 @@ esac done done @@ -1848,7 +2131,7 @@ Index: pam.deb/configure IFS=$as_save_IFS fi -@@ -2383,7 +2744,7 @@ +@@ -2521,7 +2878,7 @@ MKDIR_P="$ac_install_sh -d" fi fi @@ -1857,7 +2140,7 @@ Index: pam.deb/configure $as_echo "$MKDIR_P" >&6; } mkdir_p="$MKDIR_P" -@@ -2396,9 +2757,9 @@ +@@ -2534,9 +2891,9 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -1869,7 +2152,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else if test -n "$AWK"; then -@@ -2409,24 +2770,24 @@ +@@ -2547,24 +2904,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -1899,7 +2182,7 @@ Index: pam.deb/configure $as_echo "no" >&6; } fi -@@ -2434,11 +2795,11 @@ +@@ -2572,11 +2929,11 @@ test -n "$AWK" && break done @@ -1913,7 +2196,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else cat >conftest.make <<\_ACEOF -@@ -2456,11 +2817,11 @@ +@@ -2594,11 +2951,11 @@ rm -f conftest.make fi if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then @@ -1927,7 +2210,7 @@ Index: pam.deb/configure $as_echo "no" >&6; } SET_MAKE="MAKE=${MAKE-make}" fi -@@ -2480,9 +2841,7 @@ +@@ -2618,9 +2975,7 @@ am__isrc=' -I$(srcdir)' # test to see if srcdir already configured if test -f $srcdir/config.status; then @@ -1938,100 +2221,7 @@ Index: pam.deb/configure fi fi -@@ -2536,9 +2895,9 @@ - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. - set dummy ${ac_tool_prefix}strip; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_STRIP+set}" = set; then -+if test "${ac_cv_prog_STRIP+set}" = set; then : - $as_echo_n "(cached) " >&6 - else - if test -n "$STRIP"; then -@@ -2549,24 +2908,24 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -+ for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_STRIP="${ac_tool_prefix}strip" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done - IFS=$as_save_IFS - - fi - fi - STRIP=$ac_cv_prog_STRIP - if test -n "$STRIP"; then -- { $as_echo "$as_me:$LINENO: result: $STRIP" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 - $as_echo "$STRIP" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - fi - -@@ -2576,9 +2935,9 @@ - ac_ct_STRIP=$STRIP - # Extract the first word of "strip", so it can be a program name with args. - set dummy strip; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then -+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : - $as_echo_n "(cached) " >&6 - else - if test -n "$ac_ct_STRIP"; then -@@ -2589,24 +2948,24 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -+ for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_STRIP="strip" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done - IFS=$as_save_IFS - - fi - fi - ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP - if test -n "$ac_ct_STRIP"; then -- { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 - $as_echo "$ac_ct_STRIP" >&6; } - else -- { $as_echo "$as_me:$LINENO: result: no" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - fi - -@@ -2615,7 +2974,7 @@ - else - case $cross_compiling:$ac_tool_warned in - yes:) --{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 - $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} - ac_tool_warned=yes ;; - esac -@@ -2646,35 +3005,27 @@ +@@ -2682,35 +3037,27 @@ # Make sure we can run config.sub. $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || @@ -2074,7 +2264,7 @@ Index: pam.deb/configure esac build=$ac_cv_build ac_save_IFS=$IFS; IFS='-' -@@ -2690,28 +3041,24 @@ +@@ -2726,28 +3073,24 @@ case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac @@ -2108,7 +2298,7 @@ Index: pam.deb/configure esac host=$ac_cv_host ac_save_IFS=$IFS; IFS='-' -@@ -2770,7 +3117,7 @@ +@@ -2806,7 +3149,7 @@ fi # Check whether --enable-static-modules was given. @@ -2117,7 +2307,7 @@ Index: pam.deb/configure enableval=$enable_static_modules; STATIC_MODULES=$enableval else STATIC_MODULES=no -@@ -2779,7 +3126,7 @@ +@@ -2815,7 +3158,7 @@ if test "$STATIC_MODULES" != "no" ; then CFLAGS="$CFLAGS -DPAM_STATIC" # Check whether --enable-static was given. @@ -2126,7 +2316,7 @@ Index: pam.deb/configure enableval=$enable_static; p=${PACKAGE-default} case $enableval in yes) enable_static=yes ;; -@@ -2810,7 +3157,7 @@ +@@ -2846,7 +3189,7 @@ # Check whether --enable-shared was given. @@ -2135,7 +2325,7 @@ Index: pam.deb/configure enableval=$enable_shared; p=${PACKAGE-default} case $enableval in yes) enable_shared=yes ;; -@@ -2843,7 +3190,7 @@ +@@ -2879,7 +3222,7 @@ else # per default don't build static libraries # Check whether --enable-static was given. @@ -2144,7 +2334,7 @@ Index: pam.deb/configure enableval=$enable_static; p=${PACKAGE-default} case $enableval in yes) enable_static=yes ;; -@@ -2871,7 +3218,7 @@ +@@ -2907,7 +3250,7 @@ # Check whether --enable-shared was given. @@ -2153,7 +2343,7 @@ Index: pam.deb/configure enableval=$enable_shared; p=${PACKAGE-default} case $enableval in yes) enable_shared=yes ;; -@@ -2920,7 +3267,7 @@ +@@ -2956,7 +3299,7 @@ .PHONY: am__doit END # If we don't find an include directive, just comment out the code. @@ -2162,7 +2352,7 @@ Index: pam.deb/configure $as_echo_n "checking for style of include used by $am_make... " >&6; } am__include="#" am__quote= -@@ -2948,12 +3295,12 @@ +@@ -2984,12 +3327,12 @@ fi @@ -2177,7 +2367,7 @@ Index: pam.deb/configure enableval=$enable_dependency_tracking; fi -@@ -2978,9 +3325,9 @@ +@@ -3014,9 +3357,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 @@ -2189,7 +2379,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else if test -n "$CC"; then -@@ -2991,24 +3338,24 @@ +@@ -3027,24 +3370,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -2219,7 +2409,7 @@ Index: pam.deb/configure $as_echo "no" >&6; } fi -@@ -3018,9 +3365,9 @@ +@@ -3054,9 +3397,9 @@ ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 @@ -2231,7 +2421,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then -@@ -3031,24 +3378,24 @@ +@@ -3067,24 +3410,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -2261,7 +2451,7 @@ Index: pam.deb/configure $as_echo "no" >&6; } fi -@@ -3057,7 +3404,7 @@ +@@ -3093,7 +3436,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -2270,7 +2460,7 @@ Index: pam.deb/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -3071,9 +3418,9 @@ +@@ -3107,9 +3450,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 @@ -2282,7 +2472,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else if test -n "$CC"; then -@@ -3084,24 +3431,24 @@ +@@ -3120,24 +3463,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -2312,7 +2502,7 @@ Index: pam.deb/configure $as_echo "no" >&6; } fi -@@ -3111,9 +3458,9 @@ +@@ -3147,9 +3490,9 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 @@ -2324,7 +2514,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else if test -n "$CC"; then -@@ -3125,18 +3472,18 @@ +@@ -3161,18 +3504,18 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -2346,7 +2536,7 @@ Index: pam.deb/configure IFS=$as_save_IFS if test $ac_prog_rejected = yes; then -@@ -3155,10 +3502,10 @@ +@@ -3191,10 +3534,10 @@ fi CC=$ac_cv_prog_CC if test -n "$CC"; then @@ -2359,7 +2549,7 @@ Index: pam.deb/configure $as_echo "no" >&6; } fi -@@ -3170,9 +3517,9 @@ +@@ -3206,9 +3549,9 @@ do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 @@ -2371,7 +2561,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else if test -n "$CC"; then -@@ -3183,24 +3530,24 @@ +@@ -3219,24 +3562,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -2401,7 +2591,7 @@ Index: pam.deb/configure $as_echo "no" >&6; } fi -@@ -3214,9 +3561,9 @@ +@@ -3250,9 +3593,9 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -2413,7 +2603,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then -@@ -3227,24 +3574,24 @@ +@@ -3263,24 +3606,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -2443,7 +2633,7 @@ Index: pam.deb/configure $as_echo "no" >&6; } fi -@@ -3257,7 +3604,7 @@ +@@ -3293,7 +3636,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -2452,7 +2642,7 @@ Index: pam.deb/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -3268,73 +3615,55 @@ +@@ -3304,73 +3647,55 @@ fi @@ -2551,7 +2741,7 @@ Index: pam.deb/configure $as_echo_n "checking for C compiler default output file name... " >&6; } ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` -@@ -3351,17 +3680,17 @@ +@@ -3387,17 +3712,17 @@ done rm -f $ac_rmfiles @@ -2574,7 +2764,7 @@ Index: pam.deb/configure # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. # So ignore a value of `no', otherwise this would lead to `EXEEXT = no' # in a Makefile. We should not override ac_cv_exeext if it was cached, -@@ -3378,7 +3707,7 @@ +@@ -3414,7 +3739,7 @@ # certainly right. break;; *.* ) @@ -2583,7 +2773,7 @@ Index: pam.deb/configure then :; else ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` fi -@@ -3397,84 +3726,75 @@ +@@ -3433,84 +3758,75 @@ else ac_file='' fi @@ -2693,7 +2883,7 @@ Index: pam.deb/configure # If both `conftest.exe' and `conftest' are `present' (well, observable) # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will # work properly (i.e., refer to `conftest.exe'), while it won't with -@@ -3489,32 +3809,24 @@ +@@ -3525,32 +3841,24 @@ esac done else @@ -2733,7 +2923,7 @@ Index: pam.deb/configure /* end confdefs.h. */ int -@@ -3526,17 +3838,17 @@ +@@ -3562,17 +3870,17 @@ } _ACEOF rm -f conftest.o conftest.obj @@ -2756,7 +2946,7 @@ Index: pam.deb/configure for ac_file in conftest.o conftest.obj conftest.*; do test -f "$ac_file" || continue; case $ac_file in -@@ -3549,31 +3861,23 @@ +@@ -3585,31 +3893,23 @@ $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -2795,7 +2985,7 @@ Index: pam.deb/configure /* end confdefs.h. */ int -@@ -3587,37 +3891,16 @@ +@@ -3623,37 +3923,16 @@ return 0; } _ACEOF @@ -2836,7 +3026,7 @@ Index: pam.deb/configure $as_echo "$ac_cv_c_compiler_gnu" >&6; } if test $ac_compiler_gnu = yes; then GCC=yes -@@ -3626,20 +3909,16 @@ +@@ -3662,20 +3941,16 @@ fi ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS @@ -2860,7 +3050,7 @@ Index: pam.deb/configure /* end confdefs.h. */ int -@@ -3650,35 +3929,11 @@ +@@ -3686,35 +3961,11 @@ return 0; } _ACEOF @@ -2899,7 +3089,7 @@ Index: pam.deb/configure /* end confdefs.h. */ int -@@ -3689,36 +3944,12 @@ +@@ -3725,36 +3976,12 @@ return 0; } _ACEOF @@ -2940,7 +3130,7 @@ Index: pam.deb/configure /* end confdefs.h. */ int -@@ -3729,42 +3960,17 @@ +@@ -3765,42 +3992,17 @@ return 0; } _ACEOF @@ -2985,7 +3175,7 @@ Index: pam.deb/configure $as_echo "$ac_cv_prog_cc_g" >&6; } if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS -@@ -3781,18 +3987,14 @@ +@@ -3817,18 +4019,14 @@ CFLAGS= fi fi @@ -3007,7 +3197,7 @@ Index: pam.deb/configure /* end confdefs.h. */ #include #include -@@ -3849,32 +4051,9 @@ +@@ -3885,32 +4083,9 @@ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do CC="$ac_save_CC $ac_arg" @@ -3041,7 +3231,7 @@ Index: pam.deb/configure rm -f core conftest.err conftest.$ac_objext test "x$ac_cv_prog_cc_c89" != "xno" && break done -@@ -3885,17 +4064,19 @@ +@@ -3921,17 +4096,19 @@ # AC_CACHE_VAL case "x$ac_cv_prog_cc_c89" in x) @@ -3064,7 +3254,7 @@ Index: pam.deb/configure ac_ext=c ac_cpp='$CPP $CPPFLAGS' -@@ -3905,9 +4086,9 @@ +@@ -3941,9 +4118,9 @@ depcc="$CC" am_compiler_list= @@ -3076,7 +3266,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then -@@ -3996,7 +4177,7 @@ +@@ -4051,7 +4228,7 @@ fi fi @@ -3085,7 +3275,7 @@ Index: pam.deb/configure $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type -@@ -4017,14 +4198,14 @@ +@@ -4072,14 +4249,14 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu @@ -3102,7 +3292,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else # Double quotes because CPP needs to be expanded -@@ -4039,11 +4220,7 @@ +@@ -4094,11 +4271,7 @@ # exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. @@ -3115,7 +3305,7 @@ Index: pam.deb/configure /* end confdefs.h. */ #ifdef __STDC__ # include -@@ -4052,78 +4229,34 @@ +@@ -4107,78 +4280,34 @@ #endif Syntax error _ACEOF @@ -3199,7 +3389,7 @@ Index: pam.deb/configure break fi -@@ -4135,7 +4268,7 @@ +@@ -4190,7 +4319,7 @@ else ac_cv_prog_CPP=$CPP fi @@ -3208,7 +3398,7 @@ Index: pam.deb/configure $as_echo "$CPP" >&6; } ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes -@@ -4146,11 +4279,7 @@ +@@ -4201,11 +4330,7 @@ # exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. @@ -3221,7 +3411,7 @@ Index: pam.deb/configure /* end confdefs.h. */ #ifdef __STDC__ # include -@@ -4159,87 +4288,40 @@ +@@ -4214,87 +4339,40 @@ #endif Syntax error _ACEOF @@ -3318,7 +3508,7 @@ Index: pam.deb/configure fi ac_ext=c -@@ -4249,9 +4331,9 @@ +@@ -4304,9 +4382,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu @@ -3330,7 +3520,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else if test -z "$GREP"; then -@@ -4262,7 +4344,7 @@ +@@ -4317,7 +4395,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -3339,7 +3529,7 @@ Index: pam.deb/configure for ac_exec_ext in '' $ac_executable_extensions; do ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue -@@ -4282,7 +4364,7 @@ +@@ -4337,7 +4415,7 @@ $as_echo 'GREP' >> "conftest.nl" "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break @@ -3348,7 +3538,7 @@ Index: pam.deb/configure if test $ac_count -gt ${ac_path_GREP_max-0}; then # Best one so far, save it but keep looking for a better one ac_cv_path_GREP="$ac_path_GREP" -@@ -4297,26 +4379,24 @@ +@@ -4352,26 +4430,24 @@ $ac_path_GREP_found && break 3 done done @@ -3380,7 +3570,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 -@@ -4330,7 +4410,7 @@ +@@ -4385,7 +4461,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -3389,7 +3579,7 @@ Index: pam.deb/configure for ac_exec_ext in '' $ac_executable_extensions; do ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue -@@ -4350,7 +4430,7 @@ +@@ -4405,7 +4481,7 @@ $as_echo 'EGREP' >> "conftest.nl" "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break @@ -3398,7 +3588,7 @@ Index: pam.deb/configure if test $ac_count -gt ${ac_path_EGREP_max-0}; then # Best one so far, save it but keep looking for a better one ac_cv_path_EGREP="$ac_path_EGREP" -@@ -4365,12 +4445,10 @@ +@@ -4420,12 +4496,10 @@ $ac_path_EGREP_found && break 3 done done @@ -3413,7 +3603,7 @@ Index: pam.deb/configure fi else ac_cv_path_EGREP=$EGREP -@@ -4378,21 +4456,17 @@ +@@ -4433,21 +4507,17 @@ fi fi @@ -3439,7 +3629,7 @@ Index: pam.deb/configure /* end confdefs.h. */ #include #include -@@ -4407,48 +4481,23 @@ +@@ -4462,48 +4532,23 @@ return 0; } _ACEOF @@ -3493,7 +3683,7 @@ Index: pam.deb/configure else ac_cv_header_stdc=no fi -@@ -4458,18 +4507,14 @@ +@@ -4513,18 +4558,14 @@ if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. @@ -3515,7 +3705,7 @@ Index: pam.deb/configure else ac_cv_header_stdc=no fi -@@ -4479,14 +4524,10 @@ +@@ -4534,14 +4575,10 @@ if test $ac_cv_header_stdc = yes; then # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. @@ -3532,7 +3722,7 @@ Index: pam.deb/configure /* end confdefs.h. */ #include #include -@@ -4513,292 +4554,71 @@ +@@ -4568,292 +4605,71 @@ return 0; } _ACEOF @@ -3866,7 +4056,7 @@ Index: pam.deb/configure /* end confdefs.h. */ # define __EXTENSIONS__ 1 -@@ -4811,56 +4631,25 @@ +@@ -4866,56 +4682,25 @@ return 0; } _ACEOF @@ -3931,7 +4121,7 @@ Index: pam.deb/configure ac_ext=c -@@ -4871,9 +4660,9 @@ +@@ -4926,9 +4711,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 @@ -3943,7 +4133,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else if test -n "$CC"; then -@@ -4884,24 +4673,24 @@ +@@ -4939,24 +4724,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -3973,7 +4163,7 @@ Index: pam.deb/configure $as_echo "no" >&6; } fi -@@ -4911,9 +4700,9 @@ +@@ -4966,9 +4751,9 @@ ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 @@ -3985,7 +4175,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then -@@ -4924,24 +4713,24 @@ +@@ -4979,24 +4764,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -4015,7 +4205,7 @@ Index: pam.deb/configure $as_echo "no" >&6; } fi -@@ -4950,7 +4739,7 @@ +@@ -5005,7 +4790,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -4024,7 +4214,7 @@ Index: pam.deb/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -4964,9 +4753,9 @@ +@@ -5019,9 +4804,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 @@ -4036,7 +4226,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else if test -n "$CC"; then -@@ -4977,24 +4766,24 @@ +@@ -5032,24 +4817,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -4066,7 +4256,7 @@ Index: pam.deb/configure $as_echo "no" >&6; } fi -@@ -5004,9 +4793,9 @@ +@@ -5059,9 +4844,9 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 @@ -4078,7 +4268,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else if test -n "$CC"; then -@@ -5018,18 +4807,18 @@ +@@ -5073,18 +4858,18 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -4100,7 +4290,7 @@ Index: pam.deb/configure IFS=$as_save_IFS if test $ac_prog_rejected = yes; then -@@ -5048,10 +4837,10 @@ +@@ -5103,10 +4888,10 @@ fi CC=$ac_cv_prog_CC if test -n "$CC"; then @@ -4113,7 +4303,7 @@ Index: pam.deb/configure $as_echo "no" >&6; } fi -@@ -5063,9 +4852,9 @@ +@@ -5118,9 +4903,9 @@ do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 @@ -4125,7 +4315,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else if test -n "$CC"; then -@@ -5076,24 +4865,24 @@ +@@ -5131,24 +4916,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -4155,7 +4345,7 @@ Index: pam.deb/configure $as_echo "no" >&6; } fi -@@ -5107,9 +4896,9 @@ +@@ -5162,9 +4947,9 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -4167,7 +4357,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then -@@ -5120,24 +4909,24 @@ +@@ -5175,24 +4960,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -4197,7 +4387,7 @@ Index: pam.deb/configure $as_echo "no" >&6; } fi -@@ -5150,7 +4939,7 @@ +@@ -5205,7 +4990,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -4206,7 +4396,7 @@ Index: pam.deb/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -5161,62 +4950,42 @@ +@@ -5216,62 +5001,42 @@ fi @@ -4291,7 +4481,7 @@ Index: pam.deb/configure /* end confdefs.h. */ int -@@ -5230,37 +4999,16 @@ +@@ -5285,37 +5050,16 @@ return 0; } _ACEOF @@ -4332,7 +4522,7 @@ Index: pam.deb/configure $as_echo "$ac_cv_c_compiler_gnu" >&6; } if test $ac_compiler_gnu = yes; then GCC=yes -@@ -5269,20 +5017,16 @@ +@@ -5324,20 +5068,16 @@ fi ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS @@ -4356,7 +4546,7 @@ Index: pam.deb/configure /* end confdefs.h. */ int -@@ -5293,35 +5037,11 @@ +@@ -5348,35 +5088,11 @@ return 0; } _ACEOF @@ -4395,7 +4585,7 @@ Index: pam.deb/configure /* end confdefs.h. */ int -@@ -5332,36 +5052,12 @@ +@@ -5387,36 +5103,12 @@ return 0; } _ACEOF @@ -4436,7 +4626,7 @@ Index: pam.deb/configure /* end confdefs.h. */ int -@@ -5372,42 +5068,17 @@ +@@ -5427,42 +5119,17 @@ return 0; } _ACEOF @@ -4481,7 +4671,7 @@ Index: pam.deb/configure $as_echo "$ac_cv_prog_cc_g" >&6; } if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS -@@ -5424,18 +5095,14 @@ +@@ -5479,18 +5146,14 @@ CFLAGS= fi fi @@ -4503,7 +4693,7 @@ Index: pam.deb/configure /* end confdefs.h. */ #include #include -@@ -5492,32 +5159,9 @@ +@@ -5547,32 +5210,9 @@ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do CC="$ac_save_CC $ac_arg" @@ -4537,7 +4727,7 @@ Index: pam.deb/configure rm -f core conftest.err conftest.$ac_objext test "x$ac_cv_prog_cc_c89" != "xno" && break done -@@ -5528,17 +5172,19 @@ +@@ -5583,17 +5223,19 @@ # AC_CACHE_VAL case "x$ac_cv_prog_cc_c89" in x) @@ -4560,7 +4750,7 @@ Index: pam.deb/configure ac_ext=c ac_cpp='$CPP $CPPFLAGS' -@@ -5548,9 +5194,9 @@ +@@ -5603,9 +5245,9 @@ depcc="$CC" am_compiler_list= @@ -4572,7 +4762,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then -@@ -5639,7 +5285,7 @@ +@@ -5713,7 +5355,7 @@ fi fi @@ -4581,7 +4771,7 @@ Index: pam.deb/configure $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type -@@ -5658,9 +5304,9 @@ +@@ -5732,9 +5374,9 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -4593,7 +4783,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else if test -n "$YACC"; then -@@ -5671,24 +5317,24 @@ +@@ -5745,24 +5387,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -4623,7 +4813,7 @@ Index: pam.deb/configure $as_echo "no" >&6; } fi -@@ -5701,9 +5347,9 @@ +@@ -5775,9 +5417,9 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -4635,7 +4825,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else if test -n "$LEX"; then -@@ -5714,24 +5360,24 @@ +@@ -5788,24 +5430,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -4665,7 +4855,7 @@ Index: pam.deb/configure $as_echo "no" >&6; } fi -@@ -5760,20 +5406,20 @@ +@@ -5834,20 +5476,20 @@ return ! yylex () + ! yywrap (); } _ACEOF @@ -4693,7 +4883,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else -@@ -5782,19 +5428,17 @@ +@@ -5856,19 +5498,17 @@ elif test -f lexyy.c; then ac_cv_prog_lex_root=lexyy else @@ -4717,7 +4907,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else -@@ -5802,55 +5446,29 @@ +@@ -5876,55 +5516,29 @@ ac_cv_lib_lex='none needed' for ac_lib in '' -lfl -ll; do LIBS="$ac_lib $ac_save_LIBS" @@ -4781,7 +4971,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else # POSIX says lex can declare yytext either as a pointer or an array; the -@@ -5859,52 +5477,24 @@ +@@ -5933,52 +5547,24 @@ ac_cv_prog_lex_yytext_pointer=no ac_save_LIBS=$LIBS LIBS="$LEXLIB $ac_save_LIBS" @@ -4841,7 +5031,7 @@ Index: pam.deb/configure fi rm -f conftest.l $LEX_OUTPUT_ROOT.c -@@ -5913,115 +5503,23 @@ +@@ -5987,115 +5573,23 @@ if test "$LEX" = :; then LEX=${am_missing_run}flex fi @@ -4962,7 +5152,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else cat >conftest.make <<\_ACEOF -@@ -6039,18 +5537,18 @@ +@@ -6113,18 +5607,18 @@ rm -f conftest.make fi if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then @@ -4984,7 +5174,7 @@ Index: pam.deb/configure $as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;; esac -@@ -6073,9 +5571,9 @@ +@@ -6147,9 +5641,9 @@ ltmain="$ac_aux_dir/ltmain.sh" @@ -4996,7 +5186,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ -@@ -6083,7 +5581,7 @@ +@@ -6157,7 +5651,7 @@ ac_script="$ac_script$as_nl$ac_script" done echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed @@ -5005,7 +5195,7 @@ Index: pam.deb/configure if test -z "$SED"; then ac_path_SED_found=false # Loop through the user's path and test for each of PROGNAME-LIST -@@ -6092,7 +5590,7 @@ +@@ -6166,7 +5660,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -5014,7 +5204,7 @@ Index: pam.deb/configure for ac_exec_ext in '' $ac_executable_extensions; do ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue -@@ -6112,7 +5610,7 @@ +@@ -6186,7 +5680,7 @@ $as_echo '' >> "conftest.nl" "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break @@ -5023,7 +5213,7 @@ Index: pam.deb/configure if test $ac_count -gt ${ac_path_SED_max-0}; then # Best one so far, save it but keep looking for a better one ac_cv_path_SED="$ac_path_SED" -@@ -6127,19 +5625,17 @@ +@@ -6201,19 +5695,17 @@ $ac_path_SED_found && break 3 done done @@ -5046,7 +5236,7 @@ Index: pam.deb/configure $as_echo "$ac_cv_path_SED" >&6; } SED="$ac_cv_path_SED" rm -f conftest.sed -@@ -6157,9 +5653,9 @@ +@@ -6231,9 +5723,9 @@ @@ -5058,7 +5248,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 -@@ -6173,7 +5669,7 @@ +@@ -6247,7 +5739,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -5067,7 +5257,7 @@ Index: pam.deb/configure for ac_exec_ext in '' $ac_executable_extensions; do ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue -@@ -6193,7 +5689,7 @@ +@@ -6267,7 +5759,7 @@ $as_echo 'FGREP' >> "conftest.nl" "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break @@ -5076,7 +5266,7 @@ Index: pam.deb/configure if test $ac_count -gt ${ac_path_FGREP_max-0}; then # Best one so far, save it but keep looking for a better one ac_cv_path_FGREP="$ac_path_FGREP" -@@ -6208,12 +5704,10 @@ +@@ -6282,12 +5774,10 @@ $ac_path_FGREP_found && break 3 done done @@ -5091,7 +5281,7 @@ Index: pam.deb/configure fi else ac_cv_path_FGREP=$FGREP -@@ -6221,7 +5715,7 @@ +@@ -6295,7 +5785,7 @@ fi fi @@ -5100,7 +5290,7 @@ Index: pam.deb/configure $as_echo "$ac_cv_path_FGREP" >&6; } FGREP="$ac_cv_path_FGREP" -@@ -6247,7 +5741,7 @@ +@@ -6321,7 +5811,7 @@ # Check whether --with-gnu-ld was given. @@ -5109,7 +5299,7 @@ Index: pam.deb/configure withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes else with_gnu_ld=no -@@ -6256,7 +5750,7 @@ +@@ -6330,7 +5820,7 @@ ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. @@ -5118,7 +5308,7 @@ Index: pam.deb/configure $as_echo_n "checking for ld used by $CC... " >&6; } case $host in *-*-mingw*) -@@ -6286,13 +5780,13 @@ +@@ -6360,13 +5850,13 @@ ;; esac elif test "$with_gnu_ld" = yes; then @@ -5135,7 +5325,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else if test -z "$LD"; then -@@ -6323,18 +5817,16 @@ +@@ -6397,18 +5887,16 @@ LD="$lt_cv_path_LD" if test -n "$LD"; then @@ -5159,7 +5349,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else # I'd rather use --version here, but apparently some GNU lds only accept -v. -@@ -6347,7 +5839,7 @@ +@@ -6421,7 +5909,7 @@ ;; esac fi @@ -5168,7 +5358,7 @@ Index: pam.deb/configure $as_echo "$lt_cv_prog_gnu_ld" >&6; } with_gnu_ld=$lt_cv_prog_gnu_ld -@@ -6359,9 +5851,9 @@ +@@ -6433,9 +5921,9 @@ @@ -5180,7 +5370,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else if test -n "$NM"; then -@@ -6408,7 +5900,7 @@ +@@ -6482,7 +5970,7 @@ : ${lt_cv_path_NM=no} fi fi @@ -5189,7 +5379,7 @@ Index: pam.deb/configure $as_echo "$lt_cv_path_NM" >&6; } if test "$lt_cv_path_NM" != "no"; then NM="$lt_cv_path_NM" -@@ -6419,9 +5911,9 @@ +@@ -6493,9 +5981,9 @@ do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 @@ -5201,7 +5391,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else if test -n "$DUMPBIN"; then -@@ -6432,24 +5924,24 @@ +@@ -6506,24 +5994,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -5231,7 +5421,7 @@ Index: pam.deb/configure $as_echo "no" >&6; } fi -@@ -6463,9 +5955,9 @@ +@@ -6537,9 +6025,9 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -5243,7 +5433,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_DUMPBIN"; then -@@ -6476,24 +5968,24 @@ +@@ -6550,24 +6038,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -5273,7 +5463,7 @@ Index: pam.deb/configure $as_echo "no" >&6; } fi -@@ -6506,7 +5998,7 @@ +@@ -6580,7 +6068,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -5282,7 +5472,7 @@ Index: pam.deb/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -6526,33 +6018,33 @@ +@@ -6600,33 +6088,33 @@ @@ -5295,16 +5485,16 @@ Index: pam.deb/configure else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext -- (eval echo "\"\$as_me:6536: $ac_compile\"" >&5) -+ (eval echo "\"\$as_me:6028: $ac_compile\"" >&5) +- (eval echo "\"\$as_me:6610: $ac_compile\"" >&5) ++ (eval echo "\"\$as_me:6098: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 -- (eval echo "\"\$as_me:6539: $NM \\\"conftest.$ac_objext\\\"\"" >&5) -+ (eval echo "\"\$as_me:6031: $NM \\\"conftest.$ac_objext\\\"\"" >&5) +- (eval echo "\"\$as_me:6613: $NM \\\"conftest.$ac_objext\\\"\"" >&5) ++ (eval echo "\"\$as_me:6101: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 -- (eval echo "\"\$as_me:6542: output\"" >&5) -+ (eval echo "\"\$as_me:6034: output\"" >&5) +- (eval echo "\"\$as_me:6616: output\"" >&5) ++ (eval echo "\"\$as_me:6104: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -5324,7 +5514,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else i=0 -@@ -6670,10 +6162,10 @@ +@@ -6744,10 +6232,10 @@ fi if test -n $lt_cv_sys_max_cmd_len ; then @@ -5337,7 +5527,7 @@ Index: pam.deb/configure $as_echo "none" >&6; } fi max_cmd_len=$lt_cv_sys_max_cmd_len -@@ -6687,7 +6179,7 @@ +@@ -6761,7 +6249,7 @@ : ${MV="mv -f"} : ${RM="rm -f"} @@ -5346,7 +5536,7 @@ Index: pam.deb/configure $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; } # Try some XSI features xsi_shell=no -@@ -6697,17 +6189,17 @@ +@@ -6771,17 +6259,17 @@ && eval 'test $(( 1 + 1 )) -eq 2 \ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ && xsi_shell=yes @@ -5367,7 +5557,7 @@ Index: pam.deb/configure $as_echo "$lt_shell_append" >&6; } -@@ -6742,14 +6234,14 @@ +@@ -6816,14 +6304,14 @@ @@ -5385,7 +5575,7 @@ Index: pam.deb/configure $as_echo "$lt_cv_ld_reload_flag" >&6; } reload_flag=$lt_cv_ld_reload_flag case $reload_flag in -@@ -6778,9 +6270,9 @@ +@@ -6852,9 +6340,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. set dummy ${ac_tool_prefix}objdump; ac_word=$2 @@ -5397,7 +5587,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else if test -n "$OBJDUMP"; then -@@ -6791,24 +6283,24 @@ +@@ -6865,24 +6353,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -5427,7 +5617,7 @@ Index: pam.deb/configure $as_echo "no" >&6; } fi -@@ -6818,9 +6310,9 @@ +@@ -6892,9 +6380,9 @@ ac_ct_OBJDUMP=$OBJDUMP # Extract the first word of "objdump", so it can be a program name with args. set dummy objdump; ac_word=$2 @@ -5439,7 +5629,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_OBJDUMP"; then -@@ -6831,24 +6323,24 @@ +@@ -6905,24 +6393,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -5469,7 +5659,7 @@ Index: pam.deb/configure $as_echo "no" >&6; } fi -@@ -6857,7 +6349,7 @@ +@@ -6931,7 +6419,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -5478,7 +5668,7 @@ Index: pam.deb/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -6877,9 +6369,9 @@ +@@ -6951,9 +6439,9 @@ @@ -5490,7 +5680,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else lt_cv_file_magic_cmd='$MAGIC_CMD' -@@ -6998,7 +6490,7 @@ +@@ -7072,7 +6560,7 @@ lt_cv_deplibs_check_method=pass_all ;; @@ -5499,7 +5689,7 @@ Index: pam.deb/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 -@@ -7073,7 +6565,7 @@ +@@ -7147,7 +6635,7 @@ esac fi @@ -5508,7 +5698,7 @@ Index: pam.deb/configure $as_echo "$lt_cv_deplibs_check_method" >&6; } file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method -@@ -7093,9 +6585,9 @@ +@@ -7167,9 +6655,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 @@ -5520,7 +5710,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else if test -n "$AR"; then -@@ -7106,24 +6598,24 @@ +@@ -7180,24 +6668,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -5550,7 +5740,7 @@ Index: pam.deb/configure $as_echo "no" >&6; } fi -@@ -7133,9 +6625,9 @@ +@@ -7207,9 +6695,9 @@ ac_ct_AR=$AR # Extract the first word of "ar", so it can be a program name with args. set dummy ar; ac_word=$2 @@ -5562,7 +5752,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_AR"; then -@@ -7146,24 +6638,24 @@ +@@ -7220,24 +6708,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -5592,7 +5782,7 @@ Index: pam.deb/configure $as_echo "no" >&6; } fi -@@ -7172,7 +6664,7 @@ +@@ -7246,7 +6734,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -5601,7 +5791,7 @@ Index: pam.deb/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -7198,9 +6690,9 @@ +@@ -7272,9 +6760,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 @@ -5613,7 +5803,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else if test -n "$STRIP"; then -@@ -7211,24 +6703,24 @@ +@@ -7285,24 +6773,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -5643,7 +5833,7 @@ Index: pam.deb/configure $as_echo "no" >&6; } fi -@@ -7238,9 +6730,9 @@ +@@ -7312,9 +6800,9 @@ ac_ct_STRIP=$STRIP # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 @@ -5655,7 +5845,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_STRIP"; then -@@ -7251,24 +6743,24 @@ +@@ -7325,24 +6813,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -5685,7 +5875,7 @@ Index: pam.deb/configure $as_echo "no" >&6; } fi -@@ -7277,7 +6769,7 @@ +@@ -7351,7 +6839,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -5694,7 +5884,7 @@ Index: pam.deb/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -7297,9 +6789,9 @@ +@@ -7371,9 +6859,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 @@ -5706,7 +5896,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else if test -n "$RANLIB"; then -@@ -7310,24 +6802,24 @@ +@@ -7384,24 +6872,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -5736,7 +5926,7 @@ Index: pam.deb/configure $as_echo "no" >&6; } fi -@@ -7337,9 +6829,9 @@ +@@ -7411,9 +6899,9 @@ ac_ct_RANLIB=$RANLIB # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 @@ -5748,7 +5938,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_RANLIB"; then -@@ -7350,24 +6842,24 @@ +@@ -7424,24 +6912,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -5778,7 +5968,7 @@ Index: pam.deb/configure $as_echo "no" >&6; } fi -@@ -7376,7 +6868,7 @@ +@@ -7450,7 +6938,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -5787,7 +5977,7 @@ Index: pam.deb/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -7454,9 +6946,9 @@ +@@ -7528,9 +7016,9 @@ # Check for command to grab the raw symbol name followed by C symbol from nm. @@ -5799,7 +5989,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else -@@ -7572,18 +7064,18 @@ +@@ -7646,18 +7134,18 @@ int main(){nm_test_var='a';nm_test_func();return(0);} _LT_EOF @@ -5824,7 +6014,7 @@ Index: pam.deb/configure # Try sorting and uniquifying the output. if sort "$nlist" | uniq > "$nlist"T; then mv -f "$nlist"T "$nlist" -@@ -7636,11 +7128,11 @@ +@@ -7710,11 +7198,11 @@ lt_save_CFLAGS="$CFLAGS" LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" @@ -5839,7 +6029,7 @@ Index: pam.deb/configure pipe_works=yes fi LIBS="$lt_save_LIBS" -@@ -7674,10 +7166,10 @@ +@@ -7748,10 +7236,10 @@ lt_cv_sys_global_symbol_to_cdecl= fi if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then @@ -5852,7 +6042,7 @@ Index: pam.deb/configure $as_echo "ok" >&6; } fi -@@ -7703,7 +7195,7 @@ +@@ -7777,7 +7265,7 @@ # Check whether --enable-libtool-lock was given. @@ -5861,7 +6051,7 @@ Index: pam.deb/configure enableval=$enable_libtool_lock; fi -@@ -7715,11 +7207,11 @@ +@@ -7789,11 +7277,11 @@ ia64-*-hpux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -5876,13 +6066,13 @@ Index: pam.deb/configure case `/usr/bin/file conftest.$ac_objext` in *ELF-32*) HPUX_IA64_MODE="32" -@@ -7733,12 +7225,12 @@ +@@ -7807,12 +7295,12 @@ ;; *-*-irix6*) # Find out which ABI we are using. -- echo '#line 7736 "configure"' > conftest.$ac_ext +- echo '#line 7810 "configure"' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -+ echo '#line 7228 "configure"' > conftest.$ac_ext ++ echo '#line 7298 "configure"' > conftest.$ac_ext + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -5893,7 +6083,7 @@ Index: pam.deb/configure if test "$lt_cv_prog_gnu_ld" = yes; then case `/usr/bin/file conftest.$ac_objext` in *32-bit*) -@@ -7772,11 +7264,11 @@ +@@ -7846,11 +7334,11 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -5908,7 +6098,7 @@ Index: pam.deb/configure case `/usr/bin/file conftest.o` in *32-bit*) case $host in -@@ -7825,9 +7317,9 @@ +@@ -7899,9 +7387,9 @@ # On SCO OpenServer 5, we need -belf to get full-featured binaries. SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" @@ -5920,7 +6110,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else ac_ext=c -@@ -7836,11 +7328,7 @@ +@@ -7910,11 +7398,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu @@ -5933,7 +6123,7 @@ Index: pam.deb/configure /* end confdefs.h. */ int -@@ -7851,38 +7339,13 @@ +@@ -7925,38 +7409,13 @@ return 0; } _ACEOF @@ -5976,7 +6166,7 @@ Index: pam.deb/configure ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -7890,7 +7353,7 @@ +@@ -7964,7 +7423,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu fi @@ -5985,7 +6175,7 @@ Index: pam.deb/configure $as_echo "$lt_cv_cc_needs_belf" >&6; } if test x"$lt_cv_cc_needs_belf" != x"yes"; then # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf -@@ -7900,11 +7363,11 @@ +@@ -7974,11 +7433,11 @@ sparc*-*solaris*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -6000,7 +6190,7 @@ Index: pam.deb/configure case `/usr/bin/file conftest.o` in *64-bit*) case $lt_cv_prog_gnu_ld in -@@ -7930,9 +7393,9 @@ +@@ -8004,9 +7463,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 @@ -6012,7 +6202,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else if test -n "$DSYMUTIL"; then -@@ -7943,24 +7406,24 @@ +@@ -8017,24 +7476,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -6042,7 +6232,7 @@ Index: pam.deb/configure $as_echo "no" >&6; } fi -@@ -7970,9 +7433,9 @@ +@@ -8044,9 +7503,9 @@ ac_ct_DSYMUTIL=$DSYMUTIL # Extract the first word of "dsymutil", so it can be a program name with args. set dummy dsymutil; ac_word=$2 @@ -6054,7 +6244,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_DSYMUTIL"; then -@@ -7983,24 +7446,24 @@ +@@ -8057,24 +7516,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -6084,7 +6274,7 @@ Index: pam.deb/configure $as_echo "no" >&6; } fi -@@ -8009,7 +7472,7 @@ +@@ -8083,7 +7542,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -6093,7 +6283,7 @@ Index: pam.deb/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -8022,9 +7485,9 @@ +@@ -8096,9 +7555,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. set dummy ${ac_tool_prefix}nmedit; ac_word=$2 @@ -6105,7 +6295,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else if test -n "$NMEDIT"; then -@@ -8035,24 +7498,24 @@ +@@ -8109,24 +7568,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -6135,7 +6325,7 @@ Index: pam.deb/configure $as_echo "no" >&6; } fi -@@ -8062,9 +7525,9 @@ +@@ -8136,9 +7595,9 @@ ac_ct_NMEDIT=$NMEDIT # Extract the first word of "nmedit", so it can be a program name with args. set dummy nmedit; ac_word=$2 @@ -6147,7 +6337,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_NMEDIT"; then -@@ -8075,24 +7538,24 @@ +@@ -8149,24 +7608,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -6177,7 +6367,7 @@ Index: pam.deb/configure $as_echo "no" >&6; } fi -@@ -8101,7 +7564,7 @@ +@@ -8175,7 +7634,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -6186,7 +6376,7 @@ Index: pam.deb/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -8114,9 +7577,9 @@ +@@ -8188,9 +7647,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args. set dummy ${ac_tool_prefix}lipo; ac_word=$2 @@ -6198,7 +6388,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else if test -n "$LIPO"; then -@@ -8127,24 +7590,24 @@ +@@ -8201,24 +7660,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -6228,7 +6418,7 @@ Index: pam.deb/configure $as_echo "no" >&6; } fi -@@ -8154,9 +7617,9 @@ +@@ -8228,9 +7687,9 @@ ac_ct_LIPO=$LIPO # Extract the first word of "lipo", so it can be a program name with args. set dummy lipo; ac_word=$2 @@ -6240,7 +6430,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_LIPO"; then -@@ -8167,24 +7630,24 @@ +@@ -8241,24 +7700,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -6270,7 +6460,7 @@ Index: pam.deb/configure $as_echo "no" >&6; } fi -@@ -8193,7 +7656,7 @@ +@@ -8267,7 +7726,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -6279,7 +6469,7 @@ Index: pam.deb/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -8206,9 +7669,9 @@ +@@ -8280,9 +7739,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args. set dummy ${ac_tool_prefix}otool; ac_word=$2 @@ -6291,7 +6481,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else if test -n "$OTOOL"; then -@@ -8219,24 +7682,24 @@ +@@ -8293,24 +7752,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -6321,7 +6511,7 @@ Index: pam.deb/configure $as_echo "no" >&6; } fi -@@ -8246,9 +7709,9 @@ +@@ -8320,9 +7779,9 @@ ac_ct_OTOOL=$OTOOL # Extract the first word of "otool", so it can be a program name with args. set dummy otool; ac_word=$2 @@ -6333,7 +6523,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_OTOOL"; then -@@ -8259,24 +7722,24 @@ +@@ -8333,24 +7792,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -6363,7 +6553,7 @@ Index: pam.deb/configure $as_echo "no" >&6; } fi -@@ -8285,7 +7748,7 @@ +@@ -8359,7 +7818,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -6372,7 +6562,7 @@ Index: pam.deb/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -8298,9 +7761,9 @@ +@@ -8372,9 +7831,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args. set dummy ${ac_tool_prefix}otool64; ac_word=$2 @@ -6384,7 +6574,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else if test -n "$OTOOL64"; then -@@ -8311,24 +7774,24 @@ +@@ -8385,24 +7844,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -6414,7 +6604,7 @@ Index: pam.deb/configure $as_echo "no" >&6; } fi -@@ -8338,9 +7801,9 @@ +@@ -8412,9 +7871,9 @@ ac_ct_OTOOL64=$OTOOL64 # Extract the first word of "otool64", so it can be a program name with args. set dummy otool64; ac_word=$2 @@ -6426,7 +6616,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_OTOOL64"; then -@@ -8351,24 +7814,24 @@ +@@ -8425,24 +7884,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -6456,7 +6646,7 @@ Index: pam.deb/configure $as_echo "no" >&6; } fi -@@ -8377,7 +7840,7 @@ +@@ -8451,7 +7910,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -6465,7 +6655,7 @@ Index: pam.deb/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -8413,9 +7876,9 @@ +@@ -8487,9 +7946,9 @@ @@ -6477,7 +6667,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else lt_cv_apple_cc_single_mod=no -@@ -8440,22 +7903,18 @@ +@@ -8514,22 +7973,18 @@ rm -f conftest.* fi fi @@ -6504,7 +6694,7 @@ Index: pam.deb/configure /* end confdefs.h. */ int -@@ -8466,42 +7925,17 @@ +@@ -8540,42 +7995,17 @@ return 0; } _ACEOF @@ -6552,7 +6742,7 @@ Index: pam.deb/configure $as_echo "$lt_cv_ld_exported_symbols_list" >&6; } case $host_os in rhapsody* | darwin1.[012]) -@@ -8538,62 +7972,13 @@ +@@ -8612,62 +8042,13 @@ ;; esac @@ -6620,7 +6810,7 @@ Index: pam.deb/configure _ACEOF fi -@@ -8616,7 +8001,7 @@ +@@ -8690,7 +8071,7 @@ # Check whether --with-pic was given. @@ -6629,7 +6819,7 @@ Index: pam.deb/configure withval=$with_pic; pic_mode="$withval" else pic_mode=default -@@ -8632,7 +8017,7 @@ +@@ -8706,7 +8087,7 @@ # Check whether --enable-fast-install was given. @@ -6638,7 +6828,7 @@ Index: pam.deb/configure enableval=$enable_fast_install; p=${PACKAGE-default} case $enableval in yes) enable_fast_install=yes ;; -@@ -8713,9 +8098,9 @@ +@@ -8787,9 +8168,9 @@ setopt NO_GLOB_SUBST fi @@ -6650,7 +6840,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else rm -f .libs 2>/dev/null -@@ -8728,7 +8113,7 @@ +@@ -8802,7 +8183,7 @@ fi rmdir .libs 2>/dev/null fi @@ -6659,7 +6849,7 @@ Index: pam.deb/configure $as_echo "$lt_cv_objdir" >&6; } objdir=$lt_cv_objdir -@@ -8821,9 +8206,9 @@ +@@ -8895,9 +8276,9 @@ case $deplibs_check_method in file_magic*) if test "$file_magic_cmd" = '$MAGIC_CMD'; then @@ -6671,7 +6861,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else case $MAGIC_CMD in -@@ -8874,10 +8259,10 @@ +@@ -8948,10 +8329,10 @@ MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if test -n "$MAGIC_CMD"; then @@ -6684,7 +6874,7 @@ Index: pam.deb/configure $as_echo "no" >&6; } fi -@@ -8887,9 +8272,9 @@ +@@ -8961,9 +8342,9 @@ if test -z "$lt_cv_path_MAGIC_CMD"; then if test -n "$ac_tool_prefix"; then @@ -6696,7 +6886,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else case $MAGIC_CMD in -@@ -8940,10 +8325,10 @@ +@@ -9014,10 +8395,10 @@ MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if test -n "$MAGIC_CMD"; then @@ -6709,7 +6899,7 @@ Index: pam.deb/configure $as_echo "no" >&6; } fi -@@ -9024,9 +8409,9 @@ +@@ -9098,9 +8479,9 @@ if test "$GCC" = yes; then lt_prog_compiler_no_builtin_flag=' -fno-builtin' @@ -6721,21 +6911,21 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_rtti_exceptions=no -@@ -9042,11 +8427,11 @@ +@@ -9116,11 +8497,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:9045: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:8430: $lt_compile\"" >&5) +- (eval echo "\"\$as_me:9119: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8500: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 -- echo "$as_me:9049: \$? = $ac_status" >&5 -+ echo "$as_me:8434: \$? = $ac_status" >&5 +- echo "$as_me:9123: \$? = $ac_status" >&5 ++ echo "$as_me:8504: \$? = $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. -@@ -9059,7 +8444,7 @@ +@@ -9133,7 +8514,7 @@ $RM conftest* fi @@ -6744,7 +6934,7 @@ Index: pam.deb/configure $as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; } if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then -@@ -9079,7 +8464,7 @@ +@@ -9153,7 +8534,7 @@ lt_prog_compiler_pic= lt_prog_compiler_static= @@ -6753,7 +6943,7 @@ Index: pam.deb/configure $as_echo_n "checking for $compiler option to produce PIC... " >&6; } if test "$GCC" = yes; then -@@ -9351,7 +8736,7 @@ +@@ -9425,7 +8806,7 @@ lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" ;; esac @@ -6762,7 +6952,7 @@ Index: pam.deb/configure $as_echo "$lt_prog_compiler_pic" >&6; } -@@ -9363,9 +8748,9 @@ +@@ -9437,9 +8818,9 @@ # Check to make sure the PIC flag actually works. # if test -n "$lt_prog_compiler_pic"; then @@ -6774,21 +6964,21 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_pic_works=no -@@ -9381,11 +8766,11 @@ +@@ -9455,11 +8836,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:9384: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:8769: $lt_compile\"" >&5) +- (eval echo "\"\$as_me:9458: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8839: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 -- echo "$as_me:9388: \$? = $ac_status" >&5 -+ echo "$as_me:8773: \$? = $ac_status" >&5 +- echo "$as_me:9462: \$? = $ac_status" >&5 ++ echo "$as_me:8843: \$? = $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. -@@ -9398,7 +8783,7 @@ +@@ -9472,7 +8853,7 @@ $RM conftest* fi @@ -6797,7 +6987,7 @@ Index: pam.deb/configure $as_echo "$lt_cv_prog_compiler_pic_works" >&6; } if test x"$lt_cv_prog_compiler_pic_works" = xyes; then -@@ -9422,9 +8807,9 @@ +@@ -9496,9 +8877,9 @@ # Check to make sure the static flag actually works. # wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" @@ -6809,7 +6999,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_static_works=no -@@ -9450,7 +8835,7 @@ +@@ -9524,7 +8905,7 @@ LDFLAGS="$save_LDFLAGS" fi @@ -6818,7 +7008,7 @@ Index: pam.deb/configure $as_echo "$lt_cv_prog_compiler_static_works" >&6; } if test x"$lt_cv_prog_compiler_static_works" = xyes; then -@@ -9465,9 +8850,9 @@ +@@ -9539,9 +8920,9 @@ @@ -6830,21 +7020,21 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_c_o=no -@@ -9486,11 +8871,11 @@ +@@ -9560,11 +8941,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:9489: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:8874: $lt_compile\"" >&5) +- (eval echo "\"\$as_me:9563: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8944: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 -- echo "$as_me:9493: \$? = $ac_status" >&5 -+ echo "$as_me:8878: \$? = $ac_status" >&5 +- echo "$as_me:9567: \$? = $ac_status" >&5 ++ echo "$as_me:8948: \$? = $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 -@@ -9512,7 +8897,7 @@ +@@ -9586,7 +8967,7 @@ $RM conftest* fi @@ -6853,7 +7043,7 @@ Index: pam.deb/configure $as_echo "$lt_cv_prog_compiler_c_o" >&6; } -@@ -9520,9 +8905,9 @@ +@@ -9594,9 +8975,9 @@ @@ -6865,21 +7055,21 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_c_o=no -@@ -9541,11 +8926,11 @@ +@@ -9615,11 +8996,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:9544: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:8929: $lt_compile\"" >&5) +- (eval echo "\"\$as_me:9618: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8999: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 -- echo "$as_me:9548: \$? = $ac_status" >&5 -+ echo "$as_me:8933: \$? = $ac_status" >&5 +- echo "$as_me:9622: \$? = $ac_status" >&5 ++ echo "$as_me:9003: \$? = $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 -@@ -9567,7 +8952,7 @@ +@@ -9641,7 +9022,7 @@ $RM conftest* fi @@ -6888,7 +7078,7 @@ Index: pam.deb/configure $as_echo "$lt_cv_prog_compiler_c_o" >&6; } -@@ -9576,7 +8961,7 @@ +@@ -9650,7 +9031,7 @@ hard_links="nottested" if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then # do not overwrite the value of need_locks provided by the user @@ -6897,7 +7087,7 @@ Index: pam.deb/configure $as_echo_n "checking if we can lock with hard links... " >&6; } hard_links=yes $RM conftest* -@@ -9584,10 +8969,10 @@ +@@ -9658,10 +9039,10 @@ touch conftest.a ln conftest.a conftest.b 2>&5 || hard_links=no ln conftest.a conftest.b 2>/dev/null && hard_links=no @@ -6910,7 +7100,7 @@ Index: pam.deb/configure $as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} need_locks=warn fi -@@ -9600,7 +8985,7 @@ +@@ -9674,7 +9055,7 @@ @@ -6919,7 +7109,7 @@ Index: pam.deb/configure $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } runpath_var= -@@ -9660,6 +9045,9 @@ +@@ -9734,6 +9115,9 @@ openbsd*) with_gnu_ld=no ;; @@ -6929,7 +7119,7 @@ Index: pam.deb/configure esac ld_shlibs=yes -@@ -9842,7 +9230,7 @@ +@@ -9916,7 +9300,7 @@ fi ;; @@ -6938,7 +7128,7 @@ Index: pam.deb/configure if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= -@@ -10017,6 +9405,7 @@ +@@ -10091,6 +9475,7 @@ if test "$aix_use_runtimelinking" = yes; then shared_flag="$shared_flag "'${wl}-G' fi @@ -6946,7 +7136,7 @@ Index: pam.deb/configure else # not using gcc if test "$host_cpu" = ia64; then -@@ -10042,11 +9431,7 @@ +@@ -10116,11 +9501,7 @@ allow_undefined_flag='-berok' # Determine the default libpath from the value encoded in an # empty executable. @@ -6959,7 +7149,7 @@ Index: pam.deb/configure /* end confdefs.h. */ int -@@ -10057,27 +9442,7 @@ +@@ -10131,27 +9512,7 @@ return 0; } _ACEOF @@ -6988,7 +7178,7 @@ Index: pam.deb/configure lt_aix_libpath_sed=' /Import File Strings/,/^$/ { -@@ -10091,16 +9456,9 @@ +@@ -10165,16 +9526,9 @@ if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` fi @@ -7007,7 +7197,7 @@ Index: pam.deb/configure if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" -@@ -10113,11 +9471,7 @@ +@@ -10187,11 +9541,7 @@ else # Determine the default libpath from the value encoded in an # empty executable. @@ -7020,7 +7210,7 @@ Index: pam.deb/configure /* end confdefs.h. */ int -@@ -10128,27 +9482,7 @@ +@@ -10202,27 +9552,7 @@ return 0; } _ACEOF @@ -7049,7 +7239,7 @@ Index: pam.deb/configure lt_aix_libpath_sed=' /Import File Strings/,/^$/ { -@@ -10162,16 +9496,9 @@ +@@ -10236,16 +9566,9 @@ if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` fi @@ -7068,7 +7258,7 @@ Index: pam.deb/configure if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" -@@ -10383,42 +9710,16 @@ +@@ -10457,42 +9780,16 @@ # implicitly export all symbols. save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" @@ -7116,7 +7306,7 @@ Index: pam.deb/configure LDFLAGS="$save_LDFLAGS" else archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' -@@ -10431,7 +9732,7 @@ +@@ -10505,7 +9802,7 @@ link_all_deplibs=yes ;; @@ -7125,7 +7315,7 @@ Index: pam.deb/configure if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else -@@ -10674,7 +9975,7 @@ +@@ -10748,7 +10045,7 @@ fi fi @@ -7134,7 +7324,7 @@ Index: pam.deb/configure $as_echo "$ld_shlibs" >&6; } test "$ld_shlibs" = no && can_build_shared=no -@@ -10711,16 +10012,16 @@ +@@ -10785,16 +10082,16 @@ # Test whether the compiler implicitly links with -lc since on some # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. @@ -7155,7 +7345,7 @@ Index: pam.deb/configure soname=conftest lib=conftest libobjs=conftest.$ac_objext -@@ -10734,11 +10035,11 @@ +@@ -10808,11 +10105,11 @@ libname=conftest lt_save_allow_undefined_flag=$allow_undefined_flag allow_undefined_flag= @@ -7170,7 +7360,7 @@ Index: pam.deb/configure then archive_cmds_need_lc=no else -@@ -10749,7 +10050,7 @@ +@@ -10823,7 +10120,7 @@ cat conftest.err 1>&5 fi $RM conftest* @@ -7179,7 +7369,7 @@ Index: pam.deb/configure $as_echo "$archive_cmds_need_lc" >&6; } ;; esac -@@ -10913,7 +10214,7 @@ +@@ -10987,7 +10284,7 @@ @@ -7188,7 +7378,7 @@ Index: pam.deb/configure $as_echo_n "checking dynamic linker characteristics... " >&6; } if test "$GCC" = yes; then -@@ -11335,11 +10636,7 @@ +@@ -11409,11 +10706,7 @@ save_libdir=$libdir eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \ LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\"" @@ -7201,7 +7391,7 @@ Index: pam.deb/configure /* end confdefs.h. */ int -@@ -11350,41 +10647,13 @@ +@@ -11424,41 +10717,13 @@ return 0; } _ACEOF @@ -7247,7 +7437,7 @@ Index: pam.deb/configure LDFLAGS=$save_LDFLAGS libdir=$save_libdir -@@ -11408,6 +10677,18 @@ +@@ -11482,6 +10747,18 @@ dynamic_linker='GNU/Linux ld.so' ;; @@ -7266,7 +7456,7 @@ Index: pam.deb/configure netbsd*) version_type=sunos need_lib_prefix=no -@@ -11596,7 +10877,7 @@ +@@ -11670,7 +10947,7 @@ dynamic_linker=no ;; esac @@ -7275,7 +7465,7 @@ Index: pam.deb/configure $as_echo "$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no -@@ -11698,7 +10979,7 @@ +@@ -11772,7 +11049,7 @@ @@ -7284,7 +7474,7 @@ Index: pam.deb/configure $as_echo_n "checking how to hardcode library paths into programs... " >&6; } hardcode_action= if test -n "$hardcode_libdir_flag_spec" || -@@ -11723,7 +11004,7 @@ +@@ -11797,7 +11074,7 @@ # directories. hardcode_action=unsupported fi @@ -7293,7 +7483,7 @@ Index: pam.deb/configure $as_echo "$hardcode_action" >&6; } if test "$hardcode_action" = relink || -@@ -11768,18 +11049,14 @@ +@@ -11842,18 +11119,14 @@ darwin*) # if libdl is installed we need to link against it @@ -7315,7 +7505,7 @@ Index: pam.deb/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -11797,43 +11074,18 @@ +@@ -11871,43 +11144,18 @@ return 0; } _ACEOF @@ -7365,7 +7555,7 @@ Index: pam.deb/configure lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" else -@@ -11846,106 +11098,18 @@ +@@ -11920,106 +11168,18 @@ ;; *) @@ -7477,7 +7667,7 @@ Index: pam.deb/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -11963,145 +11127,32 @@ +@@ -12037,145 +11197,32 @@ return 0; } _ACEOF @@ -7634,7 +7824,7 @@ Index: pam.deb/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -12119,57 +11170,28 @@ +@@ -12193,57 +11240,28 @@ return 0; } _ACEOF @@ -7701,7 +7891,7 @@ Index: pam.deb/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -12187,57 +11209,28 @@ +@@ -12261,57 +11279,28 @@ return 0; } _ACEOF @@ -7768,7 +7958,7 @@ Index: pam.deb/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -12255,43 +11248,18 @@ +@@ -12329,43 +11318,18 @@ return 0; } _ACEOF @@ -7818,7 +8008,7 @@ Index: pam.deb/configure lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" fi -@@ -12330,9 +11298,9 @@ +@@ -12404,9 +11368,9 @@ save_LIBS="$LIBS" LIBS="$lt_cv_dlopen_libs $LIBS" @@ -7830,16 +8020,16 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then : -@@ -12341,7 +11309,7 @@ +@@ -12415,7 +11379,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 12344 "configure" -+#line 11312 "configure" +-#line 12418 "configure" ++#line 11382 "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -12400,11 +11368,11 @@ +@@ -12474,11 +11438,11 @@ return status; } _LT_EOF @@ -7854,7 +8044,7 @@ Index: pam.deb/configure (./conftest; exit; ) >&5 2>/dev/null lt_status=$? case x$lt_status in -@@ -12421,14 +11389,14 @@ +@@ -12495,14 +11459,14 @@ fi @@ -7872,16 +8062,16 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then : -@@ -12437,7 +11405,7 @@ +@@ -12511,7 +11475,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 12440 "configure" -+#line 11408 "configure" +-#line 12514 "configure" ++#line 11478 "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -12496,11 +11464,11 @@ +@@ -12570,11 +11534,11 @@ return status; } _LT_EOF @@ -7896,7 +8086,7 @@ Index: pam.deb/configure (./conftest; exit; ) >&5 2>/dev/null lt_status=$? case x$lt_status in -@@ -12517,7 +11485,7 @@ +@@ -12591,7 +11555,7 @@ fi @@ -7905,7 +8095,7 @@ Index: pam.deb/configure $as_echo "$lt_cv_dlopen_self_static" >&6; } fi -@@ -12556,12 +11524,12 @@ +@@ -12630,12 +11594,12 @@ striplib= old_striplib= @@ -7920,7 +8110,7 @@ Index: pam.deb/configure $as_echo "yes" >&6; } else # FIXME - insert some real tests, host_os isn't really good enough -@@ -12570,15 +11538,15 @@ +@@ -12644,15 +11608,15 @@ if test -n "$STRIP" ; then striplib="$STRIP -x" old_striplib="$STRIP -S" @@ -7939,7 +8129,7 @@ Index: pam.deb/configure $as_echo "no" >&6; } ;; esac -@@ -12596,12 +11564,12 @@ +@@ -12670,12 +11634,12 @@ # Report which library types will actually be built @@ -7955,7 +8145,7 @@ Index: pam.deb/configure $as_echo_n "checking whether to build shared libraries... " >&6; } test "$can_build_shared" = "no" && enable_shared=no -@@ -12622,14 +11590,14 @@ +@@ -12696,14 +11660,14 @@ fi ;; esac @@ -7973,7 +8163,7 @@ Index: pam.deb/configure $as_echo "$enable_static" >&6; } -@@ -12665,22 +11633,18 @@ +@@ -12739,22 +11703,18 @@ if test "x$CC" != xcc; then @@ -8000,7 +8190,7 @@ Index: pam.deb/configure /* end confdefs.h. */ int -@@ -12696,63 +11660,63 @@ +@@ -12770,63 +11730,63 @@ # existing .o file with -o, though they will create one. ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5' rm -f conftest2.* @@ -8089,7 +8279,7 @@ Index: pam.deb/configure then # cc works too. : -@@ -12769,15 +11733,13 @@ +@@ -12843,15 +11803,13 @@ fi if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then @@ -8108,7 +8298,7 @@ Index: pam.deb/configure fi -@@ -12797,9 +11759,9 @@ +@@ -12871,9 +11829,9 @@ @@ -8120,7 +8310,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else cat > conftest.c <&6 else cat > conftest.c <&6 else ac_cv_sys_largefile_CC=no -@@ -12875,11 +11837,7 @@ +@@ -12949,11 +11907,7 @@ while :; do # IRIX 6.2 and later do not support large files by default, # so use the C compiler's -n32 option if that helps. @@ -8209,7 +8399,7 @@ Index: pam.deb/configure /* end confdefs.h. */ #include /* Check that off_t can represent 2**63 - 1 correctly. -@@ -12898,60 +11856,14 @@ +@@ -12972,60 +11926,14 @@ return 0; } _ACEOF @@ -8272,7 +8462,7 @@ Index: pam.deb/configure rm -f core conftest.err conftest.$ac_objext break done -@@ -12959,23 +11871,19 @@ +@@ -13033,23 +11941,19 @@ rm -f conftest.$ac_ext fi fi @@ -8300,7 +8490,7 @@ Index: pam.deb/configure /* end confdefs.h. */ #include /* Check that off_t can represent 2**63 - 1 correctly. -@@ -12994,38 +11902,11 @@ +@@ -13068,38 +11972,11 @@ return 0; } _ACEOF @@ -8341,7 +8531,7 @@ Index: pam.deb/configure /* end confdefs.h. */ #define _FILE_OFFSET_BITS 64 #include -@@ -13045,38 +11926,15 @@ +@@ -13119,38 +11996,15 @@ return 0; } _ACEOF @@ -8382,7 +8572,7 @@ Index: pam.deb/configure $as_echo "$ac_cv_sys_file_offset_bits" >&6; } case $ac_cv_sys_file_offset_bits in #( no | unknown) ;; -@@ -13088,17 +11946,13 @@ +@@ -13162,17 +12016,13 @@ esac rm -rf conftest* if test $ac_cv_sys_file_offset_bits = unknown; then @@ -8403,7 +8593,7 @@ Index: pam.deb/configure /* end confdefs.h. */ #include /* Check that off_t can represent 2**63 - 1 correctly. -@@ -13117,38 +11971,11 @@ +@@ -13191,38 +12041,11 @@ return 0; } _ACEOF @@ -8444,7 +8634,7 @@ Index: pam.deb/configure /* end confdefs.h. */ #define _LARGE_FILES 1 #include -@@ -13168,38 +11995,15 @@ +@@ -13242,38 +12065,15 @@ return 0; } _ACEOF @@ -8485,7 +8675,7 @@ Index: pam.deb/configure $as_echo "$ac_cv_sys_large_files" >&6; } case $ac_cv_sys_large_files in #( no | unknown) ;; -@@ -13268,17 +12072,13 @@ +@@ -13342,17 +12142,13 @@ fi @@ -8506,7 +8696,7 @@ Index: pam.deb/configure /* end confdefs.h. */ #include -@@ -13300,54 +12100,29 @@ +@@ -13374,54 +12170,29 @@ return 0; } _ACEOF @@ -8568,7 +8758,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else cat > conftest.s <&6 else if test $libc_cv_asm_symver_directive = yes; then -@@ -13391,11 +12166,11 @@ +@@ -13465,11 +12236,11 @@ -nostartfiles -nostdlib -Wl,--version-script,conftest.map 1>&5' @@ -8598,7 +8788,7 @@ Index: pam.deb/configure then libc_cv_ld_version_script_option=yes else -@@ -13409,7 +12184,7 @@ +@@ -13483,7 +12254,7 @@ fi rm -f conftest* fi @@ -8607,7 +8797,7 @@ Index: pam.deb/configure $as_echo "$libc_cv_ld_version_script_option" >&6; } if test "$libc_cv_ld_version_script_option" = "yes"; then HAVE_VERSIONING_TRUE= -@@ -13421,16 +12196,16 @@ +@@ -13495,16 +12266,16 @@ # Check whether --enable-pie was given. @@ -8627,7 +8817,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else cat > conftest.c <&6; } -@@ -13465,7 +12240,7 @@ +@@ -13539,7 +12310,7 @@ # Check whether --enable-prelude was given. @@ -8660,7 +8850,7 @@ Index: pam.deb/configure enableval=$enable_prelude; WITH_PRELUDE=$enableval else WITH_PRELUDE=yes -@@ -13474,7 +12249,7 @@ +@@ -13548,7 +12319,7 @@ if test "$WITH_PRELUDE" == "yes" ; then # Check whether --with-libprelude-prefix was given. @@ -8669,7 +8859,7 @@ Index: pam.deb/configure withval=$with_libprelude_prefix; libprelude_config_prefix="$withval" else libprelude_config_prefix="" -@@ -13489,9 +12264,9 @@ +@@ -13563,9 +12334,9 @@ # Extract the first word of "libprelude-config", so it can be a program name with args. set dummy libprelude-config; ac_word=$2 @@ -8681,7 +8871,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else case $LIBPRELUDE_CONFIG in -@@ -13504,14 +12279,14 @@ +@@ -13578,14 +12349,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -8699,7 +8889,7 @@ Index: pam.deb/configure IFS=$as_save_IFS test -z "$ac_cv_path_LIBPRELUDE_CONFIG" && ac_cv_path_LIBPRELUDE_CONFIG="no" -@@ -13520,16 +12295,16 @@ +@@ -13594,16 +12365,16 @@ fi LIBPRELUDE_CONFIG=$ac_cv_path_LIBPRELUDE_CONFIG if test -n "$LIBPRELUDE_CONFIG"; then @@ -8719,7 +8909,7 @@ Index: pam.deb/configure $as_echo_n "checking for libprelude - version >= $min_libprelude_version... " >&6; } no_libprelude="" if test "$LIBPRELUDE_CONFIG" = "no" ; then -@@ -13551,14 +12326,10 @@ +@@ -13625,14 +12396,10 @@ LDFLAGS="$LDFLAGS $LIBPRELUDE_LDFLAGS" LIBS="$LIBS $LIBPRELUDE_LIBS" rm -f conf.libpreludetest @@ -8736,7 +8926,7 @@ Index: pam.deb/configure /* end confdefs.h. */ #include -@@ -13616,56 +12387,29 @@ +@@ -13690,56 +12457,29 @@ } _ACEOF @@ -8800,7 +8990,7 @@ Index: pam.deb/configure $as_echo "no" >&6; } fi if test "$LIBPRELUDE_CONFIG" = "no" ; then -@@ -13681,11 +12425,7 @@ +@@ -13755,11 +12495,7 @@ CFLAGS="$CFLAGS $LIBPRELUDE_CFLAGS" LDFLAGS="$LDFLAGS $LIBPRELUDE_LDFLAGS" LIBS="$LIBS $LIBPRELUDE_LIBS" @@ -8813,7 +9003,7 @@ Index: pam.deb/configure /* end confdefs.h. */ #include -@@ -13701,27 +12441,7 @@ +@@ -13775,27 +12511,7 @@ return 0; } _ACEOF @@ -8842,7 +9032,7 @@ Index: pam.deb/configure echo "*** The test program compiled, but did not run. This usually means" echo "*** that the run-time linker is not finding LIBPRELUDE or finding the wrong" echo "*** version of LIBPRELUDE. If it is not finding LIBPRELUDE, you'll need to set your" -@@ -13733,18 +12453,13 @@ +@@ -13807,18 +12523,13 @@ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" echo "***" else @@ -8864,7 +9054,7 @@ Index: pam.deb/configure CFLAGS="$ac_save_CFLAGS" LDFLAGS="$ac_save_LDFLAGS" LIBS="$ac_save_LIBS" -@@ -13769,21 +12484,19 @@ +@@ -13843,21 +12554,19 @@ fi # Check whether --enable-debug was given. @@ -8877,9 +9067,9 @@ Index: pam.deb/configure if test x"$enable_debug" = x"yes" ; then -cat >>confdefs.h <<\_ACEOF --#define DEBUG /**/ +-#define PAM_DEBUG /**/ -_ACEOF -+$as_echo "#define DEBUG /**/" >>confdefs.h ++$as_echo "#define PAM_DEBUG /**/" >>confdefs.h fi @@ -8889,7 +9079,7 @@ Index: pam.deb/configure enableval=$enable_securedir; SECUREDIR=$enableval else SECUREDIR=$libdir/security -@@ -13792,7 +12505,7 @@ +@@ -13866,7 +12575,7 @@ # Check whether --enable-isadir was given. @@ -8898,7 +9088,7 @@ Index: pam.deb/configure enableval=$enable_isadir; ISA=$enableval else ISA=../../`basename $libdir`/security -@@ -13804,11 +12517,11 @@ +@@ -13878,11 +12587,11 @@ #define _PAM_ISA "$ISA" _ACEOF @@ -8912,7 +9102,7 @@ Index: pam.deb/configure enableval=$enable_sconfigdir; SCONFIGDIR=$enableval else SCONFIGDIR=$sysconfdir/security -@@ -13817,35 +12530,31 @@ +@@ -13891,35 +12600,31 @@ # Check whether --enable-pamlocking was given. @@ -8953,7 +9143,7 @@ Index: pam.deb/configure enableval=$enable_lckpwdf; WITH_LCKPWDF=$enableval else WITH_LCKPWDF=yes -@@ -13853,152 +12562,16 @@ +@@ -13927,152 +12632,16 @@ if test "$WITH_LCKPWDF" == "yes" ; then @@ -9111,7 +9301,7 @@ Index: pam.deb/configure _ACEOF fi -@@ -14007,21 +12580,17 @@ +@@ -14081,21 +12650,17 @@ # Check whether --with-mailspool was given. @@ -9136,7 +9326,7 @@ Index: pam.deb/configure /* end confdefs.h. */ #include -@@ -14033,42 +12602,15 @@ +@@ -14107,42 +12672,15 @@ #endif } _ACEOF @@ -9183,7 +9373,7 @@ Index: pam.deb/configure fi cat >>confdefs.h <<_ACEOF -@@ -14078,16 +12620,16 @@ +@@ -14152,16 +12690,16 @@ # Check whether --with-xauth was given. @@ -9203,7 +9393,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else case $pam_xauth_path in -@@ -14100,14 +12642,14 @@ +@@ -14174,14 +12712,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -9221,7 +9411,7 @@ Index: pam.deb/configure IFS=$as_save_IFS ;; -@@ -14115,10 +12657,10 @@ +@@ -14189,10 +12727,10 @@ fi pam_xauth_path=$ac_cv_path_pam_xauth_path if test -n "$pam_xauth_path"; then @@ -9234,7 +9424,7 @@ Index: pam.deb/configure $as_echo "no" >&6; } fi -@@ -14136,18 +12678,14 @@ +@@ -14210,18 +12748,14 @@ fi @@ -9256,7 +9446,7 @@ Index: pam.deb/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -14165,43 +12703,18 @@ +@@ -14239,43 +12773,18 @@ return 0; } _ACEOF @@ -9306,7 +9496,7 @@ Index: pam.deb/configure LIBDL="-ldl" else LIBDL="" -@@ -14211,166 +12724,28 @@ +@@ -14285,166 +12794,28 @@ # Check for cracklib # Check whether --enable-cracklib was given. @@ -9485,7 +9675,7 @@ Index: pam.deb/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -14388,43 +12763,18 @@ +@@ -14462,43 +12833,18 @@ return 0; } _ACEOF @@ -9535,7 +9725,7 @@ Index: pam.deb/configure LIBCRACK="-lcrack" else LIBCRACK="" -@@ -14448,153 +12798,23 @@ +@@ -14522,153 +12868,23 @@ # Check whether --enable-audit was given. @@ -9695,7 +9885,7 @@ Index: pam.deb/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -14612,145 +12832,26 @@ +@@ -14686,145 +12902,26 @@ return 0; } _ACEOF @@ -9850,7 +10040,7 @@ Index: pam.deb/configure HAVE_AUDIT_TTY_STATUS=yes else HAVE_AUDIT_TTY_STATUS="" -@@ -14762,16 +12863,12 @@ +@@ -14836,16 +12933,12 @@ if test ! -z "$LIBAUDIT" -a "$ac_cv_header_libaudit_h" != "no" ; then @@ -9869,7 +10059,7 @@ Index: pam.deb/configure fi else -@@ -14787,165 +12884,28 @@ +@@ -14861,165 +12954,28 @@ fi @@ -10051,7 +10241,7 @@ Index: pam.deb/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -14970,155 +12930,39 @@ +@@ -15044,155 +13000,39 @@ ac_res=-l$ac_lib LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi @@ -10119,7 +10309,7 @@ Index: pam.deb/configure - - - for ac_func in crypt_r crypt_gensalt_rn + for ac_func in crypt_r crypt_gensalt_r -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 @@ -10220,7 +10410,7 @@ Index: pam.deb/configure cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF -@@ -15130,15 +12974,13 @@ +@@ -15204,15 +13044,13 @@ if test "$LIBCRYPT" = "-lxcrypt" -a "$ac_cv_header_xcrypt_h" = "yes" ; then @@ -10238,7 +10428,7 @@ Index: pam.deb/configure withval=$with_randomdev; opt_randomdev=$withval fi -@@ -15156,7 +12998,7 @@ +@@ -15230,7 +13068,7 @@ fi # Check whether --enable-db was given. @@ -10247,7 +10437,7 @@ Index: pam.deb/configure enableval=$enable_db; WITH_DB=$enableval else WITH_DB=yes -@@ -15164,25 +13006,21 @@ +@@ -15238,25 +13076,21 @@ # Check whether --with-db-uniquename was given. @@ -10277,7 +10467,7 @@ Index: pam.deb/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -15200,47 +13038,20 @@ +@@ -15274,47 +13108,20 @@ return 0; } _ACEOF @@ -10333,7 +10523,7 @@ Index: pam.deb/configure LIBDB="-ldb$with_db_uniquename" else LIBDB="" -@@ -15248,18 +13059,14 @@ +@@ -15322,18 +13129,14 @@ if test -z "$LIBDB" ; then as_ac_Lib=`$as_echo "ac_cv_lib_db$with_db_uniquename''_dbm_store$with_db_uniquename" | $as_tr_sh` @@ -10355,7 +10545,7 @@ Index: pam.deb/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -15277,47 +13084,20 @@ +@@ -15351,47 +13154,20 @@ return 0; } _ACEOF @@ -10411,7 +10601,7 @@ Index: pam.deb/configure LIBDB="-ldb$with_db_uniquename" else LIBDB="" -@@ -15326,18 +13106,14 @@ +@@ -15400,18 +13176,14 @@ fi fi if test -z "$LIBDB" ; then @@ -10433,7 +10623,7 @@ Index: pam.deb/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -15355,367 +13131,70 @@ +@@ -15429,367 +13201,70 @@ return 0; } _ACEOF @@ -10836,7 +11026,7 @@ Index: pam.deb/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -15733,43 +13212,18 @@ +@@ -15807,43 +13282,18 @@ return 0; } _ACEOF @@ -10886,12 +11076,19 @@ Index: pam.deb/configure LIBNSL="-lnsl" else LIBNSL="" -@@ -15777,102 +13231,12 @@ +@@ -15851,107 +13301,12 @@ BACKUP_LIBS=$LIBS LIBS="$LIBS $LIBNSL" - - for ac_func in yp_get_default_domain +- +- +- +- +- +- +- + for ac_func in yp_get_default_domain getdomainname innetgr yperr_string yp_master yp_bind yp_match yp_unbind -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 @@ -10985,15 +11182,14 @@ Index: pam.deb/configure - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then +do : -+ ac_fn_c_check_func "$LINENO" "yp_get_default_domain" "ac_cv_func_yp_get_default_domain" -+if test "x$ac_cv_func_yp_get_default_domain" = x""yes; then : ++ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" ++eval as_val=\$$as_ac_var ++ if test "x$as_val" = x""yes; then : cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -+#define HAVE_YP_GET_DEFAULT_DOMAIN 1 + #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF - - fi -@@ -15882,25 +13246,21 @@ +@@ -15963,25 +13318,21 @@ # Check whether --enable-selinux was given. @@ -11023,7 +11219,7 @@ Index: pam.deb/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -15918,43 +13278,18 @@ +@@ -15999,43 +13350,18 @@ return 0; } _ACEOF @@ -11073,7 +11269,7 @@ Index: pam.deb/configure LIBSELINUX="-lselinux" else LIBSELINUX="" -@@ -15974,304 +13309,86 @@ +@@ -16055,304 +13381,86 @@ if test ! -z "$LIBSELINUX" ; then @@ -11128,10 +11324,13 @@ Index: pam.deb/configure + cat >>confdefs.h <<_ACEOF +#define HAVE_GETSEUSER 1 +_ACEOF ++ ++fi ++done -#undef $ac_func ++ LIBS=$BACKUP_LIBS +fi -+done -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC @@ -11146,9 +11345,6 @@ Index: pam.deb/configure -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif -+ LIBS=$BACKUP_LIBS -+fi -+ +ac_header_dirent=no +for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do + as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` @@ -11431,7 +11627,7 @@ Index: pam.deb/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -16296,70 +13413,39 @@ +@@ -16377,70 +13485,39 @@ ac_res=-l$ac_lib LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi @@ -11513,7 +11709,7 @@ Index: pam.deb/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -16384,70 +13470,39 @@ +@@ -16465,70 +13542,39 @@ ac_res=-l$ac_lib LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi @@ -11595,7 +11791,7 @@ Index: pam.deb/configure /* end confdefs.h. */ #include #include -@@ -16462,48 +13517,23 @@ +@@ -16543,48 +13589,23 @@ return 0; } _ACEOF @@ -11649,7 +11845,7 @@ Index: pam.deb/configure else ac_cv_header_stdc=no fi -@@ -16513,18 +13543,14 @@ +@@ -16594,18 +13615,14 @@ if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. @@ -11671,7 +11867,7 @@ Index: pam.deb/configure else ac_cv_header_stdc=no fi -@@ -16534,14 +13560,10 @@ +@@ -16615,14 +13632,10 @@ if test $ac_cv_header_stdc = yes; then # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. @@ -11688,7 +11884,7 @@ Index: pam.deb/configure /* end confdefs.h. */ #include #include -@@ -16568,64 +13590,31 @@ +@@ -16649,64 +13662,31 @@ return 0; } _ACEOF @@ -11763,7 +11959,7 @@ Index: pam.deb/configure /* end confdefs.h. */ #include #include -@@ -16646,411 +13635,94 @@ +@@ -16727,413 +13707,94 @@ return 0; } _ACEOF @@ -11809,7 +12005,7 @@ Index: pam.deb/configure fi -+for ac_header in fcntl.h limits.h malloc.h sys/file.h sys/ioctl.h sys/time.h syslog.h net/if.h termio.h unistd.h sys/fsuid.h inittypes.h ++for ac_header in fcntl.h limits.h malloc.h sys/file.h sys/ioctl.h sys/time.h syslog.h net/if.h termio.h unistd.h sys/fsuid.h inittypes.h rpcsvc/ypclnt.h rpcsvc/yp_prot.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" @@ -11843,7 +12039,9 @@ Index: pam.deb/configure - - - --for ac_header in fcntl.h limits.h malloc.h sys/file.h sys/ioctl.h sys/time.h syslog.h net/if.h termio.h unistd.h sys/fsuid.h inittypes.h +- +- +-for ac_header in fcntl.h limits.h malloc.h sys/file.h sys/ioctl.h sys/time.h syslog.h net/if.h termio.h unistd.h sys/fsuid.h inittypes.h rpcsvc/ypclnt.h rpcsvc/yp_prot.h -do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then @@ -11928,7 +12126,7 @@ Index: pam.deb/configure + done fi - - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } - @@ -12223,21 +12421,19 @@ Index: pam.deb/configure - -fi - --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -- if test $ac_cv_c_bigendian = unknown; then -- # See if sys/param.h defines the BYTE_ORDER macro. + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + if test $ac_cv_c_bigendian = unknown; then + # See if sys/param.h defines the BYTE_ORDER macro. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -+ if test $ac_cv_c_bigendian = unknown; then -+ # See if sys/param.h defines the BYTE_ORDER macro. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include -@@ -17068,30 +13740,9 @@ +@@ -17151,30 +13812,9 @@ return 0; } _ACEOF @@ -12270,7 +12466,7 @@ Index: pam.deb/configure /* end confdefs.h. */ #include #include -@@ -17107,49 +13758,18 @@ +@@ -17190,49 +13830,18 @@ return 0; } _ACEOF @@ -12323,7 +12519,7 @@ Index: pam.deb/configure /* end confdefs.h. */ #include -@@ -17164,30 +13784,9 @@ +@@ -17247,30 +13856,9 @@ return 0; } _ACEOF @@ -12356,7 +12552,7 @@ Index: pam.deb/configure /* end confdefs.h. */ #include -@@ -17202,51 +13801,20 @@ +@@ -17285,51 +13873,20 @@ return 0; } _ACEOF @@ -12412,7 +12608,7 @@ Index: pam.deb/configure /* end confdefs.h. */ short int ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; -@@ -17272,24 +13840,7 @@ +@@ -17355,24 +13912,7 @@ return 0; } _ACEOF @@ -12438,7 +12634,7 @@ Index: pam.deb/configure if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then ac_cv_c_bigendian=yes fi -@@ -17301,20 +13852,10 @@ +@@ -17384,20 +13924,10 @@ ac_cv_c_bigendian=unknown fi fi @@ -12460,7 +12656,7 @@ Index: pam.deb/configure /* end confdefs.h. */ $ac_includes_default int -@@ -17334,79 +13875,41 @@ +@@ -17417,79 +13947,41 @@ return 0; } _ACEOF @@ -12552,7 +12748,7 @@ Index: pam.deb/configure /* end confdefs.h. */ int -@@ -17466,60 +13969,33 @@ +@@ -17549,60 +14041,33 @@ return 0; } _ACEOF @@ -12621,7 +12817,7 @@ Index: pam.deb/configure ac_cv_type_uid_t=yes else ac_cv_type_uid_t=no -@@ -17527,117 +14003,20 @@ +@@ -17610,117 +14075,20 @@ rm -f conftest* fi @@ -12744,7 +12940,7 @@ Index: pam.deb/configure else cat >>confdefs.h <<_ACEOF -@@ -17646,102 +14025,9 @@ +@@ -17729,102 +14097,9 @@ fi @@ -12849,7 +13045,7 @@ Index: pam.deb/configure else cat >>confdefs.h <<_ACEOF -@@ -17750,102 +14036,9 @@ +@@ -17833,102 +14108,9 @@ fi @@ -12939,12 +13135,12 @@ Index: pam.deb/configure -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +- +- +-fi +ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default" +if test "x$ac_cv_type_size_t" = x""yes; then : -- --fi -- -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5 @@ -12954,7 +13150,7 @@ Index: pam.deb/configure else cat >>confdefs.h <<_ACEOF -@@ -17854,16 +14047,12 @@ +@@ -17937,16 +14119,12 @@ fi @@ -12974,7 +13170,7 @@ Index: pam.deb/configure /* end confdefs.h. */ #include #include -@@ -17878,54 +14067,27 @@ +@@ -17961,54 +14139,27 @@ return 0; } _ACEOF @@ -13036,7 +13232,7 @@ Index: pam.deb/configure /* end confdefs.h. */ #include #include -@@ -17940,58 +14102,31 @@ +@@ -18023,58 +14174,31 @@ return 0; } _ACEOF @@ -13103,7 +13299,7 @@ Index: pam.deb/configure /* end confdefs.h. */ /* Thanks to Mike Rendell for this test. */ $ac_includes_default -@@ -18017,54 +14152,23 @@ +@@ -18100,54 +14224,23 @@ return n > 0 && gidset[n] != val.gval; } _ACEOF @@ -13164,7 +13360,7 @@ Index: pam.deb/configure ac_cv_type_getgroups=gid_t else ac_cv_type_getgroups=int -@@ -18073,7 +14177,7 @@ +@@ -18156,7 +14249,7 @@ fi fi @@ -13173,7 +13369,7 @@ Index: pam.deb/configure $as_echo "$ac_cv_type_getgroups" >&6; } cat >>confdefs.h <<_ACEOF -@@ -18082,23 +14186,19 @@ +@@ -18165,23 +14258,19 @@ if test $ac_cv_c_compiler_gnu = yes; then @@ -13201,7 +13397,7 @@ Index: pam.deb/configure ac_cv_prog_gcc_traditional=yes else ac_cv_prog_gcc_traditional=no -@@ -18107,43 +14207,35 @@ +@@ -18190,43 +14279,35 @@ if test $ac_cv_prog_gcc_traditional = no; then @@ -13252,7 +13448,7 @@ Index: pam.deb/configure /* end confdefs.h. */ $ac_includes_default int -@@ -18178,44 +14270,17 @@ +@@ -18261,44 +14342,17 @@ return 0; } _ACEOF @@ -13302,7 +13498,7 @@ Index: pam.deb/configure $as_echo "$ac_cv_func_memcmp_working" >&6; } test $ac_cv_func_memcmp_working = no && case " $LIBOBJS " in *" memcmp.$ac_objext "* ) ;; -@@ -18224,300 +14289,31 @@ +@@ -18307,300 +14361,31 @@ esac @@ -13617,7 +13813,7 @@ Index: pam.deb/configure cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF -@@ -18525,105 +14321,12 @@ +@@ -18608,105 +14393,12 @@ fi done @@ -13728,7 +13924,7 @@ Index: pam.deb/configure cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF -@@ -18631,104 +14334,12 @@ +@@ -18714,104 +14406,12 @@ fi done @@ -13838,7 +14034,7 @@ Index: pam.deb/configure cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF -@@ -18736,102 +14347,12 @@ +@@ -18819,102 +14419,12 @@ fi done @@ -13946,7 +14142,7 @@ Index: pam.deb/configure cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF -@@ -18839,102 +14360,12 @@ +@@ -18922,102 +14432,12 @@ fi done @@ -14054,7 +14250,7 @@ Index: pam.deb/configure cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF -@@ -18943,102 +14374,12 @@ +@@ -19026,102 +14446,12 @@ done @@ -14161,8 +14357,17 @@ Index: pam.deb/configure _ACEOF UNSHARE=yes else -@@ -19058,9 +14399,9 @@ - enable_man=yes +@@ -19139,7 +14469,7 @@ + + + # Check whether --enable-regenerate-docu was given. +-if test "${enable_regenerate_docu+set}" = set; then ++if test "${enable_regenerate_docu+set}" = set; then : + enableval=$enable_regenerate_docu; enable_docu=$enableval + else + enable_docu=yes +@@ -19147,9 +14477,9 @@ + # Extract the first word of "xsltproc", so it can be a program name with args. set dummy xsltproc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 @@ -14173,7 +14378,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else case $XSLTPROC in -@@ -19073,14 +14414,14 @@ +@@ -19162,14 +14492,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -14191,7 +14396,7 @@ Index: pam.deb/configure IFS=$as_save_IFS ;; -@@ -19088,10 +14429,10 @@ +@@ -19177,10 +14507,10 @@ fi XSLTPROC=$ac_cv_path_XSLTPROC if test -n "$XSLTPROC"; then @@ -14204,7 +14409,7 @@ Index: pam.deb/configure $as_echo "no" >&6; } fi -@@ -19101,9 +14442,9 @@ +@@ -19190,9 +14520,9 @@ fi # Extract the first word of "xmllint", so it can be a program name with args. set dummy xmllint; ac_word=$2 @@ -14216,7 +14421,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else case $XMLLINT in -@@ -19116,14 +14457,14 @@ +@@ -19205,14 +14535,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -14234,7 +14439,7 @@ Index: pam.deb/configure IFS=$as_save_IFS test -z "$ac_cv_path_XMLLINT" && ac_cv_path_XMLLINT="/bin/true" -@@ -19132,10 +14473,10 @@ +@@ -19221,10 +14551,10 @@ fi XMLLINT=$ac_cv_path_XMLLINT if test -n "$XMLLINT"; then @@ -14247,7 +14452,7 @@ Index: pam.deb/configure $as_echo "no" >&6; } fi -@@ -19144,7 +14485,7 @@ +@@ -19233,7 +14563,7 @@ # check for the presence of the XML catalog # Check whether --with-xml-catalog was given. @@ -14256,7 +14461,7 @@ Index: pam.deb/configure withval=$with_xml_catalog; else with_xml_catalog=/etc/xml/catalog -@@ -19153,23 +14494,23 @@ +@@ -19242,23 +14572,23 @@ jh_found_xmlcatalog=true XML_CATALOG_FILE="$with_xml_catalog" @@ -14285,7 +14490,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else case $XMLCATALOG in -@@ -19182,14 +14523,14 @@ +@@ -19271,14 +14601,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -14303,7 +14508,7 @@ Index: pam.deb/configure IFS=$as_save_IFS test -z "$ac_cv_path_XMLCATALOG" && ac_cv_path_XMLCATALOG="no" -@@ -19198,10 +14539,10 @@ +@@ -19287,10 +14617,10 @@ fi XMLCATALOG=$ac_cv_path_XMLCATALOG if test -n "$XMLCATALOG"; then @@ -14316,7 +14521,7 @@ Index: pam.deb/configure $as_echo "no" >&6; } fi -@@ -19217,35 +14558,35 @@ +@@ -19306,35 +14636,35 @@ fi @@ -14339,7 +14544,7 @@ Index: pam.deb/configure - { $as_echo "$as_me:$LINENO: result: not found" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 $as_echo "not found" >&6; } - enable_man=no + enable_docu=no fi @@ -14362,9 +14567,9 @@ Index: pam.deb/configure - { $as_echo "$as_me:$LINENO: result: not found" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 $as_echo "not found" >&6; } - enable_man=no + enable_docu=no fi -@@ -19253,9 +14594,9 @@ +@@ -19342,9 +14672,9 @@ # Extract the first word of "w3m", so it can be a program name with args. set dummy w3m; ac_word=$2 @@ -14376,7 +14581,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else case $BROWSER in -@@ -19268,14 +14609,14 @@ +@@ -19357,14 +14687,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -14394,7 +14599,7 @@ Index: pam.deb/configure IFS=$as_save_IFS ;; -@@ -19283,10 +14624,10 @@ +@@ -19372,10 +14702,10 @@ fi BROWSER=$ac_cv_path_BROWSER if test -n "$BROWSER"; then @@ -14407,7 +14612,7 @@ Index: pam.deb/configure $as_echo "no" >&6; } fi -@@ -19299,9 +14640,9 @@ +@@ -19388,9 +14718,9 @@ # Extract the first word of "fop", so it can be a program name with args. set dummy fop; ac_word=$2 @@ -14419,7 +14624,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else case $FO2PDF in -@@ -19314,14 +14655,14 @@ +@@ -19403,14 +14733,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -14437,7 +14642,7 @@ Index: pam.deb/configure IFS=$as_save_IFS ;; -@@ -19329,10 +14670,10 @@ +@@ -19418,10 +14748,10 @@ fi FO2PDF=$ac_cv_path_FO2PDF if test -n "$FO2PDF"; then @@ -14450,7 +14655,7 @@ Index: pam.deb/configure $as_echo "no" >&6; } fi -@@ -19358,16 +14699,16 @@ +@@ -19447,16 +14777,16 @@ @@ -14470,7 +14675,7 @@ Index: pam.deb/configure $as_echo "$USE_NLS" >&6; } -@@ -19408,9 +14749,9 @@ +@@ -19497,9 +14827,9 @@ # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 @@ -14482,7 +14687,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else case "$MSGFMT" in -@@ -19440,18 +14781,18 @@ +@@ -19529,18 +14859,18 @@ fi MSGFMT="$ac_cv_path_MSGFMT" if test "$MSGFMT" != ":"; then @@ -14505,7 +14710,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else case $GMSGFMT in -@@ -19464,14 +14805,14 @@ +@@ -19553,14 +14883,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -14523,7 +14728,7 @@ Index: pam.deb/configure IFS=$as_save_IFS test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" -@@ -19480,10 +14821,10 @@ +@@ -19569,10 +14899,10 @@ fi GMSGFMT=$ac_cv_path_GMSGFMT if test -n "$GMSGFMT"; then @@ -14536,7 +14741,7 @@ Index: pam.deb/configure $as_echo "no" >&6; } fi -@@ -19531,9 +14872,9 @@ +@@ -19620,9 +14950,9 @@ # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 @@ -14548,7 +14753,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else case "$XGETTEXT" in -@@ -19563,10 +14904,10 @@ +@@ -19652,10 +14982,10 @@ fi XGETTEXT="$ac_cv_path_XGETTEXT" if test "$XGETTEXT" != ":"; then @@ -14561,7 +14766,7 @@ Index: pam.deb/configure $as_echo "no" >&6; } fi -@@ -19609,9 +14950,9 @@ +@@ -19698,9 +15028,9 @@ # Extract the first word of "msgmerge", so it can be a program name with args. set dummy msgmerge; ac_word=$2 @@ -14573,7 +14778,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else case "$MSGMERGE" in -@@ -19640,10 +14981,10 @@ +@@ -19729,10 +15059,10 @@ fi MSGMERGE="$ac_cv_path_MSGMERGE" if test "$MSGMERGE" != ":"; then @@ -14586,7 +14791,7 @@ Index: pam.deb/configure $as_echo "no" >&6; } fi -@@ -19675,7 +15016,7 @@ +@@ -19764,7 +15094,7 @@ # Check whether --with-gnu-ld was given. @@ -14595,7 +14800,7 @@ Index: pam.deb/configure withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes else with_gnu_ld=no -@@ -19697,7 +15038,7 @@ +@@ -19786,7 +15116,7 @@ ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. @@ -14604,7 +14809,7 @@ Index: pam.deb/configure $as_echo_n "checking for ld used by GCC... " >&6; } case $host in *-*-mingw*) -@@ -19727,13 +15068,13 @@ +@@ -19816,13 +15146,13 @@ ;; esac elif test "$with_gnu_ld" = yes; then @@ -14621,7 +14826,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else if test -z "$LD"; then -@@ -19761,18 +15102,16 @@ +@@ -19850,18 +15180,16 @@ LD="$acl_cv_path_LD" if test -n "$LD"; then @@ -14645,7 +14850,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else # I'd rather use --version here, but apparently some GNU ld's only accept -v. -@@ -19783,16 +15122,16 @@ +@@ -19872,16 +15200,16 @@ acl_cv_prog_gnu_ld=no ;; esac fi @@ -14665,7 +14870,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else -@@ -19803,7 +15142,7 @@ +@@ -19892,7 +15220,7 @@ acl_cv_rpath=done fi @@ -14674,7 +14879,7 @@ Index: pam.deb/configure $as_echo "$acl_cv_rpath" >&6; } wl="$acl_cv_wl" acl_libext="$acl_cv_libext" -@@ -19815,7 +15154,7 @@ +@@ -19904,7 +15232,7 @@ acl_hardcode_direct="$acl_cv_hardcode_direct" acl_hardcode_minus_L="$acl_cv_hardcode_minus_L" # Check whether --enable-rpath was given. @@ -14683,7 +14888,7 @@ Index: pam.deb/configure enableval=$enable_rpath; : else enable_rpath=yes -@@ -19864,7 +15203,7 @@ +@@ -19953,7 +15281,7 @@ # Check whether --with-libiconv-prefix was given. @@ -14692,7 +14897,7 @@ Index: pam.deb/configure withval=$with_libiconv_prefix; if test "X$withval" = "Xno"; then use_additional=no -@@ -20304,18 +15643,14 @@ +@@ -20393,18 +15721,14 @@ @@ -14714,7 +14919,7 @@ Index: pam.deb/configure /* end confdefs.h. */ #include int -@@ -20326,61 +15661,30 @@ +@@ -20415,61 +15739,30 @@ return 0; } _ACEOF @@ -14785,7 +14990,7 @@ Index: pam.deb/configure /* end confdefs.h. */ #include int -@@ -20391,47 +15695,20 @@ +@@ -20480,47 +15773,20 @@ return 0; } _ACEOF @@ -14839,7 +15044,7 @@ Index: pam.deb/configure fi INTL_MACOSX_LIBS= -@@ -20476,16 +15753,12 @@ +@@ -20565,16 +15831,12 @@ gt_expression_test_code= fi @@ -14859,7 +15064,7 @@ Index: pam.deb/configure /* end confdefs.h. */ #include $gt_revision_test_code -@@ -20500,42 +15773,16 @@ +@@ -20589,42 +15851,16 @@ return 0; } _ACEOF @@ -14908,7 +15113,7 @@ Index: pam.deb/configure $as_echo "$ac_res" >&6; } if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then -@@ -20569,19 +15816,15 @@ +@@ -20658,19 +15894,15 @@ done @@ -14931,7 +15136,7 @@ Index: pam.deb/configure /* end confdefs.h. */ #include #include -@@ -20595,46 +15838,15 @@ +@@ -20684,46 +15916,15 @@ return 0; } _ACEOF @@ -14982,7 +15187,7 @@ Index: pam.deb/configure /* end confdefs.h. */ #include #include -@@ -20648,49 +15860,22 @@ +@@ -20737,49 +15938,22 @@ return 0; } _ACEOF @@ -15038,7 +15243,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else -@@ -20698,17 +15883,13 @@ +@@ -20787,17 +15961,13 @@ if test $am_cv_lib_iconv = yes; then LIBS="$LIBS $LIBICONV" fi @@ -15058,7 +15263,7 @@ Index: pam.deb/configure /* end confdefs.h. */ #include -@@ -20768,46 +15949,19 @@ +@@ -20857,46 +16027,19 @@ return 0; } _ACEOF @@ -15110,7 +15315,7 @@ Index: pam.deb/configure $as_echo "$am_cv_func_iconv_works" >&6; } case "$am_cv_func_iconv_works" in *no) am_func_iconv=no am_cv_lib_iconv=no ;; -@@ -20818,15 +15972,13 @@ +@@ -20907,15 +16050,13 @@ fi if test "$am_func_iconv" = yes; then @@ -15129,7 +15334,7 @@ Index: pam.deb/configure $as_echo "$LIBICONV" >&6; } else CPPFLAGS="$am_save_CPPFLAGS" -@@ -20856,7 +16008,7 @@ +@@ -20945,7 +16086,7 @@ # Check whether --with-libintl-prefix was given. @@ -15138,7 +15343,7 @@ Index: pam.deb/configure withval=$with_libintl_prefix; if test "X$withval" = "Xno"; then use_additional=no -@@ -21272,20 +16424,16 @@ +@@ -21361,20 +16502,16 @@ done fi @@ -15162,7 +15367,7 @@ Index: pam.deb/configure /* end confdefs.h. */ #include $gt_revision_test_code -@@ -21304,45 +16452,16 @@ +@@ -21393,45 +16530,16 @@ return 0; } _ACEOF @@ -15213,7 +15418,7 @@ Index: pam.deb/configure /* end confdefs.h. */ #include $gt_revision_test_code -@@ -21361,48 +16480,20 @@ +@@ -21450,48 +16558,20 @@ return 0; } _ACEOF @@ -15267,7 +15472,7 @@ Index: pam.deb/configure $as_echo "$ac_res" >&6; } fi -@@ -21430,21 +16521,19 @@ +@@ -21519,21 +16599,19 @@ if test "$gt_use_preinstalled_gnugettext" = "yes" \ || test "$nls_cv_use_gnu_gettext" = "yes"; then @@ -15293,7 +15498,7 @@ Index: pam.deb/configure $as_echo_n "checking where the gettext function comes from... " >&6; } if test "$gt_use_preinstalled_gnugettext" = "yes"; then if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then -@@ -21455,7 +16544,7 @@ +@@ -21544,7 +16622,7 @@ else gt_source="included intl directory" fi @@ -15302,7 +15507,7 @@ Index: pam.deb/configure $as_echo "$gt_source" >&6; } fi -@@ -21463,9 +16552,9 @@ +@@ -21552,9 +16630,9 @@ if test "$gt_use_preinstalled_gnugettext" = "yes"; then if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then @@ -15314,7 +15519,7 @@ Index: pam.deb/configure $as_echo "$LIBINTL" >&6; } for element in $INCINTL; do -@@ -21493,14 +16582,10 @@ +@@ -21582,14 +16660,10 @@ fi @@ -15331,7 +15536,7 @@ Index: pam.deb/configure fi -@@ -21509,233 +16594,38 @@ +@@ -21598,233 +16672,38 @@ @@ -15587,7 +15792,7 @@ Index: pam.deb/configure have_key_errors=1 else have_key_errors=0 -@@ -21750,9 +16640,7 @@ +@@ -21839,9 +16718,7 @@ if test $HAVE_KEY_MANAGEMENT = 1; then @@ -15598,7 +15803,7 @@ Index: pam.deb/configure fi HAVE_KEY_MANAGEMENT=$HAVE_KEY_MANAGEMENT -@@ -21796,13 +16684,13 @@ +@@ -21885,13 +16762,13 @@ case $ac_val in #( *${as_nl}*) case $ac_var in #( @@ -15614,7 +15819,7 @@ Index: pam.deb/configure esac ;; esac done -@@ -21810,8 +16698,8 @@ +@@ -21899,8 +16776,8 @@ (set) 2>&1 | case $as_nl`(ac_space=' '; set) 2>&1` in #( *${as_nl}ac_space=\ *) @@ -15625,7 +15830,7 @@ Index: pam.deb/configure sed -n \ "s/'/'\\\\''/g; s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" -@@ -21834,11 +16722,11 @@ +@@ -21923,11 +16800,11 @@ if diff "$cache_file" confcache >/dev/null 2>&1; then :; else if test -w "$cache_file"; then test "x$cache_file" != "x/dev/null" && @@ -15639,7 +15844,7 @@ Index: pam.deb/configure $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} fi fi -@@ -21858,8 +16746,8 @@ +@@ -21947,8 +16824,8 @@ ac_i=`$as_echo "$ac_i" | sed "$ac_script"` # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR # will be set to the directory where LIBOBJS objects are built. @@ -15650,8 +15855,8 @@ Index: pam.deb/configure done LIBOBJS=$ac_libobjs -@@ -21867,105 +16755,67 @@ - +@@ -21964,105 +16841,67 @@ + fi if test -z "${STATIC_MODULES_TRUE}" && test -z "${STATIC_MODULES_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"STATIC_MODULES\" was never defined. @@ -15785,7 +15990,7 @@ Index: pam.deb/configure #! $SHELL # Generated by $as_me. # Run this file to recreate the current configuration. -@@ -21975,17 +16825,18 @@ +@@ -22072,17 +16911,18 @@ debug=false ac_cs_recheck=false ac_cs_silent=false @@ -15811,7 +16016,7 @@ Index: pam.deb/configure emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which -@@ -21993,23 +16844,15 @@ +@@ -22090,23 +16930,15 @@ alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else @@ -15840,7 +16045,7 @@ Index: pam.deb/configure as_nl=' ' export as_nl -@@ -22017,7 +16860,13 @@ +@@ -22114,7 +16946,13 @@ as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo @@ -15855,7 +16060,7 @@ Index: pam.deb/configure as_echo='printf %s\n' as_echo_n='printf %s' else -@@ -22028,7 +16877,7 @@ +@@ -22125,7 +16963,7 @@ as_echo_body='eval expr "X$1" : "X\\(.*\\)"' as_echo_n_body='eval arg=$1; @@ -15864,7 +16069,7 @@ Index: pam.deb/configure *"$as_nl"*) expr "X$arg" : "X\\(.*\\)$as_nl"; arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; -@@ -22051,13 +16900,6 @@ +@@ -22148,13 +16986,6 @@ } fi @@ -15878,7 +16083,7 @@ Index: pam.deb/configure # IFS # We need space, tab and new line, in precisely that order. Quoting is -@@ -22067,15 +16909,15 @@ +@@ -22164,15 +16995,15 @@ IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. @@ -15897,7 +16102,7 @@ Index: pam.deb/configure IFS=$as_save_IFS ;; -@@ -22087,12 +16929,16 @@ +@@ -22184,12 +17015,16 @@ fi if test ! -f "$as_myself"; then $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 @@ -15918,7 +16123,7 @@ Index: pam.deb/configure done PS1='$ ' PS2='> ' -@@ -22104,7 +16950,89 @@ +@@ -22201,7 +17036,89 @@ LANGUAGE=C export LANGUAGE @@ -16009,7 +16214,7 @@ Index: pam.deb/configure if expr a : '\(a\)' >/dev/null 2>&1 && test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr -@@ -22118,8 +17046,12 @@ +@@ -22215,8 +17132,12 @@ as_basename=false fi @@ -16023,7 +16228,7 @@ Index: pam.deb/configure as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ -@@ -22139,76 +17071,25 @@ +@@ -22236,76 +17157,25 @@ } s/.*/./; q'` @@ -16111,7 +16316,7 @@ Index: pam.deb/configure rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then -@@ -22237,8 +17118,56 @@ +@@ -22334,8 +17204,56 @@ rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -16169,7 +16374,7 @@ Index: pam.deb/configure else test -d ./-p && rmdir ./-p as_mkdir_p=false -@@ -22257,10 +17186,10 @@ +@@ -22354,10 +17272,10 @@ if test -d "$1"; then test -d "$1/."; else @@ -16182,7 +16387,7 @@ Index: pam.deb/configure ???[sx]*):;;*)false;;esac;fi '\'' sh ' -@@ -22275,13 +17204,19 @@ +@@ -22372,13 +17290,19 @@ exec 6>&1 @@ -16204,7 +16409,7 @@ Index: pam.deb/configure CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS -@@ -22313,10 +17248,11 @@ +@@ -22410,10 +17334,11 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ac_cs_usage="\ @@ -16219,7 +16424,7 @@ Index: pam.deb/configure -h, --help print this help, then exit -V, --version print version number and configuration settings, then exit -@@ -22338,16 +17274,16 @@ +@@ -22435,16 +17360,16 @@ Configuration commands: $config_commands @@ -16239,7 +16444,7 @@ Index: pam.deb/configure This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." -@@ -22390,20 +17326,19 @@ +@@ -22487,20 +17412,19 @@ case $ac_optarg in *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; esac @@ -16264,7 +16469,7 @@ Index: pam.deb/configure --help | --hel | -h ) $as_echo "$ac_cs_usage"; exit ;; -q | -quiet | --quiet | --quie | --qui | --qu | --q \ -@@ -22411,11 +17346,10 @@ +@@ -22508,11 +17432,10 @@ ac_cs_silent=: ;; # This is an error. @@ -16279,7 +16484,7 @@ Index: pam.deb/configure ac_need_defaults=false ;; esac -@@ -22796,9 +17730,7 @@ +@@ -22893,9 +17816,7 @@ "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;; "xtests/Makefile") CONFIG_FILES="$CONFIG_FILES xtests/Makefile" ;; @@ -16290,7 +16495,7 @@ Index: pam.deb/configure esac done -@@ -22825,7 +17757,7 @@ +@@ -22922,7 +17843,7 @@ trap 'exit_status=$? { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status ' 0 @@ -16299,7 +16504,7 @@ Index: pam.deb/configure } # Create a (secure) tmp directory for tmp files. -@@ -22836,11 +17768,7 @@ +@@ -22933,11 +17854,7 @@ { tmp=./conf$$-$RANDOM (umask 077 && mkdir "$tmp") @@ -16312,7 +16517,7 @@ Index: pam.deb/configure # Set up the scripts for CONFIG_FILES section. # No need to generate them if there are no CONFIG_FILES. -@@ -22848,10 +17776,16 @@ +@@ -22945,10 +17862,16 @@ if test -n "$CONFIG_FILES"; then @@ -16331,7 +16536,7 @@ Index: pam.deb/configure else ac_cs_awk_cr=$ac_cr fi -@@ -22865,24 +17799,18 @@ +@@ -22962,24 +17885,18 @@ echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && echo "_ACEOF" } >conf$$subs.sh || @@ -16359,7 +16564,7 @@ Index: pam.deb/configure else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi -@@ -22971,9 +17899,7 @@ +@@ -23068,9 +17985,7 @@ else cat fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ @@ -16370,7 +16575,7 @@ Index: pam.deb/configure _ACEOF # VPATH may cause trouble with some makes, so we remove $(srcdir), -@@ -23014,9 +17940,7 @@ +@@ -23111,9 +18026,7 @@ if test -z "$ac_t"; then break elif $ac_last_try; then @@ -16381,7 +16586,7 @@ Index: pam.deb/configure else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi -@@ -23101,9 +18025,7 @@ +@@ -23198,9 +18111,7 @@ _ACAWK _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 @@ -16392,7 +16597,7 @@ Index: pam.deb/configure fi # test -n "$CONFIG_HEADERS" -@@ -23116,9 +18038,7 @@ +@@ -23213,9 +18124,7 @@ esac case $ac_mode$ac_tag in :[FHL]*:*);; @@ -16403,7 +16608,7 @@ Index: pam.deb/configure :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac -@@ -23146,12 +18066,10 @@ +@@ -23243,12 +18152,10 @@ [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || @@ -16418,7 +16623,7 @@ Index: pam.deb/configure done # Let's still pretend it is `configure' which instantiates (i.e., don't -@@ -23162,7 +18080,7 @@ +@@ -23259,7 +18166,7 @@ `' by configure.' if test x"$ac_file" != x-; then configure_input="$ac_file. $configure_input" @@ -16427,7 +16632,7 @@ Index: pam.deb/configure $as_echo "$as_me: creating $ac_file" >&6;} fi # Neutralize special characters interpreted by sed in replacement strings. -@@ -23175,9 +18093,7 @@ +@@ -23272,9 +18179,7 @@ case $ac_tag in *:-:* | *:-) cat >"$tmp/stdin" \ @@ -16438,7 +16643,7 @@ Index: pam.deb/configure esac ;; esac -@@ -23205,47 +18121,7 @@ +@@ -23302,47 +18207,7 @@ q } s/.*/./; q'` @@ -16487,7 +16692,7 @@ Index: pam.deb/configure ac_builddir=. case "$ac_dir" in -@@ -23302,7 +18178,6 @@ +@@ -23399,7 +18264,6 @@ # If the template does not know about datarootdir, expand it. # FIXME: This hack should be removed a few years after 2.60. ac_datarootdir_hack=; ac_datarootdir_seen= @@ -16495,7 +16700,7 @@ Index: pam.deb/configure ac_sed_dataroot=' /datarootdir/ { p -@@ -23312,12 +18187,11 @@ +@@ -23409,12 +18273,11 @@ /@docdir@/p /@infodir@/p /@localedir@/p @@ -16510,7 +16715,7 @@ Index: pam.deb/configure $as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -@@ -23327,7 +18201,7 @@ +@@ -23424,7 +18287,7 @@ s&@infodir@&$infodir&g s&@localedir@&$localedir&g s&@mandir@&$mandir&g @@ -16519,7 +16724,7 @@ Index: pam.deb/configure esac _ACEOF -@@ -23356,14 +18230,12 @@ +@@ -23453,14 +18316,12 @@ $ac_datarootdir_hack " eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ @@ -16536,7 +16741,7 @@ Index: pam.deb/configure which seems to be undefined. Please make sure it is defined." >&5 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined." >&2;} -@@ -23373,9 +18245,7 @@ +@@ -23470,9 +18331,7 @@ -) cat "$tmp/out" && rm -f "$tmp/out";; *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; esac \ @@ -16547,7 +16752,7 @@ Index: pam.deb/configure ;; :H) # -@@ -23386,25 +18256,19 @@ +@@ -23483,25 +18342,19 @@ $as_echo "/* $configure_input */" \ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" } >"$tmp/config.h" \ @@ -16577,7 +16782,7 @@ Index: pam.deb/configure fi # Compute "$ac_file"'s index in $config_headers. _am_arg="$ac_file" -@@ -23442,7 +18306,7 @@ +@@ -23539,7 +18392,7 @@ s/.*/./; q'`/stamp-h$_am_stamp_count ;; @@ -16586,11 +16791,11 @@ Index: pam.deb/configure $as_echo "$as_me: executing $ac_file commands" >&6;} ;; esac -@@ -23536,47 +18400,7 @@ +@@ -23634,47 +18487,7 @@ q } s/.*/./; q'` -- { as_dir=$dirpart/$fdir +- { as_dir=$dirpart/$fdir - case $as_dir in #( - -*) as_dir=./$as_dir;; - esac @@ -16631,11 +16836,11 @@ Index: pam.deb/configure - } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 -$as_echo "$as_me: error: cannot create directory $as_dir" >&2;} - { (exit 1); exit 1; }; }; } -+ as_dir=$dirpart/$fdir; as_fn_mkdir_p - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" - done -@@ -24335,15 +19159,12 @@ ++ as_dir=$dirpart/$fdir; as_fn_mkdir_p + # echo "creating $dirpart/$file" + echo '# dummy' > "$dirpart/$file" + done +@@ -24434,15 +19247,12 @@ done # for ac_tag @@ -16653,7 +16858,7 @@ Index: pam.deb/configure # configure is writing to config.log, and then calls config.status. -@@ -24364,10 +19185,10 @@ +@@ -24463,10 +19273,10 @@ exec 5>>config.log # Use ||, not &&, to avoid exiting from the if with $? = 1, which # would make configure fail if this is the last instruction. @@ -16666,11 +16871,46 @@ Index: pam.deb/configure $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi +Index: pam.deb/Makefile.in +=================================================================== +--- pam.deb.orig/Makefile.in ++++ pam.deb/Makefile.in +@@ -41,12 +41,11 @@ + DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in $(srcdir)/config.h.in \ + $(top_srcdir)/configure ABOUT-NLS AUTHORS COPYING ChangeLog \ +- INSTALL NEWS compile config.guess config.rpath config.sub \ ++ INSTALL NEWS TODO compile config.guess config.rpath config.sub \ + depcomp install-sh ltmain.sh missing mkinstalldirs ylwrap + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ +- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ + $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ + $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ +@@ -55,7 +54,7 @@ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ +- $(top_srcdir)/configure.in ++ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ +@@ -200,6 +199,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PIE_CFLAGS = @PIE_CFLAGS@ Index: pam.deb/modules/pam_namespace/Makefile.in =================================================================== --- pam.deb.orig/modules/pam_namespace/Makefile.in +++ pam.deb/modules/pam_namespace/Makefile.in -@@ -46,7 +46,6 @@ +@@ -49,7 +49,6 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ @@ -16678,7 +16918,7 @@ Index: pam.deb/modules/pam_namespace/Makefile.in $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ -@@ -55,7 +54,7 @@ +@@ -58,7 +57,7 @@ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ @@ -16687,7 +16927,7 @@ Index: pam.deb/modules/pam_namespace/Makefile.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -@@ -188,6 +187,7 @@ +@@ -206,6 +205,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -16699,7 +16939,7 @@ Index: pam.deb/modules/pam_securetty/Makefile.in =================================================================== --- pam.deb.orig/modules/pam_securetty/Makefile.in +++ pam.deb/modules/pam_securetty/Makefile.in -@@ -43,7 +43,6 @@ +@@ -45,7 +45,6 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ @@ -16707,7 +16947,7 @@ Index: pam.deb/modules/pam_securetty/Makefile.in $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ -@@ -52,7 +51,7 @@ +@@ -54,7 +53,7 @@ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ @@ -16716,8 +16956,8 @@ Index: pam.deb/modules/pam_securetty/Makefile.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -@@ -68,8 +67,8 @@ - securelibLTLIBRARIES_INSTALL = $(INSTALL) +@@ -85,8 +84,8 @@ + am__installdirs = "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man8dir)" LTLIBRARIES = $(securelib_LTLIBRARIES) pam_securetty_la_DEPENDENCIES = -pam_securetty_la_SOURCES = pam_securetty.c @@ -16727,7 +16967,7 @@ Index: pam.deb/modules/pam_securetty/Makefile.in DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles -@@ -82,8 +81,8 @@ +@@ -100,8 +99,8 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ @@ -16738,7 +16978,7 @@ Index: pam.deb/modules/pam_securetty/Makefile.in man8dir = $(mandir)/man8 NROFF = nroff MANS = $(man_MANS) -@@ -173,6 +172,7 @@ +@@ -193,6 +192,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -16746,7 +16986,7 @@ Index: pam.deb/modules/pam_securetty/Makefile.in PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PIE_CFLAGS = @PIE_CFLAGS@ -@@ -262,6 +262,10 @@ +@@ -283,6 +283,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 @@ -16757,7 +16997,7 @@ Index: pam.deb/modules/pam_securetty/Makefile.in @ENABLE_REGENERATE_MAN_TRUE@noinst_DATA = README all: all-am -@@ -333,6 +337,7 @@ +@@ -359,6 +363,7 @@ -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_securetty.Plo@am__quote@ @@ -16769,7 +17009,7 @@ Index: pam.deb/modules/pam_unix/Makefile.in =================================================================== --- pam.deb.orig/modules/pam_unix/Makefile.in +++ pam.deb/modules/pam_unix/Makefile.in -@@ -49,7 +49,6 @@ +@@ -51,7 +51,6 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ @@ -16777,7 +17017,7 @@ Index: pam.deb/modules/pam_unix/Makefile.in $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ -@@ -58,7 +57,7 @@ +@@ -60,7 +59,7 @@ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ @@ -16786,9 +17026,9 @@ Index: pam.deb/modules/pam_unix/Makefile.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -@@ -74,10 +73,10 @@ +@@ -91,10 +90,10 @@ + am__installdirs = "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(sbindir)" \ "$(DESTDIR)$(man8dir)" - securelibLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(securelib_LTLIBRARIES) -pam_unix_la_DEPENDENCIES = +pam_unix_la_DEPENDENCIES = ../pam_securetty/tty_secure.lo @@ -16799,7 +17039,7 @@ Index: pam.deb/modules/pam_unix/Makefile.in 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) \ -@@ -217,6 +216,7 @@ +@@ -236,6 +235,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -16807,7 +17047,7 @@ Index: pam.deb/modules/pam_unix/Makefile.in PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PIE_CFLAGS = @PIE_CFLAGS@ -@@ -311,13 +311,14 @@ +@@ -331,13 +331,14 @@ pam_unix_la_LDFLAGS = -no-undefined -avoid-version -module \ $(am__append_2) pam_unix_la_LIBADD = @LIBNSL@ -L$(top_builddir)/libpam -lpam \ @@ -16824,7 +17064,7 @@ Index: pam.deb/modules/pam_unix/Makefile.in bigcrypt_SOURCES = bigcrypt.c bigcrypt_main.c bigcrypt_CFLAGS = $(AM_CFLAGS) -@@ -453,6 +454,7 @@ +@@ -495,6 +496,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@ @@ -16832,206 +17072,3 @@ Index: pam.deb/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@ -Index: pam.deb/config.h.in -=================================================================== ---- pam.deb.orig/config.h.in -+++ pam.deb/config.h.in -@@ -270,6 +270,9 @@ - /* Define to the one symbol short name of this package. */ - #undef PACKAGE_TARNAME - -+/* Define to the home page for this package. */ -+#undef PACKAGE_URL -+ - /* Define to the version of this package. */ - #undef PACKAGE_VERSION - -Index: pam.deb/ltmain.sh -=================================================================== ---- pam.deb.orig/ltmain.sh -+++ pam.deb/ltmain.sh -@@ -65,7 +65,7 @@ - # compiler: $LTCC - # compiler flags: $LTCFLAGS - # linker: $LD (gnu? $with_gnu_ld) --# $progname: (GNU libtool) 2.2.6 -+# $progname: (GNU libtool) 2.2.6 Debian-2.2.6a-4 - # automake: $automake_version - # autoconf: $autoconf_version - # -@@ -73,7 +73,7 @@ - - PROGRAM=ltmain.sh - PACKAGE=libtool --VERSION=2.2.6 -+VERSION="2.2.6 Debian-2.2.6a-4" - TIMESTAMP="" - package_revision=1.3012 - -@@ -116,15 +116,15 @@ - - : ${CP="cp -f"} - : ${ECHO="echo"} --: ${EGREP="/usr/bin/grep -E"} --: ${FGREP="/usr/bin/grep -F"} --: ${GREP="/usr/bin/grep"} -+: ${EGREP="/bin/grep -E"} -+: ${FGREP="/bin/grep -F"} -+: ${GREP="/bin/grep"} - : ${LN_S="ln -s"} - : ${MAKE="make"} - : ${MKDIR="mkdir"} - : ${MV="mv -f"} - : ${RM="rm -f"} --: ${SED="/opt/local/bin/gsed"} -+: ${SED="/bin/sed"} - : ${SHELL="${CONFIG_SHELL-/bin/sh}"} - : ${Xsed="$SED -e 1s/^X//"} - -@@ -5033,7 +5033,10 @@ - case $pass in - dlopen) libs="$dlfiles" ;; - dlpreopen) libs="$dlprefiles" ;; -- link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; -+ link) -+ libs="$deplibs %DEPLIBS%" -+ test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs" -+ ;; - esac - fi - if test "$linkmode,$pass" = "lib,dlpreopen"; then -@@ -5344,19 +5347,19 @@ - # It is a libtool convenience library, so add in its objects. - convenience="$convenience $ladir/$objdir/$old_library" - old_convenience="$old_convenience $ladir/$objdir/$old_library" -+ tmp_libs= -+ for deplib in $dependency_libs; do -+ deplibs="$deplib $deplibs" -+ if $opt_duplicate_deps ; then -+ case "$tmp_libs " in -+ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; -+ esac -+ fi -+ tmp_libs="$tmp_libs $deplib" -+ done - elif test "$linkmode" != prog && test "$linkmode" != lib; then - func_fatal_error "\`$lib' is not a convenience library" - fi -- tmp_libs= -- for deplib in $dependency_libs; do -- deplibs="$deplib $deplibs" -- if $opt_duplicate_deps ; then -- case "$tmp_libs " in -- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; -- esac -- fi -- tmp_libs="$tmp_libs $deplib" -- done - continue - fi # $pass = conv - -@@ -5893,6 +5896,7 @@ - if test "$link_all_deplibs" != no; then - # Add the search paths of all dependency libraries - for deplib in $dependency_libs; do -+ path= - case $deplib in - -L*) path="$deplib" ;; - *.la) -@@ -6206,6 +6210,9 @@ - revision="$number_minor" - lt_irix_increment=no - ;; -+ *) -+ func_fatal_configuration "$modename: unknown library version type \`$version_type'" -+ ;; - esac - ;; - no) -Index: pam.deb/m4/libtool.m4 -=================================================================== ---- pam.deb.orig/m4/libtool.m4 -+++ pam.deb/m4/libtool.m4 -@@ -2485,6 +2485,18 @@ - dynamic_linker='GNU/Linux ld.so' - ;; - -+netbsdelf*-gnu) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ dynamic_linker='NetBSD ld.elf_so' -+ ;; -+ - netbsd*) - version_type=sunos - need_lib_prefix=no -@@ -3076,7 +3088,7 @@ - lt_cv_deplibs_check_method=pass_all - ;; - --netbsd*) -+netbsd* | netbsdelf*-gnu) - 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 -@@ -3757,7 +3769,7 @@ - ;; - esac - ;; -- netbsd*) -+ netbsd* | netbsdelf*-gnu) - ;; - *qnx* | *nto*) - # QNX uses GNU C++, but need to define -shared option too, otherwise -@@ -4182,6 +4194,9 @@ - cygwin* | mingw* | cegcc*) - _LT_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' - ;; -+ linux* | k*bsd*-gnu) -+ _LT_TAGVAR(link_all_deplibs, $1)=no -+ ;; - *) - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - ;; -@@ -4246,6 +4261,9 @@ - openbsd*) - with_gnu_ld=no - ;; -+ linux* | k*bsd*-gnu) -+ _LT_TAGVAR(link_all_deplibs, $1)=no -+ ;; - esac - - _LT_TAGVAR(ld_shlibs, $1)=yes -@@ -4428,7 +4446,7 @@ - fi - ;; - -- netbsd*) -+ netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= -@@ -4603,6 +4621,7 @@ - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' - fi -+ _LT_TAGVAR(link_all_deplibs, $1)=no - else - # not using gcc - if test "$host_cpu" = ia64; then -@@ -4841,7 +4860,7 @@ - _LT_TAGVAR(link_all_deplibs, $1)=yes - ;; - -- netbsd*) -+ netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out - else diff --git a/debian/patches-applied/fix-man-crud b/debian/patches-applied/fix-man-crud index 8fbac3f1..337feee6 100644 --- a/debian/patches-applied/fix-man-crud +++ b/debian/patches-applied/fix-man-crud @@ -1090,202 +1090,6 @@ Index: pam.deb/doc/man/pam_set_data.3 .SH "DESCRIPTION" .PP The -Index: pam.deb/doc/man/pam_setcred.3 -=================================================================== ---- pam.deb.orig/doc/man/pam_setcred.3 -+++ pam.deb/doc/man/pam_setcred.3 -@@ -1,161 +1,13 @@ -+'\" t - .\" Title: pam_setcred - .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] --.\" Generator: DocBook XSL Stylesheets v1.74.0 --.\" Date: 03/02/2009 -+.\" Generator: DocBook XSL Stylesheets v1.75.2 -+.\" Date: 08/25/2009 - .\" Manual: Linux-PAM Manual - .\" Source: Linux-PAM Manual - .\" Language: English - .\" --.TH "PAM_SETCRED" "3" "03/02/2009" "Linux-PAM Manual" "Linux-PAM Manual" --.\" ----------------------------------------------------------------- --.\" * (re)Define some macros --.\" ----------------------------------------------------------------- --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --.\" toupper - uppercase a string (locale-aware) --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --.de toupper --.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ --\\$* --.tr aabbccddeeffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz --.. --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --.\" SH-xref - format a cross-reference to an SH section --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --.de SH-xref --.ie n \{\ --.\} --.toupper \\$* --.el \{\ --\\$* --.\} --.. --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --.\" SH - level-one heading that works better for non-TTY output --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --.de1 SH --.\" put an extra blank line of space above the head in non-TTY output --.if t \{\ --.sp 1 --.\} --.sp \\n[PD]u --.nr an-level 1 --.set-an-margin --.nr an-prevailing-indent \\n[IN] --.fi --.in \\n[an-margin]u --.ti 0 --.HTML-TAG ".NH \\n[an-level]" --.it 1 an-trap --.nr an-no-space-flag 1 --.nr an-break-flag 1 --\." make the size of the head bigger --.ps +3 --.ft B --.ne (2v + 1u) --.ie n \{\ --.\" if n (TTY output), use uppercase --.toupper \\$* --.\} --.el \{\ --.nr an-break-flag 0 --.\" if not n (not TTY), use normal case (not uppercase) --\\$1 --.in \\n[an-margin]u --.ti 0 --.\" if not n (not TTY), put a border/line under subheading --.sp -.6 --\l'\n(.lu' --.\} --.. --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --.\" SS - level-two heading that works better for non-TTY output --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --.de1 SS --.sp \\n[PD]u --.nr an-level 1 --.set-an-margin --.nr an-prevailing-indent \\n[IN] --.fi --.in \\n[IN]u --.ti \\n[SN]u --.it 1 an-trap --.nr an-no-space-flag 1 --.nr an-break-flag 1 --.ps \\n[PS-SS]u --\." make the size of the head bigger --.ps +2 --.ft B --.ne (2v + 1u) --.if \\n[.$] \&\\$* --.. --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --.\" BB/BE - put background/screen (filled box) around block of text --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --.de BB --.if t \{\ --.sp -.5 --.br --.in +2n --.ll -2n --.gcolor red --.di BX --.\} --.. --.de EB --.if t \{\ --.if "\\$2"adjust-for-leading-newline" \{\ --.sp -1 --.\} --.br --.di --.in --.ll --.gcolor --.nr BW \\n(.lu-\\n(.i --.nr BH \\n(dn+.5v --.ne \\n(BHu+.5v --.ie "\\$2"adjust-for-leading-newline" \{\ --\M[\\$1]\h'1n'\v'+.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] --.\} --.el \{\ --\M[\\$1]\h'1n'\v'-.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] --.\} --.in 0 --.sp -.5v --.nf --.BX --.in --.sp .5v --.fi --.\} --.. --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --.\" BM/EM - put colored marker in margin next to block of text --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --.de BM --.if t \{\ --.br --.ll -2n --.gcolor red --.di BX --.\} --.. --.de EM --.if t \{\ --.br --.di --.ll --.gcolor --.nr BH \\n(dn --.ne \\n(BHu --\M[\\$1]\D'P -.75n 0 0 \\n(BHu -(\\n[.i]u - \\n(INu - .75n) 0 0 -\\n(BHu'\M[] --.in 0 --.nf --.BX --.in --.fi --.\} --.. -+.TH "PAM_SETCRED" "3" "08/25/2009" "Linux-PAM Manual" "Linux-PAM Manual" - .\" ----------------------------------------------------------------- - .\" * set default formatting - .\" ----------------------------------------------------------------- -@@ -166,23 +18,17 @@ - .\" ----------------------------------------------------------------- - .\" * MAIN CONTENT STARTS HERE * - .\" ----------------------------------------------------------------- --.SH "Name" -+.SH "NAME" - pam_setcred \- establish / delete user credentials --.SH "Synopsis" -+.SH "SYNOPSIS" - .sp - .ft B --.fam C --.ps -1 - .nf - #include - .fi --.fam --.ps +1 - .ft --.fam C - .HP \w'int\ pam_setcred('u - .BI "int pam_setcred(pam_handle_t\ *" "pamh" ", int\ " "flags" ");" --.fam - .SH "DESCRIPTION" - .PP - The Index: pam.deb/doc/man/pam_sm_authenticate.3 =================================================================== --- pam.deb.orig/doc/man/pam_sm_authenticate.3 @@ -2104,251 +1908,29 @@ Index: pam.deb/modules/pam_pwhistory/pam_pwhistory.8 .RS 4 .\} -.fam C --.ps -1 - .nf --.if t \{\ --.sp -1 --.\} --.BB lightgray adjust-for-leading-newline --.sp -1 -- - #%PAM\-1\&.0 - password required pam_pwhistory\&.so - password required pam_unix\&.so use_authtok - --.EB lightgray adjust-for-leading-newline --.if t \{\ --.sp 1 --.\} - .fi --.fam --.ps +1 - .if n \{\ - .RE - .\} -@@ -286,34 +122,20 @@ - .if n \{\ - .RS 4 - .\} --.fam C --.ps -1 - .nf --.if t \{\ --.sp -1 --.\} --.BB lightgray adjust-for-leading-newline --.sp -1 -- - #%PAM\-1\&.0 - password required pam_cracklib\&.so retry=3 - password required pam_pwhistory\&.so use_authtok - password required pam_unix\&.so use_authtok - --.EB lightgray adjust-for-leading-newline --.if t \{\ --.sp 1 --.\} - .fi --.fam --.ps +1 - .if n \{\ - .RE - .\} - .sp - .SH "FILES" - .PP --\FC/etc/security/opasswd\F[] -+/etc/security/opasswd - .RS 4 - File with password history - .RE -Index: pam.deb/modules/pam_timestamp/pam_timestamp.8 -=================================================================== ---- pam.deb.orig/modules/pam_timestamp/pam_timestamp.8 -+++ pam.deb/modules/pam_timestamp/pam_timestamp.8 -@@ -1,161 +1,13 @@ -+'\" t - .\" Title: pam_timestamp - .\" Author: [see the "AUTHOR" section] --.\" Generator: DocBook XSL Stylesheets v1.74.0 --.\" Date: 06/16/2009 -+.\" Generator: DocBook XSL Stylesheets v1.75.2 -+.\" Date: 08/25/2009 - .\" Manual: Linux-PAM Manual - .\" Source: Linux-PAM Manual - .\" Language: English - .\" --.TH "PAM_TIMESTAMP" "8" "06/16/2009" "Linux-PAM Manual" "Linux\-PAM Manual" --.\" ----------------------------------------------------------------- --.\" * (re)Define some macros --.\" ----------------------------------------------------------------- --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --.\" toupper - uppercase a string (locale-aware) --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --.de toupper --.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ --\\$* --.tr aabbccddeeffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz --.. --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --.\" SH-xref - format a cross-reference to an SH section --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --.de SH-xref --.ie n \{\ --.\} --.toupper \\$* --.el \{\ --\\$* --.\} --.. --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --.\" SH - level-one heading that works better for non-TTY output --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --.de1 SH --.\" put an extra blank line of space above the head in non-TTY output --.if t \{\ --.sp 1 --.\} --.sp \\n[PD]u --.nr an-level 1 --.set-an-margin --.nr an-prevailing-indent \\n[IN] --.fi --.in \\n[an-margin]u --.ti 0 --.HTML-TAG ".NH \\n[an-level]" --.it 1 an-trap --.nr an-no-space-flag 1 --.nr an-break-flag 1 --\." make the size of the head bigger --.ps +3 --.ft B --.ne (2v + 1u) --.ie n \{\ --.\" if n (TTY output), use uppercase --.toupper \\$* --.\} --.el \{\ --.nr an-break-flag 0 --.\" if not n (not TTY), use normal case (not uppercase) --\\$1 --.in \\n[an-margin]u --.ti 0 --.\" if not n (not TTY), put a border/line under subheading --.sp -.6 --\l'\n(.lu' --.\} --.. --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --.\" SS - level-two heading that works better for non-TTY output --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --.de1 SS --.sp \\n[PD]u --.nr an-level 1 --.set-an-margin --.nr an-prevailing-indent \\n[IN] --.fi --.in \\n[IN]u --.ti \\n[SN]u --.it 1 an-trap --.nr an-no-space-flag 1 --.nr an-break-flag 1 --.ps \\n[PS-SS]u --\." make the size of the head bigger --.ps +2 --.ft B --.ne (2v + 1u) --.if \\n[.$] \&\\$* --.. --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --.\" BB/BE - put background/screen (filled box) around block of text --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --.de BB --.if t \{\ --.sp -.5 --.br --.in +2n --.ll -2n --.gcolor red --.di BX --.\} --.. --.de EB --.if t \{\ --.if "\\$2"adjust-for-leading-newline" \{\ --.sp -1 --.\} --.br --.di --.in --.ll --.gcolor --.nr BW \\n(.lu-\\n(.i --.nr BH \\n(dn+.5v --.ne \\n(BHu+.5v --.ie "\\$2"adjust-for-leading-newline" \{\ --\M[\\$1]\h'1n'\v'+.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] --.\} --.el \{\ --\M[\\$1]\h'1n'\v'-.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] --.\} --.in 0 --.sp -.5v --.nf --.BX --.in --.sp .5v --.fi --.\} --.. --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --.\" BM/EM - put colored marker in margin next to block of text --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --.de BM --.if t \{\ --.br --.ll -2n --.gcolor red --.di BX --.\} --.. --.de EM --.if t \{\ --.br --.di --.ll --.gcolor --.nr BH \\n(dn --.ne \\n(BHu --\M[\\$1]\D'P -.75n 0 0 \\n(BHu -(\\n[.i]u - \\n(INu - .75n) 0 0 -\\n(BHu'\M[] --.in 0 --.nf --.BX --.in --.fi --.\} --.. -+.TH "PAM_TIMESTAMP" "8" "08/25/2009" "Linux-PAM Manual" "Linux\-PAM Manual" - .\" ----------------------------------------------------------------- - .\" * set default formatting - .\" ----------------------------------------------------------------- -@@ -166,13 +18,11 @@ - .\" ----------------------------------------------------------------- - .\" * MAIN CONTENT STARTS HERE * - .\" ----------------------------------------------------------------- --.SH "Name" -+.SH "NAME" - pam_timestamp \- Authenticate using cached successful authentication attempts --.SH "Synopsis" --.fam C -+.SH "SYNOPSIS" - .HP \w'\fBpam_timestamp\&.so\fR\ 'u - \fBpam_timestamp\&.so\fR [timestamp_timeout=\fInumber\fR] [verbose] [debug] +-.ps -1 + .nf +-.if t \{\ +-.sp -1 +-.\} +-.BB lightgray adjust-for-leading-newline +-.sp -1 +- + #%PAM\-1\&.0 + password required pam_pwhistory\&.so + password required pam_unix\&.so use_authtok + +-.EB lightgray adjust-for-leading-newline +-.if t \{\ +-.sp 1 +-.\} + .fi -.fam - .SH "DESCRIPTION" - .PP - In a nutshell, -@@ -234,34 +84,20 @@ +-.ps +1 + .if n \{\ + .RE + .\} +@@ -286,34 +122,20 @@ .if n \{\ .RS 4 .\} @@ -2361,12 +1943,11 @@ Index: pam.deb/modules/pam_timestamp/pam_timestamp.8 -.BB lightgray adjust-for-leading-newline -.sp -1 - - auth sufficient pam_timestamp\&.so verbose - auth required pam_unix\&.so - - session required pam_unix\&.so - session optional pam_timestamp\&.so - + #%PAM\-1\&.0 + password required pam_cracklib\&.so retry=3 + password required pam_pwhistory\&.so use_authtok + password required pam_unix\&.so use_authtok + -.EB lightgray adjust-for-leading-newline -.if t \{\ -.sp 1 @@ -2377,20 +1958,21 @@ Index: pam.deb/modules/pam_timestamp/pam_timestamp.8 .if n \{\ .RE .\} + .sp .SH "FILES" .PP --\FC/var/run/sudo/\&.\&.\&.\F[] -+/var/run/sudo/\&.\&.\&. +-\FC/etc/security/opasswd\F[] ++/etc/security/opasswd .RS 4 - timestamp files and directories + File with password history .RE -Index: pam.deb/modules/pam_tty_audit/pam_tty_audit.8 +Index: pam.deb/modules/pam_timestamp/pam_timestamp.8 =================================================================== ---- pam.deb.orig/modules/pam_tty_audit/pam_tty_audit.8 -+++ pam.deb/modules/pam_tty_audit/pam_tty_audit.8 +--- pam.deb.orig/modules/pam_timestamp/pam_timestamp.8 ++++ pam.deb/modules/pam_timestamp/pam_timestamp.8 @@ -1,161 +1,13 @@ +'\" t - .\" Title: pam_tty_audit + .\" Title: pam_timestamp .\" Author: [see the "AUTHOR" section] -.\" Generator: DocBook XSL Stylesheets v1.74.0 -.\" Date: 06/16/2009 @@ -2400,7 +1982,7 @@ Index: pam.deb/modules/pam_tty_audit/pam_tty_audit.8 .\" Source: Linux-PAM Manual .\" Language: English .\" --.TH "PAM_TTY_AUDIT" "8" "06/16/2009" "Linux-PAM Manual" "Linux\-PAM Manual" +-.TH "PAM_TIMESTAMP" "8" "06/16/2009" "Linux-PAM Manual" "Linux\-PAM Manual" -.\" ----------------------------------------------------------------- -.\" * (re)Define some macros -.\" ----------------------------------------------------------------- @@ -2550,7 +2132,7 @@ Index: pam.deb/modules/pam_tty_audit/pam_tty_audit.8 -.fi -.\} -.. -+.TH "PAM_TTY_AUDIT" "8" "08/25/2009" "Linux-PAM Manual" "Linux\-PAM Manual" ++.TH "PAM_TIMESTAMP" "8" "08/25/2009" "Linux-PAM Manual" "Linux\-PAM Manual" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- @@ -2560,17 +2142,17 @@ Index: pam.deb/modules/pam_tty_audit/pam_tty_audit.8 .\" ----------------------------------------------------------------- -.SH "Name" +.SH "NAME" - pam_tty_audit \- Enable or disable TTY auditing for specified users + pam_timestamp \- Authenticate using cached successful authentication attempts -.SH "Synopsis" -.fam C +.SH "SYNOPSIS" - .HP \w'\fBpam_tty_audit\&.so\fR\ 'u - \fBpam_tty_audit\&.so\fR [disable=\fIpatterns\fR] [enable=\fIpatterns\fR] + .HP \w'\fBpam_timestamp\&.so\fR\ 'u + \fBpam_timestamp\&.so\fR [timestamp_timeout=\fInumber\fR] [verbose] [debug] -.fam .SH "DESCRIPTION" .PP - The pam_tty_audit PAM module is used to enable or disable TTY auditing\&. By default, the kernel does not audit input on any TTY\&. -@@ -229,24 +79,10 @@ + In a nutshell, +@@ -234,34 +84,20 @@ .if n \{\ .RS 4 .\} @@ -2583,8 +2165,12 @@ Index: pam.deb/modules/pam_tty_audit/pam_tty_audit.8 -.BB lightgray adjust-for-leading-newline -.sp -1 - - session required pam_tty_audit\&.so disable=* enable=root - + auth sufficient pam_timestamp\&.so verbose + auth required pam_unix\&.so + + session required pam_unix\&.so + session optional pam_timestamp\&.so + -.EB lightgray adjust-for-leading-newline -.if t \{\ -.sp 1 @@ -2595,6 +2181,13 @@ Index: pam.deb/modules/pam_tty_audit/pam_tty_audit.8 .if n \{\ .RE .\} + .SH "FILES" + .PP +-\FC/var/run/sudo/\&.\&.\&.\F[] ++/var/run/sudo/\&.\&.\&. + .RS 4 + timestamp files and directories + .RE Index: pam.deb/modules/pam_unix/unix_update.8 =================================================================== --- pam.deb.orig/modules/pam_unix/unix_update.8 @@ -4034,202 +3627,6 @@ Index: pam.deb/modules/pam_unix/unix_chkpwd.8 .SH "DESCRIPTION" .PP -Index: pam.deb/doc/man/pam_get_authtok.3 -=================================================================== ---- pam.deb.orig/doc/man/pam_get_authtok.3 -+++ pam.deb/doc/man/pam_get_authtok.3 -@@ -1,161 +1,13 @@ -+'\" t - .\" Title: pam_get_authtok - .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] --.\" Generator: DocBook XSL Stylesheets v1.74.0 --.\" Date: 03/02/2009 -+.\" Generator: DocBook XSL Stylesheets v1.75.2 -+.\" Date: 08/25/2009 - .\" Manual: Linux-PAM Manual - .\" Source: Linux-PAM Manual - .\" Language: English - .\" --.TH "PAM_GET_AUTHTOK" "3" "03/02/2009" "Linux-PAM Manual" "Linux-PAM Manual" --.\" ----------------------------------------------------------------- --.\" * (re)Define some macros --.\" ----------------------------------------------------------------- --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --.\" toupper - uppercase a string (locale-aware) --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --.de toupper --.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ --\\$* --.tr aabbccddeeffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz --.. --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --.\" SH-xref - format a cross-reference to an SH section --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --.de SH-xref --.ie n \{\ --.\} --.toupper \\$* --.el \{\ --\\$* --.\} --.. --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --.\" SH - level-one heading that works better for non-TTY output --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --.de1 SH --.\" put an extra blank line of space above the head in non-TTY output --.if t \{\ --.sp 1 --.\} --.sp \\n[PD]u --.nr an-level 1 --.set-an-margin --.nr an-prevailing-indent \\n[IN] --.fi --.in \\n[an-margin]u --.ti 0 --.HTML-TAG ".NH \\n[an-level]" --.it 1 an-trap --.nr an-no-space-flag 1 --.nr an-break-flag 1 --\." make the size of the head bigger --.ps +3 --.ft B --.ne (2v + 1u) --.ie n \{\ --.\" if n (TTY output), use uppercase --.toupper \\$* --.\} --.el \{\ --.nr an-break-flag 0 --.\" if not n (not TTY), use normal case (not uppercase) --\\$1 --.in \\n[an-margin]u --.ti 0 --.\" if not n (not TTY), put a border/line under subheading --.sp -.6 --\l'\n(.lu' --.\} --.. --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --.\" SS - level-two heading that works better for non-TTY output --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --.de1 SS --.sp \\n[PD]u --.nr an-level 1 --.set-an-margin --.nr an-prevailing-indent \\n[IN] --.fi --.in \\n[IN]u --.ti \\n[SN]u --.it 1 an-trap --.nr an-no-space-flag 1 --.nr an-break-flag 1 --.ps \\n[PS-SS]u --\." make the size of the head bigger --.ps +2 --.ft B --.ne (2v + 1u) --.if \\n[.$] \&\\$* --.. --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --.\" BB/BE - put background/screen (filled box) around block of text --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --.de BB --.if t \{\ --.sp -.5 --.br --.in +2n --.ll -2n --.gcolor red --.di BX --.\} --.. --.de EB --.if t \{\ --.if "\\$2"adjust-for-leading-newline" \{\ --.sp -1 --.\} --.br --.di --.in --.ll --.gcolor --.nr BW \\n(.lu-\\n(.i --.nr BH \\n(dn+.5v --.ne \\n(BHu+.5v --.ie "\\$2"adjust-for-leading-newline" \{\ --\M[\\$1]\h'1n'\v'+.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] --.\} --.el \{\ --\M[\\$1]\h'1n'\v'-.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] --.\} --.in 0 --.sp -.5v --.nf --.BX --.in --.sp .5v --.fi --.\} --.. --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --.\" BM/EM - put colored marker in margin next to block of text --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --.de BM --.if t \{\ --.br --.ll -2n --.gcolor red --.di BX --.\} --.. --.de EM --.if t \{\ --.br --.di --.ll --.gcolor --.nr BH \\n(dn --.ne \\n(BHu --\M[\\$1]\D'P -.75n 0 0 \\n(BHu -(\\n[.i]u - \\n(INu - .75n) 0 0 -\\n(BHu'\M[] --.in 0 --.nf --.BX --.in --.fi --.\} --.. -+.TH "PAM_GET_AUTHTOK" "3" "08/25/2009" "Linux-PAM Manual" "Linux-PAM Manual" - .\" ----------------------------------------------------------------- - .\" * set default formatting - .\" ----------------------------------------------------------------- -@@ -166,23 +18,17 @@ - .\" ----------------------------------------------------------------- - .\" * MAIN CONTENT STARTS HERE * - .\" ----------------------------------------------------------------- --.SH "Name" -+.SH "NAME" - pam_get_authtok \- get authentication token --.SH "Synopsis" -+.SH "SYNOPSIS" - .sp - .ft B --.fam C --.ps -1 - .nf - #include - .fi --.fam --.ps +1 - .ft --.fam C - .HP \w'int\ pam_get_authtok('u - .BI "int pam_get_authtok(pam_handle_t\ *" "pamh" ", int\ " "item" ", const\ char\ **" "authtok" ", const\ char\ *" "prompt" ");" --.fam - .SH "DESCRIPTION" - .PP - The Index: pam.deb/doc/man/pam_sm_chauthtok.3 =================================================================== --- pam.deb.orig/doc/man/pam_sm_chauthtok.3 diff --git a/debian/patches-applied/hurd_no_setfsuid b/debian/patches-applied/hurd_no_setfsuid index 76501432..24ce40a0 100644 --- a/debian/patches-applied/hurd_no_setfsuid +++ b/debian/patches-applied/hurd_no_setfsuid @@ -4,10 +4,10 @@ Authors: Steve Langasek Upstream status: superseded by pam_modutil_set_euid proposal -Index: Linux-PAM/modules/pam_xauth/pam_xauth.c +Index: pam.deb/modules/pam_xauth/pam_xauth.c =================================================================== ---- Linux-PAM/modules/pam_xauth/pam_xauth.c.orig -+++ Linux-PAM/modules/pam_xauth/pam_xauth.c +--- pam.deb.orig/modules/pam_xauth/pam_xauth.c ++++ pam.deb/modules/pam_xauth/pam_xauth.c @@ -35,7 +35,9 @@ #include "config.h" @@ -18,7 +18,7 @@ Index: Linux-PAM/modules/pam_xauth/pam_xauth.c #include #include #include -@@ -210,6 +212,9 @@ +@@ -218,6 +220,9 @@ FILE *fp; int i; uid_t euid; @@ -28,7 +28,7 @@ Index: Linux-PAM/modules/pam_xauth/pam_xauth.c /* Check this user's file. */ pwd = pam_modutil_getpwnam(pamh, this_user); if (pwd == NULL) { -@@ -226,9 +231,34 @@ +@@ -234,9 +239,34 @@ return PAM_SESSION_ERR; } euid = geteuid(); @@ -63,7 +63,7 @@ Index: Linux-PAM/modules/pam_xauth/pam_xauth.c if (fp != NULL) { char buf[LINE_MAX], *tmp; /* Scan the file for a list of specs of users to "trust". */ -@@ -297,6 +327,9 @@ +@@ -306,6 +336,9 @@ int fd, i, debug = 0; int retval = PAM_SUCCESS; uid_t systemuser = 499, targetuser = 0, euid; @@ -73,7 +73,7 @@ Index: Linux-PAM/modules/pam_xauth/pam_xauth.c /* Parse arguments. We don't understand many, so no sense in breaking * this into a separate function. */ -@@ -541,9 +574,34 @@ +@@ -554,7 +587,22 @@ /* Generate a new file to hold the data. */ euid = geteuid(); @@ -93,7 +93,13 @@ Index: Linux-PAM/modules/pam_xauth/pam_xauth.c + } + } +#endif - fd = mkstemp(xauthority + strlen(XAUTHENV) + 1); + + #ifdef WITH_SELINUX + if (is_selinux_enabled() > 0) { +@@ -584,7 +632,17 @@ + save_errno = errno; + #endif + +#ifdef HAVE_SYS_FSUID_H setfsuid(euid); +#else @@ -106,5 +112,5 @@ Index: Linux-PAM/modules/pam_xauth/pam_xauth.c + } +#endif if (fd == -1) { + errno = save_errno; pam_syslog(pamh, LOG_ERR, - "error creating temporary file `%s': %m", -- cgit v1.2.3 From 5a38f4ed563a28d7a3a0d98c53bb71961aa78499 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Mon, 1 Feb 2010 02:04:40 -0800 Subject: releasing version 1.1.1-1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 05893feb..f34f5b92 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -pam (1.1.1-1) UNRELEASED; urgency=low +pam (1.1.1-1) unstable; urgency=low * New upstream version. - restore proper netgroup handling in pam_access. @@ -23,7 +23,7 @@ pam (1.1.1-1) UNRELEASED; urgency=low hashes other than traditional crypt handle passwords >8 chars in length. LP: #356766. - -- Steve Langasek Wed, 16 Sep 2009 15:25:40 -0700 + -- Steve Langasek Mon, 01 Feb 2010 02:04:33 -0800 pam (1.1.0-4) unstable; urgency=low -- cgit v1.2.3 From f9ae7ba2bc715f3f0e48dda51d65b8530d4c07fe Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Thu, 4 Feb 2010 21:23:36 -0800 Subject: Document the new symbols added in 1.1.1 in debian/libpam0g.symbols, and raise the minimum version for the service restarting code. Closes: #568480. --- debian/changelog | 8 ++++++++ debian/libpam-modules.preinst | 2 +- debian/libpam0g.postinst | 4 ++-- debian/libpam0g.symbols | 1 + 4 files changed, 12 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index f34f5b92..5d33b56d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +pam (1.1.1-1ubuntu1) UNRELEASED; urgency=low + + * Document the new symbols added in 1.1.1 in debian/libpam0g.symbols, and + raise the minimum version for the service restarting code. + Closes: #568480. + + -- Steve Langasek Thu, 04 Feb 2010 21:17:59 -0800 + pam (1.1.1-1) unstable; urgency=low * New upstream version. diff --git a/debian/libpam-modules.preinst b/debian/libpam-modules.preinst index 486c6016..ceca533c 100644 --- a/debian/libpam-modules.preinst +++ b/debian/libpam-modules.preinst @@ -4,7 +4,7 @@ set -e . /usr/share/debconf/confmodule -if dpkg --compare-versions "$2" lt-nl 1.1.0; then +if dpkg --compare-versions "$2" lt-nl 1.1.1-2; then db_version 2.0 if pidof xscreensaver xlockmore >/dev/null; then diff --git a/debian/libpam0g.postinst b/debian/libpam0g.postinst index 8c72cf65..9eaa594c 100644 --- a/debian/libpam0g.postinst +++ b/debian/libpam0g.postinst @@ -85,7 +85,7 @@ installed_services() { if [ "$1" = "configure" ] then if [ ! -z "$2" ]; then - if dpkg --compare-versions "$2" lt 1.1.0; then + if dpkg --compare-versions "$2" lt 1.1.1-2; then db_version 2.0 echo -n "Checking for services that may need to be restarted..." @@ -186,7 +186,7 @@ then # Shut down the frontend, to make sure none of the # restarted services keep a connection open to it db_stop - fi # end upgrading and $2 lt 1.1.0 + fi # end upgrading and $2 lt 1.1.1-2 fi # Upgrading fi diff --git a/debian/libpam0g.symbols b/debian/libpam0g.symbols index 48785e4f..d68b2a4a 100644 --- a/debian/libpam0g.symbols +++ b/debian/libpam0g.symbols @@ -2,6 +2,7 @@ libpam.so.0 libpam0g #MINVER# *@LIBPAM_1.0 0.99.7.1 *@LIBPAM_EXTENSION_1.0 0.99.7.1 *@LIBPAM_EXTENSION_1.1 1.1.0 + *@LIBPAM_EXTENSION_1.1.1 1.1.1 *@LIBPAM_MODUTIL_1.0 0.99.7.1 *@LIBPAM_MODUTIL_1.1 0.99.10.0 libpam_misc.so.0 libpam0g #MINVER# -- cgit v1.2.3 From 1b4119d7232fc271f853893220d68ff5caccbe84 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Fri, 5 Feb 2010 00:38:43 -0800 Subject: fixing changelog defaults again, gar --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 5d33b56d..74aa6afd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -pam (1.1.1-1ubuntu1) UNRELEASED; urgency=low +pam (1.1.1-2) UNRELEASED; urgency=low * Document the new symbols added in 1.1.1 in debian/libpam0g.symbols, and raise the minimum version for the service restarting code. Closes: #568480. - -- Steve Langasek Thu, 04 Feb 2010 21:17:59 -0800 + -- Steve Langasek Thu, 04 Feb 2010 21:17:59 -0800 pam (1.1.1-1) unstable; urgency=low -- cgit v1.2.3 From fbcc1cb3851fabef569ed1132fb13b9bedfa6041 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Wed, 17 Feb 2010 23:21:27 -0800 Subject: releasing version 1.1.1-2 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 74aa6afd..b422b423 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -pam (1.1.1-2) UNRELEASED; urgency=low +pam (1.1.1-2) unstable; urgency=low * Document the new symbols added in 1.1.1 in debian/libpam0g.symbols, and raise the minimum version for the service restarting code. Closes: #568480. - -- Steve Langasek Thu, 04 Feb 2010 21:17:59 -0800 + -- Steve Langasek Wed, 17 Feb 2010 23:21:23 -0800 pam (1.1.1-1) unstable; urgency=low -- cgit v1.2.3 From dc150f2311b6f2f6b7a92e723945f0d3b47e84c9 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Sun, 25 Apr 2010 06:28:04 +0200 Subject: pam-auth-update: fix a bug in our handling of module options when the module name contains digits, caused by a buggy regexp. :/ Partially addresses LP #369575. --- debian/changelog | 8 ++++++++ debian/local/pam-auth-update | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index b422b423..fadfde3e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +pam (1.1.1-3) UNRELEASED; urgency=low + + * pam-auth-update: fix a bug in our handling of module options when the + module name contains digits, caused by a buggy regexp. :/ Partially + addresses LP #369575. + + -- Steve Langasek Sun, 25 Apr 2010 06:26:31 +0200 + pam (1.1.1-2) unstable; urgency=low * Document the new symbols added in 1.1.1 in debian/libpam0g.symbols, and diff --git a/debian/local/pam-auth-update b/debian/local/pam-auth-update index 1a1a452d..7f14982d 100755 --- a/debian/local/pam-auth-update +++ b/debian/local/pam-auth-update @@ -255,7 +255,7 @@ sub merge_one_line $modline =~ s/end/$count/g; if ($diff) { my $mod = $modline; - $mod =~ s/[0-9]+//g; + $mod =~ s/(\[[^0-9]*)[0-9]+(.*\])/$1$2/g; $adds = \%{$diff->{'add'}{$mod}}; $removes = \%{$diff->{'remove'}{$mod}}; } else { -- cgit v1.2.3 From 5ab7b5c77862f0d50fd7f84098a60c4d3cf207bf Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Sun, 25 Apr 2010 05:49:31 -0700 Subject: Install /sbin/pam_tally2 in the libpam-modules package; thanks to Olivier BONHOMME for reporting. Closes: #554010. --- debian/changelog | 2 ++ debian/libpam-modules.install | 1 + 2 files changed, 3 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index fadfde3e..ce2979fd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ pam (1.1.1-3) UNRELEASED; urgency=low * pam-auth-update: fix a bug in our handling of module options when the module name contains digits, caused by a buggy regexp. :/ Partially addresses LP #369575. + * Install /sbin/pam_tally2 in the libpam-modules package; thanks to + Olivier BONHOMME for reporting. Closes: #554010. -- Steve Langasek Sun, 25 Apr 2010 06:26:31 +0200 diff --git a/debian/libpam-modules.install b/debian/libpam-modules.install index 348012e8..3c6872d2 100644 --- a/debian/libpam-modules.install +++ b/debian/libpam-modules.install @@ -2,5 +2,6 @@ etc/security/* etc/security sbin/unix_chkpwd sbin sbin/unix_update sbin sbin/pam_tally sbin +sbin/pam_tally2 sbin sbin/mkhomedir_helper sbin lib/security/*.so lib/security -- cgit v1.2.3 From bf574a76debe2cbc8a3de6b3b826abc026fd42cd Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Sun, 25 Apr 2010 05:53:47 -0700 Subject: releasing version 1.1.1-3 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index ce2979fd..7da2321a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -pam (1.1.1-3) UNRELEASED; urgency=low +pam (1.1.1-3) unstable; urgency=low * pam-auth-update: fix a bug in our handling of module options when the module name contains digits, caused by a buggy regexp. :/ Partially @@ -6,7 +6,7 @@ pam (1.1.1-3) UNRELEASED; urgency=low * Install /sbin/pam_tally2 in the libpam-modules package; thanks to Olivier BONHOMME for reporting. Closes: #554010. - -- Steve Langasek Sun, 25 Apr 2010 06:26:31 +0200 + -- Steve Langasek Sun, 25 Apr 2010 05:53:44 -0700 pam (1.1.1-2) unstable; urgency=low -- cgit v1.2.3 From 2757399bb70319f2d62294ab01277841ee2cf72f Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Mon, 7 Jun 2010 10:57:06 -0700 Subject: debian/patches/conditional_module,_conditional_man: if we don't have the libraries required for building pam_tty_audit, we shouldn't install the manpage either. LP: #588547. --- debian/changelog | 8 +++++ debian/patches-applied/autoconf.patch | 40 ++++++++++++++++++++++ .../conditional_module,_conditional_man | 24 +++++++++++++ debian/patches-applied/series | 1 + 4 files changed, 73 insertions(+) create mode 100644 debian/patches-applied/conditional_module,_conditional_man (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 7da2321a..c7314a12 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +pam (1.1.1-4) UNRELEASED; urgency=low + + * debian/patches/conditional_module,_conditional_man: if we don't have the + libraries required for building pam_tty_audit, we shouldn't install the + manpage either. LP: #588547. + + -- Steve Langasek Mon, 07 Jun 2010 10:53:48 -0700 + pam (1.1.1-3) unstable; urgency=low * pam-auth-update: fix a bug in our handling of module options when the diff --git a/debian/patches-applied/autoconf.patch b/debian/patches-applied/autoconf.patch index 89b63723..de57de6b 100644 --- a/debian/patches-applied/autoconf.patch +++ b/debian/patches-applied/autoconf.patch @@ -17072,3 +17072,43 @@ Index: pam.deb/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@ +Index: pam.deb/modules/pam_tty_audit/Makefile.in +=================================================================== +--- pam.deb.orig/modules/pam_tty_audit/Makefile.in ++++ pam.deb/modules/pam_tty_audit/Makefile.in +@@ -45,7 +45,6 @@ + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ +- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ + $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ + $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ +@@ -54,7 +53,7 @@ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ +- $(top_srcdir)/configure.in ++ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -193,6 +192,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PIE_CFLAGS = @PIE_CFLAGS@ +@@ -273,8 +273,8 @@ + top_srcdir = @top_srcdir@ + CLEANFILES = *~ + MAINTAINERCLEANFILES = $(MANS) README +-EXTRA_DIST = README $(MANS) $(XMLS) +-man_MANS = pam_tty_audit.8 ++EXTRA_DIST = README pam_tty_audit.8 $(XMLS) ++@HAVE_AUDIT_TTY_STATUS_TRUE@man_MANS = pam_tty_audit.8 + XMLS = README.xml pam_tty_audit.8.xml + securelibdir = $(SECUREDIR) + AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include diff --git a/debian/patches-applied/conditional_module,_conditional_man b/debian/patches-applied/conditional_module,_conditional_man new file mode 100644 index 00000000..607aa144 --- /dev/null +++ b/debian/patches-applied/conditional_module,_conditional_man @@ -0,0 +1,24 @@ +Description: don't install manpage for pam_tty_audit if the module isn't built + If we don't have the libraries required for building pam_tty_audit, we + shouldn't install the manpage either. +Author: Steve Langasek +Bug-Ubuntu: https://bugs.launchpad.net/bugs/588547 + +Index: pam.deb/modules/pam_tty_audit/Makefile.am +=================================================================== +--- pam.deb.orig/modules/pam_tty_audit/Makefile.am ++++ pam.deb/modules/pam_tty_audit/Makefile.am +@@ -5,9 +5,11 @@ + CLEANFILES = *~ + MAINTAINERCLEANFILES = $(MANS) README + +-EXTRA_DIST = README $(MANS) $(XMLS) ++EXTRA_DIST = README pam_tty_audit.8 $(XMLS) + +-man_MANS = pam_tty_audit.8 ++if HAVE_AUDIT_TTY_STATUS ++ man_MANS = pam_tty_audit.8 ++endif + XMLS = README.xml pam_tty_audit.8.xml + + securelibdir = $(SECUREDIR) diff --git a/debian/patches-applied/series b/debian/patches-applied/series index 1d1a6034..7783ddb1 100644 --- a/debian/patches-applied/series +++ b/debian/patches-applied/series @@ -16,6 +16,7 @@ hurd_no_setfsuid 054_pam_security_abstract_securetty_handling 055_pam_unix_nullok_secure PAM-manpage-section +conditional_module,_conditional_man autoconf.patch update-motd fix-man-crud -- cgit v1.2.3 From f67b05e671300c72c9d2445def0c1f3800c962d9 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Mon, 7 Jun 2010 11:44:30 -0700 Subject: patch forwarded upstream --- debian/patches-applied/conditional_module,_conditional_man | 1 + 1 file changed, 1 insertion(+) (limited to 'debian') diff --git a/debian/patches-applied/conditional_module,_conditional_man b/debian/patches-applied/conditional_module,_conditional_man index 607aa144..729f63f6 100644 --- a/debian/patches-applied/conditional_module,_conditional_man +++ b/debian/patches-applied/conditional_module,_conditional_man @@ -3,6 +3,7 @@ Description: don't install manpage for pam_tty_audit if the module isn't built shouldn't install the manpage either. Author: Steve Langasek Bug-Ubuntu: https://bugs.launchpad.net/bugs/588547 +Forwarded: <20100607181348.GA28895@dario.dodds.net> Index: pam.deb/modules/pam_tty_audit/Makefile.am =================================================================== -- cgit v1.2.3 From 3022927d5acf2a426353ec714064d2ec30cb9483 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Mon, 7 Jun 2010 13:02:36 -0700 Subject: patch committed upstream --- debian/patches-applied/conditional_module,_conditional_man | 1 + 1 file changed, 1 insertion(+) (limited to 'debian') diff --git a/debian/patches-applied/conditional_module,_conditional_man b/debian/patches-applied/conditional_module,_conditional_man index 729f63f6..69e15a80 100644 --- a/debian/patches-applied/conditional_module,_conditional_man +++ b/debian/patches-applied/conditional_module,_conditional_man @@ -4,6 +4,7 @@ Description: don't install manpage for pam_tty_audit if the module isn't built Author: Steve Langasek Bug-Ubuntu: https://bugs.launchpad.net/bugs/588547 Forwarded: <20100607181348.GA28895@dario.dodds.net> +Applied-Upstream: 987, http://bzr.debian.org/pkg-pam/upstream/branches/HEAD Index: pam.deb/modules/pam_tty_audit/Makefile.am =================================================================== -- cgit v1.2.3 From bc96a7084aa19e38c2cf5047bd05d85f99e99f8e Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Wed, 28 Jul 2010 15:23:04 -0700 Subject: * Updated debconf translations: - Portuguese, thanks to Eder L. Marques (closes: #581746) --- debian/changelog | 3 +++ debian/po/pt_BR.po | 65 +++++++++++++++++++++++++++++++++++++++--------------- 2 files changed, 50 insertions(+), 18 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index c7314a12..7ed7d192 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,9 @@ pam (1.1.1-4) UNRELEASED; urgency=low * debian/patches/conditional_module,_conditional_man: if we don't have the libraries required for building pam_tty_audit, we shouldn't install the manpage either. LP: #588547. + * Updated debconf translations: + - Portuguese, thanks to Eder L. Marques + (closes: #581746) -- Steve Langasek Mon, 07 Jun 2010 10:53:48 -0700 diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po index bc8c0a48..25b2abe8 100644 --- a/debian/po/pt_BR.po +++ b/debian/po/pt_BR.po @@ -1,21 +1,19 @@ # pam Brazilian Portuguese translation # Copyright (c) 2007 Steve Langasek # This file is distributed under the same license as the pam package. -# Eder L. Marques , 2007. +# Eder L. Marques , 2007-2009. # msgid "" -msgstr "" +msgstr "pt_BR utf-8\n" "Project-Id-Version: pam_0.99.7.1-5\n" "Report-Msgid-Bugs-To: pam@packages.debian.org\n" "POT-Creation-Date: 2009-08-18 18:30-0700\n" -"PO-Revision-Date: 2007-09-26 15:53-0300\n" -"Last-Translator: Eder L. Marques \n" -"Language-Team: l10n Portuguese \n" +"PO-Revision-Date: 2009-09-08 11:33+0900\n" +"Last-Translator: Eder L. Marques \n" +"Language-Team: Brazilian Portuguese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"pt_BR utf-8\n" -"X-Generator: KBabel 1.11.4\n" #. Type: string #. Description @@ -86,7 +84,7 @@ msgstr "" #. Description #: ../libpam-runtime.templates:1001 msgid "PAM profiles to enable:" -msgstr "" +msgstr "Perfis PAM para habilitar:" #. Type: multiselect #. Description @@ -97,6 +95,10 @@ msgid "" "allowing configuration of additional actions to take when starting user " "sessions." msgstr "" +"O PAM (\"Pluggable Authentication Modules\") determina como a autenticação, " +"autorização e alteração de senha são tratados no sistema, assim como permite " +"a configuração de ações adicionais a serem tomadas quando sessões de usuário " +"são iniciadas." #. Type: multiselect #. Description @@ -106,12 +108,16 @@ msgid "" "adjust the behavior of all PAM-using applications on the system. Please " "indicate which of these behaviors you wish to enable." msgstr "" +"Alguns pacotes de módulos PAM fornecem perfis que podem ser usados para " +"ajustar automaticamente o comportamento de todas as aplicações que usam PAM " +"no sistema. Por favor, indique quais destes comportamentos você deseja " +"habilitar." #. Type: error #. Description #: ../libpam-runtime.templates:2001 msgid "Incompatible PAM profiles selected." -msgstr "" +msgstr "Perfis PAM incompatíveis foram selecionados." #. Type: error #. Description @@ -119,19 +125,19 @@ msgstr "" #. PAM profile names. #: ../libpam-runtime.templates:2001 msgid "The following PAM profiles cannot be used together:" -msgstr "" +msgstr "Os seguintes perfis PAM não podem ser usados em conjunto:" #. Type: error #. Description #: ../libpam-runtime.templates:2001 msgid "Please select a different set of modules to enable." -msgstr "" +msgstr "Por favor, selecione um conjunto diferente de módulos para habilitar." #. Type: boolean #. Description #: ../libpam-runtime.templates:3001 msgid "Override local changes to /etc/pam.d/common-*?" -msgstr "" +msgstr "Sobrescrever as modificações locais de /etc/pam.d/common-*?" #. Type: boolean #. Description @@ -143,12 +149,17 @@ msgid "" "decline this option, you will need to manage your system's authentication " "configuration by hand." msgstr "" +"Um ou mais dos arquivos /etc/pam.d/common-{auth,account,password,session} " +"foram modificados localmente. Por favor, indique quais destas modificações " +"locais devem ser sobrescritas usando a configuração fornecida pelo sistema. " +"Se você recusar esta opção, você precisará gerenciar a configuração de " +"autenticação do seu sistema manualmente." #. Type: error #. Description #: ../libpam-runtime.templates:4001 msgid "No PAM profiles have been selected." -msgstr "" +msgstr "Nenhum perfil PAM foi selecionado." #. Type: error #. Description @@ -157,13 +168,15 @@ msgid "" "No PAM profiles have been selected for use on this system. This would grant " "all users access without authenticating, and is not allowed. Please select " "at least one PAM profile from the available list." -msgstr "" +msgstr "Nenhum perfil PAM foi selecionado para uso neste sistema. Isto irá " +"garantir a todos os usuários acesso sem autenticação, e isto não é permitido. " +"Por favor, selecione no mínimo um perfil PAM da lista disponível." #. Type: error #. Description #: ../libpam-runtime.templates:5001 msgid "Your system allowed access without a password!" -msgstr "" +msgstr "Seu sistema permite acesso sem uma senha!" #. Type: error #. Description @@ -177,7 +190,14 @@ msgid "" "security failures, viruses, and malicious software, you should re-install " "this system from scratch or obtain the services of a skilled system " "administrator. For more information, see:" -msgstr "" +msgstr "Um bug na versão anterior de libpam-runtime resultou em nenhum perfil " +"PAM sendo selecionado para uso neste sistema. Como resultado, acesso era " +"permitido para todas as contas no seu sistema, com ou sem uma senha correta. " +"Especificamente se este sistema pode ser acessado da Internet, é bem provável " +"que ele tenha sido comprometido. A menos que você seja familiar com " +"recuperação a partir de falhas de segurança, virus e softwares maliciosos, " +"você deve re-instalar este sistema do início ou obter os serviços de um " +"administrador de sistemas competente. Para maiores informações, veja:" #. Type: error #. Description @@ -187,13 +207,16 @@ msgid "" "version of libpam-runtime, and your configuration has now been corrected. We " "apologize that previous versions of libpam-runtime did not detect and " "prevent this situation." -msgstr "" +msgstr "este bug que permitia esta configuração errada foi corrigido na versão " +"atual de libpam-runtime, e sua configuração foi agora corrigida. Nós pedimos " +"desculpas por as versões anteriores de libpam-runtime não detectarem e " +"prevenirem esta situação." #. Type: error #. Description #: ../libpam-modules.templates:1001 msgid "xscreensaver and xlockmore must be restarted before upgrading" -msgstr "" +msgstr "O xscreensaver e xlockmore precisam ser reiniciados antes de atualizar" #. Type: error #. Description @@ -206,3 +229,9 @@ msgid "" "stopped before continuing this upgrade, to avoid locking your users out of " "their current sessions." msgstr "" +"Uma ou mais instâncias do xscreensaver ou do xlockmore foram detectadas em " +"execução neste sistema. Por causa de modificações incompatíveis de " +"biblioteca a atualização do pacote libpam-modules impossibilitará você de " +"se autenticar nestes programas. Você deve providenciar que estes programas " +"sejam reiniciados ou parados antes de continuar com esta atualização, para " +"evitar bloquear seus usuários fora de suas sessões atuais." -- cgit v1.2.3 From 8645d4f5131d25692dfd78d3e1c46b03f33febf3 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Wed, 28 Jul 2010 15:32:04 -0700 Subject: Don't pass --version-script options when linking executables, only when linking libraries. Thanks to Julien Cristau for the fix. Closes: #582362. --- debian/changelog | 3 + debian/patches-applied/autoconf.patch | 4734 ++++++++++++++++++------ debian/patches-applied/mkhomedir_linking.patch | 28 + debian/patches-applied/series | 1 + 4 files changed, 3623 insertions(+), 1143 deletions(-) create mode 100644 debian/patches-applied/mkhomedir_linking.patch (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 7ed7d192..5ad7735c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,9 @@ pam (1.1.1-4) UNRELEASED; urgency=low * Updated debconf translations: - Portuguese, thanks to Eder L. Marques (closes: #581746) + * Don't pass --version-script options when linking executables, + only when linking libraries. Thanks to Julien Cristau + for the fix. Closes: #582362. -- Steve Langasek Mon, 07 Jun 2010 10:53:48 -0700 diff --git a/debian/patches-applied/autoconf.patch b/debian/patches-applied/autoconf.patch index de57de6b..5168eee9 100644 --- a/debian/patches-applied/autoconf.patch +++ b/debian/patches-applied/autoconf.patch @@ -7,28 +7,39 @@ The process for refreshing this patch is: quilt refresh find . -name '*.rej' | xargs rm -Index: pam.deb/ltmain.sh +Index: pam.debian/ltmain.sh =================================================================== ---- pam.deb.orig/ltmain.sh -+++ pam.deb/ltmain.sh +--- pam.debian.orig/ltmain.sh ++++ pam.debian/ltmain.sh +@@ -1,6 +1,6 @@ + # Generated from ltmain.m4sh. + +-# ltmain.sh (GNU libtool) 2.2.6 ++# ltmain.sh (GNU libtool) 2.2.6b + # Written by Gordon Matzigkeit , 1996 + + # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc. @@ -65,7 +65,7 @@ # compiler: $LTCC # compiler flags: $LTCFLAGS # linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.2.6 -+# $progname: (GNU libtool) 2.2.6 Debian-2.2.6a-4 ++# $progname: (GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu1 # automake: $automake_version # autoconf: $autoconf_version # -@@ -73,7 +73,7 @@ +@@ -73,9 +73,9 @@ PROGRAM=ltmain.sh PACKAGE=libtool -VERSION=2.2.6 -+VERSION="2.2.6 Debian-2.2.6a-4" ++VERSION="2.2.6b Debian-2.2.6b-2ubuntu1" TIMESTAMP="" - package_revision=1.3012 +-package_revision=1.3012 ++package_revision=1.3017 + # Be Bourne compatible + if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then @@ -116,15 +116,15 @@ : ${CP="cp -f"} @@ -109,10 +120,19 @@ Index: pam.deb/ltmain.sh esac ;; no) -Index: pam.deb/m4/libtool.m4 +Index: pam.debian/m4/libtool.m4 =================================================================== ---- pam.deb.orig/m4/libtool.m4 -+++ pam.deb/m4/libtool.m4 +--- pam.debian.orig/m4/libtool.m4 ++++ pam.debian/m4/libtool.m4 +@@ -2445,7 +2445,7 @@ + ;; + + # This must be Linux ELF. +-linux* | k*bsd*-gnu) ++linux* | k*bsd*-gnu | kopensolaris*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no @@ -2485,6 +2485,18 @@ dynamic_linker='GNU/Linux ld.so' ;; @@ -132,7 +152,12 @@ Index: pam.deb/m4/libtool.m4 netbsd*) version_type=sunos need_lib_prefix=no -@@ -3076,7 +3088,7 @@ +@@ -3072,11 +3084,11 @@ + ;; + + # This must be Linux ELF. +-linux* | k*bsd*-gnu) ++linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; @@ -141,6 +166,15 @@ Index: pam.deb/m4/libtool.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 +@@ -3693,7 +3705,7 @@ + ;; + esac + ;; +- linux* | k*bsd*-gnu) ++ linux* | k*bsd*-gnu | kopensolaris*-gnu) + case $cc_basename in + KCC*) + # KAI C++ Compiler @@ -3757,7 +3769,7 @@ ;; esac @@ -150,6 +184,15 @@ Index: pam.deb/m4/libtool.m4 ;; *qnx* | *nto*) # QNX uses GNU C++, but need to define -shared option too, otherwise +@@ -3977,7 +3989,7 @@ + _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; + +- linux* | k*bsd*-gnu) ++ linux* | k*bsd*-gnu | kopensolaris*-gnu) + case $cc_basename in + # old Intel for x86_64 which still supported -KPIC. + ecc*) @@ -4182,6 +4194,9 @@ cygwin* | mingw* | cegcc*) _LT_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' @@ -170,7 +213,24 @@ Index: pam.deb/m4/libtool.m4 esac _LT_TAGVAR(ld_shlibs, $1)=yes -@@ -4428,7 +4446,7 @@ +@@ -4267,6 +4285,7 @@ + fi + supports_anon_versioning=no + case `$LD -v 2>&1` in ++ *GNU\ gold*) supports_anon_versioning=yes ;; + *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... + *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... +@@ -4358,7 +4377,7 @@ + _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; + +- gnu* | linux* | tpf* | k*bsd*-gnu) ++ gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) + tmp_diet=no + if test "$host_os" = linux-dietlibc; then + case $cc_basename in +@@ -4428,7 +4447,7 @@ fi ;; @@ -179,7 +239,7 @@ Index: pam.deb/m4/libtool.m4 if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= -@@ -4603,6 +4621,7 @@ +@@ -4603,6 +4622,7 @@ if test "$aix_use_runtimelinking" = yes; then shared_flag="$shared_flag "'${wl}-G' fi @@ -187,7 +247,7 @@ Index: pam.deb/m4/libtool.m4 else # not using gcc if test "$host_cpu" = ia64; then -@@ -4841,7 +4860,7 @@ +@@ -4841,7 +4861,7 @@ _LT_TAGVAR(link_all_deplibs, $1)=yes ;; @@ -196,21 +256,54 @@ Index: pam.deb/m4/libtool.m4 if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else -Index: pam.deb/aclocal.m4 +@@ -5841,7 +5861,7 @@ + _LT_TAGVAR(inherit_rpath, $1)=yes + ;; + +- linux* | k*bsd*-gnu) ++ linux* | k*bsd*-gnu | kopensolaris*-gnu) + case $cc_basename in + KCC*) + # Kuck and Associates, Inc. (KAI) C++ Compiler +Index: pam.debian/aclocal.m4 =================================================================== ---- pam.deb.orig/aclocal.m4 -+++ pam.deb/aclocal.m4 +--- pam.debian.orig/aclocal.m4 ++++ pam.debian/aclocal.m4 +@@ -1,4 +1,4 @@ +-# generated automatically by aclocal 1.11 -*- Autoconf -*- ++# generated automatically by aclocal 1.11.1 -*- Autoconf -*- + + # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, + # 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. @@ -13,8 +13,8 @@ m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],, -[m4_warning([this file was generated for autoconf 2.63. -+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.64],, -+[m4_warning([this file was generated for autoconf 2.64. ++m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],, ++[m4_warning([this file was generated for autoconf 2.65. 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'.])]) +@@ -34,7 +34,7 @@ + [am__api_version='1.11' + 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.11], [], ++m4_if([$1], [1.11.1], [], + [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl + ]) + +@@ -50,7 +50,7 @@ + # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. + # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. + AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], +-[AM_AUTOMAKE_VERSION([1.11])dnl ++[AM_AUTOMAKE_VERSION([1.11.1])dnl + m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl + _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) @@ -1008,7 +1008,6 @@ m4_include([m4/gettext.m4]) m4_include([m4/iconv.m4]) @@ -224,10 +317,10 @@ Index: pam.deb/aclocal.m4 m4_include([m4/po.m4]) m4_include([m4/progtest.m4]) +m4_include([acinclude.m4]) -Index: pam.deb/config.h.in +Index: pam.debian/config.h.in =================================================================== ---- pam.deb.orig/config.h.in -+++ pam.deb/config.h.in +--- pam.debian.orig/config.h.in ++++ pam.debian/config.h.in @@ -294,6 +294,9 @@ /* Define to the one symbol short name of this package. */ #undef PACKAGE_TARNAME @@ -238,20 +331,22 @@ Index: pam.deb/config.h.in /* Define to the version of this package. */ #undef PACKAGE_VERSION -Index: pam.deb/configure +Index: pam.debian/configure =================================================================== ---- pam.deb.orig/configure -+++ pam.deb/configure -@@ -1,18 +1,20 @@ +--- pam.debian.orig/configure ++++ pam.debian/configure +@@ -1,18 +1,22 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63. -+# Generated by GNU Autoconf 2.64. ++# Generated by GNU Autoconf 2.65. ++# # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. -+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software -+# Foundation, Inc. ++# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. ++# +# # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. @@ -269,7 +364,7 @@ Index: pam.deb/configure emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which -@@ -20,23 +22,15 @@ +@@ -20,23 +24,15 @@ alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else @@ -298,7 +393,7 @@ Index: pam.deb/configure as_nl=' ' export as_nl -@@ -44,7 +38,13 @@ +@@ -44,7 +40,13 @@ as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo @@ -313,7 +408,7 @@ Index: pam.deb/configure as_echo='printf %s\n' as_echo_n='printf %s' else -@@ -55,7 +55,7 @@ +@@ -55,7 +57,7 @@ as_echo_body='eval expr "X$1" : "X\\(.*\\)"' as_echo_n_body='eval arg=$1; @@ -322,7 +417,7 @@ Index: pam.deb/configure *"$as_nl"*) expr "X$arg" : "X\\(.*\\)$as_nl"; arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; -@@ -78,13 +78,6 @@ +@@ -78,13 +80,6 @@ } fi @@ -336,7 +431,7 @@ Index: pam.deb/configure # IFS # We need space, tab and new line, in precisely that order. Quoting is -@@ -94,15 +87,15 @@ +@@ -94,15 +89,15 @@ IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. @@ -355,7 +450,7 @@ Index: pam.deb/configure IFS=$as_save_IFS ;; -@@ -114,12 +107,16 @@ +@@ -114,12 +109,16 @@ fi if test ! -f "$as_myself"; then $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 @@ -376,7 +471,7 @@ Index: pam.deb/configure done PS1='$ ' PS2='> ' -@@ -131,330 +128,299 @@ +@@ -131,330 +130,299 @@ LANGUAGE=C export LANGUAGE @@ -710,7 +805,7 @@ Index: pam.deb/configure +# Unset more variables known to interfere with behavior of common tools. +CLICOLOR_FORCE= GREP_OPTIONS= +unset CLICOLOR_FORCE GREP_OPTIONS -+ + +## --------------------- ## +## M4sh Shell Functions. ## +## --------------------- ## @@ -746,7 +841,7 @@ Index: pam.deb/configure +# Create "$as_dir" as a directory, including parents if necessary. +as_fn_mkdir_p () +{ - ++ + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac @@ -952,7 +1047,7 @@ Index: pam.deb/configure sed -n ' p /[$]LINENO/= -@@ -471,8 +437,7 @@ +@@ -471,8 +439,7 @@ s/-\n.*// ' >$as_me.lineno && chmod +x "$as_me.lineno" || @@ -962,7 +1057,7 @@ Index: pam.deb/configure # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the -@@ -482,29 +447,18 @@ +@@ -482,29 +449,18 @@ exit } @@ -997,7 +1092,7 @@ Index: pam.deb/configure rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then -@@ -534,7 +488,7 @@ +@@ -534,7 +490,7 @@ rmdir conf$$.dir 2>/dev/null if mkdir -p . 2>/dev/null; then @@ -1006,7 +1101,7 @@ Index: pam.deb/configure else test -d ./-p && rmdir ./-p as_mkdir_p=false -@@ -553,10 +507,10 @@ +@@ -553,10 +509,10 @@ if test -d "$1"; then test -d "$1/."; else @@ -1019,7 +1114,7 @@ Index: pam.deb/configure ???[sx]*):;;*)false;;esac;fi '\'' sh ' -@@ -571,7 +525,6 @@ +@@ -571,7 +527,6 @@ @@ -1027,7 +1122,17 @@ Index: pam.deb/configure # Check that we are running under the correct shell. SHELL=${CONFIG_SHELL-/bin/sh} -@@ -738,7 +691,6 @@ +@@ -720,7 +675,8 @@ + + + +-exec 7<&0 &1 ++test -n "$DJDIR" || exec 7<&0 &1 + + # Name of the host. + # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, +@@ -738,7 +694,6 @@ subdirs= MFLAGS= MAKEFLAGS= @@ -1035,7 +1140,7 @@ Index: pam.deb/configure # Identity of this package. PACKAGE_NAME= -@@ -746,6 +698,7 @@ +@@ -746,6 +701,7 @@ PACKAGE_VERSION= PACKAGE_STRING= PACKAGE_BUGREPORT= @@ -1043,7 +1148,7 @@ Index: pam.deb/configure ac_unique_file="conf/pam_conv1/pam_conv_y.y" ac_default_prefix=/usr -@@ -957,6 +910,7 @@ +@@ -957,6 +913,7 @@ program_transform_name prefix exec_prefix @@ -1051,7 +1156,7 @@ Index: pam.deb/configure PACKAGE_BUGREPORT PACKAGE_STRING PACKAGE_VERSION -@@ -1120,8 +1074,7 @@ +@@ -1120,8 +1077,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && @@ -1061,7 +1166,7 @@ Index: pam.deb/configure ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in -@@ -1147,8 +1100,7 @@ +@@ -1147,8 +1103,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && @@ -1071,7 +1176,7 @@ Index: pam.deb/configure ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in -@@ -1352,8 +1304,7 @@ +@@ -1352,8 +1307,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && @@ -1081,7 +1186,7 @@ Index: pam.deb/configure ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in -@@ -1369,8 +1320,7 @@ +@@ -1369,8 +1323,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && @@ -1091,7 +1196,7 @@ Index: pam.deb/configure ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in -@@ -1400,17 +1350,17 @@ +@@ -1400,17 +1353,17 @@ | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; @@ -1115,7 +1220,7 @@ Index: pam.deb/configure eval $ac_envvar=\$ac_optarg export $ac_envvar ;; -@@ -1427,15 +1377,13 @@ +@@ -1427,15 +1380,13 @@ if test -n "$ac_prev"; then ac_option=--`echo $ac_prev | sed 's/_/-/g'` @@ -1133,7 +1238,7 @@ Index: pam.deb/configure *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; esac fi -@@ -1458,8 +1406,7 @@ +@@ -1458,8 +1409,7 @@ [\\/$]* | ?:[\\/]* ) continue;; NONE | '' ) case $ac_var in *prefix ) continue;; esac;; esac @@ -1143,7 +1248,7 @@ Index: pam.deb/configure done # There might be people who depend on the old broken behavior: `$host' -@@ -1489,11 +1436,9 @@ +@@ -1489,11 +1439,9 @@ ac_pwd=`pwd` && test -n "$ac_pwd" && ac_ls_di=`ls -di .` && ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || @@ -1157,7 +1262,7 @@ Index: pam.deb/configure # Find the source files, if location was not specified. -@@ -1532,13 +1477,11 @@ +@@ -1532,13 +1480,11 @@ fi if test ! -r "$srcdir/$ac_unique_file"; then test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." @@ -1173,7 +1278,16 @@ Index: pam.deb/configure pwd)` # When building in place, set srcdir=. if test "$ac_abs_confdir" = "$ac_pwd"; then -@@ -1717,6 +1660,7 @@ +@@ -1705,7 +1651,7 @@ + LDFLAGS linker flags, e.g. -L if you have libraries in a + nonstandard directory + LIBS libraries to pass to the linker, e.g. -l +- CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I if ++ CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if + you have headers in a nonstandard directory + CPP C preprocessor + YACC The `Yet Another C Compiler' implementation to use. Defaults to +@@ -1717,6 +1663,7 @@ Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. @@ -1181,12 +1295,12 @@ Index: pam.deb/configure _ACEOF ac_status=$? fi -@@ -1780,21 +1724,465 @@ +@@ -1780,21 +1727,465 @@ if $ac_init_version; then cat <<\_ACEOF configure -generated by GNU Autoconf 2.63 -+generated by GNU Autoconf 2.64 ++generated by GNU Autoconf 2.65 -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. @@ -1235,7 +1349,7 @@ Index: pam.deb/configure + ac_retval=1 +fi + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} -+ return $ac_retval ++ as_fn_set_status $ac_retval + +} # ac_fn_c_try_compile + @@ -1272,7 +1386,7 @@ Index: pam.deb/configure + ac_retval=1 +fi + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} -+ return $ac_retval ++ as_fn_set_status $ac_retval + +} # ac_fn_c_try_cpp + @@ -1401,7 +1515,7 @@ Index: pam.deb/configure +fi + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} -+ return $ac_retval ++ as_fn_set_status $ac_retval + +} # ac_fn_c_try_run + @@ -1478,7 +1592,7 @@ Index: pam.deb/configure + # left behind by Apple's compiler. We do this before executing the actions. + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} -+ return $ac_retval ++ as_fn_set_status $ac_retval + +} # ac_fn_c_try_link + @@ -1647,11 +1761,11 @@ Index: pam.deb/configure It was created by $as_me, which was -generated by GNU Autoconf 2.63. Invocation command line was -+generated by GNU Autoconf 2.64. Invocation command line was ++generated by GNU Autoconf 2.65. Invocation command line was $ $0 $@ -@@ -1830,8 +2218,8 @@ +@@ -1830,8 +2221,8 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -1662,7 +1776,7 @@ Index: pam.deb/configure IFS=$as_save_IFS } >&5 -@@ -1868,9 +2256,9 @@ +@@ -1868,9 +2259,9 @@ ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; esac case $ac_pass in @@ -1674,7 +1788,7 @@ Index: pam.deb/configure if test $ac_must_keep_next = true; then ac_must_keep_next=false # Got value, back to normal. else -@@ -1886,13 +2274,13 @@ +@@ -1886,13 +2277,13 @@ -* ) ac_must_keep_next=true ;; esac fi @@ -1691,7 +1805,7 @@ Index: pam.deb/configure # When interrupted or exit'd, cleanup temporary files, and complete # config.log. We remove comments because anyway the quotes in there -@@ -1917,13 +2305,13 @@ +@@ -1917,13 +2308,13 @@ case $ac_val in #( *${as_nl}*) case $ac_var in #( @@ -1707,7 +1821,7 @@ Index: pam.deb/configure esac ;; esac done -@@ -1995,39 +2383,41 @@ +@@ -1995,39 +2386,41 @@ exit $exit_status ' 0 for ac_signal in 1 2 13 15; do @@ -1754,25 +1868,33 @@ Index: pam.deb/configure # Let the site file select an alternate cache file if it wants to. # Prefer an explicitly selected file to automatically selected ones. -@@ -2046,7 +2436,7 @@ +@@ -2045,8 +2438,8 @@ + for ac_site_file in "$ac_site_file1" "$ac_site_file2" do test "x$ac_site_file" = xNONE && continue - if test -r "$ac_site_file"; then +- if test -r "$ac_site_file"; then - { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 ++ if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 $as_echo "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 . "$ac_site_file" -@@ -2057,7 +2447,7 @@ - # Some versions of bash will fail to source /dev/null (special - # files actually), so we avoid doing that. - if test -f "$cache_file"; then +@@ -2054,10 +2447,10 @@ + done + + if test -r "$cache_file"; then +- # Some versions of bash will fail to source /dev/null (special +- # files actually), so we avoid doing that. +- if test -f "$cache_file"; then - { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5 ++ # Some versions of bash will fail to source /dev/null (special files ++ # actually), so we avoid doing that. DJGPP emulates it as a regular file. ++ if test /dev/null != "$cache_file" && test -f "$cache_file"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 $as_echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in [\\/]* | ?:[\\/]* ) . "$cache_file";; -@@ -2065,7 +2455,7 @@ +@@ -2065,7 +2458,7 @@ esac fi else @@ -1781,7 +1903,7 @@ Index: pam.deb/configure $as_echo "$as_me: creating cache $cache_file" >&6;} >$cache_file fi -@@ -2081,11 +2471,11 @@ +@@ -2081,11 +2474,11 @@ eval ac_new_val=\$ac_env_${ac_var}_value case $ac_old_set,$ac_new_set in set,) @@ -1795,7 +1917,7 @@ Index: pam.deb/configure $as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_cache_corrupted=: ;; ,);; -@@ -2095,17 +2485,17 @@ +@@ -2095,17 +2488,17 @@ ac_old_val_w=`echo x $ac_old_val` ac_new_val_w=`echo x $ac_new_val` if test "$ac_old_val_w" != "$ac_new_val_w"; then @@ -1817,7 +1939,7 @@ Index: pam.deb/configure $as_echo "$as_me: current value: \`$ac_new_val'" >&2;} fi;; esac -@@ -2117,35 +2507,20 @@ +@@ -2117,35 +2510,20 @@ esac case " $ac_configure_args " in *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. @@ -1860,7 +1982,7 @@ Index: pam.deb/configure ac_ext=c ac_cpp='$CPP $CPPFLAGS' -@@ -2159,24 +2534,16 @@ +@@ -2159,24 +2537,16 @@ ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do @@ -1893,7 +2015,7 @@ Index: pam.deb/configure fi # These three variables are undocumented and unsupported, -@@ -2202,10 +2569,10 @@ +@@ -2202,10 +2572,10 @@ # OS/2's system install, which has a completely different semantic # ./install, which can be erroneously created by make from ./install.sh. # Reject install programs that cannot install multiple files. @@ -1906,7 +2028,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -@@ -2213,11 +2580,11 @@ +@@ -2213,11 +2583,11 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -1922,7 +2044,7 @@ Index: pam.deb/configure /usr/ucb/* ) ;; *) # OSF1 and SCO ODT 3.0 have their own names for install. -@@ -2254,7 +2621,7 @@ +@@ -2254,7 +2624,7 @@ ;; esac @@ -1931,7 +2053,7 @@ Index: pam.deb/configure IFS=$as_save_IFS rm -rf conftest.one conftest.two conftest.dir -@@ -2270,7 +2637,7 @@ +@@ -2270,7 +2640,7 @@ INSTALL=$ac_install_sh fi fi @@ -1940,7 +2062,7 @@ Index: pam.deb/configure $as_echo "$INSTALL" >&6; } # Use test -z because SunOS4 sh mishandles braces in ${var-val}. -@@ -2281,7 +2648,7 @@ +@@ -2281,7 +2651,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' @@ -1949,7 +2071,7 @@ Index: pam.deb/configure $as_echo_n "checking whether build environment is sane... " >&6; } # Just in case sleep 1 -@@ -2292,15 +2659,11 @@ +@@ -2292,15 +2662,11 @@ ' case `pwd` in *[\\\"\#\$\&\'\`$am_lf]*) @@ -1967,7 +2089,7 @@ Index: pam.deb/configure esac # Do `set' in a subshell so we don't clobber the current shell's -@@ -2322,11 +2685,8 @@ +@@ -2322,11 +2688,8 @@ # if, for instance, CONFIG_SHELL is bash and it inherits a # broken ls alias from the environment. This has actually # happened. Such a system could not be considered "sane". @@ -1981,7 +2103,7 @@ Index: pam.deb/configure fi test "$2" = conftest.file -@@ -2335,13 +2695,10 @@ +@@ -2335,13 +2698,10 @@ # Ok. : else @@ -1998,7 +2120,7 @@ Index: pam.deb/configure $as_echo "yes" >&6; } test "$program_prefix" != NONE && program_transform_name="s&^&$program_prefix&;$program_transform_name" -@@ -2369,7 +2726,7 @@ +@@ -2369,7 +2729,7 @@ am_missing_run="$MISSING --run " else am_missing_run= @@ -2007,7 +2129,7 @@ Index: pam.deb/configure $as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} fi -@@ -2390,9 +2747,9 @@ +@@ -2390,9 +2750,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 @@ -2019,7 +2141,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else if test -n "$STRIP"; then -@@ -2403,24 +2760,24 @@ +@@ -2403,24 +2763,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -2049,7 +2171,7 @@ Index: pam.deb/configure $as_echo "no" >&6; } fi -@@ -2430,9 +2787,9 @@ +@@ -2430,9 +2790,9 @@ ac_ct_STRIP=$STRIP # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 @@ -2061,7 +2183,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_STRIP"; then -@@ -2443,24 +2800,24 @@ +@@ -2443,24 +2803,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -2091,7 +2213,7 @@ Index: pam.deb/configure $as_echo "no" >&6; } fi -@@ -2469,7 +2826,7 @@ +@@ -2469,7 +2829,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -2100,7 +2222,7 @@ Index: pam.deb/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -2482,10 +2839,10 @@ +@@ -2482,10 +2842,10 @@ fi INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" @@ -2113,7 +2235,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -@@ -2493,7 +2850,7 @@ +@@ -2493,7 +2853,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -2122,7 +2244,7 @@ Index: pam.deb/configure 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 #( -@@ -2505,7 +2862,7 @@ +@@ -2505,11 +2865,12 @@ esac done done @@ -2131,7 +2253,16 @@ Index: pam.deb/configure IFS=$as_save_IFS fi -@@ -2521,7 +2878,7 @@ + ++ test -d ./--version && rmdir ./--version + if test "${ac_cv_path_mkdir+set}" = set; then + MKDIR_P="$ac_cv_path_mkdir -p" + else +@@ -2517,11 +2878,10 @@ + # 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" fi fi @@ -2140,7 +2271,7 @@ Index: pam.deb/configure $as_echo "$MKDIR_P" >&6; } mkdir_p="$MKDIR_P" -@@ -2534,9 +2891,9 @@ +@@ -2534,9 +2894,9 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -2152,7 +2283,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else if test -n "$AWK"; then -@@ -2547,24 +2904,24 @@ +@@ -2547,24 +2907,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -2182,7 +2313,7 @@ Index: pam.deb/configure $as_echo "no" >&6; } fi -@@ -2572,11 +2929,11 @@ +@@ -2572,11 +2932,11 @@ test -n "$AWK" && break done @@ -2196,7 +2327,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else cat >conftest.make <<\_ACEOF -@@ -2594,11 +2951,11 @@ +@@ -2594,11 +2954,11 @@ rm -f conftest.make fi if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then @@ -2210,7 +2341,7 @@ Index: pam.deb/configure $as_echo "no" >&6; } SET_MAKE="MAKE=${MAKE-make}" fi -@@ -2618,9 +2975,7 @@ +@@ -2618,9 +2978,7 @@ am__isrc=' -I$(srcdir)' # test to see if srcdir already configured if test -f $srcdir/config.status; then @@ -2221,7 +2352,7 @@ Index: pam.deb/configure fi fi -@@ -2682,35 +3037,27 @@ +@@ -2682,35 +3040,27 @@ # Make sure we can run config.sub. $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || @@ -2264,7 +2395,7 @@ Index: pam.deb/configure esac build=$ac_cv_build ac_save_IFS=$IFS; IFS='-' -@@ -2726,28 +3073,24 @@ +@@ -2726,28 +3076,24 @@ case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac @@ -2298,7 +2429,7 @@ Index: pam.deb/configure esac host=$ac_cv_host ac_save_IFS=$IFS; IFS='-' -@@ -2806,7 +3149,7 @@ +@@ -2806,7 +3152,7 @@ fi # Check whether --enable-static-modules was given. @@ -2307,7 +2438,7 @@ Index: pam.deb/configure enableval=$enable_static_modules; STATIC_MODULES=$enableval else STATIC_MODULES=no -@@ -2815,7 +3158,7 @@ +@@ -2815,7 +3161,7 @@ if test "$STATIC_MODULES" != "no" ; then CFLAGS="$CFLAGS -DPAM_STATIC" # Check whether --enable-static was given. @@ -2316,7 +2447,7 @@ Index: pam.deb/configure enableval=$enable_static; p=${PACKAGE-default} case $enableval in yes) enable_static=yes ;; -@@ -2846,7 +3189,7 @@ +@@ -2846,7 +3192,7 @@ # Check whether --enable-shared was given. @@ -2325,7 +2456,7 @@ Index: pam.deb/configure enableval=$enable_shared; p=${PACKAGE-default} case $enableval in yes) enable_shared=yes ;; -@@ -2879,7 +3222,7 @@ +@@ -2879,7 +3225,7 @@ else # per default don't build static libraries # Check whether --enable-static was given. @@ -2334,7 +2465,7 @@ Index: pam.deb/configure enableval=$enable_static; p=${PACKAGE-default} case $enableval in yes) enable_static=yes ;; -@@ -2907,7 +3250,7 @@ +@@ -2907,7 +3253,7 @@ # Check whether --enable-shared was given. @@ -2343,7 +2474,7 @@ Index: pam.deb/configure enableval=$enable_shared; p=${PACKAGE-default} case $enableval in yes) enable_shared=yes ;; -@@ -2956,7 +3299,7 @@ +@@ -2956,7 +3302,7 @@ .PHONY: am__doit END # If we don't find an include directive, just comment out the code. @@ -2352,7 +2483,7 @@ Index: pam.deb/configure $as_echo_n "checking for style of include used by $am_make... " >&6; } am__include="#" am__quote= -@@ -2984,12 +3327,12 @@ +@@ -2984,12 +3330,12 @@ fi @@ -2367,7 +2498,7 @@ Index: pam.deb/configure enableval=$enable_dependency_tracking; fi -@@ -3014,9 +3357,9 @@ +@@ -3014,9 +3360,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 @@ -2379,7 +2510,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else if test -n "$CC"; then -@@ -3027,24 +3370,24 @@ +@@ -3027,24 +3373,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -2409,7 +2540,7 @@ Index: pam.deb/configure $as_echo "no" >&6; } fi -@@ -3054,9 +3397,9 @@ +@@ -3054,9 +3400,9 @@ ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 @@ -2421,7 +2552,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then -@@ -3067,24 +3410,24 @@ +@@ -3067,24 +3413,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -2451,7 +2582,7 @@ Index: pam.deb/configure $as_echo "no" >&6; } fi -@@ -3093,7 +3436,7 @@ +@@ -3093,7 +3439,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -2460,7 +2591,7 @@ Index: pam.deb/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -3107,9 +3450,9 @@ +@@ -3107,9 +3453,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 @@ -2472,7 +2603,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else if test -n "$CC"; then -@@ -3120,24 +3463,24 @@ +@@ -3120,24 +3466,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -2502,7 +2633,7 @@ Index: pam.deb/configure $as_echo "no" >&6; } fi -@@ -3147,9 +3490,9 @@ +@@ -3147,9 +3493,9 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 @@ -2514,7 +2645,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else if test -n "$CC"; then -@@ -3161,18 +3504,18 @@ +@@ -3161,18 +3507,18 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -2536,7 +2667,7 @@ Index: pam.deb/configure IFS=$as_save_IFS if test $ac_prog_rejected = yes; then -@@ -3191,10 +3534,10 @@ +@@ -3191,10 +3537,10 @@ fi CC=$ac_cv_prog_CC if test -n "$CC"; then @@ -2549,7 +2680,7 @@ Index: pam.deb/configure $as_echo "no" >&6; } fi -@@ -3206,9 +3549,9 @@ +@@ -3206,9 +3552,9 @@ do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 @@ -2561,7 +2692,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else if test -n "$CC"; then -@@ -3219,24 +3562,24 @@ +@@ -3219,24 +3565,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -2591,7 +2722,7 @@ Index: pam.deb/configure $as_echo "no" >&6; } fi -@@ -3250,9 +3593,9 @@ +@@ -3250,9 +3596,9 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -2603,7 +2734,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then -@@ -3263,24 +3606,24 @@ +@@ -3263,24 +3609,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -2633,7 +2764,7 @@ Index: pam.deb/configure $as_echo "no" >&6; } fi -@@ -3293,7 +3636,7 @@ +@@ -3293,7 +3639,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -2642,7 +2773,7 @@ Index: pam.deb/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -3304,73 +3647,55 @@ +@@ -3304,57 +3650,37 @@ fi @@ -2705,8 +2836,8 @@ Index: pam.deb/configure +... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 -+ rm -f conftest.er1 conftest.err + fi ++ rm -f conftest.er1 conftest.err + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +done @@ -2718,30 +2849,20 @@ Index: pam.deb/configure -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -- -+#include - int - main () - { -+FILE *f = fopen ("conftest.out", "w"); -+ return ferror (f) || fclose (f) != 0; - ; - return 0; - } - _ACEOF - ac_clean_files_save=$ac_clean_files --ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" -+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out" + int +@@ -3370,8 +3696,8 @@ # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 - $as_echo_n "checking for C compiler default output file name... " >&6; } +-$as_echo_n "checking for C compiler default output file name... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 ++$as_echo_n "checking whether the C compiler works... " >&6; } ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` -@@ -3387,17 +3712,17 @@ + # The possible output files: +@@ -3387,17 +3713,17 @@ done rm -f $ac_rmfiles @@ -2764,7 +2885,7 @@ Index: pam.deb/configure # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. # So ignore a value of `no', otherwise this would lead to `EXEEXT = no' # in a Makefile. We should not override ac_cv_exeext if it was cached, -@@ -3414,7 +3739,7 @@ +@@ -3414,7 +3740,7 @@ # certainly right. break;; *.* ) @@ -2773,17 +2894,19 @@ Index: pam.deb/configure then :; else ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` fi -@@ -3433,84 +3758,75 @@ +@@ -3433,84 +3759,42 @@ else ac_file='' fi - -{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 - $as_echo "$ac_file" >&6; } +-$as_echo "$ac_file" >&6; } -if test -z "$ac_file"; then +- $as_echo "$as_me: failed program was:" >&5 +if test -z "$ac_file"; then : - $as_echo "$as_me: failed program was:" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++$as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 @@ -2797,70 +2920,64 @@ Index: pam.deb/configure +{ as_fn_set_status 77 +as_fn_error "C compiler cannot create executables +See \`config.log' for more details." "$LINENO" 5; }; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } fi - ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 ++$as_echo_n "checking for C compiler default output file name... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 ++$as_echo "$ac_file" >&6; } ac_exeext=$ac_cv_exeext - # Check that the compiler produces executables we can run. If not, either - # the compiler is broken, or we cross compile. +-# Check that the compiler produces executables we can run. If not, either +-# the compiler is broken, or we cross compile. -{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 - $as_echo_n "checking whether the C compiler works... " >&6; } +-$as_echo_n "checking whether the C compiler works... " >&6; } -# FIXME: These cross compiler hacks should be removed for Autoconf 3.0 - # If not cross compiling, check that we can run a simple program. - if test "$cross_compiling" != yes; then - if { ac_try='./$ac_file' +-# If not cross compiling, check that we can run a simple program. +-if test "$cross_compiling" != yes; then +- if { ac_try='./$ac_file' - { (case "(($ac_try" in -+ { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? +- (eval "$ac_try") 2>&5 +- ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; }; then - cross_compiling=no - else - if test "$cross_compiling" = maybe; then - cross_compiling=yes - else +- cross_compiling=no +- else +- if test "$cross_compiling" = maybe; then +- cross_compiling=yes +- else - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 - $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs. -+as_fn_error "cannot run C compiled programs. - If you meant to cross compile, use \`--host'. +-If you meant to cross compile, use \`--host'. -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: cannot run C compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } -+See \`config.log' for more details." "$LINENO" 5; } - fi - fi - fi +- fi +- fi +-fi -{ $as_echo "$as_me:$LINENO: result: yes" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 - $as_echo "yes" >&6; } - --rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out -+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out +-$as_echo "yes" >&6; } +- + rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out ac_clean_files=$ac_clean_files_save - # Check that the compiler produces executables we can run. If not, either - # the compiler is broken, or we cross compile. +-# Check that the compiler produces executables we can run. If not, either +-# the compiler is broken, or we cross compile. -{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 - $as_echo_n "checking whether we are cross compiling... " >&6; } +-$as_echo_n "checking whether we are cross compiling... " >&6; } -{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 - $as_echo "$cross_compiling" >&6; } - +-$as_echo "$cross_compiling" >&6; } +- -{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 $as_echo_n "checking for suffix of executables... " >&6; } @@ -2883,7 +3000,7 @@ Index: pam.deb/configure # If both `conftest.exe' and `conftest' are `present' (well, observable) # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will # work properly (i.e., refer to `conftest.exe'), while it won't with -@@ -3525,32 +3841,24 @@ +@@ -3525,32 +3809,83 @@ esac done else @@ -2899,8 +3016,9 @@ Index: pam.deb/configure +See \`config.log' for more details." "$LINENO" 5; } fi - - rm -f conftest$ac_cv_exeext +-rm -f conftest$ac_cv_exeext -{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 ++rm -f conftest conftest$ac_cv_exeext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 $as_echo "$ac_cv_exeext" >&6; } @@ -2908,6 +3026,65 @@ Index: pam.deb/configure EXEEXT=$ac_cv_exeext ac_exeext=$EXEEXT -{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5 ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include ++int ++main () ++{ ++FILE *f = fopen ("conftest.out", "w"); ++ return ferror (f) || fclose (f) != 0; ++ ++ ; ++ return 0; ++} ++_ACEOF ++ac_clean_files="$ac_clean_files conftest.out" ++# Check that the compiler produces executables we can run. If not, either ++# the compiler is broken, or we cross compile. ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 ++$as_echo_n "checking whether we are cross compiling... " >&6; } ++if test "$cross_compiling" != yes; then ++ { { ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_link") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } ++ if { ac_try='./conftest$ac_cv_exeext' ++ { { case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; }; then ++ cross_compiling=no ++ else ++ if test "$cross_compiling" = maybe; then ++ cross_compiling=yes ++ else ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++as_fn_error "cannot run C compiled programs. ++If you meant to cross compile, use \`--host'. ++See \`config.log' for more details." "$LINENO" 5; } ++ fi ++ fi ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 ++$as_echo "$cross_compiling" >&6; } ++ ++rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out ++ac_clean_files=$ac_clean_files_save +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 $as_echo_n "checking for suffix of object files... " >&6; } -if test "${ac_cv_objext+set}" = set; then @@ -2923,7 +3100,7 @@ Index: pam.deb/configure /* end confdefs.h. */ int -@@ -3562,17 +3870,17 @@ +@@ -3562,17 +3897,17 @@ } _ACEOF rm -f conftest.o conftest.obj @@ -2946,7 +3123,7 @@ Index: pam.deb/configure for ac_file in conftest.o conftest.obj conftest.*; do test -f "$ac_file" || continue; case $ac_file in -@@ -3585,31 +3893,23 @@ +@@ -3585,31 +3920,23 @@ $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -2985,7 +3162,7 @@ Index: pam.deb/configure /* end confdefs.h. */ int -@@ -3623,37 +3923,16 @@ +@@ -3623,37 +3950,16 @@ return 0; } _ACEOF @@ -3026,7 +3203,7 @@ Index: pam.deb/configure $as_echo "$ac_cv_c_compiler_gnu" >&6; } if test $ac_compiler_gnu = yes; then GCC=yes -@@ -3662,20 +3941,16 @@ +@@ -3662,20 +3968,16 @@ fi ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS @@ -3050,7 +3227,7 @@ Index: pam.deb/configure /* end confdefs.h. */ int -@@ -3686,35 +3961,11 @@ +@@ -3686,35 +3988,11 @@ return 0; } _ACEOF @@ -3089,7 +3266,7 @@ Index: pam.deb/configure /* end confdefs.h. */ int -@@ -3725,36 +3976,12 @@ +@@ -3725,36 +4003,12 @@ return 0; } _ACEOF @@ -3130,7 +3307,7 @@ Index: pam.deb/configure /* end confdefs.h. */ int -@@ -3765,42 +3992,17 @@ +@@ -3765,42 +4019,17 @@ return 0; } _ACEOF @@ -3175,7 +3352,7 @@ Index: pam.deb/configure $as_echo "$ac_cv_prog_cc_g" >&6; } if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS -@@ -3817,18 +4019,14 @@ +@@ -3817,18 +4046,14 @@ CFLAGS= fi fi @@ -3197,7 +3374,7 @@ Index: pam.deb/configure /* end confdefs.h. */ #include #include -@@ -3885,32 +4083,9 @@ +@@ -3885,32 +4110,9 @@ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do CC="$ac_save_CC $ac_arg" @@ -3231,7 +3408,7 @@ Index: pam.deb/configure rm -f core conftest.err conftest.$ac_objext test "x$ac_cv_prog_cc_c89" != "xno" && break done -@@ -3921,17 +4096,19 @@ +@@ -3921,17 +4123,19 @@ # AC_CACHE_VAL case "x$ac_cv_prog_cc_c89" in x) @@ -3254,7 +3431,7 @@ Index: pam.deb/configure ac_ext=c ac_cpp='$CPP $CPPFLAGS' -@@ -3941,9 +4118,9 @@ +@@ -3941,9 +4145,9 @@ depcc="$CC" am_compiler_list= @@ -3266,7 +3443,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then -@@ -4051,7 +4228,7 @@ +@@ -4051,7 +4255,7 @@ fi fi @@ -3275,7 +3452,7 @@ Index: pam.deb/configure $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type -@@ -4072,14 +4249,14 @@ +@@ -4072,14 +4276,14 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu @@ -3292,7 +3469,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else # Double quotes because CPP needs to be expanded -@@ -4094,11 +4271,7 @@ +@@ -4094,11 +4298,7 @@ # exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. @@ -3305,7 +3482,7 @@ Index: pam.deb/configure /* end confdefs.h. */ #ifdef __STDC__ # include -@@ -4107,78 +4280,34 @@ +@@ -4107,78 +4307,34 @@ #endif Syntax error _ACEOF @@ -3389,7 +3566,7 @@ Index: pam.deb/configure break fi -@@ -4190,7 +4319,7 @@ +@@ -4190,7 +4346,7 @@ else ac_cv_prog_CPP=$CPP fi @@ -3398,7 +3575,7 @@ Index: pam.deb/configure $as_echo "$CPP" >&6; } ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes -@@ -4201,11 +4330,7 @@ +@@ -4201,11 +4357,7 @@ # exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. @@ -3411,7 +3588,7 @@ Index: pam.deb/configure /* end confdefs.h. */ #ifdef __STDC__ # include -@@ -4214,87 +4339,40 @@ +@@ -4214,87 +4366,40 @@ #endif Syntax error _ACEOF @@ -3508,7 +3685,7 @@ Index: pam.deb/configure fi ac_ext=c -@@ -4304,9 +4382,9 @@ +@@ -4304,9 +4409,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu @@ -3520,7 +3697,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else if test -z "$GREP"; then -@@ -4317,7 +4395,7 @@ +@@ -4317,7 +4422,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -3529,7 +3706,7 @@ Index: pam.deb/configure for ac_exec_ext in '' $ac_executable_extensions; do ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue -@@ -4337,7 +4415,7 @@ +@@ -4337,7 +4442,7 @@ $as_echo 'GREP' >> "conftest.nl" "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break @@ -3538,7 +3715,7 @@ Index: pam.deb/configure if test $ac_count -gt ${ac_path_GREP_max-0}; then # Best one so far, save it but keep looking for a better one ac_cv_path_GREP="$ac_path_GREP" -@@ -4352,26 +4430,24 @@ +@@ -4352,26 +4457,24 @@ $ac_path_GREP_found && break 3 done done @@ -3570,7 +3747,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 -@@ -4385,7 +4461,7 @@ +@@ -4385,7 +4488,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -3579,7 +3756,7 @@ Index: pam.deb/configure for ac_exec_ext in '' $ac_executable_extensions; do ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue -@@ -4405,7 +4481,7 @@ +@@ -4405,7 +4508,7 @@ $as_echo 'EGREP' >> "conftest.nl" "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break @@ -3588,7 +3765,7 @@ Index: pam.deb/configure if test $ac_count -gt ${ac_path_EGREP_max-0}; then # Best one so far, save it but keep looking for a better one ac_cv_path_EGREP="$ac_path_EGREP" -@@ -4420,12 +4496,10 @@ +@@ -4420,12 +4523,10 @@ $ac_path_EGREP_found && break 3 done done @@ -3603,7 +3780,7 @@ Index: pam.deb/configure fi else ac_cv_path_EGREP=$EGREP -@@ -4433,21 +4507,17 @@ +@@ -4433,21 +4534,17 @@ fi fi @@ -3629,7 +3806,7 @@ Index: pam.deb/configure /* end confdefs.h. */ #include #include -@@ -4462,48 +4532,23 @@ +@@ -4462,48 +4559,23 @@ return 0; } _ACEOF @@ -3683,7 +3860,7 @@ Index: pam.deb/configure else ac_cv_header_stdc=no fi -@@ -4513,18 +4558,14 @@ +@@ -4513,18 +4585,14 @@ if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. @@ -3705,7 +3882,7 @@ Index: pam.deb/configure else ac_cv_header_stdc=no fi -@@ -4534,14 +4575,10 @@ +@@ -4534,14 +4602,10 @@ if test $ac_cv_header_stdc = yes; then # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. @@ -3722,7 +3899,7 @@ Index: pam.deb/configure /* end confdefs.h. */ #include #include -@@ -4568,292 +4605,71 @@ +@@ -4568,118 +4632,34 @@ return 0; } _ACEOF @@ -3782,57 +3959,24 @@ Index: pam.deb/configure fi # On IRIX 5.3, sys/types and inttypes.h are conflicting. -+for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ -+ inttypes.h stdint.h unistd.h -+do : -+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default -+" -+eval as_val=\$$as_ac_Header -+ if test "x$as_val" = x""yes; then : -+ cat >>confdefs.h <<_ACEOF -+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+_ACEOF -+ -+fi -+ -+done -+ -+ -+ -+ ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default" -+if test "x$ac_cv_header_minix_config_h" = x""yes; then : -+ MINIX=yes -+else -+ MINIX= -+fi - - -+ if test "$MINIX" = yes; then - -+$as_echo "#define _POSIX_SOURCE 1" >>confdefs.h - - -+$as_echo "#define _POSIX_1_SOURCE 2" >>confdefs.h - - -+$as_echo "#define _MINIX 1" >>confdefs.h - -+ fi - --for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ -- inttypes.h stdint.h unistd.h +- +- +- +- +- +- +- +- +- + for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ + inttypes.h stdint.h unistd.h -do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5 -+$as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; } -+if test "${ac_cv_safe_to_define___extensions__+set}" = set; then : - $as_echo_n "(cached) " >&6 - else +- $as_echo_n "(cached) " >&6 +-else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF @@ -3878,16 +4022,19 @@ Index: pam.deb/configure -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then -- cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 --_ACEOF -- --fi -- --done -- -- -- ++do : ++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ++ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default ++" ++eval as_val=\$$as_ac_Header ++ if test "x$as_val" = x""yes; then : + cat >>confdefs.h <<_ACEOF + #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 + _ACEOF +@@ -4690,134 +4670,8 @@ + + + - if test "${ac_cv_header_minix_config_h+set}" = set; then - { $as_echo "$as_me:$LINENO: checking for minix/config.h" >&5 -$as_echo_n "checking for minix/config.h... " >&6; } @@ -4016,37 +4163,43 @@ Index: pam.deb/configure - -fi -if test "x$ac_cv_header_minix_config_h" = x""yes; then -- MINIX=yes --else -- MINIX= --fi -- -- -- if test "$MINIX" = yes; then -- ++ ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default" ++if test "x$ac_cv_header_minix_config_h" = x""yes; then : + MINIX=yes + else + MINIX= +@@ -4826,34 +4680,23 @@ + + if test "$MINIX" = yes; then + -cat >>confdefs.h <<\_ACEOF -#define _POSIX_SOURCE 1 -_ACEOF -- -- ++$as_echo "#define _POSIX_SOURCE 1" >>confdefs.h + + -cat >>confdefs.h <<\_ACEOF -#define _POSIX_1_SOURCE 2 -_ACEOF -- -- ++$as_echo "#define _POSIX_1_SOURCE 2" >>confdefs.h + + -cat >>confdefs.h <<\_ACEOF -#define _MINIX 1 -_ACEOF -- -- fi -- -- ++$as_echo "#define _MINIX 1" >>confdefs.h + + fi + + - - { $as_echo "$as_me:$LINENO: checking whether it is safe to define __EXTENSIONS__" >&5 --$as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5 + $as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; } -if test "${ac_cv_safe_to_define___extensions__+set}" = set; then -- $as_echo_n "(cached) " >&6 --else ++if test "${ac_cv_safe_to_define___extensions__+set}" = set; then : + $as_echo_n "(cached) " >&6 + else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF @@ -4056,7 +4209,7 @@ Index: pam.deb/configure /* end confdefs.h. */ # define __EXTENSIONS__ 1 -@@ -4866,56 +4682,25 @@ +@@ -4866,56 +4709,25 @@ return 0; } _ACEOF @@ -4121,7 +4274,7 @@ Index: pam.deb/configure ac_ext=c -@@ -4926,9 +4711,9 @@ +@@ -4926,9 +4738,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 @@ -4133,7 +4286,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else if test -n "$CC"; then -@@ -4939,24 +4724,24 @@ +@@ -4939,24 +4751,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -4163,7 +4316,7 @@ Index: pam.deb/configure $as_echo "no" >&6; } fi -@@ -4966,9 +4751,9 @@ +@@ -4966,9 +4778,9 @@ ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 @@ -4175,7 +4328,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then -@@ -4979,24 +4764,24 @@ +@@ -4979,24 +4791,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -4205,7 +4358,7 @@ Index: pam.deb/configure $as_echo "no" >&6; } fi -@@ -5005,7 +4790,7 @@ +@@ -5005,7 +4817,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -4214,7 +4367,7 @@ Index: pam.deb/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -5019,9 +4804,9 @@ +@@ -5019,9 +4831,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 @@ -4226,7 +4379,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else if test -n "$CC"; then -@@ -5032,24 +4817,24 @@ +@@ -5032,24 +4844,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -4256,7 +4409,7 @@ Index: pam.deb/configure $as_echo "no" >&6; } fi -@@ -5059,9 +4844,9 @@ +@@ -5059,9 +4871,9 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 @@ -4268,7 +4421,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else if test -n "$CC"; then -@@ -5073,18 +4858,18 @@ +@@ -5073,18 +4885,18 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -4290,7 +4443,7 @@ Index: pam.deb/configure IFS=$as_save_IFS if test $ac_prog_rejected = yes; then -@@ -5103,10 +4888,10 @@ +@@ -5103,10 +4915,10 @@ fi CC=$ac_cv_prog_CC if test -n "$CC"; then @@ -4303,7 +4456,7 @@ Index: pam.deb/configure $as_echo "no" >&6; } fi -@@ -5118,9 +4903,9 @@ +@@ -5118,9 +4930,9 @@ do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 @@ -4315,7 +4468,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else if test -n "$CC"; then -@@ -5131,24 +4916,24 @@ +@@ -5131,24 +4943,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -4345,7 +4498,7 @@ Index: pam.deb/configure $as_echo "no" >&6; } fi -@@ -5162,9 +4947,9 @@ +@@ -5162,9 +4974,9 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -4357,7 +4510,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then -@@ -5175,24 +4960,24 @@ +@@ -5175,24 +4987,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -4387,7 +4540,7 @@ Index: pam.deb/configure $as_echo "no" >&6; } fi -@@ -5205,7 +4990,7 @@ +@@ -5205,7 +5017,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -4396,7 +4549,7 @@ Index: pam.deb/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -5216,62 +5001,42 @@ +@@ -5216,62 +5028,42 @@ fi @@ -4459,8 +4612,8 @@ Index: pam.deb/configure +... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 -+ rm -f conftest.er1 conftest.err + fi ++ rm -f conftest.er1 conftest.err + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +done @@ -4481,7 +4634,7 @@ Index: pam.deb/configure /* end confdefs.h. */ int -@@ -5285,37 +5050,16 @@ +@@ -5285,37 +5077,16 @@ return 0; } _ACEOF @@ -4522,7 +4675,7 @@ Index: pam.deb/configure $as_echo "$ac_cv_c_compiler_gnu" >&6; } if test $ac_compiler_gnu = yes; then GCC=yes -@@ -5324,20 +5068,16 @@ +@@ -5324,20 +5095,16 @@ fi ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS @@ -4546,7 +4699,7 @@ Index: pam.deb/configure /* end confdefs.h. */ int -@@ -5348,35 +5088,11 @@ +@@ -5348,35 +5115,11 @@ return 0; } _ACEOF @@ -4585,7 +4738,7 @@ Index: pam.deb/configure /* end confdefs.h. */ int -@@ -5387,36 +5103,12 @@ +@@ -5387,36 +5130,12 @@ return 0; } _ACEOF @@ -4626,7 +4779,7 @@ Index: pam.deb/configure /* end confdefs.h. */ int -@@ -5427,42 +5119,17 @@ +@@ -5427,42 +5146,17 @@ return 0; } _ACEOF @@ -4671,7 +4824,7 @@ Index: pam.deb/configure $as_echo "$ac_cv_prog_cc_g" >&6; } if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS -@@ -5479,18 +5146,14 @@ +@@ -5479,18 +5173,14 @@ CFLAGS= fi fi @@ -4693,7 +4846,7 @@ Index: pam.deb/configure /* end confdefs.h. */ #include #include -@@ -5547,32 +5210,9 @@ +@@ -5547,32 +5237,9 @@ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do CC="$ac_save_CC $ac_arg" @@ -4727,7 +4880,7 @@ Index: pam.deb/configure rm -f core conftest.err conftest.$ac_objext test "x$ac_cv_prog_cc_c89" != "xno" && break done -@@ -5583,17 +5223,19 @@ +@@ -5583,17 +5250,19 @@ # AC_CACHE_VAL case "x$ac_cv_prog_cc_c89" in x) @@ -4750,7 +4903,7 @@ Index: pam.deb/configure ac_ext=c ac_cpp='$CPP $CPPFLAGS' -@@ -5603,9 +5245,9 @@ +@@ -5603,9 +5272,9 @@ depcc="$CC" am_compiler_list= @@ -4762,7 +4915,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then -@@ -5713,7 +5355,7 @@ +@@ -5713,7 +5382,7 @@ fi fi @@ -4771,7 +4924,7 @@ Index: pam.deb/configure $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type -@@ -5732,9 +5374,9 @@ +@@ -5732,9 +5401,9 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -4783,7 +4936,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else if test -n "$YACC"; then -@@ -5745,24 +5387,24 @@ +@@ -5745,24 +5414,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -4813,7 +4966,7 @@ Index: pam.deb/configure $as_echo "no" >&6; } fi -@@ -5775,9 +5417,9 @@ +@@ -5775,9 +5444,9 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -4825,7 +4978,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else if test -n "$LEX"; then -@@ -5788,24 +5430,24 @@ +@@ -5788,24 +5457,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -4855,7 +5008,7 @@ Index: pam.deb/configure $as_echo "no" >&6; } fi -@@ -5834,20 +5476,20 @@ +@@ -5834,20 +5503,20 @@ return ! yylex () + ! yywrap (); } _ACEOF @@ -4883,7 +5036,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else -@@ -5856,19 +5498,17 @@ +@@ -5856,19 +5525,17 @@ elif test -f lexyy.c; then ac_cv_prog_lex_root=lexyy else @@ -4907,7 +5060,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else -@@ -5876,55 +5516,29 @@ +@@ -5876,55 +5543,29 @@ ac_cv_lib_lex='none needed' for ac_lib in '' -lfl -ll; do LIBS="$ac_lib $ac_save_LIBS" @@ -4971,7 +5124,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else # POSIX says lex can declare yytext either as a pointer or an array; the -@@ -5933,52 +5547,24 @@ +@@ -5933,52 +5574,24 @@ ac_cv_prog_lex_yytext_pointer=no ac_save_LIBS=$LIBS LIBS="$LEXLIB $ac_save_LIBS" @@ -5031,7 +5184,7 @@ Index: pam.deb/configure fi rm -f conftest.l $LEX_OUTPUT_ROOT.c -@@ -5987,115 +5573,23 @@ +@@ -5987,115 +5600,23 @@ if test "$LEX" = :; then LEX=${am_missing_run}flex fi @@ -5152,7 +5305,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else cat >conftest.make <<\_ACEOF -@@ -6113,18 +5607,18 @@ +@@ -6113,25 +5634,25 @@ rm -f conftest.make fi if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then @@ -5174,7 +5327,16 @@ Index: pam.deb/configure $as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;; esac -@@ -6147,9 +5641,9 @@ + + +-macro_version='2.2.6' +-macro_revision='1.3012' ++macro_version='2.2.6b' ++macro_revision='1.3017' + + + +@@ -6147,9 +5668,9 @@ ltmain="$ac_aux_dir/ltmain.sh" @@ -5186,7 +5348,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ -@@ -6157,7 +5651,7 @@ +@@ -6157,7 +5678,7 @@ ac_script="$ac_script$as_nl$ac_script" done echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed @@ -5195,7 +5357,7 @@ Index: pam.deb/configure if test -z "$SED"; then ac_path_SED_found=false # Loop through the user's path and test for each of PROGNAME-LIST -@@ -6166,7 +5660,7 @@ +@@ -6166,7 +5687,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -5204,7 +5366,7 @@ Index: pam.deb/configure for ac_exec_ext in '' $ac_executable_extensions; do ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue -@@ -6186,7 +5680,7 @@ +@@ -6186,7 +5707,7 @@ $as_echo '' >> "conftest.nl" "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break @@ -5213,7 +5375,7 @@ Index: pam.deb/configure if test $ac_count -gt ${ac_path_SED_max-0}; then # Best one so far, save it but keep looking for a better one ac_cv_path_SED="$ac_path_SED" -@@ -6201,19 +5695,17 @@ +@@ -6201,19 +5722,17 @@ $ac_path_SED_found && break 3 done done @@ -5236,7 +5398,7 @@ Index: pam.deb/configure $as_echo "$ac_cv_path_SED" >&6; } SED="$ac_cv_path_SED" rm -f conftest.sed -@@ -6231,9 +5723,9 @@ +@@ -6231,9 +5750,9 @@ @@ -5248,7 +5410,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 -@@ -6247,7 +5739,7 @@ +@@ -6247,7 +5766,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -5257,7 +5419,7 @@ Index: pam.deb/configure for ac_exec_ext in '' $ac_executable_extensions; do ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue -@@ -6267,7 +5759,7 @@ +@@ -6267,7 +5786,7 @@ $as_echo 'FGREP' >> "conftest.nl" "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break @@ -5266,7 +5428,7 @@ Index: pam.deb/configure if test $ac_count -gt ${ac_path_FGREP_max-0}; then # Best one so far, save it but keep looking for a better one ac_cv_path_FGREP="$ac_path_FGREP" -@@ -6282,12 +5774,10 @@ +@@ -6282,12 +5801,10 @@ $ac_path_FGREP_found && break 3 done done @@ -5281,7 +5443,7 @@ Index: pam.deb/configure fi else ac_cv_path_FGREP=$FGREP -@@ -6295,7 +5785,7 @@ +@@ -6295,7 +5812,7 @@ fi fi @@ -5290,7 +5452,7 @@ Index: pam.deb/configure $as_echo "$ac_cv_path_FGREP" >&6; } FGREP="$ac_cv_path_FGREP" -@@ -6321,7 +5811,7 @@ +@@ -6321,7 +5838,7 @@ # Check whether --with-gnu-ld was given. @@ -5299,7 +5461,7 @@ Index: pam.deb/configure withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes else with_gnu_ld=no -@@ -6330,7 +5820,7 @@ +@@ -6330,7 +5847,7 @@ ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. @@ -5308,7 +5470,7 @@ Index: pam.deb/configure $as_echo_n "checking for ld used by $CC... " >&6; } case $host in *-*-mingw*) -@@ -6360,13 +5850,13 @@ +@@ -6360,13 +5877,13 @@ ;; esac elif test "$with_gnu_ld" = yes; then @@ -5325,7 +5487,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else if test -z "$LD"; then -@@ -6397,18 +5887,16 @@ +@@ -6397,18 +5914,16 @@ LD="$lt_cv_path_LD" if test -n "$LD"; then @@ -5349,7 +5511,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else # I'd rather use --version here, but apparently some GNU lds only accept -v. -@@ -6421,7 +5909,7 @@ +@@ -6421,7 +5936,7 @@ ;; esac fi @@ -5358,7 +5520,7 @@ Index: pam.deb/configure $as_echo "$lt_cv_prog_gnu_ld" >&6; } with_gnu_ld=$lt_cv_prog_gnu_ld -@@ -6433,9 +5921,9 @@ +@@ -6433,9 +5948,9 @@ @@ -5370,7 +5532,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else if test -n "$NM"; then -@@ -6482,7 +5970,7 @@ +@@ -6482,7 +5997,7 @@ : ${lt_cv_path_NM=no} fi fi @@ -5379,7 +5541,7 @@ Index: pam.deb/configure $as_echo "$lt_cv_path_NM" >&6; } if test "$lt_cv_path_NM" != "no"; then NM="$lt_cv_path_NM" -@@ -6493,9 +5981,9 @@ +@@ -6493,9 +6008,9 @@ do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 @@ -5391,7 +5553,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else if test -n "$DUMPBIN"; then -@@ -6506,24 +5994,24 @@ +@@ -6506,24 +6021,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -5421,7 +5583,7 @@ Index: pam.deb/configure $as_echo "no" >&6; } fi -@@ -6537,9 +6025,9 @@ +@@ -6537,9 +6052,9 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -5433,7 +5595,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_DUMPBIN"; then -@@ -6550,24 +6038,24 @@ +@@ -6550,24 +6065,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -5463,7 +5625,7 @@ Index: pam.deb/configure $as_echo "no" >&6; } fi -@@ -6580,7 +6068,7 @@ +@@ -6580,7 +6095,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -5472,7 +5634,7 @@ Index: pam.deb/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -6600,33 +6088,33 @@ +@@ -6600,33 +6115,33 @@ @@ -5486,15 +5648,15 @@ Index: pam.deb/configure lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:6610: $ac_compile\"" >&5) -+ (eval echo "\"\$as_me:6098: $ac_compile\"" >&5) ++ (eval echo "\"\$as_me:6125: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:6613: $NM \\\"conftest.$ac_objext\\\"\"" >&5) -+ (eval echo "\"\$as_me:6101: $NM \\\"conftest.$ac_objext\\\"\"" >&5) ++ (eval echo "\"\$as_me:6128: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:6616: output\"" >&5) -+ (eval echo "\"\$as_me:6104: output\"" >&5) ++ (eval echo "\"\$as_me:6131: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -5514,7 +5676,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else i=0 -@@ -6744,10 +6232,10 @@ +@@ -6744,10 +6259,10 @@ fi if test -n $lt_cv_sys_max_cmd_len ; then @@ -5527,7 +5689,7 @@ Index: pam.deb/configure $as_echo "none" >&6; } fi max_cmd_len=$lt_cv_sys_max_cmd_len -@@ -6761,7 +6249,7 @@ +@@ -6761,7 +6276,7 @@ : ${MV="mv -f"} : ${RM="rm -f"} @@ -5536,7 +5698,7 @@ Index: pam.deb/configure $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; } # Try some XSI features xsi_shell=no -@@ -6771,17 +6259,17 @@ +@@ -6771,17 +6286,17 @@ && eval 'test $(( 1 + 1 )) -eq 2 \ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ && xsi_shell=yes @@ -5557,7 +5719,7 @@ Index: pam.deb/configure $as_echo "$lt_shell_append" >&6; } -@@ -6816,14 +6304,14 @@ +@@ -6816,14 +6331,14 @@ @@ -5575,7 +5737,7 @@ Index: pam.deb/configure $as_echo "$lt_cv_ld_reload_flag" >&6; } reload_flag=$lt_cv_ld_reload_flag case $reload_flag in -@@ -6852,9 +6340,9 @@ +@@ -6852,9 +6367,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. set dummy ${ac_tool_prefix}objdump; ac_word=$2 @@ -5587,7 +5749,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else if test -n "$OBJDUMP"; then -@@ -6865,24 +6353,24 @@ +@@ -6865,24 +6380,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -5617,7 +5779,7 @@ Index: pam.deb/configure $as_echo "no" >&6; } fi -@@ -6892,9 +6380,9 @@ +@@ -6892,9 +6407,9 @@ ac_ct_OBJDUMP=$OBJDUMP # Extract the first word of "objdump", so it can be a program name with args. set dummy objdump; ac_word=$2 @@ -5629,7 +5791,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_OBJDUMP"; then -@@ -6905,24 +6393,24 @@ +@@ -6905,24 +6420,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -5659,7 +5821,7 @@ Index: pam.deb/configure $as_echo "no" >&6; } fi -@@ -6931,7 +6419,7 @@ +@@ -6931,7 +6446,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -5668,7 +5830,7 @@ Index: pam.deb/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -6951,9 +6439,9 @@ +@@ -6951,9 +6466,9 @@ @@ -5680,7 +5842,12 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else lt_cv_file_magic_cmd='$MAGIC_CMD' -@@ -7072,7 +6560,7 @@ +@@ -7068,11 +6583,11 @@ + ;; + + # This must be Linux ELF. +-linux* | k*bsd*-gnu) ++linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; @@ -5689,7 +5856,7 @@ Index: pam.deb/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 -@@ -7147,7 +6635,7 @@ +@@ -7147,7 +6662,7 @@ esac fi @@ -5698,7 +5865,7 @@ Index: pam.deb/configure $as_echo "$lt_cv_deplibs_check_method" >&6; } file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method -@@ -7167,9 +6655,9 @@ +@@ -7167,9 +6682,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 @@ -5710,7 +5877,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else if test -n "$AR"; then -@@ -7180,24 +6668,24 @@ +@@ -7180,24 +6695,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -5740,7 +5907,7 @@ Index: pam.deb/configure $as_echo "no" >&6; } fi -@@ -7207,9 +6695,9 @@ +@@ -7207,9 +6722,9 @@ ac_ct_AR=$AR # Extract the first word of "ar", so it can be a program name with args. set dummy ar; ac_word=$2 @@ -5752,7 +5919,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_AR"; then -@@ -7220,24 +6708,24 @@ +@@ -7220,24 +6735,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -5782,7 +5949,7 @@ Index: pam.deb/configure $as_echo "no" >&6; } fi -@@ -7246,7 +6734,7 @@ +@@ -7246,7 +6761,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -5791,7 +5958,7 @@ Index: pam.deb/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -7272,9 +6760,9 @@ +@@ -7272,9 +6787,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 @@ -5803,7 +5970,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else if test -n "$STRIP"; then -@@ -7285,24 +6773,24 @@ +@@ -7285,24 +6800,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -5833,7 +6000,7 @@ Index: pam.deb/configure $as_echo "no" >&6; } fi -@@ -7312,9 +6800,9 @@ +@@ -7312,9 +6827,9 @@ ac_ct_STRIP=$STRIP # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 @@ -5845,7 +6012,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_STRIP"; then -@@ -7325,24 +6813,24 @@ +@@ -7325,24 +6840,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -5875,7 +6042,7 @@ Index: pam.deb/configure $as_echo "no" >&6; } fi -@@ -7351,7 +6839,7 @@ +@@ -7351,7 +6866,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -5884,7 +6051,7 @@ Index: pam.deb/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -7371,9 +6859,9 @@ +@@ -7371,9 +6886,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 @@ -5896,7 +6063,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else if test -n "$RANLIB"; then -@@ -7384,24 +6872,24 @@ +@@ -7384,24 +6899,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -5926,7 +6093,7 @@ Index: pam.deb/configure $as_echo "no" >&6; } fi -@@ -7411,9 +6899,9 @@ +@@ -7411,9 +6926,9 @@ ac_ct_RANLIB=$RANLIB # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 @@ -5938,7 +6105,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_RANLIB"; then -@@ -7424,24 +6912,24 @@ +@@ -7424,24 +6939,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -5968,7 +6135,7 @@ Index: pam.deb/configure $as_echo "no" >&6; } fi -@@ -7450,7 +6938,7 @@ +@@ -7450,7 +6965,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -5977,7 +6144,7 @@ Index: pam.deb/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -7528,9 +7016,9 @@ +@@ -7528,9 +7043,9 @@ # Check for command to grab the raw symbol name followed by C symbol from nm. @@ -5989,7 +6156,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else -@@ -7646,18 +7134,18 @@ +@@ -7646,18 +7161,18 @@ int main(){nm_test_var='a';nm_test_func();return(0);} _LT_EOF @@ -6014,7 +6181,7 @@ Index: pam.deb/configure # Try sorting and uniquifying the output. if sort "$nlist" | uniq > "$nlist"T; then mv -f "$nlist"T "$nlist" -@@ -7710,11 +7198,11 @@ +@@ -7710,11 +7225,11 @@ lt_save_CFLAGS="$CFLAGS" LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" @@ -6029,7 +6196,7 @@ Index: pam.deb/configure pipe_works=yes fi LIBS="$lt_save_LIBS" -@@ -7748,10 +7236,10 @@ +@@ -7748,10 +7263,10 @@ lt_cv_sys_global_symbol_to_cdecl= fi if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then @@ -6042,7 +6209,7 @@ Index: pam.deb/configure $as_echo "ok" >&6; } fi -@@ -7777,7 +7265,7 @@ +@@ -7777,7 +7292,7 @@ # Check whether --enable-libtool-lock was given. @@ -6051,7 +6218,7 @@ Index: pam.deb/configure enableval=$enable_libtool_lock; fi -@@ -7789,11 +7277,11 @@ +@@ -7789,11 +7304,11 @@ ia64-*-hpux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -6066,13 +6233,13 @@ Index: pam.deb/configure case `/usr/bin/file conftest.$ac_objext` in *ELF-32*) HPUX_IA64_MODE="32" -@@ -7807,12 +7295,12 @@ +@@ -7807,12 +7322,12 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 7810 "configure"' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -+ echo '#line 7298 "configure"' > conftest.$ac_ext ++ echo '#line 7325 "configure"' > conftest.$ac_ext + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -6083,7 +6250,7 @@ Index: pam.deb/configure if test "$lt_cv_prog_gnu_ld" = yes; then case `/usr/bin/file conftest.$ac_objext` in *32-bit*) -@@ -7846,11 +7334,11 @@ +@@ -7846,11 +7361,11 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -6098,7 +6265,7 @@ Index: pam.deb/configure case `/usr/bin/file conftest.o` in *32-bit*) case $host in -@@ -7899,9 +7387,9 @@ +@@ -7899,9 +7414,9 @@ # On SCO OpenServer 5, we need -belf to get full-featured binaries. SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" @@ -6110,7 +6277,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else ac_ext=c -@@ -7910,11 +7398,7 @@ +@@ -7910,11 +7425,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu @@ -6123,7 +6290,7 @@ Index: pam.deb/configure /* end confdefs.h. */ int -@@ -7925,38 +7409,13 @@ +@@ -7925,38 +7436,13 @@ return 0; } _ACEOF @@ -6166,7 +6333,7 @@ Index: pam.deb/configure ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -7964,7 +7423,7 @@ +@@ -7964,7 +7450,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu fi @@ -6175,7 +6342,7 @@ Index: pam.deb/configure $as_echo "$lt_cv_cc_needs_belf" >&6; } if test x"$lt_cv_cc_needs_belf" != x"yes"; then # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf -@@ -7974,11 +7433,11 @@ +@@ -7974,11 +7460,11 @@ sparc*-*solaris*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -6190,7 +6357,7 @@ Index: pam.deb/configure case `/usr/bin/file conftest.o` in *64-bit*) case $lt_cv_prog_gnu_ld in -@@ -8004,9 +7463,9 @@ +@@ -8004,9 +7490,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 @@ -6202,7 +6369,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else if test -n "$DSYMUTIL"; then -@@ -8017,24 +7476,24 @@ +@@ -8017,24 +7503,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -6232,7 +6399,7 @@ Index: pam.deb/configure $as_echo "no" >&6; } fi -@@ -8044,9 +7503,9 @@ +@@ -8044,9 +7530,9 @@ ac_ct_DSYMUTIL=$DSYMUTIL # Extract the first word of "dsymutil", so it can be a program name with args. set dummy dsymutil; ac_word=$2 @@ -6244,7 +6411,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_DSYMUTIL"; then -@@ -8057,24 +7516,24 @@ +@@ -8057,24 +7543,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -6274,7 +6441,7 @@ Index: pam.deb/configure $as_echo "no" >&6; } fi -@@ -8083,7 +7542,7 @@ +@@ -8083,7 +7569,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -6283,7 +6450,7 @@ Index: pam.deb/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -8096,9 +7555,9 @@ +@@ -8096,9 +7582,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. set dummy ${ac_tool_prefix}nmedit; ac_word=$2 @@ -6295,7 +6462,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else if test -n "$NMEDIT"; then -@@ -8109,24 +7568,24 @@ +@@ -8109,24 +7595,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -6325,7 +6492,7 @@ Index: pam.deb/configure $as_echo "no" >&6; } fi -@@ -8136,9 +7595,9 @@ +@@ -8136,9 +7622,9 @@ ac_ct_NMEDIT=$NMEDIT # Extract the first word of "nmedit", so it can be a program name with args. set dummy nmedit; ac_word=$2 @@ -6337,7 +6504,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_NMEDIT"; then -@@ -8149,24 +7608,24 @@ +@@ -8149,24 +7635,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -6367,7 +6534,7 @@ Index: pam.deb/configure $as_echo "no" >&6; } fi -@@ -8175,7 +7634,7 @@ +@@ -8175,7 +7661,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -6376,7 +6543,7 @@ Index: pam.deb/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -8188,9 +7647,9 @@ +@@ -8188,9 +7674,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args. set dummy ${ac_tool_prefix}lipo; ac_word=$2 @@ -6388,7 +6555,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else if test -n "$LIPO"; then -@@ -8201,24 +7660,24 @@ +@@ -8201,24 +7687,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -6418,7 +6585,7 @@ Index: pam.deb/configure $as_echo "no" >&6; } fi -@@ -8228,9 +7687,9 @@ +@@ -8228,9 +7714,9 @@ ac_ct_LIPO=$LIPO # Extract the first word of "lipo", so it can be a program name with args. set dummy lipo; ac_word=$2 @@ -6430,7 +6597,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_LIPO"; then -@@ -8241,24 +7700,24 @@ +@@ -8241,24 +7727,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -6460,7 +6627,7 @@ Index: pam.deb/configure $as_echo "no" >&6; } fi -@@ -8267,7 +7726,7 @@ +@@ -8267,7 +7753,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -6469,7 +6636,7 @@ Index: pam.deb/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -8280,9 +7739,9 @@ +@@ -8280,9 +7766,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args. set dummy ${ac_tool_prefix}otool; ac_word=$2 @@ -6481,7 +6648,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else if test -n "$OTOOL"; then -@@ -8293,24 +7752,24 @@ +@@ -8293,24 +7779,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -6511,7 +6678,7 @@ Index: pam.deb/configure $as_echo "no" >&6; } fi -@@ -8320,9 +7779,9 @@ +@@ -8320,9 +7806,9 @@ ac_ct_OTOOL=$OTOOL # Extract the first word of "otool", so it can be a program name with args. set dummy otool; ac_word=$2 @@ -6523,7 +6690,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_OTOOL"; then -@@ -8333,24 +7792,24 @@ +@@ -8333,24 +7819,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -6553,7 +6720,7 @@ Index: pam.deb/configure $as_echo "no" >&6; } fi -@@ -8359,7 +7818,7 @@ +@@ -8359,7 +7845,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -6562,7 +6729,7 @@ Index: pam.deb/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -8372,9 +7831,9 @@ +@@ -8372,9 +7858,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args. set dummy ${ac_tool_prefix}otool64; ac_word=$2 @@ -6574,7 +6741,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else if test -n "$OTOOL64"; then -@@ -8385,24 +7844,24 @@ +@@ -8385,24 +7871,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -6604,7 +6771,7 @@ Index: pam.deb/configure $as_echo "no" >&6; } fi -@@ -8412,9 +7871,9 @@ +@@ -8412,9 +7898,9 @@ ac_ct_OTOOL64=$OTOOL64 # Extract the first word of "otool64", so it can be a program name with args. set dummy otool64; ac_word=$2 @@ -6616,7 +6783,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_OTOOL64"; then -@@ -8425,24 +7884,24 @@ +@@ -8425,24 +7911,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -6646,7 +6813,7 @@ Index: pam.deb/configure $as_echo "no" >&6; } fi -@@ -8451,7 +7910,7 @@ +@@ -8451,7 +7937,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -6655,7 +6822,7 @@ Index: pam.deb/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -8487,9 +7946,9 @@ +@@ -8487,9 +7973,9 @@ @@ -6667,7 +6834,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else lt_cv_apple_cc_single_mod=no -@@ -8514,22 +7973,18 @@ +@@ -8514,22 +8000,18 @@ rm -f conftest.* fi fi @@ -6694,7 +6861,7 @@ Index: pam.deb/configure /* end confdefs.h. */ int -@@ -8540,42 +7995,17 @@ +@@ -8540,42 +8022,17 @@ return 0; } _ACEOF @@ -6742,7 +6909,7 @@ Index: pam.deb/configure $as_echo "$lt_cv_ld_exported_symbols_list" >&6; } case $host_os in rhapsody* | darwin1.[012]) -@@ -8612,62 +8042,13 @@ +@@ -8612,62 +8069,13 @@ ;; esac @@ -6800,17 +6967,18 @@ Index: pam.deb/configure -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then +- cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +do : + ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default +" +if test "x$ac_cv_header_dlfcn_h" = x""yes; then : - cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++ cat >>confdefs.h <<_ACEOF +#define HAVE_DLFCN_H 1 _ACEOF fi -@@ -8690,7 +8071,7 @@ +@@ -8690,7 +8098,7 @@ # Check whether --with-pic was given. @@ -6819,7 +6987,7 @@ Index: pam.deb/configure withval=$with_pic; pic_mode="$withval" else pic_mode=default -@@ -8706,7 +8087,7 @@ +@@ -8706,7 +8114,7 @@ # Check whether --enable-fast-install was given. @@ -6828,7 +6996,7 @@ Index: pam.deb/configure enableval=$enable_fast_install; p=${PACKAGE-default} case $enableval in yes) enable_fast_install=yes ;; -@@ -8787,9 +8168,9 @@ +@@ -8787,9 +8195,9 @@ setopt NO_GLOB_SUBST fi @@ -6840,7 +7008,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else rm -f .libs 2>/dev/null -@@ -8802,7 +8183,7 @@ +@@ -8802,7 +8210,7 @@ fi rmdir .libs 2>/dev/null fi @@ -6849,7 +7017,7 @@ Index: pam.deb/configure $as_echo "$lt_cv_objdir" >&6; } objdir=$lt_cv_objdir -@@ -8895,9 +8276,9 @@ +@@ -8895,9 +8303,9 @@ case $deplibs_check_method in file_magic*) if test "$file_magic_cmd" = '$MAGIC_CMD'; then @@ -6861,7 +7029,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else case $MAGIC_CMD in -@@ -8948,10 +8329,10 @@ +@@ -8948,10 +8356,10 @@ MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if test -n "$MAGIC_CMD"; then @@ -6874,7 +7042,7 @@ Index: pam.deb/configure $as_echo "no" >&6; } fi -@@ -8961,9 +8342,9 @@ +@@ -8961,9 +8369,9 @@ if test -z "$lt_cv_path_MAGIC_CMD"; then if test -n "$ac_tool_prefix"; then @@ -6886,7 +7054,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else case $MAGIC_CMD in -@@ -9014,10 +8395,10 @@ +@@ -9014,10 +8422,10 @@ MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if test -n "$MAGIC_CMD"; then @@ -6899,7 +7067,7 @@ Index: pam.deb/configure $as_echo "no" >&6; } fi -@@ -9098,9 +8479,9 @@ +@@ -9098,9 +8506,9 @@ if test "$GCC" = yes; then lt_prog_compiler_no_builtin_flag=' -fno-builtin' @@ -6911,21 +7079,21 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_rtti_exceptions=no -@@ -9116,11 +8497,11 @@ +@@ -9116,11 +8524,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:9119: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:8500: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8527: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9123: \$? = $ac_status" >&5 -+ echo "$as_me:8504: \$? = $ac_status" >&5 ++ echo "$as_me:8531: \$? = $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. -@@ -9133,7 +8514,7 @@ +@@ -9133,7 +8541,7 @@ $RM conftest* fi @@ -6934,7 +7102,7 @@ Index: pam.deb/configure $as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; } if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then -@@ -9153,7 +8534,7 @@ +@@ -9153,7 +8561,7 @@ lt_prog_compiler_pic= lt_prog_compiler_static= @@ -6943,7 +7111,16 @@ Index: pam.deb/configure $as_echo_n "checking for $compiler option to produce PIC... " >&6; } if test "$GCC" = yes; then -@@ -9425,7 +8806,7 @@ +@@ -9285,7 +8693,7 @@ + lt_prog_compiler_static='-non_shared' + ;; + +- linux* | k*bsd*-gnu) ++ linux* | k*bsd*-gnu | kopensolaris*-gnu) + case $cc_basename in + # old Intel for x86_64 which still supported -KPIC. + ecc*) +@@ -9425,7 +8833,7 @@ lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" ;; esac @@ -6952,7 +7129,7 @@ Index: pam.deb/configure $as_echo "$lt_prog_compiler_pic" >&6; } -@@ -9437,9 +8818,9 @@ +@@ -9437,9 +8845,9 @@ # Check to make sure the PIC flag actually works. # if test -n "$lt_prog_compiler_pic"; then @@ -6964,21 +7141,21 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_pic_works=no -@@ -9455,11 +8836,11 @@ +@@ -9455,11 +8863,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:9458: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:8839: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8866: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9462: \$? = $ac_status" >&5 -+ echo "$as_me:8843: \$? = $ac_status" >&5 ++ echo "$as_me:8870: \$? = $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. -@@ -9472,7 +8853,7 @@ +@@ -9472,7 +8880,7 @@ $RM conftest* fi @@ -6987,7 +7164,7 @@ Index: pam.deb/configure $as_echo "$lt_cv_prog_compiler_pic_works" >&6; } if test x"$lt_cv_prog_compiler_pic_works" = xyes; then -@@ -9496,9 +8877,9 @@ +@@ -9496,9 +8904,9 @@ # Check to make sure the static flag actually works. # wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" @@ -6999,7 +7176,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_static_works=no -@@ -9524,7 +8905,7 @@ +@@ -9524,7 +8932,7 @@ LDFLAGS="$save_LDFLAGS" fi @@ -7008,7 +7185,7 @@ Index: pam.deb/configure $as_echo "$lt_cv_prog_compiler_static_works" >&6; } if test x"$lt_cv_prog_compiler_static_works" = xyes; then -@@ -9539,9 +8920,9 @@ +@@ -9539,9 +8947,9 @@ @@ -7020,21 +7197,21 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_c_o=no -@@ -9560,11 +8941,11 @@ +@@ -9560,11 +8968,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:9563: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:8944: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8971: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9567: \$? = $ac_status" >&5 -+ echo "$as_me:8948: \$? = $ac_status" >&5 ++ echo "$as_me:8975: \$? = $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 -@@ -9586,7 +8967,7 @@ +@@ -9586,7 +8994,7 @@ $RM conftest* fi @@ -7043,7 +7220,7 @@ Index: pam.deb/configure $as_echo "$lt_cv_prog_compiler_c_o" >&6; } -@@ -9594,9 +8975,9 @@ +@@ -9594,9 +9002,9 @@ @@ -7055,21 +7232,21 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_c_o=no -@@ -9615,11 +8996,11 @@ +@@ -9615,11 +9023,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:9618: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:8999: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:9026: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9622: \$? = $ac_status" >&5 -+ echo "$as_me:9003: \$? = $ac_status" >&5 ++ echo "$as_me:9030: \$? = $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 -@@ -9641,7 +9022,7 @@ +@@ -9641,7 +9049,7 @@ $RM conftest* fi @@ -7078,7 +7255,7 @@ Index: pam.deb/configure $as_echo "$lt_cv_prog_compiler_c_o" >&6; } -@@ -9650,7 +9031,7 @@ +@@ -9650,7 +9058,7 @@ hard_links="nottested" if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then # do not overwrite the value of need_locks provided by the user @@ -7087,7 +7264,7 @@ Index: pam.deb/configure $as_echo_n "checking if we can lock with hard links... " >&6; } hard_links=yes $RM conftest* -@@ -9658,10 +9039,10 @@ +@@ -9658,10 +9066,10 @@ touch conftest.a ln conftest.a conftest.b 2>&5 || hard_links=no ln conftest.a conftest.b 2>/dev/null && hard_links=no @@ -7100,7 +7277,7 @@ Index: pam.deb/configure $as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} need_locks=warn fi -@@ -9674,7 +9055,7 @@ +@@ -9674,7 +9082,7 @@ @@ -7109,7 +7286,7 @@ Index: pam.deb/configure $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } runpath_var= -@@ -9734,6 +9115,9 @@ +@@ -9734,6 +9142,9 @@ openbsd*) with_gnu_ld=no ;; @@ -7119,7 +7296,24 @@ Index: pam.deb/configure esac ld_shlibs=yes -@@ -9916,7 +9300,7 @@ +@@ -9755,6 +9166,7 @@ + fi + supports_anon_versioning=no + case `$LD -v 2>&1` in ++ *GNU\ gold*) supports_anon_versioning=yes ;; + *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... + *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... +@@ -9846,7 +9258,7 @@ + archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; + +- gnu* | linux* | tpf* | k*bsd*-gnu) ++ gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) + tmp_diet=no + if test "$host_os" = linux-dietlibc; then + case $cc_basename in +@@ -9916,7 +9328,7 @@ fi ;; @@ -7128,7 +7322,7 @@ Index: pam.deb/configure if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= -@@ -10091,6 +9475,7 @@ +@@ -10091,6 +9503,7 @@ if test "$aix_use_runtimelinking" = yes; then shared_flag="$shared_flag "'${wl}-G' fi @@ -7136,7 +7330,7 @@ Index: pam.deb/configure else # not using gcc if test "$host_cpu" = ia64; then -@@ -10116,11 +9501,7 @@ +@@ -10116,11 +9529,7 @@ allow_undefined_flag='-berok' # Determine the default libpath from the value encoded in an # empty executable. @@ -7149,7 +7343,7 @@ Index: pam.deb/configure /* end confdefs.h. */ int -@@ -10131,27 +9512,7 @@ +@@ -10131,27 +9540,7 @@ return 0; } _ACEOF @@ -7178,7 +7372,7 @@ Index: pam.deb/configure lt_aix_libpath_sed=' /Import File Strings/,/^$/ { -@@ -10165,16 +9526,9 @@ +@@ -10165,16 +9554,9 @@ if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` fi @@ -7197,7 +7391,7 @@ Index: pam.deb/configure if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" -@@ -10187,11 +9541,7 @@ +@@ -10187,11 +9569,7 @@ else # Determine the default libpath from the value encoded in an # empty executable. @@ -7210,7 +7404,7 @@ Index: pam.deb/configure /* end confdefs.h. */ int -@@ -10202,27 +9552,7 @@ +@@ -10202,27 +9580,7 @@ return 0; } _ACEOF @@ -7239,7 +7433,7 @@ Index: pam.deb/configure lt_aix_libpath_sed=' /Import File Strings/,/^$/ { -@@ -10236,16 +9566,9 @@ +@@ -10236,16 +9594,9 @@ if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` fi @@ -7258,7 +7452,7 @@ Index: pam.deb/configure if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" -@@ -10457,42 +9780,16 @@ +@@ -10457,42 +9808,16 @@ # implicitly export all symbols. save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" @@ -7306,7 +7500,7 @@ Index: pam.deb/configure LDFLAGS="$save_LDFLAGS" else archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' -@@ -10505,7 +9802,7 @@ +@@ -10505,7 +9830,7 @@ link_all_deplibs=yes ;; @@ -7315,7 +7509,7 @@ Index: pam.deb/configure if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else -@@ -10748,7 +10045,7 @@ +@@ -10748,7 +10073,7 @@ fi fi @@ -7324,7 +7518,7 @@ Index: pam.deb/configure $as_echo "$ld_shlibs" >&6; } test "$ld_shlibs" = no && can_build_shared=no -@@ -10785,16 +10082,16 @@ +@@ -10785,16 +10110,16 @@ # Test whether the compiler implicitly links with -lc since on some # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. @@ -7345,7 +7539,7 @@ Index: pam.deb/configure soname=conftest lib=conftest libobjs=conftest.$ac_objext -@@ -10808,11 +10105,11 @@ +@@ -10808,11 +10133,11 @@ libname=conftest lt_save_allow_undefined_flag=$allow_undefined_flag allow_undefined_flag= @@ -7360,7 +7554,7 @@ Index: pam.deb/configure then archive_cmds_need_lc=no else -@@ -10823,7 +10120,7 @@ +@@ -10823,7 +10148,7 @@ cat conftest.err 1>&5 fi $RM conftest* @@ -7369,7 +7563,7 @@ Index: pam.deb/configure $as_echo "$archive_cmds_need_lc" >&6; } ;; esac -@@ -10987,7 +10284,7 @@ +@@ -10987,7 +10312,7 @@ @@ -7378,7 +7572,16 @@ Index: pam.deb/configure $as_echo_n "checking dynamic linker characteristics... " >&6; } if test "$GCC" = yes; then -@@ -11409,11 +10706,7 @@ +@@ -11395,7 +10720,7 @@ + ;; + + # This must be Linux ELF. +-linux* | k*bsd*-gnu) ++linux* | k*bsd*-gnu | kopensolaris*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -11409,11 +10734,7 @@ save_libdir=$libdir eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \ LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\"" @@ -7391,7 +7594,7 @@ Index: pam.deb/configure /* end confdefs.h. */ int -@@ -11424,41 +10717,13 @@ +@@ -11424,41 +10745,13 @@ return 0; } _ACEOF @@ -7437,7 +7640,7 @@ Index: pam.deb/configure LDFLAGS=$save_LDFLAGS libdir=$save_libdir -@@ -11482,6 +10747,18 @@ +@@ -11482,6 +10775,18 @@ dynamic_linker='GNU/Linux ld.so' ;; @@ -7456,7 +7659,7 @@ Index: pam.deb/configure netbsd*) version_type=sunos need_lib_prefix=no -@@ -11670,7 +10947,7 @@ +@@ -11670,7 +10975,7 @@ dynamic_linker=no ;; esac @@ -7465,7 +7668,7 @@ Index: pam.deb/configure $as_echo "$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no -@@ -11772,7 +11049,7 @@ +@@ -11772,7 +11077,7 @@ @@ -7474,7 +7677,7 @@ Index: pam.deb/configure $as_echo_n "checking how to hardcode library paths into programs... " >&6; } hardcode_action= if test -n "$hardcode_libdir_flag_spec" || -@@ -11797,7 +11074,7 @@ +@@ -11797,7 +11102,7 @@ # directories. hardcode_action=unsupported fi @@ -7483,7 +7686,7 @@ Index: pam.deb/configure $as_echo "$hardcode_action" >&6; } if test "$hardcode_action" = relink || -@@ -11842,18 +11119,14 @@ +@@ -11842,18 +11147,14 @@ darwin*) # if libdl is installed we need to link against it @@ -7505,7 +7708,7 @@ Index: pam.deb/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -11871,43 +11144,18 @@ +@@ -11871,43 +11172,18 @@ return 0; } _ACEOF @@ -7555,21 +7758,31 @@ Index: pam.deb/configure lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" else -@@ -11920,106 +11168,18 @@ +@@ -11920,33 +11196,19 @@ ;; *) - { $as_echo "$as_me:$LINENO: checking for shl_load" >&5 -$as_echo_n "checking for shl_load... " >&6; } -if test "${ac_cv_func_shl_load+set}" = set; then -- $as_echo_n "(cached) " >&6 --else ++ ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load" ++if test "x$ac_cv_func_shl_load" = x""yes; then : ++ lt_cv_dlopen="shl_load" ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 ++$as_echo_n "checking for shl_load in -ldld... " >&6; } ++if test "${ac_cv_lib_dld_shl_load+set}" = set; then : + $as_echo_n "(cached) " >&6 + else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-ldld $LIBS" ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ -/* Define shl_load to an innocuous variant, in case declares shl_load. - For example, HP-UX 11i declares gettimeofday. */ -#define shl_load innocuous_shl_load @@ -7586,14 +7799,13 @@ Index: pam.deb/configure -#endif - -#undef shl_load -- --/* Override any GCC internal prototype to avoid an error. -- Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ --#ifdef __cplusplus --extern "C" --#endif --char shl_load (); + + /* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC +@@ -11955,13 +11217,6 @@ + extern "C" + #endif + char shl_load (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ @@ -7601,14 +7813,13 @@ Index: pam.deb/configure -choke me -#endif - --int --main () --{ --return shl_load (); -- ; -- return 0; --} --_ACEOF + int + main () + { +@@ -11970,56 +11225,32 @@ + return 0; + } + _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in @@ -7631,43 +7842,68 @@ Index: pam.deb/configure - $as_test_x conftest$ac_exeext - }; then - ac_cv_func_shl_load=yes --else ++if ac_fn_c_try_link "$LINENO"; then : ++ ac_cv_lib_dld_shl_load=yes + else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_shl_load=no --fi ++ ac_cv_lib_dld_shl_load=no + fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext --fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS + fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 -$as_echo "$ac_cv_func_shl_load" >&6; } -if test "x$ac_cv_func_shl_load" = x""yes; then -+ ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load" -+if test "x$ac_cv_func_shl_load" = x""yes; then : - lt_cv_dlopen="shl_load" +- lt_cv_dlopen="shl_load" ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 ++$as_echo "$ac_cv_lib_dld_shl_load" >&6; } ++if test "x$ac_cv_lib_dld_shl_load" = x""yes; then : ++ lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" else - { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 - $as_echo_n "checking for shl_load in -ldld... " >&6; } +-$as_echo_n "checking for shl_load in -ldld... " >&6; } -if test "${ac_cv_lib_dld_shl_load+set}" = set; then -+if test "${ac_cv_lib_dld_shl_load+set}" = set; then : ++ ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" ++if test "x$ac_cv_func_dlopen" = x""yes; then : ++ lt_cv_dlopen="dlopen" ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 ++$as_echo_n "checking for dlopen in -ldl... " >&6; } ++if test "${ac_cv_lib_dl_dlopen+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS - LIBS="-ldld $LIBS" +-LIBS="-ldld $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF ++LIBS="-ldl $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -12037,145 +11197,32 @@ +@@ -12028,81 +11259,38 @@ + #ifdef __cplusplus + extern "C" + #endif +-char shl_load (); ++char dlopen (); + int + main () + { +-return shl_load (); ++return dlopen (); + ; return 0; } _ACEOF @@ -7692,14 +7928,15 @@ Index: pam.deb/configure - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +- ac_cv_lib_dld_shl_load=yes +if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_dld_shl_load=yes ++ ac_cv_lib_dl_dlopen=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_dld_shl_load=no -+ ac_cv_lib_dld_shl_load=no ++ ac_cv_lib_dl_dlopen=no fi - -rm -rf conftest.dSYM @@ -7710,23 +7947,31 @@ Index: pam.deb/configure LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 - $as_echo "$ac_cv_lib_dld_shl_load" >&6; } +-$as_echo "$ac_cv_lib_dld_shl_load" >&6; } -if test "x$ac_cv_lib_dld_shl_load" = x""yes; then -+if test "x$ac_cv_lib_dld_shl_load" = x""yes; then : - lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" +- lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 ++$as_echo "$ac_cv_lib_dl_dlopen" >&6; } ++if test "x$ac_cv_lib_dl_dlopen" = x""yes; then : ++ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" else - { $as_echo "$as_me:$LINENO: checking for dlopen" >&5 -$as_echo_n "checking for dlopen... " >&6; } -if test "${ac_cv_func_dlopen+set}" = set; then -- $as_echo_n "(cached) " >&6 --else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 ++$as_echo_n "checking for dlopen in -lsvld... " >&6; } ++if test "${ac_cv_lib_svld_dlopen+set}" = set; then : + $as_echo_n "(cached) " >&6 + else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-lsvld $LIBS" ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ -/* Define dlopen to an innocuous variant, in case declares dlopen. - For example, HP-UX 11i declares gettimeofday. */ -#define dlopen innocuous_dlopen @@ -7743,14 +7988,13 @@ Index: pam.deb/configure -#endif - -#undef dlopen -- --/* Override any GCC internal prototype to avoid an error. -- Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ --#ifdef __cplusplus --extern "C" --#endif --char dlopen (); + + /* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC +@@ -12111,13 +11299,6 @@ + extern "C" + #endif + char dlopen (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ @@ -7758,14 +8002,13 @@ Index: pam.deb/configure -choke me -#endif - --int --main () --{ --return dlopen (); -- ; -- return 0; --} --_ACEOF + int + main () + { +@@ -12126,56 +11307,28 @@ + return 0; + } + _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in @@ -7788,43 +8031,64 @@ Index: pam.deb/configure - $as_test_x conftest$ac_exeext - }; then - ac_cv_func_dlopen=yes --else ++if ac_fn_c_try_link "$LINENO"; then : ++ ac_cv_lib_svld_dlopen=yes + else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_dlopen=no --fi ++ ac_cv_lib_svld_dlopen=no + fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext --fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS + fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 -$as_echo "$ac_cv_func_dlopen" >&6; } -if test "x$ac_cv_func_dlopen" = x""yes; then -+ ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" -+if test "x$ac_cv_func_dlopen" = x""yes; then : - lt_cv_dlopen="dlopen" +- lt_cv_dlopen="dlopen" ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 ++$as_echo "$ac_cv_lib_svld_dlopen" >&6; } ++if test "x$ac_cv_lib_svld_dlopen" = x""yes; then : ++ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" else - { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 - $as_echo_n "checking for dlopen in -ldl... " >&6; } +-$as_echo_n "checking for dlopen in -ldl... " >&6; } -if test "${ac_cv_lib_dl_dlopen+set}" = set; then -+if test "${ac_cv_lib_dl_dlopen+set}" = set; then : ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5 ++$as_echo_n "checking for dld_link in -ldld... " >&6; } ++if test "${ac_cv_lib_dld_dld_link+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS - LIBS="-ldl $LIBS" +-LIBS="-ldl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF ++LIBS="-ldld $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -12193,57 +11240,28 @@ +@@ -12184,188 +11337,27 @@ + #ifdef __cplusplus + extern "C" + #endif +-char dlopen (); ++char dld_link (); + int + main () + { +-return dlopen (); ++return dld_link (); + ; return 0; } _ACEOF @@ -7849,52 +8113,55 @@ Index: pam.deb/configure - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +- ac_cv_lib_dl_dlopen=yes +if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_dl_dlopen=yes ++ ac_cv_lib_dld_dld_link=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_dl_dlopen=no -+ ac_cv_lib_dl_dlopen=no - fi +-fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi +-LIBS=$ac_check_lib_save_LIBS +-fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 - $as_echo "$ac_cv_lib_dl_dlopen" >&6; } +-$as_echo "$ac_cv_lib_dl_dlopen" >&6; } -if test "x$ac_cv_lib_dl_dlopen" = x""yes; then -+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then : - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" - else +- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" +-else - { $as_echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 - $as_echo_n "checking for dlopen in -lsvld... " >&6; } +-$as_echo_n "checking for dlopen in -lsvld... " >&6; } -if test "${ac_cv_lib_svld_dlopen+set}" = set; then -+if test "${ac_cv_lib_svld_dlopen+set}" = set; then : - $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-lsvld $LIBS" +- $as_echo_n "(cached) " >&6 +-else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-lsvld $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - /* Override any GCC internal prototype to avoid an error. -@@ -12261,57 +11279,28 @@ - return 0; - } - _ACEOF +-/* end confdefs.h. */ +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char dlopen (); +-int +-main () +-{ +-return dlopen (); +- ; +- return 0; +-} +-_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in @@ -7916,52 +8183,53 @@ Index: pam.deb/configure - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then -+if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_svld_dlopen=yes - else +- ac_cv_lib_svld_dlopen=yes +-else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_svld_dlopen=no -+ ac_cv_lib_svld_dlopen=no - fi +-fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi +-LIBS=$ac_check_lib_save_LIBS +-fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 - $as_echo "$ac_cv_lib_svld_dlopen" >&6; } +-$as_echo "$ac_cv_lib_svld_dlopen" >&6; } -if test "x$ac_cv_lib_svld_dlopen" = x""yes; then -+if test "x$ac_cv_lib_svld_dlopen" = x""yes; then : - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" - else +- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" +-else - { $as_echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5 - $as_echo_n "checking for dld_link in -ldld... " >&6; } +-$as_echo_n "checking for dld_link in -ldld... " >&6; } -if test "${ac_cv_lib_dld_dld_link+set}" = set; then -+if test "${ac_cv_lib_dld_dld_link+set}" = set; then : - $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-ldld $LIBS" +- $as_echo_n "(cached) " >&6 +-else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-ldld $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - /* Override any GCC internal prototype to avoid an error. -@@ -12329,43 +11318,18 @@ - return 0; - } - _ACEOF +-/* end confdefs.h. */ +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char dld_link (); +-int +-main () +-{ +-return dld_link (); +- ; +- return 0; +-} +-_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in @@ -7983,9 +8251,8 @@ Index: pam.deb/configure - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then -+if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_dld_dld_link=yes - else +- ac_cv_lib_dld_dld_link=yes +-else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - @@ -8008,7 +8275,7 @@ Index: pam.deb/configure lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" fi -@@ -12404,9 +11368,9 @@ +@@ -12404,9 +11396,9 @@ save_LIBS="$LIBS" LIBS="$lt_cv_dlopen_libs $LIBS" @@ -8020,16 +8287,16 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then : -@@ -12415,7 +11379,7 @@ +@@ -12415,7 +11407,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12418 "configure" -+#line 11382 "configure" ++#line 11410 "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -12474,11 +11438,11 @@ +@@ -12474,11 +11466,11 @@ return status; } _LT_EOF @@ -8044,7 +8311,7 @@ Index: pam.deb/configure (./conftest; exit; ) >&5 2>/dev/null lt_status=$? case x$lt_status in -@@ -12495,14 +11459,14 @@ +@@ -12495,14 +11487,14 @@ fi @@ -8062,16 +8329,16 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then : -@@ -12511,7 +11475,7 @@ +@@ -12511,7 +11503,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12514 "configure" -+#line 11478 "configure" ++#line 11506 "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -12570,11 +11534,11 @@ +@@ -12570,11 +11562,11 @@ return status; } _LT_EOF @@ -8086,7 +8353,7 @@ Index: pam.deb/configure (./conftest; exit; ) >&5 2>/dev/null lt_status=$? case x$lt_status in -@@ -12591,7 +11555,7 @@ +@@ -12591,7 +11583,7 @@ fi @@ -8095,7 +8362,7 @@ Index: pam.deb/configure $as_echo "$lt_cv_dlopen_self_static" >&6; } fi -@@ -12630,12 +11594,12 @@ +@@ -12630,12 +11622,12 @@ striplib= old_striplib= @@ -8110,7 +8377,7 @@ Index: pam.deb/configure $as_echo "yes" >&6; } else # FIXME - insert some real tests, host_os isn't really good enough -@@ -12644,15 +11608,15 @@ +@@ -12644,15 +11636,15 @@ if test -n "$STRIP" ; then striplib="$STRIP -x" old_striplib="$STRIP -S" @@ -8129,7 +8396,7 @@ Index: pam.deb/configure $as_echo "no" >&6; } ;; esac -@@ -12670,12 +11634,12 @@ +@@ -12670,12 +11662,12 @@ # Report which library types will actually be built @@ -8145,7 +8412,7 @@ Index: pam.deb/configure $as_echo_n "checking whether to build shared libraries... " >&6; } test "$can_build_shared" = "no" && enable_shared=no -@@ -12696,14 +11660,14 @@ +@@ -12696,14 +11688,14 @@ fi ;; esac @@ -8163,7 +8430,7 @@ Index: pam.deb/configure $as_echo "$enable_static" >&6; } -@@ -12739,22 +11703,18 @@ +@@ -12739,22 +11731,18 @@ if test "x$CC" != xcc; then @@ -8190,7 +8457,7 @@ Index: pam.deb/configure /* end confdefs.h. */ int -@@ -12770,63 +11730,63 @@ +@@ -12770,63 +11758,63 @@ # existing .o file with -o, though they will create one. ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5' rm -f conftest2.* @@ -8279,7 +8546,7 @@ Index: pam.deb/configure then # cc works too. : -@@ -12843,15 +11803,13 @@ +@@ -12843,15 +11831,13 @@ fi if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then @@ -8298,7 +8565,7 @@ Index: pam.deb/configure fi -@@ -12871,9 +11829,9 @@ +@@ -12871,9 +11857,9 @@ @@ -8310,7 +8577,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else cat > conftest.c <&6 else cat > conftest.c <&6 else ac_cv_sys_largefile_CC=no -@@ -12949,11 +11907,7 @@ +@@ -12949,11 +11935,7 @@ while :; do # IRIX 6.2 and later do not support large files by default, # so use the C compiler's -n32 option if that helps. @@ -8399,7 +8666,7 @@ Index: pam.deb/configure /* end confdefs.h. */ #include /* Check that off_t can represent 2**63 - 1 correctly. -@@ -12972,60 +11926,14 @@ +@@ -12972,60 +11954,14 @@ return 0; } _ACEOF @@ -8462,7 +8729,7 @@ Index: pam.deb/configure rm -f core conftest.err conftest.$ac_objext break done -@@ -13033,23 +11941,19 @@ +@@ -13033,23 +11969,19 @@ rm -f conftest.$ac_ext fi fi @@ -8490,7 +8757,7 @@ Index: pam.deb/configure /* end confdefs.h. */ #include /* Check that off_t can represent 2**63 - 1 correctly. -@@ -13068,38 +11972,11 @@ +@@ -13068,38 +12000,11 @@ return 0; } _ACEOF @@ -8531,7 +8798,7 @@ Index: pam.deb/configure /* end confdefs.h. */ #define _FILE_OFFSET_BITS 64 #include -@@ -13119,38 +11996,15 @@ +@@ -13119,38 +12024,15 @@ return 0; } _ACEOF @@ -8572,7 +8839,7 @@ Index: pam.deb/configure $as_echo "$ac_cv_sys_file_offset_bits" >&6; } case $ac_cv_sys_file_offset_bits in #( no | unknown) ;; -@@ -13162,17 +12016,13 @@ +@@ -13162,17 +12044,13 @@ esac rm -rf conftest* if test $ac_cv_sys_file_offset_bits = unknown; then @@ -8593,7 +8860,7 @@ Index: pam.deb/configure /* end confdefs.h. */ #include /* Check that off_t can represent 2**63 - 1 correctly. -@@ -13191,38 +12041,11 @@ +@@ -13191,38 +12069,11 @@ return 0; } _ACEOF @@ -8634,7 +8901,7 @@ Index: pam.deb/configure /* end confdefs.h. */ #define _LARGE_FILES 1 #include -@@ -13242,38 +12065,15 @@ +@@ -13242,38 +12093,15 @@ return 0; } _ACEOF @@ -8675,7 +8942,7 @@ Index: pam.deb/configure $as_echo "$ac_cv_sys_large_files" >&6; } case $ac_cv_sys_large_files in #( no | unknown) ;; -@@ -13342,17 +12142,13 @@ +@@ -13342,17 +12170,13 @@ fi @@ -8696,7 +8963,7 @@ Index: pam.deb/configure /* end confdefs.h. */ #include -@@ -13374,54 +12170,29 @@ +@@ -13374,54 +12198,29 @@ return 0; } _ACEOF @@ -8758,7 +9025,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else cat > conftest.s <&6 else if test $libc_cv_asm_symver_directive = yes; then -@@ -13465,11 +12236,11 @@ +@@ -13465,11 +12264,11 @@ -nostartfiles -nostdlib -Wl,--version-script,conftest.map 1>&5' @@ -8788,7 +9055,7 @@ Index: pam.deb/configure then libc_cv_ld_version_script_option=yes else -@@ -13483,7 +12254,7 @@ +@@ -13483,7 +12282,7 @@ fi rm -f conftest* fi @@ -8797,7 +9064,7 @@ Index: pam.deb/configure $as_echo "$libc_cv_ld_version_script_option" >&6; } if test "$libc_cv_ld_version_script_option" = "yes"; then HAVE_VERSIONING_TRUE= -@@ -13495,16 +12266,16 @@ +@@ -13495,16 +12294,16 @@ # Check whether --enable-pie was given. @@ -8817,7 +9084,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else cat > conftest.c <&6; } -@@ -13539,7 +12310,7 @@ +@@ -13539,7 +12338,7 @@ # Check whether --enable-prelude was given. @@ -8850,7 +9117,7 @@ Index: pam.deb/configure enableval=$enable_prelude; WITH_PRELUDE=$enableval else WITH_PRELUDE=yes -@@ -13548,7 +12319,7 @@ +@@ -13548,7 +12347,7 @@ if test "$WITH_PRELUDE" == "yes" ; then # Check whether --with-libprelude-prefix was given. @@ -8859,7 +9126,7 @@ Index: pam.deb/configure withval=$with_libprelude_prefix; libprelude_config_prefix="$withval" else libprelude_config_prefix="" -@@ -13563,9 +12334,9 @@ +@@ -13563,9 +12362,9 @@ # Extract the first word of "libprelude-config", so it can be a program name with args. set dummy libprelude-config; ac_word=$2 @@ -8871,7 +9138,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else case $LIBPRELUDE_CONFIG in -@@ -13578,14 +12349,14 @@ +@@ -13578,14 +12377,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -8889,7 +9156,7 @@ Index: pam.deb/configure IFS=$as_save_IFS test -z "$ac_cv_path_LIBPRELUDE_CONFIG" && ac_cv_path_LIBPRELUDE_CONFIG="no" -@@ -13594,16 +12365,16 @@ +@@ -13594,16 +12393,16 @@ fi LIBPRELUDE_CONFIG=$ac_cv_path_LIBPRELUDE_CONFIG if test -n "$LIBPRELUDE_CONFIG"; then @@ -8909,7 +9176,7 @@ Index: pam.deb/configure $as_echo_n "checking for libprelude - version >= $min_libprelude_version... " >&6; } no_libprelude="" if test "$LIBPRELUDE_CONFIG" = "no" ; then -@@ -13625,14 +12396,10 @@ +@@ -13625,14 +12424,10 @@ LDFLAGS="$LDFLAGS $LIBPRELUDE_LDFLAGS" LIBS="$LIBS $LIBPRELUDE_LIBS" rm -f conf.libpreludetest @@ -8926,7 +9193,7 @@ Index: pam.deb/configure /* end confdefs.h. */ #include -@@ -13690,56 +12457,29 @@ +@@ -13690,56 +12485,29 @@ } _ACEOF @@ -8990,7 +9257,7 @@ Index: pam.deb/configure $as_echo "no" >&6; } fi if test "$LIBPRELUDE_CONFIG" = "no" ; then -@@ -13755,11 +12495,7 @@ +@@ -13755,11 +12523,7 @@ CFLAGS="$CFLAGS $LIBPRELUDE_CFLAGS" LDFLAGS="$LDFLAGS $LIBPRELUDE_LDFLAGS" LIBS="$LIBS $LIBPRELUDE_LIBS" @@ -9003,7 +9270,7 @@ Index: pam.deb/configure /* end confdefs.h. */ #include -@@ -13775,27 +12511,7 @@ +@@ -13775,27 +12539,7 @@ return 0; } _ACEOF @@ -9032,7 +9299,7 @@ Index: pam.deb/configure echo "*** The test program compiled, but did not run. This usually means" echo "*** that the run-time linker is not finding LIBPRELUDE or finding the wrong" echo "*** version of LIBPRELUDE. If it is not finding LIBPRELUDE, you'll need to set your" -@@ -13807,18 +12523,13 @@ +@@ -13807,18 +12551,13 @@ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" echo "***" else @@ -9054,7 +9321,7 @@ Index: pam.deb/configure CFLAGS="$ac_save_CFLAGS" LDFLAGS="$ac_save_LDFLAGS" LIBS="$ac_save_LIBS" -@@ -13843,21 +12554,19 @@ +@@ -13843,21 +12582,19 @@ fi # Check whether --enable-debug was given. @@ -9079,7 +9346,7 @@ Index: pam.deb/configure enableval=$enable_securedir; SECUREDIR=$enableval else SECUREDIR=$libdir/security -@@ -13866,7 +12575,7 @@ +@@ -13866,7 +12603,7 @@ # Check whether --enable-isadir was given. @@ -9088,7 +9355,7 @@ Index: pam.deb/configure enableval=$enable_isadir; ISA=$enableval else ISA=../../`basename $libdir`/security -@@ -13878,11 +12587,11 @@ +@@ -13878,11 +12615,11 @@ #define _PAM_ISA "$ISA" _ACEOF @@ -9102,7 +9369,7 @@ Index: pam.deb/configure enableval=$enable_sconfigdir; SCONFIGDIR=$enableval else SCONFIGDIR=$sysconfdir/security -@@ -13891,35 +12600,31 @@ +@@ -13891,35 +12628,31 @@ # Check whether --enable-pamlocking was given. @@ -9143,19 +9410,30 @@ Index: pam.deb/configure enableval=$enable_lckpwdf; WITH_LCKPWDF=$enableval else WITH_LCKPWDF=yes -@@ -13927,152 +12632,16 @@ +@@ -13927,175 +12660,35 @@ if test "$WITH_LCKPWDF" == "yes" ; then -cat >>confdefs.h <<\_ACEOF -#define USE_LCKPWDF 1 --_ACEOF +$as_echo "#define USE_LCKPWDF 1" >>confdefs.h ++ ++fi ++ ++for ac_header in paths.h ++do : ++ ac_fn_c_check_header_mongrel "$LINENO" "paths.h" "ac_cv_header_paths_h" "$ac_includes_default" ++if test "x$ac_cv_header_paths_h" = x""yes; then : ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_PATHS_H 1 + _ACEOF fi -- - for ac_header in paths.h ++done ++ + +-for ac_header in paths.h -do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then @@ -9292,22 +9570,21 @@ Index: pam.deb/configure -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then -+do : -+ ac_fn_c_check_header_mongrel "$LINENO" "paths.h" "ac_cv_header_paths_h" "$ac_includes_default" -+if test "x$ac_cv_header_paths_h" = x""yes; then : - cat >>confdefs.h <<_ACEOF +- cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+#define HAVE_PATHS_H 1 - _ACEOF - - fi -@@ -14081,21 +12650,17 @@ - - - # Check whether --with-mailspool was given. +-_ACEOF +- +-fi +- +-done +- +- +-# Check whether --with-mailspool was given. -if test "${with_mailspool+set}" = set; then +- withval=$with_mailspool; with_mailspool=${withval} ++# Check whether --with-mailspool was given. +if test "${with_mailspool+set}" = set; then : - withval=$with_mailspool; with_mailspool=${withval} ++ withval=$with_mailspool; with_mailspool=${withval} fi if test x$with_mailspool != x ; then @@ -9326,7 +9603,7 @@ Index: pam.deb/configure /* end confdefs.h. */ #include -@@ -14107,42 +12672,15 @@ +@@ -14107,42 +12700,15 @@ #endif } _ACEOF @@ -9373,7 +9650,7 @@ Index: pam.deb/configure fi cat >>confdefs.h <<_ACEOF -@@ -14152,16 +12690,16 @@ +@@ -14152,16 +12718,16 @@ # Check whether --with-xauth was given. @@ -9393,7 +9670,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else case $pam_xauth_path in -@@ -14174,14 +12712,14 @@ +@@ -14174,14 +12740,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -9411,7 +9688,7 @@ Index: pam.deb/configure IFS=$as_save_IFS ;; -@@ -14189,10 +12727,10 @@ +@@ -14189,10 +12755,10 @@ fi pam_xauth_path=$ac_cv_path_pam_xauth_path if test -n "$pam_xauth_path"; then @@ -9424,7 +9701,7 @@ Index: pam.deb/configure $as_echo "no" >&6; } fi -@@ -14210,18 +12748,14 @@ +@@ -14210,18 +12776,14 @@ fi @@ -9446,7 +9723,7 @@ Index: pam.deb/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -14239,43 +12773,18 @@ +@@ -14239,43 +12801,18 @@ return 0; } _ACEOF @@ -9496,7 +9773,7 @@ Index: pam.deb/configure LIBDL="-ldl" else LIBDL="" -@@ -14285,166 +12794,28 @@ +@@ -14285,166 +12822,28 @@ # Check for cracklib # Check whether --enable-cracklib was given. @@ -9646,21 +9923,18 @@ Index: pam.deb/configure -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then -- cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 --_ACEOF -- { $as_echo "$as_me:$LINENO: checking for FascistCheck in -lcrack" >&5 --$as_echo_n "checking for FascistCheck in -lcrack... " >&6; } --if test "${ac_cv_lib_crack_FascistCheck+set}" = set; then + for ac_header in crack.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "crack.h" "ac_cv_header_crack_h" "$ac_includes_default" +if test "x$ac_cv_header_crack_h" = x""yes; then : -+ cat >>confdefs.h <<_ACEOF + cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define HAVE_CRACK_H 1 -+_ACEOF + _ACEOF +- { $as_echo "$as_me:$LINENO: checking for FascistCheck in -lcrack" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FascistCheck in -lcrack" >&5 -+$as_echo_n "checking for FascistCheck in -lcrack... " >&6; } + $as_echo_n "checking for FascistCheck in -lcrack... " >&6; } +-if test "${ac_cv_lib_crack_FascistCheck+set}" = set; then +if test "${ac_cv_lib_crack_FascistCheck+set}" = set; then : $as_echo_n "(cached) " >&6 else @@ -9675,7 +9949,7 @@ Index: pam.deb/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -14462,43 +12833,18 @@ +@@ -14462,43 +12861,18 @@ return 0; } _ACEOF @@ -9725,7 +9999,7 @@ Index: pam.deb/configure LIBCRACK="-lcrack" else LIBCRACK="" -@@ -14522,153 +12868,23 @@ +@@ -14522,153 +12896,23 @@ # Check whether --enable-audit was given. @@ -9885,7 +10159,7 @@ Index: pam.deb/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -14686,145 +12902,26 @@ +@@ -14686,145 +12930,26 @@ return 0; } _ACEOF @@ -10040,7 +10314,7 @@ Index: pam.deb/configure HAVE_AUDIT_TTY_STATUS=yes else HAVE_AUDIT_TTY_STATUS="" -@@ -14836,16 +12933,12 @@ +@@ -14836,16 +12961,12 @@ if test ! -z "$LIBAUDIT" -a "$ac_cv_header_libaudit_h" != "no" ; then @@ -10059,7 +10333,7 @@ Index: pam.deb/configure fi else -@@ -14861,165 +12954,28 @@ +@@ -14861,145 +12982,12 @@ fi @@ -10090,14 +10364,7 @@ Index: pam.deb/configure -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -+do : -+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -+eval as_val=\$$as_ac_Header -+ if test "x$as_val" = x""yes; then : -+ cat >>confdefs.h <<_ACEOF -+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 - _ACEOF +-_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in @@ -10120,15 +10387,14 @@ Index: pam.deb/configure -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +- - ac_header_compiler=no - fi - +-fi +- -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } -+done - +- -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -$as_echo_n "checking $ac_header presence... " >&6; } @@ -10210,38 +10476,36 @@ Index: pam.deb/configure -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then -- cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 --_ACEOF -- --fi -- --done -- --BACKUP_LIBS=$LIBS ++do : ++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" ++eval as_val=\$$as_ac_Header ++ if test "x$as_val" = x""yes; then : + cat >>confdefs.h <<_ACEOF + #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 + _ACEOF +@@ -15009,17 +12997,13 @@ + done + + BACKUP_LIBS=$LIBS -{ $as_echo "$as_me:$LINENO: checking for library containing crypt" >&5 --$as_echo_n "checking for library containing crypt... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing crypt" >&5 + $as_echo_n "checking for library containing crypt... " >&6; } -if test "${ac_cv_search_crypt+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- ac_func_search_save_LIBS=$LIBS ++if test "${ac_cv_search_crypt+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_func_search_save_LIBS=$LIBS -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -+BACKUP_LIBS=$LIBS -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing crypt" >&5 -+$as_echo_n "checking for library containing crypt... " >&6; } -+if test "${ac_cv_search_crypt+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -15044,155 +13000,39 @@ +@@ -15044,155 +13028,39 @@ ac_res=-l$ac_lib LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi @@ -10410,7 +10674,7 @@ Index: pam.deb/configure cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF -@@ -15204,15 +13044,13 @@ +@@ -15204,15 +13072,13 @@ if test "$LIBCRYPT" = "-lxcrypt" -a "$ac_cv_header_xcrypt_h" = "yes" ; then @@ -10428,7 +10692,7 @@ Index: pam.deb/configure withval=$with_randomdev; opt_randomdev=$withval fi -@@ -15230,7 +13068,7 @@ +@@ -15230,7 +13096,7 @@ fi # Check whether --enable-db was given. @@ -10437,7 +10701,7 @@ Index: pam.deb/configure enableval=$enable_db; WITH_DB=$enableval else WITH_DB=yes -@@ -15238,25 +13076,21 @@ +@@ -15238,25 +13104,21 @@ # Check whether --with-db-uniquename was given. @@ -10467,7 +10731,7 @@ Index: pam.deb/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -15274,47 +13108,20 @@ +@@ -15274,47 +13136,20 @@ return 0; } _ACEOF @@ -10523,7 +10787,7 @@ Index: pam.deb/configure LIBDB="-ldb$with_db_uniquename" else LIBDB="" -@@ -15322,18 +13129,14 @@ +@@ -15322,18 +13157,14 @@ if test -z "$LIBDB" ; then as_ac_Lib=`$as_echo "ac_cv_lib_db$with_db_uniquename''_dbm_store$with_db_uniquename" | $as_tr_sh` @@ -10545,7 +10809,7 @@ Index: pam.deb/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -15351,47 +13154,20 @@ +@@ -15351,47 +13182,20 @@ return 0; } _ACEOF @@ -10601,7 +10865,7 @@ Index: pam.deb/configure LIBDB="-ldb$with_db_uniquename" else LIBDB="" -@@ -15400,18 +13176,14 @@ +@@ -15400,18 +13204,14 @@ fi fi if test -z "$LIBDB" ; then @@ -10623,7 +10887,7 @@ Index: pam.deb/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -15429,367 +13201,70 @@ +@@ -15429,189 +13229,30 @@ return 0; } _ACEOF @@ -10702,13 +10966,7 @@ Index: pam.deb/configure -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -+ for ac_header in ndbm.h -+do : -+ ac_fn_c_check_header_mongrel "$LINENO" "ndbm.h" "ac_cv_header_ndbm_h" "$ac_includes_default" -+if test "x$ac_cv_header_ndbm_h" = x""yes; then : -+ cat >>confdefs.h <<_ACEOF -+#define HAVE_NDBM_H 1 - _ACEOF +-_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in @@ -10731,15 +10989,14 @@ Index: pam.deb/configure -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +- - ac_header_compiler=no - fi - +-fi +- -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } -+done - +- -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -$as_echo_n "checking $ac_header presence... " >&6; } @@ -10750,15 +11007,7 @@ Index: pam.deb/configure -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -+ fi -+ else -+ for ac_header in db.h -+do : -+ ac_fn_c_check_header_mongrel "$LINENO" "db.h" "ac_cv_header_db_h" "$ac_includes_default" -+if test "x$ac_cv_header_db_h" = x""yes; then : -+ cat >>confdefs.h <<_ACEOF -+#define HAVE_DB_H 1 - _ACEOF +-_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; @@ -10780,10 +11029,10 @@ Index: pam.deb/configure -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - +- - ac_header_preproc=no - fi - +-fi +- -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } @@ -10824,30 +11073,26 @@ Index: pam.deb/configure - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -+done - -+ fi - fi +- +-fi -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then -- cat >>confdefs.h <<_ACEOF ++ for ac_header in ndbm.h ++do : ++ ac_fn_c_check_header_mongrel "$LINENO" "ndbm.h" "ac_cv_header_ndbm_h" "$ac_includes_default" ++if test "x$ac_cv_header_ndbm_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 --_ACEOF ++#define HAVE_NDBM_H 1 + _ACEOF -+ if test ! -z "$LIBDB"; then -+ HAVE_LIBDB_TRUE= -+ HAVE_LIBDB_FALSE='#' -+else -+ HAVE_LIBDB_TRUE='#' -+ HAVE_LIBDB_FALSE= fi +@@ -15620,146 +13261,12 @@ --done + fi + else - -- fi -- else - -for ac_header in db.h -do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` @@ -10855,16 +11100,13 @@ Index: pam.deb/configure - { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for yp_get_default_domain in -lnsl" >&5 -+$as_echo_n "checking for yp_get_default_domain in -lnsl... " >&6; } -+if test "${ac_cv_lib_nsl_yp_get_default_domain+set}" = set; then : - $as_echo_n "(cached) " >&6 +- $as_echo_n "(cached) " >&6 -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - else +-else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -$as_echo_n "checking $ac_header usability... " >&6; } @@ -10988,45 +11230,39 @@ Index: pam.deb/configure -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then -- cat >>confdefs.h <<_ACEOF ++ for ac_header in db.h ++do : ++ ac_fn_c_check_header_mongrel "$LINENO" "db.h" "ac_cv_header_db_h" "$ac_includes_default" ++if test "x$ac_cv_header_db_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 --_ACEOF -- --fi -- --done -- -- fi --fi -- -- if test ! -z "$LIBDB"; then -- HAVE_LIBDB_TRUE= -- HAVE_LIBDB_FALSE='#' --else -- HAVE_LIBDB_TRUE='#' -- HAVE_LIBDB_FALSE= --fi -- -- ++#define HAVE_DB_H 1 + _ACEOF + + fi +@@ -15778,18 +13285,14 @@ + fi + + -{ $as_echo "$as_me:$LINENO: checking for yp_get_default_domain in -lnsl" >&5 --$as_echo_n "checking for yp_get_default_domain in -lnsl... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for yp_get_default_domain in -lnsl" >&5 + $as_echo_n "checking for yp_get_default_domain in -lnsl... " >&6; } -if test "${ac_cv_lib_nsl_yp_get_default_domain+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-lnsl $LIBS" ++if test "${ac_cv_lib_nsl_yp_get_default_domain+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lnsl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-lnsl $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -15807,43 +13282,18 @@ +@@ -15807,43 +13310,18 @@ return 0; } _ACEOF @@ -11076,7 +11312,7 @@ Index: pam.deb/configure LIBNSL="-lnsl" else LIBNSL="" -@@ -15851,107 +13301,12 @@ +@@ -15851,107 +13329,12 @@ BACKUP_LIBS=$LIBS LIBS="$LIBS $LIBNSL" @@ -11189,7 +11425,7 @@ Index: pam.deb/configure cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF -@@ -15963,25 +13318,21 @@ +@@ -15963,25 +13346,21 @@ # Check whether --enable-selinux was given. @@ -11219,7 +11455,7 @@ Index: pam.deb/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -15999,43 +13350,18 @@ +@@ -15999,43 +13378,18 @@ return 0; } _ACEOF @@ -11269,7 +11505,7 @@ Index: pam.deb/configure LIBSELINUX="-lselinux" else LIBSELINUX="" -@@ -16055,304 +13381,86 @@ +@@ -16055,210 +13409,28 @@ if test ! -z "$LIBSELINUX" ; then @@ -11304,34 +11540,22 @@ Index: pam.deb/configure -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - +- -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ -+fi -+done -#ifdef __STDC__ -# include -#else -# include -#endif -+ for ac_func in getseuser -+do : -+ ac_fn_c_check_func "$LINENO" "getseuser" "ac_cv_func_getseuser" -+if test "x$ac_cv_func_getseuser" = x""yes; then : -+ cat >>confdefs.h <<_ACEOF -+#define HAVE_GETSEUSER 1 -+_ACEOF -+ +fi +done -#undef $ac_func -+ LIBS=$BACKUP_LIBS -+fi - +- -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ @@ -11345,29 +11569,15 @@ Index: pam.deb/configure -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif -+ac_header_dirent=no -+for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do -+ as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5 -+$as_echo_n "checking for $ac_hdr that defines DIR... " >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include -+#include <$ac_hdr> - - int - main () - { +- +-int +-main () +-{ -return $ac_func (); -+if ((DIR *) 0) -+return 0; - ; - return 0; - } - _ACEOF +- ; +- return 0; +-} +-_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in @@ -11390,56 +11600,40 @@ Index: pam.deb/configure - $as_test_x conftest$ac_exeext - }; then - eval "$as_ac_var=yes" -+if ac_fn_c_try_compile "$LINENO"; then : -+ eval "$as_ac_Header=yes" - else +-else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" -+ eval "$as_ac_Header=no" - fi +-fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi +-fi -ac_res=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+eval ac_res=\$$as_ac_Header -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 - $as_echo "$ac_res" >&6; } +-$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then -+eval as_val=\$$as_ac_Header -+ if test "x$as_val" = x""yes; then : - cat >>confdefs.h <<_ACEOF +- cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -+#define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1 - _ACEOF - -+ac_header_dirent=$ac_hdr; break - fi +-_ACEOF +- +-fi -done - - +- -for ac_func in getseuser -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -$as_echo_n "checking for $ac_func... " >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then -+done -+# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. -+if test $ac_header_dirent = dirent.h; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5 -+$as_echo_n "checking for library containing opendir... " >&6; } -+if test "${ac_cv_search_opendir+set}" = set; then : - $as_echo_n "(cached) " >&6 - else +- $as_echo_n "(cached) " >&6 +-else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF @@ -11528,44 +11722,48 @@ Index: pam.deb/configure - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF -- --fi --done -- -- LIBS=$BACKUP_LIBS --fi -- ++ for ac_func in getseuser ++do : ++ ac_fn_c_check_func "$LINENO" "getseuser" "ac_cv_func_getseuser" ++if test "x$ac_cv_func_getseuser" = x""yes; then : ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_GETSEUSER 1 ++_ACEOF + + fi + done +@@ -16266,24 +13438,15 @@ + LIBS=$BACKUP_LIBS + fi + - - - - - --ac_header_dirent=no --for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do -- as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` + ac_header_dirent=no + for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do + as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5 --$as_echo_n "checking for $ac_hdr that defines DIR... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5 + $as_echo_n "checking for $ac_hdr that defines DIR... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- $as_echo_n "(cached) " >&6 --else ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 + else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include --#include <$ac_hdr> -- --int --main () --{ --if ((DIR *) 0) --return 0; -- ; -- return 0; --} --_ACEOF ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + #include <$ac_hdr> +@@ -16297,41 +13460,18 @@ + return 0; + } + _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in @@ -11584,50 +11782,54 @@ Index: pam.deb/configure - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then -- eval "$as_ac_Header=yes" --else ++if ac_fn_c_try_compile "$LINENO"; then : + eval "$as_ac_Header=yes" + else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Header=no" --fi ++ eval "$as_ac_Header=no" + fi - --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --fi + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } ++eval ac_res=\$$as_ac_Header ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then -- cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1 --_ACEOF -- --ac_header_dirent=$ac_hdr; break --fi -- --done --# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. --if test $ac_header_dirent = dirent.h; then ++eval as_val=\$$as_ac_Header ++ if test "x$as_val" = x""yes; then : + cat >>confdefs.h <<_ACEOF + #define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1 + _ACEOF +@@ -16342,17 +13482,13 @@ + done + # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. + if test $ac_header_dirent = dirent.h; then - { $as_echo "$as_me:$LINENO: checking for library containing opendir" >&5 --$as_echo_n "checking for library containing opendir... " >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5 + $as_echo_n "checking for library containing opendir... " >&6; } -if test "${ac_cv_search_opendir+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- ac_func_search_save_LIBS=$LIBS ++if test "${ac_cv_search_opendir+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_func_search_save_LIBS=$LIBS -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -+ ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -16377,70 +13485,39 @@ +@@ -16377,70 +13513,39 @@ ac_res=-l$ac_lib LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi @@ -11709,7 +11911,7 @@ Index: pam.deb/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -16465,70 +13542,39 @@ +@@ -16465,70 +13570,39 @@ ac_res=-l$ac_lib LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi @@ -11791,7 +11993,7 @@ Index: pam.deb/configure /* end confdefs.h. */ #include #include -@@ -16543,48 +13589,23 @@ +@@ -16543,48 +13617,23 @@ return 0; } _ACEOF @@ -11845,7 +12047,7 @@ Index: pam.deb/configure else ac_cv_header_stdc=no fi -@@ -16594,18 +13615,14 @@ +@@ -16594,18 +13643,14 @@ if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. @@ -11867,7 +12069,7 @@ Index: pam.deb/configure else ac_cv_header_stdc=no fi -@@ -16615,14 +13632,10 @@ +@@ -16615,14 +13660,10 @@ if test $ac_cv_header_stdc = yes; then # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. @@ -11884,7 +12086,7 @@ Index: pam.deb/configure /* end confdefs.h. */ #include #include -@@ -16649,64 +13662,31 @@ +@@ -16649,64 +13690,31 @@ return 0; } _ACEOF @@ -11959,7 +12161,7 @@ Index: pam.deb/configure /* end confdefs.h. */ #include #include -@@ -16727,413 +13707,94 @@ +@@ -16727,413 +13735,94 @@ return 0; } _ACEOF @@ -12100,31 +12302,9 @@ Index: pam.deb/configure -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -+if ac_fn_c_try_compile "$LINENO"; then : - +- - ac_header_compiler=no -+ # Check for potential -arch flags. It is not universal unless -+ # there are at least two -arch flags with different values. -+ ac_arch= -+ ac_prev= -+ for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do -+ if test -n "$ac_prev"; then -+ case $ac_word in -+ i?86 | x86_64 | ppc | ppc64) -+ if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then -+ ac_arch=$ac_word -+ else -+ ac_cv_c_bigendian=universal -+ break -+ fi -+ ;; -+ esac -+ ac_prev= -+ elif test "x$ac_word" = "x-arch"; then -+ ac_prev=arch -+ fi -+ done - fi +-fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 @@ -12407,8 +12587,9 @@ Index: pam.deb/configure - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then -- -- # Check for potential -arch flags. It is not universal unless ++if ac_fn_c_try_compile "$LINENO"; then : + + # Check for potential -arch flags. It is not universal unless - # there are some -arch flags. Note that *ppc* also matches - # ppc64. This check is also rather less than ideal. - case "${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}" in #( @@ -12419,7 +12600,27 @@ Index: pam.deb/configure -sed 's/^/| /' conftest.$ac_ext >&5 - - --fi ++ # there are at least two -arch flags with different values. ++ ac_arch= ++ ac_prev= ++ for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do ++ if test -n "$ac_prev"; then ++ case $ac_word in ++ i?86 | x86_64 | ppc | ppc64) ++ if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then ++ ac_arch=$ac_word ++ else ++ ac_cv_c_bigendian=universal ++ break ++ fi ++ ;; ++ esac ++ ac_prev= ++ elif test "x$ac_word" = "x-arch"; then ++ ac_prev=arch ++ fi ++ done + fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test $ac_cv_c_bigendian = unknown; then @@ -12433,7 +12634,7 @@ Index: pam.deb/configure /* end confdefs.h. */ #include #include -@@ -17151,30 +13812,9 @@ +@@ -17151,30 +13840,9 @@ return 0; } _ACEOF @@ -12466,7 +12667,7 @@ Index: pam.deb/configure /* end confdefs.h. */ #include #include -@@ -17190,49 +13830,18 @@ +@@ -17190,49 +13858,18 @@ return 0; } _ACEOF @@ -12519,7 +12720,7 @@ Index: pam.deb/configure /* end confdefs.h. */ #include -@@ -17247,30 +13856,9 @@ +@@ -17247,30 +13884,9 @@ return 0; } _ACEOF @@ -12552,7 +12753,7 @@ Index: pam.deb/configure /* end confdefs.h. */ #include -@@ -17285,51 +13873,20 @@ +@@ -17285,51 +13901,20 @@ return 0; } _ACEOF @@ -12608,7 +12809,7 @@ Index: pam.deb/configure /* end confdefs.h. */ short int ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; -@@ -17355,24 +13912,7 @@ +@@ -17355,24 +13940,7 @@ return 0; } _ACEOF @@ -12634,7 +12835,7 @@ Index: pam.deb/configure if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then ac_cv_c_bigendian=yes fi -@@ -17384,20 +13924,10 @@ +@@ -17384,20 +13952,10 @@ ac_cv_c_bigendian=unknown fi fi @@ -12656,7 +12857,7 @@ Index: pam.deb/configure /* end confdefs.h. */ $ac_includes_default int -@@ -17417,79 +13947,41 @@ +@@ -17417,79 +13975,41 @@ return 0; } _ACEOF @@ -12748,7 +12949,7 @@ Index: pam.deb/configure /* end confdefs.h. */ int -@@ -17549,60 +14041,33 @@ +@@ -17549,60 +14069,33 @@ return 0; } _ACEOF @@ -12817,7 +13018,7 @@ Index: pam.deb/configure ac_cv_type_uid_t=yes else ac_cv_type_uid_t=no -@@ -17610,117 +14075,20 @@ +@@ -17610,117 +14103,20 @@ rm -f conftest* fi @@ -12940,7 +13141,7 @@ Index: pam.deb/configure else cat >>confdefs.h <<_ACEOF -@@ -17729,102 +14097,9 @@ +@@ -17729,102 +14125,9 @@ fi @@ -13031,11 +13232,11 @@ Index: pam.deb/configure - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -- --fi +ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default" +if test "x$ac_cv_type_pid_t" = x""yes; then : +-fi +- -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5 @@ -13045,7 +13246,7 @@ Index: pam.deb/configure else cat >>confdefs.h <<_ACEOF -@@ -17833,102 +14108,9 @@ +@@ -17833,102 +14136,9 @@ fi @@ -13150,7 +13351,7 @@ Index: pam.deb/configure else cat >>confdefs.h <<_ACEOF -@@ -17937,16 +14119,12 @@ +@@ -17937,16 +14147,12 @@ fi @@ -13170,7 +13371,7 @@ Index: pam.deb/configure /* end confdefs.h. */ #include #include -@@ -17961,54 +14139,27 @@ +@@ -17961,54 +14167,27 @@ return 0; } _ACEOF @@ -13232,7 +13433,7 @@ Index: pam.deb/configure /* end confdefs.h. */ #include #include -@@ -18023,58 +14174,31 @@ +@@ -18023,58 +14202,31 @@ return 0; } _ACEOF @@ -13299,7 +13500,7 @@ Index: pam.deb/configure /* end confdefs.h. */ /* Thanks to Mike Rendell for this test. */ $ac_includes_default -@@ -18100,54 +14224,23 @@ +@@ -18100,54 +14252,23 @@ return n > 0 && gidset[n] != val.gval; } _ACEOF @@ -13360,7 +13561,7 @@ Index: pam.deb/configure ac_cv_type_getgroups=gid_t else ac_cv_type_getgroups=int -@@ -18156,7 +14249,7 @@ +@@ -18156,7 +14277,7 @@ fi fi @@ -13369,7 +13570,7 @@ Index: pam.deb/configure $as_echo "$ac_cv_type_getgroups" >&6; } cat >>confdefs.h <<_ACEOF -@@ -18165,23 +14258,19 @@ +@@ -18165,23 +14286,19 @@ if test $ac_cv_c_compiler_gnu = yes; then @@ -13397,7 +13598,7 @@ Index: pam.deb/configure ac_cv_prog_gcc_traditional=yes else ac_cv_prog_gcc_traditional=no -@@ -18190,43 +14279,35 @@ +@@ -18190,43 +14307,35 @@ if test $ac_cv_prog_gcc_traditional = no; then @@ -13448,7 +13649,7 @@ Index: pam.deb/configure /* end confdefs.h. */ $ac_includes_default int -@@ -18261,44 +14342,17 @@ +@@ -18261,44 +14370,17 @@ return 0; } _ACEOF @@ -13498,7 +13699,7 @@ Index: pam.deb/configure $as_echo "$ac_cv_func_memcmp_working" >&6; } test $ac_cv_func_memcmp_working = no && case " $LIBOBJS " in *" memcmp.$ac_objext "* ) ;; -@@ -18307,300 +14361,31 @@ +@@ -18307,194 +14389,18 @@ esac @@ -13513,33 +13714,25 @@ Index: pam.deb/configure -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -+do : -+ ac_fn_c_check_func "$LINENO" "vprintf" "ac_cv_func_vprintf" -+if test "x$ac_cv_func_vprintf" = x""yes; then : -+ cat >>confdefs.h <<_ACEOF -+#define HAVE_VPRINTF 1 - _ACEOF +-_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - +- -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ -+ac_fn_c_check_func "$LINENO" "_doprnt" "ac_cv_func__doprnt" -+if test "x$ac_cv_func__doprnt" = x""yes; then : - +- -#ifdef __STDC__ -# include -#else -# include -#endif -+$as_echo "#define HAVE_DOPRNT 1" >>confdefs.h - +- -#undef $ac_func - -/* Override any GCC internal prototype to avoid an error. @@ -13604,7 +13797,10 @@ Index: pam.deb/configure -as_val=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then -- cat >>confdefs.h <<_ACEOF ++do : ++ ac_fn_c_check_func "$LINENO" "vprintf" "ac_cv_func_vprintf" ++if test "x$ac_cv_func_vprintf" = x""yes; then : + cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF - @@ -13657,7 +13853,8 @@ Index: pam.deb/configure - ; - return 0; -} --_ACEOF ++#define HAVE_VPRINTF 1 + _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in @@ -13686,7 +13883,7 @@ Index: pam.deb/configure - - ac_cv_func__doprnt=no -fi -- + -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext @@ -13694,15 +13891,17 @@ Index: pam.deb/configure -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func__doprnt" >&5 -$as_echo "$ac_cv_func__doprnt" >&6; } -if test "x$ac_cv_func__doprnt" = x""yes; then -- ++ac_fn_c_check_func "$LINENO" "_doprnt" "ac_cv_func__doprnt" ++if test "x$ac_cv_func__doprnt" = x""yes; then : + -cat >>confdefs.h <<\_ACEOF -#define HAVE_DOPRNT 1 -_ACEOF -- --fi -+fi ++$as_echo "#define HAVE_DOPRNT 1" >>confdefs.h fi + +@@ -18502,105 +14408,12 @@ done @@ -13813,7 +14012,7 @@ Index: pam.deb/configure cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF -@@ -18608,105 +14393,12 @@ +@@ -18608,105 +14421,12 @@ fi done @@ -13924,7 +14123,7 @@ Index: pam.deb/configure cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF -@@ -18714,104 +14406,12 @@ +@@ -18714,104 +14434,12 @@ fi done @@ -14034,7 +14233,7 @@ Index: pam.deb/configure cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF -@@ -18819,102 +14419,12 @@ +@@ -18819,102 +14447,12 @@ fi done @@ -14142,7 +14341,7 @@ Index: pam.deb/configure cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF -@@ -18922,102 +14432,12 @@ +@@ -18922,102 +14460,12 @@ fi done @@ -14250,7 +14449,7 @@ Index: pam.deb/configure cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF -@@ -19026,102 +14446,12 @@ +@@ -19026,102 +14474,12 @@ done @@ -14357,7 +14556,7 @@ Index: pam.deb/configure _ACEOF UNSHARE=yes else -@@ -19139,7 +14469,7 @@ +@@ -19139,7 +14497,7 @@ # Check whether --enable-regenerate-docu was given. @@ -14366,7 +14565,7 @@ Index: pam.deb/configure enableval=$enable_regenerate_docu; enable_docu=$enableval else enable_docu=yes -@@ -19147,9 +14477,9 @@ +@@ -19147,9 +14505,9 @@ # Extract the first word of "xsltproc", so it can be a program name with args. set dummy xsltproc; ac_word=$2 @@ -14378,7 +14577,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else case $XSLTPROC in -@@ -19162,14 +14492,14 @@ +@@ -19162,14 +14520,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -14396,7 +14595,7 @@ Index: pam.deb/configure IFS=$as_save_IFS ;; -@@ -19177,10 +14507,10 @@ +@@ -19177,10 +14535,10 @@ fi XSLTPROC=$ac_cv_path_XSLTPROC if test -n "$XSLTPROC"; then @@ -14409,7 +14608,7 @@ Index: pam.deb/configure $as_echo "no" >&6; } fi -@@ -19190,9 +14520,9 @@ +@@ -19190,9 +14548,9 @@ fi # Extract the first word of "xmllint", so it can be a program name with args. set dummy xmllint; ac_word=$2 @@ -14421,7 +14620,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else case $XMLLINT in -@@ -19205,14 +14535,14 @@ +@@ -19205,14 +14563,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -14439,7 +14638,7 @@ Index: pam.deb/configure IFS=$as_save_IFS test -z "$ac_cv_path_XMLLINT" && ac_cv_path_XMLLINT="/bin/true" -@@ -19221,10 +14551,10 @@ +@@ -19221,10 +14579,10 @@ fi XMLLINT=$ac_cv_path_XMLLINT if test -n "$XMLLINT"; then @@ -14452,7 +14651,7 @@ Index: pam.deb/configure $as_echo "no" >&6; } fi -@@ -19233,7 +14563,7 @@ +@@ -19233,7 +14591,7 @@ # check for the presence of the XML catalog # Check whether --with-xml-catalog was given. @@ -14461,7 +14660,7 @@ Index: pam.deb/configure withval=$with_xml_catalog; else with_xml_catalog=/etc/xml/catalog -@@ -19242,23 +14572,23 @@ +@@ -19242,23 +14600,23 @@ jh_found_xmlcatalog=true XML_CATALOG_FILE="$with_xml_catalog" @@ -14490,7 +14689,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else case $XMLCATALOG in -@@ -19271,14 +14601,14 @@ +@@ -19271,14 +14629,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -14508,7 +14707,7 @@ Index: pam.deb/configure IFS=$as_save_IFS test -z "$ac_cv_path_XMLCATALOG" && ac_cv_path_XMLCATALOG="no" -@@ -19287,10 +14617,10 @@ +@@ -19287,10 +14645,10 @@ fi XMLCATALOG=$ac_cv_path_XMLCATALOG if test -n "$XMLCATALOG"; then @@ -14521,7 +14720,7 @@ Index: pam.deb/configure $as_echo "no" >&6; } fi -@@ -19306,35 +14636,35 @@ +@@ -19306,35 +14664,35 @@ fi @@ -14569,7 +14768,7 @@ Index: pam.deb/configure $as_echo "not found" >&6; } enable_docu=no fi -@@ -19342,9 +14672,9 @@ +@@ -19342,9 +14700,9 @@ # Extract the first word of "w3m", so it can be a program name with args. set dummy w3m; ac_word=$2 @@ -14581,7 +14780,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else case $BROWSER in -@@ -19357,14 +14687,14 @@ +@@ -19357,14 +14715,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -14599,7 +14798,7 @@ Index: pam.deb/configure IFS=$as_save_IFS ;; -@@ -19372,10 +14702,10 @@ +@@ -19372,10 +14730,10 @@ fi BROWSER=$ac_cv_path_BROWSER if test -n "$BROWSER"; then @@ -14612,7 +14811,7 @@ Index: pam.deb/configure $as_echo "no" >&6; } fi -@@ -19388,9 +14718,9 @@ +@@ -19388,9 +14746,9 @@ # Extract the first word of "fop", so it can be a program name with args. set dummy fop; ac_word=$2 @@ -14624,7 +14823,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else case $FO2PDF in -@@ -19403,14 +14733,14 @@ +@@ -19403,14 +14761,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -14642,7 +14841,7 @@ Index: pam.deb/configure IFS=$as_save_IFS ;; -@@ -19418,10 +14748,10 @@ +@@ -19418,10 +14776,10 @@ fi FO2PDF=$ac_cv_path_FO2PDF if test -n "$FO2PDF"; then @@ -14655,7 +14854,7 @@ Index: pam.deb/configure $as_echo "no" >&6; } fi -@@ -19447,16 +14777,16 @@ +@@ -19447,16 +14805,16 @@ @@ -14675,7 +14874,7 @@ Index: pam.deb/configure $as_echo "$USE_NLS" >&6; } -@@ -19497,9 +14827,9 @@ +@@ -19497,9 +14855,9 @@ # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 @@ -14687,7 +14886,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else case "$MSGFMT" in -@@ -19529,18 +14859,18 @@ +@@ -19529,18 +14887,18 @@ fi MSGFMT="$ac_cv_path_MSGFMT" if test "$MSGFMT" != ":"; then @@ -14710,7 +14909,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else case $GMSGFMT in -@@ -19553,14 +14883,14 @@ +@@ -19553,14 +14911,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -14728,7 +14927,7 @@ Index: pam.deb/configure IFS=$as_save_IFS test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" -@@ -19569,10 +14899,10 @@ +@@ -19569,10 +14927,10 @@ fi GMSGFMT=$ac_cv_path_GMSGFMT if test -n "$GMSGFMT"; then @@ -14741,7 +14940,7 @@ Index: pam.deb/configure $as_echo "no" >&6; } fi -@@ -19620,9 +14950,9 @@ +@@ -19620,9 +14978,9 @@ # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 @@ -14753,7 +14952,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else case "$XGETTEXT" in -@@ -19652,10 +14982,10 @@ +@@ -19652,10 +15010,10 @@ fi XGETTEXT="$ac_cv_path_XGETTEXT" if test "$XGETTEXT" != ":"; then @@ -14766,7 +14965,7 @@ Index: pam.deb/configure $as_echo "no" >&6; } fi -@@ -19698,9 +15028,9 @@ +@@ -19698,9 +15056,9 @@ # Extract the first word of "msgmerge", so it can be a program name with args. set dummy msgmerge; ac_word=$2 @@ -14778,7 +14977,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else case "$MSGMERGE" in -@@ -19729,10 +15059,10 @@ +@@ -19729,10 +15087,10 @@ fi MSGMERGE="$ac_cv_path_MSGMERGE" if test "$MSGMERGE" != ":"; then @@ -14791,7 +14990,7 @@ Index: pam.deb/configure $as_echo "no" >&6; } fi -@@ -19764,7 +15094,7 @@ +@@ -19764,7 +15122,7 @@ # Check whether --with-gnu-ld was given. @@ -14800,7 +14999,7 @@ Index: pam.deb/configure withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes else with_gnu_ld=no -@@ -19786,7 +15116,7 @@ +@@ -19786,7 +15144,7 @@ ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. @@ -14809,7 +15008,7 @@ Index: pam.deb/configure $as_echo_n "checking for ld used by GCC... " >&6; } case $host in *-*-mingw*) -@@ -19816,13 +15146,13 @@ +@@ -19816,13 +15174,13 @@ ;; esac elif test "$with_gnu_ld" = yes; then @@ -14826,7 +15025,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else if test -z "$LD"; then -@@ -19850,18 +15180,16 @@ +@@ -19850,18 +15208,16 @@ LD="$acl_cv_path_LD" if test -n "$LD"; then @@ -14850,7 +15049,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else # I'd rather use --version here, but apparently some GNU ld's only accept -v. -@@ -19872,16 +15200,16 @@ +@@ -19872,16 +15228,16 @@ acl_cv_prog_gnu_ld=no ;; esac fi @@ -14870,7 +15069,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else -@@ -19892,7 +15220,7 @@ +@@ -19892,7 +15248,7 @@ acl_cv_rpath=done fi @@ -14879,7 +15078,7 @@ Index: pam.deb/configure $as_echo "$acl_cv_rpath" >&6; } wl="$acl_cv_wl" acl_libext="$acl_cv_libext" -@@ -19904,7 +15232,7 @@ +@@ -19904,7 +15260,7 @@ acl_hardcode_direct="$acl_cv_hardcode_direct" acl_hardcode_minus_L="$acl_cv_hardcode_minus_L" # Check whether --enable-rpath was given. @@ -14888,7 +15087,7 @@ Index: pam.deb/configure enableval=$enable_rpath; : else enable_rpath=yes -@@ -19953,7 +15281,7 @@ +@@ -19953,7 +15309,7 @@ # Check whether --with-libiconv-prefix was given. @@ -14897,7 +15096,7 @@ Index: pam.deb/configure withval=$with_libiconv_prefix; if test "X$withval" = "Xno"; then use_additional=no -@@ -20393,18 +15721,14 @@ +@@ -20393,18 +15749,14 @@ @@ -14919,7 +15118,7 @@ Index: pam.deb/configure /* end confdefs.h. */ #include int -@@ -20415,61 +15739,30 @@ +@@ -20415,61 +15767,30 @@ return 0; } _ACEOF @@ -14990,7 +15189,7 @@ Index: pam.deb/configure /* end confdefs.h. */ #include int -@@ -20480,47 +15773,20 @@ +@@ -20480,47 +15801,20 @@ return 0; } _ACEOF @@ -15044,7 +15243,7 @@ Index: pam.deb/configure fi INTL_MACOSX_LIBS= -@@ -20565,16 +15831,12 @@ +@@ -20565,16 +15859,12 @@ gt_expression_test_code= fi @@ -15064,7 +15263,7 @@ Index: pam.deb/configure /* end confdefs.h. */ #include $gt_revision_test_code -@@ -20589,42 +15851,16 @@ +@@ -20589,42 +15879,16 @@ return 0; } _ACEOF @@ -15113,7 +15312,7 @@ Index: pam.deb/configure $as_echo "$ac_res" >&6; } if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then -@@ -20658,19 +15894,15 @@ +@@ -20658,19 +15922,15 @@ done @@ -15136,7 +15335,7 @@ Index: pam.deb/configure /* end confdefs.h. */ #include #include -@@ -20684,46 +15916,15 @@ +@@ -20684,46 +15944,15 @@ return 0; } _ACEOF @@ -15187,7 +15386,7 @@ Index: pam.deb/configure /* end confdefs.h. */ #include #include -@@ -20737,49 +15938,22 @@ +@@ -20737,49 +15966,22 @@ return 0; } _ACEOF @@ -15243,7 +15442,7 @@ Index: pam.deb/configure $as_echo_n "(cached) " >&6 else -@@ -20787,17 +15961,13 @@ +@@ -20787,17 +15989,13 @@ if test $am_cv_lib_iconv = yes; then LIBS="$LIBS $LIBICONV" fi @@ -15263,7 +15462,7 @@ Index: pam.deb/configure /* end confdefs.h. */ #include -@@ -20857,46 +16027,19 @@ +@@ -20857,46 +16055,19 @@ return 0; } _ACEOF @@ -15315,7 +15514,7 @@ Index: pam.deb/configure $as_echo "$am_cv_func_iconv_works" >&6; } case "$am_cv_func_iconv_works" in *no) am_func_iconv=no am_cv_lib_iconv=no ;; -@@ -20907,15 +16050,13 @@ +@@ -20907,15 +16078,13 @@ fi if test "$am_func_iconv" = yes; then @@ -15334,7 +15533,7 @@ Index: pam.deb/configure $as_echo "$LIBICONV" >&6; } else CPPFLAGS="$am_save_CPPFLAGS" -@@ -20945,7 +16086,7 @@ +@@ -20945,7 +16114,7 @@ # Check whether --with-libintl-prefix was given. @@ -15343,7 +15542,7 @@ Index: pam.deb/configure withval=$with_libintl_prefix; if test "X$withval" = "Xno"; then use_additional=no -@@ -21361,20 +16502,16 @@ +@@ -21361,20 +16530,16 @@ done fi @@ -15367,7 +15566,7 @@ Index: pam.deb/configure /* end confdefs.h. */ #include $gt_revision_test_code -@@ -21393,45 +16530,16 @@ +@@ -21393,45 +16558,16 @@ return 0; } _ACEOF @@ -15418,7 +15617,7 @@ Index: pam.deb/configure /* end confdefs.h. */ #include $gt_revision_test_code -@@ -21450,48 +16558,20 @@ +@@ -21450,48 +16586,20 @@ return 0; } _ACEOF @@ -15472,7 +15671,7 @@ Index: pam.deb/configure $as_echo "$ac_res" >&6; } fi -@@ -21519,21 +16599,19 @@ +@@ -21519,21 +16627,19 @@ if test "$gt_use_preinstalled_gnugettext" = "yes" \ || test "$nls_cv_use_gnu_gettext" = "yes"; then @@ -15498,7 +15697,7 @@ Index: pam.deb/configure $as_echo_n "checking where the gettext function comes from... " >&6; } if test "$gt_use_preinstalled_gnugettext" = "yes"; then if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then -@@ -21544,7 +16622,7 @@ +@@ -21544,7 +16650,7 @@ else gt_source="included intl directory" fi @@ -15507,7 +15706,7 @@ Index: pam.deb/configure $as_echo "$gt_source" >&6; } fi -@@ -21552,9 +16630,9 @@ +@@ -21552,9 +16658,9 @@ if test "$gt_use_preinstalled_gnugettext" = "yes"; then if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then @@ -15519,7 +15718,7 @@ Index: pam.deb/configure $as_echo "$LIBINTL" >&6; } for element in $INCINTL; do -@@ -21582,14 +16660,10 @@ +@@ -21582,14 +16688,10 @@ fi @@ -15536,7 +15735,7 @@ Index: pam.deb/configure fi -@@ -21598,233 +16672,38 @@ +@@ -21598,233 +16700,38 @@ @@ -15792,7 +15991,7 @@ Index: pam.deb/configure have_key_errors=1 else have_key_errors=0 -@@ -21839,9 +16718,7 @@ +@@ -21839,9 +16746,7 @@ if test $HAVE_KEY_MANAGEMENT = 1; then @@ -15803,7 +16002,7 @@ Index: pam.deb/configure fi HAVE_KEY_MANAGEMENT=$HAVE_KEY_MANAGEMENT -@@ -21885,13 +16762,13 @@ +@@ -21885,13 +16790,13 @@ case $ac_val in #( *${as_nl}*) case $ac_var in #( @@ -15819,7 +16018,7 @@ Index: pam.deb/configure esac ;; esac done -@@ -21899,8 +16776,8 @@ +@@ -21899,8 +16804,8 @@ (set) 2>&1 | case $as_nl`(ac_space=' '; set) 2>&1` in #( *${as_nl}ac_space=\ *) @@ -15830,7 +16029,7 @@ Index: pam.deb/configure sed -n \ "s/'/'\\\\''/g; s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" -@@ -21923,11 +16800,11 @@ +@@ -21923,11 +16828,11 @@ if diff "$cache_file" confcache >/dev/null 2>&1; then :; else if test -w "$cache_file"; then test "x$cache_file" != "x/dev/null" && @@ -15844,7 +16043,7 @@ Index: pam.deb/configure $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} fi fi -@@ -21947,8 +16824,8 @@ +@@ -21947,8 +16852,8 @@ ac_i=`$as_echo "$ac_i" | sed "$ac_script"` # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR # will be set to the directory where LIBOBJS objects are built. @@ -15855,7 +16054,7 @@ Index: pam.deb/configure done LIBOBJS=$ac_libobjs -@@ -21964,105 +16841,67 @@ +@@ -21964,105 +16869,67 @@ fi if test -z "${STATIC_MODULES_TRUE}" && test -z "${STATIC_MODULES_FALSE}"; then @@ -15990,7 +16189,7 @@ Index: pam.deb/configure #! $SHELL # Generated by $as_me. # Run this file to recreate the current configuration. -@@ -22072,17 +16911,18 @@ +@@ -22072,17 +16939,18 @@ debug=false ac_cs_recheck=false ac_cs_silent=false @@ -16016,7 +16215,7 @@ Index: pam.deb/configure emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which -@@ -22090,23 +16930,15 @@ +@@ -22090,23 +16958,15 @@ alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else @@ -16045,7 +16244,7 @@ Index: pam.deb/configure as_nl=' ' export as_nl -@@ -22114,7 +16946,13 @@ +@@ -22114,7 +16974,13 @@ as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo @@ -16060,7 +16259,7 @@ Index: pam.deb/configure as_echo='printf %s\n' as_echo_n='printf %s' else -@@ -22125,7 +16963,7 @@ +@@ -22125,7 +16991,7 @@ as_echo_body='eval expr "X$1" : "X\\(.*\\)"' as_echo_n_body='eval arg=$1; @@ -16069,7 +16268,7 @@ Index: pam.deb/configure *"$as_nl"*) expr "X$arg" : "X\\(.*\\)$as_nl"; arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; -@@ -22148,13 +16986,6 @@ +@@ -22148,13 +17014,6 @@ } fi @@ -16083,7 +16282,7 @@ Index: pam.deb/configure # IFS # We need space, tab and new line, in precisely that order. Quoting is -@@ -22164,15 +16995,15 @@ +@@ -22164,15 +17023,15 @@ IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. @@ -16102,7 +16301,7 @@ Index: pam.deb/configure IFS=$as_save_IFS ;; -@@ -22184,12 +17015,16 @@ +@@ -22184,12 +17043,16 @@ fi if test ! -f "$as_myself"; then $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 @@ -16123,7 +16322,7 @@ Index: pam.deb/configure done PS1='$ ' PS2='> ' -@@ -22201,7 +17036,89 @@ +@@ -22201,7 +17064,89 @@ LANGUAGE=C export LANGUAGE @@ -16214,7 +16413,7 @@ Index: pam.deb/configure if expr a : '\(a\)' >/dev/null 2>&1 && test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr -@@ -22215,8 +17132,12 @@ +@@ -22215,8 +17160,12 @@ as_basename=false fi @@ -16228,7 +16427,7 @@ Index: pam.deb/configure as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ -@@ -22236,76 +17157,25 @@ +@@ -22236,76 +17185,25 @@ } s/.*/./; q'` @@ -16316,7 +16515,7 @@ Index: pam.deb/configure rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then -@@ -22334,8 +17204,56 @@ +@@ -22334,8 +17232,56 @@ rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -16374,7 +16573,7 @@ Index: pam.deb/configure else test -d ./-p && rmdir ./-p as_mkdir_p=false -@@ -22354,10 +17272,10 @@ +@@ -22354,10 +17300,10 @@ if test -d "$1"; then test -d "$1/."; else @@ -16387,7 +16586,7 @@ Index: pam.deb/configure ???[sx]*):;;*)false;;esac;fi '\'' sh ' -@@ -22372,13 +17290,19 @@ +@@ -22372,13 +17318,19 @@ exec 6>&1 @@ -16405,11 +16604,11 @@ Index: pam.deb/configure ac_log=" This file was extended by $as_me, which was -generated by GNU Autoconf 2.63. Invocation command line was -+generated by GNU Autoconf 2.64. Invocation command line was ++generated by GNU Autoconf 2.65. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS -@@ -22410,10 +17334,11 @@ +@@ -22410,13 +17362,15 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ac_cs_usage="\ @@ -16424,7 +16623,11 @@ Index: pam.deb/configure -h, --help print this help, then exit -V, --version print version number and configuration settings, then exit -@@ -22435,16 +17360,16 @@ ++ --config print configuration, then exit + -q, --quiet, --silent + do not print progress messages + -d, --debug don't remove temporary files +@@ -22435,16 +17389,17 @@ Configuration commands: $config_commands @@ -16433,18 +16636,29 @@ Index: pam.deb/configure _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ++ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ config.status -configured by $0, generated by GNU Autoconf 2.63, -+configured by $0, generated by GNU Autoconf 2.64, - with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" +- with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" ++configured by $0, generated by GNU Autoconf 2.65, ++ with options \\"\$ac_cs_config\\" -Copyright (C) 2008 Free Software Foundation, Inc. +Copyright (C) 2009 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." -@@ -22487,20 +17412,19 @@ +@@ -22480,6 +17435,8 @@ + ac_cs_recheck=: ;; + --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) + $as_echo "$ac_cs_version"; exit ;; ++ --config | --confi | --conf | --con | --co | --c ) ++ $as_echo "$ac_cs_config"; exit ;; + --debug | --debu | --deb | --de | --d | -d ) + debug=: ;; + --file | --fil | --fi | --f ) +@@ -22487,20 +17444,19 @@ case $ac_optarg in *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; esac @@ -16469,7 +16683,7 @@ Index: pam.deb/configure --help | --hel | -h ) $as_echo "$ac_cs_usage"; exit ;; -q | -quiet | --quiet | --quie | --qui | --qu | --q \ -@@ -22508,11 +17432,10 @@ +@@ -22508,11 +17464,10 @@ ac_cs_silent=: ;; # This is an error. @@ -16484,7 +16698,7 @@ Index: pam.deb/configure ac_need_defaults=false ;; esac -@@ -22893,9 +17816,7 @@ +@@ -22893,9 +17848,7 @@ "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;; "xtests/Makefile") CONFIG_FILES="$CONFIG_FILES xtests/Makefile" ;; @@ -16495,7 +16709,7 @@ Index: pam.deb/configure esac done -@@ -22922,7 +17843,7 @@ +@@ -22922,7 +17875,7 @@ trap 'exit_status=$? { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status ' 0 @@ -16504,7 +16718,7 @@ Index: pam.deb/configure } # Create a (secure) tmp directory for tmp files. -@@ -22933,11 +17854,7 @@ +@@ -22933,11 +17886,7 @@ { tmp=./conf$$-$RANDOM (umask 077 && mkdir "$tmp") @@ -16517,7 +16731,7 @@ Index: pam.deb/configure # Set up the scripts for CONFIG_FILES section. # No need to generate them if there are no CONFIG_FILES. -@@ -22945,10 +17862,16 @@ +@@ -22945,10 +17894,16 @@ if test -n "$CONFIG_FILES"; then @@ -16536,7 +16750,7 @@ Index: pam.deb/configure else ac_cs_awk_cr=$ac_cr fi -@@ -22962,24 +17885,18 @@ +@@ -22962,24 +17917,18 @@ echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && echo "_ACEOF" } >conf$$subs.sh || @@ -16564,7 +16778,25 @@ Index: pam.deb/configure else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi -@@ -23068,9 +17985,7 @@ +@@ -23001,7 +17950,7 @@ + t delim + :nl + h +-s/\(.\{148\}\).*/\1/ ++s/\(.\{148\}\)..*/\1/ + t more1 + s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ + p +@@ -23015,7 +17964,7 @@ + t nl + :delim + h +-s/\(.\{148\}\).*/\1/ ++s/\(.\{148\}\)..*/\1/ + t more2 + s/["\\]/\\&/g; s/^/"/; s/$/"/ + p +@@ -23068,9 +18017,7 @@ else cat fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ @@ -16575,7 +16807,7 @@ Index: pam.deb/configure _ACEOF # VPATH may cause trouble with some makes, so we remove $(srcdir), -@@ -23111,9 +18026,7 @@ +@@ -23111,9 +18058,7 @@ if test -z "$ac_t"; then break elif $ac_last_try; then @@ -16586,7 +16818,7 @@ Index: pam.deb/configure else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi -@@ -23198,9 +18111,7 @@ +@@ -23198,9 +18143,7 @@ _ACAWK _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 @@ -16597,7 +16829,7 @@ Index: pam.deb/configure fi # test -n "$CONFIG_HEADERS" -@@ -23213,9 +18124,7 @@ +@@ -23213,9 +18156,7 @@ esac case $ac_mode$ac_tag in :[FHL]*:*);; @@ -16608,7 +16840,7 @@ Index: pam.deb/configure :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac -@@ -23243,12 +18152,10 @@ +@@ -23243,12 +18184,10 @@ [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || @@ -16623,7 +16855,7 @@ Index: pam.deb/configure done # Let's still pretend it is `configure' which instantiates (i.e., don't -@@ -23259,7 +18166,7 @@ +@@ -23259,7 +18198,7 @@ `' by configure.' if test x"$ac_file" != x-; then configure_input="$ac_file. $configure_input" @@ -16632,7 +16864,7 @@ Index: pam.deb/configure $as_echo "$as_me: creating $ac_file" >&6;} fi # Neutralize special characters interpreted by sed in replacement strings. -@@ -23272,9 +18179,7 @@ +@@ -23272,9 +18211,7 @@ case $ac_tag in *:-:* | *:-) cat >"$tmp/stdin" \ @@ -16643,7 +16875,7 @@ Index: pam.deb/configure esac ;; esac -@@ -23302,47 +18207,7 @@ +@@ -23302,47 +18239,7 @@ q } s/.*/./; q'` @@ -16692,7 +16924,7 @@ Index: pam.deb/configure ac_builddir=. case "$ac_dir" in -@@ -23399,7 +18264,6 @@ +@@ -23399,7 +18296,6 @@ # If the template does not know about datarootdir, expand it. # FIXME: This hack should be removed a few years after 2.60. ac_datarootdir_hack=; ac_datarootdir_seen= @@ -16700,7 +16932,7 @@ Index: pam.deb/configure ac_sed_dataroot=' /datarootdir/ { p -@@ -23409,12 +18273,11 @@ +@@ -23409,12 +18305,11 @@ /@docdir@/p /@infodir@/p /@localedir@/p @@ -16715,7 +16947,7 @@ Index: pam.deb/configure $as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -@@ -23424,7 +18287,7 @@ +@@ -23424,7 +18319,7 @@ s&@infodir@&$infodir&g s&@localedir@&$localedir&g s&@mandir@&$mandir&g @@ -16724,7 +16956,7 @@ Index: pam.deb/configure esac _ACEOF -@@ -23453,14 +18316,12 @@ +@@ -23453,14 +18348,12 @@ $ac_datarootdir_hack " eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ @@ -16741,7 +16973,7 @@ Index: pam.deb/configure which seems to be undefined. Please make sure it is defined." >&5 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined." >&2;} -@@ -23470,9 +18331,7 @@ +@@ -23470,9 +18363,7 @@ -) cat "$tmp/out" && rm -f "$tmp/out";; *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; esac \ @@ -16752,7 +16984,7 @@ Index: pam.deb/configure ;; :H) # -@@ -23483,25 +18342,19 @@ +@@ -23483,25 +18374,19 @@ $as_echo "/* $configure_input */" \ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" } >"$tmp/config.h" \ @@ -16782,7 +17014,7 @@ Index: pam.deb/configure fi # Compute "$ac_file"'s index in $config_headers. _am_arg="$ac_file" -@@ -23539,7 +18392,7 @@ +@@ -23539,7 +18424,7 @@ s/.*/./; q'`/stamp-h$_am_stamp_count ;; @@ -16791,7 +17023,7 @@ Index: pam.deb/configure $as_echo "$as_me: executing $ac_file commands" >&6;} ;; esac -@@ -23634,47 +18487,7 @@ +@@ -23634,47 +18519,7 @@ q } s/.*/./; q'` @@ -16840,7 +17072,7 @@ Index: pam.deb/configure # echo "creating $dirpart/$file" echo '# dummy' > "$dirpart/$file" done -@@ -24434,15 +19247,12 @@ +@@ -24434,15 +19279,12 @@ done # for ac_tag @@ -16858,7 +17090,7 @@ Index: pam.deb/configure # configure is writing to config.log, and then calls config.status. -@@ -24463,10 +19273,10 @@ +@@ -24463,10 +19305,10 @@ exec 5>>config.log # Use ||, not &&, to avoid exiting from the if with $? = 1, which # would make configure fail if this is the last instruction. @@ -16871,17 +17103,17 @@ Index: pam.deb/configure $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi -Index: pam.deb/Makefile.in +Index: pam.debian/Makefile.in =================================================================== ---- pam.deb.orig/Makefile.in -+++ pam.deb/Makefile.in -@@ -41,12 +41,11 @@ - DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/config.h.in \ - $(top_srcdir)/configure ABOUT-NLS AUTHORS COPYING ChangeLog \ -- INSTALL NEWS compile config.guess config.rpath config.sub \ -+ INSTALL NEWS TODO compile config.guess config.rpath config.sub \ - depcomp install-sh ltmain.sh missing mkinstalldirs ylwrap +--- pam.debian.orig/Makefile.in ++++ pam.debian/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -46,7 +46,6 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ @@ -16906,10 +17138,66 @@ Index: pam.deb/Makefile.in PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PIE_CFLAGS = @PIE_CFLAGS@ -Index: pam.deb/modules/pam_namespace/Makefile.in +@@ -364,7 +364,7 @@ + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @failcom='exit 1'; \ ++ @fail= failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ +@@ -389,7 +389,7 @@ + fi; test -z "$$fail" + + $(RECURSIVE_CLEAN_TARGETS): +- @failcom='exit 1'; \ ++ @fail= failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ +@@ -559,7 +559,8 @@ + fi; \ + done + -test -n "$(am__skip_mode_fix)" \ +- || find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ ++ || find "$(distdir)" -type d ! -perm -755 \ ++ -exec chmod u+rwx,go+rx {} \; -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 {} {} \; \ +@@ -603,17 +604,17 @@ + distcheck: dist + case '$(DIST_ARCHIVES)' in \ + *.tar.gz*) \ +- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ ++ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ + *.tar.bz2*) \ +- bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ ++ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ + *.tar.lzma*) \ +- unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ ++ lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ + *.tar.xz*) \ + xz -dc $(distdir).tar.xz | $(am__untar) ;;\ + *.tar.Z*) \ + uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ + *.shar.gz*) \ +- GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ ++ GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ + *.zip*) \ + unzip $(distdir).zip ;;\ + esac +Index: pam.debian/modules/pam_namespace/Makefile.in =================================================================== ---- pam.deb.orig/modules/pam_namespace/Makefile.in -+++ pam.deb/modules/pam_namespace/Makefile.in +--- pam.debian.orig/modules/pam_namespace/Makefile.in ++++ pam.debian/modules/pam_namespace/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -49,7 +49,6 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ @@ -16935,10 +17223,16 @@ Index: pam.deb/modules/pam_namespace/Makefile.in PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PIE_CFLAGS = @PIE_CFLAGS@ -Index: pam.deb/modules/pam_securetty/Makefile.in +Index: pam.debian/modules/pam_securetty/Makefile.in =================================================================== ---- pam.deb.orig/modules/pam_securetty/Makefile.in -+++ pam.deb/modules/pam_securetty/Makefile.in +--- pam.debian.orig/modules/pam_securetty/Makefile.in ++++ pam.debian/modules/pam_securetty/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -45,7 +45,6 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ @@ -17005,10 +17299,16 @@ Index: pam.deb/modules/pam_securetty/Makefile.in .c.o: @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -Index: pam.deb/modules/pam_unix/Makefile.in +Index: pam.debian/modules/pam_unix/Makefile.in =================================================================== ---- pam.deb.orig/modules/pam_unix/Makefile.in -+++ pam.deb/modules/pam_unix/Makefile.in +--- pam.debian.orig/modules/pam_unix/Makefile.in ++++ pam.debian/modules/pam_unix/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -51,7 +51,6 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ @@ -17072,10 +17372,16 @@ Index: pam.deb/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@ -Index: pam.deb/modules/pam_tty_audit/Makefile.in +Index: pam.debian/modules/pam_tty_audit/Makefile.in =================================================================== ---- pam.deb.orig/modules/pam_tty_audit/Makefile.in -+++ pam.deb/modules/pam_tty_audit/Makefile.in +--- pam.debian.orig/modules/pam_tty_audit/Makefile.in ++++ pam.debian/modules/pam_tty_audit/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -45,7 +45,6 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ @@ -17112,3 +17418,2145 @@ Index: pam.deb/modules/pam_tty_audit/Makefile.in XMLS = README.xml pam_tty_audit.8.xml securelibdir = $(SECUREDIR) AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include +Index: pam.debian/conf/Makefile.in +=================================================================== +--- pam.debian.orig/conf/Makefile.in ++++ pam.debian/conf/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -38,7 +38,6 @@ + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ +- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ + $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ + $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ +@@ -47,7 +46,7 @@ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ +- $(top_srcdir)/configure.in ++ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -179,6 +178,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PIE_CFLAGS = @PIE_CFLAGS@ +@@ -307,7 +307,7 @@ + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @failcom='exit 1'; \ ++ @fail= failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ +@@ -332,7 +332,7 @@ + fi; test -z "$$fail" + + $(RECURSIVE_CLEAN_TARGETS): +- @failcom='exit 1'; \ ++ @fail= failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ +Index: pam.debian/conf/pam_conv1/Makefile.in +=================================================================== +--- pam.debian.orig/conf/pam_conv1/Makefile.in ++++ pam.debian/conf/pam_conv1/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -45,7 +45,6 @@ + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ +- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ + $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ + $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ +@@ -54,7 +53,7 @@ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ +- $(top_srcdir)/configure.in ++ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -172,6 +171,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PIE_CFLAGS = @PIE_CFLAGS@ +Index: pam.debian/doc/Makefile.in +=================================================================== +--- pam.debian.orig/doc/Makefile.in ++++ pam.debian/doc/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -44,7 +44,6 @@ + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ +- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ + $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ + $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ +@@ -53,7 +52,7 @@ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ +- $(top_srcdir)/configure.in ++ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -208,6 +207,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PIE_CFLAGS = @PIE_CFLAGS@ +@@ -356,7 +356,7 @@ + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @failcom='exit 1'; \ ++ @fail= failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ +@@ -381,7 +381,7 @@ + fi; test -z "$$fail" + + $(RECURSIVE_CLEAN_TARGETS): +- @failcom='exit 1'; \ ++ @fail= failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ +Index: pam.debian/doc/adg/Makefile.in +=================================================================== +--- pam.debian.orig/doc/adg/Makefile.in ++++ pam.debian/doc/adg/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -42,7 +42,6 @@ + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ +- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ + $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ + $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ +@@ -51,7 +50,7 @@ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ +- $(top_srcdir)/configure.in ++ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -143,6 +142,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PIE_CFLAGS = @PIE_CFLAGS@ +Index: pam.debian/doc/man/Makefile.in +=================================================================== +--- pam.debian.orig/doc/man/Makefile.in ++++ pam.debian/doc/man/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -42,7 +42,6 @@ + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ +- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ + $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ + $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ +@@ -51,7 +50,7 @@ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ +- $(top_srcdir)/configure.in ++ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -171,6 +170,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PIE_CFLAGS = @PIE_CFLAGS@ +Index: pam.debian/doc/mwg/Makefile.in +=================================================================== +--- pam.debian.orig/doc/mwg/Makefile.in ++++ pam.debian/doc/mwg/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -42,7 +42,6 @@ + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ +- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ + $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ + $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ +@@ -51,7 +50,7 @@ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ +- $(top_srcdir)/configure.in ++ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -143,6 +142,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PIE_CFLAGS = @PIE_CFLAGS@ +Index: pam.debian/doc/sag/Makefile.in +=================================================================== +--- pam.debian.orig/doc/sag/Makefile.in ++++ pam.debian/doc/sag/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -42,7 +42,6 @@ + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ +- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ + $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ + $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ +@@ -51,7 +50,7 @@ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ +- $(top_srcdir)/configure.in ++ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -143,6 +142,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PIE_CFLAGS = @PIE_CFLAGS@ +Index: pam.debian/doc/specs/Makefile.in +=================================================================== +--- pam.debian.orig/doc/specs/Makefile.in ++++ pam.debian/doc/specs/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -46,7 +46,6 @@ + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ +- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ + $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ + $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ +@@ -55,7 +54,7 @@ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ +- $(top_srcdir)/configure.in ++ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -196,6 +195,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PIE_CFLAGS = @PIE_CFLAGS@ +Index: pam.debian/examples/Makefile.in +=================================================================== +--- pam.debian.orig/examples/Makefile.in ++++ pam.debian/examples/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -45,7 +45,6 @@ + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ +- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ + $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ + $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ +@@ -54,7 +53,7 @@ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ +- $(top_srcdir)/configure.in ++ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -178,6 +177,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PIE_CFLAGS = @PIE_CFLAGS@ +Index: pam.debian/libpam/Makefile.in +=================================================================== +--- pam.debian.orig/libpam/Makefile.in ++++ pam.debian/libpam/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -50,7 +50,6 @@ + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ +- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ + $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ + $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ +@@ -59,7 +58,7 @@ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ +- $(top_srcdir)/configure.in ++ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -208,6 +207,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PIE_CFLAGS = @PIE_CFLAGS@ +Index: pam.debian/libpam_misc/Makefile.in +=================================================================== +--- pam.debian.orig/libpam_misc/Makefile.in ++++ pam.debian/libpam_misc/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -46,7 +46,6 @@ + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ +- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ + $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ + $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ +@@ -55,7 +54,7 @@ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ +- $(top_srcdir)/configure.in ++ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -192,6 +191,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PIE_CFLAGS = @PIE_CFLAGS@ +Index: pam.debian/libpamc/Makefile.in +=================================================================== +--- pam.debian.orig/libpamc/Makefile.in ++++ pam.debian/libpamc/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -46,7 +46,6 @@ + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ +- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ + $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ + $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ +@@ -55,7 +54,7 @@ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ +- $(top_srcdir)/configure.in ++ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -230,6 +229,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PIE_CFLAGS = @PIE_CFLAGS@ +@@ -450,7 +450,7 @@ + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @failcom='exit 1'; \ ++ @fail= failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ +@@ -475,7 +475,7 @@ + fi; test -z "$$fail" + + $(RECURSIVE_CLEAN_TARGETS): +- @failcom='exit 1'; \ ++ @fail= failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ +Index: pam.debian/libpamc/test/Makefile.in +=================================================================== +--- pam.debian.orig/libpamc/test/Makefile.in ++++ pam.debian/libpamc/test/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -42,7 +42,6 @@ + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ +- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ + $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ + $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ +@@ -51,7 +50,7 @@ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ +- $(top_srcdir)/configure.in ++ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -143,6 +142,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PIE_CFLAGS = @PIE_CFLAGS@ +Index: pam.debian/modules/Makefile.in +=================================================================== +--- pam.debian.orig/modules/Makefile.in ++++ pam.debian/modules/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -42,7 +42,6 @@ + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ +- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ + $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ + $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ +@@ -51,7 +50,7 @@ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ +- $(top_srcdir)/configure.in ++ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -183,6 +182,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PIE_CFLAGS = @PIE_CFLAGS@ +@@ -321,7 +321,7 @@ + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @failcom='exit 1'; \ ++ @fail= failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ +@@ -346,7 +346,7 @@ + fi; test -z "$$fail" + + $(RECURSIVE_CLEAN_TARGETS): +- @failcom='exit 1'; \ ++ @fail= failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ +Index: pam.debian/modules/pam_access/Makefile.in +=================================================================== +--- pam.debian.orig/modules/pam_access/Makefile.in ++++ pam.debian/modules/pam_access/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -45,7 +45,6 @@ + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ +- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ + $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ + $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ +@@ -54,7 +53,7 @@ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ +- $(top_srcdir)/configure.in ++ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -195,6 +194,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PIE_CFLAGS = @PIE_CFLAGS@ +Index: pam.debian/modules/pam_cracklib/Makefile.in +=================================================================== +--- pam.debian.orig/modules/pam_cracklib/Makefile.in ++++ pam.debian/modules/pam_cracklib/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -45,7 +45,6 @@ + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ +- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ + $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ + $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ +@@ -54,7 +53,7 @@ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ +- $(top_srcdir)/configure.in ++ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -194,6 +193,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PIE_CFLAGS = @PIE_CFLAGS@ +Index: pam.debian/modules/pam_debug/Makefile.in +=================================================================== +--- pam.debian.orig/modules/pam_debug/Makefile.in ++++ pam.debian/modules/pam_debug/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -45,7 +45,6 @@ + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ +- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ + $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ + $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ +@@ -54,7 +53,7 @@ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ +- $(top_srcdir)/configure.in ++ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -193,6 +192,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PIE_CFLAGS = @PIE_CFLAGS@ +Index: pam.debian/modules/pam_deny/Makefile.in +=================================================================== +--- pam.debian.orig/modules/pam_deny/Makefile.in ++++ pam.debian/modules/pam_deny/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -45,7 +45,6 @@ + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ +- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ + $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ + $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ +@@ -54,7 +53,7 @@ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ +- $(top_srcdir)/configure.in ++ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -193,6 +192,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PIE_CFLAGS = @PIE_CFLAGS@ +Index: pam.debian/modules/pam_echo/Makefile.in +=================================================================== +--- pam.debian.orig/modules/pam_echo/Makefile.in ++++ pam.debian/modules/pam_echo/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -45,7 +45,6 @@ + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ +- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ + $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ + $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ +@@ -54,7 +53,7 @@ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ +- $(top_srcdir)/configure.in ++ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -193,6 +192,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PIE_CFLAGS = @PIE_CFLAGS@ +Index: pam.debian/modules/pam_env/Makefile.in +=================================================================== +--- pam.debian.orig/modules/pam_env/Makefile.in ++++ pam.debian/modules/pam_env/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -45,7 +45,6 @@ + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ +- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ + $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ + $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ +@@ -54,7 +53,7 @@ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ +- $(top_srcdir)/configure.in ++ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -196,6 +195,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PIE_CFLAGS = @PIE_CFLAGS@ +Index: pam.debian/modules/pam_exec/Makefile.in +=================================================================== +--- pam.debian.orig/modules/pam_exec/Makefile.in ++++ pam.debian/modules/pam_exec/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -45,7 +45,6 @@ + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ +- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ + $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ + $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ +@@ -54,7 +53,7 @@ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ +- $(top_srcdir)/configure.in ++ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -193,6 +192,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PIE_CFLAGS = @PIE_CFLAGS@ +Index: pam.debian/modules/pam_faildelay/Makefile.in +=================================================================== +--- pam.debian.orig/modules/pam_faildelay/Makefile.in ++++ pam.debian/modules/pam_faildelay/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -45,7 +45,6 @@ + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ +- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ + $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ + $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ +@@ -54,7 +53,7 @@ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ +- $(top_srcdir)/configure.in ++ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -193,6 +192,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PIE_CFLAGS = @PIE_CFLAGS@ +Index: pam.debian/modules/pam_filter/Makefile.in +=================================================================== +--- pam.debian.orig/modules/pam_filter/Makefile.in ++++ pam.debian/modules/pam_filter/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -47,7 +47,6 @@ + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ +- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ + $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ + $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ +@@ -56,7 +55,7 @@ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ +- $(top_srcdir)/configure.in ++ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -235,6 +234,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PIE_CFLAGS = @PIE_CFLAGS@ +@@ -496,7 +496,7 @@ + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @failcom='exit 1'; \ ++ @fail= failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ +@@ -521,7 +521,7 @@ + fi; test -z "$$fail" + + $(RECURSIVE_CLEAN_TARGETS): +- @failcom='exit 1'; \ ++ @fail= failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ +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,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -44,7 +44,6 @@ + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ +- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ + $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ + $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ +@@ -53,7 +52,7 @@ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ +- $(top_srcdir)/configure.in ++ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -166,6 +165,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PIE_CFLAGS = @PIE_CFLAGS@ +Index: pam.debian/modules/pam_ftp/Makefile.in +=================================================================== +--- pam.debian.orig/modules/pam_ftp/Makefile.in ++++ pam.debian/modules/pam_ftp/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -45,7 +45,6 @@ + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ +- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ + $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ + $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ +@@ -54,7 +53,7 @@ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ +- $(top_srcdir)/configure.in ++ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -193,6 +192,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PIE_CFLAGS = @PIE_CFLAGS@ +Index: pam.debian/modules/pam_group/Makefile.in +=================================================================== +--- pam.debian.orig/modules/pam_group/Makefile.in ++++ pam.debian/modules/pam_group/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -45,7 +45,6 @@ + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ +- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ + $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ + $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ +@@ -54,7 +53,7 @@ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ +- $(top_srcdir)/configure.in ++ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -195,6 +194,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PIE_CFLAGS = @PIE_CFLAGS@ +Index: pam.debian/modules/pam_issue/Makefile.in +=================================================================== +--- pam.debian.orig/modules/pam_issue/Makefile.in ++++ pam.debian/modules/pam_issue/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -45,7 +45,6 @@ + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ +- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ + $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ + $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ +@@ -54,7 +53,7 @@ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ +- $(top_srcdir)/configure.in ++ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -193,6 +192,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PIE_CFLAGS = @PIE_CFLAGS@ +Index: pam.debian/modules/pam_keyinit/Makefile.in +=================================================================== +--- pam.debian.orig/modules/pam_keyinit/Makefile.in ++++ pam.debian/modules/pam_keyinit/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -45,7 +45,6 @@ + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ +- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ + $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ + $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ +@@ -54,7 +53,7 @@ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ +- $(top_srcdir)/configure.in ++ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -195,6 +194,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PIE_CFLAGS = @PIE_CFLAGS@ +Index: pam.debian/modules/pam_lastlog/Makefile.in +=================================================================== +--- pam.debian.orig/modules/pam_lastlog/Makefile.in ++++ pam.debian/modules/pam_lastlog/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -45,7 +45,6 @@ + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ +- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ + $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ + $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ +@@ -54,7 +53,7 @@ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ +- $(top_srcdir)/configure.in ++ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -193,6 +192,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PIE_CFLAGS = @PIE_CFLAGS@ +Index: pam.debian/modules/pam_limits/Makefile.in +=================================================================== +--- pam.debian.orig/modules/pam_limits/Makefile.in ++++ pam.debian/modules/pam_limits/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -45,7 +45,6 @@ + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ +- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ + $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ + $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ +@@ -54,7 +53,7 @@ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ +- $(top_srcdir)/configure.in ++ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -195,6 +194,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PIE_CFLAGS = @PIE_CFLAGS@ +Index: pam.debian/modules/pam_listfile/Makefile.in +=================================================================== +--- pam.debian.orig/modules/pam_listfile/Makefile.in ++++ pam.debian/modules/pam_listfile/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -45,7 +45,6 @@ + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ +- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ + $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ + $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ +@@ -54,7 +53,7 @@ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ +- $(top_srcdir)/configure.in ++ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -193,6 +192,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PIE_CFLAGS = @PIE_CFLAGS@ +Index: pam.debian/modules/pam_localuser/Makefile.in +=================================================================== +--- pam.debian.orig/modules/pam_localuser/Makefile.in ++++ pam.debian/modules/pam_localuser/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -45,7 +45,6 @@ + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ +- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ + $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ + $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ +@@ -54,7 +53,7 @@ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ +- $(top_srcdir)/configure.in ++ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -193,6 +192,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PIE_CFLAGS = @PIE_CFLAGS@ +Index: pam.debian/modules/pam_loginuid/Makefile.in +=================================================================== +--- pam.debian.orig/modules/pam_loginuid/Makefile.in ++++ pam.debian/modules/pam_loginuid/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -45,7 +45,6 @@ + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ +- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ + $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ + $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ +@@ -54,7 +53,7 @@ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ +- $(top_srcdir)/configure.in ++ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -193,6 +192,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PIE_CFLAGS = @PIE_CFLAGS@ +Index: pam.debian/modules/pam_mail/Makefile.in +=================================================================== +--- pam.debian.orig/modules/pam_mail/Makefile.in ++++ pam.debian/modules/pam_mail/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -45,7 +45,6 @@ + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ +- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ + $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ + $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ +@@ -54,7 +53,7 @@ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ +- $(top_srcdir)/configure.in ++ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -193,6 +192,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PIE_CFLAGS = @PIE_CFLAGS@ +Index: pam.debian/modules/pam_mkhomedir/Makefile.in +=================================================================== +--- pam.debian.orig/modules/pam_mkhomedir/Makefile.in ++++ pam.debian/modules/pam_mkhomedir/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -48,7 +48,6 @@ + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ +- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ + $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ + $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ +@@ -57,7 +56,7 @@ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ +- $(top_srcdir)/configure.in ++ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -91,6 +90,9 @@ + pam_mkhomedir_la_DEPENDENCIES = + am_pam_mkhomedir_la_OBJECTS = pam_mkhomedir.lo + pam_mkhomedir_la_OBJECTS = $(am_pam_mkhomedir_la_OBJECTS) ++pam_mkhomedir_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++ $(pam_mkhomedir_la_LDFLAGS) $(LDFLAGS) -o $@ + PROGRAMS = $(sbin_PROGRAMS) + am_mkhomedir_helper_OBJECTS = mkhomedir_helper.$(OBJEXT) + mkhomedir_helper_OBJECTS = $(am_mkhomedir_helper_OBJECTS) +@@ -201,6 +203,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PIE_CFLAGS = @PIE_CFLAGS@ +@@ -290,10 +293,11 @@ + AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \ + -DMKHOMEDIR_HELPER=\"$(sbindir)/mkhomedir_helper\" + +-AM_LDFLAGS = -no-undefined -avoid-version -module $(am__append_1) + securelib_LTLIBRARIES = pam_mkhomedir.la + pam_mkhomedir_la_SOURCES = pam_mkhomedir.c + pam_mkhomedir_la_LIBADD = -L$(top_builddir)/libpam -lpam ++pam_mkhomedir_la_LDFLAGS = -no-undefined -avoid-version -module \ ++ $(am__append_1) + mkhomedir_helper_SOURCES = mkhomedir_helper.c + mkhomedir_helper_LDADD = -L$(top_builddir)/libpam -lpam + @ENABLE_REGENERATE_MAN_TRUE@noinst_DATA = README +@@ -363,7 +367,7 @@ + rm -f "$${dir}/so_locations"; \ + done + pam_mkhomedir.la: $(pam_mkhomedir_la_OBJECTS) $(pam_mkhomedir_la_DEPENDENCIES) +- $(LINK) -rpath $(securelibdir) $(pam_mkhomedir_la_OBJECTS) $(pam_mkhomedir_la_LIBADD) $(LIBS) ++ $(pam_mkhomedir_la_LINK) -rpath $(securelibdir) $(pam_mkhomedir_la_OBJECTS) $(pam_mkhomedir_la_LIBADD) $(LIBS) + install-sbinPROGRAMS: $(sbin_PROGRAMS) + @$(NORMAL_INSTALL) + test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)" +Index: pam.debian/modules/pam_motd/Makefile.in +=================================================================== +--- pam.debian.orig/modules/pam_motd/Makefile.in ++++ pam.debian/modules/pam_motd/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -45,7 +45,6 @@ + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ +- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ + $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ + $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ +@@ -54,7 +53,7 @@ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ +- $(top_srcdir)/configure.in ++ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -193,6 +192,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PIE_CFLAGS = @PIE_CFLAGS@ +Index: pam.debian/modules/pam_nologin/Makefile.in +=================================================================== +--- pam.debian.orig/modules/pam_nologin/Makefile.in ++++ pam.debian/modules/pam_nologin/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -45,7 +45,6 @@ + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ +- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ + $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ + $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ +@@ -54,7 +53,7 @@ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ +- $(top_srcdir)/configure.in ++ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -193,6 +192,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PIE_CFLAGS = @PIE_CFLAGS@ +Index: pam.debian/modules/pam_permit/Makefile.in +=================================================================== +--- pam.debian.orig/modules/pam_permit/Makefile.in ++++ pam.debian/modules/pam_permit/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -45,7 +45,6 @@ + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ +- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ + $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ + $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ +@@ -54,7 +53,7 @@ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ +- $(top_srcdir)/configure.in ++ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -193,6 +192,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PIE_CFLAGS = @PIE_CFLAGS@ +Index: pam.debian/modules/pam_pwhistory/Makefile.in +=================================================================== +--- pam.debian.orig/modules/pam_pwhistory/Makefile.in ++++ pam.debian/modules/pam_pwhistory/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -47,7 +47,6 @@ + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ +- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ + $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ + $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ +@@ -56,7 +55,7 @@ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ +- $(top_srcdir)/configure.in ++ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -196,6 +195,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PIE_CFLAGS = @PIE_CFLAGS@ +Index: pam.debian/modules/pam_rhosts/Makefile.in +=================================================================== +--- pam.debian.orig/modules/pam_rhosts/Makefile.in ++++ pam.debian/modules/pam_rhosts/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -45,7 +45,6 @@ + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ +- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ + $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ + $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ +@@ -54,7 +53,7 @@ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ +- $(top_srcdir)/configure.in ++ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -193,6 +192,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PIE_CFLAGS = @PIE_CFLAGS@ +Index: pam.debian/modules/pam_rootok/Makefile.in +=================================================================== +--- pam.debian.orig/modules/pam_rootok/Makefile.in ++++ pam.debian/modules/pam_rootok/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -46,7 +46,6 @@ + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ +- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ + $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ + $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ +@@ -55,7 +54,7 @@ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ +- $(top_srcdir)/configure.in ++ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -194,6 +193,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PIE_CFLAGS = @PIE_CFLAGS@ +Index: pam.debian/modules/pam_selinux/Makefile.in +=================================================================== +--- pam.debian.orig/modules/pam_selinux/Makefile.in ++++ pam.debian/modules/pam_selinux/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -47,7 +47,6 @@ + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ +- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ + $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ + $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ +@@ -56,7 +55,7 @@ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ +- $(top_srcdir)/configure.in ++ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -206,6 +205,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PIE_CFLAGS = @PIE_CFLAGS@ +Index: pam.debian/modules/pam_sepermit/Makefile.in +=================================================================== +--- pam.debian.orig/modules/pam_sepermit/Makefile.in ++++ pam.debian/modules/pam_sepermit/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -46,7 +46,6 @@ + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ +- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ + $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ + $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ +@@ -55,7 +54,7 @@ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ +- $(top_srcdir)/configure.in ++ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -202,6 +201,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PIE_CFLAGS = @PIE_CFLAGS@ +Index: pam.debian/modules/pam_shells/Makefile.in +=================================================================== +--- pam.debian.orig/modules/pam_shells/Makefile.in ++++ pam.debian/modules/pam_shells/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -45,7 +45,6 @@ + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ +- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ + $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ + $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ +@@ -54,7 +53,7 @@ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ +- $(top_srcdir)/configure.in ++ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -193,6 +192,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PIE_CFLAGS = @PIE_CFLAGS@ +Index: pam.debian/modules/pam_stress/Makefile.in +=================================================================== +--- pam.debian.orig/modules/pam_stress/Makefile.in ++++ pam.debian/modules/pam_stress/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -44,7 +44,6 @@ + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ +- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ + $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ + $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ +@@ -53,7 +52,7 @@ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ +- $(top_srcdir)/configure.in ++ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -188,6 +187,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PIE_CFLAGS = @PIE_CFLAGS@ +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,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -45,7 +45,6 @@ + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ +- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ + $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ + $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ +@@ -54,7 +53,7 @@ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ +- $(top_srcdir)/configure.in ++ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -193,6 +192,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PIE_CFLAGS = @PIE_CFLAGS@ +Index: pam.debian/modules/pam_tally/Makefile.in +=================================================================== +--- pam.debian.orig/modules/pam_tally/Makefile.in ++++ pam.debian/modules/pam_tally/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -49,7 +49,6 @@ + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ +- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ + $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ + $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ +@@ -58,7 +57,7 @@ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ +- $(top_srcdir)/configure.in ++ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -206,6 +205,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PIE_CFLAGS = @PIE_CFLAGS@ +Index: pam.debian/modules/pam_tally2/Makefile.in +=================================================================== +--- pam.debian.orig/modules/pam_tally2/Makefile.in ++++ pam.debian/modules/pam_tally2/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -50,7 +50,6 @@ + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ +- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ + $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ + $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ +@@ -59,7 +58,7 @@ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ +- $(top_srcdir)/configure.in ++ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -208,6 +207,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PIE_CFLAGS = @PIE_CFLAGS@ +Index: pam.debian/modules/pam_time/Makefile.in +=================================================================== +--- pam.debian.orig/modules/pam_time/Makefile.in ++++ pam.debian/modules/pam_time/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -45,7 +45,6 @@ + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ +- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ + $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ + $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ +@@ -54,7 +53,7 @@ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ +- $(top_srcdir)/configure.in ++ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -195,6 +194,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PIE_CFLAGS = @PIE_CFLAGS@ +Index: pam.debian/modules/pam_timestamp/Makefile.in +=================================================================== +--- pam.debian.orig/modules/pam_timestamp/Makefile.in ++++ pam.debian/modules/pam_timestamp/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -52,7 +52,6 @@ + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ +- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ + $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ + $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ +@@ -61,7 +60,7 @@ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ +- $(top_srcdir)/configure.in ++ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -221,6 +220,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PIE_CFLAGS = @PIE_CFLAGS@ +Index: pam.debian/modules/pam_umask/Makefile.in +=================================================================== +--- pam.debian.orig/modules/pam_umask/Makefile.in ++++ pam.debian/modules/pam_umask/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -45,7 +45,6 @@ + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ +- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ + $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ + $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ +@@ -54,7 +53,7 @@ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ +- $(top_srcdir)/configure.in ++ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -193,6 +192,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PIE_CFLAGS = @PIE_CFLAGS@ +Index: pam.debian/modules/pam_userdb/Makefile.in +=================================================================== +--- pam.debian.orig/modules/pam_userdb/Makefile.in ++++ pam.debian/modules/pam_userdb/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -47,7 +47,6 @@ + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ +- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ + $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ + $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ +@@ -56,7 +55,7 @@ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ +- $(top_srcdir)/configure.in ++ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -197,6 +196,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PIE_CFLAGS = @PIE_CFLAGS@ +Index: pam.debian/modules/pam_warn/Makefile.in +=================================================================== +--- pam.debian.orig/modules/pam_warn/Makefile.in ++++ pam.debian/modules/pam_warn/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -45,7 +45,6 @@ + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ +- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ + $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ + $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ +@@ -54,7 +53,7 @@ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ +- $(top_srcdir)/configure.in ++ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -193,6 +192,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PIE_CFLAGS = @PIE_CFLAGS@ +Index: pam.debian/modules/pam_wheel/Makefile.in +=================================================================== +--- pam.debian.orig/modules/pam_wheel/Makefile.in ++++ pam.debian/modules/pam_wheel/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -45,7 +45,6 @@ + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ +- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ + $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ + $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ +@@ -54,7 +53,7 @@ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ +- $(top_srcdir)/configure.in ++ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -193,6 +192,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PIE_CFLAGS = @PIE_CFLAGS@ +Index: pam.debian/modules/pam_xauth/Makefile.in +=================================================================== +--- pam.debian.orig/modules/pam_xauth/Makefile.in ++++ pam.debian/modules/pam_xauth/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -45,7 +45,6 @@ + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ +- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ + $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ + $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ +@@ -54,7 +53,7 @@ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ +- $(top_srcdir)/configure.in ++ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -193,6 +192,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PIE_CFLAGS = @PIE_CFLAGS@ +Index: pam.debian/tests/Makefile.in +=================================================================== +--- pam.debian.orig/tests/Makefile.in ++++ pam.debian/tests/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -51,7 +51,6 @@ + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ +- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ + $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ + $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ +@@ -60,7 +59,7 @@ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ +- $(top_srcdir)/configure.in ++ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -250,6 +249,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PIE_CFLAGS = @PIE_CFLAGS@ +Index: pam.debian/xtests/Makefile.in +=================================================================== +--- pam.debian.orig/xtests/Makefile.in ++++ pam.debian/xtests/Makefile.in +@@ -1,4 +1,4 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +@@ -44,7 +44,6 @@ + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ +- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ + $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ + $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ +@@ -53,7 +52,7 @@ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ +- $(top_srcdir)/configure.in ++ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -252,6 +251,7 @@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PIE_CFLAGS = @PIE_CFLAGS@ +Index: pam.debian/m4/ltversion.m4 +=================================================================== +--- pam.debian.orig/m4/ltversion.m4 ++++ pam.debian/m4/ltversion.m4 +@@ -9,15 +9,15 @@ + + # Generated from ltversion.in. + +-# serial 3012 ltversion.m4 ++# serial 3017 ltversion.m4 + # This file is part of GNU Libtool + +-m4_define([LT_PACKAGE_VERSION], [2.2.6]) +-m4_define([LT_PACKAGE_REVISION], [1.3012]) ++m4_define([LT_PACKAGE_VERSION], [2.2.6b]) ++m4_define([LT_PACKAGE_REVISION], [1.3017]) + + AC_DEFUN([LTVERSION_VERSION], +-[macro_version='2.2.6' +-macro_revision='1.3012' ++[macro_version='2.2.6b' ++macro_revision='1.3017' + _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) + _LT_DECL(, macro_revision, 0) + ]) diff --git a/debian/patches-applied/mkhomedir_linking.patch b/debian/patches-applied/mkhomedir_linking.patch new file mode 100644 index 00000000..f629b2df --- /dev/null +++ b/debian/patches-applied/mkhomedir_linking.patch @@ -0,0 +1,28 @@ +Description: don't pass --version-script options when linking executables, + only when linking libraries +Author: Julien Cristau +Bug-Debian: http://bugs.debian.org/582362 + +Index: pam/modules/pam_mkhomedir/Makefile.am +=================================================================== +--- pam.orig/modules/pam_mkhomedir/Makefile.am ++++ pam/modules/pam_mkhomedir/Makefile.am +@@ -19,14 +19,14 @@ + + AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \ + -DMKHOMEDIR_HELPER=\"$(sbindir)/mkhomedir_helper\" +-AM_LDFLAGS = -no-undefined -avoid-version -module +-if HAVE_VERSIONING +- AM_LDFLAGS += -Wl,--version-script=$(srcdir)/../modules.map +-endif + + securelib_LTLIBRARIES = pam_mkhomedir.la + pam_mkhomedir_la_SOURCES = pam_mkhomedir.c + pam_mkhomedir_la_LIBADD = -L$(top_builddir)/libpam -lpam ++pam_mkhomedir_la_LDFLAGS = -no-undefined -avoid-version -module ++if HAVE_VERSIONING ++ pam_mkhomedir_la_LDFLAGS += -Wl,--version-script=$(srcdir)/../modules.map ++endif + + sbin_PROGRAMS = mkhomedir_helper + mkhomedir_helper_SOURCES = mkhomedir_helper.c diff --git a/debian/patches-applied/series b/debian/patches-applied/series index 7783ddb1..7455447a 100644 --- a/debian/patches-applied/series +++ b/debian/patches-applied/series @@ -17,6 +17,7 @@ hurd_no_setfsuid 055_pam_unix_nullok_secure PAM-manpage-section conditional_module,_conditional_man +mkhomedir_linking.patch autoconf.patch update-motd fix-man-crud -- cgit v1.2.3