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