diff options
Diffstat (limited to 'debian/patches-applied')
| -rw-r--r-- | debian/patches-applied/007_modules_pam_unix | 457 | ||||
| -rw-r--r-- | debian/patches-applied/008_modules_pam_limits_chroot | 48 | ||||
| -rw-r--r-- | debian/patches-applied/027_pam_limits_better_init_allow_explicit_root | 275 | ||||
| -rw-r--r-- | debian/patches-applied/036_pam_wheel_getlogin_considered_harmful | 29 | ||||
| -rw-r--r-- | debian/patches-applied/055_pam_unix_nullok_secure | 40 | ||||
| -rw-r--r-- | debian/patches-applied/PAM-manpage-section | 3032 | ||||
| -rw-r--r-- | debian/patches-applied/autoconf.patch | 14654 | ||||
| -rw-r--r-- | debian/patches-applied/conditional_module,_conditional_man | 26 | ||||
| -rw-r--r-- | debian/patches-applied/fix-man-crud | 1806 | ||||
| -rw-r--r-- | debian/patches-applied/hurd_no_setfsuid | 139 | ||||
| -rw-r--r-- | debian/patches-applied/mkhomedir_linking.patch | 28 | ||||
| -rw-r--r-- | debian/patches-applied/series | 2 |
12 files changed, 15746 insertions, 4790 deletions
diff --git a/debian/patches-applied/007_modules_pam_unix b/debian/patches-applied/007_modules_pam_unix index a0c1857a..07f27629 100644 --- a/debian/patches-applied/007_modules_pam_unix +++ b/debian/patches-applied/007_modules_pam_unix @@ -12,26 +12,7 @@ Index: pam.deb/modules/pam_unix/pam_unix_passwd.c /* How it works: Gets in username (has to be done) from the calling program -@@ -457,7 +460,8 @@ - static int _pam_unix_approve_pass(pam_handle_t * pamh - ,unsigned int ctrl - ,const char *pass_old -- ,const char *pass_new) -+ ,const char *pass_new, -+ int pass_min_len) - { - const void *user; - const char *remark = NULL; -@@ -488,7 +492,7 @@ - } - } - if (off(UNIX__IAMROOT, ctrl)) { -- if (strlen(pass_new) < 6) -+ if (strlen(pass_new) < pass_min_len) - remark = _("You must choose a longer password"); - D(("length check [%s]", remark)); - if (on(UNIX_REMEMBER_PASSWD, ctrl)) { -@@ -500,6 +504,11 @@ +@@ -501,6 +504,11 @@ return retval; } } @@ -43,70 +24,19 @@ Index: pam.deb/modules/pam_unix/pam_unix_passwd.c } if (remark) { _make_remark(pamh, ctrl, PAM_ERROR_MSG, remark); -@@ -516,6 +525,7 @@ +@@ -517,7 +525,7 @@ int retval; int remember = -1; int rounds = -1; +- int pass_min_len = 0; + int pass_min_len = 6; /* <DO NOT free() THESE> */ const char *user; -@@ -524,7 +534,8 @@ - - D(("called.")); - -- ctrl = _set_ctrl(pamh, flags, &remember, &rounds, argc, argv); -+ ctrl = _set_ctrl(pamh, flags, &remember, &rounds, &pass_min_len, -+ argc, argv); - - /* - * First get the name of a user -@@ -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); -@@ -757,7 +769,8 @@ - return retval; - } - -- 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) { - pam_syslog(pamh, LOG_NOTICE, - "new password not acceptable 2"); -Index: pam.deb/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.")); - -- ctrl = _set_ctrl(pamh, flags, NULL, NULL, argc, argv); -+ ctrl = _set_ctrl(pamh, flags, NULL, NULL, NULL, argc, argv); - - retval = pam_get_item(pamh, PAM_USER, &void_uname); - uname = void_uname; Index: pam.deb/modules/pam_unix/support.c =================================================================== --- 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, -- int argc, const char **argv) -+ int *pass_min_len, int argc, const char **argv) - { - unsigned int ctrl; - @@ -81,6 +81,7 @@ D(("SILENT")); set(UNIX__QUIET, ctrl); @@ -125,62 +55,22 @@ Index: pam.deb/modules/pam_unix/support.c break; } } -@@ -102,15 +104,16 @@ - ctrl &= unix_args[j].mask; /* for turning things off */ - ctrl |= unix_args[j].flag; /* for turning things on */ - -- if (remember != NULL) { -- if (j == UNIX_REMEMBER_PASSWD) { -- *remember = strtol(*argv + 9, NULL, 10); -- if ((*remember == INT_MIN) || (*remember == INT_MAX)) -- *remember = -1; -- if (*remember > 400) -- *remember = 400; -- } -- } -+ /* special cases */ -+ if (remember != NULL && j == UNIX_REMEMBER_PASSWD) { -+ *remember = strtol(*argv + 9, NULL, 10); -+ if ((*remember == INT_MIN) || (*remember == INT_MAX)) -+ *remember = -1; -+ if (*remember > 400) -+ *remember = 400; -+ } else if (pass_min_len && j == UNIX_MIN_PASS_LEN) { -+ *pass_min_len = atoi(*argv + 4); -+ } - if (rounds != NULL && j == UNIX_ALGO_ROUNDS) - *rounds = strtol(*argv + 7, NULL, 10); - } -@@ -118,6 +121,10 @@ - ++argv; /* step to next argument */ - } - -+ if (off(UNIX_HASH_MASK,ctrl) -+ && pass_min_len && *pass_min_len > 8) -+ *pass_min_len = 8; -+ - if (flags & PAM_DISALLOW_NULL_AUTHTOK) { - D(("DISALLOW_NULL_AUTHTOK")); - set(UNIX__NONULL, ctrl); Index: pam.deb/modules/pam_unix/support.h =================================================================== --- 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 +@@ -90,8 +90,9 @@ password hash algorithms */ #define UNIX_BLOWFISH_PASS 26 /* new password hashes will use blowfish */ -+#define UNIX_MAX_PASS_LEN 27 /* internal, for compatibility only */ -+#define UNIX_MIN_PASS_LEN 28 /* min length for password */ -+#define UNIX_OBSCURE_CHECKS 29 /* enable obscure checks on passwords */ + #define UNIX_MIN_PASS_LEN 27 /* min length for password */ ++#define UNIX_OBSCURE_CHECKS 28 /* enable obscure checks on passwords */ /* -------------- */ --#define UNIX_CTRLS_ 27 /* number of ctrl arguments defined */ -+#define UNIX_CTRLS_ 30 /* number of ctrl arguments defined */ -+ -+#define UNIX_HASH_MASK (UNIX_MD5_PASS|UNIX_BIGCRYPT|UNIX_SHA256_PASS|UNIX_SHA512_PASS|UNIX_BLOWFISH_PASS) +-#define UNIX_CTRLS_ 28 /* number of ctrl arguments defined */ ++#define UNIX_CTRLS_ 29 /* number of ctrl arguments defined */ - static const UNIX_Ctrls unix_args[UNIX_CTRLS_] = - { + #define UNIX_DES_CRYPT(ctrl) (off(UNIX_MD5_PASS,ctrl)&&off(UNIX_BIGCRYPT,ctrl)&&off(UNIX_SHA256_PASS,ctrl)&&off(UNIX_SHA512_PASS,ctrl)&&off(UNIX_BLOWFISH_PASS,ctrl)) + +@@ -100,34 +101,35 @@ /* symbol token name ctrl mask ctrl * * ----------------------- ------------------- --------------------- -------- */ @@ -211,6 +101,7 @@ Index: pam.deb/modules/pam_unix/support.h -/* UNIX_SHA512_PASS */ {"sha512", _ALL_ON_^(0260420000), 040000000}, -/* UNIX_ALGO_ROUNDS */ {"rounds=", _ALL_ON_, 0100000000}, -/* UNIX_BLOWFISH_PASS */ {"blowfish", _ALL_ON_^(0260420000), 0200000000}, +-/* UNIX_MIN_PASS_LEN */ {"minlen=", _ALL_ON_, 0400000000}, +/* UNIX__OLD_PASSWD */ {NULL, _ALL_ON_, 0x1}, +/* UNIX__VERIFY_PASSWD */ {NULL, _ALL_ON_, 0x2}, +/* UNIX__IAMROOT */ {NULL, _ALL_ON_, 0x4}, @@ -238,37 +129,23 @@ Index: pam.deb/modules/pam_unix/support.h +/* UNIX_SHA512_PASS */ {"sha512", _ALL_ON_^(0x2C22000), 0x800000}, +/* UNIX_ALGO_ROUNDS */ {"rounds=", _ALL_ON_, 0x1000000}, +/* UNIX_BLOWFISH_PASS */ {"blowfish", _ALL_ON_^(0x2C22000),0x2000000}, -+/* UNIX_MAX_PASS_LEN */ {"max=", _ALL_ON_, 0}, -+/* UNIX_MIN_PASS_LEN */ {"min=", _ALL_ON_, 0x4000000}, ++/* UNIX_MIN_PASS_LEN */ {"minlen=", _ALL_ON_, 0x4000000}, +/* UNIX_OBSCURE_CHECKS */ {"obscure", _ALL_ON_, 0x8000000}, }; #define UNIX_DEFAULTS (unix_args[UNIX__NONULL].flag) -@@ -141,7 +149,7 @@ - extern int _make_remark(pam_handle_t * pamh, unsigned int ctrl - ,int type, const char *text); - extern int _set_ctrl(pam_handle_t * pamh, int flags, int *remember, int *rounds, -- int argc, const char **argv); -+ int *pass_min_len, int argc, const char **argv); - extern int _unix_getpwnam (pam_handle_t *pamh, - const char *name, int files, int nis, - struct passwd **ret); Index: pam.deb/modules/pam_unix/pam_unix.8.xml =================================================================== --- pam.deb.orig/modules/pam_unix/pam_unix.8.xml +++ pam.deb/modules/pam_unix/pam_unix.8.xml -@@ -326,6 +326,90 @@ - </para> - </listitem> - </varlistentry> -+ <varlistentry> -+ <term> -+ <option>min=<replaceable>n</replaceable></option> -+ </term> -+ <listitem> -+ <para> -+ Set a minimum password length of <replaceable>n</replaceable> -+ characters. The default value is 6. +@@ -333,8 +333,81 @@ + <listitem> + <para> + Set a minimum password length of <replaceable>n</replaceable> +- characters. The max. for DES crypt based passwords are 8 +- characters. ++ characters. The default value is 6. The maximum for DES ++ crypt-based passwords is 8 characters. + </para> + </listitem> + </varlistentry> @@ -342,12 +219,9 @@ Index: pam.deb/modules/pam_unix/pam_unix.8.xml + </listitem> + </varlistentry> + </variablelist> -+ </para> -+ </listitem> -+ </varlistentry> - </variablelist> - <para> - Invalid arguments are logged with <citerefentry> + </para> + </listitem> + </varlistentry> Index: pam.deb/modules/pam_unix/obscure.c =================================================================== --- /dev/null @@ -535,7 +409,7 @@ Index: pam.deb/modules/pam_unix/obscure.c + Example: "password$%^&*123". So check it again, this time + truncated to the maximum length. Idea from npasswd. --marekm */ + -+ if (on(UNIX_HASH_MASK,ctrl)) ++ if (!UNIX_DES_CRYPT(ctrl)) + return NULL; /* unlimited password length */ + + if (oldlen <= 8 && newlen <= 8) @@ -564,46 +438,182 @@ Index: pam.deb/modules/pam_unix/Makefile.am bigcrypt_SOURCES = bigcrypt.c bigcrypt_main.c bigcrypt_CFLAGS = $(AM_CFLAGS) -Index: pam.deb/modules/pam_unix/pam_unix_auth.c -=================================================================== ---- 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.")); - -- ctrl = _set_ctrl(pamh, flags, NULL, NULL, argc, argv); -+ ctrl = _set_ctrl(pamh, flags, NULL, NULL, NULL, argc, argv); - - /* Get a few bytes so we can pass our return value to - pam_sm_setcred(). */ -Index: pam.deb/modules/pam_unix/pam_unix_sess.c -=================================================================== ---- 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.")); - -- ctrl = _set_ctrl(pamh, flags, NULL, NULL, argc, argv); -+ ctrl = _set_ctrl(pamh, flags, NULL, NULL, NULL, argc, argv); - - retval = pam_get_item(pamh, PAM_USER, (void *) &user_name); - if (user_name == NULL || *user_name == '\0' || retval != PAM_SUCCESS) { -@@ -107,7 +107,7 @@ - - D(("called.")); - -- ctrl = _set_ctrl(pamh, flags, NULL, NULL, argc, argv); -+ ctrl = _set_ctrl(pamh, flags, NULL, NULL, NULL, argc, argv); - - retval = pam_get_item(pamh, PAM_USER, (void *) &user_name); - if (user_name == NULL || *user_name == '\0' || retval != PAM_SUCCESS) { Index: pam.deb/modules/pam_unix/pam_unix.8 =================================================================== --- pam.deb.orig/modules/pam_unix/pam_unix.8 +++ pam.deb/modules/pam_unix/pam_unix.8 -@@ -166,13 +166,11 @@ +@@ -1,161 +1,22 @@ ++'\" t + .\" Title: pam_unix + .\" Author: [see the "AUTHOR" section] +-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/> +-.\" Date: 10/27/2010 ++.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> ++.\" Date: 05/31/2011 + .\" Manual: Linux-PAM Manual + .\" Source: Linux-PAM Manual + .\" Language: English + .\" +-.TH "PAM_UNIX" "8" "10/27/2010" "Linux-PAM Manual" "Linux\-PAM Manual" ++.TH "PAM_UNIX" "8" "05/31/2011" "Linux-PAM Manual" "Linux\-PAM Manual" + .\" ----------------------------------------------------------------- +-.\" * (re)Define some macros ++.\" * Define some portability stuff + .\" ----------------------------------------------------------------- + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +-.\" toupper - uppercase a string (locale-aware) ++.\" http://bugs.debian.org/507673 ++.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +-.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 +-.\} +-.. ++.ie \n(.g .ds Aq \(aq ++.el .ds Aq ' + .\" ----------------------------------------------------------------- + .\" * set default formatting + .\" ----------------------------------------------------------------- +@@ -166,38 +27,36 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- @@ -618,8 +628,48 @@ Index: pam.deb/modules/pam_unix/pam_unix.8 -.fam .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 +262,7 @@ +-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\&. ++This is the standard Unix authentication module\&. It uses standard calls from the system\*(Aqs 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\&. + .PP +-The account component performs the task of establishing the status of the user\'s account and password based on the following ++The account component performs the task of establishing the status of the user\*(Aqs account and password based on the following + \fIshadow\fR + elements: expire, last_change, max_change, min_change, warn_change\&. In the case of the latter, it may offer advice to the user on changing their password or, through the + \fBPAM_AUTHTOKEN_REQD\fR + return, delay giving service to the user until they have established a new password\&. The entries listed above are documented in the + \fBshadow\fR(5) +-manual page\&. Should the user\'s record not contain one or more of these entries, the corresponding ++manual page\&. Should the user\*(Aqs record not contain one or more of these entries, the corresponding + \fIshadow\fR + check is not performed\&. + .PP + The authentication component performs the task of checking the users credentials (password)\&. The default action of this module is to not permit the user access to a service if their official password is blank\&. + .PP + A helper binary, +-\fBunix_chkpwd\fR(8), is provided to check the user\'s password when it is stored in a read protected database\&. This binary is very simple and will only check the password of the user invoking it\&. It is called transparently on behalf of the user by the authenticating component of this module\&. In this way it is possible for applications like ++\fBunix_chkpwd\fR(8), is provided to check the user\*(Aqs password when it is stored in a read protected database\&. This binary is very simple and will only check the password of the user invoking it\&. It is called transparently on behalf of the user by the authenticating component of this module\&. In this way it is possible for applications like + \fBxlock\fR(1) +-to work without being setuid\-root\&. The module, by default, will temporarily turn off SIGCHLD handling for the duration of execution of the helper binary\&. This is generally the right thing to do, as many applications are not prepared to handle this signal from a child they didn\'t know was ++to work without being setuid\-root\&. The module, by default, will temporarily turn off SIGCHLD handling for the duration of execution of the helper binary\&. This is generally the right thing to do, as many applications are not prepared to handle this signal from a child they didn\*(Aqt know was + \fBfork()\fRd\&. The + \fBnoreap\fR + module argument can be used to suppress this temporary shielding and may be needed for use with certain applications\&. + .PP +-The password component of this module performs the task of updating the user\'s password\&. ++The password component of this module performs the task of updating the user\*(Aqs password\&. + .PP + The session component of this module logs when a user logins or leave the system\&. + .PP +@@ -225,7 +84,7 @@ + .PP + \fBtry_first_pass\fR + .RS 4 +-Before prompting the user for their password, the module first tries the previous stacked module\'s password in case that satisfies this module as well\&. ++Before prompting the user for their password, the module first tries the previous stacked module\*(Aqs password in case that satisfies this module as well\&. + .RE + .PP + \fBuse_first_pass\fR +@@ -264,7 +123,7 @@ The last \fIn\fR passwords for each user are saved in @@ -628,15 +678,12 @@ Index: pam.deb/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 +313,44 @@ - Ignore errors reading shadow information for users in the account management module\&. - .RE - .PP -+\fBmin=\fR\fB\fIn\fR\fR -+.RS 4 -+Set a minimum password length of -+\fIn\fR -+characters\&. The default value is 6\&. +@@ -319,7 +178,38 @@ + .RS 4 + Set a minimum password length of + \fIn\fR +-characters\&. The max\&. for DES crypt based passwords are 8 characters\&. ++characters\&. The default value is 6\&. The maximum for DES crypt\-based passwords is 8 characters\&. +.RE +.PP +\fBobscure\fR @@ -650,12 +697,12 @@ Index: pam.deb/modules/pam_unix/pam_unix.8 +.PP +\fBCase Change Only\fR +.RS 4 -+Verifies that the new password isn\'t the same as the old one with a change of case\&. ++Verifies that the new password isn\*(Aqt the same as the old one with a change of case\&. +.RE +.PP +\fBSimilar\fR +.RS 4 -+Verifies that the new password isn\'t too much like the previous one\&. ++Verifies that the new password isn\*(Aqt too much like the previous one\&. +.RE +.PP +\fBSimple\fR @@ -668,12 +715,10 @@ Index: pam.deb/modules/pam_unix/pam_unix.8 +Is the new password a rotated version of the old password? (E\&.g\&., "billy" and "illyb") +.RE +.sp -+.RE -+.PP + .RE + .PP Invalid arguments are logged with - \fBsyslog\fR(3)\&. - .SH "MODULE TYPES PROVIDED" -@@ -333,21 +369,13 @@ +@@ -340,21 +230,13 @@ .SH "EXAMPLES" .PP An example usage for @@ -696,7 +741,7 @@ Index: pam.deb/modules/pam_unix/pam_unix.8 # Authenticate the user auth required pam_unix\&.so # Ensure users account and password are still active -@@ -358,13 +386,7 @@ +@@ -365,13 +247,7 @@ password required pam_unix\&.so use_authtok nullok md5 session required pam_unix\&.so diff --git a/debian/patches-applied/008_modules_pam_limits_chroot b/debian/patches-applied/008_modules_pam_limits_chroot index d791567c..46befadd 100644 --- a/debian/patches-applied/008_modules_pam_limits_chroot +++ b/debian/patches-applied/008_modules_pam_limits_chroot @@ -94,25 +94,29 @@ Index: pam.deb/modules/pam_limits/limits.conf.5 =================================================================== --- pam.deb.orig/modules/pam_limits/limits.conf.5 +++ pam.deb/modules/pam_limits/limits.conf.5 -@@ -1,161 +1,13 @@ +@@ -1,161 +1,22 @@ +'\" t .\" Title: limits.conf .\" Author: [see the "AUTHOR" section] -.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/> --.\" Date: 03/02/2009 +-.\" Date: 10/27/2010 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -+.\" Date: 08/24/2009 ++.\" Date: 05/31/2011 .\" Manual: Linux-PAM Manual .\" Source: Linux-PAM Manual .\" Language: English .\" --.TH "LIMITS\&.CONF" "5" "03/02/2009" "Linux-PAM Manual" "Linux\-PAM Manual" --.\" ----------------------------------------------------------------- +-.TH "LIMITS\&.CONF" "5" "10/27/2010" "Linux-PAM Manual" "Linux\-PAM Manual" ++.TH "LIMITS\&.CONF" "5" "05/31/2011" "Linux-PAM Manual" "Linux\-PAM Manual" + .\" ----------------------------------------------------------------- -.\" * (re)Define some macros --.\" ----------------------------------------------------------------- --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" * Define some portability stuff + .\" ----------------------------------------------------------------- + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" http://bugs.debian.org/507673 ++.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* @@ -256,11 +260,12 @@ Index: pam.deb/modules/pam_limits/limits.conf.5 -.fi -.\} -.. -+.TH "LIMITS\&.CONF" "5" "08/24/2009" "Linux-PAM Manual" "Linux\-PAM Manual" ++.ie \n(.g .ds Aq \(aq ++.el .ds Aq ' .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- -@@ -166,7 +18,7 @@ +@@ -166,7 +27,7 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- @@ -269,7 +274,16 @@ Index: pam.deb/modules/pam_limits/limits.conf.5 limits.conf \- configuration file for the pam_limits module .SH "DESCRIPTION" .PP -@@ -360,6 +212,11 @@ +@@ -263,7 +124,7 @@ + \fBhard\fR + resource limits together\&. + .sp +-Note, if you specify a type of \'\-\' but neglect to supply the item and value fields then the module will never enforce any limits on the specified user/group etc\&. \&. ++Note, if you specify a type of \*(Aq\-\*(Aq but neglect to supply the item and value fields then the module will never enforce any limits on the specified user/group etc\&. \&. + .RE + .RE + .PP +@@ -360,6 +221,11 @@ .RS 4 maximum realtime priority allowed for non\-privileged processes (Linux 2\&.6\&.12 and higher) .RE @@ -281,7 +295,15 @@ Index: pam.deb/modules/pam_limits/limits.conf.5 .RE .PP All items support the values -@@ -392,20 +249,12 @@ +@@ -385,27 +251,19 @@ + .PP + In the + \fIlimits\fR +-configuration file, the \'\fB#\fR\' character introduces a comment \- after which the rest of the line is ignored\&. ++configuration file, the \*(Aq\fB#\fR\*(Aq character introduces a comment \- after which the rest of the line is ignored\&. + .PP + The pam_limits module does report configuration problems found in its configuration file and errors via + \fBsyslog\fR(3)\&. .SH "EXAMPLES" .PP These are some example lines which might be specified in @@ -303,7 +325,7 @@ Index: pam.deb/modules/pam_limits/limits.conf.5 * soft core 0 * hard rss 10000 @student hard nproc 20 -@@ -414,13 +263,7 @@ +@@ -414,13 +272,7 @@ ftp hard nproc 0 @student \- maxlogins 4 diff --git a/debian/patches-applied/027_pam_limits_better_init_allow_explicit_root b/debian/patches-applied/027_pam_limits_better_init_allow_explicit_root index 07e383ec..8d0b6a4e 100644 --- a/debian/patches-applied/027_pam_limits_better_init_allow_explicit_root +++ b/debian/patches-applied/027_pam_limits_better_init_allow_explicit_root @@ -1,21 +1,65 @@ -Allow explicit limits for root. -Also, remove limits on su. -Index: pam.deb/modules/pam_limits/pam_limits.c +Description: Allow explicit limits for root and reset limits on each session + When crossing session boundaries (such as when su'ing from one user to + another), if the target account has no limit specified in limits.conf we + want to use the default, not the current value configured for the + source account. + . + On Linux, we query default limits by parsing /proc/1/limits, so that we + can sanely inherit kernel defaults that vary with system resources (such as + nproc). If /proc/1/limits is unavailable, fall back to a set of + hard-coded values that shadow the currently known defaults on Linux. + . + Also, don't apply wildcard limits to the root account; only apply limits to + root that reference root by name. +Author: Peter Paluch <peterp@frcatel.fri.utc.sk>, + Ben Collins <bcollins@debian.org>, + Steve Langasek <vorlon@debian.org>, + Kees Cook <kees@ubuntu.com> +Bug-Ubuntu: https://launchpad.net/bugs/746655 +Bug-Debian: http://bugs.debian.org/63230 +Bug-Debian: http://bugs.debian.org/620302 +Forwarded: https://fedorahosted.org/pipermail/pam-developers/2011-March/000017.html +Index: pam-debian/modules/pam_limits/pam_limits.c =================================================================== ---- pam.deb.orig/modules/pam_limits/pam_limits.c -+++ pam.deb/modules/pam_limits/pam_limits.c -@@ -45,6 +45,10 @@ +--- pam-debian.orig/modules/pam_limits/pam_limits.c 2011-06-08 15:00:12.826832292 -0700 ++++ pam-debian/modules/pam_limits/pam_limits.c 2011-06-08 15:02:31.668716317 -0700 +@@ -45,15 +45,24 @@ #include <libaudit.h> #endif +#ifndef MLOCK_LIMIT ++#ifdef __FreeBSD_kernel__ ++#define MLOCK_LIMIT RLIM_INFINITY ++#else +#define MLOCK_LIMIT (64*1024) +#endif ++#endif + /* Module defines */ #define LINE_LENGTH 1024 -@@ -74,6 +78,7 @@ + #define LIMITS_DEF_USER 0 /* limit was set by an user entry */ + #define LIMITS_DEF_GROUP 1 /* limit was set by a group entry */ + #define LIMITS_DEF_ALLGROUP 2 /* limit was set by a group entry */ +-#define LIMITS_DEF_ALL 3 /* limit was set by an default entry */ +-#define LIMITS_DEF_DEFAULT 4 /* limit was set by an default entry */ +-#define LIMITS_DEF_NONE 5 /* this limit was not set yet */ ++#define LIMITS_DEF_ALL 3 /* limit was set by an all entry */ ++#define LIMITS_DEF_DEFAULT 4 /* limit was set by an internal default entry */ ++#define LIMITS_DEF_KERNEL 5 /* limit was set from /proc/1/limits */ ++#define LIMITS_DEF_NONE 6 /* this limit was not set yet */ + + static const char *limits_def_names[] = { + "USER", +@@ -61,6 +70,7 @@ + "ALLGROUP", + "ALL", + "DEFAULT", ++ "KERNEL", + "NONE", + NULL + }; +@@ -74,6 +84,7 @@ /* internal data */ struct pam_limit_s { @@ -23,7 +67,145 @@ Index: pam.deb/modules/pam_limits/pam_limits.c int login_limit; /* the max logins limit */ int login_limit_def; /* which entry set the login limit */ int flag_numsyslogins; /* whether to limit logins only for a -@@ -295,9 +300,18 @@ +@@ -291,13 +302,155 @@ + return 0; + } + +-static int init_limits(struct pam_limit_s *pl) ++static const char * lnames[RLIM_NLIMITS] = { ++ [RLIMIT_CPU] = "Max cpu time", ++ [RLIMIT_FSIZE] = "Max file size", ++ [RLIMIT_DATA] = "Max data size", ++ [RLIMIT_STACK] = "Max stack size", ++ [RLIMIT_CORE] = "Max core file size", ++ [RLIMIT_RSS] = "Max resident set", ++ [RLIMIT_NPROC] = "Max processes", ++ [RLIMIT_NOFILE] = "Max open files", ++ [RLIMIT_MEMLOCK] = "Max locked memory", ++#ifdef RLIMIT_AS ++ [RLIMIT_AS] = "Max address space", ++#endif ++#ifdef RLIMIT_LOCKS ++ [RLIMIT_LOCKS] = "Max file locks", ++#endif ++#ifdef RLIMIT_SIGPENDING ++ [RLIMIT_SIGPENDING] = "Max pending signals", ++#endif ++#ifdef RLIMIT_MSGQUEUE ++ [RLIMIT_MSGQUEUE] = "Max msgqueue size", ++#endif ++#ifdef RLIMIT_NICE ++ [RLIMIT_NICE] = "Max nice priority", ++#endif ++#ifdef RLIMIT_RTPRIO ++ [RLIMIT_RTPRIO] = "Max realtime priority", ++#endif ++#ifdef RLIMIT_RTTIME ++ [RLIMIT_RTTIME] = "Max realtime timeout", ++#endif ++}; ++ ++static int str2rlimit(char *name) { ++ int i; ++ if (!name || *name == '\0') ++ return -1; ++ for(i = 0; i < RLIM_NLIMITS; i++) { ++ if (strcmp(name, lnames[i]) == 0) return i; ++ } ++ return -1; ++} ++ ++static rlim_t str2rlim_t(char *value) { ++ unsigned long long rlimit = 0; ++ ++ if (!value) return (rlim_t)rlimit; ++ if (strcmp(value, "unlimited") == 0) { ++ return RLIM_INFINITY; ++ } ++ rlimit = strtoull(value, NULL, 10); ++ return (rlim_t)rlimit; ++} ++ ++#define LIMITS_SKIP_WHITESPACE { \ ++ /* step backwards over spaces */ \ ++ pos--; \ ++ while (pos && line[pos] == ' ') pos--; \ ++ if (!pos) continue; \ ++ line[pos+1] = '\0'; \ ++} ++#define LIMITS_MARK_ITEM(item) { \ ++ /* step backwards over non-spaces */ \ ++ pos--; \ ++ while (pos && line[pos] != ' ') pos--; \ ++ if (!pos) continue; \ ++ item = line + pos + 1; \ ++} ++ ++static void parse_kernel_limits(pam_handle_t *pamh, struct pam_limit_s *pl) ++{ ++ int i, maxlen = 0; ++ FILE *limitsfile; ++ const char *proclimits = "/proc/1/limits"; ++ char line[256]; ++ char *units, *hard, *soft, *name; ++ ++ if (!(limitsfile = fopen(proclimits, "r"))) { ++ pam_syslog(pamh, LOG_WARNING, "Could not read %s (%s), using PAM internal defaults", proclimits, strerror(errno)); ++ return; ++ } ++ ++ while (fgets(line, 256, limitsfile)) { ++ int pos = strlen(line); ++ if (pos < 2) continue; ++ ++ /* drop trailing newline */ ++ if (line[pos-1] == '\n') { ++ pos--; ++ line[pos] = '\0'; ++ } ++ ++ /* determine formatting boundry of limits report */ ++ if (!maxlen && strncmp(line, "Limit", 5) == 0) { ++ maxlen = pos; ++ continue; ++ } ++ ++ if (pos == maxlen) { ++ /* step backwards over "Units" name */ ++ LIMITS_SKIP_WHITESPACE; ++ LIMITS_MARK_ITEM(units); ++ } ++ else { ++ units = ""; ++ } ++ ++ /* step backwards over "Hard Limit" value */ ++ LIMITS_SKIP_WHITESPACE; ++ LIMITS_MARK_ITEM(hard); ++ ++ /* step backwards over "Soft Limit" value */ ++ LIMITS_SKIP_WHITESPACE; ++ LIMITS_MARK_ITEM(soft); ++ ++ /* step backwards over name of limit */ ++ LIMITS_SKIP_WHITESPACE; ++ name = line; ++ ++ i = str2rlimit(name); ++ if (i < 0 || i >= RLIM_NLIMITS) { ++ if (ctrl & PAM_DEBUG_ARG) ++ pam_syslog(pamh, LOG_DEBUG, "Unknown kernel rlimit '%s' ignored", name); ++ continue; ++ } ++ pl->limits[i].limit.rlim_cur = str2rlim_t(soft); ++ pl->limits[i].limit.rlim_max = str2rlim_t(hard); ++ pl->limits[i].src_soft = LIMITS_DEF_KERNEL; ++ pl->limits[i].src_hard = LIMITS_DEF_KERNEL; ++ } ++ fclose(limitsfile); ++} ++ ++static int init_limits(pam_handle_t *pamh, struct pam_limit_s *pl) { int i; int retval = PAM_SUCCESS; @@ -42,12 +224,22 @@ Index: pam.deb/modules/pam_limits/pam_limits.c for(i = 0; i < RLIM_NLIMITS; i++) { int r = getrlimit(i, &pl->limits[i].limit); if (r == -1) { -@@ -307,8 +321,56 @@ - } - } else { - pl->limits[i].supported = 1; -- pl->limits[i].src_soft = LIMITS_DEF_NONE; -- pl->limits[i].src_hard = LIMITS_DEF_NONE; +@@ -312,6 +465,71 @@ + } + } + ++#ifdef __linux__ ++ parse_kernel_limits(pamh, pl); ++#endif ++ ++ for(i = 0; i < RLIM_NLIMITS; i++) { ++ if (pl->limits[i].supported && ++ (pl->limits[i].src_soft == LIMITS_DEF_NONE || ++ pl->limits[i].src_hard == LIMITS_DEF_NONE)) { ++#ifdef __linux__ ++ pam_syslog(pamh, LOG_WARNING, "Did not find kernel RLIMIT for %s, using PAM internal default", rlimit2str(i)); ++#endif ++ + pl->limits[i].src_soft = LIMITS_DEF_DEFAULT; + pl->limits[i].src_hard = LIMITS_DEF_DEFAULT; + switch(i) { @@ -98,10 +290,13 @@ Index: pam.deb/modules/pam_limits/pam_limits.c + pl->limits[i].src_hard = LIMITS_DEF_NONE; + break; + } - } - } - -@@ -591,7 +653,7 @@ ++ } ++ } ++ + errno = 0; + pl->priority = getpriority (PRIO_PROCESS, 0); + if (pl->priority == -1 && errno != 0) +@@ -591,7 +809,7 @@ if (strcmp(uname, domain) == 0) /* this user have a limit */ process_limit(pamh, LIMITS_DEF_USER, ltype, item, value, ctrl, pl); @@ -110,7 +305,7 @@ Index: pam.deb/modules/pam_limits/pam_limits.c if (ctrl & PAM_DEBUG_ARG) { pam_syslog(pamh, LOG_DEBUG, "checking if %s is in group %s", -@@ -600,7 +662,7 @@ +@@ -600,7 +818,7 @@ if (pam_modutil_user_in_group_nam_nam(pamh, uname, domain+1)) process_limit(pamh, LIMITS_DEF_GROUP, ltype, item, value, ctrl, pl); @@ -119,7 +314,7 @@ Index: pam.deb/modules/pam_limits/pam_limits.c if (ctrl & PAM_DEBUG_ARG) { pam_syslog(pamh, LOG_DEBUG, "checking if %s is in group %s", -@@ -614,7 +676,7 @@ +@@ -614,7 +832,7 @@ process_limit(pamh, LIMITS_DEF_ALLGROUP, ltype, item, value, ctrl, pl); } @@ -128,7 +323,7 @@ Index: pam.deb/modules/pam_limits/pam_limits.c process_limit(pamh, LIMITS_DEF_DEFAULT, ltype, item, value, ctrl, pl); } else if (i == 2 && ltype[0] == '-') { /* Probably a no-limit line */ -@@ -649,6 +711,12 @@ +@@ -649,6 +867,12 @@ int status; int retval = LIMITED_OK; @@ -141,7 +336,14 @@ Index: pam.deb/modules/pam_limits/pam_limits.c for (i=0, status=LIMITED_OK; i<RLIM_NLIMITS; i++) { int res; -@@ -749,6 +817,8 @@ +@@ -743,12 +967,14 @@ + return PAM_USER_UNKNOWN; + } + +- retval = init_limits(pl); ++ retval = init_limits(pamh, pl); + if (retval != PAM_SUCCESS) { + pam_syslog(pamh, LOG_WARNING, "cannot initialize"); return PAM_ABORT; } @@ -150,10 +352,10 @@ Index: pam.deb/modules/pam_limits/pam_limits.c retval = parse_config_file(pamh, pwd->pw_name, ctrl, pl); if (retval == PAM_IGNORE) { D(("the configuration file ('%s') has an applicable '<domain> -' entry", CONF_FILE)); -Index: pam.deb/modules/pam_limits/limits.conf +Index: pam-debian/modules/pam_limits/limits.conf =================================================================== ---- pam.deb.orig/modules/pam_limits/limits.conf -+++ pam.deb/modules/pam_limits/limits.conf +--- pam-debian.orig/modules/pam_limits/limits.conf 2011-06-08 15:00:12.836832427 -0700 ++++ pam-debian/modules/pam_limits/limits.conf 2011-06-08 15:00:15.716871508 -0700 @@ -11,6 +11,9 @@ # - the wildcard *, for default entry # - the wildcard %, can be also used with %group syntax, @@ -172,10 +374,10 @@ Index: pam.deb/modules/pam_limits/limits.conf #* hard rss 10000 #@student hard nproc 20 #@faculty soft nproc 20 -Index: pam.deb/modules/pam_limits/limits.conf.5.xml +Index: pam-debian/modules/pam_limits/limits.conf.5.xml =================================================================== ---- pam.deb.orig/modules/pam_limits/limits.conf.5.xml -+++ pam.deb/modules/pam_limits/limits.conf.5.xml +--- pam-debian.orig/modules/pam_limits/limits.conf.5.xml 2011-06-08 15:00:12.836832427 -0700 ++++ pam-debian/modules/pam_limits/limits.conf.5.xml 2011-06-08 15:00:15.716871508 -0700 @@ -57,6 +57,11 @@ </para> </listitem> @@ -196,11 +398,11 @@ Index: pam.deb/modules/pam_limits/limits.conf.5.xml * hard rss 10000 @student hard nproc 20 @faculty soft nproc 20 -Index: pam.deb/modules/pam_limits/limits.conf.5 +Index: pam-debian/modules/pam_limits/limits.conf.5 =================================================================== ---- pam.deb.orig/modules/pam_limits/limits.conf.5 -+++ pam.deb/modules/pam_limits/limits.conf.5 -@@ -84,6 +84,11 @@ +--- pam-debian.orig/modules/pam_limits/limits.conf.5 2011-06-08 15:00:12.836832427 -0700 ++++ pam-debian/modules/pam_limits/limits.conf.5 2011-06-08 15:00:15.716871508 -0700 +@@ -93,6 +93,11 @@ \fI%group\fR syntax\&. .RE @@ -212,7 +414,7 @@ Index: pam.deb/modules/pam_limits/limits.conf.5 .RE .PP \fB<type>\fR -@@ -256,6 +261,7 @@ +@@ -265,6 +270,7 @@ .\} .nf * soft core 0 @@ -220,10 +422,10 @@ Index: pam.deb/modules/pam_limits/limits.conf.5 * hard rss 10000 @student hard nproc 20 @faculty soft nproc 20 -Index: pam.deb/modules/pam_limits/README +Index: pam-debian/modules/pam_limits/README =================================================================== ---- pam.deb.orig/modules/pam_limits/README 2009-08-24 20:18:05 +0000 -+++ pam.deb/modules/pam_limits/README 2009-08-26 00:32:41 +0000 +--- pam-debian.orig/modules/pam_limits/README 2011-06-08 14:59:29.746247674 -0700 ++++ pam-debian/modules/pam_limits/README 2011-06-08 15:00:15.716871508 -0700 @@ -55,6 +55,7 @@ limits.conf. @@ -232,4 +434,3 @@ Index: pam.deb/modules/pam_limits/README * hard rss 10000 @student hard nproc 20 @faculty soft nproc 20 - diff --git a/debian/patches-applied/036_pam_wheel_getlogin_considered_harmful b/debian/patches-applied/036_pam_wheel_getlogin_considered_harmful index 20f408a3..6dee95c7 100644 --- a/debian/patches-applied/036_pam_wheel_getlogin_considered_harmful +++ b/debian/patches-applied/036_pam_wheel_getlogin_considered_harmful @@ -105,25 +105,29 @@ Index: pam.deb/modules/pam_wheel/pam_wheel.8 =================================================================== --- pam.deb.orig/modules/pam_wheel/pam_wheel.8 +++ pam.deb/modules/pam_wheel/pam_wheel.8 -@@ -1,161 +1,13 @@ +@@ -1,161 +1,22 @@ +'\" t .\" Title: pam_wheel .\" Author: [see the "AUTHOR" section] -.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/> --.\" Date: 03/02/2009 +-.\" Date: 10/27/2010 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -+.\" Date: 08/24/2009 ++.\" Date: 05/31/2011 .\" Manual: Linux-PAM Manual .\" Source: Linux-PAM Manual .\" Language: English .\" --.TH "PAM_WHEEL" "8" "03/02/2009" "Linux-PAM Manual" "Linux\-PAM Manual" --.\" ----------------------------------------------------------------- +-.TH "PAM_WHEEL" "8" "10/27/2010" "Linux-PAM Manual" "Linux\-PAM Manual" ++.TH "PAM_WHEEL" "8" "05/31/2011" "Linux-PAM Manual" "Linux\-PAM Manual" + .\" ----------------------------------------------------------------- -.\" * (re)Define some macros --.\" ----------------------------------------------------------------- --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" * Define some portability stuff + .\" ----------------------------------------------------------------- + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" http://bugs.debian.org/507673 ++.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* @@ -267,11 +271,12 @@ Index: pam.deb/modules/pam_wheel/pam_wheel.8 -.fi -.\} -.. -+.TH "PAM_WHEEL" "8" "08/24/2009" "Linux-PAM Manual" "Linux\-PAM Manual" ++.ie \n(.g .ds Aq \(aq ++.el .ds Aq ' .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- -@@ -166,13 +18,11 @@ +@@ -166,13 +27,11 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- @@ -288,7 +293,7 @@ Index: pam.deb/modules/pam_wheel/pam_wheel.8 .SH "DESCRIPTION" .PP The pam_wheel PAM module is used to enforce the so\-called -@@ -213,11 +63,6 @@ +@@ -213,11 +72,6 @@ .RS 4 The pam_wheel module will return PAM_SUCCESS instead of PAM_IGNORE if the user is a member of the wheel group (thus with a little play stacking the modules the wheel members may be able to su to root without being prompted for a passwd)\&. .RE @@ -300,7 +305,7 @@ Index: pam.deb/modules/pam_wheel/pam_wheel.8 .SH "MODULE TYPES PROVIDED" .PP The -@@ -268,26 +113,12 @@ +@@ -268,26 +122,12 @@ .if n \{\ .RS 4 .\} diff --git a/debian/patches-applied/055_pam_unix_nullok_secure b/debian/patches-applied/055_pam_unix_nullok_secure index 27415915..5e694e12 100644 --- a/debian/patches-applied/055_pam_unix_nullok_secure +++ b/debian/patches-applied/055_pam_unix_nullok_secure @@ -39,7 +39,7 @@ Index: pam.deb/modules/pam_unix/support.c } } -@@ -449,6 +456,7 @@ +@@ -452,6 +459,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 }; -@@ -476,7 +484,18 @@ +@@ -479,7 +487,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"); -@@ -557,6 +576,17 @@ +@@ -560,6 +579,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); -@@ -643,7 +673,8 @@ +@@ -646,7 +676,8 @@ } } } else { @@ -99,35 +99,35 @@ Index: pam.deb/modules/pam_unix/support.h =================================================================== --- pam.deb.orig/modules/pam_unix/support.h +++ pam.deb/modules/pam_unix/support.h -@@ -92,8 +92,9 @@ - #define UNIX_MAX_PASS_LEN 27 /* internal, for compatibility only */ - #define UNIX_MIN_PASS_LEN 28 /* min length for password */ - #define UNIX_OBSCURE_CHECKS 29 /* enable obscure checks on passwords */ -+#define UNIX_NULLOK_SECURE 30 /* NULL passwords allowed only on secure ttys */ +@@ -91,8 +91,9 @@ + #define UNIX_BLOWFISH_PASS 26 /* new password hashes will use blowfish */ + #define UNIX_MIN_PASS_LEN 27 /* min length for password */ + #define UNIX_OBSCURE_CHECKS 28 /* enable obscure checks on passwords */ ++#define UNIX_NULLOK_SECURE 29 /* NULL passwords allowed only on secure ttys */ /* -------------- */ --#define UNIX_CTRLS_ 30 /* number of ctrl arguments defined */ -+#define UNIX_CTRLS_ 31 /* number of ctrl arguments defined */ +-#define UNIX_CTRLS_ 29 /* number of ctrl arguments defined */ ++#define UNIX_CTRLS_ 30 /* number of ctrl arguments defined */ - #define UNIX_HASH_MASK (UNIX_MD5_PASS|UNIX_BIGCRYPT|UNIX_SHA256_PASS|UNIX_SHA512_PASS|UNIX_BLOWFISH_PASS) + #define UNIX_DES_CRYPT(ctrl) (off(UNIX_MD5_PASS,ctrl)&&off(UNIX_BIGCRYPT,ctrl)&&off(UNIX_SHA256_PASS,ctrl)&&off(UNIX_SHA512_PASS,ctrl)&&off(UNIX_BLOWFISH_PASS,ctrl)) -@@ -111,7 +112,7 @@ +@@ -110,7 +111,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}, -/* UNIX__NONULL */ {NULL, _ALL_ON_, 0x200}, -+/* UNIX__NONULL */ {NULL, _ALL_ON_^(0x8000000), 0x200}, ++/* UNIX__NONULL */ {NULL, _ALL_ON_^(0x10000000), 0x200}, /* UNIX__QUIET */ {NULL, _ALL_ON_, 0x400}, /* UNIX_USE_AUTHTOK */ {"use_authtok", _ALL_ON_, 0x800}, /* UNIX_SHADOW */ {"shadow", _ALL_ON_, 0x1000}, -@@ -132,6 +133,7 @@ - /* UNIX_MAX_PASS_LEN */ {"max=", _ALL_ON_, 0}, - /* UNIX_MIN_PASS_LEN */ {"min=", _ALL_ON_, 0x4000000}, +@@ -130,6 +131,7 @@ + /* UNIX_BLOWFISH_PASS */ {"blowfish", _ALL_ON_^(0x2C22000),0x2000000}, + /* UNIX_MIN_PASS_LEN */ {"minlen=", _ALL_ON_, 0x4000000}, /* UNIX_OBSCURE_CHECKS */ {"obscure", _ALL_ON_, 0x8000000}, -+/* UNIX__NULLOK */ {"nullok_secure", _ALL_ON_^(0x200), 0x10000000}, ++/* UNIX_NULLOK_SECURE */ {"nullok_secure", _ALL_ON_^(0x200), 0x10000000}, }; #define UNIX_DEFAULTS (unix_args[UNIX__NONULL].flag) -@@ -167,6 +169,9 @@ +@@ -165,6 +167,9 @@ ,const char *data_name ,const void **pass); @@ -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 -@@ -218,7 +218,14 @@ +@@ -79,7 +79,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 0106037a..202d4d3b 100644 --- a/debian/patches-applied/PAM-manpage-section +++ b/debian/patches-applied/PAM-manpage-section @@ -9,25 +9,29 @@ Index: pam.deb/doc/man/PAM.8 =================================================================== --- pam.deb.orig/doc/man/PAM.8 +++ pam.deb/doc/man/PAM.8 -@@ -1,161 +1,13 @@ +@@ -1,161 +1,22 @@ +'\" t .\" Title: pam .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/> --.\" Date: 03/02/2009 +-.\" Date: 10/27/2010 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -+.\" Date: 08/24/2009 ++.\" Date: 06/04/2011 .\" Manual: Linux-PAM Manual .\" Source: Linux-PAM Manual .\" Language: English .\" --.TH "PAM" "8" "03/02/2009" "Linux-PAM Manual" "Linux-PAM Manual" --.\" ----------------------------------------------------------------- +-.TH "PAM" "8" "10/27/2010" "Linux-PAM Manual" "Linux-PAM Manual" ++.TH "PAM" "7" "06/04/2011" "Linux-PAM Manual" "Linux-PAM Manual" + .\" ----------------------------------------------------------------- -.\" * (re)Define some macros --.\" ----------------------------------------------------------------- --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" * Define some portability stuff + .\" ----------------------------------------------------------------- + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" http://bugs.debian.org/507673 ++.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* @@ -171,11 +175,12 @@ Index: pam.deb/doc/man/PAM.8 -.fi -.\} -.. -+.TH "PAM" "7" "08/24/2009" "Linux-PAM Manual" "Linux-PAM Manual" ++.ie \n(.g .ds Aq \(aq ++.el .ds Aq ' .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- -@@ -166,7 +18,7 @@ +@@ -166,13 +27,13 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- @@ -184,7 +189,14 @@ Index: pam.deb/doc/man/PAM.8 PAM, pam \- Pluggable Authentication Modules for Linux .SH "DESCRIPTION" .PP -@@ -184,13 +36,13 @@ + This manual is intended to offer a quick introduction to + \fBLinux\-PAM\fR\&. For more information the reader is directed to the +-\fBLinux\-PAM system administrators\' guide\fR\&. ++\fBLinux\-PAM system administrators\*(Aq guide\fR\&. + .PP + + \fBLinux\-PAM\fR +@@ -184,13 +45,13 @@ The principal feature of the PAM approach is that the nature of the authentication is dynamically configurable\&. In other words, the system administrator is free to choose how individual service\-providing applications will authenticate users\&. This dynamic configuration is set by the contents of the single \fBLinux\-PAM\fR configuration file @@ -201,7 +213,30 @@ Index: pam.deb/doc/man/PAM.8 .PP From the point of view of the system administrator, for whom this manual is provided, it is not of primary importance to understand the internal behavior of the \fBLinux\-PAM\fR -@@ -231,17 +83,17 @@ +@@ -212,36 +73,36 @@ + \fBsession\fR + management\&. (We highlight the abbreviations used for these groups in the configuration file\&.) + .PP +-Simply put, these groups take care of different aspects of a typical user\'s request for a restricted service: ++Simply put, these groups take care of different aspects of a typical user\*(Aqs request for a restricted service: + .PP + \fBaccount\fR +-\- provide account verification types of service: has the user\'s password expired?; is this user permitted access to the requested service? ++\- provide account verification types of service: has the user\*(Aqs password expired?; is this user permitted access to the requested service? + .PP + \fBauth\fRentication \- authenticate a user and set up user credentials\&. Typically this is via some challenge\-response request that the user must satisfy: if you are who you claim to be please enter your password\&. Not all authentications are of this type, there exist hardware based authentication schemes (such as the use of smart\-cards and biometric devices), with suitable modules, these may be substituted seamlessly for more standard approaches to authentication \- such is the flexibility of + \fBLinux\-PAM\fR\&. + .PP + \fBpassword\fR +-\- this group\'s responsibility is the task of updating authentication mechanisms\&. Typically, such services are strongly coupled to those of the ++\- this group\*(Aqs responsibility is the task of updating authentication mechanisms\&. Typically, such services are strongly coupled to those of the + \fBauth\fR + group\&. Some authentication mechanisms lend themselves well to being updated with such a function\&. Standard UN*X password\-based access is the obvious example: please enter a replacement password\&. + .PP + \fBsession\fR +-\- this group of tasks cover things that should be done prior to a service being given and after it is withdrawn\&. Such tasks include the maintenance of audit trails and the mounting of the user\'s home directory\&. The ++\- this group of tasks cover things that should be done prior to a service being given and after it is withdrawn\&. Such tasks include the maintenance of audit trails and the mounting of the user\*(Aqs home directory\&. The + \fBsession\fR management group is important as it provides both an opening and closing hook for modules to affect the services available to a user\&. .SH "FILES" .PP @@ -222,7 +257,7 @@ Index: pam.deb/doc/man/PAM.8 file is ignored\&. .RE .SH "ERRORS" -@@ -260,4 +112,4 @@ +@@ -260,4 +121,4 @@ \fBpam_authenticate\fR(3), \fBpam_sm_setcred\fR(3), \fBpam_strerror\fR(3), @@ -261,7 +296,222 @@ 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 -@@ -174,7 +174,7 @@ +@@ -1,161 +1,22 @@ ++'\" t + .\" Title: access.conf + .\" Author: [see the "AUTHORS" section] +-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/> +-.\" Date: 10/27/2010 ++.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> ++.\" Date: 06/04/2011 + .\" Manual: Linux-PAM Manual + .\" Source: Linux-PAM Manual + .\" Language: English + .\" +-.TH "ACCESS\&.CONF" "5" "10/27/2010" "Linux-PAM Manual" "Linux\-PAM Manual" ++.TH "ACCESS\&.CONF" "5" "06/04/2011" "Linux-PAM Manual" "Linux\-PAM Manual" + .\" ----------------------------------------------------------------- +-.\" * (re)Define some macros ++.\" * Define some portability stuff + .\" ----------------------------------------------------------------- + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +-.\" toupper - uppercase a string (locale-aware) ++.\" http://bugs.debian.org/507673 ++.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +-.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 +-.\} +-.. ++.ie \n(.g .ds Aq \(aq ++.el .ds Aq ' + .\" ----------------------------------------------------------------- + .\" * set default formatting + .\" ----------------------------------------------------------------- +@@ -166,19 +27,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, +@@ -230,7 +91,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 +@@ -254,9 +115,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 +@@ -322,7 +183,7 @@ \fBpam_access\fR(8), \fBpam.d\fR(5), @@ -287,25 +537,29 @@ Index: pam.deb/modules/pam_env/pam_env.conf.5 =================================================================== --- pam.deb.orig/modules/pam_env/pam_env.conf.5 +++ pam.deb/modules/pam_env/pam_env.conf.5 -@@ -1,161 +1,13 @@ +@@ -1,161 +1,22 @@ +'\" t .\" Title: pam_env.conf .\" Author: [see the "AUTHOR" section] -.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/> --.\" Date: 03/02/2009 +-.\" Date: 10/27/2010 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -+.\" Date: 08/24/2009 ++.\" Date: 06/04/2011 .\" Manual: Linux-PAM Manual .\" Source: Linux-PAM Manual .\" Language: English .\" --.TH "PAM_ENV\&.CONF" "5" "03/02/2009" "Linux-PAM Manual" "Linux\-PAM Manual" --.\" ----------------------------------------------------------------- +-.TH "PAM_ENV\&.CONF" "5" "10/27/2010" "Linux-PAM Manual" "Linux\-PAM Manual" ++.TH "PAM_ENV\&.CONF" "5" "06/04/2011" "Linux-PAM Manual" "Linux\-PAM Manual" + .\" ----------------------------------------------------------------- -.\" * (re)Define some macros --.\" ----------------------------------------------------------------- --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" * Define some portability stuff + .\" ----------------------------------------------------------------- + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" http://bugs.debian.org/507673 ++.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* @@ -449,11 +703,12 @@ Index: pam.deb/modules/pam_env/pam_env.conf.5 -.fi -.\} -.. -+.TH "PAM_ENV\&.CONF" "5" "08/24/2009" "Linux-PAM Manual" "Linux\-PAM Manual" ++.ie \n(.g .ds Aq \(aq ++.el .ds Aq ' .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- -@@ -166,12 +18,12 @@ +@@ -166,12 +27,12 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- @@ -468,7 +723,14 @@ Index: pam.deb/modules/pam_env/pam_env.conf.5 file specifies the environment variables to be set, unset or modified by \fBpam_env\fR(8)\&. When someone logs in, this file is read and the environment variables are set according\&. .PP -@@ -187,31 +39,17 @@ +@@ -181,37 +42,23 @@ + \fIVARIABLE\fR + [\fIDEFAULT=[value]\fR] [\fIOVERRIDE=[value]\fR] + .PP +-(Possibly non\-existent) environment variables may be used in values using the ${string} syntax and (possibly non\-existent) PAM_ITEMs may be used in values using the @{string} syntax\&. Both the $ and @ characters can be backslash escaped to be used as literal values values can be delimited with "", escaped " not supported\&. Note that many environment variables that you would like to use may not be set by the time the module is called\&. For example, HOME is used below several times, but many PAM applications don\'t make it available by the time you need it\&. ++(Possibly non\-existent) environment variables may be used in values using the ${string} syntax and (possibly non\-existent) PAM_ITEMs may be used in values using the @{string} syntax\&. Both the $ and @ characters can be backslash escaped to be used as literal values values can be delimited with "", escaped " not supported\&. Note that many environment variables that you would like to use may not be set by the time the module is called\&. For example, HOME is used below several times, but many PAM applications don\*(Aqt make it available by the time you need it\&. + .PP + The "\fI#\fR" character at start of line (no space at front) can be used to mark this line as a comment line\&. .SH "EXAMPLES" .PP These are some example lines which might be specified in @@ -501,7 +763,7 @@ Index: pam.deb/modules/pam_env/pam_env.conf.5 .if n \{\ .RE .\} -@@ -221,24 +59,10 @@ +@@ -221,24 +68,10 @@ .if n \{\ .RS 4 .\} @@ -526,7 +788,7 @@ Index: pam.deb/modules/pam_env/pam_env.conf.5 .if n \{\ .RE .\} -@@ -248,15 +72,7 @@ +@@ -248,15 +81,7 @@ .if n \{\ .RS 4 .\} @@ -542,7 +804,7 @@ Index: pam.deb/modules/pam_env/pam_env.conf.5 PAGER DEFAULT=less MANPAGER DEFAULT=less LESS DEFAULT="M q e h15 z23 b80" -@@ -264,13 +80,7 @@ +@@ -264,13 +89,7 @@ PATH DEFAULT=${HOME}/bin:/usr/local/bin:/bin\e :/usr/bin:/usr/local/bin/X11:/usr/bin/X11 @@ -556,7 +818,7 @@ Index: pam.deb/modules/pam_env/pam_env.conf.5 .if n \{\ .RE .\} -@@ -280,27 +90,13 @@ +@@ -280,27 +99,13 @@ .if n \{\ .RS 4 .\} @@ -584,7 +846,7 @@ Index: pam.deb/modules/pam_env/pam_env.conf.5 .if n \{\ .RE .\} -@@ -309,7 +105,7 @@ +@@ -309,7 +114,7 @@ \fBpam_env\fR(8), \fBpam.d\fR(5), @@ -610,25 +872,29 @@ Index: pam.deb/modules/pam_group/group.conf.5 =================================================================== --- pam.deb.orig/modules/pam_group/group.conf.5 +++ pam.deb/modules/pam_group/group.conf.5 -@@ -1,161 +1,13 @@ +@@ -1,161 +1,22 @@ +'\" t .\" Title: group.conf .\" Author: [see the "AUTHOR" section] -.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/> --.\" Date: 03/02/2009 +-.\" Date: 10/27/2010 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -+.\" Date: 08/24/2009 ++.\" Date: 06/04/2011 .\" Manual: Linux-PAM Manual .\" Source: Linux-PAM Manual .\" Language: English .\" --.TH "GROUP\&.CONF" "5" "03/02/2009" "Linux-PAM Manual" "Linux\-PAM Manual" --.\" ----------------------------------------------------------------- +-.TH "GROUP\&.CONF" "5" "10/27/2010" "Linux-PAM Manual" "Linux\-PAM Manual" ++.TH "GROUP\&.CONF" "5" "06/04/2011" "Linux-PAM Manual" "Linux\-PAM Manual" + .\" ----------------------------------------------------------------- -.\" * (re)Define some macros --.\" ----------------------------------------------------------------- --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" * Define some portability stuff + .\" ----------------------------------------------------------------- + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" http://bugs.debian.org/507673 ++.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* @@ -772,11 +1038,12 @@ Index: pam.deb/modules/pam_group/group.conf.5 -.fi -.\} -.. -+.TH "GROUP\&.CONF" "5" "08/24/2009" "Linux-PAM Manual" "Linux\-PAM Manual" ++.ie \n(.g .ds Aq \(aq ++.el .ds Aq ' .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- -@@ -166,14 +18,14 @@ +@@ -166,15 +27,15 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- @@ -789,18 +1056,43 @@ Index: pam.deb/modules/pam_group/group.conf.5 .PP For this module to function correctly there must be a correctly formatted -\FC/etc/security/group\&.conf\F[] +-file present\&. White spaces are ignored and lines maybe extended with \'\e\' (escaped newlines)\&. Text following a \'#\' is ignored to the end of the line\&. +/etc/security/group\&.conf - file present\&. White spaces are ignored and lines maybe extended with \'\e\' (escaped newlines)\&. Text following a \'#\' is ignored to the end of the line\&. ++file present\&. White spaces are ignored and lines maybe extended with \*(Aq\e\*(Aq (escaped newlines)\&. Text following a \*(Aq#\*(Aq is ignored to the end of the line\&. .PP The syntax of the lines is as follows: -@@ -209,22 +61,16 @@ + .PP +@@ -191,95 +52,61 @@ + .PP + The third field, the + \fIusers\fR +-field, is a logic list of users, or a UNIX group, or a netgroup of users to whom this rule applies\&. Group names are preceded by a \'%\' symbol, while netgroup names are preceded by a \'@\' symbol\&. ++field, is a logic list of users, or a UNIX group, or a netgroup of users to whom this rule applies\&. Group names are preceded by a \*(Aq%\*(Aq symbol, while netgroup names are preceded by a \*(Aq@\*(Aq symbol\&. + .PP +-For these items the simple wildcard \'*\' may be used only once\&. With UNIX groups or netgroups no wildcards or logic operators are allowed\&. ++For these items the simple wildcard \*(Aq*\*(Aq may be used only once\&. With UNIX groups or netgroups no wildcards or logic operators are allowed\&. + .PP + The + \fItimes\fR + field is used to indicate "when" these groups are to be given to the user\&. The format here is a logic list of day/time\-range entries\&. The days are specified by a sequence of two character entries, MoTuSa for example is Monday Tuesday and Saturday\&. Note that repeated days are unset MoMo = no day, and MoWk = all weekdays bar Monday\&. The two character combinations accepted are Mo Tu We Th Fr Sa Su Wk Wd Al, the last two being week\-end days and all 7 days of the week respectively\&. As a final example, AlFr means all days except Friday\&. + .PP +-Each day/time\-range can be prefixed with a \'!\' to indicate "anything but"\&. The time\-range part is two 24\-hour times HHMM, separated by a hyphen, indicating the start and finish time (if the finish time is smaller than the start time it is deemed to apply on the following day)\&. ++Each day/time\-range can be prefixed with a \*(Aq!\*(Aq to indicate "anything but"\&. The time\-range part is two 24\-hour times HHMM, separated by a hyphen, indicating the start and finish time (if the finish time is smaller than the start time it is deemed to apply on the following day)\&. + .PP + The + \fIgroups\fR +-field is a comma or space separated list of groups that the user inherits membership of\&. These groups are added if the previous fields are satisfied by the user\'s request\&. ++field is a comma or space separated list of groups that the user inherits membership of\&. These groups are added if the previous fields are satisfied by the user\*(Aqs request\&. + .PP + For a rule to be active, ALL of service+ttys+users must be satisfied by the applying process\&. .SH "EXAMPLES" .PP These are some example lines which might be specified in -\FC/etc/security/group\&.conf\F[]\&. +/etc/security/group\&.conf\&. .PP - Running \'xsh\' on tty* (any ttyXXX device), the user \'us\' is given access to the floppy (through membership of the floppy group) +-Running \'xsh\' on tty* (any ttyXXX device), the user \'us\' is given access to the floppy (through membership of the floppy group) ++Running \*(Aqxsh\*(Aq on tty* (any ttyXXX device), the user \*(Aqus\*(Aq is given access to the floppy (through membership of the floppy group) .sp .if n \{\ .RS 4 @@ -817,7 +1109,10 @@ Index: pam.deb/modules/pam_group/group.conf.5 .if n \{\ .RE .\} -@@ -234,25 +80,11 @@ + .PP +-Running \'xsh\' on tty* (any ttyXXX device), the user \'sword\' is given access to games (through membership of the floppy group) after work hours\&. ++Running \*(Aqxsh\*(Aq on tty* (any ttyXXX device), the user \*(Aqsword\*(Aq is given access to games (through membership of the floppy group) after work hours\&. + .sp .if n \{\ .RS 4 .\} @@ -843,7 +1138,35 @@ Index: pam.deb/modules/pam_group/group.conf.5 .if n \{\ .RE .\} -@@ -261,7 +93,7 @@ + .PP +-Any member of the group \'admin\' running \'xsh\' on tty*, is granted access (at any time) to the group \'plugdev\' ++Any member of the group \*(Aqadmin\*(Aq running \*(Aqxsh\*(Aq on tty*, is granted access (at any time) to the group \*(Aqplugdev\*(Aq + .sp + .if n \{\ + .RS 4 + .\} +-.fam C +-.ps -1 + .nf +-.if t \{\ +-.sp -1 +-.\} +-.BB lightgray adjust-for-leading-newline +-.sp -1 +- + xsh; tty* ;%admin;Al0000\-2400;plugdev + +-.EB lightgray adjust-for-leading-newline +-.if t \{\ +-.sp 1 +-.\} + .fi +-.fam +-.ps +1 + .if n \{\ + .RE + .\} +@@ -288,7 +115,7 @@ \fBpam_group\fR(8), \fBpam.d\fR(5), @@ -856,7 +1179,7 @@ Index: pam.deb/modules/pam_group/group.conf.5.xml =================================================================== --- pam.deb.orig/modules/pam_group/group.conf.5.xml +++ pam.deb/modules/pam_group/group.conf.5.xml -@@ -118,7 +118,7 @@ +@@ -128,7 +128,7 @@ <para> <citerefentry><refentrytitle>pam_group</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>pam.d</refentrytitle><manvolnum>5</manvolnum></citerefentry>, @@ -869,7 +1192,16 @@ Index: pam.deb/modules/pam_limits/limits.conf.5 =================================================================== --- pam.deb.orig/modules/pam_limits/limits.conf.5 +++ pam.deb/modules/pam_limits/limits.conf.5 -@@ -278,7 +278,7 @@ +@@ -93,7 +93,7 @@ + \fI%group\fR + syntax\&. + .RE +-.RS 4 ++.sp + + \fBNOTE:\fR + group and wildcard limits are not applied to the root user\&. To set a limit for the root user, this field must contain the literal username +@@ -287,7 +287,7 @@ \fBpam_limits\fR(8), \fBpam.d\fR(5), @@ -895,25 +1227,29 @@ Index: pam.deb/modules/pam_namespace/namespace.conf.5 =================================================================== --- pam.deb.orig/modules/pam_namespace/namespace.conf.5 +++ pam.deb/modules/pam_namespace/namespace.conf.5 -@@ -1,161 +1,13 @@ +@@ -1,161 +1,22 @@ +'\" t .\" Title: namespace.conf .\" Author: [see the "AUTHORS" section] -.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/> --.\" Date: 03/02/2009 +-.\" Date: 10/27/2010 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -+.\" Date: 08/24/2009 ++.\" Date: 06/04/2011 .\" Manual: Linux-PAM Manual .\" Source: Linux-PAM Manual .\" Language: English .\" --.TH "NAMESPACE\&.CONF" "5" "03/02/2009" "Linux-PAM Manual" "Linux\-PAM Manual" --.\" ----------------------------------------------------------------- +-.TH "NAMESPACE\&.CONF" "5" "10/27/2010" "Linux-PAM Manual" "Linux\-PAM Manual" ++.TH "NAMESPACE\&.CONF" "5" "06/04/2011" "Linux-PAM Manual" "Linux\-PAM Manual" + .\" ----------------------------------------------------------------- -.\" * (re)Define some macros --.\" ----------------------------------------------------------------- --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" * Define some portability stuff + .\" ----------------------------------------------------------------- + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" http://bugs.debian.org/507673 ++.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* @@ -1057,11 +1393,12 @@ Index: pam.deb/modules/pam_namespace/namespace.conf.5 -.fi -.\} -.. -+.TH "NAMESPACE\&.CONF" "5" "08/24/2009" "Linux-PAM Manual" "Linux\-PAM Manual" ++.ie \n(.g .ds Aq \(aq ++.el .ds Aq ' .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- -@@ -166,22 +18,22 @@ +@@ -166,22 +27,22 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- @@ -1088,7 +1425,31 @@ Index: pam.deb/modules/pam_namespace/namespace.conf.5 is scanned\&. Comments are marked by \fI#\fR characters\&. Each non comment line represents one polyinstantiated directory\&. The fields are separated by spaces but can be quoted by -@@ -231,7 +83,7 @@ +@@ -200,7 +61,7 @@ + The first field, + \fIpolydir\fR, is the absolute pathname of the directory to polyinstantiate\&. The special string + \fI$HOME\fR +-is replaced with the user\'s home directory, and ++is replaced with the user\*(Aqs home directory, and + \fI$USER\fR + with the username\&. This field cannot be blank\&. + .PP +@@ -210,12 +71,12 @@ + \fImethod\fR + it is then appended with "instance differentiation string" to generate the final instance directory path\&. This directory is created if it did not exist already, and is then bind mounted on the <polydir> to provide an instance of <polydir> based on the <method> column\&. The special string + \fI$HOME\fR +-is replaced with the user\'s home directory, and ++is replaced with the user\*(Aqs home directory, and + \fI$USER\fR + with the username\&. This field cannot be blank\&. + .PP + The third field, +-\fImethod\fR, is the method used for polyinstantiation\&. It can take these values; "user" for polyinstantiation based on user name, "level" for polyinstantiation based on process MLS level and user name, "context" for polyinstantiation based on process security context and user name, "tmpfs" for mounting tmpfs filesystem as an instance dir, and "tmpdir" for creating temporary directory as an instance dir which is removed when the user\'s session is closed\&. Methods "context" and "level" are only available with SELinux\&. This field cannot be blank\&. ++\fImethod\fR, is the method used for polyinstantiation\&. It can take these values; "user" for polyinstantiation based on user name, "level" for polyinstantiation based on process MLS level and user name, "context" for polyinstantiation based on process security context and user name, "tmpfs" for mounting tmpfs filesystem as an instance dir, and "tmpdir" for creating temporary directory as an instance dir which is removed when the user\*(Aqs session is closed\&. Methods "context" and "level" are only available with SELinux\&. This field cannot be blank\&. + .PP + The fourth field, + \fIlist_of_uids\fR, is a comma separated list of user names for whom the polyinstantiation is not performed\&. If left blank, polyinstantiation will be performed for all users\&. If the list is preceded with a single "~" character, polyinstantiation is performed only for users in the list\&. +@@ -231,7 +92,7 @@ .PP \fIiscript\fR=\fIpath\fR \- path to the instance directory init script\&. The base directory for relative paths is @@ -1097,7 +1458,7 @@ Index: pam.deb/modules/pam_namespace/namespace.conf.5 .PP \fInoinit\fR \- instance directory init script will not be executed\&. -@@ -243,7 +95,7 @@ +@@ -243,7 +104,7 @@ \fIignore_instance_parent_mode\fR .PP In case of context or level polyinstantiation the SELinux context which is used for polyinstantiation is the context used for executing a new process as obtained by getexeccon\&. This context must be set by the calling application or @@ -1106,7 +1467,7 @@ Index: pam.deb/modules/pam_namespace/namespace.conf.5 module\&. If this context is not set the polyinstatiation will be based just on user name\&. .PP The "instance differentiation string" is <user name> for "user" method and <user name>_<raw directory context> for "context" and "level" methods\&. If the whole string is too long the end of it is replaced with md5sum of itself\&. Also when command line option -@@ -252,20 +104,12 @@ +@@ -252,22 +113,14 @@ .SH "EXAMPLES" .PP These are some example lines which might be specified in @@ -1126,9 +1487,12 @@ Index: pam.deb/modules/pam_namespace/namespace.conf.5 -.sp -1 - # The following three lines will polyinstantiate /tmp, - # /var/tmp and user\'s home directories\&. /tmp and /var/tmp +- # /var/tmp and user\'s home directories\&. /tmp and /var/tmp ++ # /var/tmp and user\*(Aqs home directories\&. /tmp and /var/tmp # will be polyinstantiated based on the security level -@@ -286,13 +130,7 @@ + # as well as user name, whereas home directory will be + # polyinstantiated based on the full security context and user name\&. +@@ -286,13 +139,7 @@ /var/tmp /var/tmp/tmp\-inst/ level root,adm $HOME $HOME/$USER\&.inst/inst\- context @@ -1142,7 +1506,7 @@ Index: pam.deb/modules/pam_namespace/namespace.conf.5 .if n \{\ .RE .\} -@@ -307,7 +145,7 @@ +@@ -307,7 +154,7 @@ \fBpam_namespace\fR(8), \fBpam.d\fR(5), @@ -1168,25 +1532,29 @@ Index: pam.deb/modules/pam_time/time.conf.5 =================================================================== --- pam.deb.orig/modules/pam_time/time.conf.5 +++ pam.deb/modules/pam_time/time.conf.5 -@@ -1,161 +1,13 @@ +@@ -1,161 +1,22 @@ +'\" t .\" Title: time.conf .\" Author: [see the "AUTHOR" section] -.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/> --.\" Date: 03/02/2009 +-.\" Date: 10/27/2010 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -+.\" Date: 08/24/2009 ++.\" Date: 06/04/2011 .\" Manual: Linux-PAM Manual .\" Source: Linux-PAM Manual .\" Language: English .\" --.TH "TIME\&.CONF" "5" "03/02/2009" "Linux-PAM Manual" "Linux\-PAM Manual" --.\" ----------------------------------------------------------------- +-.TH "TIME\&.CONF" "5" "10/27/2010" "Linux-PAM Manual" "Linux\-PAM Manual" ++.TH "TIME\&.CONF" "5" "06/04/2011" "Linux-PAM Manual" "Linux\-PAM Manual" + .\" ----------------------------------------------------------------- -.\" * (re)Define some macros --.\" ----------------------------------------------------------------- --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" * Define some portability stuff + .\" ----------------------------------------------------------------- + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" http://bugs.debian.org/507673 ++.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* @@ -1330,11 +1698,12 @@ Index: pam.deb/modules/pam_time/time.conf.5 -.fi -.\} -.. -+.TH "TIME\&.CONF" "5" "08/24/2009" "Linux-PAM Manual" "Linux\-PAM Manual" ++.ie \n(.g .ds Aq \(aq ++.el .ds Aq ' .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- -@@ -166,14 +18,14 @@ +@@ -166,22 +27,22 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- @@ -1347,11 +1716,37 @@ Index: pam.deb/modules/pam_time/time.conf.5 .PP For this module to function correctly there must be a correctly formatted -\FC/etc/security/time\&.conf\F[] +-file present\&. White spaces are ignored and lines maybe extended with \'\e\' (escaped newlines)\&. Text following a \'#\' is ignored to the end of the line\&. +/etc/security/time\&.conf - file present\&. White spaces are ignored and lines maybe extended with \'\e\' (escaped newlines)\&. Text following a \'#\' is ignored to the end of the line\&. ++file present\&. White spaces are ignored and lines maybe extended with \*(Aq\e\*(Aq (escaped newlines)\&. Text following a \*(Aq#\*(Aq is ignored to the end of the line\&. .PP The syntax of the lines is as follows: -@@ -212,7 +64,7 @@ + .PP + + \fIservices\fR;\fIttys\fR;\fIusers\fR;\fItimes\fR + .PP +-In words, each rule occupies a line, terminated with a newline or the beginning of a comment; a \'\fB#\fR\'\&. It contains four fields separated with semicolons, \'\fB;\fR\'\&. ++In words, each rule occupies a line, terminated with a newline or the beginning of a comment; a \*(Aq\fB#\fR\*(Aq\&. It contains four fields separated with semicolons, \*(Aq\fB;\fR\*(Aq\&. + .PP + The first field, the + \fIservices\fR +@@ -195,13 +56,13 @@ + \fIusers\fR + field, is a logic list of users or a netgroup of users to whom this rule applies\&. + .PP +-For these items the simple wildcard \'*\' may be used only once\&. With netgroups no wildcards or logic operators are allowed\&. ++For these items the simple wildcard \*(Aq*\*(Aq may be used only once\&. With netgroups no wildcards or logic operators are allowed\&. + .PP + The + \fItimes\fR + field is used to indicate the times at which this rule applies\&. The format here is a logic list of day/time\-range entries\&. The days are specified by a sequence of two character entries, MoTuSa for example is Monday Tuesday and Saturday\&. Note that repeated days are unset MoMo = no day, and MoWk = all weekdays bar Monday\&. The two character combinations accepted are Mo Tu We Th Fr Sa Su Wk Wd Al, the last two being week\-end days and all 7 days of the week respectively\&. As a final example, AlFr means all days except Friday\&. + .PP +-Each day/time\-range can be prefixed with a \'!\' to indicate "anything but"\&. The time\-range part is two 24\-hour times HHMM, separated by a hyphen, indicating the start and finish time (if the finish time is smaller than the start time it is deemed to apply on the following day)\&. ++Each day/time\-range can be prefixed with a \*(Aq!\*(Aq to indicate "anything but"\&. The time\-range part is two 24\-hour times HHMM, separated by a hyphen, indicating the start and finish time (if the finish time is smaller than the start time it is deemed to apply on the following day)\&. + .PP + For a rule to be active, ALL of service+ttys+users must be satisfied by the applying process\&. + .PP +@@ -212,7 +73,7 @@ .SH "EXAMPLES" .PP These are some example lines which might be specified in @@ -1360,7 +1755,7 @@ Index: pam.deb/modules/pam_time/time.conf.5 .PP All users except for \fIroot\fR -@@ -221,24 +73,10 @@ +@@ -221,24 +82,10 @@ .if n \{\ .RS 4 .\} @@ -1385,7 +1780,7 @@ Index: pam.deb/modules/pam_time/time.conf.5 .if n \{\ .RE .\} -@@ -249,17 +87,11 @@ +@@ -249,17 +96,11 @@ .if n \{\ .RS 4 .\} @@ -1403,7 +1798,7 @@ Index: pam.deb/modules/pam_time/time.conf.5 .if n \{\ .RE .\} -@@ -269,7 +101,7 @@ +@@ -269,7 +110,7 @@ \fBpam_time\fR(8), \fBpam.d\fR(5), @@ -1429,25 +1824,29 @@ Index: pam.deb/modules/pam_access/pam_access.8 =================================================================== --- pam.deb.orig/modules/pam_access/pam_access.8 +++ pam.deb/modules/pam_access/pam_access.8 -@@ -1,161 +1,13 @@ +@@ -1,161 +1,22 @@ +'\" t .\" Title: pam_access .\" Author: [see the "AUTHORS" section] -.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/> --.\" Date: 06/16/2009 +-.\" Date: 10/27/2010 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -+.\" Date: 08/24/2009 ++.\" Date: 06/04/2011 .\" Manual: Linux-PAM Manual .\" Source: Linux-PAM Manual .\" Language: English .\" --.TH "PAM_ACCESS" "8" "06/16/2009" "Linux-PAM Manual" "Linux-PAM Manual" --.\" ----------------------------------------------------------------- +-.TH "PAM_ACCESS" "8" "10/27/2010" "Linux-PAM Manual" "Linux-PAM Manual" ++.TH "PAM_ACCESS" "8" "06/04/2011" "Linux-PAM Manual" "Linux-PAM Manual" + .\" ----------------------------------------------------------------- -.\" * (re)Define some macros --.\" ----------------------------------------------------------------- --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" * Define some portability stuff + .\" ----------------------------------------------------------------- + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" http://bugs.debian.org/507673 ++.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* @@ -1591,11 +1990,12 @@ Index: pam.deb/modules/pam_access/pam_access.8 -.fi -.\} -.. -+.TH "PAM_ACCESS" "8" "08/24/2009" "Linux-PAM Manual" "Linux-PAM Manual" ++.ie \n(.g .ds Aq \(aq ++.el .ds Aq ' .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- -@@ -166,19 +18,17 @@ +@@ -166,20 +27,18 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- @@ -1614,11 +2014,13 @@ Index: pam.deb/modules/pam_access/pam_access.8 .PP By default rules for access management are taken from config file -\FC/etc/security/access\&.conf\F[] +-if you don\'t specify another file\&. +/etc/security/access\&.conf - if you don\'t specify another file\&. ++if you don\*(Aqt specify another file\&. .PP If Linux PAM is compiled with audit support the module will report when it denies access based on origin (host or tty)\&. -@@ -187,7 +37,7 @@ + .SH "OPTIONS" +@@ -187,7 +46,7 @@ \fBaccessfile=\fR\fB\fI/path/to/access\&.conf\fR\fR .RS 4 Indicate an alternative @@ -1627,7 +2029,27 @@ Index: pam.deb/modules/pam_access/pam_access.8 style configuration file to override the default\&. This can be useful when different services need different access lists\&. .RE .PP -@@ -259,7 +109,7 @@ +@@ -206,16 +65,16 @@ + .RS 4 + This option modifies the field separator character that pam_access will recognize when parsing the access configuration file\&. For example: + \fBfieldsep=|\fR +-will cause the default `:\' character to be treated as part of a field value and `|\' becomes the field separator\&. Doing this may be useful in conjunction with a system that wants to use pam_access with X based applications, since the ++will cause the default `:\*(Aq character to be treated as part of a field value and `|\*(Aq becomes the field separator\&. Doing this may be useful in conjunction with a system that wants to use pam_access with X based applications, since the + \fBPAM_TTY\fR +-item is likely to be of the form "hostname:0" which includes a `:\' character in its value\&. But you should not need this\&. ++item is likely to be of the form "hostname:0" which includes a `:\*(Aq character in its value\&. But you should not need this\&. + .RE + .PP + \fBlistsep=\fR\fB\fIseparators\fR\fR + .RS 4 + This option modifies the list separator character that pam_access will recognize when parsing the access configuration file\&. For example: + \fBlistsep=,\fR +-will cause the default ` \' (space) and `\et\' (tab) characters to be treated as part of a list element value and `,\' becomes the only list element separator\&. Doing this may be useful on a system with group information obtained from a Windows domain, where the default built\-in groups "Domain Users", "Domain Admins" contain a space\&. ++will cause the default ` \*(Aq (space) and `\et\*(Aq (tab) characters to be treated as part of a list element value and `,\*(Aq becomes the only list element separator\&. Doing this may be useful on a system with group information obtained from a Windows domain, where the default built\-in groups "Domain Users", "Domain Admins" contain a space\&. + .RE + .PP + \fBnodefgroup\fR +@@ -259,7 +118,7 @@ .RE .SH "FILES" .PP @@ -1636,7 +2058,7 @@ Index: pam.deb/modules/pam_access/pam_access.8 .RS 4 Default configuration file .RE -@@ -268,7 +118,7 @@ +@@ -268,7 +127,7 @@ \fBaccess.conf\fR(5), \fBpam.d\fR(5), @@ -1662,25 +2084,29 @@ Index: pam.deb/modules/pam_cracklib/pam_cracklib.8 =================================================================== --- pam.deb.orig/modules/pam_cracklib/pam_cracklib.8 +++ pam.deb/modules/pam_cracklib/pam_cracklib.8 -@@ -1,161 +1,13 @@ +@@ -1,161 +1,22 @@ +'\" t .\" Title: pam_cracklib .\" Author: [see the "AUTHOR" section] -.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/> --.\" Date: 06/16/2009 +-.\" Date: 10/27/2010 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -+.\" Date: 08/24/2009 ++.\" Date: 06/04/2011 .\" Manual: Linux-PAM Manual .\" Source: Linux-PAM Manual .\" Language: English .\" --.TH "PAM_CRACKLIB" "8" "06/16/2009" "Linux-PAM Manual" "Linux\-PAM Manual" --.\" ----------------------------------------------------------------- +-.TH "PAM_CRACKLIB" "8" "10/27/2010" "Linux-PAM Manual" "Linux\-PAM Manual" ++.TH "PAM_CRACKLIB" "8" "06/04/2011" "Linux-PAM Manual" "Linux\-PAM Manual" + .\" ----------------------------------------------------------------- -.\" * (re)Define some macros --.\" ----------------------------------------------------------------- --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" * Define some portability stuff + .\" ----------------------------------------------------------------- + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" http://bugs.debian.org/507673 ++.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* @@ -1824,11 +2250,12 @@ Index: pam.deb/modules/pam_cracklib/pam_cracklib.8 -.fi -.\} -.. -+.TH "PAM_CRACKLIB" "8" "08/24/2009" "Linux-PAM Manual" "Linux\-PAM Manual" ++.ie \n(.g .ds Aq \(aq ++.el .ds Aq ' .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- -@@ -166,13 +18,11 @@ +@@ -166,13 +27,11 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- @@ -1844,7 +2271,16 @@ Index: pam.deb/modules/pam_cracklib/pam_cracklib.8 .SH "DESCRIPTION" .PP This module can be plugged into the -@@ -421,15 +271,7 @@ +@@ -234,7 +93,7 @@ + .PP + Contains user name + .RS 4 +-Optional check whether the password contains the user\'s name in some form\&. ++Optional check whether the password contains the user\*(Aqs name in some form\&. + .RE + .PP + This module with no arguments will work well for standard unix password encryption\&. With md5 encryption, passwords can be longer than 8 characters and the default settings for this module can make it hard for the user to choose a satisfactory new password\&. Notably, the requirement that the new password contain no more than 1/2 of the characters in the old password becomes a non\-trivial constraint\&. For example, an old password of the form "the quick brown fox jumped over the lazy dogs" would be difficult to change\&.\&.\&. In addition, the default action is to allow passwords as small as 5 characters in length\&. For a md5 systems it can be a good idea to increase the required minimum size of a password\&. One can then allow more credit for different kinds of characters but accept that the new password may share most of these characters with the old password\&. +@@ -421,15 +280,7 @@ .if n \{\ .RS 4 .\} @@ -1860,7 +2296,7 @@ Index: pam.deb/modules/pam_cracklib/pam_cracklib.8 # # These lines stack two password type modules\&. In this example the # user is given 3 opportunities to enter a strong password\&. The -@@ -440,33 +282,19 @@ +@@ -440,33 +291,19 @@ passwd password required pam_cracklib\&.so retry=3 passwd password required pam_unix\&.so use_authtok @@ -1895,7 +2331,7 @@ Index: pam.deb/modules/pam_cracklib/pam_cracklib.8 #%PAM\-1\&.0 # # These lines allow a md5 systems to support passwords of at least 14 -@@ -478,13 +306,7 @@ +@@ -478,31 +315,17 @@ difok=3 minlen=15 dcredit= 2 ocredit=2 password required pam_unix\&.so use_authtok nullok md5 @@ -1909,7 +2345,10 @@ Index: pam.deb/modules/pam_cracklib/pam_cracklib.8 .if n \{\ .RE .\} -@@ -494,15 +316,7 @@ + .PP +-And here is another example in case you don\'t want to use credits: ++And here is another example in case you don\*(Aqt want to use credits: + .sp .if n \{\ .RS 4 .\} @@ -1925,7 +2364,7 @@ Index: pam.deb/modules/pam_cracklib/pam_cracklib.8 #%PAM\-1\&.0 # # These lines require the user to select a password with a minimum -@@ -513,13 +327,7 @@ +@@ -513,13 +336,7 @@ dcredit=\-1 ucredit=\-1 ocredit=\-1 lcredit=0 minlen=8 password required pam_unix\&.so use_authtok nullok md5 @@ -1939,7 +2378,7 @@ Index: pam.deb/modules/pam_cracklib/pam_cracklib.8 .if n \{\ .RE .\} -@@ -529,7 +337,7 @@ +@@ -529,7 +346,7 @@ \fBpam.conf\fR(5), \fBpam.d\fR(5), @@ -1965,25 +2404,29 @@ Index: pam.deb/modules/pam_debug/pam_debug.8 =================================================================== --- pam.deb.orig/modules/pam_debug/pam_debug.8 +++ pam.deb/modules/pam_debug/pam_debug.8 -@@ -1,161 +1,13 @@ +@@ -1,161 +1,22 @@ +'\" t .\" Title: pam_debug .\" Author: [see the "AUTHOR" section] -.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/> --.\" Date: 03/02/2009 +-.\" Date: 10/27/2010 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -+.\" Date: 08/24/2009 ++.\" Date: 06/04/2011 .\" Manual: Linux-PAM Manual .\" Source: Linux-PAM Manual .\" Language: English .\" --.TH "PAM_DEBUG" "8" "03/02/2009" "Linux-PAM Manual" "Linux\-PAM Manual" --.\" ----------------------------------------------------------------- +-.TH "PAM_DEBUG" "8" "10/27/2010" "Linux-PAM Manual" "Linux\-PAM Manual" ++.TH "PAM_DEBUG" "8" "06/04/2011" "Linux-PAM Manual" "Linux\-PAM Manual" + .\" ----------------------------------------------------------------- -.\" * (re)Define some macros --.\" ----------------------------------------------------------------- --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" * Define some portability stuff + .\" ----------------------------------------------------------------- + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" http://bugs.debian.org/507673 ++.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* @@ -2127,11 +2570,12 @@ Index: pam.deb/modules/pam_debug/pam_debug.8 -.fi -.\} -.. -+.TH "PAM_DEBUG" "8" "08/24/2009" "Linux-PAM Manual" "Linux\-PAM Manual" ++.ie \n(.g .ds Aq \(aq ++.el .ds Aq ' .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- -@@ -166,13 +18,11 @@ +@@ -166,13 +27,11 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- @@ -2147,7 +2591,7 @@ Index: pam.deb/modules/pam_debug/pam_debug.8 .SH "DESCRIPTION" .PP The pam_debug PAM module is intended as a debugging aide for determining how the PAM stack is operating\&. This module returns what its module arguments tell it to return\&. -@@ -263,15 +113,7 @@ +@@ -263,15 +122,7 @@ .if n \{\ .RS 4 .\} @@ -2163,7 +2607,7 @@ Index: pam.deb/modules/pam_debug/pam_debug.8 auth requisite pam_permit\&.so auth [success=2 default=ok] pam_debug\&.so auth=perm_denied cred=success auth [default=reset] pam_debug\&.so auth=success cred=perm_denied -@@ -279,13 +121,7 @@ +@@ -279,13 +130,7 @@ auth optional pam_debug\&.so auth=perm_denied cred=perm_denied auth sufficient pam_debug\&.so auth=success cred=success @@ -2177,7 +2621,7 @@ Index: pam.deb/modules/pam_debug/pam_debug.8 .if n \{\ .RE .\} -@@ -294,7 +130,7 @@ +@@ -294,7 +139,7 @@ \fBpam.conf\fR(5), \fBpam.d\fR(5), @@ -2203,25 +2647,29 @@ Index: pam.deb/modules/pam_deny/pam_deny.8 =================================================================== --- pam.deb.orig/modules/pam_deny/pam_deny.8 +++ pam.deb/modules/pam_deny/pam_deny.8 -@@ -1,161 +1,13 @@ +@@ -1,161 +1,22 @@ +'\" t .\" Title: pam_deny .\" Author: [see the "AUTHOR" section] -.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/> --.\" Date: 03/02/2009 +-.\" Date: 10/27/2010 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -+.\" Date: 08/24/2009 ++.\" Date: 06/04/2011 .\" Manual: Linux-PAM Manual .\" Source: Linux-PAM Manual .\" Language: English .\" --.TH "PAM_DENY" "8" "03/02/2009" "Linux-PAM Manual" "Linux\-PAM Manual" --.\" ----------------------------------------------------------------- +-.TH "PAM_DENY" "8" "10/27/2010" "Linux-PAM Manual" "Linux\-PAM Manual" ++.TH "PAM_DENY" "8" "06/04/2011" "Linux-PAM Manual" "Linux\-PAM Manual" + .\" ----------------------------------------------------------------- -.\" * (re)Define some macros --.\" ----------------------------------------------------------------- --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" * Define some portability stuff + .\" ----------------------------------------------------------------- + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" http://bugs.debian.org/507673 ++.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* @@ -2365,11 +2813,12 @@ Index: pam.deb/modules/pam_deny/pam_deny.8 -.fi -.\} -.. -+.TH "PAM_DENY" "8" "08/24/2009" "Linux-PAM Manual" "Linux\-PAM Manual" ++.ie \n(.g .ds Aq \(aq ++.el .ds Aq ' .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- -@@ -166,13 +18,11 @@ +@@ -166,13 +27,11 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- @@ -2385,7 +2834,7 @@ Index: pam.deb/modules/pam_deny/pam_deny.8 .SH "DESCRIPTION" .PP This module can be used to deny access\&. It always indicates a failure to the application through the PAM framework\&. It might be suitable for using for default (the -@@ -214,15 +64,7 @@ +@@ -214,18 +73,10 @@ .if n \{\ .RS 4 .\} @@ -2400,8 +2849,12 @@ Index: pam.deb/modules/pam_deny/pam_deny.8 - #%PAM\-1\&.0 # - # If we don\'t have config entries for a service, the -@@ -237,13 +79,7 @@ +-# If we don\'t have config entries for a service, the ++# If we don\*(Aqt have config entries for a service, the + # OTHER entries are used\&. To be secure, warn and deny + # access to everything\&. + other auth required pam_warn\&.so +@@ -237,13 +88,7 @@ other session required pam_warn\&.so other session required pam_deny\&.so @@ -2415,7 +2868,7 @@ Index: pam.deb/modules/pam_deny/pam_deny.8 .if n \{\ .RE .\} -@@ -252,7 +88,7 @@ +@@ -252,7 +97,7 @@ \fBpam.conf\fR(5), \fBpam.d\fR(5), @@ -2441,25 +2894,29 @@ Index: pam.deb/modules/pam_echo/pam_echo.8 =================================================================== --- pam.deb.orig/modules/pam_echo/pam_echo.8 +++ pam.deb/modules/pam_echo/pam_echo.8 -@@ -1,161 +1,13 @@ +@@ -1,161 +1,22 @@ +'\" t .\" Title: pam_echo .\" Author: [see the "AUTHOR" section] -.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/> --.\" Date: 06/16/2009 +-.\" Date: 10/27/2010 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -+.\" Date: 08/24/2009 ++.\" Date: 06/04/2011 .\" Manual: Linux-PAM Manual .\" Source: Linux-PAM Manual .\" Language: English .\" --.TH "PAM_ECHO" "8" "06/16/2009" "Linux-PAM Manual" "Linux-PAM Manual" --.\" ----------------------------------------------------------------- +-.TH "PAM_ECHO" "8" "10/27/2010" "Linux-PAM Manual" "Linux-PAM Manual" ++.TH "PAM_ECHO" "8" "06/04/2011" "Linux-PAM Manual" "Linux-PAM Manual" + .\" ----------------------------------------------------------------- -.\" * (re)Define some macros --.\" ----------------------------------------------------------------- --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" * Define some portability stuff + .\" ----------------------------------------------------------------- + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" http://bugs.debian.org/507673 ++.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* @@ -2603,11 +3060,12 @@ Index: pam.deb/modules/pam_echo/pam_echo.8 -.fi -.\} -.. -+.TH "PAM_ECHO" "8" "08/24/2009" "Linux-PAM Manual" "Linux-PAM Manual" ++.ie \n(.g .ds Aq \(aq ++.el .ds Aq ' .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- -@@ -166,13 +18,11 @@ +@@ -166,13 +27,11 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- @@ -2623,7 +3081,7 @@ Index: pam.deb/modules/pam_echo/pam_echo.8 .SH "DESCRIPTION" .PP The -@@ -221,7 +71,7 @@ +@@ -221,7 +80,7 @@ \fBfile=\fR\fB\fI/path/message\fR\fR .RS 4 The content of the file @@ -2632,7 +3090,7 @@ Index: pam.deb/modules/pam_echo/pam_echo.8 will be printed with the PAM conversion function as PAM_TEXT_INFO\&. .RE .SH "MODULE TYPES PROVIDED" -@@ -254,25 +104,11 @@ +@@ -254,25 +113,11 @@ .if n \{\ .RS 4 .\} @@ -2658,7 +3116,7 @@ Index: pam.deb/modules/pam_echo/pam_echo.8 .if n \{\ .RE .\} -@@ -282,7 +118,7 @@ +@@ -282,7 +127,7 @@ \fBpam.conf\fR(8), \fBpam.d\fR(5), @@ -2684,25 +3142,29 @@ Index: pam.deb/modules/pam_env/pam_env.8 =================================================================== --- pam.deb.orig/modules/pam_env/pam_env.8 +++ pam.deb/modules/pam_env/pam_env.8 -@@ -1,161 +1,13 @@ +@@ -1,161 +1,22 @@ +'\" t .\" Title: pam_env .\" Author: [see the "AUTHOR" section] -.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/> --.\" Date: 06/16/2009 +-.\" Date: 10/27/2010 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -+.\" Date: 08/24/2009 ++.\" Date: 06/04/2011 .\" Manual: Linux-PAM Manual .\" Source: Linux-PAM Manual .\" Language: English .\" --.TH "PAM_ENV" "8" "06/16/2009" "Linux-PAM Manual" "Linux-PAM Manual" --.\" ----------------------------------------------------------------- +-.TH "PAM_ENV" "8" "10/27/2010" "Linux-PAM Manual" "Linux-PAM Manual" ++.TH "PAM_ENV" "8" "06/04/2011" "Linux-PAM Manual" "Linux-PAM Manual" + .\" ----------------------------------------------------------------- -.\" * (re)Define some macros --.\" ----------------------------------------------------------------- --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" * Define some portability stuff + .\" ----------------------------------------------------------------- + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" http://bugs.debian.org/507673 ++.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* @@ -2846,11 +3308,12 @@ Index: pam.deb/modules/pam_env/pam_env.8 -.fi -.\} -.. -+.TH "PAM_ENV" "8" "08/24/2009" "Linux-PAM Manual" "Linux-PAM Manual" ++.ie \n(.g .ds Aq \(aq ++.el .ds Aq ' .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- -@@ -166,13 +18,11 @@ +@@ -166,13 +27,11 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- @@ -2866,7 +3329,7 @@ Index: pam.deb/modules/pam_env/pam_env.8 .SH "DESCRIPTION" .PP The pam_env PAM module allows the (un)setting of environment variables\&. Supported is the use of previously set environment variables as well as -@@ -180,12 +30,12 @@ +@@ -180,12 +39,12 @@ \fIPAM_RHOST\fR\&. .PP By default rules for (un)setting of variables is taken from the config file @@ -2881,7 +3344,7 @@ Index: pam.deb/modules/pam_env/pam_env.8 by default)\&. You can change the default file to parse, with the \fIenvfile\fR flag and turn it on or off by setting the -@@ -196,7 +46,7 @@ +@@ -198,7 +57,7 @@ \fBconffile=\fR\fB\fI/path/to/pam_env\&.conf\fR\fR .RS 4 Indicate an alternative @@ -2890,7 +3353,7 @@ Index: pam.deb/modules/pam_env/pam_env.8 style configuration file to override the default\&. This can be useful when different services need different environments\&. .RE .PP -@@ -209,7 +59,7 @@ +@@ -211,7 +70,7 @@ \fBenvfile=\fR\fB\fI/path/to/environment\fR\fR .RS 4 Indicate an alternative @@ -2899,7 +3362,7 @@ Index: pam.deb/modules/pam_env/pam_env.8 file to override the default\&. This can be useful when different services need different environments\&. .RE .PP -@@ -221,7 +71,7 @@ +@@ -223,7 +82,7 @@ \fBuser_envfile=\fR\fB\fIfilename\fR\fR .RS 4 Indicate an alternative @@ -2908,7 +3371,7 @@ Index: pam.deb/modules/pam_env/pam_env.8 file to override the default\&. This can be useful when different services need different environments\&. The filename is relative to the user home directory\&. .RE .PP -@@ -259,17 +109,17 @@ +@@ -261,17 +120,17 @@ .RE .SH "FILES" .PP @@ -2929,7 +3392,7 @@ Index: pam.deb/modules/pam_env/pam_env.8 .RS 4 User specific environment file .RE -@@ -278,7 +128,7 @@ +@@ -280,7 +139,7 @@ \fBpam_env.conf\fR(5), \fBpam.d\fR(5), @@ -2942,7 +3405,7 @@ Index: pam.deb/modules/pam_env/pam_env.8.xml =================================================================== --- pam.deb.orig/modules/pam_env/pam_env.8.xml +++ pam.deb/modules/pam_env/pam_env.8.xml -@@ -231,7 +231,7 @@ +@@ -235,7 +235,7 @@ <refentrytitle>pam.d</refentrytitle><manvolnum>5</manvolnum> </citerefentry>, <citerefentry> @@ -2955,25 +3418,29 @@ Index: pam.deb/modules/pam_exec/pam_exec.8 =================================================================== --- pam.deb.orig/modules/pam_exec/pam_exec.8 +++ pam.deb/modules/pam_exec/pam_exec.8 -@@ -1,161 +1,13 @@ +@@ -1,161 +1,22 @@ +'\" t .\" Title: pam_exec .\" Author: [see the "AUTHOR" section] -.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/> --.\" Date: 06/16/2009 +-.\" Date: 10/27/2010 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -+.\" Date: 02/01/2010 ++.\" Date: 06/04/2011 .\" Manual: Linux-PAM Manual .\" Source: Linux-PAM Manual .\" Language: English .\" --.TH "PAM_EXEC" "8" "06/16/2009" "Linux-PAM Manual" "Linux\-PAM Manual" --.\" ----------------------------------------------------------------- +-.TH "PAM_EXEC" "8" "10/27/2010" "Linux-PAM Manual" "Linux\-PAM Manual" ++.TH "PAM_EXEC" "8" "06/04/2011" "Linux-PAM Manual" "Linux\-PAM Manual" + .\" ----------------------------------------------------------------- -.\" * (re)Define some macros --.\" ----------------------------------------------------------------- --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" * Define some portability stuff + .\" ----------------------------------------------------------------- + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" http://bugs.debian.org/507673 ++.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* @@ -3117,11 +3584,12 @@ Index: pam.deb/modules/pam_exec/pam_exec.8 -.fi -.\} -.. -+.TH "PAM_EXEC" "8" "02/01/2010" "Linux-PAM Manual" "Linux\-PAM Manual" ++.ie \n(.g .ds Aq \(aq ++.el .ds Aq ' .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- -@@ -166,13 +18,11 @@ +@@ -166,18 +27,16 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- @@ -3137,7 +3605,13 @@ Index: pam.deb/modules/pam_exec/pam_exec.8 .SH "DESCRIPTION" .PP pam_exec is a PAM module that can be used to run an external command\&. -@@ -210,7 +60,7 @@ + .PP +-The child\'s environment is set to the current PAM environment list, as returned by ++The child\*(Aqs environment is set to the current PAM environment list, as returned by + \fBpam_getenvlist\fR(3) + In addition, the following PAM items are exported as environment variables: + \fIPAM_RHOST\fR, +@@ -212,7 +71,7 @@ \fBlog=\fR\fB\fIfile\fR\fR .RS 4 The output of the command is appended to @@ -3146,7 +3620,7 @@ Index: pam.deb/modules/pam_exec/pam_exec.8 .RE .PP \fBquiet\fR -@@ -256,30 +106,16 @@ +@@ -258,30 +117,16 @@ .SH "EXAMPLES" .PP Add the following line to @@ -3166,7 +3640,7 @@ Index: pam.deb/modules/pam_exec/pam_exec.8 -.BB lightgray adjust-for-leading-newline -.sp -1 - - passwd optional pam_exec\&.so seteuid make \-C /var/yp + password optional pam_exec\&.so seteuid /usr/bin/make \-C /var/yp -.EB lightgray adjust-for-leading-newline -.if t \{\ @@ -3178,7 +3652,7 @@ Index: pam.deb/modules/pam_exec/pam_exec.8 .if n \{\ .RE .\} -@@ -289,15 +125,9 @@ +@@ -291,15 +136,9 @@ .if n \{\ .RS 4 .\} @@ -3194,7 +3668,7 @@ Index: pam.deb/modules/pam_exec/pam_exec.8 .if n \{\ .RE .\} -@@ -308,7 +138,7 @@ +@@ -310,7 +149,7 @@ \fBpam.conf\fR(5), \fBpam.d\fR(5), @@ -3207,7 +3681,7 @@ Index: pam.deb/modules/pam_exec/pam_exec.8.xml =================================================================== --- pam.deb.orig/modules/pam_exec/pam_exec.8.xml +++ pam.deb/modules/pam_exec/pam_exec.8.xml -@@ -223,7 +223,7 @@ +@@ -228,7 +228,7 @@ <refentrytitle>pam.d</refentrytitle><manvolnum>5</manvolnum> </citerefentry>, <citerefentry> @@ -3220,25 +3694,29 @@ Index: pam.deb/modules/pam_faildelay/pam_faildelay.8 =================================================================== --- pam.deb.orig/modules/pam_faildelay/pam_faildelay.8 +++ pam.deb/modules/pam_faildelay/pam_faildelay.8 -@@ -1,161 +1,13 @@ +@@ -1,161 +1,22 @@ +'\" t .\" Title: pam_faildelay .\" Author: [see the "AUTHOR" section] -.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/> --.\" Date: 03/02/2009 +-.\" Date: 10/27/2010 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -+.\" Date: 08/24/2009 ++.\" Date: 06/04/2011 .\" Manual: Linux-PAM Manual .\" Source: Linux-PAM Manual .\" Language: English .\" --.TH "PAM_FAILDELAY" "8" "03/02/2009" "Linux-PAM Manual" "Linux\-PAM Manual" --.\" ----------------------------------------------------------------- +-.TH "PAM_FAILDELAY" "8" "10/27/2010" "Linux-PAM Manual" "Linux\-PAM Manual" ++.TH "PAM_FAILDELAY" "8" "06/04/2011" "Linux-PAM Manual" "Linux\-PAM Manual" + .\" ----------------------------------------------------------------- -.\" * (re)Define some macros --.\" ----------------------------------------------------------------- --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" * Define some portability stuff + .\" ----------------------------------------------------------------- + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" http://bugs.debian.org/507673 ++.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* @@ -3382,11 +3860,12 @@ Index: pam.deb/modules/pam_faildelay/pam_faildelay.8 -.fi -.\} -.. -+.TH "PAM_FAILDELAY" "8" "08/24/2009" "Linux-PAM Manual" "Linux\-PAM Manual" ++.ie \n(.g .ds Aq \(aq ++.el .ds Aq ' .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- -@@ -166,13 +18,11 @@ +@@ -166,13 +27,11 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- @@ -3402,7 +3881,7 @@ Index: pam.deb/modules/pam_faildelay/pam_faildelay.8 .SH "DESCRIPTION" .PP pam_faildelay is a PAM module that can be used to set the delay on failure per\-application\&. -@@ -180,7 +30,7 @@ +@@ -180,7 +39,7 @@ If no \fBdelay\fR is given, pam_faildelay will use the value of FAIL_DELAY from @@ -3411,7 +3890,7 @@ Index: pam.deb/modules/pam_faildelay/pam_faildelay.8 .SH "OPTIONS" .PP \fBdebug\fR -@@ -215,24 +65,10 @@ +@@ -215,24 +74,10 @@ .if n \{\ .RS 4 .\} @@ -3436,7 +3915,7 @@ Index: pam.deb/modules/pam_faildelay/pam_faildelay.8 .if n \{\ .RE .\} -@@ -243,7 +79,7 @@ +@@ -243,7 +88,7 @@ \fBpam_fail_delay\fR(3), \fBpam.conf\fR(5), \fBpam.d\fR(5), @@ -3462,25 +3941,29 @@ Index: pam.deb/modules/pam_filter/pam_filter.8 =================================================================== --- pam.deb.orig/modules/pam_filter/pam_filter.8 +++ pam.deb/modules/pam_filter/pam_filter.8 -@@ -1,161 +1,13 @@ +@@ -1,161 +1,22 @@ +'\" t .\" Title: pam_filter .\" Author: [see the "AUTHOR" section] -.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/> --.\" Date: 06/16/2009 +-.\" Date: 10/27/2010 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -+.\" Date: 08/24/2009 ++.\" Date: 06/04/2011 .\" Manual: Linux-PAM Manual .\" Source: Linux-PAM Manual .\" Language: English .\" --.TH "PAM_FILTER" "8" "06/16/2009" "Linux-PAM Manual" "Linux\-PAM Manual" --.\" ----------------------------------------------------------------- +-.TH "PAM_FILTER" "8" "10/27/2010" "Linux-PAM Manual" "Linux\-PAM Manual" ++.TH "PAM_FILTER" "8" "06/04/2011" "Linux-PAM Manual" "Linux\-PAM Manual" + .\" ----------------------------------------------------------------- -.\" * (re)Define some macros --.\" ----------------------------------------------------------------- --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" * Define some portability stuff + .\" ----------------------------------------------------------------- + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" http://bugs.debian.org/507673 ++.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* @@ -3624,11 +4107,12 @@ Index: pam.deb/modules/pam_filter/pam_filter.8 -.fi -.\} -.. -+.TH "PAM_FILTER" "8" "08/24/2009" "Linux-PAM Manual" "Linux\-PAM Manual" ++.ie \n(.g .ds Aq \(aq ++.el .ds Aq ' .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- -@@ -166,13 +18,11 @@ +@@ -166,13 +27,11 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- @@ -3644,7 +4128,25 @@ Index: pam.deb/modules/pam_filter/pam_filter.8 .SH "DESCRIPTION" .PP This module is intended to be a platform for providing access to all of the input/output that passes between the user and the application\&. It is only suitable for tty\-based and (stdin/stdout) applications\&. -@@ -289,30 +139,16 @@ +@@ -205,7 +64,7 @@ + .PP + \fBnon_term\fR + .RS 4 +-don\'t try to set the ++don\*(Aqt try to set the + \fIPAM_TTY\fR + item\&. + .RE +@@ -221,7 +80,7 @@ + and + \fI2\fR\&. These indicate the precise time that the filter is to be run\&. To understand this concept it will be useful to have read the + \fBpam\fR(3) +-manual page\&. Basically, for each management group there are up to two ways of calling the module\'s functions\&. In the case of the ++manual page\&. Basically, for each management group there are up to two ways of calling the module\*(Aqs functions\&. In the case of the + \fIauthentication\fR + and + \fIsession\fR +@@ -289,30 +148,16 @@ .SH "EXAMPLES" .PP Add the following line to @@ -3676,7 +4178,7 @@ Index: pam.deb/modules/pam_filter/pam_filter.8 .if n \{\ .RE .\} -@@ -322,7 +158,7 @@ +@@ -322,7 +167,7 @@ \fBpam.conf\fR(5), \fBpam.d\fR(5), @@ -3702,25 +4204,29 @@ Index: pam.deb/modules/pam_ftp/pam_ftp.8 =================================================================== --- pam.deb.orig/modules/pam_ftp/pam_ftp.8 +++ pam.deb/modules/pam_ftp/pam_ftp.8 -@@ -1,161 +1,13 @@ +@@ -1,161 +1,22 @@ +'\" t .\" Title: pam_ftp .\" Author: [see the "AUTHOR" section] -.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/> --.\" Date: 06/16/2009 +-.\" Date: 10/27/2010 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -+.\" Date: 08/24/2009 ++.\" Date: 06/04/2011 .\" Manual: Linux-PAM Manual .\" Source: Linux-PAM Manual .\" Language: English .\" --.TH "PAM_FTP" "8" "06/16/2009" "Linux-PAM Manual" "Linux\-PAM Manual" --.\" ----------------------------------------------------------------- +-.TH "PAM_FTP" "8" "10/27/2010" "Linux-PAM Manual" "Linux\-PAM Manual" ++.TH "PAM_FTP" "8" "06/04/2011" "Linux-PAM Manual" "Linux\-PAM Manual" + .\" ----------------------------------------------------------------- -.\" * (re)Define some macros --.\" ----------------------------------------------------------------- --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" * Define some portability stuff + .\" ----------------------------------------------------------------- + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" http://bugs.debian.org/507673 ++.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* @@ -3864,11 +4370,12 @@ Index: pam.deb/modules/pam_ftp/pam_ftp.8 -.fi -.\} -.. -+.TH "PAM_FTP" "8" "08/24/2009" "Linux-PAM Manual" "Linux\-PAM Manual" ++.ie \n(.g .ds Aq \(aq ++.el .ds Aq ' .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- -@@ -166,13 +18,11 @@ +@@ -166,21 +27,19 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- @@ -3884,7 +4391,17 @@ Index: pam.deb/modules/pam_ftp/pam_ftp.8 .SH "DESCRIPTION" .PP pam_ftp is a PAM module which provides a pluggable anonymous ftp mode of access\&. -@@ -234,21 +84,13 @@ + .PP +-This module intercepts the user\'s name and password\&. If the name is ++This module intercepts the user\*(Aqs name and password\&. If the name is + \fIftp\fR + or +-\fIanonymous\fR, the user\'s password is broken up at the ++\fIanonymous\fR, the user\*(Aqs password is broken up at the + \fI@\fR + delimiter into a + \fIPAM_RUSER\fR +@@ -234,21 +93,13 @@ .SH "EXAMPLES" .PP Add the following line to @@ -3907,7 +4424,7 @@ Index: pam.deb/modules/pam_ftp/pam_ftp.8 # # ftpd; add ftp\-specifics\&. These lines enable anonymous ftp over # standard UN*X access (the listfile entry blocks access to -@@ -259,13 +101,7 @@ +@@ -259,13 +110,7 @@ auth required pam_listfile\&.so \e onerr=succeed item=user sense=deny file=/etc/ftpusers @@ -3921,7 +4438,7 @@ Index: pam.deb/modules/pam_ftp/pam_ftp.8 .if n \{\ .RE .\} -@@ -275,7 +111,7 @@ +@@ -275,7 +120,7 @@ \fBpam.conf\fR(5), \fBpam.d\fR(5), @@ -3947,25 +4464,29 @@ Index: pam.deb/modules/pam_group/pam_group.8 =================================================================== --- pam.deb.orig/modules/pam_group/pam_group.8 +++ pam.deb/modules/pam_group/pam_group.8 -@@ -1,161 +1,13 @@ +@@ -1,161 +1,22 @@ +'\" t .\" Title: pam_group .\" Author: [see the "AUTHORS" section] -.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/> --.\" Date: 06/16/2009 +-.\" Date: 10/27/2010 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -+.\" Date: 08/24/2009 ++.\" Date: 06/04/2011 .\" Manual: Linux-PAM Manual .\" Source: Linux-PAM Manual .\" Language: English .\" --.TH "PAM_GROUP" "8" "06/16/2009" "Linux-PAM Manual" "Linux-PAM Manual" --.\" ----------------------------------------------------------------- +-.TH "PAM_GROUP" "8" "10/27/2010" "Linux-PAM Manual" "Linux-PAM Manual" ++.TH "PAM_GROUP" "8" "06/04/2011" "Linux-PAM Manual" "Linux-PAM Manual" + .\" ----------------------------------------------------------------- -.\" * (re)Define some macros --.\" ----------------------------------------------------------------- --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" * Define some portability stuff + .\" ----------------------------------------------------------------- + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" http://bugs.debian.org/507673 ++.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* @@ -4109,11 +4630,12 @@ Index: pam.deb/modules/pam_group/pam_group.8 -.fi -.\} -.. -+.TH "PAM_GROUP" "8" "08/24/2009" "Linux-PAM Manual" "Linux-PAM Manual" ++.ie \n(.g .ds Aq \(aq ++.el .ds Aq ' .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- -@@ -166,19 +18,17 @@ +@@ -166,21 +27,19 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- @@ -4134,9 +4656,12 @@ Index: pam.deb/modules/pam_group/pam_group.8 -\FC/etc/security/group\&.conf\F[]\&. +/etc/security/group\&.conf\&. .PP - This module\'s usefulness relies on the file\-systems accessible to the user\&. The point being that once granted the membership of a group, the user may attempt to create a +-This module\'s usefulness relies on the file\-systems accessible to the user\&. The point being that once granted the membership of a group, the user may attempt to create a ++This module\*(Aqs usefulness relies on the file\-systems accessible to the user\&. The point being that once granted the membership of a group, the user may attempt to create a \fBsetgid\fR -@@ -188,11 +38,11 @@ + binary with a restricted group ownership\&. Later, when the user is not given membership to this group, they can recover group membership with the precompiled binary\&. The reason that the file\-systems that the user has access to are so significant, is the fact that when a system is mounted + \fInosuid\fR +@@ -188,11 +47,11 @@ \fInosuid\fR\&. .PP The pam_group module functions in parallel with the @@ -4150,7 +4675,7 @@ Index: pam.deb/modules/pam_group/pam_group.8 (or equivalent)\&. .SH "OPTIONS" .PP -@@ -237,7 +87,7 @@ +@@ -237,7 +96,7 @@ .RE .SH "FILES" .PP @@ -4159,7 +4684,7 @@ Index: pam.deb/modules/pam_group/pam_group.8 .RS 4 Default configuration file .RE -@@ -246,7 +96,7 @@ +@@ -246,7 +105,7 @@ \fBgroup.conf\fR(5), \fBpam.d\fR(5), @@ -4185,25 +4710,29 @@ Index: pam.deb/modules/pam_issue/pam_issue.8 =================================================================== --- pam.deb.orig/modules/pam_issue/pam_issue.8 +++ pam.deb/modules/pam_issue/pam_issue.8 -@@ -1,161 +1,13 @@ +@@ -1,161 +1,22 @@ +'\" t .\" Title: pam_issue .\" Author: [see the "AUTHOR" section] -.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/> --.\" Date: 06/16/2009 +-.\" Date: 10/27/2010 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -+.\" Date: 08/24/2009 ++.\" Date: 06/04/2011 .\" Manual: Linux-PAM Manual .\" Source: Linux-PAM Manual .\" Language: English .\" --.TH "PAM_ISSUE" "8" "06/16/2009" "Linux-PAM Manual" "Linux\-PAM Manual" --.\" ----------------------------------------------------------------- +-.TH "PAM_ISSUE" "8" "10/27/2010" "Linux-PAM Manual" "Linux\-PAM Manual" ++.TH "PAM_ISSUE" "8" "06/04/2011" "Linux-PAM Manual" "Linux\-PAM Manual" + .\" ----------------------------------------------------------------- -.\" * (re)Define some macros --.\" ----------------------------------------------------------------- --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" * Define some portability stuff + .\" ----------------------------------------------------------------- + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" http://bugs.debian.org/507673 ++.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* @@ -4347,11 +4876,12 @@ Index: pam.deb/modules/pam_issue/pam_issue.8 -.fi -.\} -.. -+.TH "PAM_ISSUE" "8" "08/24/2009" "Linux-PAM Manual" "Linux\-PAM Manual" ++.ie \n(.g .ds Aq \(aq ++.el .ds Aq ' .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- -@@ -166,13 +18,11 @@ +@@ -166,16 +27,14 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- @@ -4366,8 +4896,21 @@ Index: pam.deb/modules/pam_issue/pam_issue.8 -.fam .SH "DESCRIPTION" .PP - pam_issue is a PAM module to prepend an issue file to the username prompt\&. It also by default parses escape codes in the issue file similar to some common getty\'s (using \ex format)\&. -@@ -275,30 +125,16 @@ +-pam_issue is a PAM module to prepend an issue file to the username prompt\&. It also by default parses escape codes in the issue file similar to some common getty\'s (using \ex format)\&. ++pam_issue is a PAM module to prepend an issue file to the username prompt\&. It also by default parses escape codes in the issue file similar to some common getty\*(Aqs (using \ex format)\&. + .PP + Recognized escapes: + .PP +@@ -196,7 +55,7 @@ + .PP + \fB\en\fR + .RS 4 +-machine\'s network node hostname (uname \-n) ++machine\*(Aqs network node hostname (uname \-n) + .RE + .PP + \fB\eo\fR +@@ -275,30 +134,16 @@ .SH "EXAMPLES" .PP Add the following line to @@ -4399,7 +4942,7 @@ Index: pam.deb/modules/pam_issue/pam_issue.8 .if n \{\ .RE .\} -@@ -308,7 +144,7 @@ +@@ -308,7 +153,7 @@ \fBpam.conf\fR(5), \fBpam.d\fR(5), @@ -4425,25 +4968,29 @@ Index: pam.deb/modules/pam_keyinit/pam_keyinit.8 =================================================================== --- pam.deb.orig/modules/pam_keyinit/pam_keyinit.8 +++ pam.deb/modules/pam_keyinit/pam_keyinit.8 -@@ -1,161 +1,13 @@ +@@ -1,161 +1,22 @@ +'\" t .\" Title: pam_keyinit .\" Author: [see the "AUTHOR" section] -.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/> --.\" Date: 03/02/2009 +-.\" Date: 10/27/2010 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -+.\" Date: 08/24/2009 ++.\" Date: 06/04/2011 .\" Manual: Linux-PAM Manual .\" Source: Linux-PAM Manual .\" Language: English .\" --.TH "PAM_KEYINIT" "8" "03/02/2009" "Linux-PAM Manual" "Linux\-PAM Manual" --.\" ----------------------------------------------------------------- +-.TH "PAM_KEYINIT" "8" "10/27/2010" "Linux-PAM Manual" "Linux\-PAM Manual" ++.TH "PAM_KEYINIT" "8" "06/04/2011" "Linux-PAM Manual" "Linux\-PAM Manual" + .\" ----------------------------------------------------------------- -.\" * (re)Define some macros --.\" ----------------------------------------------------------------- --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" * Define some portability stuff + .\" ----------------------------------------------------------------- + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" http://bugs.debian.org/507673 ++.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* @@ -4587,11 +5134,12 @@ Index: pam.deb/modules/pam_keyinit/pam_keyinit.8 -.fi -.\} -.. -+.TH "PAM_KEYINIT" "8" "08/24/2009" "Linux-PAM Manual" "Linux\-PAM Manual" ++.ie \n(.g .ds Aq \(aq ++.el .ds Aq ' .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- -@@ -166,13 +18,11 @@ +@@ -166,18 +27,16 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- @@ -4607,7 +5155,13 @@ Index: pam.deb/modules/pam_keyinit/pam_keyinit.8 .SH "DESCRIPTION" .PP The pam_keyinit PAM module ensures that the invoking process has a session keyring other than the user default session keyring\&. -@@ -193,7 +43,7 @@ + .PP +-The session component of the module checks to see if the process\'s session keyring is the user default, and, if it is, creates a new anonymous session keyring with which to replace it\&. ++The session component of the module checks to see if the process\*(Aqs session keyring is the user default, and, if it is, creates a new anonymous session keyring with which to replace it\&. + .PP + If a new session keyring is created, it will install a link to the user common keyring in the session keyring so that keys common to the user will be automatically accessible through it\&. + .PP +@@ -193,7 +52,7 @@ The keyutils package is used to manipulate keys more directly\&. This can be obtained from: .PP @@ -4616,7 +5170,7 @@ Index: pam.deb/modules/pam_keyinit/pam_keyinit.8 .SH "OPTIONS" .PP \fBdebug\fR -@@ -259,24 +109,10 @@ +@@ -259,24 +118,10 @@ .if n \{\ .RS 4 .\} @@ -4641,7 +5195,7 @@ Index: pam.deb/modules/pam_keyinit/pam_keyinit.8 .if n \{\ .RE .\} -@@ -287,12 +123,12 @@ +@@ -287,12 +132,12 @@ \fBpam.conf\fR(5), \fBpam.d\fR(5), @@ -4673,25 +5227,29 @@ Index: pam.deb/modules/pam_lastlog/pam_lastlog.8 =================================================================== --- pam.deb.orig/modules/pam_lastlog/pam_lastlog.8 +++ pam.deb/modules/pam_lastlog/pam_lastlog.8 -@@ -1,161 +1,13 @@ +@@ -1,161 +1,22 @@ +'\" t .\" Title: pam_lastlog .\" Author: [see the "AUTHOR" section] -.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/> --.\" Date: 06/16/2009 +-.\" Date: 10/27/2010 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -+.\" Date: 08/24/2009 ++.\" Date: 06/04/2011 .\" Manual: Linux-PAM Manual .\" Source: Linux-PAM Manual .\" Language: English .\" --.TH "PAM_LASTLOG" "8" "06/16/2009" "Linux-PAM Manual" "Linux\-PAM Manual" --.\" ----------------------------------------------------------------- +-.TH "PAM_LASTLOG" "8" "10/27/2010" "Linux-PAM Manual" "Linux\-PAM Manual" ++.TH "PAM_LASTLOG" "8" "06/04/2011" "Linux-PAM Manual" "Linux\-PAM Manual" + .\" ----------------------------------------------------------------- -.\" * (re)Define some macros --.\" ----------------------------------------------------------------- --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" * Define some portability stuff + .\" ----------------------------------------------------------------- + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" http://bugs.debian.org/507673 ++.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* @@ -4835,11 +5393,12 @@ Index: pam.deb/modules/pam_lastlog/pam_lastlog.8 -.fi -.\} -.. -+.TH "PAM_LASTLOG" "8" "08/24/2009" "Linux-PAM Manual" "Linux\-PAM Manual" ++.ie \n(.g .ds Aq \(aq ++.el .ds Aq ' .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- -@@ -166,17 +18,15 @@ +@@ -166,17 +27,15 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- @@ -4860,11 +5419,13 @@ Index: pam.deb/modules/pam_lastlog/pam_lastlog.8 file\&. .PP Some applications may perform this function themselves\&. In such cases, this module is not necessary\&. -@@ -190,14 +40,14 @@ +@@ -189,41 +48,41 @@ + .PP \fBsilent\fR .RS 4 - Don\'t inform the user about any previous login, just update the +-Don\'t inform the user about any previous login, just update the -\FC/var/log/lastlog\F[] ++Don\*(Aqt inform the user about any previous login, just update the +/var/log/lastlog file\&. .RE @@ -4877,7 +5438,38 @@ Index: pam.deb/modules/pam_lastlog/pam_lastlog.8 file does not contain any old entries for the user, indicate that the user has never previously logged in with a welcome message\&. .RE .PP -@@ -257,36 +107,22 @@ + \fBnodate\fR + .RS 4 +-Don\'t display the date of the last login\&. ++Don\*(Aqt display the date of the last login\&. + .RE + .PP + \fBnoterm\fR + .RS 4 +-Don\'t display the terminal name on which the last login was attempted\&. ++Don\*(Aqt display the terminal name on which the last login was attempted\&. + .RE + .PP + \fBnohost\fR + .RS 4 +-Don\'t indicate from which host the last login was attempted\&. ++Don\*(Aqt indicate from which host the last login was attempted\&. + .RE + .PP + \fBnowtmp\fR + .RS 4 +-Don\'t update the wtmp entry\&. ++Don\*(Aqt update the wtmp entry\&. + .RE + .PP + \fBnoupdate\fR + .RS 4 +-Don\'t update any file\&. ++Don\*(Aqt update any file\&. + .RE + .PP + \fBshowfailed\fR +@@ -257,36 +116,22 @@ .SH "EXAMPLES" .PP Add the following line to @@ -4916,7 +5508,7 @@ Index: pam.deb/modules/pam_lastlog/pam_lastlog.8 .RS 4 Lastlog logging file .RE -@@ -295,7 +131,7 @@ +@@ -295,7 +140,7 @@ \fBpam.conf\fR(5), \fBpam.d\fR(5), @@ -4942,25 +5534,29 @@ Index: pam.deb/modules/pam_limits/pam_limits.8 =================================================================== --- pam.deb.orig/modules/pam_limits/pam_limits.8 +++ pam.deb/modules/pam_limits/pam_limits.8 -@@ -1,161 +1,13 @@ +@@ -1,161 +1,22 @@ +'\" t .\" Title: pam_limits .\" Author: [see the "AUTHORS" section] -.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/> --.\" Date: 06/16/2009 +-.\" Date: 10/27/2010 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -+.\" Date: 08/24/2009 ++.\" Date: 06/04/2011 .\" Manual: Linux-PAM Manual .\" Source: Linux-PAM Manual .\" Language: English .\" --.TH "PAM_LIMITS" "8" "06/16/2009" "Linux-PAM Manual" "Linux-PAM Manual" --.\" ----------------------------------------------------------------- +-.TH "PAM_LIMITS" "8" "10/27/2010" "Linux-PAM Manual" "Linux-PAM Manual" ++.TH "PAM_LIMITS" "8" "06/04/2011" "Linux-PAM Manual" "Linux-PAM Manual" + .\" ----------------------------------------------------------------- -.\" * (re)Define some macros --.\" ----------------------------------------------------------------- --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" * Define some portability stuff + .\" ----------------------------------------------------------------- + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" http://bugs.debian.org/507673 ++.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* @@ -5104,11 +5700,12 @@ Index: pam.deb/modules/pam_limits/pam_limits.8 -.fi -.\} -.. -+.TH "PAM_LIMITS" "8" "08/24/2009" "Linux-PAM Manual" "Linux-PAM Manual" ++.ie \n(.g .ds Aq \(aq ++.el .ds Aq ' .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- -@@ -166,13 +18,11 @@ +@@ -166,13 +27,11 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- @@ -5124,7 +5721,7 @@ Index: pam.deb/modules/pam_limits/pam_limits.8 .SH "DESCRIPTION" .PP The pam_limits PAM module sets limits on the system resources that can be obtained in a user\-session\&. Users of -@@ -180,9 +30,9 @@ +@@ -180,9 +39,9 @@ are affected by this limits, too\&. .PP By default limits are taken from the @@ -5136,7 +5733,7 @@ Index: pam.deb/modules/pam_limits/pam_limits.8 directory are read\&. The files are parsed one after another in the order of "C" locale\&. The effect of the individual files is the same as if all the files were concatenated together in the order of parsing\&. If a config file is explicitly specified with a module option then the files in the above directory are not parsed\&. .PP The module must not be called by a multithreaded application\&. -@@ -257,41 +107,27 @@ +@@ -257,41 +116,27 @@ .RE .SH "FILES" .PP @@ -5180,7 +5777,7 @@ Index: pam.deb/modules/pam_limits/pam_limits.8 .if n \{\ .RE .\} -@@ -302,7 +138,7 @@ +@@ -302,7 +147,7 @@ \fBlimits.conf\fR(5), \fBpam.d\fR(5), @@ -5206,25 +5803,29 @@ Index: pam.deb/modules/pam_listfile/pam_listfile.8 =================================================================== --- pam.deb.orig/modules/pam_listfile/pam_listfile.8 +++ pam.deb/modules/pam_listfile/pam_listfile.8 -@@ -1,161 +1,13 @@ +@@ -1,161 +1,22 @@ +'\" t .\" Title: pam_listfile .\" Author: [see the "AUTHOR" section] -.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/> --.\" Date: 06/16/2009 +-.\" Date: 10/27/2010 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -+.\" Date: 08/24/2009 ++.\" Date: 06/04/2011 .\" Manual: Linux-PAM Manual .\" Source: Linux-PAM Manual .\" Language: English .\" --.TH "PAM_LISTFILE" "8" "06/16/2009" "Linux-PAM Manual" "Linux\-PAM Manual" --.\" ----------------------------------------------------------------- +-.TH "PAM_LISTFILE" "8" "10/27/2010" "Linux-PAM Manual" "Linux\-PAM Manual" ++.TH "PAM_LISTFILE" "8" "06/04/2011" "Linux-PAM Manual" "Linux\-PAM Manual" + .\" ----------------------------------------------------------------- -.\" * (re)Define some macros --.\" ----------------------------------------------------------------- --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" * Define some portability stuff + .\" ----------------------------------------------------------------- + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" http://bugs.debian.org/507673 ++.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* @@ -5368,11 +5969,12 @@ Index: pam.deb/modules/pam_listfile/pam_listfile.8 -.fi -.\} -.. -+.TH "PAM_LISTFILE" "8" "08/24/2009" "Linux-PAM Manual" "Linux\-PAM Manual" ++.ie \n(.g .ds Aq \(aq ++.el .ds Aq ' .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- -@@ -166,13 +18,11 @@ +@@ -166,13 +27,11 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- @@ -5388,7 +5990,7 @@ Index: pam.deb/modules/pam_listfile/pam_listfile.8 .SH "DESCRIPTION" .PP pam_listfile is a PAM module which provides a way to deny or allow services based on an arbitrary file\&. -@@ -188,7 +38,7 @@ +@@ -188,7 +47,7 @@ \fIPAM_RUSER\fR \-\- and looks for an instance of that item in the \fBfile=\fR\fB\fIfilename\fR\fR\&. @@ -5397,7 +5999,7 @@ Index: pam.deb/modules/pam_listfile/pam_listfile.8 contains one line per item listed\&. If the item is found, then if \fBsense=\fR\fB\fIallow\fR\fR, \fIPAM_SUCCESS\fR -@@ -198,7 +48,7 @@ +@@ -198,7 +57,7 @@ is returned, causing the authorization request to fail\&. .PP If an error is encountered (for instance, if @@ -5406,11 +6008,13 @@ Index: pam.deb/modules/pam_listfile/pam_listfile.8 does not exist, or a poorly\-constructed argument is encountered), then if \fIonerr=succeed\fR, \fIPAM_SUCCESS\fR -@@ -295,79 +145,51 @@ +@@ -294,80 +153,52 @@ + .RE .SH "EXAMPLES" .PP - Classic \'ftpusers\' authentication can be implemented with this entry in +-Classic \'ftpusers\' authentication can be implemented with this entry in -\FC/etc/pam\&.d/ftpd\F[]: ++Classic \*(Aqftpusers\*(Aq authentication can be implemented with this entry in +/etc/pam\&.d/ftpd: .sp .if n \{\ @@ -5491,7 +6095,7 @@ Index: pam.deb/modules/pam_listfile/pam_listfile.8 \fIsu\fR to the root account\&. .SH "SEE ALSO" -@@ -375,7 +197,7 @@ +@@ -375,7 +206,7 @@ \fBpam.conf\fR(5), \fBpam.d\fR(5), @@ -5517,25 +6121,29 @@ Index: pam.deb/modules/pam_localuser/pam_localuser.8 =================================================================== --- pam.deb.orig/modules/pam_localuser/pam_localuser.8 +++ pam.deb/modules/pam_localuser/pam_localuser.8 -@@ -1,161 +1,13 @@ +@@ -1,161 +1,22 @@ +'\" t .\" Title: pam_localuser .\" Author: [see the "AUTHOR" section] -.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/> --.\" Date: 06/16/2009 +-.\" Date: 10/27/2010 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -+.\" Date: 08/24/2009 ++.\" Date: 06/04/2011 .\" Manual: Linux-PAM Manual .\" Source: Linux-PAM Manual .\" Language: English .\" --.TH "PAM_LOCALUSER" "8" "06/16/2009" "Linux-PAM Manual" "Linux\-PAM Manual" --.\" ----------------------------------------------------------------- +-.TH "PAM_LOCALUSER" "8" "10/27/2010" "Linux-PAM Manual" "Linux\-PAM Manual" ++.TH "PAM_LOCALUSER" "8" "06/04/2011" "Linux-PAM Manual" "Linux\-PAM Manual" + .\" ----------------------------------------------------------------- -.\" * (re)Define some macros --.\" ----------------------------------------------------------------- --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" * Define some portability stuff + .\" ----------------------------------------------------------------- + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" http://bugs.debian.org/507673 ++.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* @@ -5679,11 +6287,12 @@ Index: pam.deb/modules/pam_localuser/pam_localuser.8 -.fi -.\} -.. -+.TH "PAM_LOCALUSER" "8" "08/24/2009" "Linux-PAM Manual" "Linux\-PAM Manual" ++.ie \n(.g .ds Aq \(aq ++.el .ds Aq ' .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- -@@ -166,13 +18,11 @@ +@@ -166,18 +27,16 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- @@ -5698,8 +6307,15 @@ Index: pam.deb/modules/pam_localuser/pam_localuser.8 -.fam .SH "DESCRIPTION" .PP - pam_localuser is a PAM module to help implementing site\-wide login policies, where they typically include a subset of the network\'s users and a few accounts that are local to a particular workstation\&. Using pam_localuser and pam_wheel or pam_listfile is an effective way to restrict access to either local users and/or a subset of the network\'s users\&. -@@ -189,7 +39,7 @@ +-pam_localuser is a PAM module to help implementing site\-wide login policies, where they typically include a subset of the network\'s users and a few accounts that are local to a particular workstation\&. Using pam_localuser and pam_wheel or pam_listfile is an effective way to restrict access to either local users and/or a subset of the network\'s users\&. ++pam_localuser is a PAM module to help implementing site\-wide login policies, where they typically include a subset of the network\*(Aqs users and a few accounts that are local to a particular workstation\&. Using pam_localuser and pam_wheel or pam_listfile is an effective way to restrict access to either local users and/or a subset of the network\*(Aqs users\&. + .PP +-This could also be implemented using pam_listfile\&.so and a very short awk script invoked by cron, but it\'s common enough to have been separated out\&. ++This could also be implemented using pam_listfile\&.so and a very short awk script invoked by cron, but it\*(Aqs common enough to have been separated out\&. + .SH "OPTIONS" + .PP + .PP +@@ -189,7 +48,7 @@ \fBfile=\fR\fB\fI/path/passwd\fR\fR .RS 4 Use a file other than @@ -5708,7 +6324,7 @@ Index: pam.deb/modules/pam_localuser/pam_localuser.8 .RE .SH "MODULE TYPES PROVIDED" .PP -@@ -218,38 +68,24 @@ +@@ -218,38 +77,24 @@ .SH "EXAMPLES" .PP Add the following line to @@ -5749,7 +6365,7 @@ Index: pam.deb/modules/pam_localuser/pam_localuser.8 .RS 4 Local user account information\&. .RE -@@ -258,7 +94,7 @@ +@@ -258,7 +103,7 @@ \fBpam.conf\fR(5), \fBpam.d\fR(5), @@ -5775,25 +6391,29 @@ Index: pam.deb/modules/pam_loginuid/pam_loginuid.8 =================================================================== --- pam.deb.orig/modules/pam_loginuid/pam_loginuid.8 +++ pam.deb/modules/pam_loginuid/pam_loginuid.8 -@@ -1,161 +1,13 @@ +@@ -1,161 +1,22 @@ +'\" t .\" Title: pam_loginuid .\" Author: [see the "AUTHOR" section] -.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/> --.\" Date: 06/16/2009 +-.\" Date: 10/27/2010 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -+.\" Date: 08/24/2009 ++.\" Date: 06/04/2011 .\" Manual: Linux-PAM Manual .\" Source: Linux-PAM Manual .\" Language: English .\" --.TH "PAM_LOGINUID" "8" "06/16/2009" "Linux-PAM Manual" "Linux\-PAM Manual" --.\" ----------------------------------------------------------------- +-.TH "PAM_LOGINUID" "8" "10/27/2010" "Linux-PAM Manual" "Linux\-PAM Manual" ++.TH "PAM_LOGINUID" "8" "06/04/2011" "Linux-PAM Manual" "Linux\-PAM Manual" + .\" ----------------------------------------------------------------- -.\" * (re)Define some macros --.\" ----------------------------------------------------------------- --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" * Define some portability stuff + .\" ----------------------------------------------------------------- + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" http://bugs.debian.org/507673 ++.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* @@ -5937,19 +6557,21 @@ Index: pam.deb/modules/pam_loginuid/pam_loginuid.8 -.fi -.\} -.. -+.TH "PAM_LOGINUID" "8" "08/24/2009" "Linux-PAM Manual" "Linux\-PAM Manual" ++.ie \n(.g .ds Aq \(aq ++.el .ds Aq ' .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- -@@ -166,13 +18,11 @@ +@@ -166,13 +27,11 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- -.SH "Name" -+.SH "NAME" - pam_loginuid \- Record user\'s login uid to the process attribute +-pam_loginuid \- Record user\'s login uid to the process attribute -.SH "Synopsis" -.fam C ++.SH "NAME" ++pam_loginuid \- Record user\*(Aqs login uid to the process attribute +.SH "SYNOPSIS" .HP \w'\fBpam_loginuid\&.so\fR\ 'u \fBpam_loginuid\&.so\fR [require_auditd] @@ -5957,7 +6579,7 @@ Index: pam.deb/modules/pam_loginuid/pam_loginuid.8 .SH "DESCRIPTION" .PP The pam_loginuid module sets the loginuid process attribute for the process that was authenticated\&. This is necessary for applications to be correctly audited\&. This PAM module should only be used for entry point applications like: login, sshd, gdm, vsftpd, crond and atd\&. There are probably other entry point applications besides these\&. You should not use it for applications like sudo or su as that defeats the purpose by changing the loginuid to the account they just switched to\&. -@@ -199,15 +49,7 @@ +@@ -199,15 +58,7 @@ .if n \{\ .RS 4 .\} @@ -5973,7 +6595,7 @@ Index: pam.deb/modules/pam_loginuid/pam_loginuid.8 #%PAM\-1\&.0 auth required pam_unix\&.so auth required pam_nologin\&.so -@@ -216,13 +58,7 @@ +@@ -216,13 +67,7 @@ session required pam_unix\&.so session required pam_loginuid\&.so @@ -5987,7 +6609,7 @@ Index: pam.deb/modules/pam_loginuid/pam_loginuid.8 .if n \{\ .RE .\} -@@ -231,7 +67,7 @@ +@@ -231,7 +76,7 @@ \fBpam.conf\fR(5), \fBpam.d\fR(5), @@ -6013,25 +6635,29 @@ Index: pam.deb/modules/pam_mail/pam_mail.8 =================================================================== --- pam.deb.orig/modules/pam_mail/pam_mail.8 +++ pam.deb/modules/pam_mail/pam_mail.8 -@@ -1,161 +1,13 @@ +@@ -1,161 +1,22 @@ +'\" t .\" Title: pam_mail .\" Author: [see the "AUTHOR" section] -.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/> --.\" Date: 03/02/2009 +-.\" Date: 10/27/2010 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -+.\" Date: 08/24/2009 ++.\" Date: 06/04/2011 .\" Manual: Linux-PAM Manual .\" Source: Linux-PAM Manual .\" Language: English .\" --.TH "PAM_MAIL" "8" "03/02/2009" "Linux-PAM Manual" "Linux\-PAM Manual" --.\" ----------------------------------------------------------------- +-.TH "PAM_MAIL" "8" "10/27/2010" "Linux-PAM Manual" "Linux\-PAM Manual" ++.TH "PAM_MAIL" "8" "06/04/2011" "Linux-PAM Manual" "Linux\-PAM Manual" + .\" ----------------------------------------------------------------- -.\" * (re)Define some macros --.\" ----------------------------------------------------------------- --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" * Define some portability stuff + .\" ----------------------------------------------------------------- + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" http://bugs.debian.org/507673 ++.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* @@ -6175,11 +6801,12 @@ Index: pam.deb/modules/pam_mail/pam_mail.8 -.fi -.\} -.. -+.TH "PAM_MAIL" "8" "08/24/2009" "Linux-PAM Manual" "Linux\-PAM Manual" ++.ie \n(.g .ds Aq \(aq ++.el .ds Aq ' .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- -@@ -166,13 +18,11 @@ +@@ -166,22 +27,20 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- @@ -6195,8 +6822,11 @@ Index: pam.deb/modules/pam_mail/pam_mail.8 .SH "DESCRIPTION" .PP The pam_mail PAM module provides the "you have new mail" service to the user\&. It can be plugged into any application that has credential or session hooks\&. It gives a single message indicating the -@@ -181,7 +31,7 @@ - \fBMAIL\fR, to the user\'s mail directory\&. + \fInewness\fR +-of any mail it finds in the user\'s mail folder\&. This module also sets the PAM environment variable, +-\fBMAIL\fR, to the user\'s mail directory\&. ++of any mail it finds in the user\*(Aqs mail folder\&. This module also sets the PAM environment variable, ++\fBMAIL\fR, to the user\*(Aqs mail directory\&. .PP If the mail spool file (be it -\FC/var/mail/$USER\F[] @@ -6204,20 +6834,24 @@ Index: pam.deb/modules/pam_mail/pam_mail.8 or a pathname given with the \fBdir=\fR parameter) is a directory then pam_mail assumes it is in the -@@ -203,9 +53,9 @@ +@@ -202,11 +61,11 @@ + .PP \fBdir=\fR\fB\fImaildir\fR\fR .RS 4 - Look for the users\' mail in an alternative location defined by +-Look for the users\' mail in an alternative location defined by -\FCmaildir/<login>\F[]\&. The default location for mail is -\FC/var/mail/<login>\F[]\&. Note, if the supplied -\FCmaildir\F[] +-is prefixed by a \'~\', the directory is interpreted as indicating a file in the user\'s home directory\&. ++Look for the users\*(Aq mail in an alternative location defined by +maildir/<login>\&. The default location for mail is +/var/mail/<login>\&. Note, if the supplied +maildir - is prefixed by a \'~\', the directory is interpreted as indicating a file in the user\'s home directory\&. ++is prefixed by a \*(Aq~\*(Aq, the directory is interpreted as indicating a file in the user\*(Aqs home directory\&. .RE .PP -@@ -219,7 +69,7 @@ + \fBempty\fR +@@ -219,7 +78,7 @@ Mail directory hash depth\&. For example, a \fIhashcount\fR of 2 would make the mail file be @@ -6226,7 +6860,25 @@ Index: pam.deb/modules/pam_mail/pam_mail.8 .RE .PP \fBnoenv\fR -@@ -276,30 +126,16 @@ +@@ -231,7 +90,7 @@ + .PP + \fBnopen\fR + .RS 4 +-Don\'t print any mail information on login\&. This flag is useful to get the ++Don\*(Aqt print any mail information on login\&. This flag is useful to get the + \fBMAIL\fR + environment variable set, but to not display any information about it\&. + .RE +@@ -243,7 +102,7 @@ + .PP + \fBstandard\fR + .RS 4 +-Old style "You have\&.\&.\&." format which doesn\'t show the mail spool being used\&. This also implies "empty"\&. ++Old style "You have\&.\&.\&." format which doesn\*(Aqt show the mail spool being used\&. This also implies "empty"\&. + .RE + .SH "MODULE TYPES PROVIDED" + .PP +@@ -276,30 +135,16 @@ .SH "EXAMPLES" .PP Add the following line to @@ -6258,7 +6910,7 @@ Index: pam.deb/modules/pam_mail/pam_mail.8 .if n \{\ .RE .\} -@@ -309,7 +145,7 @@ +@@ -309,7 +154,7 @@ \fBpam.conf\fR(5), \fBpam.d\fR(5), @@ -6284,25 +6936,29 @@ Index: pam.deb/modules/pam_mkhomedir/pam_mkhomedir.8 =================================================================== --- pam.deb.orig/modules/pam_mkhomedir/pam_mkhomedir.8 +++ pam.deb/modules/pam_mkhomedir/pam_mkhomedir.8 -@@ -1,161 +1,13 @@ +@@ -1,161 +1,22 @@ +'\" t .\" Title: pam_mkhomedir .\" Author: [see the "AUTHOR" section] -.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/> --.\" Date: 06/16/2009 +-.\" Date: 10/27/2010 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -+.\" Date: 08/24/2009 ++.\" Date: 06/04/2011 .\" Manual: Linux-PAM Manual .\" Source: Linux-PAM Manual .\" Language: English .\" --.TH "PAM_MKHOMEDIR" "8" "06/16/2009" "Linux-PAM Manual" "Linux-PAM Manual" --.\" ----------------------------------------------------------------- +-.TH "PAM_MKHOMEDIR" "8" "10/27/2010" "Linux-PAM Manual" "Linux-PAM Manual" ++.TH "PAM_MKHOMEDIR" "8" "06/04/2011" "Linux-PAM Manual" "Linux-PAM Manual" + .\" ----------------------------------------------------------------- -.\" * (re)Define some macros --.\" ----------------------------------------------------------------- --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" * Define some portability stuff + .\" ----------------------------------------------------------------- + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" http://bugs.debian.org/507673 ++.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* @@ -6446,11 +7102,12 @@ Index: pam.deb/modules/pam_mkhomedir/pam_mkhomedir.8 -.fi -.\} -.. -+.TH "PAM_MKHOMEDIR" "8" "08/24/2009" "Linux-PAM Manual" "Linux-PAM Manual" ++.ie \n(.g .ds Aq \(aq ++.el .ds Aq ' .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- -@@ -166,17 +18,15 @@ +@@ -166,24 +27,22 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- @@ -6471,7 +7128,15 @@ Index: pam.deb/modules/pam_mkhomedir/pam_mkhomedir.8 .PP The new users home directory will not be removed after logout of the user\&. .SH "OPTIONS" -@@ -195,9 +45,9 @@ + .PP + \fBsilent\fR + .RS 4 +-Don\'t print informative messages\&. ++Don\*(Aqt print informative messages\&. + .RE + .PP + \fBumask=\fR\fB\fImask\fR\fR +@@ -195,9 +54,9 @@ \fBskel=\fR\fB\fI/path/to/skel/directory\fR\fR .RS 4 Indicate an alternative @@ -6483,7 +7148,7 @@ Index: pam.deb/modules/pam_mkhomedir/pam_mkhomedir.8 .RE .SH "MODULE TYPES PROVIDED" .PP -@@ -232,7 +82,7 @@ +@@ -232,7 +91,7 @@ .RE .SH "FILES" .PP @@ -6492,7 +7157,7 @@ Index: pam.deb/modules/pam_mkhomedir/pam_mkhomedir.8 .RS 4 Default skel directory .RE -@@ -243,15 +93,7 @@ +@@ -243,15 +102,7 @@ .if n \{\ .RS 4 .\} @@ -6508,7 +7173,7 @@ Index: pam.deb/modules/pam_mkhomedir/pam_mkhomedir.8 auth requisite pam_securetty\&.so auth sufficient pam_ldap\&.so auth required pam_unix\&.so -@@ -264,13 +106,7 @@ +@@ -264,13 +115,7 @@ session optional pam_lastlog\&.so session optional pam_mail\&.so standard @@ -6522,7 +7187,7 @@ Index: pam.deb/modules/pam_mkhomedir/pam_mkhomedir.8 .if n \{\ .RE .\} -@@ -279,7 +115,7 @@ +@@ -279,7 +124,7 @@ .PP \fBpam.d\fR(5), @@ -6548,25 +7213,29 @@ Index: pam.deb/modules/pam_motd/pam_motd.8 =================================================================== --- pam.deb.orig/modules/pam_motd/pam_motd.8 +++ pam.deb/modules/pam_motd/pam_motd.8 -@@ -1,161 +1,13 @@ +@@ -1,161 +1,22 @@ +'\" t .\" Title: pam_motd .\" Author: [see the "AUTHOR" section] -.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/> --.\" Date: 06/16/2009 +-.\" Date: 10/27/2010 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -+.\" Date: 08/24/2009 ++.\" Date: 06/04/2011 .\" Manual: Linux-PAM Manual .\" Source: Linux-PAM Manual .\" Language: English .\" --.TH "PAM_MOTD" "8" "06/16/2009" "Linux-PAM Manual" "Linux\-PAM Manual" --.\" ----------------------------------------------------------------- +-.TH "PAM_MOTD" "8" "10/27/2010" "Linux-PAM Manual" "Linux\-PAM Manual" ++.TH "PAM_MOTD" "8" "06/04/2011" "Linux-PAM Manual" "Linux\-PAM Manual" + .\" ----------------------------------------------------------------- -.\" * (re)Define some macros --.\" ----------------------------------------------------------------- --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" * Define some portability stuff + .\" ----------------------------------------------------------------- + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" http://bugs.debian.org/507673 ++.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* @@ -6710,11 +7379,12 @@ Index: pam.deb/modules/pam_motd/pam_motd.8 -.fi -.\} -.. -+.TH "PAM_MOTD" "8" "08/24/2009" "Linux-PAM Manual" "Linux\-PAM Manual" ++.ie \n(.g .ds Aq \(aq ++.el .ds Aq ' .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- -@@ -166,24 +18,22 @@ +@@ -166,24 +27,22 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- @@ -6743,7 +7413,7 @@ Index: pam.deb/modules/pam_motd/pam_motd.8 file is displayed as message of the day\&. .RE .SH "MODULE TYPES PROVIDED" -@@ -200,30 +50,16 @@ +@@ -200,30 +59,16 @@ .SH "EXAMPLES" .PP The suggested usage for @@ -6775,7 +7445,7 @@ Index: pam.deb/modules/pam_motd/pam_motd.8 .if n \{\ .RE .\} -@@ -234,7 +70,7 @@ +@@ -234,7 +79,7 @@ \fBmotd\fR(5), \fBpam.conf\fR(5), \fBpam.d\fR(5), @@ -6801,25 +7471,29 @@ Index: pam.deb/modules/pam_namespace/pam_namespace.8 =================================================================== --- pam.deb.orig/modules/pam_namespace/pam_namespace.8 +++ pam.deb/modules/pam_namespace/pam_namespace.8 -@@ -1,161 +1,13 @@ +@@ -1,161 +1,22 @@ +'\" t .\" Title: pam_namespace .\" Author: [see the "AUTHORS" section] -.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/> --.\" Date: 06/16/2009 +-.\" Date: 10/27/2010 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -+.\" Date: 08/24/2009 ++.\" Date: 06/04/2011 .\" Manual: Linux-PAM Manual .\" Source: Linux-PAM Manual .\" Language: English .\" --.TH "PAM_NAMESPACE" "8" "06/16/2009" "Linux-PAM Manual" "Linux-PAM Manual" --.\" ----------------------------------------------------------------- +-.TH "PAM_NAMESPACE" "8" "10/27/2010" "Linux-PAM Manual" "Linux-PAM Manual" ++.TH "PAM_NAMESPACE" "8" "06/04/2011" "Linux-PAM Manual" "Linux-PAM Manual" + .\" ----------------------------------------------------------------- -.\" * (re)Define some macros --.\" ----------------------------------------------------------------- --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" * Define some portability stuff + .\" ----------------------------------------------------------------- + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" http://bugs.debian.org/507673 ++.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* @@ -6963,11 +7637,12 @@ Index: pam.deb/modules/pam_namespace/pam_namespace.8 -.fi -.\} -.. -+.TH "PAM_NAMESPACE" "8" "08/24/2009" "Linux-PAM Manual" "Linux-PAM Manual" ++.ie \n(.g .ds Aq \(aq ++.el .ds Aq ' .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- -@@ -166,17 +18,15 @@ +@@ -166,17 +27,15 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- @@ -6988,7 +7663,7 @@ Index: pam.deb/modules/pam_namespace/pam_namespace.8 exists, it is used to initialize the instance directory after it is set up and mounted on the polyinstantiated directory\&. The script receives the polyinstantiated directory path, the instance directory path, flag whether the instance directory was newly created (0 for no, 1 for yes), and the user name as its arguments\&. .PP The pam_namespace module disassociates the session namespace from the parent namespace\&. Any mounts/unmounts performed in the parent namespace, such as mounting of devices, are not reflected in the session namespace\&. To propagate selected mount/unmount events from the parent namespace into the disassociated session namespace, an administrator may use the special shared\-subtree feature\&. For additional information on shared\-subtree feature, please refer to the mount(8) man page and the shared\-subtree description at http://lwn\&.net/Articles/159077 and http://lwn\&.net/Articles/159092\&. -@@ -254,17 +104,17 @@ +@@ -254,17 +113,17 @@ .RE .SH "FILES" .PP @@ -7009,7 +7684,7 @@ Index: pam.deb/modules/pam_namespace/pam_namespace.8 .RS 4 Init script for instance directories .RE -@@ -279,24 +129,16 @@ +@@ -279,24 +138,16 @@ /usr/sbin/gdm\-safe\-restart .PP This allows gdm to restart after each session and appropriately adjust namespaces of display manager and the X server\&. If polyinstantiation of /tmp is desired along with the graphical environment, then additional configuration changes are needed to address the interaction of X server and font server namespaces with their use of /tmp to create communication sockets\&. Please use the initialization script @@ -7036,7 +7711,7 @@ Index: pam.deb/modules/pam_namespace/pam_namespace.8 1\&. Disable the use of font server by commenting out "FontPath" line in /etc/X11/xorg\&.conf\&. If you do want to use the font server then you will have to augment the instance initialization -@@ -310,13 +152,7 @@ +@@ -310,13 +161,7 @@ "AlwaysRestartServer=true", and it is not overridden by /etc/gdm/custom\&.conf\&. @@ -7050,7 +7725,7 @@ Index: pam.deb/modules/pam_namespace/pam_namespace.8 .if n \{\ .RE .\} -@@ -327,7 +163,7 @@ +@@ -327,7 +172,7 @@ \fBnamespace.conf\fR(5), \fBpam.d\fR(5), \fBmount\fR(8), @@ -7076,25 +7751,29 @@ Index: pam.deb/modules/pam_nologin/pam_nologin.8 =================================================================== --- pam.deb.orig/modules/pam_nologin/pam_nologin.8 +++ pam.deb/modules/pam_nologin/pam_nologin.8 -@@ -1,161 +1,13 @@ +@@ -1,161 +1,22 @@ +'\" t .\" Title: pam_nologin .\" Author: [see the "AUTHOR" section] -.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/> --.\" Date: 03/02/2009 +-.\" Date: 10/27/2010 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -+.\" Date: 02/01/2010 ++.\" Date: 06/04/2011 .\" Manual: Linux-PAM Manual .\" Source: Linux-PAM Manual .\" Language: English .\" --.TH "PAM_NOLOGIN" "8" "03/02/2009" "Linux-PAM Manual" "Linux\-PAM Manual" --.\" ----------------------------------------------------------------- +-.TH "PAM_NOLOGIN" "8" "10/27/2010" "Linux-PAM Manual" "Linux\-PAM Manual" ++.TH "PAM_NOLOGIN" "8" "06/04/2011" "Linux-PAM Manual" "Linux\-PAM Manual" + .\" ----------------------------------------------------------------- -.\" * (re)Define some macros --.\" ----------------------------------------------------------------- --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" * Define some portability stuff + .\" ----------------------------------------------------------------- + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" http://bugs.debian.org/507673 ++.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* @@ -7238,11 +7917,12 @@ Index: pam.deb/modules/pam_nologin/pam_nologin.8 -.fi -.\} -.. -+.TH "PAM_NOLOGIN" "8" "02/01/2010" "Linux-PAM Manual" "Linux\-PAM Manual" ++.ie \n(.g .ds Aq \(aq ++.el .ds Aq ' .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- -@@ -166,26 +18,24 @@ +@@ -166,27 +27,25 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- @@ -7258,23 +7938,25 @@ Index: pam.deb/modules/pam_nologin/pam_nologin.8 .SH "DESCRIPTION" .PP pam_nologin is a PAM module that prevents users from logging into the system when --\FC/etc/nologin\F[] -+/etc/nologin - exists\&. The contents of the --\FC/etc/nologin\F[] -+/etc/nologin - file are displayed to the user\&. The pam_nologin module has no effect on the root user\'s ability to log in\&. +-\FC/var/run/nologin\F[] ++/var/run/nologin + or +-\FC/etc/nologin\F[]exists\&. The contents of the file are displayed to the user\&. The pam_nologin module has no effect on the root user\'s ability to log in\&. ++/etc/nologinexists\&. The contents of the file are displayed to the user\&. The pam_nologin module has no effect on the root user\*(Aqs ability to log in\&. .SH "OPTIONS" .PP \fBfile=\fR\fB\fI/path/nologin\fR\fR .RS 4 Use this file instead the default +-\FC/var/run/nologin\F[] ++/var/run/nologin + or -\FC/etc/nologin\F[]\&. +/etc/nologin\&. .RE .PP \fBsuccessok\fR -@@ -204,7 +54,7 @@ +@@ -205,7 +64,7 @@ PAM_AUTH_ERR .RS 4 The user is not root and @@ -7283,16 +7965,7 @@ Index: pam.deb/modules/pam_nologin/pam_nologin.8 exists, so the user is not permitted to log in\&. .RE .PP -@@ -221,7 +71,7 @@ - PAM_SUCCESS - .RS 4 - Success: either the user is root or the --\FC/etc/nologin\F[] -+/etc/nologin - file does not exist\&. - .RE - .PP -@@ -232,30 +82,16 @@ +@@ -231,30 +90,16 @@ .SH "EXAMPLES" .PP The suggested usage for @@ -7324,7 +7997,7 @@ Index: pam.deb/modules/pam_nologin/pam_nologin.8 .if n \{\ .RE .\} -@@ -280,7 +116,7 @@ +@@ -279,7 +124,7 @@ \fBnologin\fR(5), \fBpam.conf\fR(5), \fBpam.d\fR(5), @@ -7337,7 +8010,7 @@ Index: pam.deb/modules/pam_nologin/pam_nologin.8.xml =================================================================== --- pam.deb.orig/modules/pam_nologin/pam_nologin.8.xml +++ pam.deb/modules/pam_nologin/pam_nologin.8.xml -@@ -159,7 +159,7 @@ +@@ -160,7 +160,7 @@ <refentrytitle>pam.d</refentrytitle><manvolnum>5</manvolnum> </citerefentry>, <citerefentry> @@ -7350,25 +8023,29 @@ Index: pam.deb/modules/pam_permit/pam_permit.8 =================================================================== --- pam.deb.orig/modules/pam_permit/pam_permit.8 +++ pam.deb/modules/pam_permit/pam_permit.8 -@@ -1,161 +1,13 @@ +@@ -1,161 +1,22 @@ +'\" t .\" Title: pam_permit .\" Author: [see the "AUTHOR" section] -.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/> --.\" Date: 03/02/2009 +-.\" Date: 10/27/2010 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -+.\" Date: 08/24/2009 ++.\" Date: 06/04/2011 .\" Manual: Linux-PAM Manual .\" Source: Linux-PAM Manual .\" Language: English .\" --.TH "PAM_PERMIT" "8" "03/02/2009" "Linux-PAM Manual" "Linux\-PAM Manual" --.\" ----------------------------------------------------------------- +-.TH "PAM_PERMIT" "8" "10/27/2010" "Linux-PAM Manual" "Linux\-PAM Manual" ++.TH "PAM_PERMIT" "8" "06/04/2011" "Linux-PAM Manual" "Linux\-PAM Manual" + .\" ----------------------------------------------------------------- -.\" * (re)Define some macros --.\" ----------------------------------------------------------------- --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" * Define some portability stuff + .\" ----------------------------------------------------------------- + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" http://bugs.debian.org/507673 ++.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* @@ -7512,11 +8189,12 @@ Index: pam.deb/modules/pam_permit/pam_permit.8 -.fi -.\} -.. -+.TH "PAM_PERMIT" "8" "08/24/2009" "Linux-PAM Manual" "Linux\-PAM Manual" ++.ie \n(.g .ds Aq \(aq ++.el .ds Aq ' .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- -@@ -166,13 +18,11 @@ +@@ -166,20 +27,18 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- @@ -7532,7 +8210,16 @@ Index: pam.deb/modules/pam_permit/pam_permit.8 .SH "DESCRIPTION" .PP pam_permit is a PAM module that always permit access\&. It does nothing else\&. -@@ -207,24 +57,10 @@ + .PP +-In the case of authentication, the user\'s name will be set to ++In the case of authentication, the user\*(Aqs name will be set to + \fInobody\fR +-if the application didn\'t set one\&. Many applications and PAM modules become confused if this name is unknown\&. ++if the application didn\*(Aqt set one\&. Many applications and PAM modules become confused if this name is unknown\&. + .PP + This module is very dangerous\&. It should be used with extreme caution\&. + .SH "OPTIONS" +@@ -207,24 +66,10 @@ .if n \{\ .RS 4 .\} @@ -7557,7 +8244,7 @@ Index: pam.deb/modules/pam_permit/pam_permit.8 .if n \{\ .RE .\} -@@ -234,7 +70,7 @@ +@@ -234,7 +79,7 @@ \fBpam.conf\fR(5), \fBpam.d\fR(5), @@ -7583,25 +8270,29 @@ Index: pam.deb/modules/pam_rhosts/pam_rhosts.8 =================================================================== --- pam.deb.orig/modules/pam_rhosts/pam_rhosts.8 +++ pam.deb/modules/pam_rhosts/pam_rhosts.8 -@@ -1,161 +1,13 @@ +@@ -1,161 +1,22 @@ +'\" t .\" Title: pam_rhosts .\" Author: [see the "AUTHOR" section] -.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/> --.\" Date: 03/02/2009 +-.\" Date: 10/27/2010 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -+.\" Date: 08/24/2009 ++.\" Date: 06/04/2011 .\" Manual: Linux-PAM Manual .\" Source: Linux-PAM Manual .\" Language: English .\" --.TH "PAM_RHOSTS" "8" "03/02/2009" "Linux-PAM Manual" "Linux\-PAM Manual" --.\" ----------------------------------------------------------------- +-.TH "PAM_RHOSTS" "8" "10/27/2010" "Linux-PAM Manual" "Linux\-PAM Manual" ++.TH "PAM_RHOSTS" "8" "06/04/2011" "Linux-PAM Manual" "Linux\-PAM Manual" + .\" ----------------------------------------------------------------- -.\" * (re)Define some macros --.\" ----------------------------------------------------------------- --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" * Define some portability stuff + .\" ----------------------------------------------------------------- + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" http://bugs.debian.org/507673 ++.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* @@ -7745,11 +8436,12 @@ Index: pam.deb/modules/pam_rhosts/pam_rhosts.8 -.fi -.\} -.. -+.TH "PAM_RHOSTS" "8" "08/24/2009" "Linux-PAM Manual" "Linux\-PAM Manual" ++.ie \n(.g .ds Aq \(aq ++.el .ds Aq ' .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- -@@ -166,13 +18,11 @@ +@@ -166,13 +27,11 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- @@ -7765,7 +8457,7 @@ Index: pam.deb/modules/pam_rhosts/pam_rhosts.8 .SH "DESCRIPTION" .PP This module performs the standard network authentication for services, as used by traditional implementations of -@@ -182,10 +32,10 @@ +@@ -182,10 +41,10 @@ etc\&. .PP The authentication mechanism of this module is based on the contents of two files; @@ -7774,21 +8466,32 @@ Index: pam.deb/modules/pam_rhosts/pam_rhosts.8 (or and -\FC~/\&.rhosts\F[]\&. Firstly, hosts listed in the former file are treated as equivalent to the localhost\&. Secondly, entries in the user\'s own copy of the latter file is used to map "\fIremote\-host remote\-user\fR" pairs to that user\'s account on the current host\&. Access is granted to the user if their host is present in -\FC/etc/hosts\&.equiv\F[] -+~/\&.rhosts\&. Firstly, hosts listed in the former file are treated as equivalent to the localhost\&. Secondly, entries in the user\'s own copy of the latter file is used to map "\fIremote\-host remote\-user\fR" pairs to that user\'s account on the current host\&. Access is granted to the user if their host is present in ++~/\&.rhosts\&. Firstly, hosts listed in the former file are treated as equivalent to the localhost\&. Secondly, entries in the user\*(Aqs own copy of the latter file is used to map "\fIremote\-host remote\-user\fR" pairs to that user\*(Aqs account on the current host\&. Access is granted to the user if their host is present in +/etc/hosts\&.equiv and their remote account is identical to their local one, or if their remote account has an entry in their personal configuration file\&. .PP The module authenticates a remote user (internally specified by the item -@@ -221,7 +71,7 @@ +@@ -202,7 +61,7 @@ + .PP + \fBsilent\fR + .RS 4 +-Don\'t print informative messages\&. ++Don\*(Aqt print informative messages\&. + .RE + .PP + \fBsuperuser=\fR\fB\fIaccount\fR\fR +@@ -220,8 +79,8 @@ + .PP PAM_AUTH_ERR .RS 4 - The remote host, remote user name or the local user name couldn\'t be determined or access was denied by +-The remote host, remote user name or the local user name couldn\'t be determined or access was denied by -\FC\&.rhosts\F[] ++The remote host, remote user name or the local user name couldn\*(Aqt be determined or access was denied by +\&.rhosts file\&. .RE .PP -@@ -232,26 +82,18 @@ +@@ -232,26 +91,18 @@ .SH "EXAMPLES" .PP To grant a remote user access by @@ -7818,7 +8521,7 @@ Index: pam.deb/modules/pam_rhosts/pam_rhosts.8 #%PAM\-1\&.0 # auth required pam_rhosts\&.so -@@ -259,13 +101,7 @@ +@@ -259,13 +110,7 @@ auth required pam_env\&.so auth required pam_unix\&.so @@ -7832,7 +8535,7 @@ Index: pam.deb/modules/pam_rhosts/pam_rhosts.8 .if n \{\ .RE .\} -@@ -278,7 +114,7 @@ +@@ -278,7 +123,7 @@ \fBrhosts\fR(5), \fBpam.conf\fR(5), \fBpam.d\fR(5), @@ -7858,25 +8561,29 @@ Index: pam.deb/modules/pam_rootok/pam_rootok.8 =================================================================== --- pam.deb.orig/modules/pam_rootok/pam_rootok.8 +++ pam.deb/modules/pam_rootok/pam_rootok.8 -@@ -1,161 +1,13 @@ +@@ -1,161 +1,22 @@ +'\" t .\" Title: pam_rootok .\" Author: [see the "AUTHOR" section] -.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/> --.\" Date: 03/02/2009 +-.\" Date: 10/27/2010 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -+.\" Date: 08/24/2009 ++.\" Date: 06/04/2011 .\" Manual: Linux-PAM Manual .\" Source: Linux-PAM Manual .\" Language: English .\" --.TH "PAM_ROOTOK" "8" "03/02/2009" "Linux-PAM Manual" "Linux\-PAM Manual" --.\" ----------------------------------------------------------------- +-.TH "PAM_ROOTOK" "8" "10/27/2010" "Linux-PAM Manual" "Linux\-PAM Manual" ++.TH "PAM_ROOTOK" "8" "06/04/2011" "Linux-PAM Manual" "Linux\-PAM Manual" + .\" ----------------------------------------------------------------- -.\" * (re)Define some macros --.\" ----------------------------------------------------------------- --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" * Define some portability stuff + .\" ----------------------------------------------------------------- + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" http://bugs.debian.org/507673 ++.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* @@ -8020,11 +8727,12 @@ Index: pam.deb/modules/pam_rootok/pam_rootok.8 -.fi -.\} -.. -+.TH "PAM_ROOTOK" "8" "08/24/2009" "Linux-PAM Manual" "Linux\-PAM Manual" ++.ie \n(.g .ds Aq \(aq ++.el .ds Aq ' .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- -@@ -166,13 +18,11 @@ +@@ -166,13 +27,11 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- @@ -8040,7 +8748,7 @@ Index: pam.deb/modules/pam_rootok/pam_rootok.8 .SH "DESCRIPTION" .PP pam_rootok is a PAM module that authenticates the user if their -@@ -217,32 +67,18 @@ +@@ -220,32 +79,18 @@ In the case of the \fBsu\fR(1) application the historical usage is to permit the superuser to adopt the identity of a lesser user without the use of a password\&. To obtain this behavior with PAM the following pair of lines are needed for the corresponding entry in the @@ -8074,7 +8782,7 @@ Index: pam.deb/modules/pam_rootok/pam_rootok.8 .if n \{\ .RE .\} -@@ -253,7 +89,7 @@ +@@ -256,7 +101,7 @@ \fBsu\fR(1), \fBpam.conf\fR(5), \fBpam.d\fR(5), @@ -8087,7 +8795,7 @@ Index: pam.deb/modules/pam_rootok/pam_rootok.8.xml =================================================================== --- pam.deb.orig/modules/pam_rootok/pam_rootok.8.xml +++ pam.deb/modules/pam_rootok/pam_rootok.8.xml -@@ -115,7 +115,7 @@ +@@ -116,7 +116,7 @@ <refentrytitle>pam.d</refentrytitle><manvolnum>5</manvolnum> </citerefentry>, <citerefentry> @@ -8100,25 +8808,29 @@ Index: pam.deb/modules/pam_securetty/pam_securetty.8 =================================================================== --- pam.deb.orig/modules/pam_securetty/pam_securetty.8 +++ pam.deb/modules/pam_securetty/pam_securetty.8 -@@ -1,161 +1,13 @@ +@@ -1,161 +1,22 @@ +'\" t .\" Title: pam_securetty .\" Author: [see the "AUTHOR" section] -.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/> --.\" Date: 03/02/2009 +-.\" Date: 10/27/2010 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -+.\" Date: 08/24/2009 ++.\" Date: 06/04/2011 .\" Manual: Linux-PAM Manual .\" Source: Linux-PAM Manual .\" Language: English .\" --.TH "PAM_SECURETTY" "8" "03/02/2009" "Linux-PAM Manual" "Linux\-PAM Manual" --.\" ----------------------------------------------------------------- +-.TH "PAM_SECURETTY" "8" "10/27/2010" "Linux-PAM Manual" "Linux\-PAM Manual" ++.TH "PAM_SECURETTY" "8" "06/04/2011" "Linux-PAM Manual" "Linux\-PAM Manual" + .\" ----------------------------------------------------------------- -.\" * (re)Define some macros --.\" ----------------------------------------------------------------- --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" * Define some portability stuff + .\" ----------------------------------------------------------------- + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" http://bugs.debian.org/507673 ++.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* @@ -8262,11 +8974,12 @@ Index: pam.deb/modules/pam_securetty/pam_securetty.8 -.fi -.\} -.. -+.TH "PAM_SECURETTY" "8" "08/24/2009" "Linux-PAM Manual" "Linux\-PAM Manual" ++.ie \n(.g .ds Aq \(aq ++.el .ds Aq ' .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- -@@ -166,18 +18,16 @@ +@@ -166,18 +27,16 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- @@ -8289,7 +9002,7 @@ Index: pam.deb/modules/pam_securetty/pam_securetty.8 is a plain file and not world writable\&. .PP This module has no effect on non\-root users and requires that the application fills in the -@@ -210,7 +60,7 @@ +@@ -210,7 +69,7 @@ PAM_AUTH_ERR .RS 4 Authentication is rejected\&. Either root is attempting to log in via an unacceptable device, or the @@ -8298,11 +9011,13 @@ Index: pam.deb/modules/pam_securetty/pam_securetty.8 file is world writable or not a normal file\&. .RE .PP -@@ -222,13 +72,13 @@ +@@ -221,14 +80,14 @@ + .PP PAM_SERVICE_ERR .RS 4 - An error occurred while the module was determining the user\'s name or tty, or the module could not open +-An error occurred while the module was determining the user\'s name or tty, or the module could not open -\FC/etc/securetty\F[]\&. ++An error occurred while the module was determining the user\*(Aqs name or tty, or the module could not open +/etc/securetty\&. .RE .PP @@ -8314,7 +9029,7 @@ Index: pam.deb/modules/pam_securetty/pam_securetty.8 file to verify whether the user had a UID of 0\&. Therefore, the results of running this module are ignored\&. .RE .SH "EXAMPLES" -@@ -238,25 +88,11 @@ +@@ -238,25 +97,11 @@ .if n \{\ .RS 4 .\} @@ -8340,7 +9055,7 @@ Index: pam.deb/modules/pam_securetty/pam_securetty.8 .if n \{\ .RE .\} -@@ -267,7 +103,7 @@ +@@ -267,7 +112,7 @@ \fBsecuretty\fR(5), \fBpam.conf\fR(5), \fBpam.d\fR(5), @@ -8366,25 +9081,29 @@ Index: pam.deb/modules/pam_selinux/pam_selinux.8 =================================================================== --- pam.deb.orig/modules/pam_selinux/pam_selinux.8 +++ pam.deb/modules/pam_selinux/pam_selinux.8 -@@ -1,161 +1,13 @@ +@@ -1,161 +1,22 @@ +'\" t .\" Title: pam_selinux .\" Author: [see the "AUTHOR" section] -.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/> --.\" Date: 06/16/2009 +-.\" Date: 07/08/2010 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -+.\" Date: 02/01/2010 ++.\" Date: 08/31/2010 .\" Manual: Linux-PAM Manual .\" Source: Linux-PAM Manual .\" Language: English .\" --.TH "PAM_SELINUX" "8" "06/16/2009" "Linux-PAM Manual" "Linux\-PAM Manual" --.\" ----------------------------------------------------------------- +-.TH "PAM_SELINUX" "8" "07/08/2010" "Linux-PAM Manual" "Linux\-PAM Manual" ++.TH "PAM_SELINUX" "8" "08/31/2010" "Linux-PAM Manual" "Linux\-PAM Manual" + .\" ----------------------------------------------------------------- -.\" * (re)Define some macros --.\" ----------------------------------------------------------------- --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" * Define some portability stuff + .\" ----------------------------------------------------------------- + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" http://bugs.debian.org/507673 ++.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* @@ -8528,11 +9247,12 @@ Index: pam.deb/modules/pam_selinux/pam_selinux.8 -.fi -.\} -.. -+.TH "PAM_SELINUX" "8" "02/01/2010" "Linux-PAM Manual" "Linux\-PAM Manual" ++.ie \n(.g .ds Aq \(aq ++.el .ds Aq ' .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- -@@ -166,13 +18,11 @@ +@@ -166,18 +27,16 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- @@ -8548,7 +9268,13 @@ Index: pam.deb/modules/pam_selinux/pam_selinux.8 .SH "DESCRIPTION" .PP In a nutshell, pam_selinux sets up the default security context for the next execed shell\&. -@@ -251,26 +101,12 @@ + .PP +-When an application opens a session using pam_selinux, the shell that gets executed will be run in the default security context, or if the user chooses and the pam file allows the selected security context\&. Also the controlling tty will have it\'s security context modified to match the users\&. ++When an application opens a session using pam_selinux, the shell that gets executed will be run in the default security context, or if the user chooses and the pam file allows the selected security context\&. Also the controlling tty will have it\*(Aqs security context modified to match the users\&. + .PP + Adding pam_selinux into a pam file could cause other pam modules to change their behavior if the exec another application\&. The close and open option help mitigate this problem\&. close option will only cause the close portion of the pam_selinux to execute, and open will only cause the open portion to run\&. You can add pam_selinux to the config file twice\&. Add the pam_selinux close as the executes the open pass through the modules, pam_selinux open_session will happen last\&. When PAM executes the close pass through the modules pam_selinux close_session will happen first\&. + .SH "OPTIONS" +@@ -251,26 +110,12 @@ .if n \{\ .RS 4 .\} @@ -8575,7 +9301,7 @@ Index: pam.deb/modules/pam_selinux/pam_selinux.8 .if n \{\ .RE .\} -@@ -279,7 +115,7 @@ +@@ -279,7 +124,7 @@ \fBpam.conf\fR(5), \fBpam.d\fR(5), @@ -8601,7 +9327,240 @@ 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 @@ +@@ -1,161 +1,22 @@ ++'\" t + .\" Title: pam_sepermit + .\" Author: [see the "AUTHOR" section] +-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/> +-.\" Date: 07/08/2010 ++.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> ++.\" Date: 08/31/2010 + .\" Manual: Linux-PAM Manual + .\" Source: Linux-PAM Manual + .\" Language: English + .\" +-.TH "PAM_SEPERMIT" "8" "07/08/2010" "Linux-PAM Manual" "Linux\-PAM Manual" ++.TH "PAM_SEPERMIT" "8" "08/31/2010" "Linux-PAM Manual" "Linux\-PAM Manual" + .\" ----------------------------------------------------------------- +-.\" * (re)Define some macros ++.\" * Define some portability stuff + .\" ----------------------------------------------------------------- + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +-.\" toupper - uppercase a string (locale-aware) ++.\" http://bugs.debian.org/507673 ++.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +-.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 +-.\} +-.. ++.ie \n(.g .ds Aq \(aq ++.el .ds Aq ' + .\" ----------------------------------------------------------------- + .\" * set default formatting + .\" ----------------------------------------------------------------- +@@ -166,13 +27,11 @@ + .\" ----------------------------------------------------------------- + .\" * MAIN CONTENT STARTS HERE * + .\" ----------------------------------------------------------------- +-.SH "Name" ++.SH "NAME" + pam_sepermit \- PAM module to allow/deny login depending on SELinux enforcement state +-.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] +-.fam + .SH "DESCRIPTION" + .PP + The pam_sepermit module allows or denies login depending on SELinux enforcement state\&. +@@ -232,7 +91,7 @@ + .PP + PAM_USER_UNKNOWN + .RS 4 +-The module was unable to determine the user\'s name\&. ++The module was unable to determine the user\*(Aqs name\&. + .RE + .PP + PAM_SERVICE_ERR +@@ -241,7 +100,7 @@ + .RE + .SH "FILES" + .PP +-\FC/etc/security/sepermit\&.conf\F[] ++/etc/security/sepermit\&.conf + .RS 4 + Default configuration file + .RE +@@ -250,27 +109,13 @@ + .if n \{\ + .RS 4 + .\} +-.fam C +-.ps -1 + .nf +-.if t \{\ +-.sp -1 +-.\} +-.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 + +-.EB lightgray adjust-for-leading-newline +-.if t \{\ +-.sp 1 +-.\} + .fi +-.fam +-.ps +1 + .if n \{\ + .RE + .\} +@@ -280,7 +125,7 @@ \fBsepermit.conf\fR(5), \fBpam.conf\fR(5), \fBpam.d\fR(5), @@ -8627,25 +9586,29 @@ 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 @@ +@@ -1,161 +1,22 @@ +'\" t .\" Title: pam_shells .\" Author: [see the "AUTHOR" section] -.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/> --.\" Date: 03/02/2009 +-.\" Date: 10/27/2010 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -+.\" Date: 08/24/2009 ++.\" Date: 06/04/2011 .\" Manual: Linux-PAM Manual .\" Source: Linux-PAM Manual .\" Language: English .\" --.TH "PAM_SHELLS" "8" "03/02/2009" "Linux-PAM Manual" "Linux\-PAM Manual" --.\" ----------------------------------------------------------------- +-.TH "PAM_SHELLS" "8" "10/27/2010" "Linux-PAM Manual" "Linux\-PAM Manual" ++.TH "PAM_SHELLS" "8" "06/04/2011" "Linux-PAM Manual" "Linux\-PAM Manual" + .\" ----------------------------------------------------------------- -.\" * (re)Define some macros --.\" ----------------------------------------------------------------- --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" * Define some portability stuff + .\" ----------------------------------------------------------------- + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" http://bugs.debian.org/507673 ++.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* @@ -8789,11 +9752,12 @@ Index: pam.deb/modules/pam_shells/pam_shells.8 -.fi -.\} -.. -+.TH "PAM_SHELLS" "8" "08/24/2009" "Linux-PAM Manual" "Linux\-PAM Manual" ++.ie \n(.g .ds Aq \(aq ++.el .ds Aq ' .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- -@@ -166,20 +18,18 @@ +@@ -166,20 +27,18 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- @@ -8818,7 +9782,7 @@ Index: pam.deb/modules/pam_shells/pam_shells.8 is a plain file and not world writable\&. .SH "OPTIONS" .PP -@@ -201,7 +51,7 @@ +@@ -201,7 +60,7 @@ PAM_SUCCESS .RS 4 The users login shell was listed as valid shell in @@ -8827,7 +9791,7 @@ Index: pam.deb/modules/pam_shells/pam_shells.8 .RE .PP PAM_SERVICE_ERR -@@ -215,24 +65,10 @@ +@@ -215,24 +74,10 @@ .if n \{\ .RS 4 .\} @@ -8852,7 +9816,7 @@ Index: pam.deb/modules/pam_shells/pam_shells.8 .if n \{\ .RE .\} -@@ -243,7 +79,7 @@ +@@ -243,7 +88,7 @@ \fBshells\fR(5), \fBpam.conf\fR(5), \fBpam.d\fR(5), @@ -8878,25 +9842,29 @@ Index: pam.deb/modules/pam_succeed_if/pam_succeed_if.8 =================================================================== --- pam.deb.orig/modules/pam_succeed_if/pam_succeed_if.8 +++ pam.deb/modules/pam_succeed_if/pam_succeed_if.8 -@@ -1,161 +1,13 @@ +@@ -1,161 +1,22 @@ +'\" t .\" Title: pam_succeed_if .\" Author: [see the "AUTHOR" section] -.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/> --.\" Date: 06/16/2009 +-.\" Date: 10/27/2010 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -+.\" Date: 08/24/2009 ++.\" Date: 06/04/2011 .\" Manual: Linux-PAM .\" Source: Linux-PAM .\" Language: English .\" --.TH "PAM_SUCCEED_IF" "8" "06/16/2009" "Linux-PAM" "Linux\-PAM" --.\" ----------------------------------------------------------------- +-.TH "PAM_SUCCEED_IF" "8" "10/27/2010" "Linux-PAM" "Linux\-PAM" ++.TH "PAM_SUCCEED_IF" "8" "06/04/2011" "Linux-PAM" "Linux\-PAM" + .\" ----------------------------------------------------------------- -.\" * (re)Define some macros --.\" ----------------------------------------------------------------- --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" * Define some portability stuff + .\" ----------------------------------------------------------------- + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" http://bugs.debian.org/507673 ++.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* @@ -9040,11 +10008,12 @@ Index: pam.deb/modules/pam_succeed_if/pam_succeed_if.8 -.fi -.\} -.. -+.TH "PAM_SUCCEED_IF" "8" "08/24/2009" "Linux-PAM" "Linux\-PAM" ++.ie \n(.g .ds Aq \(aq ++.el .ds Aq ' .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- -@@ -166,13 +18,11 @@ +@@ -166,13 +27,11 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- @@ -9060,7 +10029,37 @@ Index: pam.deb/modules/pam_succeed_if/pam_succeed_if.8 .SH "DESCRIPTION" .PP pam_succeed_if\&.so is designed to succeed or fail authentication based on characteristics of the account belonging to the user being authenticated\&. One use is to select whether to load other modules based on this test\&. -@@ -330,24 +180,10 @@ +@@ -195,17 +54,17 @@ + .PP + \fBquiet\fR + .RS 4 +-Don\'t log failure or success to the system log\&. ++Don\*(Aqt log failure or success to the system log\&. + .RE + .PP + \fBquiet_fail\fR + .RS 4 +-Don\'t log failure to the system log\&. ++Don\*(Aqt log failure to the system log\&. + .RE + .PP + \fBquiet_success\fR + .RS 4 +-Don\'t log success to the system log\&. ++Don\*(Aqt log success to the system log\&. + .RE + .PP + \fBaudit\fR +@@ -325,7 +184,7 @@ + .PP + PAM_SERVICE_ERR + .RS 4 +-A service error occurred or the arguments can\'t be parsed correctly\&. ++A service error occurred or the arguments can\*(Aqt be parsed correctly\&. + .RE + .SH "EXAMPLES" + .PP +@@ -335,24 +194,10 @@ .if n \{\ .RS 4 .\} @@ -9085,7 +10084,7 @@ Index: pam.deb/modules/pam_succeed_if/pam_succeed_if.8 .if n \{\ .RE .\} -@@ -357,25 +193,11 @@ +@@ -362,25 +207,11 @@ .if n \{\ .RS 4 .\} @@ -9111,7 +10110,7 @@ Index: pam.deb/modules/pam_succeed_if/pam_succeed_if.8 .if n \{\ .RE .\} -@@ -383,7 +205,7 @@ +@@ -388,7 +219,7 @@ .PP \fBglob\fR(7), @@ -9124,7 +10123,7 @@ Index: pam.deb/modules/pam_succeed_if/pam_succeed_if.8.xml =================================================================== --- pam.deb.orig/modules/pam_succeed_if/pam_succeed_if.8.xml +++ pam.deb/modules/pam_succeed_if/pam_succeed_if.8.xml -@@ -286,7 +286,7 @@ +@@ -294,7 +294,7 @@ <refentrytitle>glob</refentrytitle><manvolnum>7</manvolnum> </citerefentry>, <citerefentry> @@ -9137,25 +10136,29 @@ Index: pam.deb/modules/pam_tally/pam_tally.8 =================================================================== --- pam.deb.orig/modules/pam_tally/pam_tally.8 +++ pam.deb/modules/pam_tally/pam_tally.8 -@@ -1,161 +1,13 @@ +@@ -1,161 +1,22 @@ +'\" t .\" Title: pam_tally .\" Author: [see the "AUTHOR" section] -.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/> --.\" Date: 06/16/2009 +-.\" Date: 10/27/2010 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -+.\" Date: 08/24/2009 ++.\" Date: 06/04/2011 .\" Manual: Linux-PAM Manual .\" Source: Linux-PAM Manual .\" Language: English .\" --.TH "PAM_TALLY" "8" "06/16/2009" "Linux-PAM Manual" "Linux\-PAM Manual" --.\" ----------------------------------------------------------------- +-.TH "PAM_TALLY" "8" "10/27/2010" "Linux-PAM Manual" "Linux\-PAM Manual" ++.TH "PAM_TALLY" "8" "06/04/2011" "Linux-PAM Manual" "Linux\-PAM Manual" + .\" ----------------------------------------------------------------- -.\" * (re)Define some macros --.\" ----------------------------------------------------------------- --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" * Define some portability stuff + .\" ----------------------------------------------------------------- + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" http://bugs.debian.org/507673 ++.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* @@ -9299,11 +10302,12 @@ Index: pam.deb/modules/pam_tally/pam_tally.8 -.fi -.\} -.. -+.TH "PAM_TALLY" "8" "08/24/2009" "Linux-PAM Manual" "Linux\-PAM Manual" ++.ie \n(.g .ds Aq \(aq ++.el .ds Aq ' .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- -@@ -166,17 +18,13 @@ +@@ -166,17 +27,13 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- @@ -9323,7 +10327,25 @@ Index: pam.deb/modules/pam_tally/pam_tally.8 .SH "DESCRIPTION" .PP This module maintains a count of attempted accesses, can reset count on success, can deny access if too many attempts fail\&. -@@ -219,7 +67,7 @@ +@@ -188,7 +45,7 @@ + and + \fBpam_tally\fR\&. The former is the PAM module and the latter, a stand\-alone program\&. + \fBpam_tally\fR +-is an (optional) application which can be used to interrogate and manipulate the counter file\&. It can display users\' counts, set individual counts, or clear all counts\&. Setting artificially high counts may be useful for blocking users without changing their passwords\&. For example, one might find it useful to clear all counts every midnight from a cron job\&. The ++is an (optional) application which can be used to interrogate and manipulate the counter file\&. It can display users\*(Aq counts, set individual counts, or clear all counts\&. Setting artificially high counts may be useful for blocking users without changing their passwords\&. For example, one might find it useful to clear all counts every midnight from a cron job\&. The + \fBfaillog\fR(8) + command can be used instead of pam_tally to to maintain the counter file\&. + .PP +@@ -196,7 +53,7 @@ + \fIroot\fR + will + \fBnot\fR +-cause the root account to become blocked, to prevent denial\-of\-service: if your users aren\'t given shell accounts and root may only login via ++cause the root account to become blocked, to prevent denial\-of\-service: if your users aren\*(Aqt given shell accounts and root may only login via + \fBsu\fR + or at the machine console (not telnet/rsh, etc), this is safe\&. + .SH "OPTIONS" +@@ -221,7 +78,7 @@ \fBfile=\fR\fB\fI/path/to/counter\fR\fR .RS 4 File where to keep counts\&. Default is @@ -9332,7 +10354,22 @@ Index: pam.deb/modules/pam_tally/pam_tally.8 .RE .PP \fBaudit\fR -@@ -274,7 +122,7 @@ +@@ -231,12 +88,12 @@ + .PP + \fBsilent\fR + .RS 4 +-Don\'t print informative messages\&. ++Don\*(Aqt print informative messages\&. + .RE + .PP + \fBno_log_info\fR + .RS 4 +-Don\'t log informative messages via ++Don\*(Aqt log informative messages via + \fBsyslog\fR(3)\&. + .RE + .RE +@@ -276,13 +133,13 @@ \fBno_lock_time\fR .RS 4 Do not use the \&.fail_locktime field in @@ -9341,7 +10378,14 @@ Index: pam.deb/modules/pam_tally/pam_tally.8 for this user\&. .RE .PP -@@ -291,7 +139,7 @@ + \fBno_reset\fR + .RS 4 +-Don\'t reset count on successful entry, only decrement\&. ++Don\*(Aqt reset count on successful entry, only decrement\&. + .RE + .PP + \fBeven_deny_root_account\fR +@@ -293,7 +150,7 @@ \fBper_user\fR .RS 4 If @@ -9350,16 +10394,36 @@ Index: pam.deb/modules/pam_tally/pam_tally.8 contains a non\-zero \&.fail_max/\&.fail_locktime field for this user then use it instead of \fBdeny=\fR\fB\fIn\fR\fR/ \fBlock_time=\fR\fB\fIn\fR\fR -@@ -301,7 +149,7 @@ +@@ -302,8 +159,8 @@ + .PP \fBno_lock_time\fR .RS 4 - Don\'t use \&.fail_locktime filed in +-Don\'t use \&.fail_locktime filed in -\FC/var/log/faillog\F[] ++Don\*(Aqt use \&.fail_locktime filed in +/var/log/faillog for this user\&. .RE .RE -@@ -351,9 +199,9 @@ +@@ -312,7 +169,7 @@ + .RS 4 + Account phase resets attempts counter if the user is + \fBnot\fR +-magic root\&. This phase can be used optionally for services which don\'t call ++magic root\&. This phase can be used optionally for services which don\*(Aqt call + \fBpam_setcred\fR(3) + correctly or if the reset should be done regardless of the failure of the account phase of other modules\&. + .PP +@@ -324,7 +181,7 @@ + .PP + \fBno_reset\fR + .RS 4 +-Don\'t reset count on successful entry, only decrement\&. ++Don\*(Aqt reset count on successful entry, only decrement\&. + .RE + .RE + .SH "MODULE TYPES PROVIDED" +@@ -353,9 +210,9 @@ .SH "EXAMPLES" .PP Add the following line to @@ -9371,7 +10435,7 @@ Index: pam.deb/modules/pam_tally/pam_tally.8 and needs to be set with pam_tally or \fBfaillog\fR(8) before\&. -@@ -361,15 +209,7 @@ +@@ -363,15 +220,7 @@ .if n \{\ .RS 4 .\} @@ -9387,7 +10451,7 @@ Index: pam.deb/modules/pam_tally/pam_tally.8 auth required pam_securetty\&.so auth required pam_tally\&.so per_user auth required pam_env\&.so -@@ -382,19 +222,13 @@ +@@ -384,19 +233,13 @@ session required pam_lastlog\&.so nowtmp session optional pam_mail\&.so standard @@ -9408,7 +10472,7 @@ Index: pam.deb/modules/pam_tally/pam_tally.8 .RS 4 failure logging file .RE -@@ -404,7 +238,7 @@ +@@ -406,7 +249,7 @@ \fBfaillog\fR(8), \fBpam.conf\fR(5), \fBpam.d\fR(5), @@ -9421,7 +10485,7 @@ Index: pam.deb/modules/pam_tally/pam_tally.8.xml =================================================================== --- pam.deb.orig/modules/pam_tally/pam_tally.8.xml +++ pam.deb/modules/pam_tally/pam_tally.8.xml -@@ -438,7 +438,7 @@ +@@ -444,7 +444,7 @@ <refentrytitle>pam.d</refentrytitle><manvolnum>5</manvolnum> </citerefentry>, <citerefentry> @@ -9434,25 +10498,29 @@ Index: pam.deb/modules/pam_time/pam_time.8 =================================================================== --- pam.deb.orig/modules/pam_time/pam_time.8 +++ pam.deb/modules/pam_time/pam_time.8 -@@ -1,161 +1,13 @@ +@@ -1,161 +1,22 @@ +'\" t .\" Title: pam_time .\" Author: [see the "AUTHOR" section] -.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/> --.\" Date: 06/16/2009 +-.\" Date: 10/27/2010 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -+.\" Date: 08/24/2009 ++.\" Date: 06/04/2011 .\" Manual: Linux-PAM Manual .\" Source: Linux-PAM Manual .\" Language: English .\" --.TH "PAM_TIME" "8" "06/16/2009" "Linux-PAM Manual" "Linux-PAM Manual" --.\" ----------------------------------------------------------------- +-.TH "PAM_TIME" "8" "10/27/2010" "Linux-PAM Manual" "Linux-PAM Manual" ++.TH "PAM_TIME" "8" "06/04/2011" "Linux-PAM Manual" "Linux-PAM Manual" + .\" ----------------------------------------------------------------- -.\" * (re)Define some macros --.\" ----------------------------------------------------------------- --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" * Define some portability stuff + .\" ----------------------------------------------------------------- + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" http://bugs.debian.org/507673 ++.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* @@ -9596,11 +10664,12 @@ Index: pam.deb/modules/pam_time/pam_time.8 -.fi -.\} -.. -+.TH "PAM_TIME" "8" "08/24/2009" "Linux-PAM Manual" "Linux-PAM Manual" ++.ie \n(.g .ds Aq \(aq ++.el .ds Aq ' .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- -@@ -166,19 +18,17 @@ +@@ -166,19 +27,17 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- @@ -9623,7 +10692,7 @@ Index: pam.deb/modules/pam_time/pam_time.8 .PP If Linux PAM is compiled with audit support the module will report when it denies access\&. .SH "OPTIONS" -@@ -226,7 +76,7 @@ +@@ -226,7 +85,7 @@ .RE .SH "FILES" .PP @@ -9632,7 +10701,7 @@ Index: pam.deb/modules/pam_time/pam_time.8 .RS 4 Default configuration file .RE -@@ -235,28 +85,14 @@ +@@ -235,28 +94,14 @@ .if n \{\ .RS 4 .\} @@ -9661,7 +10730,7 @@ Index: pam.deb/modules/pam_time/pam_time.8 .if n \{\ .RE .\} -@@ -265,7 +101,7 @@ +@@ -265,7 +110,7 @@ \fBtime.conf\fR(5), \fBpam.d\fR(5), @@ -9687,25 +10756,29 @@ Index: pam.deb/modules/pam_umask/pam_umask.8 =================================================================== --- pam.deb.orig/modules/pam_umask/pam_umask.8 +++ pam.deb/modules/pam_umask/pam_umask.8 -@@ -1,161 +1,13 @@ +@@ -1,161 +1,22 @@ +'\" t .\" Title: pam_umask .\" Author: [see the "AUTHOR" section] -.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/> --.\" Date: 06/16/2009 +-.\" Date: 10/27/2010 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -+.\" Date: 08/24/2009 ++.\" Date: 06/04/2011 .\" Manual: Linux-PAM Manual .\" Source: Linux-PAM Manual .\" Language: English .\" --.TH "PAM_UMASK" "8" "06/16/2009" "Linux-PAM Manual" "Linux\-PAM Manual" --.\" ----------------------------------------------------------------- +-.TH "PAM_UMASK" "8" "10/27/2010" "Linux-PAM Manual" "Linux\-PAM Manual" ++.TH "PAM_UMASK" "8" "06/04/2011" "Linux-PAM Manual" "Linux\-PAM Manual" + .\" ----------------------------------------------------------------- -.\" * (re)Define some macros --.\" ----------------------------------------------------------------- --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" * Define some portability stuff + .\" ----------------------------------------------------------------- + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" http://bugs.debian.org/507673 ++.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* @@ -9849,11 +10922,12 @@ Index: pam.deb/modules/pam_umask/pam_umask.8 -.fi -.\} -.. -+.TH "PAM_UMASK" "8" "08/24/2009" "Linux-PAM Manual" "Linux\-PAM Manual" ++.ie \n(.g .ds Aq \(aq ++.el .ds Aq ' .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- -@@ -166,13 +18,11 @@ +@@ -166,13 +27,11 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- @@ -9869,7 +10943,33 @@ Index: pam.deb/modules/pam_umask/pam_umask.8 .SH "DESCRIPTION" .PP pam_umask is a PAM module to set the file mode creation mask of the current environment\&. The umask affects the default permissions assigned to newly created files\&. -@@ -295,30 +145,16 @@ +@@ -245,7 +104,6 @@ + UMASK entry from /etc/login\&.defs + .RE + .sp +-.RE + .SH "OPTIONS" + .PP + .PP +@@ -256,7 +114,7 @@ + .PP + \fBsilent\fR + .RS 4 +-Don\'t print informative messages\&. ++Don\*(Aqt print informative messages\&. + .RE + .PP + \fBusergroups\fR +@@ -266,7 +124,7 @@ + .PP + \fBumask=\fR\fB\fImask\fR\fR + .RS 4 +-Sets the calling process\'s file mode creation mask (umask) to ++Sets the calling process\*(Aqs file mode creation mask (umask) to + \fBmask\fR + & 0777\&. The value is interpreted as Octal\&. + .RE +@@ -295,30 +153,16 @@ .SH "EXAMPLES" .PP Add the following line to @@ -9901,7 +11001,7 @@ Index: pam.deb/modules/pam_umask/pam_umask.8 .if n \{\ .RE .\} -@@ -328,7 +164,7 @@ +@@ -328,7 +172,7 @@ \fBpam.conf\fR(5), \fBpam.d\fR(5), @@ -9914,7 +11014,7 @@ Index: pam.deb/modules/pam_umask/pam_umask.8.xml =================================================================== --- pam.deb.orig/modules/pam_umask/pam_umask.8.xml +++ pam.deb/modules/pam_umask/pam_umask.8.xml -@@ -205,7 +205,7 @@ +@@ -204,7 +204,7 @@ <refentrytitle>pam.d</refentrytitle><manvolnum>5</manvolnum> </citerefentry>, <citerefentry> @@ -9927,173 +11027,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 -@@ -1,161 +1,13 @@ -+'\" t - .\" Title: pam_unix - .\" Author: [see the "AUTHOR" section] --.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/> --.\" Date: 06/29/2009 -+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -+.\" 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 @@ +@@ -264,7 +264,7 @@ \fBpam.conf\fR(5), \fBpam.d\fR(5), @@ -10106,7 +11040,7 @@ Index: pam.deb/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 -@@ -486,7 +486,7 @@ +@@ -487,7 +487,7 @@ <refentrytitle>pam.d</refentrytitle><manvolnum>5</manvolnum> </citerefentry>, <citerefentry> @@ -10119,25 +11053,29 @@ Index: pam.deb/doc/man/misc_conv.3 =================================================================== --- pam.deb.orig/doc/man/misc_conv.3 +++ pam.deb/doc/man/misc_conv.3 -@@ -1,161 +1,13 @@ +@@ -1,161 +1,22 @@ +'\" t .\" Title: misc_conv .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/> --.\" Date: 03/02/2009 +-.\" Date: 10/27/2010 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -+.\" Date: 08/24/2009 ++.\" Date: 06/04/2011 .\" Manual: Linux-PAM Manual .\" Source: Linux-PAM Manual .\" Language: English .\" --.TH "MISC_CONV" "3" "03/02/2009" "Linux-PAM Manual" "Linux-PAM Manual" --.\" ----------------------------------------------------------------- +-.TH "MISC_CONV" "3" "10/27/2010" "Linux-PAM Manual" "Linux-PAM Manual" ++.TH "MISC_CONV" "3" "06/04/2011" "Linux-PAM Manual" "Linux-PAM Manual" + .\" ----------------------------------------------------------------- -.\" * (re)Define some macros --.\" ----------------------------------------------------------------- --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" * Define some portability stuff + .\" ----------------------------------------------------------------- + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" http://bugs.debian.org/507673 ++.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* @@ -10281,11 +11219,12 @@ Index: pam.deb/doc/man/misc_conv.3 -.fi -.\} -.. -+.TH "MISC_CONV" "3" "08/24/2009" "Linux-PAM Manual" "Linux-PAM Manual" ++.ie \n(.g .ds Aq \(aq ++.el .ds Aq ' .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- -@@ -166,23 +18,17 @@ +@@ -166,23 +27,17 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- @@ -10311,7 +11250,7 @@ Index: pam.deb/doc/man/misc_conv.3 .SH "DESCRIPTION" .PP The -@@ -263,7 +109,7 @@ +@@ -263,7 +118,7 @@ .PP \fBpam_conv\fR(3), @@ -10337,25 +11276,29 @@ Index: pam.deb/doc/man/pam_acct_mgmt.3 =================================================================== --- pam.deb.orig/doc/man/pam_acct_mgmt.3 +++ pam.deb/doc/man/pam_acct_mgmt.3 -@@ -1,161 +1,13 @@ +@@ -1,161 +1,22 @@ +'\" t .\" Title: pam_acct_mgmt .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/> --.\" Date: 03/02/2009 +-.\" Date: 10/27/2010 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -+.\" Date: 08/24/2009 ++.\" Date: 06/04/2011 .\" Manual: Linux-PAM Manual .\" Source: Linux-PAM Manual .\" Language: English .\" --.TH "PAM_ACCT_MGMT" "3" "03/02/2009" "Linux-PAM Manual" "Linux-PAM Manual" --.\" ----------------------------------------------------------------- +-.TH "PAM_ACCT_MGMT" "3" "10/27/2010" "Linux-PAM Manual" "Linux-PAM Manual" ++.TH "PAM_ACCT_MGMT" "3" "06/04/2011" "Linux-PAM Manual" "Linux-PAM Manual" + .\" ----------------------------------------------------------------- -.\" * (re)Define some macros --.\" ----------------------------------------------------------------- --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" * Define some portability stuff + .\" ----------------------------------------------------------------- + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" http://bugs.debian.org/507673 ++.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* @@ -10499,11 +11442,12 @@ Index: pam.deb/doc/man/pam_acct_mgmt.3 -.fi -.\} -.. -+.TH "PAM_ACCT_MGMT" "3" "08/24/2009" "Linux-PAM Manual" "Linux-PAM Manual" ++.ie \n(.g .ds Aq \(aq ++.el .ds Aq ' .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- -@@ -166,23 +18,17 @@ +@@ -166,23 +27,17 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- @@ -10529,7 +11473,7 @@ Index: pam.deb/doc/man/pam_acct_mgmt.3 .SH "DESCRIPTION" .PP The -@@ -243,4 +89,4 @@ +@@ -243,4 +98,4 @@ \fBpam_authenticate\fR(3), \fBpam_chauthtok\fR(3), \fBpam_strerror\fR(3), @@ -10552,25 +11496,29 @@ Index: pam.deb/doc/man/pam_authenticate.3 =================================================================== --- pam.deb.orig/doc/man/pam_authenticate.3 +++ pam.deb/doc/man/pam_authenticate.3 -@@ -1,161 +1,13 @@ +@@ -1,161 +1,22 @@ +'\" t .\" Title: pam_authenticate .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/> --.\" Date: 03/02/2009 +-.\" Date: 10/27/2010 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -+.\" Date: 08/24/2009 ++.\" Date: 06/04/2011 .\" Manual: Linux-PAM Manual .\" Source: Linux-PAM Manual .\" Language: English .\" --.TH "PAM_AUTHENTICATE" "3" "03/02/2009" "Linux-PAM Manual" "Linux-PAM Manual" --.\" ----------------------------------------------------------------- +-.TH "PAM_AUTHENTICATE" "3" "10/27/2010" "Linux-PAM Manual" "Linux-PAM Manual" ++.TH "PAM_AUTHENTICATE" "3" "06/04/2011" "Linux-PAM Manual" "Linux-PAM Manual" + .\" ----------------------------------------------------------------- -.\" * (re)Define some macros --.\" ----------------------------------------------------------------- --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" * Define some portability stuff + .\" ----------------------------------------------------------------- + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" http://bugs.debian.org/507673 ++.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* @@ -10714,11 +11662,12 @@ Index: pam.deb/doc/man/pam_authenticate.3 -.fi -.\} -.. -+.TH "PAM_AUTHENTICATE" "3" "08/24/2009" "Linux-PAM Manual" "Linux-PAM Manual" ++.ie \n(.g .ds Aq \(aq ++.el .ds Aq ' .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- -@@ -166,23 +18,17 @@ +@@ -166,23 +27,17 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- @@ -10744,7 +11693,7 @@ Index: pam.deb/doc/man/pam_authenticate.3 .SH "DESCRIPTION" .PP The -@@ -253,4 +99,4 @@ +@@ -253,4 +108,4 @@ \fBpam_setcred\fR(3), \fBpam_chauthtok\fR(3), \fBpam_strerror\fR(3), @@ -10767,25 +11716,29 @@ Index: pam.deb/doc/man/pam_chauthtok.3 =================================================================== --- pam.deb.orig/doc/man/pam_chauthtok.3 +++ pam.deb/doc/man/pam_chauthtok.3 -@@ -1,161 +1,13 @@ +@@ -1,161 +1,22 @@ +'\" t .\" Title: pam_chauthtok .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/> --.\" Date: 03/02/2009 +-.\" Date: 10/27/2010 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -+.\" Date: 08/24/2009 ++.\" Date: 06/04/2011 .\" Manual: Linux-PAM Manual .\" Source: Linux-PAM Manual .\" Language: English .\" --.TH "PAM_CHAUTHTOK" "3" "03/02/2009" "Linux-PAM Manual" "Linux-PAM Manual" --.\" ----------------------------------------------------------------- +-.TH "PAM_CHAUTHTOK" "3" "10/27/2010" "Linux-PAM Manual" "Linux-PAM Manual" ++.TH "PAM_CHAUTHTOK" "3" "06/04/2011" "Linux-PAM Manual" "Linux-PAM Manual" + .\" ----------------------------------------------------------------- -.\" * (re)Define some macros --.\" ----------------------------------------------------------------- --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" * Define some portability stuff + .\" ----------------------------------------------------------------- + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" http://bugs.debian.org/507673 ++.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* @@ -10929,11 +11882,12 @@ Index: pam.deb/doc/man/pam_chauthtok.3 -.fi -.\} -.. -+.TH "PAM_CHAUTHTOK" "3" "08/24/2009" "Linux-PAM Manual" "Linux-PAM Manual" ++.ie \n(.g .ds Aq \(aq ++.el .ds Aq ' .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- -@@ -166,23 +18,17 @@ +@@ -166,23 +27,17 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- @@ -10959,7 +11913,16 @@ Index: pam.deb/doc/man/pam_chauthtok.3 .SH "DESCRIPTION" .PP The -@@ -252,4 +98,4 @@ +@@ -237,7 +92,7 @@ + .PP + PAM_TRY_AGAIN + .RS 4 +-Not all of the modules were in a position to update the authentication token(s)\&. In such a case none of the user\'s authentication tokens are updated\&. ++Not all of the modules were in a position to update the authentication token(s)\&. In such a case none of the user\*(Aqs authentication tokens are updated\&. + .RE + .PP + PAM_USER_UNKNOWN +@@ -252,4 +107,4 @@ \fBpam_setcred\fR(3), \fBpam_get_item\fR(3), \fBpam_strerror\fR(3), @@ -10982,25 +11945,29 @@ Index: pam.deb/doc/man/pam_conv.3 =================================================================== --- pam.deb.orig/doc/man/pam_conv.3 +++ pam.deb/doc/man/pam_conv.3 -@@ -1,161 +1,13 @@ +@@ -1,161 +1,22 @@ +'\" t .\" Title: pam_conv .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/> --.\" Date: 03/02/2009 +-.\" Date: 10/27/2010 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -+.\" Date: 08/24/2009 ++.\" Date: 06/04/2011 .\" Manual: Linux-PAM Manual .\" Source: Linux-PAM Manual .\" Language: English .\" --.TH "PAM_CONV" "3" "03/02/2009" "Linux-PAM Manual" "Linux-PAM Manual" --.\" ----------------------------------------------------------------- +-.TH "PAM_CONV" "3" "10/27/2010" "Linux-PAM Manual" "Linux-PAM Manual" ++.TH "PAM_CONV" "3" "06/04/2011" "Linux-PAM Manual" "Linux-PAM Manual" + .\" ----------------------------------------------------------------- -.\" * (re)Define some macros --.\" ----------------------------------------------------------------- --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" * Define some portability stuff + .\" ----------------------------------------------------------------- + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" http://bugs.debian.org/507673 ++.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* @@ -11144,11 +12111,12 @@ Index: pam.deb/doc/man/pam_conv.3 -.fi -.\} -.. -+.TH "PAM_CONV" "3" "08/24/2009" "Linux-PAM Manual" "Linux-PAM Manual" ++.ie \n(.g .ds Aq \(aq ++.el .ds Aq ' .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- -@@ -166,22 +18,16 @@ +@@ -166,22 +27,16 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- @@ -11173,7 +12141,7 @@ Index: pam.deb/doc/man/pam_conv.3 .nf struct pam_message { int msg_style; -@@ -200,8 +46,6 @@ +@@ -200,8 +55,6 @@ }; .fi @@ -11182,7 +12150,34 @@ Index: pam.deb/doc/man/pam_conv.3 .SH "DESCRIPTION" .PP The PAM library uses an application\-defined callback to allow a direct communication between a loaded module and the application\&. This callback is specified by the -@@ -290,24 +134,10 @@ +@@ -221,7 +74,7 @@ + \fIresp\fR + points to an array of pam_response structures, holding the application supplied text\&. The + \fIresp_retcode\fR +-member of this struct is unused and should be set to zero\&. It is the caller\'s responsibility to release both, this array and the responses themselves, using ++member of this struct is unused and should be set to zero\&. It is the caller\*(Aqs responsibility to release both, this array and the responses themselves, using + \fBfree\fR(3)\&. Note, + \fI*resp\fR + is a +@@ -231,7 +84,7 @@ + The number of responses is always equal to the + \fInum_msg\fR + conversation function argument\&. This does require that the response array is +-\fBfree\fR(3)\'d after every call to the conversation function\&. The index of the responses corresponds directly to the prompt index in the pam_message array\&. ++\fBfree\fR(3)\*(Aqd after every call to the conversation function\&. The index of the responses corresponds directly to the prompt index in the pam_message array\&. + .PP + On failure, the conversation function should release any resources it has allocated, and return one of the predefined PAM error codes\&. + .PP +@@ -262,7 +115,7 @@ + .PP + The point of having an array of messages is that it becomes possible to pass a number of things to the application in a single call from the module\&. It can also be convenient for the application that related things come at once: a windows based application can then present a single form with many messages/prompts on at once\&. + .PP +-In passing, it is worth noting that there is a descrepency between the way Linux\-PAM handles the const struct pam_message **msg conversation function argument from the way that Solaris\' PAM (and derivitives, known to include HP/UX, are there others?) does\&. Linux\-PAM interprets the msg argument as entirely equivalent to the following prototype const struct pam_message *msg[] (which, in spirit, is consistent with the commonly used prototypes for argv argument to the familiar main() function: char **argv; and char *argv[])\&. Said another way Linux\-PAM interprets the msg argument as a pointer to an array of num_msg read only \'struct pam_message\' pointers\&. Solaris\' PAM implementation interprets this argument as a pointer to a pointer to an array of num_msg pam_message structures\&. Fortunately, perhaps, for most module/application developers when num_msg has a value of one these two definitions are entirely equivalent\&. Unfortunately, casually raising this number to two has led to unanticipated compatibility problems\&. ++In passing, it is worth noting that there is a descrepency between the way Linux\-PAM handles the const struct pam_message **msg conversation function argument from the way that Solaris\*(Aq PAM (and derivitives, known to include HP/UX, are there others?) does\&. Linux\-PAM interprets the msg argument as entirely equivalent to the following prototype const struct pam_message *msg[] (which, in spirit, is consistent with the commonly used prototypes for argv argument to the familiar main() function: char **argv; and char *argv[])\&. Said another way Linux\-PAM interprets the msg argument as a pointer to an array of num_msg read only \*(Aqstruct pam_message\*(Aq pointers\&. Solaris\*(Aq PAM implementation interprets this argument as a pointer to a pointer to an array of num_msg pam_message structures\&. Fortunately, perhaps, for most module/application developers when num_msg has a value of one these two definitions are entirely equivalent\&. Unfortunately, casually raising this number to two has led to unanticipated compatibility problems\&. + .PP + For what its worth the two known module writer work\-arounds for trying to maintain source level compatibility with both PAM implementations are: + .sp +@@ -290,24 +143,10 @@ .if n \{\ .RS 4 .\} @@ -11207,7 +12202,7 @@ Index: pam.deb/doc/man/pam_conv.3 .if n \{\ .RE .\} -@@ -336,4 +166,4 @@ +@@ -336,4 +175,4 @@ \fBpam_set_item\fR(3), \fBpam_get_item\fR(3), \fBpam_strerror\fR(3), @@ -11230,25 +12225,29 @@ Index: pam.deb/doc/man/pam_error.3 =================================================================== --- pam.deb.orig/doc/man/pam_error.3 +++ pam.deb/doc/man/pam_error.3 -@@ -1,161 +1,13 @@ +@@ -1,161 +1,22 @@ +'\" t .\" Title: pam_error .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/> --.\" Date: 03/02/2009 +-.\" Date: 10/27/2010 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -+.\" Date: 08/24/2009 ++.\" Date: 06/04/2011 .\" Manual: Linux-PAM Manual .\" Source: Linux-PAM Manual .\" Language: English .\" --.TH "PAM_ERROR" "3" "03/02/2009" "Linux-PAM Manual" "Linux-PAM Manual" --.\" ----------------------------------------------------------------- +-.TH "PAM_ERROR" "3" "10/27/2010" "Linux-PAM Manual" "Linux-PAM Manual" ++.TH "PAM_ERROR" "3" "06/04/2011" "Linux-PAM Manual" "Linux-PAM Manual" + .\" ----------------------------------------------------------------- -.\" * (re)Define some macros --.\" ----------------------------------------------------------------- --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" * Define some portability stuff + .\" ----------------------------------------------------------------- + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" http://bugs.debian.org/507673 ++.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* @@ -11392,11 +12391,12 @@ Index: pam.deb/doc/man/pam_error.3 -.fi -.\} -.. -+.TH "PAM_ERROR" "3" "08/24/2009" "Linux-PAM Manual" "Linux-PAM Manual" ++.ie \n(.g .ds Aq \(aq ++.el .ds Aq ' .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- -@@ -166,27 +18,19 @@ +@@ -166,27 +27,19 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- @@ -11426,7 +12426,7 @@ Index: pam.deb/doc/man/pam_error.3 .SH "DESCRIPTION" .PP The -@@ -228,7 +72,7 @@ +@@ -228,7 +81,7 @@ \fBpam_vinfo\fR(3), \fBpam_prompt\fR(3), \fBpam_vprompt\fR(3), @@ -11452,25 +12452,29 @@ Index: pam.deb/doc/man/pam_getenv.3 =================================================================== --- pam.deb.orig/doc/man/pam_getenv.3 +++ pam.deb/doc/man/pam_getenv.3 -@@ -1,161 +1,13 @@ +@@ -1,161 +1,22 @@ +'\" t .\" Title: pam_getenv .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/> --.\" Date: 03/02/2009 +-.\" Date: 10/27/2010 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -+.\" Date: 08/24/2009 ++.\" Date: 06/04/2011 .\" Manual: Linux-PAM Manual .\" Source: Linux-PAM Manual .\" Language: English .\" --.TH "PAM_GETENV" "3" "03/02/2009" "Linux-PAM Manual" "Linux-PAM Manual" --.\" ----------------------------------------------------------------- +-.TH "PAM_GETENV" "3" "10/27/2010" "Linux-PAM Manual" "Linux-PAM Manual" ++.TH "PAM_GETENV" "3" "06/04/2011" "Linux-PAM Manual" "Linux-PAM Manual" + .\" ----------------------------------------------------------------- -.\" * (re)Define some macros --.\" ----------------------------------------------------------------- --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" * Define some portability stuff + .\" ----------------------------------------------------------------- + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" http://bugs.debian.org/507673 ++.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* @@ -11614,11 +12618,12 @@ Index: pam.deb/doc/man/pam_getenv.3 -.fi -.\} -.. -+.TH "PAM_GETENV" "3" "08/24/2009" "Linux-PAM Manual" "Linux-PAM Manual" ++.ie \n(.g .ds Aq \(aq ++.el .ds Aq ' .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- -@@ -166,23 +18,17 @@ +@@ -166,23 +27,17 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- @@ -11644,7 +12649,7 @@ Index: pam.deb/doc/man/pam_getenv.3 .SH "DESCRIPTION" .PP The -@@ -203,4 +49,4 @@ +@@ -203,4 +58,4 @@ \fBpam_start\fR(3), \fBpam_getenvlist\fR(3), \fBpam_putenv\fR(3), @@ -11667,25 +12672,29 @@ Index: pam.deb/doc/man/pam_getenvlist.3 =================================================================== --- pam.deb.orig/doc/man/pam_getenvlist.3 +++ pam.deb/doc/man/pam_getenvlist.3 -@@ -1,161 +1,13 @@ +@@ -1,161 +1,22 @@ +'\" t .\" Title: pam_getenvlist .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/> --.\" Date: 03/02/2009 +-.\" Date: 10/27/2010 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -+.\" Date: 08/24/2009 ++.\" Date: 06/04/2011 .\" Manual: Linux-PAM Manual .\" Source: Linux-PAM Manual .\" Language: English .\" --.TH "PAM_GETENVLIST" "3" "03/02/2009" "Linux-PAM Manual" "Linux-PAM Manual" --.\" ----------------------------------------------------------------- +-.TH "PAM_GETENVLIST" "3" "10/27/2010" "Linux-PAM Manual" "Linux-PAM Manual" ++.TH "PAM_GETENVLIST" "3" "06/04/2011" "Linux-PAM Manual" "Linux-PAM Manual" + .\" ----------------------------------------------------------------- -.\" * (re)Define some macros --.\" ----------------------------------------------------------------- --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" * Define some portability stuff + .\" ----------------------------------------------------------------- + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" http://bugs.debian.org/507673 ++.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* @@ -11829,11 +12838,12 @@ Index: pam.deb/doc/man/pam_getenvlist.3 -.fi -.\} -.. -+.TH "PAM_GETENVLIST" "3" "08/24/2009" "Linux-PAM Manual" "Linux-PAM Manual" ++.ie \n(.g .ds Aq \(aq ++.el .ds Aq ' .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- -@@ -166,23 +18,17 @@ +@@ -166,23 +27,17 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- @@ -11859,7 +12869,19 @@ Index: pam.deb/doc/man/pam_getenvlist.3 .SH "DESCRIPTION" .PP The -@@ -209,4 +55,4 @@ +@@ -190,9 +45,9 @@ + function returns a complete copy of the PAM environment as associated with the handle + \fIpamh\fR\&. The PAM environment variables represent the contents of the regular environment variables of the authenticated user when service is granted\&. + .PP +-The format of the memory is a malloc()\'d array of char pointers, the last element of which is set to NULL\&. Each of the non\-NULL entries in this array point to a NUL terminated and malloc()\'d char string of the form: "\fIname=value\fR"\&. ++The format of the memory is a malloc()\*(Aqd array of char pointers, the last element of which is set to NULL\&. Each of the non\-NULL entries in this array point to a NUL terminated and malloc()\*(Aqd char string of the form: "\fIname=value\fR"\&. + .PP +-It should be noted that this memory will never be free()\'d by libpam\&. Once obtained by a call to ++It should be noted that this memory will never be free()\*(Aqd by libpam\&. Once obtained by a call to + \fBpam_getenvlist\fR, it is the responsibility of the calling application to free() this memory\&. + .PP + It is by design, and not a coincidence, that the format and contents of the returned array matches that required for the third argument of the +@@ -209,4 +64,4 @@ \fBpam_start\fR(3), \fBpam_getenv\fR(3), \fBpam_putenv\fR(3), @@ -11882,25 +12904,29 @@ Index: pam.deb/doc/man/pam_info.3 =================================================================== --- pam.deb.orig/doc/man/pam_info.3 +++ pam.deb/doc/man/pam_info.3 -@@ -1,161 +1,13 @@ +@@ -1,161 +1,22 @@ +'\" t .\" Title: pam_info .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/> --.\" Date: 03/02/2009 +-.\" Date: 10/27/2010 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -+.\" Date: 08/24/2009 ++.\" Date: 06/04/2011 .\" Manual: Linux-PAM Manual .\" Source: Linux-PAM Manual .\" Language: English .\" --.TH "PAM_INFO" "3" "03/02/2009" "Linux-PAM Manual" "Linux-PAM Manual" --.\" ----------------------------------------------------------------- +-.TH "PAM_INFO" "3" "10/27/2010" "Linux-PAM Manual" "Linux-PAM Manual" ++.TH "PAM_INFO" "3" "06/04/2011" "Linux-PAM Manual" "Linux-PAM Manual" + .\" ----------------------------------------------------------------- -.\" * (re)Define some macros --.\" ----------------------------------------------------------------- --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" * Define some portability stuff + .\" ----------------------------------------------------------------- + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" http://bugs.debian.org/507673 ++.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* @@ -12044,11 +13070,12 @@ Index: pam.deb/doc/man/pam_info.3 -.fi -.\} -.. -+.TH "PAM_INFO" "3" "08/24/2009" "Linux-PAM Manual" "Linux-PAM Manual" ++.ie \n(.g .ds Aq \(aq ++.el .ds Aq ' .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- -@@ -166,27 +18,19 @@ +@@ -166,27 +27,19 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- @@ -12078,7 +13105,7 @@ Index: pam.deb/doc/man/pam_info.3 .SH "DESCRIPTION" .PP The -@@ -224,7 +68,7 @@ +@@ -224,7 +77,7 @@ .SH "SEE ALSO" .PP @@ -12104,25 +13131,29 @@ Index: pam.deb/doc/man/pam_misc_drop_env.3 =================================================================== --- pam.deb.orig/doc/man/pam_misc_drop_env.3 +++ pam.deb/doc/man/pam_misc_drop_env.3 -@@ -1,161 +1,13 @@ +@@ -1,161 +1,22 @@ +'\" t .\" Title: pam_misc_drop_env .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/> --.\" Date: 03/02/2009 +-.\" Date: 10/27/2010 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -+.\" Date: 08/24/2009 ++.\" Date: 06/04/2011 .\" Manual: Linux-PAM Manual .\" Source: Linux-PAM Manual .\" Language: English .\" --.TH "PAM_MISC_DROP_ENV" "3" "03/02/2009" "Linux-PAM Manual" "Linux-PAM Manual" --.\" ----------------------------------------------------------------- +-.TH "PAM_MISC_DROP_ENV" "3" "10/27/2010" "Linux-PAM Manual" "Linux-PAM Manual" ++.TH "PAM_MISC_DROP_ENV" "3" "06/04/2011" "Linux-PAM Manual" "Linux-PAM Manual" + .\" ----------------------------------------------------------------- -.\" * (re)Define some macros --.\" ----------------------------------------------------------------- --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" * Define some portability stuff + .\" ----------------------------------------------------------------- + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" http://bugs.debian.org/507673 ++.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* @@ -12266,11 +13297,12 @@ Index: pam.deb/doc/man/pam_misc_drop_env.3 -.fi -.\} -.. -+.TH "PAM_MISC_DROP_ENV" "3" "08/24/2009" "Linux-PAM Manual" "Linux-PAM Manual" ++.ie \n(.g .ds Aq \(aq ++.el .ds Aq ' .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- -@@ -166,23 +18,17 @@ +@@ -166,23 +27,17 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- @@ -12296,7 +13328,7 @@ Index: pam.deb/doc/man/pam_misc_drop_env.3 .SH "DESCRIPTION" .PP This function is defined to complement the -@@ -198,7 +44,7 @@ +@@ -198,7 +53,7 @@ .PP \fBpam_getenvlist\fR(3), @@ -12322,25 +13354,29 @@ Index: pam.deb/doc/man/pam_misc_paste_env.3 =================================================================== --- pam.deb.orig/doc/man/pam_misc_paste_env.3 +++ pam.deb/doc/man/pam_misc_paste_env.3 -@@ -1,161 +1,13 @@ +@@ -1,161 +1,22 @@ +'\" t .\" Title: pam_misc_paste_env .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/> --.\" Date: 03/02/2009 +-.\" Date: 10/27/2010 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -+.\" Date: 08/24/2009 ++.\" Date: 06/04/2011 .\" Manual: Linux-PAM Manual .\" Source: Linux-PAM Manual .\" Language: English .\" --.TH "PAM_MISC_PASTE_ENV" "3" "03/02/2009" "Linux-PAM Manual" "Linux-PAM Manual" --.\" ----------------------------------------------------------------- +-.TH "PAM_MISC_PASTE_ENV" "3" "10/27/2010" "Linux-PAM Manual" "Linux-PAM Manual" ++.TH "PAM_MISC_PASTE_ENV" "3" "06/04/2011" "Linux-PAM Manual" "Linux-PAM Manual" + .\" ----------------------------------------------------------------- -.\" * (re)Define some macros --.\" ----------------------------------------------------------------- --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" * Define some portability stuff + .\" ----------------------------------------------------------------- + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" http://bugs.debian.org/507673 ++.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* @@ -12484,11 +13520,12 @@ Index: pam.deb/doc/man/pam_misc_paste_env.3 -.fi -.\} -.. -+.TH "PAM_MISC_PASTE_ENV" "3" "08/24/2009" "Linux-PAM Manual" "Linux-PAM Manual" ++.ie \n(.g .ds Aq \(aq ++.el .ds Aq ' .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- -@@ -166,23 +18,17 @@ +@@ -166,23 +27,17 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- @@ -12514,7 +13551,7 @@ Index: pam.deb/doc/man/pam_misc_paste_env.3 .SH "DESCRIPTION" .PP This function takes the supplied list of environment pointers and -@@ -193,7 +39,7 @@ +@@ -193,7 +48,7 @@ .PP \fBpam_putenv\fR(3), @@ -12540,25 +13577,29 @@ Index: pam.deb/doc/man/pam_misc_setenv.3 =================================================================== --- pam.deb.orig/doc/man/pam_misc_setenv.3 +++ pam.deb/doc/man/pam_misc_setenv.3 -@@ -1,161 +1,13 @@ +@@ -1,161 +1,22 @@ +'\" t .\" Title: pam_misc_setenv .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/> --.\" Date: 03/02/2009 +-.\" Date: 10/27/2010 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -+.\" Date: 08/24/2009 ++.\" Date: 06/04/2011 .\" Manual: Linux-PAM Manual .\" Source: Linux-PAM Manual .\" Language: English .\" --.TH "PAM_MISC_SETENV" "3" "03/02/2009" "Linux-PAM Manual" "Linux-PAM Manual" --.\" ----------------------------------------------------------------- +-.TH "PAM_MISC_SETENV" "3" "10/27/2010" "Linux-PAM Manual" "Linux-PAM Manual" ++.TH "PAM_MISC_SETENV" "3" "06/04/2011" "Linux-PAM Manual" "Linux-PAM Manual" + .\" ----------------------------------------------------------------- -.\" * (re)Define some macros --.\" ----------------------------------------------------------------- --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" * Define some portability stuff + .\" ----------------------------------------------------------------- + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" http://bugs.debian.org/507673 ++.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* @@ -12702,11 +13743,12 @@ Index: pam.deb/doc/man/pam_misc_setenv.3 -.fi -.\} -.. -+.TH "PAM_MISC_SETENV" "3" "08/24/2009" "Linux-PAM Manual" "Linux-PAM Manual" ++.ie \n(.g .ds Aq \(aq ++.el .ds Aq ' .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- -@@ -166,23 +18,17 @@ +@@ -166,23 +27,17 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- @@ -12732,7 +13774,15 @@ Index: pam.deb/doc/man/pam_misc_setenv.3 .SH "DESCRIPTION" .PP This function performs a task equivalent to -@@ -198,7 +44,7 @@ +@@ -191,14 +46,14 @@ + \fIname\fR + and + \fIvalue\fR +-are concatenated with an \'=\' to form a name=value and passed to ++are concatenated with an \*(Aq=\*(Aq to form a name=value and passed to + \fBpam_putenv()\fR\&. If, however, the PAM variable is already set, the replacement will only be applied if the last argument, + \fIreadonly\fR, is zero\&. + .SH "SEE ALSO" .PP \fBpam_putenv\fR(3), @@ -12758,25 +13808,29 @@ Index: pam.deb/doc/man/pam_prompt.3 =================================================================== --- pam.deb.orig/doc/man/pam_prompt.3 +++ pam.deb/doc/man/pam_prompt.3 -@@ -1,161 +1,13 @@ +@@ -1,161 +1,22 @@ +'\" t .\" Title: pam_prompt .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/> --.\" Date: 03/02/2009 +-.\" Date: 10/27/2010 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -+.\" Date: 08/24/2009 ++.\" Date: 06/04/2011 .\" Manual: Linux-PAM Manual .\" Source: Linux-PAM Manual .\" Language: English .\" --.TH "PAM_PROMPT" "3" "03/02/2009" "Linux-PAM Manual" "Linux-PAM Manual" --.\" ----------------------------------------------------------------- +-.TH "PAM_PROMPT" "3" "10/27/2010" "Linux-PAM Manual" "Linux-PAM Manual" ++.TH "PAM_PROMPT" "3" "06/04/2011" "Linux-PAM Manual" "Linux-PAM Manual" + .\" ----------------------------------------------------------------- -.\" * (re)Define some macros --.\" ----------------------------------------------------------------- --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" * Define some portability stuff + .\" ----------------------------------------------------------------- + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" http://bugs.debian.org/507673 ++.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* @@ -12920,11 +13974,12 @@ Index: pam.deb/doc/man/pam_prompt.3 -.fi -.\} -.. -+.TH "PAM_PROMPT" "3" "08/24/2009" "Linux-PAM Manual" "Linux-PAM Manual" ++.ie \n(.g .ds Aq \(aq ++.el .ds Aq ' .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- -@@ -166,27 +18,19 @@ +@@ -166,27 +27,19 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- @@ -12954,7 +14009,7 @@ Index: pam.deb/doc/man/pam_prompt.3 .SH "DESCRIPTION" .PP The -@@ -218,7 +62,7 @@ +@@ -218,7 +71,7 @@ .SH "SEE ALSO" .PP @@ -12980,25 +14035,29 @@ Index: pam.deb/doc/man/pam_putenv.3 =================================================================== --- pam.deb.orig/doc/man/pam_putenv.3 +++ pam.deb/doc/man/pam_putenv.3 -@@ -1,161 +1,13 @@ +@@ -1,161 +1,22 @@ +'\" t .\" Title: pam_putenv .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/> --.\" Date: 03/02/2009 +-.\" Date: 10/27/2010 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -+.\" Date: 08/24/2009 ++.\" Date: 06/04/2011 .\" Manual: Linux-PAM Manual .\" Source: Linux-PAM Manual .\" Language: English .\" --.TH "PAM_PUTENV" "3" "03/02/2009" "Linux-PAM Manual" "Linux-PAM Manual" --.\" ----------------------------------------------------------------- +-.TH "PAM_PUTENV" "3" "10/27/2010" "Linux-PAM Manual" "Linux-PAM Manual" ++.TH "PAM_PUTENV" "3" "06/04/2011" "Linux-PAM Manual" "Linux-PAM Manual" + .\" ----------------------------------------------------------------- -.\" * (re)Define some macros --.\" ----------------------------------------------------------------- --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" * Define some portability stuff + .\" ----------------------------------------------------------------- + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" http://bugs.debian.org/507673 ++.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* @@ -13142,11 +14201,12 @@ Index: pam.deb/doc/man/pam_putenv.3 -.fi -.\} -.. -+.TH "PAM_PUTENV" "3" "08/24/2009" "Linux-PAM Manual" "Linux-PAM Manual" ++.ie \n(.g .ds Aq \(aq ++.el .ds Aq ' .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- -@@ -166,23 +18,17 @@ +@@ -166,23 +27,17 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- @@ -13172,7 +14232,16 @@ Index: pam.deb/doc/man/pam_putenv.3 .SH "DESCRIPTION" .PP The -@@ -255,4 +101,4 @@ +@@ -210,7 +65,7 @@ + .PP + NAME + .RS 4 +-Without an \'=\' the ++Without an \*(Aq=\*(Aq the + \fBpam_putenv\fR() function will delete the corresponding variable from the PAM environment\&. + .RE + .PP +@@ -255,4 +110,4 @@ \fBpam_getenv\fR(3), \fBpam_getenvlist\fR(3), \fBpam_strerror\fR(3), @@ -13195,25 +14264,29 @@ Index: pam.deb/doc/man/pam_strerror.3 =================================================================== --- pam.deb.orig/doc/man/pam_strerror.3 +++ pam.deb/doc/man/pam_strerror.3 -@@ -1,161 +1,13 @@ +@@ -1,161 +1,22 @@ +'\" t .\" Title: pam_strerror .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/> --.\" Date: 03/02/2009 +-.\" Date: 10/27/2010 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -+.\" Date: 08/24/2009 ++.\" Date: 06/04/2011 .\" Manual: Linux-PAM Manual .\" Source: Linux-PAM Manual .\" Language: English .\" --.TH "PAM_STRERROR" "3" "03/02/2009" "Linux-PAM Manual" "Linux-PAM Manual" --.\" ----------------------------------------------------------------- +-.TH "PAM_STRERROR" "3" "10/27/2010" "Linux-PAM Manual" "Linux-PAM Manual" ++.TH "PAM_STRERROR" "3" "06/04/2011" "Linux-PAM Manual" "Linux-PAM Manual" + .\" ----------------------------------------------------------------- -.\" * (re)Define some macros --.\" ----------------------------------------------------------------- --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" * Define some portability stuff + .\" ----------------------------------------------------------------- + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" http://bugs.debian.org/507673 ++.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* @@ -13357,11 +14430,12 @@ Index: pam.deb/doc/man/pam_strerror.3 -.fi -.\} -.. -+.TH "PAM_STRERROR" "3" "08/24/2009" "Linux-PAM Manual" "Linux-PAM Manual" ++.ie \n(.g .ds Aq \(aq ++.el .ds Aq ' .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- -@@ -166,23 +18,17 @@ +@@ -166,23 +27,17 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- @@ -13387,7 +14461,7 @@ Index: pam.deb/doc/man/pam_strerror.3 .SH "DESCRIPTION" .PP The -@@ -195,4 +41,4 @@ +@@ -195,4 +50,4 @@ .SH "SEE ALSO" .PP @@ -13410,25 +14484,29 @@ Index: pam.deb/doc/man/pam_syslog.3 =================================================================== --- pam.deb.orig/doc/man/pam_syslog.3 +++ pam.deb/doc/man/pam_syslog.3 -@@ -1,161 +1,13 @@ +@@ -1,161 +1,22 @@ +'\" t .\" Title: pam_syslog .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/> --.\" Date: 03/02/2009 +-.\" Date: 10/27/2010 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -+.\" Date: 08/24/2009 ++.\" Date: 06/04/2011 .\" Manual: Linux-PAM Manual .\" Source: Linux-PAM Manual .\" Language: English .\" --.TH "PAM_SYSLOG" "3" "03/02/2009" "Linux-PAM Manual" "Linux-PAM Manual" --.\" ----------------------------------------------------------------- +-.TH "PAM_SYSLOG" "3" "10/27/2010" "Linux-PAM Manual" "Linux-PAM Manual" ++.TH "PAM_SYSLOG" "3" "06/04/2011" "Linux-PAM Manual" "Linux-PAM Manual" + .\" ----------------------------------------------------------------- -.\" * (re)Define some macros --.\" ----------------------------------------------------------------- --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" * Define some portability stuff + .\" ----------------------------------------------------------------- + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" http://bugs.debian.org/507673 ++.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* @@ -13572,11 +14650,12 @@ Index: pam.deb/doc/man/pam_syslog.3 -.fi -.\} -.. -+.TH "PAM_SYSLOG" "3" "08/24/2009" "Linux-PAM Manual" "Linux-PAM Manual" ++.ie \n(.g .ds Aq \(aq ++.el .ds Aq ' .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- -@@ -166,37 +18,25 @@ +@@ -166,37 +27,25 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- @@ -13616,7 +14695,7 @@ Index: pam.deb/doc/man/pam_syslog.3 .SH "DESCRIPTION" .PP The -@@ -219,7 +59,7 @@ +@@ -219,7 +68,7 @@ .SH "SEE ALSO" .PP @@ -13642,25 +14721,29 @@ Index: pam.deb/modules/pam_userdb/pam_userdb.8 =================================================================== --- pam.deb.orig/modules/pam_userdb/pam_userdb.8 +++ pam.deb/modules/pam_userdb/pam_userdb.8 -@@ -1,161 +1,13 @@ +@@ -1,161 +1,22 @@ +'\" t .\" Title: pam_userdb .\" Author: [see the "AUTHOR" section] -.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/> --.\" Date: 03/02/2009 +-.\" Date: 10/27/2010 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -+.\" Date: 08/24/2009 ++.\" Date: 06/04/2011 .\" Manual: Linux-PAM Manual .\" Source: Linux-PAM Manual .\" Language: English .\" --.TH "PAM_USERDB" "8" "03/02/2009" "Linux-PAM Manual" "Linux\-PAM Manual" --.\" ----------------------------------------------------------------- +-.TH "PAM_USERDB" "8" "10/27/2010" "Linux-PAM Manual" "Linux\-PAM Manual" ++.TH "PAM_USERDB" "8" "06/04/2011" "Linux-PAM Manual" "Linux\-PAM Manual" + .\" ----------------------------------------------------------------- -.\" * (re)Define some macros --.\" ----------------------------------------------------------------- --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" * Define some portability stuff + .\" ----------------------------------------------------------------- + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" http://bugs.debian.org/507673 ++.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* @@ -13804,11 +14887,12 @@ Index: pam.deb/modules/pam_userdb/pam_userdb.8 -.fi -.\} -.. -+.TH "PAM_USERDB" "8" "08/24/2009" "Linux-PAM Manual" "Linux\-PAM Manual" ++.ie \n(.g .ds Aq \(aq ++.el .ds Aq ' .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- -@@ -166,13 +18,11 @@ +@@ -166,13 +27,11 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- @@ -13824,7 +14908,7 @@ Index: pam.deb/modules/pam_userdb/pam_userdb.8 .SH "DESCRIPTION" .PP The pam_userdb module is used to verify a username/password pair against values stored in a Berkeley DB database\&. The database is indexed by the username, and the data fields corresponding to the username keys are the passwords\&. -@@ -191,7 +41,7 @@ +@@ -191,7 +50,7 @@ \fBdb=\fR\fB\fI/path/database\fR\fR .RS 4 Use the @@ -13833,7 +14917,25 @@ Index: pam.deb/modules/pam_userdb/pam_userdb.8 database for performing lookup\&. There is no default; the module will return \fBPAM_IGNORE\fR if no database is provided\&. -@@ -279,24 +129,10 @@ +@@ -204,7 +63,7 @@ + .PP + \fBdump\fR + .RS 4 +-Dump all the entries in the database to the log\&. Don\'t do this by default! ++Dump all the entries in the database to the log\&. Don\*(Aqt do this by default! + .RE + .PP + \fBicase\fR +@@ -229,7 +88,7 @@ + .PP + \fBkey_only\fR + .RS 4 +-The username and password are concatenated together in the database hash as \'username\-password\' with a random value\&. if the concatenation of the username and password with a dash in the middle returns any result, the user is valid\&. this is useful in cases where the username may not be unique but the username and password pair are\&. ++The username and password are concatenated together in the database hash as \*(Aqusername\-password\*(Aq with a random value\&. if the concatenation of the username and password with a dash in the middle returns any result, the user is valid\&. this is useful in cases where the username may not be unique but the username and password pair are\&. + .RE + .SH "MODULE TYPES PROVIDED" + .PP +@@ -279,24 +138,10 @@ .if n \{\ .RS 4 .\} @@ -13858,7 +14960,7 @@ Index: pam.deb/modules/pam_userdb/pam_userdb.8 .if n \{\ .RE .\} -@@ -306,7 +142,7 @@ +@@ -306,7 +151,7 @@ \fBcrypt\fR(3), \fBpam.conf\fR(5), \fBpam.d\fR(5), @@ -13884,25 +14986,29 @@ Index: pam.deb/modules/pam_warn/pam_warn.8 =================================================================== --- pam.deb.orig/modules/pam_warn/pam_warn.8 +++ pam.deb/modules/pam_warn/pam_warn.8 -@@ -1,161 +1,13 @@ +@@ -1,161 +1,22 @@ +'\" t .\" Title: pam_warn .\" Author: [see the "AUTHOR" section] -.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/> --.\" Date: 03/02/2009 +-.\" Date: 10/27/2010 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -+.\" Date: 08/24/2009 ++.\" Date: 06/04/2011 .\" Manual: Linux-PAM Manual .\" Source: Linux-PAM Manual .\" Language: English .\" --.TH "PAM_WARN" "8" "03/02/2009" "Linux-PAM Manual" "Linux\-PAM Manual" --.\" ----------------------------------------------------------------- +-.TH "PAM_WARN" "8" "10/27/2010" "Linux-PAM Manual" "Linux\-PAM Manual" ++.TH "PAM_WARN" "8" "06/04/2011" "Linux-PAM Manual" "Linux\-PAM Manual" + .\" ----------------------------------------------------------------- -.\" * (re)Define some macros --.\" ----------------------------------------------------------------- --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" * Define some portability stuff + .\" ----------------------------------------------------------------- + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" http://bugs.debian.org/507673 ++.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* @@ -14046,11 +15152,12 @@ Index: pam.deb/modules/pam_warn/pam_warn.8 -.fi -.\} -.. -+.TH "PAM_WARN" "8" "08/24/2009" "Linux-PAM Manual" "Linux\-PAM Manual" ++.ie \n(.g .ds Aq \(aq ++.el .ds Aq ' .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- -@@ -166,13 +18,11 @@ +@@ -166,13 +27,11 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- @@ -14066,7 +15173,7 @@ Index: pam.deb/modules/pam_warn/pam_warn.8 .SH "DESCRIPTION" .PP pam_warn is a PAM module that logs the service, terminal, user, remote user and remote host to -@@ -201,15 +51,7 @@ +@@ -201,18 +60,10 @@ .if n \{\ .RS 4 .\} @@ -14081,8 +15188,12 @@ Index: pam.deb/modules/pam_warn/pam_warn.8 - #%PAM\-1\&.0 # - # If we don\'t have config entries for a service, the -@@ -224,13 +66,7 @@ +-# If we don\'t have config entries for a service, the ++# If we don\*(Aqt have config entries for a service, the + # OTHER entries are used\&. To be secure, warn and deny + # access to everything\&. + other auth required pam_warn\&.so +@@ -224,13 +75,7 @@ other session required pam_warn\&.so other session required pam_deny\&.so @@ -14096,7 +15207,7 @@ Index: pam.deb/modules/pam_warn/pam_warn.8 .if n \{\ .RE .\} -@@ -239,7 +75,7 @@ +@@ -239,7 +84,7 @@ \fBpam.conf\fR(5), \fBpam.d\fR(5), @@ -14122,7 +15233,7 @@ Index: pam.deb/modules/pam_wheel/pam_wheel.8 =================================================================== --- pam.deb.orig/modules/pam_wheel/pam_wheel.8 +++ pam.deb/modules/pam_wheel/pam_wheel.8 -@@ -128,7 +128,7 @@ +@@ -137,7 +137,7 @@ \fBpam.conf\fR(5), \fBpam.d\fR(5), @@ -14148,25 +15259,29 @@ Index: pam.deb/modules/pam_xauth/pam_xauth.8 =================================================================== --- pam.deb.orig/modules/pam_xauth/pam_xauth.8 +++ pam.deb/modules/pam_xauth/pam_xauth.8 -@@ -1,161 +1,13 @@ +@@ -1,161 +1,22 @@ +'\" t .\" Title: pam_xauth .\" Author: [see the "AUTHOR" section] -.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/> --.\" Date: 06/16/2009 +-.\" Date: 10/27/2010 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -+.\" Date: 08/24/2009 ++.\" Date: 06/04/2011 .\" Manual: Linux-PAM Manual .\" Source: Linux-PAM Manual .\" Language: English .\" --.TH "PAM_XAUTH" "8" "06/16/2009" "Linux-PAM Manual" "Linux\-PAM Manual" --.\" ----------------------------------------------------------------- +-.TH "PAM_XAUTH" "8" "10/27/2010" "Linux-PAM Manual" "Linux\-PAM Manual" ++.TH "PAM_XAUTH" "8" "06/04/2011" "Linux-PAM Manual" "Linux\-PAM Manual" + .\" ----------------------------------------------------------------- -.\" * (re)Define some macros --.\" ----------------------------------------------------------------- --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" * Define some portability stuff + .\" ----------------------------------------------------------------- + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" http://bugs.debian.org/507673 ++.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* @@ -14310,11 +15425,12 @@ Index: pam.deb/modules/pam_xauth/pam_xauth.8 -.fi -.\} -.. -+.TH "PAM_XAUTH" "8" "08/24/2009" "Linux-PAM Manual" "Linux\-PAM Manual" ++.ie \n(.g .ds Aq \(aq ++.el .ds Aq ' .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- -@@ -166,13 +18,11 @@ +@@ -166,20 +27,18 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- @@ -14330,16 +15446,26 @@ Index: pam.deb/modules/pam_xauth/pam_xauth.8 .SH "DESCRIPTION" .PP The pam_xauth PAM module is designed to forward xauth keys (sometimes referred to as "cookies") between users\&. -@@ -190,24 +40,24 @@ + .PP + Without pam_xauth, when xauth is enabled and a user uses the + \fBsu\fR(1) +-command to assume another user\'s privileges, that user is no longer able to access the original user\'s X display because the new user does not have the key needed to access the display\&. pam_xauth solves the problem by forwarding the key from the user running su (the source user) to the user whose identity the source user is assuming (the target user) when the session is created, and destroying the key when the session is torn down\&. ++command to assume another user\*(Aqs privileges, that user is no longer able to access the original user\*(Aqs X display because the new user does not have the key needed to access the display\&. pam_xauth solves the problem by forwarding the key from the user running su (the source user) to the user whose identity the source user is assuming (the target user) when the session is created, and destroying the key when the session is torn down\&. + .PP + This means, for example, that when you run + \fBsu\fR(1) +@@ -190,24 +49,24 @@ pam_xauth will only forward keys if xauth can list a key connected to the $DISPLAY environment variable\&. .PP Primitive access control is provided by -\FC~/\&.xauth/export\F[] -+~/\&.xauth/export - in the invoking user\'s home directory and +-in the invoking user\'s home directory and -\FC~/\&.xauth/import\F[] +-in the target user\'s home directory\&. ++~/\&.xauth/export ++in the invoking user\*(Aqs home directory and +~/\&.xauth/import - in the target user\'s home directory\&. ++in the target user\*(Aqs home directory\&. .PP If a user has a -\FC~/\&.xauth/import\F[] @@ -14362,7 +15488,7 @@ Index: pam.deb/modules/pam_xauth/pam_xauth.8 file, and the invoking user is \fBroot\fR, the user will \fInot\fR -@@ -225,9 +75,9 @@ +@@ -225,9 +84,9 @@ \fBxauthpath=\fR\fB\fI/path/to/xauth\fR\fR .RS 4 Specify the path the xauth program (it is expected in @@ -14375,7 +15501,7 @@ Index: pam.deb/modules/pam_xauth/pam_xauth.8 by default)\&. .RE .PP -@@ -274,30 +124,16 @@ +@@ -274,30 +133,16 @@ .SH "EXAMPLES" .PP Add the following line to @@ -14407,7 +15533,7 @@ Index: pam.deb/modules/pam_xauth/pam_xauth.8 .if n \{\ .RE .\} -@@ -319,12 +155,12 @@ +@@ -319,12 +164,12 @@ pam_xauth cannot be told to not remove the keys when the session is closed\&. .SH "FILES" .PP @@ -14422,7 +15548,7 @@ Index: pam.deb/modules/pam_xauth/pam_xauth.8 .RS 4 XXX .RE -@@ -333,7 +169,7 @@ +@@ -333,7 +178,7 @@ \fBpam.conf\fR(5), \fBpam.d\fR(5), diff --git a/debian/patches-applied/autoconf.patch b/debian/patches-applied/autoconf.patch index 5168eee9..11d3135b 100644 --- a/debian/patches-applied/autoconf.patch +++ b/debian/patches-applied/autoconf.patch @@ -7,10 +7,10 @@ The process for refreshing this patch is: quilt refresh find . -name '*.rej' | xargs rm -Index: pam.debian/ltmain.sh +Index: pam.deb/ltmain.sh =================================================================== ---- pam.debian.orig/ltmain.sh -+++ pam.debian/ltmain.sh +--- pam.deb.orig/ltmain.sh ++++ pam.deb/ltmain.sh @@ -1,6 +1,6 @@ # Generated from ltmain.m4sh. @@ -24,7 +24,7 @@ Index: pam.debian/ltmain.sh # compiler flags: $LTCFLAGS # linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.2.6 -+# $progname: (GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu1 ++# $progname: (GNU libtool) 2.2.6b Debian-2.2.6b-2 # automake: $automake_version # autoconf: $autoconf_version # @@ -33,7 +33,7 @@ Index: pam.debian/ltmain.sh PROGRAM=ltmain.sh PACKAGE=libtool -VERSION=2.2.6 -+VERSION="2.2.6b Debian-2.2.6b-2ubuntu1" ++VERSION="2.2.6b Debian-2.2.6b-2" TIMESTAMP="" -package_revision=1.3012 +package_revision=1.3017 @@ -120,10 +120,10 @@ Index: pam.debian/ltmain.sh esac ;; no) -Index: pam.debian/m4/libtool.m4 +Index: pam.deb/m4/libtool.m4 =================================================================== ---- pam.debian.orig/m4/libtool.m4 -+++ pam.debian/m4/libtool.m4 +--- pam.deb.orig/m4/libtool.m4 ++++ pam.deb/m4/libtool.m4 @@ -2445,7 +2445,7 @@ ;; @@ -265,63 +265,332 @@ Index: pam.debian/m4/libtool.m4 case $cc_basename in KCC*) # Kuck and Associates, Inc. (KAI) C++ Compiler -Index: pam.debian/aclocal.m4 +Index: pam.deb/aclocal.m4 =================================================================== ---- pam.debian.orig/aclocal.m4 -+++ pam.debian/aclocal.m4 -@@ -1,4 +1,4 @@ --# generated automatically by aclocal 1.11 -*- Autoconf -*- -+# generated automatically by aclocal 1.11.1 -*- Autoconf -*- +--- pam.deb.orig/aclocal.m4 ++++ pam.deb/aclocal.m4 +@@ -1,7 +1,7 @@ +-# generated automatically by aclocal 1.10.1 -*- Autoconf -*- ++# generated automatically by aclocal 1.10.3 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, - # 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. -@@ -13,8 +13,8 @@ +-# 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -13,13 +13,13 @@ m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl --m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],, +-m4_if(AC_AUTOCONF_VERSION, [2.63],, -[m4_warning([this file was generated for autoconf 2.63. -+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],, -+[m4_warning([this file was generated for autoconf 2.65. ++m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],, ++[m4_warning([this file was generated for autoconf 2.67. 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'.])]) + +-# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc. ++# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, @@ -34,7 +34,7 @@ - [am__api_version='1.11' + [am__api_version='1.10' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. --m4_if([$1], [1.11], [], -+m4_if([$1], [1.11.1], [], +-m4_if([$1], [1.10.1], [], ++m4_if([$1], [1.10.3], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) -@@ -50,7 +50,7 @@ +@@ -48,12 +48,12 @@ + # AM_SET_CURRENT_AUTOMAKE_VERSION + # ------------------------------- # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. - # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. +-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. ++# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], --[AM_AUTOMAKE_VERSION([1.11])dnl -+[AM_AUTOMAKE_VERSION([1.11.1])dnl +-[AM_AUTOMAKE_VERSION([1.10.1])dnl ++[AM_AUTOMAKE_VERSION([1.10.3])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl - _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) -@@ -1008,7 +1008,6 @@ - m4_include([m4/gettext.m4]) - m4_include([m4/iconv.m4]) - m4_include([m4/intlmacosx.m4]) --m4_include([m4/japhar_grep_cflags.m4]) - m4_include([m4/jh_path_xml_catalog.m4]) - m4_include([m4/ld-O1.m4]) - m4_include([m4/ld-as-needed.m4]) -@@ -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.debian/config.h.in +-_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)]) ++_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) + + # AM_AUX_DIR_EXPAND -*- Autoconf -*- + +@@ -143,14 +143,14 @@ + Usually this means the macro was only invoked conditionally.]]) + fi])]) + +-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 ++# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 + # Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +-# serial 9 ++# serial 10 + + # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be + # written in clear, in which case automake, when reading aclocal.m4, +@@ -207,6 +207,16 @@ + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` + fi ++ am__universal=false ++ m4_case([$1], [CC], ++ [case " $depcc " in #( ++ *\ -arch\ *\ -arch\ *) am__universal=true ;; ++ esac], ++ [CXX], ++ [case " $depcc " in #( ++ *\ -arch\ *\ -arch\ *) am__universal=true ;; ++ esac]) ++ + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and +@@ -224,7 +234,17 @@ + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + ++ # We check with `-c' and `-o' for the sake of the "dashmstdout" ++ # mode. It turns out that the SunPro C++ compiler does not properly ++ # handle `-M -o', and we need to detect this. Also, some Intel ++ # versions had trouble with output in subdirs ++ am__obj=sub/conftest.${OBJEXT-o} ++ am__minus_obj="-o $am__obj" + case $depmode in ++ gcc) ++ # This depmode causes a compiler race in universal mode. ++ test "$am__universal" = false || continue ++ ;; + nosideeffect) + # after this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested +@@ -234,19 +254,23 @@ + break + fi + ;; ++ msvisualcpp | msvcmsys) ++ # This compiler won't grok `-c -o', but also, the minuso test has ++ # not run yet. These depmodes are late enough in the game, and ++ # so weak that their functioning should not be impacted. ++ am__obj=conftest.${OBJEXT-o} ++ am__minus_obj= ++ ;; + none) break ;; + esac +- # We check with `-c' and `-o' for the sake of the "dashmstdout" +- # mode. It turns out that the SunPro C++ compiler does not properly +- # handle `-M -o', and we need to detect this. + if depmode=$depmode \ +- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ ++ source=sub/conftest.c object=$am__obj \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ +- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ ++ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && +- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ++ grep $am__obj sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message +@@ -303,57 +327,68 @@ + + # Generate code to set up dependency tracking. -*- Autoconf -*- + +-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 ++# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 + # Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +-#serial 3 ++#serial 5 + + # _AM_OUTPUT_DEPENDENCY_COMMANDS + # ------------------------------ + AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], +-[for mf in $CONFIG_FILES; do +- # Strip MF so we end up with the name of the file. +- mf=`echo "$mf" | sed -e 's/:.*$//'` +- # Check whether this is an Automake generated Makefile or not. +- # We used to match only the files named `Makefile.in', but +- # some people rename them; so instead we look at the file content. +- # Grep'ing the first line is not enough: some people post-process +- # each Makefile.in and add a new line on top of each file to say so. +- # Grep'ing the whole file is not good either: AIX grep has a line +- # limit of 2048, but all sed's we know have understand at least 4000. +- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then +- dirpart=`AS_DIRNAME("$mf")` +- else +- continue +- fi +- # Extract the definition of DEPDIR, am__include, and am__quote +- # from the Makefile without running `make'. +- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` +- test -z "$DEPDIR" && continue +- am__include=`sed -n 's/^am__include = //p' < "$mf"` +- test -z "am__include" && continue +- am__quote=`sed -n 's/^am__quote = //p' < "$mf"` +- # When using ansi2knr, U may be empty or an underscore; expand it +- U=`sed -n 's/^U = //p' < "$mf"` +- # Find all dependency output files, they are included files with +- # $(DEPDIR) in their names. We invoke sed twice because it is the +- # simplest approach to changing $(DEPDIR) to its actual value in the +- # expansion. +- for file in `sed -n " +- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ +- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do +- # Make sure the directory exists. +- test -f "$dirpart/$file" && continue +- fdir=`AS_DIRNAME(["$file"])` +- AS_MKDIR_P([$dirpart/$fdir]) +- # echo "creating $dirpart/$file" +- echo '# dummy' > "$dirpart/$file" ++[{ ++ # Autoconf 2.62 quotes --file arguments for eval, but not when files ++ # are listed without --file. Let's play safe and only enable the eval ++ # if we detect the quoting. ++ case $CONFIG_FILES in ++ *\'*) eval set x "$CONFIG_FILES" ;; ++ *) set x $CONFIG_FILES ;; ++ esac ++ shift ++ for mf ++ do ++ # Strip MF so we end up with the name of the file. ++ mf=`echo "$mf" | sed -e 's/:.*$//'` ++ # Check whether this is an Automake generated Makefile or not. ++ # We used to match only the files named `Makefile.in', but ++ # some people rename them; so instead we look at the file content. ++ # Grep'ing the first line is not enough: some people post-process ++ # each Makefile.in and add a new line on top of each file to say so. ++ # Grep'ing the whole file is not good either: AIX grep has a line ++ # limit of 2048, but all sed's we know have understand at least 4000. ++ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then ++ dirpart=`AS_DIRNAME("$mf")` ++ else ++ continue ++ fi ++ # Extract the definition of DEPDIR, am__include, and am__quote ++ # from the Makefile without running `make'. ++ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` ++ test -z "$DEPDIR" && continue ++ am__include=`sed -n 's/^am__include = //p' < "$mf"` ++ test -z "am__include" && continue ++ am__quote=`sed -n 's/^am__quote = //p' < "$mf"` ++ # When using ansi2knr, U may be empty or an underscore; expand it ++ U=`sed -n 's/^U = //p' < "$mf"` ++ # Find all dependency output files, they are included files with ++ # $(DEPDIR) in their names. We invoke sed twice because it is the ++ # simplest approach to changing $(DEPDIR) to its actual value in the ++ # expansion. ++ for file in `sed -n " ++ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ ++ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do ++ # Make sure the directory exists. ++ test -f "$dirpart/$file" && continue ++ fdir=`AS_DIRNAME(["$file"])` ++ AS_MKDIR_P([$dirpart/$fdir]) ++ # echo "creating $dirpart/$file" ++ echo '# dummy' > "$dirpart/$file" ++ done + done +-done ++} + ])# _AM_OUTPUT_DEPENDENCY_COMMANDS + + +@@ -373,7 +408,7 @@ + # Do all the work for Automake. -*- Autoconf -*- + + # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +-# 2005, 2006, 2008 Free Software Foundation, Inc. ++# 2005, 2006, 2008, 2009 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +@@ -447,8 +482,8 @@ + AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) + AM_MISSING_PROG(AUTOHEADER, autoheader) + AM_MISSING_PROG(MAKEINFO, makeinfo) +-AM_PROG_INSTALL_SH +-AM_PROG_INSTALL_STRIP ++AC_REQUIRE([AM_PROG_INSTALL_SH])dnl ++AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl + AC_REQUIRE([AM_PROG_MKDIR_P])dnl + # We need awk for the "check" target. The system "awk" is bad on + # some platforms. +@@ -604,14 +639,14 @@ + rm -f confinc confmf + ]) + +-# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005 ++# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2008 + # Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +-# serial 5 ++# serial 6 + + # AM_PROG_CC_C_O + # -------------- +@@ -623,8 +658,9 @@ + # FIXME: we rely on the cache variable name because + # there is no other way. + set dummy $CC +-ac_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']` +-if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" != yes"; then ++am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']` ++eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o ++if test "$am_t" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. +@@ -702,13 +738,13 @@ + + # Helper functions for option handling. -*- Autoconf -*- + +-# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. ++# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +-# serial 3 ++# serial 4 + + # _AM_MANGLE_OPTION(NAME) + # ----------------------- +@@ -725,7 +761,7 @@ + # ---------------------------------- + # OPTIONS is a space-separated list of Automake options. + AC_DEFUN([_AM_SET_OPTIONS], +-[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) ++[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) + + # _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) + # ------------------------------------------- +Index: pam.deb/config.h.in =================================================================== ---- pam.debian.orig/config.h.in -+++ pam.debian/config.h.in -@@ -294,6 +294,9 @@ +--- pam.deb.orig/config.h.in ++++ pam.deb/config.h.in +@@ -303,6 +303,9 @@ /* Define to the one symbol short name of this package. */ #undef PACKAGE_TARNAME @@ -331,21 +600,21 @@ Index: pam.debian/config.h.in /* Define to the version of this package. */ #undef PACKAGE_VERSION -Index: pam.debian/configure +Index: pam.deb/configure =================================================================== ---- pam.debian.orig/configure -+++ pam.debian/configure +--- pam.deb.orig/configure ++++ pam.deb/configure @@ -1,18 +1,22 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63. -+# Generated by GNU Autoconf 2.65. ++# Generated by GNU Autoconf 2.67. +# # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. -+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -+# Inc. ++# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software ++# Foundation, Inc. +# +# # This configure script is free software; the Free Software Foundation @@ -805,7 +1074,7 @@ Index: pam.debian/configure +# Unset more variables known to interfere with behavior of common tools. +CLICOLOR_FORCE= GREP_OPTIONS= +unset CLICOLOR_FORCE GREP_OPTIONS - ++ +## --------------------- ## +## M4sh Shell Functions. ## +## --------------------- ## @@ -841,7 +1110,7 @@ Index: pam.debian/configure +# Create "$as_dir" as a directory, including parents if necessary. +as_fn_mkdir_p () +{ -+ + + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac @@ -879,7 +1148,7 @@ Index: pam.debian/configure + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" -+ } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" ++ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" -(eval "as_func_return () { @@ -946,19 +1215,19 @@ Index: pam.debian/configure -if as_func_ret_success; then - : -+# as_fn_error ERROR [LINENO LOG_FD] -+# --------------------------------- ++# as_fn_error STATUS ERROR [LINENO LOG_FD] ++# ---------------------------------------- +# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are +# provided, also output the error to LOG_FD, referencing LINENO. Then exit the -+# script with status $?, using 1 if that was 0. ++# script with STATUS, using 1 if that was 0. +as_fn_error () +{ -+ as_status=$?; test $as_status -eq 0 && as_status=1 -+ if test "$3"; then -+ as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 ++ as_status=$1; test $as_status -eq 0 && as_status=1 ++ if test "$4"; then ++ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + fi -+ $as_echo "$as_me: error: $1" >&2 ++ $as_echo "$as_me: error: $2" >&2 + as_fn_exit $as_status +} # as_fn_error + @@ -1122,7 +1391,7 @@ Index: pam.debian/configure # Check that we are running under the correct shell. SHELL=${CONFIG_SHELL-/bin/sh} -@@ -720,7 +675,8 @@ +@@ -720,10 +675,11 @@ @@ -1131,7 +1400,11 @@ Index: pam.debian/configure +exec 6>&1 # Name of the host. - # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, +-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, ++# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, + # so uname gets run too. + ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` + @@ -738,7 +694,6 @@ subdirs= MFLAGS= @@ -1148,7 +1421,7 @@ Index: pam.debian/configure ac_unique_file="conf/pam_conv1/pam_conv_y.y" ac_default_prefix=/usr -@@ -957,6 +913,7 @@ +@@ -960,6 +916,7 @@ program_transform_name prefix exec_prefix @@ -1156,55 +1429,67 @@ Index: pam.debian/configure PACKAGE_BUGREPORT PACKAGE_STRING PACKAGE_VERSION -@@ -1120,8 +1077,7 @@ +@@ -1077,8 +1034,9 @@ + fi + + case $ac_option in +- *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; +- *) ac_optarg=yes ;; ++ *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; ++ *=) ac_optarg= ;; ++ *) ac_optarg=yes ;; + esac + + # Accept the important Cygnus configure options, so we can diagnose typos. +@@ -1123,8 +1081,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 && - { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 - { (exit 1); exit 1; }; } -+ as_fn_error "invalid feature name: $ac_useropt" ++ as_fn_error $? "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in -@@ -1147,8 +1103,7 @@ +@@ -1150,8 +1107,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 && - { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 - { (exit 1); exit 1; }; } -+ as_fn_error "invalid feature name: $ac_useropt" ++ as_fn_error $? "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in -@@ -1352,8 +1307,7 @@ +@@ -1355,8 +1311,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 && - { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 - { (exit 1); exit 1; }; } -+ as_fn_error "invalid package name: $ac_useropt" ++ as_fn_error $? "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in -@@ -1369,8 +1323,7 @@ +@@ -1372,8 +1327,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 && - { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 - { (exit 1); exit 1; }; } -+ as_fn_error "invalid package name: $ac_useropt" ++ as_fn_error $? "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in -@@ -1400,17 +1353,17 @@ +@@ -1403,17 +1357,17 @@ | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; - -*) { $as_echo "$as_me: error: unrecognized option: $ac_option -Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; } -+ -*) as_fn_error "unrecognized option: \`$ac_option' -+Try \`$0 --help' for more information." ++ -*) as_fn_error $? "unrecognized option: \`$ac_option' ++Try \`$0 --help' for more information" ;; *=*) @@ -1215,18 +1500,18 @@ Index: pam.debian/configure - { (exit 1); exit 1; }; } + case $ac_envvar in #( + '' | [0-9]* | *[!_$as_cr_alnum]* ) -+ as_fn_error "invalid variable name: \`$ac_envvar'" ;; ++ as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; + esac eval $ac_envvar=\$ac_optarg export $ac_envvar ;; -@@ -1427,15 +1380,13 @@ +@@ -1430,15 +1384,13 @@ if test -n "$ac_prev"; then ac_option=--`echo $ac_prev | sed 's/_/-/g'` - { $as_echo "$as_me: error: missing argument to $ac_option" >&2 - { (exit 1); exit 1; }; } -+ as_fn_error "missing argument to $ac_option" ++ as_fn_error $? "missing argument to $ac_option" fi if test -n "$ac_unrecognized_opts"; then @@ -1234,51 +1519,71 @@ Index: pam.debian/configure no) ;; - fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2 - { (exit 1); exit 1; }; } ;; -+ fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;; ++ fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; esac fi -@@ -1458,8 +1409,7 @@ +@@ -1461,8 +1413,7 @@ [\\/$]* | ?:[\\/]* ) continue;; NONE | '' ) case $ac_var in *prefix ) continue;; esac;; esac - { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 - { (exit 1); exit 1; }; } -+ as_fn_error "expected an absolute directory name for --$ac_var: $ac_val" ++ as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" done # There might be people who depend on the old broken behavior: `$host' -@@ -1489,11 +1439,9 @@ +@@ -1476,8 +1427,8 @@ + if test "x$host_alias" != x; then + if test "x$build_alias" = x; then + cross_compiling=maybe +- $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. +- If a cross compiler is detected then cross compile mode will be used." >&2 ++ $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. ++ If a cross compiler is detected then cross compile mode will be used" >&2 + elif test "x$build_alias" != "x$host_alias"; then + cross_compiling=yes + fi +@@ -1492,11 +1443,9 @@ ac_pwd=`pwd` && test -n "$ac_pwd" && ac_ls_di=`ls -di .` && ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || - { $as_echo "$as_me: error: working directory cannot be determined" >&2 - { (exit 1); exit 1; }; } -+ as_fn_error "working directory cannot be determined" ++ as_fn_error $? "working directory cannot be determined" test "X$ac_ls_di" = "X$ac_pwd_ls_di" || - { $as_echo "$as_me: error: pwd does not report name of working directory" >&2 - { (exit 1); exit 1; }; } -+ as_fn_error "pwd does not report name of working directory" ++ as_fn_error $? "pwd does not report name of working directory" # Find the source files, if location was not specified. -@@ -1532,13 +1480,11 @@ +@@ -1535,13 +1484,11 @@ fi if test ! -r "$srcdir/$ac_unique_file"; then test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." - { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 - { (exit 1); exit 1; }; } -+ as_fn_error "cannot find sources ($ac_unique_file) in $srcdir" ++ as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" fi ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" ac_abs_confdir=`( - cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2 - { (exit 1); exit 1; }; } -+ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg" ++ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" pwd)` # When building in place, set srcdir=. if test "$ac_abs_confdir" = "$ac_pwd"; then -@@ -1705,7 +1651,7 @@ +@@ -1581,7 +1528,7 @@ + --help=short display options specific to this package + --help=recursive display the short help of all the included packages + -V, --version display version information and exit +- -q, --quiet, --silent do not print \`checking...' messages ++ -q, --quiet, --silent do not print \`checking ...' messages + --cache-file=FILE cache test results in FILE [disabled] + -C, --config-cache alias for \`--cache-file=config.cache' + -n, --no-create do not create output files +@@ -1708,7 +1655,7 @@ LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a nonstandard directory <lib dir> LIBS libraries to pass to the linker, e.g. -l<library> @@ -1287,7 +1592,7 @@ Index: pam.debian/configure you have headers in a nonstandard directory <include dir> CPP C preprocessor YACC The `Yet Another C Compiler' implementation to use. Defaults to -@@ -1717,6 +1663,7 @@ +@@ -1720,6 +1667,7 @@ Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. @@ -1295,16 +1600,16 @@ Index: pam.debian/configure _ACEOF ac_status=$? fi -@@ -1780,21 +1727,465 @@ +@@ -1783,21 +1731,472 @@ if $ac_init_version; then cat <<\_ACEOF configure -generated by GNU Autoconf 2.63 -+generated by GNU Autoconf 2.65 ++generated by GNU Autoconf 2.67 -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. -+Copyright (C) 2009 Free Software Foundation, Inc. ++Copyright (C) 2010 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1374,7 +1679,7 @@ Index: pam.debian/configure + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } >/dev/null && { ++ test $ac_status = 0; } > conftest.i && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then : @@ -1398,10 +1703,10 @@ Index: pam.debian/configure +ac_fn_c_check_header_mongrel () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : ++ if eval "test \"\${$3+set}\"" = set; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } -+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval "test \"\${$3+set}\"" = set; then : + $as_echo_n "(cached) " >&6 +fi +eval ac_res=\$$3 @@ -1437,7 +1742,7 @@ Index: pam.debian/configure +else + ac_header_preproc=no +fi -+rm -f conftest.err conftest.$ac_ext ++rm -f conftest.err conftest.i conftest.$ac_ext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } + @@ -1464,7 +1769,7 @@ Index: pam.debian/configure +esac + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } -+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval "test \"\${$3+set}\"" = set; then : + $as_echo_n "(cached) " >&6 +else + eval "$3=\$ac_header_compiler" @@ -1528,7 +1833,7 @@ Index: pam.debian/configure + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } -+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval "test \"\${$3+set}\"" = set; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -1604,7 +1909,7 @@ Index: pam.debian/configure + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } -+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval "test \"\${$3+set}\"" = set; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -1672,7 +1977,7 @@ Index: pam.debian/configure + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } -+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval "test \"\${$3+set}\"" = set; then : + $as_echo_n "(cached) " >&6 +else + eval "$3=no" @@ -1717,15 +2022,18 @@ Index: pam.debian/configure + +} # ac_fn_c_check_type + -+# ac_fn_c_check_decl LINENO SYMBOL VAR -+# ------------------------------------ -+# Tests whether SYMBOL is declared, setting cache variable VAR accordingly. ++# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES ++# --------------------------------------------- ++# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR ++# accordingly. +ac_fn_c_check_decl () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $2 is declared" >&5 -+$as_echo_n "checking whether $2 is declared... " >&6; } -+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : ++ as_decl_name=`echo $2|sed 's/ *(.*//'` ++ as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'` ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5 ++$as_echo_n "checking whether $as_decl_name is declared... " >&6; } ++if eval "test \"\${$3+set}\"" = set; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -1734,8 +2042,12 @@ Index: pam.debian/configure +int +main () +{ -+#ifndef $2 -+ (void) $2; ++#ifndef $as_decl_name ++#ifdef __cplusplus ++ (void) $as_decl_use; ++#else ++ (void) $as_decl_name; ++#endif +#endif + + ; @@ -1761,11 +2073,11 @@ Index: pam.debian/configure It was created by $as_me, which was -generated by GNU Autoconf 2.63. Invocation command line was -+generated by GNU Autoconf 2.65. Invocation command line was ++generated by GNU Autoconf 2.67. Invocation command line was $ $0 $@ -@@ -1830,8 +2221,8 @@ +@@ -1833,8 +2232,8 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -1776,7 +2088,7 @@ Index: pam.debian/configure IFS=$as_save_IFS } >&5 -@@ -1868,9 +2259,9 @@ +@@ -1871,9 +2270,9 @@ ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; esac case $ac_pass in @@ -1788,7 +2100,7 @@ Index: pam.debian/configure if test $ac_must_keep_next = true; then ac_must_keep_next=false # Got value, back to normal. else -@@ -1886,13 +2277,13 @@ +@@ -1889,13 +2288,13 @@ -* ) ac_must_keep_next=true ;; esac fi @@ -1805,7 +2117,21 @@ Index: pam.debian/configure # When interrupted or exit'd, cleanup temporary files, and complete # config.log. We remove comments because anyway the quotes in there -@@ -1917,13 +2308,13 @@ +@@ -1907,11 +2306,9 @@ + { + echo + +- cat <<\_ASBOX +-## ---------------- ## ++ $as_echo "## ---------------- ## + ## Cache variables. ## +-## ---------------- ## +-_ASBOX ++## ---------------- ##" + echo + # The following way of writing the cache mishandles newlines in values, + ( +@@ -1920,13 +2317,13 @@ case $ac_val in #( *${as_nl}*) case $ac_var in #( @@ -1821,7 +2147,49 @@ Index: pam.debian/configure esac ;; esac done -@@ -1995,39 +2386,41 @@ +@@ -1945,11 +2342,9 @@ + ) + echo + +- cat <<\_ASBOX +-## ----------------- ## ++ $as_echo "## ----------------- ## + ## Output variables. ## +-## ----------------- ## +-_ASBOX ++## ----------------- ##" + echo + for ac_var in $ac_subst_vars + do +@@ -1962,11 +2357,9 @@ + echo + + if test -n "$ac_subst_files"; then +- cat <<\_ASBOX +-## ------------------- ## ++ $as_echo "## ------------------- ## + ## File substitutions. ## +-## ------------------- ## +-_ASBOX ++## ------------------- ##" + echo + for ac_var in $ac_subst_files + do +@@ -1980,11 +2373,9 @@ + fi + + if test -s confdefs.h; then +- cat <<\_ASBOX +-## ----------- ## ++ $as_echo "## ----------- ## + ## confdefs.h. ## +-## ----------- ## +-_ASBOX ++## ----------- ##" + echo + cat confdefs.h + echo +@@ -1998,46 +2389,53 @@ exit $exit_status ' 0 for ac_signal in 1 2 13 15; do @@ -1868,7 +2236,20 @@ Index: pam.debian/configure # Let the site file select an alternate cache file if it wants to. # Prefer an explicitly selected file to automatically selected ones. -@@ -2045,8 +2438,8 @@ + ac_site_file1=NONE + ac_site_file2=NONE + if test -n "$CONFIG_SITE"; then +- ac_site_file1=$CONFIG_SITE ++ # We do not want a PATH search for config.site. ++ case $CONFIG_SITE in #(( ++ -*) ac_site_file1=./$CONFIG_SITE;; ++ */*) ac_site_file1=$CONFIG_SITE;; ++ *) ac_site_file1=./$CONFIG_SITE;; ++ esac + elif test "x$prefix" != xNONE; then + ac_site_file1=$prefix/share/config.site + ac_site_file2=$prefix/etc/config.site +@@ -2048,19 +2446,23 @@ for ac_site_file in "$ac_site_file1" "$ac_site_file2" do test "x$ac_site_file" = xNONE && continue @@ -1878,8 +2259,13 @@ Index: pam.debian/configure + { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 $as_echo "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 - . "$ac_site_file" -@@ -2054,10 +2447,10 @@ +- . "$ac_site_file" ++ . "$ac_site_file" \ ++ || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++as_fn_error $? "failed to load site script $ac_site_file ++See \`config.log' for more details" "$LINENO" 5 ; } + fi done if test -r "$cache_file"; then @@ -1894,7 +2280,7 @@ Index: pam.debian/configure $as_echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in [\\/]* | ?:[\\/]* ) . "$cache_file";; -@@ -2065,7 +2458,7 @@ +@@ -2068,7 +2470,7 @@ esac fi else @@ -1903,7 +2289,7 @@ Index: pam.debian/configure $as_echo "$as_me: creating cache $cache_file" >&6;} >$cache_file fi -@@ -2081,11 +2474,11 @@ +@@ -2084,11 +2486,11 @@ eval ac_new_val=\$ac_env_${ac_var}_value case $ac_old_set,$ac_new_set in set,) @@ -1917,7 +2303,7 @@ Index: pam.debian/configure $as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_cache_corrupted=: ;; ,);; -@@ -2095,17 +2488,17 @@ +@@ -2098,17 +2500,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 @@ -1939,7 +2325,7 @@ Index: pam.debian/configure $as_echo "$as_me: current value: \`$ac_new_val'" >&2;} fi;; esac -@@ -2117,35 +2510,20 @@ +@@ -2120,45 +2522,30 @@ esac case " $ac_configure_args " in *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. @@ -1958,8 +2344,20 @@ Index: pam.debian/configure - { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 -$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} - { (exit 1); exit 1; }; } -+ as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 ++ as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 fi ++## -------------------- ## ++## Main body of script. ## ++## -------------------- ## + ++ac_ext=c ++ac_cpp='$CPP $CPPFLAGS' ++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 + + + - - - @@ -1973,49 +2371,31 @@ Index: pam.debian/configure - - - +-ac_ext=c +-ac_cpp='$CPP $CPPFLAGS' +-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 - - - -+## -------------------- ## -+## Main body of script. ## -+## -------------------- ## - - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' -@@ -2159,24 +2537,16 @@ +-am__api_version='1.10' ++am__api_version='1.10' ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do -- if test -f "$ac_dir/install-sh"; then -- ac_aux_dir=$ac_dir -- ac_install_sh="$ac_aux_dir/install-sh -c" -- break -- elif test -f "$ac_dir/install.sh"; then -- ac_aux_dir=$ac_dir -- ac_install_sh="$ac_aux_dir/install.sh -c" -- break -- elif test -f "$ac_dir/shtool"; then -- ac_aux_dir=$ac_dir -- ac_install_sh="$ac_aux_dir/shtool install -c" -- break -- fi -+ for ac_t in install-sh install.sh shtool; do -+ if test -f "$ac_dir/$ac_t"; then -+ ac_aux_dir=$ac_dir -+ ac_install_sh="$ac_aux_dir/$ac_t -c" -+ break 2 -+ fi -+ done +@@ -2177,9 +2564,7 @@ + fi done if test -z "$ac_aux_dir"; then - { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5 -$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;} - { (exit 1); exit 1; }; } -+ as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 ++ as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 fi # These three variables are undocumented and unsupported, -@@ -2202,10 +2572,10 @@ +@@ -2205,10 +2590,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. @@ -2028,7 +2408,7 @@ Index: pam.debian/configure $as_echo_n "(cached) " >&6 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -@@ -2213,11 +2583,11 @@ +@@ -2216,11 +2601,11 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -2044,7 +2424,7 @@ Index: pam.debian/configure /usr/ucb/* ) ;; *) # OSF1 and SCO ODT 3.0 have their own names for install. -@@ -2254,7 +2624,7 @@ +@@ -2257,7 +2642,7 @@ ;; esac @@ -2053,7 +2433,7 @@ Index: pam.debian/configure IFS=$as_save_IFS rm -rf conftest.one conftest.two conftest.dir -@@ -2270,7 +2640,7 @@ +@@ -2273,7 +2658,7 @@ INSTALL=$ac_install_sh fi fi @@ -2062,7 +2442,7 @@ Index: pam.debian/configure $as_echo "$INSTALL" >&6; } # Use test -z because SunOS4 sh mishandles braces in ${var-val}. -@@ -2281,7 +2651,7 @@ +@@ -2284,7 +2669,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' @@ -2071,25 +2451,7 @@ Index: pam.debian/configure $as_echo_n "checking whether build environment is sane... " >&6; } # Just in case sleep 1 -@@ -2292,15 +2662,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 +2688,8 @@ +@@ -2308,11 +2693,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". @@ -2098,12 +2460,12 @@ Index: pam.debian/configure -$as_echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken -alias in your environment" >&2;} - { (exit 1); exit 1; }; } -+ as_fn_error "ls -t appears to fail. Make sure there is not a broken ++ as_fn_error $? "ls -t appears to fail. Make sure there is not a broken +alias in your environment" "$LINENO" 5 fi test "$2" = conftest.file -@@ -2335,13 +2698,10 @@ +@@ -2321,13 +2703,10 @@ # Ok. : else @@ -2112,7 +2474,7 @@ Index: pam.debian/configure -$as_echo "$as_me: error: newly created file is older than distributed files! -Check your system clock" >&2;} - { (exit 1); exit 1; }; } -+ as_fn_error "newly created file is older than distributed files! ++ as_fn_error $? "newly created file is older than distributed files! +Check your system clock" "$LINENO" 5 fi -{ $as_echo "$as_me:$LINENO: result: yes" >&5 @@ -2120,7 +2482,7 @@ Index: pam.debian/configure $as_echo "yes" >&6; } test "$program_prefix" != NONE && program_transform_name="s&^&$program_prefix&;$program_transform_name" -@@ -2369,7 +2729,7 @@ +@@ -2348,14 +2727,116 @@ am_missing_run="$MISSING --run " else am_missing_run= @@ -2129,104 +2491,109 @@ Index: pam.debian/configure $as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} fi -@@ -2390,9 +2750,9 @@ - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. - set dummy ${ac_tool_prefix}strip; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5 ++install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} ++ ++# Installed binaries are usually stripped using `strip' when the user ++# run `make install-strip'. However `strip' might not be the right ++# tool to use in cross-compilation environments, therefore Automake ++# will honor the `STRIP' environment variable to overrule this program. ++if test "$cross_compiling" != no; then ++ 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:${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 ++$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_STRIP+set}" = set; then : - $as_echo_n "(cached) " >&6 - else - if test -n "$STRIP"; then -@@ -2403,24 +2763,24 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$STRIP"; then ++ ac_cv_prog_STRIP="$STRIP" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. + 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 ++ 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:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done ++ break 2 ++ fi ++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 ++IFS=$as_save_IFS ++ ++fi ++fi ++STRIP=$ac_cv_prog_STRIP ++if test -n "$STRIP"; then + { $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 "$STRIP" >&6; } ++else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - fi - -@@ -2430,9 +2790,9 @@ - ac_ct_STRIP=$STRIP - # Extract the first word of "strip", so it can be a program name with args. - set dummy strip; ac_word=$2 --{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++fi ++if test -z "$ac_cv_prog_STRIP"; then ++ 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:${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 ++$as_echo_n "checking for $ac_word... " >&6; } +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 +2803,24 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$ac_ct_STRIP"; then ++ ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. + 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 ++ 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:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done ++ break 2 ++ fi ++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 ++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:${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 "$ac_ct_STRIP" >&6; } ++else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - fi - -@@ -2469,7 +2829,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 "no" >&6; } ++fi ++ ++ if test "x$ac_ct_STRIP" = x; then ++ STRIP=":" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) +{ $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 +2842,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: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ac_tool_warned=yes ;; ++esac ++ STRIP=$ac_ct_STRIP ++ fi ++else ++ STRIP="$ac_cv_prog_STRIP" ++fi ++ ++fi ++INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" ++ +{ $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; } if test -z "$MKDIR_P"; then @@ -2235,7 +2602,7 @@ Index: pam.debian/configure $as_echo_n "(cached) " >&6 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -@@ -2493,7 +2853,7 @@ +@@ -2363,7 +2844,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -2244,7 +2611,7 @@ Index: pam.debian/configure for ac_exec_ext in '' $ac_executable_extensions; do { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( -@@ -2505,11 +2865,12 @@ +@@ -2375,11 +2856,12 @@ esac done done @@ -2258,7 +2625,7 @@ Index: pam.debian/configure if test "${ac_cv_path_mkdir+set}" = set; then MKDIR_P="$ac_cv_path_mkdir -p" else -@@ -2517,11 +2878,10 @@ +@@ -2387,11 +2869,10 @@ # value for MKDIR_P within a source directory, because that will # break other packages using the cache if that directory is # removed, or if the value is a relative name. @@ -2271,7 +2638,7 @@ Index: pam.debian/configure $as_echo "$MKDIR_P" >&6; } mkdir_p="$MKDIR_P" -@@ -2534,9 +2894,9 @@ +@@ -2404,9 +2885,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 @@ -2283,7 +2650,7 @@ Index: pam.debian/configure $as_echo_n "(cached) " >&6 else if test -n "$AWK"; then -@@ -2547,24 +2907,24 @@ +@@ -2417,24 +2898,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -2313,7 +2680,7 @@ Index: pam.debian/configure $as_echo "no" >&6; } fi -@@ -2572,11 +2932,11 @@ +@@ -2442,11 +2923,11 @@ test -n "$AWK" && break done @@ -2323,11 +2690,20 @@ Index: pam.debian/configure set x ${MAKE-make} ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then -+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then : $as_echo_n "(cached) " >&6 else cat >conftest.make <<\_ACEOF -@@ -2594,11 +2954,11 @@ +@@ -2454,7 +2935,7 @@ + all: + @echo '@@@%%%=$(MAKE)=@@@%%%' + _ACEOF +-# GNU make sometimes prints "make[1]: Entering...", which would confuse us. ++# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. + case `${MAKE-make} -f conftest.make 2>/dev/null` in + *@@@%%%=?*=@@@%%%*) + eval ac_cv_prog_make_${ac_make}_set=yes;; +@@ -2464,11 +2945,11 @@ rm -f conftest.make fi if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then @@ -2341,25 +2717,134 @@ Index: pam.debian/configure $as_echo "no" >&6; } SET_MAKE="MAKE=${MAKE-make}" fi -@@ -2618,9 +2978,7 @@ +@@ -2488,9 +2969,7 @@ am__isrc=' -I$(srcdir)' # test to see if srcdir already configured if test -f $srcdir/config.status; then - { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 -$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} - { (exit 1); exit 1; }; } -+ as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 ++ as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 fi fi -@@ -2682,35 +3040,27 @@ +@@ -2534,108 +3013,6 @@ + + MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} + +-install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} +- +-# Installed binaries are usually stripped using `strip' when the user +-# run `make install-strip'. However `strip' might not be the right +-# tool to use in cross-compilation environments, therefore Automake +-# will honor the `STRIP' environment variable to overrule this program. +-if test "$cross_compiling" != no; then +- 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_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_STRIP+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- if test -n "$STRIP"; then +- ac_cv_prog_STRIP="$STRIP" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- 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 +- break 2 +- fi +-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 "$STRIP" >&6; } +-else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- +-fi +-if test -z "$ac_cv_prog_STRIP"; then +- 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_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- if test -n "$ac_ct_STRIP"; then +- ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- 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 +- break 2 +- fi +-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 "$ac_ct_STRIP" >&6; } +-else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- if test "x$ac_ct_STRIP" = x; then +- STRIP=":" +- 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: WARNING: using cross tools not prefixed with host triplet" >&2;} +-ac_tool_warned=yes ;; +-esac +- STRIP=$ac_ct_STRIP +- fi +-else +- STRIP="$ac_cv_prog_STRIP" +-fi +- +-fi +-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" +- + # We need awk for the "check" target. The system "awk" is bad on + # some platforms. + # Always define AMTAR for backward compatibility. +@@ -2654,35 +3031,27 @@ # Make sure we can run config.sub. $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || - { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 -$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;} - { (exit 1); exit 1; }; } -+ as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 ++ as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 -{ $as_echo "$as_me:$LINENO: checking build system type" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 @@ -2375,12 +2860,12 @@ Index: pam.debian/configure - { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 -$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;} - { (exit 1); exit 1; }; } -+ as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5 ++ as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || - { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5 -$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;} - { (exit 1); exit 1; }; } -+ as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 ++ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5 @@ -2391,11 +2876,11 @@ Index: pam.debian/configure -*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5 -$as_echo "$as_me: error: invalid value of canonical build" >&2;} - { (exit 1); exit 1; }; };; -+*) as_fn_error "invalid value of canonical build" "$LINENO" 5;; ++*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;; esac build=$ac_cv_build ac_save_IFS=$IFS; IFS='-' -@@ -2726,28 +3076,24 @@ +@@ -2698,28 +3067,24 @@ case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac @@ -2413,7 +2898,7 @@ Index: pam.debian/configure - { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 -$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;} - { (exit 1); exit 1; }; } -+ as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 ++ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 fi fi @@ -2425,11 +2910,11 @@ Index: pam.debian/configure -*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 -$as_echo "$as_me: error: invalid value of canonical host" >&2;} - { (exit 1); exit 1; }; };; -+*) as_fn_error "invalid value of canonical host" "$LINENO" 5;; ++*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;; esac host=$ac_cv_host ac_save_IFS=$IFS; IFS='-' -@@ -2806,7 +3152,7 @@ +@@ -2778,7 +3143,7 @@ fi # Check whether --enable-static-modules was given. @@ -2438,7 +2923,7 @@ Index: pam.debian/configure enableval=$enable_static_modules; STATIC_MODULES=$enableval else STATIC_MODULES=no -@@ -2815,7 +3161,7 @@ +@@ -2787,7 +3152,7 @@ if test "$STATIC_MODULES" != "no" ; then CFLAGS="$CFLAGS -DPAM_STATIC" # Check whether --enable-static was given. @@ -2447,7 +2932,7 @@ Index: pam.debian/configure enableval=$enable_static; p=${PACKAGE-default} case $enableval in yes) enable_static=yes ;; -@@ -2846,7 +3192,7 @@ +@@ -2818,7 +3183,7 @@ # Check whether --enable-shared was given. @@ -2456,7 +2941,7 @@ Index: pam.debian/configure enableval=$enable_shared; p=${PACKAGE-default} case $enableval in yes) enable_shared=yes ;; -@@ -2879,7 +3225,7 @@ +@@ -2851,7 +3216,7 @@ else # per default don't build static libraries # Check whether --enable-static was given. @@ -2465,7 +2950,7 @@ Index: pam.debian/configure enableval=$enable_static; p=${PACKAGE-default} case $enableval in yes) enable_static=yes ;; -@@ -2907,7 +3253,7 @@ +@@ -2879,7 +3244,7 @@ # Check whether --enable-shared was given. @@ -2474,7 +2959,7 @@ Index: pam.debian/configure enableval=$enable_shared; p=${PACKAGE-default} case $enableval in yes) enable_shared=yes ;; -@@ -2956,7 +3302,7 @@ +@@ -2928,7 +3293,7 @@ .PHONY: am__doit END # If we don't find an include directive, just comment out the code. @@ -2483,7 +2968,7 @@ Index: pam.debian/configure $as_echo_n "checking for style of include used by $am_make... " >&6; } am__include="#" am__quote= -@@ -2984,12 +3330,12 @@ +@@ -2956,12 +3321,12 @@ fi @@ -2498,7 +2983,7 @@ Index: pam.debian/configure enableval=$enable_dependency_tracking; fi -@@ -3014,9 +3360,9 @@ +@@ -2986,9 +3351,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 @@ -2510,7 +2995,7 @@ Index: pam.debian/configure $as_echo_n "(cached) " >&6 else if test -n "$CC"; then -@@ -3027,24 +3373,24 @@ +@@ -2999,24 +3364,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -2540,7 +3025,7 @@ Index: pam.debian/configure $as_echo "no" >&6; } fi -@@ -3054,9 +3400,9 @@ +@@ -3026,9 +3391,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 @@ -2552,7 +3037,7 @@ Index: pam.debian/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then -@@ -3067,24 +3413,24 @@ +@@ -3039,24 +3404,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -2582,7 +3067,7 @@ Index: pam.debian/configure $as_echo "no" >&6; } fi -@@ -3093,7 +3439,7 @@ +@@ -3065,7 +3430,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -2591,7 +3076,7 @@ Index: pam.debian/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -3107,9 +3453,9 @@ +@@ -3079,9 +3444,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 @@ -2603,7 +3088,7 @@ Index: pam.debian/configure $as_echo_n "(cached) " >&6 else if test -n "$CC"; then -@@ -3120,24 +3466,24 @@ +@@ -3092,24 +3457,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -2633,7 +3118,7 @@ Index: pam.debian/configure $as_echo "no" >&6; } fi -@@ -3147,9 +3493,9 @@ +@@ -3119,9 +3484,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 @@ -2645,7 +3130,7 @@ Index: pam.debian/configure $as_echo_n "(cached) " >&6 else if test -n "$CC"; then -@@ -3161,18 +3507,18 @@ +@@ -3133,18 +3498,18 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -2667,7 +3152,7 @@ Index: pam.debian/configure IFS=$as_save_IFS if test $ac_prog_rejected = yes; then -@@ -3191,10 +3537,10 @@ +@@ -3163,10 +3528,10 @@ fi CC=$ac_cv_prog_CC if test -n "$CC"; then @@ -2680,7 +3165,7 @@ Index: pam.debian/configure $as_echo "no" >&6; } fi -@@ -3206,9 +3552,9 @@ +@@ -3178,9 +3543,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 @@ -2692,7 +3177,7 @@ Index: pam.debian/configure $as_echo_n "(cached) " >&6 else if test -n "$CC"; then -@@ -3219,24 +3565,24 @@ +@@ -3191,24 +3556,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -2722,7 +3207,7 @@ Index: pam.debian/configure $as_echo "no" >&6; } fi -@@ -3250,9 +3596,9 @@ +@@ -3222,9 +3587,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 @@ -2734,7 +3219,7 @@ Index: pam.debian/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then -@@ -3263,24 +3609,24 @@ +@@ -3235,24 +3600,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -2764,7 +3249,7 @@ Index: pam.debian/configure $as_echo "no" >&6; } fi -@@ -3293,7 +3639,7 @@ +@@ -3265,7 +3630,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -2773,7 +3258,7 @@ Index: pam.debian/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -3304,57 +3650,37 @@ +@@ -3276,57 +3641,37 @@ fi @@ -2785,8 +3270,8 @@ Index: pam.debian/configure -$as_echo "$as_me: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } -+as_fn_error "no acceptable C compiler found in \$PATH -+See \`config.log' for more details." "$LINENO" 5; } ++as_fn_error $? "no acceptable C compiler found in \$PATH ++See \`config.log' for more details" "$LINENO" 5 ; } # Provide some information about the compiler. -$as_echo "$as_me:$LINENO: checking for C compiler version" >&5 @@ -2851,7 +3336,7 @@ Index: pam.debian/configure /* end confdefs.h. */ int -@@ -3370,8 +3696,8 @@ +@@ -3342,8 +3687,8 @@ # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. @@ -2862,7 +3347,7 @@ Index: pam.debian/configure ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` # The possible output files: -@@ -3387,17 +3713,17 @@ +@@ -3359,17 +3704,17 @@ done rm -f $ac_rmfiles @@ -2885,7 +3370,7 @@ Index: pam.debian/configure # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. # So ignore a value of `no', otherwise this would lead to `EXEEXT = no' # in a Makefile. We should not override ac_cv_exeext if it was cached, -@@ -3414,7 +3740,7 @@ +@@ -3386,7 +3731,7 @@ # certainly right. break;; *.* ) @@ -2894,7 +3379,7 @@ Index: pam.debian/configure then :; else ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` fi -@@ -3433,84 +3759,42 @@ +@@ -3405,84 +3750,41 @@ else ac_file='' fi @@ -2917,9 +3402,8 @@ Index: pam.debian/configure -$as_echo "$as_me: error: C compiler cannot create executables -See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; }; } -+{ as_fn_set_status 77 -+as_fn_error "C compiler cannot create executables -+See \`config.log' for more details." "$LINENO" 5; }; } ++as_fn_error 77 "C compiler cannot create executables ++See \`config.log' for more details" "$LINENO" 5 ; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } @@ -2940,9 +3424,15 @@ Index: pam.debian/configure -if test "$cross_compiling" != yes; then - if { ac_try='./$ac_file' - { (case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac ++rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out ++ac_clean_files=$ac_clean_files_save ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 ++$as_echo_n "checking for suffix of executables... " >&6; } ++if { { ac_try="$ac_link" ++case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 @@ -2969,8 +3459,8 @@ Index: pam.debian/configure -{ $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } - - rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out - ac_clean_files=$ac_clean_files_save +-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out +-ac_clean_files=$ac_clean_files_save -# Check that the compiler produces executables we can run. If not, either -# the compiler is broken, or we cross compile. -{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 @@ -2979,14 +3469,12 @@ Index: pam.debian/configure -$as_echo "$cross_compiling" >&6; } - -{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 - $as_echo_n "checking for suffix of executables... " >&6; } +-$as_echo_n "checking for suffix of executables... " >&6; } -if { (ac_try="$ac_link" -+if { { ac_try="$ac_link" - case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; - esac +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" @@ -3000,7 +3488,7 @@ Index: pam.debian/configure # If both `conftest.exe' and `conftest' are `present' (well, observable) # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will # work properly (i.e., refer to `conftest.exe'), while it won't with -@@ -3525,32 +3809,83 @@ +@@ -3497,32 +3799,83 @@ esac done else @@ -3012,8 +3500,8 @@ Index: pam.debian/configure -$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } -+as_fn_error "cannot compute suffix of executables: cannot compile and link -+See \`config.log' for more details." "$LINENO" 5; } ++as_fn_error $? "cannot compute suffix of executables: cannot compile and link ++See \`config.log' for more details" "$LINENO" 5 ; } fi - -rm -f conftest$ac_cv_exeext @@ -3074,9 +3562,9 @@ Index: pam.debian/configure + else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+as_fn_error "cannot run C compiled programs. ++as_fn_error $? "cannot run C compiled programs. +If you meant to cross compile, use \`--host'. -+See \`config.log' for more details." "$LINENO" 5; } ++See \`config.log' for more details" "$LINENO" 5 ; } + fi + fi +fi @@ -3100,7 +3588,7 @@ Index: pam.debian/configure /* end confdefs.h. */ int -@@ -3562,17 +3897,17 @@ +@@ -3534,17 +3887,17 @@ } _ACEOF rm -f conftest.o conftest.obj @@ -3123,7 +3611,7 @@ Index: pam.debian/configure for ac_file in conftest.o conftest.obj conftest.*; do test -f "$ac_file" || continue; case $ac_file in -@@ -3585,31 +3920,23 @@ +@@ -3557,31 +3910,23 @@ $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -3135,8 +3623,8 @@ Index: pam.debian/configure -$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } -+as_fn_error "cannot compute suffix of object files: cannot compile -+See \`config.log' for more details." "$LINENO" 5; } ++as_fn_error $? "cannot compute suffix of object files: cannot compile ++See \`config.log' for more details" "$LINENO" 5 ; } fi - rm -f conftest.$ac_cv_objext conftest.$ac_ext @@ -3162,7 +3650,7 @@ Index: pam.debian/configure /* end confdefs.h. */ int -@@ -3623,37 +3950,16 @@ +@@ -3595,37 +3940,16 @@ return 0; } _ACEOF @@ -3203,7 +3691,7 @@ Index: pam.debian/configure $as_echo "$ac_cv_c_compiler_gnu" >&6; } if test $ac_compiler_gnu = yes; then GCC=yes -@@ -3662,20 +3968,16 @@ +@@ -3634,20 +3958,16 @@ fi ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS @@ -3227,7 +3715,7 @@ Index: pam.debian/configure /* end confdefs.h. */ int -@@ -3686,35 +3988,11 @@ +@@ -3658,35 +3978,11 @@ return 0; } _ACEOF @@ -3266,7 +3754,7 @@ Index: pam.debian/configure /* end confdefs.h. */ int -@@ -3725,36 +4003,12 @@ +@@ -3697,36 +3993,12 @@ return 0; } _ACEOF @@ -3307,7 +3795,7 @@ Index: pam.debian/configure /* end confdefs.h. */ int -@@ -3765,42 +4019,17 @@ +@@ -3737,42 +4009,17 @@ return 0; } _ACEOF @@ -3352,7 +3840,7 @@ Index: pam.debian/configure $as_echo "$ac_cv_prog_cc_g" >&6; } if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS -@@ -3817,18 +4046,14 @@ +@@ -3789,18 +4036,14 @@ CFLAGS= fi fi @@ -3374,7 +3862,7 @@ Index: pam.debian/configure /* end confdefs.h. */ #include <stdarg.h> #include <stdio.h> -@@ -3885,32 +4110,9 @@ +@@ -3857,32 +4100,9 @@ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do CC="$ac_save_CC $ac_arg" @@ -3408,7 +3896,7 @@ Index: pam.debian/configure rm -f core conftest.err conftest.$ac_objext test "x$ac_cv_prog_cc_c89" != "xno" && break done -@@ -3921,17 +4123,19 @@ +@@ -3893,17 +4113,19 @@ # AC_CACHE_VAL case "x$ac_cv_prog_cc_c89" in x) @@ -3431,7 +3919,7 @@ Index: pam.debian/configure ac_ext=c ac_cpp='$CPP $CPPFLAGS' -@@ -3941,9 +4145,9 @@ +@@ -3913,9 +4135,9 @@ depcc="$CC" am_compiler_list= @@ -3443,7 +3931,67 @@ Index: pam.debian/configure $as_echo_n "(cached) " >&6 else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then -@@ -4051,7 +4255,7 @@ +@@ -3941,6 +4163,11 @@ + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` + fi ++ am__universal=false ++ case " $depcc " in #( ++ *\ -arch\ *\ -arch\ *) am__universal=true ;; ++ esac ++ + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and +@@ -3958,7 +4185,17 @@ + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + ++ # We check with `-c' and `-o' for the sake of the "dashmstdout" ++ # mode. It turns out that the SunPro C++ compiler does not properly ++ # handle `-M -o', and we need to detect this. Also, some Intel ++ # versions had trouble with output in subdirs ++ am__obj=sub/conftest.${OBJEXT-o} ++ am__minus_obj="-o $am__obj" + case $depmode in ++ gcc) ++ # This depmode causes a compiler race in universal mode. ++ test "$am__universal" = false || continue ++ ;; + nosideeffect) + # after this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested +@@ -3968,19 +4205,23 @@ + break + fi + ;; ++ msvisualcpp | msvcmsys) ++ # This compiler won't grok `-c -o', but also, the minuso test has ++ # not run yet. These depmodes are late enough in the game, and ++ # so weak that their functioning should not be impacted. ++ am__obj=conftest.${OBJEXT-o} ++ am__minus_obj= ++ ;; + none) break ;; + esac +- # We check with `-c' and `-o' for the sake of the "dashmstdout" +- # mode. It turns out that the SunPro C++ compiler does not properly +- # handle `-M -o', and we need to detect this. + if depmode=$depmode \ +- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ ++ source=sub/conftest.c object=$am__obj \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ +- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ ++ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && +- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ++ grep $am__obj sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message +@@ -4004,7 +4245,7 @@ fi fi @@ -3452,7 +4000,7 @@ Index: pam.debian/configure $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type -@@ -4072,14 +4276,14 @@ +@@ -4025,14 +4266,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 @@ -3469,7 +4017,7 @@ Index: pam.debian/configure $as_echo_n "(cached) " >&6 else # Double quotes because CPP needs to be expanded -@@ -4094,11 +4298,7 @@ +@@ -4047,11 +4288,7 @@ # <limits.h> 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. @@ -3482,7 +4030,7 @@ Index: pam.debian/configure /* end confdefs.h. */ #ifdef __STDC__ # include <limits.h> -@@ -4107,78 +4307,34 @@ +@@ -4060,78 +4297,34 @@ #endif Syntax error _ACEOF @@ -3514,7 +4062,8 @@ Index: pam.debian/configure continue fi - - rm -f conftest.err conftest.$ac_ext +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.err conftest.i conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. @@ -3556,17 +4105,19 @@ Index: pam.debian/configure break fi - - rm -f conftest.err conftest.$ac_ext +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.err conftest.i conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. - rm -f conftest.err conftest.$ac_ext +-rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then ++rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok; then : break fi -@@ -4190,7 +4346,7 @@ +@@ -4143,7 +4336,7 @@ else ac_cv_prog_CPP=$CPP fi @@ -3575,7 +4126,7 @@ Index: pam.debian/configure $as_echo "$CPP" >&6; } ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes -@@ -4201,11 +4357,7 @@ +@@ -4154,11 +4347,7 @@ # <limits.h> 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. @@ -3588,7 +4139,7 @@ Index: pam.debian/configure /* end confdefs.h. */ #ifdef __STDC__ # include <limits.h> -@@ -4214,87 +4366,40 @@ +@@ -4167,87 +4356,40 @@ #endif Syntax error _ACEOF @@ -3620,7 +4171,8 @@ Index: pam.debian/configure continue fi - - rm -f conftest.err conftest.$ac_ext +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.err conftest.i conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. @@ -3662,13 +4214,15 @@ Index: pam.debian/configure break fi - - rm -f conftest.err conftest.$ac_ext +-rm -f conftest.err conftest.$ac_ext ++rm -f conftest.err conftest.i conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. - rm -f conftest.err conftest.$ac_ext +-rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - : ++rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok; then : + else @@ -3680,12 +4234,12 @@ Index: pam.debian/configure -$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } -+as_fn_error "C preprocessor \"$CPP\" fails sanity check -+See \`config.log' for more details." "$LINENO" 5; } ++as_fn_error $? "C preprocessor \"$CPP\" fails sanity check ++See \`config.log' for more details" "$LINENO" 5 ; } fi ac_ext=c -@@ -4304,9 +4409,9 @@ +@@ -4257,9 +4399,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu @@ -3697,7 +4251,7 @@ Index: pam.debian/configure $as_echo_n "(cached) " >&6 else if test -z "$GREP"; then -@@ -4317,7 +4422,7 @@ +@@ -4270,7 +4412,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -3706,7 +4260,7 @@ Index: pam.debian/configure for ac_exec_ext in '' $ac_executable_extensions; do ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue -@@ -4337,7 +4442,7 @@ +@@ -4290,7 +4432,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 @@ -3715,7 +4269,7 @@ Index: pam.debian/configure if test $ac_count -gt ${ac_path_GREP_max-0}; then # Best one so far, save it but keep looking for a better one ac_cv_path_GREP="$ac_path_GREP" -@@ -4352,26 +4457,24 @@ +@@ -4305,26 +4447,24 @@ $ac_path_GREP_found && break 3 done done @@ -3726,7 +4280,7 @@ Index: pam.debian/configure - { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} - { (exit 1); exit 1; }; } -+ as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 ++ as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else ac_cv_path_GREP=$GREP @@ -3747,7 +4301,7 @@ Index: pam.debian/configure $as_echo_n "(cached) " >&6 else if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 -@@ -4385,7 +4488,7 @@ +@@ -4338,7 +4478,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -3756,7 +4310,7 @@ Index: pam.debian/configure for ac_exec_ext in '' $ac_executable_extensions; do ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue -@@ -4405,7 +4508,7 @@ +@@ -4358,7 +4498,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 @@ -3765,7 +4319,7 @@ Index: pam.debian/configure if test $ac_count -gt ${ac_path_EGREP_max-0}; then # Best one so far, save it but keep looking for a better one ac_cv_path_EGREP="$ac_path_EGREP" -@@ -4420,12 +4523,10 @@ +@@ -4373,12 +4513,10 @@ $ac_path_EGREP_found && break 3 done done @@ -3776,11 +4330,11 @@ Index: pam.debian/configure - { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} - { (exit 1); exit 1; }; } -+ as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 ++ as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else ac_cv_path_EGREP=$EGREP -@@ -4433,21 +4534,17 @@ +@@ -4386,21 +4524,17 @@ fi fi @@ -3806,7 +4360,7 @@ Index: pam.debian/configure /* end confdefs.h. */ #include <stdlib.h> #include <stdarg.h> -@@ -4462,48 +4559,23 @@ +@@ -4415,48 +4549,23 @@ return 0; } _ACEOF @@ -3860,7 +4414,7 @@ Index: pam.debian/configure else ac_cv_header_stdc=no fi -@@ -4513,18 +4585,14 @@ +@@ -4466,18 +4575,14 @@ if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. @@ -3882,7 +4436,7 @@ Index: pam.debian/configure else ac_cv_header_stdc=no fi -@@ -4534,14 +4602,10 @@ +@@ -4487,14 +4592,10 @@ if test $ac_cv_header_stdc = yes; then # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. @@ -3899,7 +4453,7 @@ Index: pam.debian/configure /* end confdefs.h. */ #include <ctype.h> #include <stdlib.h> -@@ -4568,118 +4632,34 @@ +@@ -4521,118 +4622,33 @@ return 0; } _ACEOF @@ -4026,12 +4580,11 @@ Index: pam.debian/configure + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default +" -+eval as_val=\$$as_ac_Header -+ if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF -@@ -4690,134 +4670,8 @@ +@@ -4643,134 +4659,8 @@ @@ -4168,7 +4721,7 @@ Index: pam.debian/configure MINIX=yes else MINIX= -@@ -4826,34 +4680,23 @@ +@@ -4779,34 +4669,23 @@ if test "$MINIX" = yes; then @@ -4209,7 +4762,7 @@ Index: pam.debian/configure /* end confdefs.h. */ # define __EXTENSIONS__ 1 -@@ -4866,56 +4709,25 @@ +@@ -4819,56 +4698,25 @@ return 0; } _ACEOF @@ -4274,7 +4827,7 @@ Index: pam.debian/configure ac_ext=c -@@ -4926,9 +4738,9 @@ +@@ -4879,9 +4727,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 @@ -4286,7 +4839,7 @@ Index: pam.debian/configure $as_echo_n "(cached) " >&6 else if test -n "$CC"; then -@@ -4939,24 +4751,24 @@ +@@ -4892,24 +4740,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -4316,7 +4869,7 @@ Index: pam.debian/configure $as_echo "no" >&6; } fi -@@ -4966,9 +4778,9 @@ +@@ -4919,9 +4767,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 @@ -4328,7 +4881,7 @@ Index: pam.debian/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then -@@ -4979,24 +4791,24 @@ +@@ -4932,24 +4780,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -4358,7 +4911,7 @@ Index: pam.debian/configure $as_echo "no" >&6; } fi -@@ -5005,7 +4817,7 @@ +@@ -4958,7 +4806,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -4367,7 +4920,7 @@ Index: pam.debian/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -5019,9 +4831,9 @@ +@@ -4972,9 +4820,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 @@ -4379,7 +4932,7 @@ Index: pam.debian/configure $as_echo_n "(cached) " >&6 else if test -n "$CC"; then -@@ -5032,24 +4844,24 @@ +@@ -4985,24 +4833,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -4409,7 +4962,7 @@ Index: pam.debian/configure $as_echo "no" >&6; } fi -@@ -5059,9 +4871,9 @@ +@@ -5012,9 +4860,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 @@ -4421,7 +4974,7 @@ Index: pam.debian/configure $as_echo_n "(cached) " >&6 else if test -n "$CC"; then -@@ -5073,18 +4885,18 @@ +@@ -5026,18 +4874,18 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -4443,7 +4996,7 @@ Index: pam.debian/configure IFS=$as_save_IFS if test $ac_prog_rejected = yes; then -@@ -5103,10 +4915,10 @@ +@@ -5056,10 +4904,10 @@ fi CC=$ac_cv_prog_CC if test -n "$CC"; then @@ -4456,7 +5009,7 @@ Index: pam.debian/configure $as_echo "no" >&6; } fi -@@ -5118,9 +4930,9 @@ +@@ -5071,9 +4919,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 @@ -4468,7 +5021,7 @@ Index: pam.debian/configure $as_echo_n "(cached) " >&6 else if test -n "$CC"; then -@@ -5131,24 +4943,24 @@ +@@ -5084,24 +4932,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -4498,7 +5051,7 @@ Index: pam.debian/configure $as_echo "no" >&6; } fi -@@ -5162,9 +4974,9 @@ +@@ -5115,9 +4963,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 @@ -4510,7 +5063,7 @@ Index: pam.debian/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then -@@ -5175,24 +4987,24 @@ +@@ -5128,24 +4976,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -4540,7 +5093,7 @@ Index: pam.debian/configure $as_echo "no" >&6; } fi -@@ -5205,7 +5017,7 @@ +@@ -5158,7 +5006,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -4549,7 +5102,7 @@ Index: pam.debian/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -5216,62 +5028,42 @@ +@@ -5169,62 +5017,42 @@ fi @@ -4561,8 +5114,8 @@ Index: pam.debian/configure -$as_echo "$as_me: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } -+as_fn_error "no acceptable C compiler found in \$PATH -+See \`config.log' for more details." "$LINENO" 5; } ++as_fn_error $? "no acceptable C compiler found in \$PATH ++See \`config.log' for more details" "$LINENO" 5 ; } # Provide some information about the compiler. -$as_echo "$as_me:$LINENO: checking for C compiler version" >&5 @@ -4634,7 +5187,7 @@ Index: pam.debian/configure /* end confdefs.h. */ int -@@ -5285,37 +5077,16 @@ +@@ -5238,37 +5066,16 @@ return 0; } _ACEOF @@ -4675,7 +5228,7 @@ Index: pam.debian/configure $as_echo "$ac_cv_c_compiler_gnu" >&6; } if test $ac_compiler_gnu = yes; then GCC=yes -@@ -5324,20 +5095,16 @@ +@@ -5277,20 +5084,16 @@ fi ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS @@ -4699,7 +5252,7 @@ Index: pam.debian/configure /* end confdefs.h. */ int -@@ -5348,35 +5115,11 @@ +@@ -5301,35 +5104,11 @@ return 0; } _ACEOF @@ -4738,7 +5291,7 @@ Index: pam.debian/configure /* end confdefs.h. */ int -@@ -5387,36 +5130,12 @@ +@@ -5340,36 +5119,12 @@ return 0; } _ACEOF @@ -4779,7 +5332,7 @@ Index: pam.debian/configure /* end confdefs.h. */ int -@@ -5427,42 +5146,17 @@ +@@ -5380,42 +5135,17 @@ return 0; } _ACEOF @@ -4824,7 +5377,7 @@ Index: pam.debian/configure $as_echo "$ac_cv_prog_cc_g" >&6; } if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS -@@ -5479,18 +5173,14 @@ +@@ -5432,18 +5162,14 @@ CFLAGS= fi fi @@ -4846,7 +5399,7 @@ Index: pam.debian/configure /* end confdefs.h. */ #include <stdarg.h> #include <stdio.h> -@@ -5547,32 +5237,9 @@ +@@ -5500,32 +5226,9 @@ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do CC="$ac_save_CC $ac_arg" @@ -4880,7 +5433,7 @@ Index: pam.debian/configure rm -f core conftest.err conftest.$ac_objext test "x$ac_cv_prog_cc_c89" != "xno" && break done -@@ -5583,17 +5250,19 @@ +@@ -5536,17 +5239,19 @@ # AC_CACHE_VAL case "x$ac_cv_prog_cc_c89" in x) @@ -4903,7 +5456,7 @@ Index: pam.debian/configure ac_ext=c ac_cpp='$CPP $CPPFLAGS' -@@ -5603,9 +5272,9 @@ +@@ -5556,9 +5261,9 @@ depcc="$CC" am_compiler_list= @@ -4915,7 +5468,67 @@ Index: pam.debian/configure $as_echo_n "(cached) " >&6 else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then -@@ -5713,7 +5382,7 @@ +@@ -5584,6 +5289,11 @@ + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` + fi ++ am__universal=false ++ case " $depcc " in #( ++ *\ -arch\ *\ -arch\ *) am__universal=true ;; ++ esac ++ + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and +@@ -5601,7 +5311,17 @@ + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + ++ # We check with `-c' and `-o' for the sake of the "dashmstdout" ++ # mode. It turns out that the SunPro C++ compiler does not properly ++ # handle `-M -o', and we need to detect this. Also, some Intel ++ # versions had trouble with output in subdirs ++ am__obj=sub/conftest.${OBJEXT-o} ++ am__minus_obj="-o $am__obj" + case $depmode in ++ gcc) ++ # This depmode causes a compiler race in universal mode. ++ test "$am__universal" = false || continue ++ ;; + nosideeffect) + # after this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested +@@ -5611,19 +5331,23 @@ + break + fi + ;; ++ msvisualcpp | msvcmsys) ++ # This compiler won't grok `-c -o', but also, the minuso test has ++ # not run yet. These depmodes are late enough in the game, and ++ # so weak that their functioning should not be impacted. ++ am__obj=conftest.${OBJEXT-o} ++ am__minus_obj= ++ ;; + none) break ;; + esac +- # We check with `-c' and `-o' for the sake of the "dashmstdout" +- # mode. It turns out that the SunPro C++ compiler does not properly +- # handle `-M -o', and we need to detect this. + if depmode=$depmode \ +- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ ++ source=sub/conftest.c object=$am__obj \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ +- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ ++ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && +- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ++ grep $am__obj sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message +@@ -5647,7 +5371,7 @@ fi fi @@ -4924,7 +5537,7 @@ Index: pam.debian/configure $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type -@@ -5732,9 +5401,9 @@ +@@ -5666,9 +5390,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 @@ -4936,7 +5549,7 @@ Index: pam.debian/configure $as_echo_n "(cached) " >&6 else if test -n "$YACC"; then -@@ -5745,24 +5414,24 @@ +@@ -5679,24 +5403,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -4966,7 +5579,7 @@ Index: pam.debian/configure $as_echo "no" >&6; } fi -@@ -5775,9 +5444,9 @@ +@@ -5709,9 +5433,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 @@ -4978,7 +5591,7 @@ Index: pam.debian/configure $as_echo_n "(cached) " >&6 else if test -n "$LEX"; then -@@ -5788,24 +5457,24 @@ +@@ -5722,24 +5446,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -5008,7 +5621,7 @@ Index: pam.debian/configure $as_echo "no" >&6; } fi -@@ -5834,20 +5503,20 @@ +@@ -5768,20 +5492,20 @@ return ! yylex () + ! yywrap (); } _ACEOF @@ -5036,14 +5649,14 @@ Index: pam.debian/configure $as_echo_n "(cached) " >&6 else -@@ -5856,19 +5525,17 @@ +@@ -5790,19 +5514,17 @@ elif test -f lexyy.c; then ac_cv_prog_lex_root=lexyy else - { { $as_echo "$as_me:$LINENO: error: cannot find output from $LEX; giving up" >&5 -$as_echo "$as_me: error: cannot find output from $LEX; giving up" >&2;} - { (exit 1); exit 1; }; } -+ as_fn_error "cannot find output from $LEX; giving up" "$LINENO" 5 ++ as_fn_error $? "cannot find output from $LEX; giving up" "$LINENO" 5 fi fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_lex_root" >&5 @@ -5060,7 +5673,7 @@ Index: pam.debian/configure $as_echo_n "(cached) " >&6 else -@@ -5876,55 +5543,29 @@ +@@ -5810,55 +5532,29 @@ ac_cv_lib_lex='none needed' for ac_lib in '' -lfl -ll; do LIBS="$ac_lib $ac_save_LIBS" @@ -5124,7 +5737,7 @@ Index: pam.debian/configure $as_echo_n "(cached) " >&6 else # POSIX says lex can declare yytext either as a pointer or an array; the -@@ -5933,52 +5574,24 @@ +@@ -5867,52 +5563,24 @@ ac_cv_prog_lex_yytext_pointer=no ac_save_LIBS=$LIBS LIBS="$LEXLIB $ac_save_LIBS" @@ -5184,7 +5797,7 @@ Index: pam.debian/configure fi rm -f conftest.l $LEX_OUTPUT_ROOT.c -@@ -5987,115 +5600,23 @@ +@@ -5921,115 +5589,23 @@ if test "$LEX" = :; then LEX=${am_missing_run}flex fi @@ -5301,11 +5914,20 @@ Index: pam.debian/configure set x ${MAKE-make} ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then -+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then : $as_echo_n "(cached) " >&6 else cat >conftest.make <<\_ACEOF -@@ -6113,25 +5634,25 @@ +@@ -6037,7 +5613,7 @@ + all: + @echo '@@@%%%=$(MAKE)=@@@%%%' + _ACEOF +-# GNU make sometimes prints "make[1]: Entering...", which would confuse us. ++# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. + case `${MAKE-make} -f conftest.make 2>/dev/null` in + *@@@%%%=?*=@@@%%%*) + eval ac_cv_prog_make_${ac_make}_set=yes;; +@@ -6047,25 +5623,25 @@ rm -f conftest.make fi if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then @@ -5336,7 +5958,7 @@ Index: pam.debian/configure -@@ -6147,9 +5668,9 @@ +@@ -6081,9 +5657,9 @@ ltmain="$ac_aux_dir/ltmain.sh" @@ -5348,7 +5970,7 @@ Index: pam.debian/configure $as_echo_n "(cached) " >&6 else ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ -@@ -6157,7 +5678,7 @@ +@@ -6091,7 +5667,7 @@ ac_script="$ac_script$as_nl$ac_script" done echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed @@ -5357,7 +5979,7 @@ Index: pam.debian/configure if test -z "$SED"; then ac_path_SED_found=false # Loop through the user's path and test for each of PROGNAME-LIST -@@ -6166,7 +5687,7 @@ +@@ -6100,7 +5676,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -5366,7 +5988,7 @@ Index: pam.debian/configure for ac_exec_ext in '' $ac_executable_extensions; do ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue -@@ -6186,7 +5707,7 @@ +@@ -6120,7 +5696,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 @@ -5375,7 +5997,7 @@ Index: pam.debian/configure if test $ac_count -gt ${ac_path_SED_max-0}; then # Best one so far, save it but keep looking for a better one ac_cv_path_SED="$ac_path_SED" -@@ -6201,19 +5722,17 @@ +@@ -6135,19 +5711,17 @@ $ac_path_SED_found && break 3 done done @@ -5386,7 +6008,7 @@ Index: pam.debian/configure - { { $as_echo "$as_me:$LINENO: error: no acceptable sed could be found in \$PATH" >&5 -$as_echo "$as_me: error: no acceptable sed could be found in \$PATH" >&2;} - { (exit 1); exit 1; }; } -+ as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5 ++ as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5 fi else ac_cv_path_SED=$SED @@ -5398,7 +6020,7 @@ Index: pam.debian/configure $as_echo "$ac_cv_path_SED" >&6; } SED="$ac_cv_path_SED" rm -f conftest.sed -@@ -6231,9 +5750,9 @@ +@@ -6165,9 +5739,9 @@ @@ -5410,7 +6032,7 @@ Index: pam.debian/configure $as_echo_n "(cached) " >&6 else if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 -@@ -6247,7 +5766,7 @@ +@@ -6181,7 +5755,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -5419,7 +6041,7 @@ Index: pam.debian/configure for ac_exec_ext in '' $ac_executable_extensions; do ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue -@@ -6267,7 +5786,7 @@ +@@ -6201,7 +5775,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 @@ -5428,7 +6050,7 @@ Index: pam.debian/configure if test $ac_count -gt ${ac_path_FGREP_max-0}; then # Best one so far, save it but keep looking for a better one ac_cv_path_FGREP="$ac_path_FGREP" -@@ -6282,12 +5801,10 @@ +@@ -6216,12 +5790,10 @@ $ac_path_FGREP_found && break 3 done done @@ -5439,11 +6061,11 @@ Index: pam.debian/configure - { { $as_echo "$as_me:$LINENO: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -$as_echo "$as_me: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} - { (exit 1); exit 1; }; } -+ as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 ++ as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else ac_cv_path_FGREP=$FGREP -@@ -6295,7 +5812,7 @@ +@@ -6229,7 +5801,7 @@ fi fi @@ -5452,7 +6074,7 @@ Index: pam.debian/configure $as_echo "$ac_cv_path_FGREP" >&6; } FGREP="$ac_cv_path_FGREP" -@@ -6321,7 +5838,7 @@ +@@ -6255,7 +5827,7 @@ # Check whether --with-gnu-ld was given. @@ -5461,7 +6083,7 @@ Index: pam.debian/configure withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes else with_gnu_ld=no -@@ -6330,7 +5847,7 @@ +@@ -6264,7 +5836,7 @@ ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. @@ -5470,7 +6092,7 @@ Index: pam.debian/configure $as_echo_n "checking for ld used by $CC... " >&6; } case $host in *-*-mingw*) -@@ -6360,13 +5877,13 @@ +@@ -6294,13 +5866,13 @@ ;; esac elif test "$with_gnu_ld" = yes; then @@ -5487,7 +6109,7 @@ Index: pam.debian/configure $as_echo_n "(cached) " >&6 else if test -z "$LD"; then -@@ -6397,18 +5914,16 @@ +@@ -6331,18 +5903,16 @@ LD="$lt_cv_path_LD" if test -n "$LD"; then @@ -5503,7 +6125,7 @@ Index: pam.debian/configure -$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} - { (exit 1); exit 1; }; } -{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 -+test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5 ++test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } -if test "${lt_cv_prog_gnu_ld+set}" = set; then @@ -5511,7 +6133,7 @@ Index: pam.debian/configure $as_echo_n "(cached) " >&6 else # I'd rather use --version here, but apparently some GNU lds only accept -v. -@@ -6421,7 +5936,7 @@ +@@ -6355,7 +5925,7 @@ ;; esac fi @@ -5520,7 +6142,7 @@ Index: pam.debian/configure $as_echo "$lt_cv_prog_gnu_ld" >&6; } with_gnu_ld=$lt_cv_prog_gnu_ld -@@ -6433,9 +5948,9 @@ +@@ -6367,9 +5937,9 @@ @@ -5532,7 +6154,7 @@ Index: pam.debian/configure $as_echo_n "(cached) " >&6 else if test -n "$NM"; then -@@ -6482,7 +5997,7 @@ +@@ -6416,7 +5986,7 @@ : ${lt_cv_path_NM=no} fi fi @@ -5541,7 +6163,7 @@ Index: pam.debian/configure $as_echo "$lt_cv_path_NM" >&6; } if test "$lt_cv_path_NM" != "no"; then NM="$lt_cv_path_NM" -@@ -6493,9 +6008,9 @@ +@@ -6427,9 +5997,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 @@ -5553,7 +6175,7 @@ Index: pam.debian/configure $as_echo_n "(cached) " >&6 else if test -n "$DUMPBIN"; then -@@ -6506,24 +6021,24 @@ +@@ -6440,24 +6010,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -5583,7 +6205,7 @@ Index: pam.debian/configure $as_echo "no" >&6; } fi -@@ -6537,9 +6052,9 @@ +@@ -6471,9 +6041,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 @@ -5595,7 +6217,7 @@ Index: pam.debian/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_DUMPBIN"; then -@@ -6550,24 +6065,24 @@ +@@ -6484,24 +6054,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -5625,7 +6247,7 @@ Index: pam.debian/configure $as_echo "no" >&6; } fi -@@ -6580,7 +6095,7 @@ +@@ -6514,7 +6084,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -5634,7 +6256,7 @@ Index: pam.debian/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -6600,33 +6115,33 @@ +@@ -6534,33 +6104,33 @@ @@ -5647,16 +6269,16 @@ Index: pam.debian/configure else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext -- (eval echo "\"\$as_me:6610: $ac_compile\"" >&5) -+ (eval echo "\"\$as_me:6125: $ac_compile\"" >&5) +- (eval echo "\"\$as_me:6544: $ac_compile\"" >&5) ++ (eval echo "\"\$as_me:6114: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 -- (eval echo "\"\$as_me:6613: $NM \\\"conftest.$ac_objext\\\"\"" >&5) -+ (eval echo "\"\$as_me:6128: $NM \\\"conftest.$ac_objext\\\"\"" >&5) +- (eval echo "\"\$as_me:6547: $NM \\\"conftest.$ac_objext\\\"\"" >&5) ++ (eval echo "\"\$as_me:6117: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 -- (eval echo "\"\$as_me:6616: output\"" >&5) -+ (eval echo "\"\$as_me:6131: output\"" >&5) +- (eval echo "\"\$as_me:6550: output\"" >&5) ++ (eval echo "\"\$as_me:6120: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -5676,7 +6298,7 @@ Index: pam.debian/configure $as_echo_n "(cached) " >&6 else i=0 -@@ -6744,10 +6259,10 @@ +@@ -6678,10 +6248,10 @@ fi if test -n $lt_cv_sys_max_cmd_len ; then @@ -5689,7 +6311,7 @@ Index: pam.debian/configure $as_echo "none" >&6; } fi max_cmd_len=$lt_cv_sys_max_cmd_len -@@ -6761,7 +6276,7 @@ +@@ -6695,7 +6265,7 @@ : ${MV="mv -f"} : ${RM="rm -f"} @@ -5698,7 +6320,7 @@ Index: pam.debian/configure $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; } # Try some XSI features xsi_shell=no -@@ -6771,17 +6286,17 @@ +@@ -6705,17 +6275,17 @@ && eval 'test $(( 1 + 1 )) -eq 2 \ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ && xsi_shell=yes @@ -5719,7 +6341,7 @@ Index: pam.debian/configure $as_echo "$lt_shell_append" >&6; } -@@ -6816,14 +6331,14 @@ +@@ -6750,14 +6320,14 @@ @@ -5737,7 +6359,7 @@ Index: pam.debian/configure $as_echo "$lt_cv_ld_reload_flag" >&6; } reload_flag=$lt_cv_ld_reload_flag case $reload_flag in -@@ -6852,9 +6367,9 @@ +@@ -6786,9 +6356,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 @@ -5749,7 +6371,7 @@ Index: pam.debian/configure $as_echo_n "(cached) " >&6 else if test -n "$OBJDUMP"; then -@@ -6865,24 +6380,24 @@ +@@ -6799,24 +6369,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -5779,7 +6401,7 @@ Index: pam.debian/configure $as_echo "no" >&6; } fi -@@ -6892,9 +6407,9 @@ +@@ -6826,9 +6396,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 @@ -5791,7 +6413,7 @@ Index: pam.debian/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_OBJDUMP"; then -@@ -6905,24 +6420,24 @@ +@@ -6839,24 +6409,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -5821,7 +6443,7 @@ Index: pam.debian/configure $as_echo "no" >&6; } fi -@@ -6931,7 +6446,7 @@ +@@ -6865,7 +6435,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -5830,7 +6452,7 @@ Index: pam.debian/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -6951,9 +6466,9 @@ +@@ -6885,9 +6455,9 @@ @@ -5842,7 +6464,7 @@ Index: pam.debian/configure $as_echo_n "(cached) " >&6 else lt_cv_file_magic_cmd='$MAGIC_CMD' -@@ -7068,11 +6583,11 @@ +@@ -7002,11 +6572,11 @@ ;; # This must be Linux ELF. @@ -5856,7 +6478,7 @@ Index: pam.debian/configure if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' else -@@ -7147,7 +6662,7 @@ +@@ -7081,7 +6651,7 @@ esac fi @@ -5865,7 +6487,7 @@ Index: pam.debian/configure $as_echo "$lt_cv_deplibs_check_method" >&6; } file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method -@@ -7167,9 +6682,9 @@ +@@ -7101,9 +6671,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 @@ -5877,7 +6499,7 @@ Index: pam.debian/configure $as_echo_n "(cached) " >&6 else if test -n "$AR"; then -@@ -7180,24 +6695,24 @@ +@@ -7114,24 +6684,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -5907,7 +6529,7 @@ Index: pam.debian/configure $as_echo "no" >&6; } fi -@@ -7207,9 +6722,9 @@ +@@ -7141,9 +6711,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 @@ -5919,7 +6541,7 @@ Index: pam.debian/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_AR"; then -@@ -7220,24 +6735,24 @@ +@@ -7154,24 +6724,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -5949,7 +6571,7 @@ Index: pam.debian/configure $as_echo "no" >&6; } fi -@@ -7246,7 +6761,7 @@ +@@ -7180,7 +6750,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -5958,7 +6580,7 @@ Index: pam.debian/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -7272,9 +6787,9 @@ +@@ -7206,9 +6776,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 @@ -5970,7 +6592,7 @@ Index: pam.debian/configure $as_echo_n "(cached) " >&6 else if test -n "$STRIP"; then -@@ -7285,24 +6800,24 @@ +@@ -7219,24 +6789,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -6000,7 +6622,7 @@ Index: pam.debian/configure $as_echo "no" >&6; } fi -@@ -7312,9 +6827,9 @@ +@@ -7246,9 +6816,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 @@ -6012,7 +6634,7 @@ Index: pam.debian/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_STRIP"; then -@@ -7325,24 +6840,24 @@ +@@ -7259,24 +6829,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -6042,7 +6664,7 @@ Index: pam.debian/configure $as_echo "no" >&6; } fi -@@ -7351,7 +6866,7 @@ +@@ -7285,7 +6855,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -6051,7 +6673,7 @@ Index: pam.debian/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -7371,9 +6886,9 @@ +@@ -7305,9 +6875,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 @@ -6063,7 +6685,7 @@ Index: pam.debian/configure $as_echo_n "(cached) " >&6 else if test -n "$RANLIB"; then -@@ -7384,24 +6899,24 @@ +@@ -7318,24 +6888,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -6093,7 +6715,7 @@ Index: pam.debian/configure $as_echo "no" >&6; } fi -@@ -7411,9 +6926,9 @@ +@@ -7345,9 +6915,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 @@ -6105,7 +6727,7 @@ Index: pam.debian/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_RANLIB"; then -@@ -7424,24 +6939,24 @@ +@@ -7358,24 +6928,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -6135,7 +6757,7 @@ Index: pam.debian/configure $as_echo "no" >&6; } fi -@@ -7450,7 +6965,7 @@ +@@ -7384,7 +6954,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -6144,7 +6766,7 @@ Index: pam.debian/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -7528,9 +7043,9 @@ +@@ -7462,9 +7032,9 @@ # Check for command to grab the raw symbol name followed by C symbol from nm. @@ -6156,7 +6778,7 @@ Index: pam.debian/configure $as_echo_n "(cached) " >&6 else -@@ -7646,18 +7161,18 @@ +@@ -7580,18 +7150,18 @@ int main(){nm_test_var='a';nm_test_func();return(0);} _LT_EOF @@ -6181,7 +6803,7 @@ Index: pam.debian/configure # Try sorting and uniquifying the output. if sort "$nlist" | uniq > "$nlist"T; then mv -f "$nlist"T "$nlist" -@@ -7710,11 +7225,11 @@ +@@ -7644,11 +7214,11 @@ lt_save_CFLAGS="$CFLAGS" LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" @@ -6196,7 +6818,7 @@ Index: pam.debian/configure pipe_works=yes fi LIBS="$lt_save_LIBS" -@@ -7748,10 +7263,10 @@ +@@ -7682,10 +7252,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 @@ -6209,7 +6831,7 @@ Index: pam.debian/configure $as_echo "ok" >&6; } fi -@@ -7777,7 +7292,7 @@ +@@ -7711,7 +7281,7 @@ # Check whether --enable-libtool-lock was given. @@ -6218,7 +6840,7 @@ Index: pam.debian/configure enableval=$enable_libtool_lock; fi -@@ -7789,11 +7304,11 @@ +@@ -7723,11 +7293,11 @@ ia64-*-hpux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -6233,13 +6855,13 @@ Index: pam.debian/configure case `/usr/bin/file conftest.$ac_objext` in *ELF-32*) HPUX_IA64_MODE="32" -@@ -7807,12 +7322,12 @@ +@@ -7741,12 +7311,12 @@ ;; *-*-irix6*) # Find out which ABI we are using. -- echo '#line 7810 "configure"' > conftest.$ac_ext +- echo '#line 7744 "configure"' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -+ echo '#line 7325 "configure"' > conftest.$ac_ext ++ echo '#line 7314 "configure"' > conftest.$ac_ext + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -6250,7 +6872,7 @@ Index: pam.debian/configure if test "$lt_cv_prog_gnu_ld" = yes; then case `/usr/bin/file conftest.$ac_objext` in *32-bit*) -@@ -7846,11 +7361,11 @@ +@@ -7780,11 +7350,11 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -6265,7 +6887,7 @@ Index: pam.debian/configure case `/usr/bin/file conftest.o` in *32-bit*) case $host in -@@ -7899,9 +7414,9 @@ +@@ -7833,9 +7403,9 @@ # On SCO OpenServer 5, we need -belf to get full-featured binaries. SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" @@ -6277,7 +6899,7 @@ Index: pam.debian/configure $as_echo_n "(cached) " >&6 else ac_ext=c -@@ -7910,11 +7425,7 @@ +@@ -7844,11 +7414,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu @@ -6290,7 +6912,7 @@ Index: pam.debian/configure /* end confdefs.h. */ int -@@ -7925,38 +7436,13 @@ +@@ -7859,38 +7425,13 @@ return 0; } _ACEOF @@ -6333,7 +6955,7 @@ Index: pam.debian/configure ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -7964,7 +7450,7 @@ +@@ -7898,7 +7439,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu fi @@ -6342,7 +6964,7 @@ Index: pam.debian/configure $as_echo "$lt_cv_cc_needs_belf" >&6; } if test x"$lt_cv_cc_needs_belf" != x"yes"; then # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf -@@ -7974,11 +7460,11 @@ +@@ -7908,11 +7449,11 @@ sparc*-*solaris*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -6357,7 +6979,7 @@ Index: pam.debian/configure case `/usr/bin/file conftest.o` in *64-bit*) case $lt_cv_prog_gnu_ld in -@@ -8004,9 +7490,9 @@ +@@ -7938,9 +7479,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 @@ -6369,7 +6991,7 @@ Index: pam.debian/configure $as_echo_n "(cached) " >&6 else if test -n "$DSYMUTIL"; then -@@ -8017,24 +7503,24 @@ +@@ -7951,24 +7492,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -6399,7 +7021,7 @@ Index: pam.debian/configure $as_echo "no" >&6; } fi -@@ -8044,9 +7530,9 @@ +@@ -7978,9 +7519,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 @@ -6411,7 +7033,7 @@ Index: pam.debian/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_DSYMUTIL"; then -@@ -8057,24 +7543,24 @@ +@@ -7991,24 +7532,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -6441,7 +7063,7 @@ Index: pam.debian/configure $as_echo "no" >&6; } fi -@@ -8083,7 +7569,7 @@ +@@ -8017,7 +7558,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -6450,7 +7072,7 @@ Index: pam.debian/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -8096,9 +7582,9 @@ +@@ -8030,9 +7571,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 @@ -6462,7 +7084,7 @@ Index: pam.debian/configure $as_echo_n "(cached) " >&6 else if test -n "$NMEDIT"; then -@@ -8109,24 +7595,24 @@ +@@ -8043,24 +7584,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -6492,7 +7114,7 @@ Index: pam.debian/configure $as_echo "no" >&6; } fi -@@ -8136,9 +7622,9 @@ +@@ -8070,9 +7611,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 @@ -6504,7 +7126,7 @@ Index: pam.debian/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_NMEDIT"; then -@@ -8149,24 +7635,24 @@ +@@ -8083,24 +7624,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -6534,7 +7156,7 @@ Index: pam.debian/configure $as_echo "no" >&6; } fi -@@ -8175,7 +7661,7 @@ +@@ -8109,7 +7650,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -6543,7 +7165,7 @@ Index: pam.debian/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -8188,9 +7674,9 @@ +@@ -8122,9 +7663,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 @@ -6555,7 +7177,7 @@ Index: pam.debian/configure $as_echo_n "(cached) " >&6 else if test -n "$LIPO"; then -@@ -8201,24 +7687,24 @@ +@@ -8135,24 +7676,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -6585,7 +7207,7 @@ Index: pam.debian/configure $as_echo "no" >&6; } fi -@@ -8228,9 +7714,9 @@ +@@ -8162,9 +7703,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 @@ -6597,7 +7219,7 @@ Index: pam.debian/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_LIPO"; then -@@ -8241,24 +7727,24 @@ +@@ -8175,24 +7716,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -6627,7 +7249,7 @@ Index: pam.debian/configure $as_echo "no" >&6; } fi -@@ -8267,7 +7753,7 @@ +@@ -8201,7 +7742,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -6636,7 +7258,7 @@ Index: pam.debian/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -8280,9 +7766,9 @@ +@@ -8214,9 +7755,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 @@ -6648,7 +7270,7 @@ Index: pam.debian/configure $as_echo_n "(cached) " >&6 else if test -n "$OTOOL"; then -@@ -8293,24 +7779,24 @@ +@@ -8227,24 +7768,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -6678,7 +7300,7 @@ Index: pam.debian/configure $as_echo "no" >&6; } fi -@@ -8320,9 +7806,9 @@ +@@ -8254,9 +7795,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 @@ -6690,7 +7312,7 @@ Index: pam.debian/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_OTOOL"; then -@@ -8333,24 +7819,24 @@ +@@ -8267,24 +7808,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -6720,7 +7342,7 @@ Index: pam.debian/configure $as_echo "no" >&6; } fi -@@ -8359,7 +7845,7 @@ +@@ -8293,7 +7834,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -6729,7 +7351,7 @@ Index: pam.debian/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -8372,9 +7858,9 @@ +@@ -8306,9 +7847,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 @@ -6741,7 +7363,7 @@ Index: pam.debian/configure $as_echo_n "(cached) " >&6 else if test -n "$OTOOL64"; then -@@ -8385,24 +7871,24 @@ +@@ -8319,24 +7860,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -6771,7 +7393,7 @@ Index: pam.debian/configure $as_echo "no" >&6; } fi -@@ -8412,9 +7898,9 @@ +@@ -8346,9 +7887,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 @@ -6783,7 +7405,7 @@ Index: pam.debian/configure $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_OTOOL64"; then -@@ -8425,24 +7911,24 @@ +@@ -8359,24 +7900,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -6813,7 +7435,7 @@ Index: pam.debian/configure $as_echo "no" >&6; } fi -@@ -8451,7 +7937,7 @@ +@@ -8385,7 +7926,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) @@ -6822,7 +7444,7 @@ Index: pam.debian/configure $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac -@@ -8487,9 +7973,9 @@ +@@ -8421,9 +7962,9 @@ @@ -6834,7 +7456,7 @@ Index: pam.debian/configure $as_echo_n "(cached) " >&6 else lt_cv_apple_cc_single_mod=no -@@ -8514,22 +8000,18 @@ +@@ -8448,22 +7989,18 @@ rm -f conftest.* fi fi @@ -6861,7 +7483,7 @@ Index: pam.debian/configure /* end confdefs.h. */ int -@@ -8540,42 +8022,17 @@ +@@ -8474,42 +8011,17 @@ return 0; } _ACEOF @@ -6909,7 +7531,7 @@ Index: pam.debian/configure $as_echo "$lt_cv_ld_exported_symbols_list" >&6; } case $host_os in rhapsody* | darwin1.[012]) -@@ -8612,62 +8069,13 @@ +@@ -8546,62 +8058,13 @@ ;; esac @@ -6967,18 +7589,17 @@ Index: pam.debian/configure -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then -- cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +do : + ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default +" +if test "x$ac_cv_header_dlfcn_h" = x""yes; then : -+ cat >>confdefs.h <<_ACEOF + cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define HAVE_DLFCN_H 1 _ACEOF fi -@@ -8690,7 +8098,7 @@ +@@ -8624,7 +8087,7 @@ # Check whether --with-pic was given. @@ -6987,7 +7608,7 @@ Index: pam.debian/configure withval=$with_pic; pic_mode="$withval" else pic_mode=default -@@ -8706,7 +8114,7 @@ +@@ -8640,7 +8103,7 @@ # Check whether --enable-fast-install was given. @@ -6996,7 +7617,7 @@ Index: pam.debian/configure enableval=$enable_fast_install; p=${PACKAGE-default} case $enableval in yes) enable_fast_install=yes ;; -@@ -8787,9 +8195,9 @@ +@@ -8721,9 +8184,9 @@ setopt NO_GLOB_SUBST fi @@ -7008,7 +7629,7 @@ Index: pam.debian/configure $as_echo_n "(cached) " >&6 else rm -f .libs 2>/dev/null -@@ -8802,7 +8210,7 @@ +@@ -8736,7 +8199,7 @@ fi rmdir .libs 2>/dev/null fi @@ -7017,7 +7638,7 @@ Index: pam.debian/configure $as_echo "$lt_cv_objdir" >&6; } objdir=$lt_cv_objdir -@@ -8895,9 +8303,9 @@ +@@ -8829,9 +8292,9 @@ case $deplibs_check_method in file_magic*) if test "$file_magic_cmd" = '$MAGIC_CMD'; then @@ -7029,7 +7650,7 @@ Index: pam.debian/configure $as_echo_n "(cached) " >&6 else case $MAGIC_CMD in -@@ -8948,10 +8356,10 @@ +@@ -8882,10 +8345,10 @@ MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if test -n "$MAGIC_CMD"; then @@ -7042,7 +7663,7 @@ Index: pam.debian/configure $as_echo "no" >&6; } fi -@@ -8961,9 +8369,9 @@ +@@ -8895,9 +8358,9 @@ if test -z "$lt_cv_path_MAGIC_CMD"; then if test -n "$ac_tool_prefix"; then @@ -7054,7 +7675,7 @@ Index: pam.debian/configure $as_echo_n "(cached) " >&6 else case $MAGIC_CMD in -@@ -9014,10 +8422,10 @@ +@@ -8948,10 +8411,10 @@ MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if test -n "$MAGIC_CMD"; then @@ -7067,7 +7688,7 @@ Index: pam.debian/configure $as_echo "no" >&6; } fi -@@ -9098,9 +8506,9 @@ +@@ -9032,9 +8495,9 @@ if test "$GCC" = yes; then lt_prog_compiler_no_builtin_flag=' -fno-builtin' @@ -7079,21 +7700,21 @@ Index: pam.debian/configure $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_rtti_exceptions=no -@@ -9116,11 +8524,11 @@ +@@ -9050,11 +8513,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:9119: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:8527: $lt_compile\"" >&5) +- (eval echo "\"\$as_me:9053: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8516: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 -- echo "$as_me:9123: \$? = $ac_status" >&5 -+ echo "$as_me:8531: \$? = $ac_status" >&5 +- echo "$as_me:9057: \$? = $ac_status" >&5 ++ echo "$as_me:8520: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. -@@ -9133,7 +8541,7 @@ +@@ -9067,7 +8530,7 @@ $RM conftest* fi @@ -7102,7 +7723,7 @@ Index: pam.debian/configure $as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; } if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then -@@ -9153,7 +8561,7 @@ +@@ -9087,7 +8550,7 @@ lt_prog_compiler_pic= lt_prog_compiler_static= @@ -7111,7 +7732,7 @@ Index: pam.debian/configure $as_echo_n "checking for $compiler option to produce PIC... " >&6; } if test "$GCC" = yes; then -@@ -9285,7 +8693,7 @@ +@@ -9219,7 +8682,7 @@ lt_prog_compiler_static='-non_shared' ;; @@ -7120,7 +7741,7 @@ Index: pam.debian/configure case $cc_basename in # old Intel for x86_64 which still supported -KPIC. ecc*) -@@ -9425,7 +8833,7 @@ +@@ -9359,7 +8822,7 @@ lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" ;; esac @@ -7129,7 +7750,7 @@ Index: pam.debian/configure $as_echo "$lt_prog_compiler_pic" >&6; } -@@ -9437,9 +8845,9 @@ +@@ -9371,9 +8834,9 @@ # Check to make sure the PIC flag actually works. # if test -n "$lt_prog_compiler_pic"; then @@ -7141,21 +7762,21 @@ Index: pam.debian/configure $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_pic_works=no -@@ -9455,11 +8863,11 @@ +@@ -9389,11 +8852,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:9458: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:8866: $lt_compile\"" >&5) +- (eval echo "\"\$as_me:9392: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8855: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 -- echo "$as_me:9462: \$? = $ac_status" >&5 -+ echo "$as_me:8870: \$? = $ac_status" >&5 +- echo "$as_me:9396: \$? = $ac_status" >&5 ++ echo "$as_me:8859: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. -@@ -9472,7 +8880,7 @@ +@@ -9406,7 +8869,7 @@ $RM conftest* fi @@ -7164,7 +7785,7 @@ Index: pam.debian/configure $as_echo "$lt_cv_prog_compiler_pic_works" >&6; } if test x"$lt_cv_prog_compiler_pic_works" = xyes; then -@@ -9496,9 +8904,9 @@ +@@ -9430,9 +8893,9 @@ # Check to make sure the static flag actually works. # wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" @@ -7176,7 +7797,7 @@ Index: pam.debian/configure $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_static_works=no -@@ -9524,7 +8932,7 @@ +@@ -9458,7 +8921,7 @@ LDFLAGS="$save_LDFLAGS" fi @@ -7185,7 +7806,7 @@ Index: pam.debian/configure $as_echo "$lt_cv_prog_compiler_static_works" >&6; } if test x"$lt_cv_prog_compiler_static_works" = xyes; then -@@ -9539,9 +8947,9 @@ +@@ -9473,9 +8936,9 @@ @@ -7197,21 +7818,21 @@ Index: pam.debian/configure $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_c_o=no -@@ -9560,11 +8968,11 @@ +@@ -9494,11 +8957,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:9563: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:8971: $lt_compile\"" >&5) +- (eval echo "\"\$as_me:9497: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8960: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 -- echo "$as_me:9567: \$? = $ac_status" >&5 -+ echo "$as_me:8975: \$? = $ac_status" >&5 +- echo "$as_me:9501: \$? = $ac_status" >&5 ++ echo "$as_me:8964: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized -@@ -9586,7 +8994,7 @@ +@@ -9520,7 +8983,7 @@ $RM conftest* fi @@ -7220,7 +7841,7 @@ Index: pam.debian/configure $as_echo "$lt_cv_prog_compiler_c_o" >&6; } -@@ -9594,9 +9002,9 @@ +@@ -9528,9 +8991,9 @@ @@ -7232,21 +7853,21 @@ Index: pam.debian/configure $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_c_o=no -@@ -9615,11 +9023,11 @@ +@@ -9549,11 +9012,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:9618: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:9026: $lt_compile\"" >&5) +- (eval echo "\"\$as_me:9552: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:9015: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 -- echo "$as_me:9622: \$? = $ac_status" >&5 -+ echo "$as_me:9030: \$? = $ac_status" >&5 +- echo "$as_me:9556: \$? = $ac_status" >&5 ++ echo "$as_me:9019: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized -@@ -9641,7 +9049,7 @@ +@@ -9575,7 +9038,7 @@ $RM conftest* fi @@ -7255,7 +7876,7 @@ Index: pam.debian/configure $as_echo "$lt_cv_prog_compiler_c_o" >&6; } -@@ -9650,7 +9058,7 @@ +@@ -9584,7 +9047,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 @@ -7264,7 +7885,7 @@ Index: pam.debian/configure $as_echo_n "checking if we can lock with hard links... " >&6; } hard_links=yes $RM conftest* -@@ -9658,10 +9066,10 @@ +@@ -9592,10 +9055,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 @@ -7277,7 +7898,7 @@ Index: pam.debian/configure $as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} need_locks=warn fi -@@ -9674,7 +9082,7 @@ +@@ -9608,7 +9071,7 @@ @@ -7286,7 +7907,7 @@ Index: pam.debian/configure $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } runpath_var= -@@ -9734,6 +9142,9 @@ +@@ -9668,6 +9131,9 @@ openbsd*) with_gnu_ld=no ;; @@ -7296,7 +7917,7 @@ Index: pam.debian/configure esac ld_shlibs=yes -@@ -9755,6 +9166,7 @@ +@@ -9689,6 +9155,7 @@ fi supports_anon_versioning=no case `$LD -v 2>&1` in @@ -7304,7 +7925,7 @@ Index: pam.debian/configure *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... -@@ -9846,7 +9258,7 @@ +@@ -9780,7 +9247,7 @@ archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; @@ -7313,7 +7934,7 @@ Index: pam.debian/configure tmp_diet=no if test "$host_os" = linux-dietlibc; then case $cc_basename in -@@ -9916,7 +9328,7 @@ +@@ -9850,7 +9317,7 @@ fi ;; @@ -7322,7 +7943,7 @@ Index: pam.debian/configure if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= -@@ -10091,6 +9503,7 @@ +@@ -10025,6 +9492,7 @@ if test "$aix_use_runtimelinking" = yes; then shared_flag="$shared_flag "'${wl}-G' fi @@ -7330,7 +7951,7 @@ Index: pam.debian/configure else # not using gcc if test "$host_cpu" = ia64; then -@@ -10116,11 +9529,7 @@ +@@ -10050,11 +9518,7 @@ allow_undefined_flag='-berok' # Determine the default libpath from the value encoded in an # empty executable. @@ -7343,7 +7964,7 @@ Index: pam.debian/configure /* end confdefs.h. */ int -@@ -10131,27 +9540,7 @@ +@@ -10065,27 +9529,7 @@ return 0; } _ACEOF @@ -7372,7 +7993,7 @@ Index: pam.debian/configure lt_aix_libpath_sed=' /Import File Strings/,/^$/ { -@@ -10165,16 +9554,9 @@ +@@ -10099,16 +9543,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 @@ -7391,7 +8012,7 @@ Index: pam.debian/configure if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" -@@ -10187,11 +9569,7 @@ +@@ -10121,11 +9558,7 @@ else # Determine the default libpath from the value encoded in an # empty executable. @@ -7404,7 +8025,7 @@ Index: pam.debian/configure /* end confdefs.h. */ int -@@ -10202,27 +9580,7 @@ +@@ -10136,27 +9569,7 @@ return 0; } _ACEOF @@ -7433,7 +8054,7 @@ Index: pam.debian/configure lt_aix_libpath_sed=' /Import File Strings/,/^$/ { -@@ -10236,16 +9594,9 @@ +@@ -10170,16 +9583,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 @@ -7452,7 +8073,7 @@ Index: pam.debian/configure if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" -@@ -10457,42 +9808,16 @@ +@@ -10391,42 +9797,16 @@ # implicitly export all symbols. save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" @@ -7500,7 +8121,7 @@ Index: pam.debian/configure LDFLAGS="$save_LDFLAGS" else archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' -@@ -10505,7 +9830,7 @@ +@@ -10439,7 +9819,7 @@ link_all_deplibs=yes ;; @@ -7509,7 +8130,7 @@ Index: pam.debian/configure if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else -@@ -10748,7 +10073,7 @@ +@@ -10682,7 +10062,7 @@ fi fi @@ -7518,7 +8139,7 @@ Index: pam.debian/configure $as_echo "$ld_shlibs" >&6; } test "$ld_shlibs" = no && can_build_shared=no -@@ -10785,16 +10110,16 @@ +@@ -10719,16 +10099,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. @@ -7539,7 +8160,7 @@ Index: pam.debian/configure soname=conftest lib=conftest libobjs=conftest.$ac_objext -@@ -10808,11 +10133,11 @@ +@@ -10742,11 +10122,11 @@ libname=conftest lt_save_allow_undefined_flag=$allow_undefined_flag allow_undefined_flag= @@ -7554,7 +8175,7 @@ Index: pam.debian/configure then archive_cmds_need_lc=no else -@@ -10823,7 +10148,7 @@ +@@ -10757,7 +10137,7 @@ cat conftest.err 1>&5 fi $RM conftest* @@ -7563,7 +8184,7 @@ Index: pam.debian/configure $as_echo "$archive_cmds_need_lc" >&6; } ;; esac -@@ -10987,7 +10312,7 @@ +@@ -10921,7 +10301,7 @@ @@ -7572,7 +8193,7 @@ Index: pam.debian/configure $as_echo_n "checking dynamic linker characteristics... " >&6; } if test "$GCC" = yes; then -@@ -11395,7 +10720,7 @@ +@@ -11329,7 +10709,7 @@ ;; # This must be Linux ELF. @@ -7581,7 +8202,7 @@ Index: pam.debian/configure version_type=linux need_lib_prefix=no need_version=no -@@ -11409,11 +10734,7 @@ +@@ -11343,11 +10723,7 @@ save_libdir=$libdir eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \ LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\"" @@ -7594,7 +8215,7 @@ Index: pam.debian/configure /* end confdefs.h. */ int -@@ -11424,41 +10745,13 @@ +@@ -11358,41 +10734,13 @@ return 0; } _ACEOF @@ -7640,7 +8261,7 @@ Index: pam.debian/configure LDFLAGS=$save_LDFLAGS libdir=$save_libdir -@@ -11482,6 +10775,18 @@ +@@ -11416,6 +10764,18 @@ dynamic_linker='GNU/Linux ld.so' ;; @@ -7659,7 +8280,7 @@ Index: pam.debian/configure netbsd*) version_type=sunos need_lib_prefix=no -@@ -11670,7 +10975,7 @@ +@@ -11604,7 +10964,7 @@ dynamic_linker=no ;; esac @@ -7668,7 +8289,7 @@ Index: pam.debian/configure $as_echo "$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no -@@ -11772,7 +11077,7 @@ +@@ -11706,7 +11066,7 @@ @@ -7677,7 +8298,7 @@ Index: pam.debian/configure $as_echo_n "checking how to hardcode library paths into programs... " >&6; } hardcode_action= if test -n "$hardcode_libdir_flag_spec" || -@@ -11797,7 +11102,7 @@ +@@ -11731,7 +11091,7 @@ # directories. hardcode_action=unsupported fi @@ -7686,7 +8307,7 @@ Index: pam.debian/configure $as_echo "$hardcode_action" >&6; } if test "$hardcode_action" = relink || -@@ -11842,18 +11147,14 @@ +@@ -11776,18 +11136,14 @@ darwin*) # if libdl is installed we need to link against it @@ -7708,7 +8329,7 @@ Index: pam.debian/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -11871,43 +11172,18 @@ +@@ -11805,43 +11161,18 @@ return 0; } _ACEOF @@ -7758,31 +8379,21 @@ Index: pam.debian/configure lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" else -@@ -11920,33 +11196,19 @@ +@@ -11854,106 +11185,18 @@ ;; *) - { $as_echo "$as_me:$LINENO: checking for shl_load" >&5 -$as_echo_n "checking for shl_load... " >&6; } -if test "${ac_cv_func_shl_load+set}" = set; then -+ ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load" -+if test "x$ac_cv_func_shl_load" = x""yes; then : -+ lt_cv_dlopen="shl_load" -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 -+$as_echo_n "checking for shl_load in -ldld... " >&6; } -+if test "${ac_cv_lib_dld_shl_load+set}" = set; then : - $as_echo_n "(cached) " >&6 - else +- $as_echo_n "(cached) " >&6 +-else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-ldld $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ +-/* end confdefs.h. */ -/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load. - For example, HP-UX 11i <limits.h> declares gettimeofday. */ -#define shl_load innocuous_shl_load @@ -7799,13 +8410,14 @@ Index: pam.debian/configure -#endif - -#undef shl_load - - /* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC -@@ -11955,13 +11217,6 @@ - extern "C" - #endif - char shl_load (); +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char shl_load (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ @@ -7813,13 +8425,14 @@ Index: pam.debian/configure -choke me -#endif - - int - main () - { -@@ -11970,56 +11225,32 @@ - return 0; - } - _ACEOF +-int +-main () +-{ +-return shl_load (); +- ; +- return 0; +-} +-_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in @@ -7842,68 +8455,43 @@ Index: pam.debian/configure - $as_test_x conftest$ac_exeext - }; then - ac_cv_func_shl_load=yes -+if ac_fn_c_try_link "$LINENO"; then : -+ ac_cv_lib_dld_shl_load=yes - else +-else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_shl_load=no -+ ac_cv_lib_dld_shl_load=no - fi +-fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS - fi +-fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 -$as_echo "$ac_cv_func_shl_load" >&6; } -if test "x$ac_cv_func_shl_load" = x""yes; then -- lt_cv_dlopen="shl_load" -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 -+$as_echo "$ac_cv_lib_dld_shl_load" >&6; } -+if test "x$ac_cv_lib_dld_shl_load" = x""yes; then : -+ lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" ++ ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load" ++if test "x$ac_cv_func_shl_load" = x""yes; then : + lt_cv_dlopen="shl_load" else - { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 --$as_echo_n "checking for shl_load in -ldld... " >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 + $as_echo_n "checking for shl_load in -ldld... " >&6; } -if test "${ac_cv_lib_dld_shl_load+set}" = set; then -+ ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" -+if test "x$ac_cv_func_dlopen" = x""yes; then : -+ lt_cv_dlopen="dlopen" -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 -+$as_echo_n "checking for dlopen in -ldl... " >&6; } -+if test "${ac_cv_lib_dl_dlopen+set}" = set; then : ++if test "${ac_cv_lib_dld_shl_load+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS --LIBS="-ldld $LIBS" + LIBS="-ldld $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -+LIBS="-ldl $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -12028,81 +11259,38 @@ - #ifdef __cplusplus - extern "C" - #endif --char shl_load (); -+char dlopen (); - int - main () - { --return shl_load (); -+return dlopen (); - ; +@@ -11971,145 +11214,32 @@ return 0; } _ACEOF @@ -7928,15 +8516,14 @@ Index: pam.debian/configure - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then -- ac_cv_lib_dld_shl_load=yes +if ac_fn_c_try_link "$LINENO"; then : -+ ac_cv_lib_dl_dlopen=yes + ac_cv_lib_dld_shl_load=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_dld_shl_load=no -+ ac_cv_lib_dl_dlopen=no ++ ac_cv_lib_dld_shl_load=no fi - -rm -rf conftest.dSYM @@ -7947,31 +8534,23 @@ Index: pam.debian/configure LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 --$as_echo "$ac_cv_lib_dld_shl_load" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 + $as_echo "$ac_cv_lib_dld_shl_load" >&6; } -if test "x$ac_cv_lib_dld_shl_load" = x""yes; then -- lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 -+$as_echo "$ac_cv_lib_dl_dlopen" >&6; } -+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then : -+ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" ++if test "x$ac_cv_lib_dld_shl_load" = x""yes; then : + lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" else - { $as_echo "$as_me:$LINENO: checking for dlopen" >&5 -$as_echo_n "checking for dlopen... " >&6; } -if test "${ac_cv_func_dlopen+set}" = set; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 -+$as_echo_n "checking for dlopen in -lsvld... " >&6; } -+if test "${ac_cv_lib_svld_dlopen+set}" = set; then : - $as_echo_n "(cached) " >&6 - else +- $as_echo_n "(cached) " >&6 +-else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-lsvld $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ +-/* end confdefs.h. */ -/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen. - For example, HP-UX 11i <limits.h> declares gettimeofday. */ -#define dlopen innocuous_dlopen @@ -7988,13 +8567,14 @@ Index: pam.debian/configure -#endif - -#undef dlopen - - /* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC -@@ -12111,13 +11299,6 @@ - extern "C" - #endif - char dlopen (); +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char dlopen (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ @@ -8002,13 +8582,14 @@ Index: pam.debian/configure -choke me -#endif - - int - main () - { -@@ -12126,56 +11307,28 @@ - return 0; - } - _ACEOF +-int +-main () +-{ +-return dlopen (); +- ; +- return 0; +-} +-_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in @@ -8031,64 +8612,43 @@ Index: pam.debian/configure - $as_test_x conftest$ac_exeext - }; then - ac_cv_func_dlopen=yes -+if ac_fn_c_try_link "$LINENO"; then : -+ ac_cv_lib_svld_dlopen=yes - else +-else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_dlopen=no -+ ac_cv_lib_svld_dlopen=no - fi +-fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS - fi +-fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 -$as_echo "$ac_cv_func_dlopen" >&6; } -if test "x$ac_cv_func_dlopen" = x""yes; then -- lt_cv_dlopen="dlopen" -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 -+$as_echo "$ac_cv_lib_svld_dlopen" >&6; } -+if test "x$ac_cv_lib_svld_dlopen" = x""yes; then : -+ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" ++ ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" ++if test "x$ac_cv_func_dlopen" = x""yes; then : + lt_cv_dlopen="dlopen" else - { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 --$as_echo_n "checking for dlopen in -ldl... " >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 + $as_echo_n "checking for dlopen in -ldl... " >&6; } -if test "${ac_cv_lib_dl_dlopen+set}" = set; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5 -+$as_echo_n "checking for dld_link in -ldld... " >&6; } -+if test "${ac_cv_lib_dld_dld_link+set}" = set; then : ++if test "${ac_cv_lib_dl_dlopen+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS --LIBS="-ldl $LIBS" + LIBS="-ldl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -+LIBS="-ldld $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -12184,188 +11337,27 @@ - #ifdef __cplusplus - extern "C" - #endif --char dlopen (); -+char dld_link (); - int - main () - { --return dlopen (); -+return dld_link (); - ; +@@ -12127,57 +11257,28 @@ return 0; } _ACEOF @@ -8113,55 +8673,52 @@ Index: pam.debian/configure - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then -- ac_cv_lib_dl_dlopen=yes +if ac_fn_c_try_link "$LINENO"; then : -+ ac_cv_lib_dld_dld_link=yes + ac_cv_lib_dl_dlopen=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_dl_dlopen=no --fi ++ ac_cv_lib_dl_dlopen=no + fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS --fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 --$as_echo "$ac_cv_lib_dl_dlopen" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 + $as_echo "$ac_cv_lib_dl_dlopen" >&6; } -if test "x$ac_cv_lib_dl_dlopen" = x""yes; then -- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" --else ++if test "x$ac_cv_lib_dl_dlopen" = x""yes; then : + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" + else - { $as_echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 --$as_echo_n "checking for dlopen in -lsvld... " >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 + $as_echo_n "checking for dlopen in -lsvld... " >&6; } -if test "${ac_cv_lib_svld_dlopen+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-lsvld $LIBS" ++if test "${ac_cv_lib_svld_dlopen+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-lsvld $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -- --/* Override any GCC internal prototype to avoid an error. -- Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ --#ifdef __cplusplus --extern "C" --#endif --char dlopen (); --int --main () --{ --return dlopen (); -- ; -- return 0; --} --_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -12195,57 +11296,28 @@ + return 0; + } + _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in @@ -8183,53 +8740,52 @@ Index: pam.debian/configure - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then -- ac_cv_lib_svld_dlopen=yes --else ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_svld_dlopen=yes + else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_svld_dlopen=no --fi ++ ac_cv_lib_svld_dlopen=no + fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS --fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 --$as_echo "$ac_cv_lib_svld_dlopen" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 + $as_echo "$ac_cv_lib_svld_dlopen" >&6; } -if test "x$ac_cv_lib_svld_dlopen" = x""yes; then -- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" --else ++if test "x$ac_cv_lib_svld_dlopen" = x""yes; then : + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" + else - { $as_echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 --$as_echo_n "checking for dld_link in -ldld... " >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5 + $as_echo_n "checking for dld_link in -ldld... " >&6; } -if test "${ac_cv_lib_dld_dld_link+set}" = set; then -- $as_echo_n "(cached) " >&6 --else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-ldld $LIBS" ++if test "${ac_cv_lib_dld_dld_link+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS + LIBS="-ldld $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -- --/* Override any GCC internal prototype to avoid an error. -- Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ --#ifdef __cplusplus --extern "C" --#endif --char dld_link (); --int --main () --{ --return dld_link (); -- ; -- return 0; --} --_ACEOF ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* Override any GCC internal prototype to avoid an error. +@@ -12263,43 +11335,18 @@ + return 0; + } + _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in @@ -8251,8 +8807,9 @@ Index: pam.debian/configure - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then -- ac_cv_lib_dld_dld_link=yes --else ++if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_dld_dld_link=yes + else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - @@ -8275,7 +8832,7 @@ Index: pam.debian/configure lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" fi -@@ -12404,9 +11396,9 @@ +@@ -12338,9 +11385,9 @@ save_LIBS="$LIBS" LIBS="$lt_cv_dlopen_libs $LIBS" @@ -8287,16 +8844,16 @@ Index: pam.debian/configure $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then : -@@ -12415,7 +11407,7 @@ +@@ -12349,7 +11396,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 12418 "configure" -+#line 11410 "configure" +-#line 12352 "configure" ++#line 11399 "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -12474,11 +11466,11 @@ +@@ -12408,11 +11455,11 @@ return status; } _LT_EOF @@ -8311,7 +8868,7 @@ Index: pam.debian/configure (./conftest; exit; ) >&5 2>/dev/null lt_status=$? case x$lt_status in -@@ -12495,14 +11487,14 @@ +@@ -12429,14 +11476,14 @@ fi @@ -8329,16 +8886,16 @@ Index: pam.debian/configure $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then : -@@ -12511,7 +11503,7 @@ +@@ -12445,7 +11492,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 12514 "configure" -+#line 11506 "configure" +-#line 12448 "configure" ++#line 11495 "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -12570,11 +11562,11 @@ +@@ -12504,11 +11551,11 @@ return status; } _LT_EOF @@ -8353,7 +8910,7 @@ Index: pam.debian/configure (./conftest; exit; ) >&5 2>/dev/null lt_status=$? case x$lt_status in -@@ -12591,7 +11583,7 @@ +@@ -12525,7 +11572,7 @@ fi @@ -8362,7 +8919,7 @@ Index: pam.debian/configure $as_echo "$lt_cv_dlopen_self_static" >&6; } fi -@@ -12630,12 +11622,12 @@ +@@ -12564,12 +11611,12 @@ striplib= old_striplib= @@ -8377,7 +8934,7 @@ Index: pam.debian/configure $as_echo "yes" >&6; } else # FIXME - insert some real tests, host_os isn't really good enough -@@ -12644,15 +11636,15 @@ +@@ -12578,15 +11625,15 @@ if test -n "$STRIP" ; then striplib="$STRIP -x" old_striplib="$STRIP -S" @@ -8396,7 +8953,7 @@ Index: pam.debian/configure $as_echo "no" >&6; } ;; esac -@@ -12670,12 +11662,12 @@ +@@ -12604,12 +11651,12 @@ # Report which library types will actually be built @@ -8412,7 +8969,7 @@ Index: pam.debian/configure $as_echo_n "checking whether to build shared libraries... " >&6; } test "$can_build_shared" = "no" && enable_shared=no -@@ -12696,14 +11688,14 @@ +@@ -12630,14 +11677,14 @@ fi ;; esac @@ -8430,7 +8987,7 @@ Index: pam.debian/configure $as_echo "$enable_static" >&6; } -@@ -12739,22 +11731,18 @@ +@@ -12673,22 +11720,18 @@ if test "x$CC" != xcc; then @@ -8445,7 +9002,7 @@ Index: pam.debian/configure set dummy $CC; ac_cc=`$as_echo "$2" | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` -if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then -+if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval "test \"\${ac_cv_prog_cc_${ac_cc}_c_o+set}\"" = set; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF @@ -8457,7 +9014,7 @@ Index: pam.debian/configure /* end confdefs.h. */ int -@@ -12770,63 +11758,63 @@ +@@ -12704,63 +11747,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.* @@ -8546,7 +9103,7 @@ Index: pam.debian/configure then # cc works too. : -@@ -12843,15 +11831,13 @@ +@@ -12777,23 +11820,22 @@ fi if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then @@ -8565,7 +9122,18 @@ Index: pam.debian/configure fi -@@ -12871,9 +11857,9 @@ + # FIXME: we rely on the cache variable name because + # there is no other way. + set dummy $CC +-ac_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` +-if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" != yes"; then ++am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` ++eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o ++if test "$am_t" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. +@@ -12804,9 +11846,9 @@ @@ -8577,7 +9145,7 @@ Index: pam.debian/configure $as_echo_n "(cached) " >&6 else cat > conftest.c <<EOF -@@ -12882,11 +11868,11 @@ +@@ -12815,11 +11857,11 @@ if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -o conftest.o conftest.c -Wl,--as-needed 1>&5' @@ -8592,7 +9160,7 @@ Index: pam.debian/configure then pam_cv_ld_as_needed=yes LDFLAGS="$LDFLAGS -Wl,--as-needed" -@@ -12895,15 +11881,15 @@ +@@ -12828,15 +11870,15 @@ fi rm -f conftest* fi @@ -8603,6 +9171,40 @@ Index: pam.debian/configure +- { $as_echo "$as_me:$LINENO: checking whether ld supports --no-undefined" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ld supports --no-undefined" >&5 + $as_echo_n "checking whether ld supports --no-undefined... " >&6; } +-if test "${pam_cv_ld_no_undefined+set}" = set; then ++if test "${pam_cv_ld_no_undefined+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + cat > conftest.c <<EOF +@@ -12845,11 +11887,11 @@ + if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS + -o conftest.o conftest.c + -Wl,--no-undefined 1>&5' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 + (eval $ac_try) 2>&5 + ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; } + then + pam_cv_ld_no_undefined=yes + LDFLAGS="$LDFLAGS -Wl,--no-undefined" +@@ -12858,15 +11900,15 @@ + fi + rm -f conftest* + fi +-{ $as_echo "$as_me:$LINENO: result: $pam_cv_ld_no_undefined" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pam_cv_ld_no_undefined" >&5 + $as_echo "$pam_cv_ld_no_undefined" >&6; } + + + + - { $as_echo "$as_me:$LINENO: checking whether ld supports -O1" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ld supports -O1" >&5 $as_echo_n "checking whether ld supports -O1... " >&6; } @@ -8611,7 +9213,7 @@ Index: pam.debian/configure $as_echo_n "(cached) " >&6 else cat > conftest.c <<EOF -@@ -12912,11 +11898,11 @@ +@@ -12875,11 +11917,11 @@ if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -o conftest.o conftest.c -Wl,-O1 1>&5' @@ -8626,7 +9228,7 @@ Index: pam.debian/configure then pam_cv_ld_O1=yes LDFLAGS="$LDFLAGS -Wl,-O1" -@@ -12925,22 +11911,22 @@ +@@ -12888,22 +11930,22 @@ fi rm -f conftest* fi @@ -8653,7 +9255,7 @@ Index: pam.debian/configure $as_echo_n "(cached) " >&6 else ac_cv_sys_largefile_CC=no -@@ -12949,11 +11935,7 @@ +@@ -12912,11 +11954,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. @@ -8666,7 +9268,7 @@ Index: pam.debian/configure /* end confdefs.h. */ #include <sys/types.h> /* Check that off_t can represent 2**63 - 1 correctly. -@@ -12972,60 +11954,14 @@ +@@ -12935,60 +11973,14 @@ return 0; } _ACEOF @@ -8729,7 +9331,7 @@ Index: pam.debian/configure rm -f core conftest.err conftest.$ac_objext break done -@@ -13033,23 +11969,19 @@ +@@ -12996,23 +11988,19 @@ rm -f conftest.$ac_ext fi fi @@ -8757,7 +9359,7 @@ Index: pam.debian/configure /* end confdefs.h. */ #include <sys/types.h> /* Check that off_t can represent 2**63 - 1 correctly. -@@ -13068,38 +12000,11 @@ +@@ -13031,38 +12019,11 @@ return 0; } _ACEOF @@ -8798,7 +9400,7 @@ Index: pam.debian/configure /* end confdefs.h. */ #define _FILE_OFFSET_BITS 64 #include <sys/types.h> -@@ -13119,38 +12024,15 @@ +@@ -13082,38 +12043,15 @@ return 0; } _ACEOF @@ -8839,7 +9441,7 @@ Index: pam.debian/configure $as_echo "$ac_cv_sys_file_offset_bits" >&6; } case $ac_cv_sys_file_offset_bits in #( no | unknown) ;; -@@ -13162,17 +12044,13 @@ +@@ -13125,17 +12063,13 @@ esac rm -rf conftest* if test $ac_cv_sys_file_offset_bits = unknown; then @@ -8860,7 +9462,7 @@ Index: pam.debian/configure /* end confdefs.h. */ #include <sys/types.h> /* Check that off_t can represent 2**63 - 1 correctly. -@@ -13191,38 +12069,11 @@ +@@ -13154,38 +12088,11 @@ return 0; } _ACEOF @@ -8901,7 +9503,7 @@ Index: pam.debian/configure /* end confdefs.h. */ #define _LARGE_FILES 1 #include <sys/types.h> -@@ -13242,38 +12093,15 @@ +@@ -13205,38 +12112,15 @@ return 0; } _ACEOF @@ -8942,8 +9544,62 @@ Index: pam.debian/configure $as_echo "$ac_cv_sys_large_files" >&6; } case $ac_cv_sys_large_files in #( no | unknown) ;; -@@ -13342,17 +12170,13 @@ +@@ -13310,9 +12194,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 +-{ $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_CC_FOR_BUILD+set}" = set; then ++if test "${ac_cv_prog_CC_FOR_BUILD+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test -n "$CC_FOR_BUILD"; then +@@ -13323,24 +12207,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_CC_FOR_BUILD="$ac_prog" +- $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 + CC_FOR_BUILD=$ac_cv_prog_CC_FOR_BUILD + if test -n "$CC_FOR_BUILD"; then +- { $as_echo "$as_me:$LINENO: result: $CC_FOR_BUILD" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC_FOR_BUILD" >&5 + $as_echo "$CC_FOR_BUILD" >&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 + +@@ -13352,9 +12236,9 @@ + CC_FOR_BUILD=${CC} + fi fi +-{ $as_echo "$as_me:$LINENO: checking for CC_FOR_BUILD" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CC_FOR_BUILD" >&5 + $as_echo_n "checking for CC_FOR_BUILD... " >&6; } +-{ $as_echo "$as_me:$LINENO: result: $CC_FOR_BUILD" >&5 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC_FOR_BUILD" >&5 + $as_echo "$CC_FOR_BUILD" >&6; } + + +@@ -13377,17 +12261,13 @@ + -{ $as_echo "$as_me:$LINENO: checking for __attribute__" >&5 @@ -8963,7 +9619,7 @@ Index: pam.debian/configure /* end confdefs.h. */ #include <stdlib.h> -@@ -13374,54 +12198,29 @@ +@@ -13409,54 +12289,29 @@ return 0; } _ACEOF @@ -9025,7 +9681,7 @@ Index: pam.debian/configure $as_echo_n "(cached) " >&6 else cat > conftest.s <<EOF -@@ -13436,11 +12235,11 @@ +@@ -13471,11 +12326,11 @@ fi rm -f conftest* fi @@ -9040,7 +9696,7 @@ Index: pam.debian/configure $as_echo_n "(cached) " >&6 else if test $libc_cv_asm_symver_directive = yes; then -@@ -13465,11 +12264,11 @@ +@@ -13500,11 +12355,11 @@ -nostartfiles -nostdlib -Wl,--version-script,conftest.map 1>&5' @@ -9055,7 +9711,7 @@ Index: pam.debian/configure then libc_cv_ld_version_script_option=yes else -@@ -13483,7 +12282,7 @@ +@@ -13518,7 +12373,7 @@ fi rm -f conftest* fi @@ -9064,7 +9720,7 @@ Index: pam.debian/configure $as_echo "$libc_cv_ld_version_script_option" >&6; } if test "$libc_cv_ld_version_script_option" = "yes"; then HAVE_VERSIONING_TRUE= -@@ -13495,16 +12294,16 @@ +@@ -13530,16 +12385,16 @@ # Check whether --enable-pie was given. @@ -9084,7 +9740,7 @@ Index: pam.debian/configure $as_echo_n "(cached) " >&6 else cat > conftest.c <<EOF -@@ -13514,11 +12313,11 @@ +@@ -13549,11 +12404,11 @@ if test "$USE_PIE" = "yes" -a "$CC" != "icc" && { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -pie -fpie -o conftest conftest.c 1>&5' @@ -9099,7 +9755,7 @@ Index: pam.debian/configure then libc_cv_fpie=yes PIE_CFLAGS="-fpie" -@@ -13530,7 +12329,7 @@ +@@ -13565,7 +12420,7 @@ fi rm -f conftest* fi @@ -9108,7 +9764,7 @@ Index: pam.debian/configure $as_echo "$libc_cv_fpie" >&6; } -@@ -13539,7 +12338,7 @@ +@@ -13574,7 +12429,7 @@ # Check whether --enable-prelude was given. @@ -9117,7 +9773,7 @@ Index: pam.debian/configure enableval=$enable_prelude; WITH_PRELUDE=$enableval else WITH_PRELUDE=yes -@@ -13548,7 +12347,7 @@ +@@ -13583,7 +12438,7 @@ if test "$WITH_PRELUDE" == "yes" ; then # Check whether --with-libprelude-prefix was given. @@ -9126,7 +9782,7 @@ Index: pam.debian/configure withval=$with_libprelude_prefix; libprelude_config_prefix="$withval" else libprelude_config_prefix="" -@@ -13563,9 +12362,9 @@ +@@ -13598,9 +12453,9 @@ # Extract the first word of "libprelude-config", so it can be a program name with args. set dummy libprelude-config; ac_word=$2 @@ -9138,7 +9794,7 @@ Index: pam.debian/configure $as_echo_n "(cached) " >&6 else case $LIBPRELUDE_CONFIG in -@@ -13578,14 +12377,14 @@ +@@ -13613,14 +12468,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -9156,7 +9812,7 @@ Index: pam.debian/configure IFS=$as_save_IFS test -z "$ac_cv_path_LIBPRELUDE_CONFIG" && ac_cv_path_LIBPRELUDE_CONFIG="no" -@@ -13594,16 +12393,16 @@ +@@ -13629,16 +12484,16 @@ fi LIBPRELUDE_CONFIG=$ac_cv_path_LIBPRELUDE_CONFIG if test -n "$LIBPRELUDE_CONFIG"; then @@ -9176,7 +9832,7 @@ Index: pam.debian/configure $as_echo_n "checking for libprelude - version >= $min_libprelude_version... " >&6; } no_libprelude="" if test "$LIBPRELUDE_CONFIG" = "no" ; then -@@ -13625,14 +12424,10 @@ +@@ -13660,14 +12515,10 @@ LDFLAGS="$LDFLAGS $LIBPRELUDE_LDFLAGS" LIBS="$LIBS $LIBPRELUDE_LIBS" rm -f conf.libpreludetest @@ -9193,7 +9849,7 @@ Index: pam.debian/configure /* end confdefs.h. */ #include <stdio.h> -@@ -13690,56 +12485,29 @@ +@@ -13725,56 +12576,29 @@ } _ACEOF @@ -9257,7 +9913,7 @@ Index: pam.debian/configure $as_echo "no" >&6; } fi if test "$LIBPRELUDE_CONFIG" = "no" ; then -@@ -13755,11 +12523,7 @@ +@@ -13790,11 +12614,7 @@ CFLAGS="$CFLAGS $LIBPRELUDE_CFLAGS" LDFLAGS="$LDFLAGS $LIBPRELUDE_LDFLAGS" LIBS="$LIBS $LIBPRELUDE_LIBS" @@ -9270,7 +9926,7 @@ Index: pam.debian/configure /* end confdefs.h. */ #include <stdio.h> -@@ -13775,27 +12539,7 @@ +@@ -13810,27 +12630,7 @@ return 0; } _ACEOF @@ -9299,7 +9955,7 @@ Index: pam.debian/configure echo "*** The test program compiled, but did not run. This usually means" echo "*** that the run-time linker is not finding LIBPRELUDE or finding the wrong" echo "*** version of LIBPRELUDE. If it is not finding LIBPRELUDE, you'll need to set your" -@@ -13807,18 +12551,13 @@ +@@ -13842,18 +12642,13 @@ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" echo "***" else @@ -9321,7 +9977,7 @@ Index: pam.debian/configure CFLAGS="$ac_save_CFLAGS" LDFLAGS="$ac_save_LDFLAGS" LIBS="$ac_save_LIBS" -@@ -13843,21 +12582,19 @@ +@@ -13878,21 +12673,19 @@ fi # Check whether --enable-debug was given. @@ -9346,7 +10002,7 @@ Index: pam.debian/configure enableval=$enable_securedir; SECUREDIR=$enableval else SECUREDIR=$libdir/security -@@ -13866,7 +12603,7 @@ +@@ -13901,7 +12694,7 @@ # Check whether --enable-isadir was given. @@ -9355,7 +10011,7 @@ Index: pam.debian/configure enableval=$enable_isadir; ISA=$enableval else ISA=../../`basename $libdir`/security -@@ -13878,11 +12615,11 @@ +@@ -13913,11 +12706,11 @@ #define _PAM_ISA "$ISA" _ACEOF @@ -9369,7 +10025,7 @@ Index: pam.debian/configure enableval=$enable_sconfigdir; SCONFIGDIR=$enableval else SCONFIGDIR=$sysconfdir/security -@@ -13891,35 +12628,31 @@ +@@ -13926,35 +12719,31 @@ # Check whether --enable-pamlocking was given. @@ -9410,30 +10066,19 @@ Index: pam.debian/configure enableval=$enable_lckpwdf; WITH_LCKPWDF=$enableval else WITH_LCKPWDF=yes -@@ -13927,175 +12660,35 @@ +@@ -13962,152 +12751,16 @@ if test "$WITH_LCKPWDF" == "yes" ; then -cat >>confdefs.h <<\_ACEOF -#define USE_LCKPWDF 1 +-_ACEOF +$as_echo "#define USE_LCKPWDF 1" >>confdefs.h -+ -+fi -+ -+for ac_header in paths.h -+do : -+ ac_fn_c_check_header_mongrel "$LINENO" "paths.h" "ac_cv_header_paths_h" "$ac_includes_default" -+if test "x$ac_cv_header_paths_h" = x""yes; then : -+ cat >>confdefs.h <<_ACEOF -+#define HAVE_PATHS_H 1 - _ACEOF fi -+done -+ - --for ac_header in paths.h +- + for ac_header in paths.h -do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then @@ -9570,21 +10215,22 @@ Index: pam.debian/configure -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then -- cat >>confdefs.h <<_ACEOF ++do : ++ ac_fn_c_check_header_mongrel "$LINENO" "paths.h" "ac_cv_header_paths_h" "$ac_includes_default" ++if test "x$ac_cv_header_paths_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 --_ACEOF -- --fi -- --done -- -- --# Check whether --with-mailspool was given. ++#define HAVE_PATHS_H 1 + _ACEOF + + fi +@@ -14116,21 +12769,17 @@ + + + # Check whether --with-mailspool was given. -if test "${with_mailspool+set}" = set; then -- withval=$with_mailspool; with_mailspool=${withval} -+# Check whether --with-mailspool was given. +if test "${with_mailspool+set}" = set; then : -+ withval=$with_mailspool; with_mailspool=${withval} + withval=$with_mailspool; with_mailspool=${withval} fi if test x$with_mailspool != x ; then @@ -9603,7 +10249,7 @@ Index: pam.debian/configure /* end confdefs.h. */ #include <paths.h> -@@ -14107,42 +12700,15 @@ +@@ -14142,42 +12791,15 @@ #endif } _ACEOF @@ -9650,7 +10296,7 @@ Index: pam.debian/configure fi cat >>confdefs.h <<_ACEOF -@@ -14152,16 +12718,16 @@ +@@ -14187,16 +12809,16 @@ # Check whether --with-xauth was given. @@ -9670,7 +10316,7 @@ Index: pam.debian/configure $as_echo_n "(cached) " >&6 else case $pam_xauth_path in -@@ -14174,14 +12740,14 @@ +@@ -14209,14 +12831,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -9688,7 +10334,7 @@ Index: pam.debian/configure IFS=$as_save_IFS ;; -@@ -14189,10 +12755,10 @@ +@@ -14224,10 +12846,10 @@ fi pam_xauth_path=$ac_cv_path_pam_xauth_path if test -n "$pam_xauth_path"; then @@ -9701,7 +10347,7 @@ Index: pam.debian/configure $as_echo "no" >&6; } fi -@@ -14210,18 +12776,14 @@ +@@ -14245,18 +12867,14 @@ fi @@ -9723,7 +10369,7 @@ Index: pam.debian/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -14239,43 +12801,18 @@ +@@ -14274,43 +12892,18 @@ return 0; } _ACEOF @@ -9773,7 +10419,7 @@ Index: pam.debian/configure LIBDL="-ldl" else LIBDL="" -@@ -14285,166 +12822,28 @@ +@@ -14320,166 +12913,28 @@ # Check for cracklib # Check whether --enable-cracklib was given. @@ -9793,13 +10439,23 @@ Index: pam.debian/configure - { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -- $as_echo_n "(cached) " >&6 ++ for ac_header in crack.h ++do : ++ ac_fn_c_check_header_mongrel "$LINENO" "crack.h" "ac_cv_header_crack_h" "$ac_includes_default" ++if test "x$ac_cv_header_crack_h" = x""yes; then : ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_CRACK_H 1 ++_ACEOF ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FascistCheck in -lcrack" >&5 ++$as_echo_n "checking for FascistCheck in -lcrack... " >&6; } ++if test "${ac_cv_lib_crack_FascistCheck+set}" = set; then : + $as_echo_n "(cached) " >&6 -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } --else + else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -$as_echo_n "checking $ac_header usability... " >&6; } @@ -9923,33 +10579,28 @@ Index: pam.debian/configure -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then -+ for ac_header in crack.h -+do : -+ ac_fn_c_check_header_mongrel "$LINENO" "crack.h" "ac_cv_header_crack_h" "$ac_includes_default" -+if test "x$ac_cv_header_crack_h" = x""yes; then : - cat >>confdefs.h <<_ACEOF +- cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+#define HAVE_CRACK_H 1 - _ACEOF +-_ACEOF - { $as_echo "$as_me:$LINENO: checking for FascistCheck in -lcrack" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FascistCheck in -lcrack" >&5 - $as_echo_n "checking for FascistCheck in -lcrack... " >&6; } +-$as_echo_n "checking for FascistCheck in -lcrack... " >&6; } -if test "${ac_cv_lib_crack_FascistCheck+set}" = set; then -+if test "${ac_cv_lib_crack_FascistCheck+set}" = set; then : - $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-lcrack $LIBS" +- $as_echo_n "(cached) " >&6 +-else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-lcrack $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-lcrack $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -14462,43 +12861,18 @@ +@@ -14497,43 +12952,18 @@ return 0; } _ACEOF @@ -9999,7 +10650,7 @@ Index: pam.debian/configure LIBCRACK="-lcrack" else LIBCRACK="" -@@ -14522,153 +12896,23 @@ +@@ -14557,153 +12987,23 @@ # Check whether --enable-audit was given. @@ -10159,7 +10810,7 @@ Index: pam.debian/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -14686,145 +12930,26 @@ +@@ -14721,145 +13021,26 @@ return 0; } _ACEOF @@ -10314,7 +10965,7 @@ Index: pam.debian/configure HAVE_AUDIT_TTY_STATUS=yes else HAVE_AUDIT_TTY_STATUS="" -@@ -14836,16 +12961,12 @@ +@@ -14871,16 +13052,12 @@ if test ! -z "$LIBAUDIT" -a "$ac_cv_header_libaudit_h" != "no" ; then @@ -10333,7 +10984,7 @@ Index: pam.debian/configure fi else -@@ -14861,145 +12982,12 @@ +@@ -14896,172 +13073,33 @@ fi @@ -10364,7 +11015,13 @@ Index: pam.debian/configure -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> --_ACEOF ++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" ++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : ++ cat >>confdefs.h <<_ACEOF ++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 + _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in @@ -10387,14 +11044,15 @@ Index: pam.debian/configure -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -- + - ac_header_compiler=no --fi -- + fi + -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } -- ++done + -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -$as_echo_n "checking $ac_header presence... " >&6; } @@ -10476,17 +11134,23 @@ Index: pam.debian/configure -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then -+do : -+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -+eval as_val=\$$as_ac_Header -+ if test "x$as_val" = x""yes; then : - cat >>confdefs.h <<_ACEOF - #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 - _ACEOF -@@ -15009,17 +12997,13 @@ - done +- cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +-_ACEOF +- +-fi +- +-done +- +-if test "x$ac_cv_header_xcrypt_h" = "xyes"; then +- crypt_libs="xcrypt crypt" ++if test "x$ac_cv_header_xcrypt_h" = "xyes"; then : ++ crypt_libs="xcrypt crypt" + else + crypt_libs="crypt" + fi +- BACKUP_LIBS=$LIBS -{ $as_echo "$as_me:$LINENO: checking for library containing crypt" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing crypt" >&5 @@ -10505,7 +11169,7 @@ Index: pam.debian/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -15044,155 +13028,39 @@ +@@ -15086,155 +13124,38 @@ ac_res=-l$ac_lib LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi @@ -10669,12 +11333,11 @@ Index: pam.debian/configure +do : + 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 : ++if eval test \"x\$"$as_ac_var"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF -@@ -15204,15 +13072,13 @@ +@@ -15246,15 +13167,13 @@ if test "$LIBCRYPT" = "-lxcrypt" -a "$ac_cv_header_xcrypt_h" = "yes" ; then @@ -10692,7 +11355,7 @@ Index: pam.debian/configure withval=$with_randomdev; opt_randomdev=$withval fi -@@ -15230,7 +13096,7 @@ +@@ -15272,7 +13191,7 @@ fi # Check whether --enable-db was given. @@ -10701,7 +11364,7 @@ Index: pam.debian/configure enableval=$enable_db; WITH_DB=$enableval else WITH_DB=yes -@@ -15238,25 +13104,21 @@ +@@ -15280,7 +13199,7 @@ # Check whether --with-db-uniquename was given. @@ -10710,109 +11373,67 @@ Index: pam.debian/configure withval=$with_db_uniquename; fi - if test x"$WITH_DB" != xno ; then +@@ -15288,103 +13207,11 @@ if test x"$WITH_DB" = xyes -o x"$WITH_DB" = xdb ; then - as_ac_Lib=`$as_echo "ac_cv_lib_db$with_db_uniquename''_db_create$with_db_uniquename" | $as_tr_sh` --{ $as_echo "$as_me:$LINENO: checking for db_create$with_db_uniquename in -ldb$with_db_uniquename" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for db_create$with_db_uniquename in -ldb$with_db_uniquename" >&5 - $as_echo_n "checking for db_create$with_db_uniquename in -ldb$with_db_uniquename... " >&6; } --if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then -+if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : - $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-ldb$with_db_uniquename $LIBS" --cat >conftest.$ac_ext <<_ACEOF + old_libs=$LIBS + LIBS="$LIBS -ldb$with_db_uniquename" +- +- +- +- +-for ac_func in db_create$with_db_uniquename db_create dbm_store$with_db_uniquename dbm_store +-do +-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +-$as_echo_n "checking for $ac_func... " >&6; } +-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then +- $as_echo_n "(cached) " >&6 +-else +- cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - /* Override any GCC internal prototype to avoid an error. -@@ -15274,47 +13136,20 @@ - return 0; - } - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_link") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_test_x conftest$ac_exeext -- }; then -+if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" - else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 +-/* end confdefs.h. */ +-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. +- For example, HP-UX 11i <limits.h> declares gettimeofday. */ +-#define $ac_func innocuous_$ac_func - -- eval "$as_ac_Lib=no" -+ eval "$as_ac_Lib=no" - fi +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char $ac_func (); below. +- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since +- <limits.h> exists even on freestanding compilers. */ - --rm -rf conftest.dSYM --rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -- conftest$ac_exeext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --ac_res=`eval 'as_val=${'$as_ac_Lib'} -- $as_echo "$as_val"'` -- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+eval ac_res=\$$as_ac_Lib -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 - $as_echo "$ac_res" >&6; } --as_val=`eval 'as_val=${'$as_ac_Lib'} -- $as_echo "$as_val"'` -- if test "x$as_val" = x""yes; then -+eval as_val=\$$as_ac_Lib -+ if test "x$as_val" = x""yes; then : - LIBDB="-ldb$with_db_uniquename" - else - LIBDB="" -@@ -15322,18 +13157,14 @@ - - if test -z "$LIBDB" ; then - as_ac_Lib=`$as_echo "ac_cv_lib_db$with_db_uniquename''_dbm_store$with_db_uniquename" | $as_tr_sh` --{ $as_echo "$as_me:$LINENO: checking for dbm_store$with_db_uniquename in -ldb$with_db_uniquename" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dbm_store$with_db_uniquename in -ldb$with_db_uniquename" >&5 - $as_echo_n "checking for dbm_store$with_db_uniquename in -ldb$with_db_uniquename... " >&6; } --if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then -+if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : - $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-ldb$with_db_uniquename $LIBS" --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ +-#ifdef __STDC__ +-# include <limits.h> +-#else +-# include <assert.h> +-#endif +- +-#undef $ac_func +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char $ac_func (); +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined __stub_$ac_func || defined __stub___$ac_func +-choke me +-#endif +- +-int +-main () +-{ +-return $ac_func (); +- ; +- return 0; +-} -_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - /* Override any GCC internal prototype to avoid an error. -@@ -15351,47 +13182,20 @@ - return 0; - } - _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in @@ -10834,39 +11455,35 @@ Index: pam.debian/configure - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then -+if ac_fn_c_try_link "$LINENO"; then : - eval "$as_ac_Lib=yes" - else +- eval "$as_ac_var=yes" +-else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -- eval "$as_ac_Lib=no" -+ eval "$as_ac_Lib=no" - fi +- eval "$as_ac_var=no" +-fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --ac_res=`eval 'as_val=${'$as_ac_Lib'} +-fi +-ac_res=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+eval ac_res=\$$as_ac_Lib -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 - $as_echo "$ac_res" >&6; } --as_val=`eval 'as_val=${'$as_ac_Lib'} +-$as_echo "$ac_res" >&6; } +-as_val=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then -+eval as_val=\$$as_ac_Lib -+ if test "x$as_val" = x""yes; then : - LIBDB="-ldb$with_db_uniquename" - else - LIBDB="" -@@ -15400,18 +13204,14 @@ - fi ++ for ac_func in db_create$with_db_uniquename db_create dbm_store$with_db_uniquename dbm_store ++do : ++ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" ++if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF + #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 + _ACEOF +@@ -15395,18 +13222,14 @@ + LIBS=$old_libs fi if test -z "$LIBDB" ; then - { $as_echo "$as_me:$LINENO: checking for dbm_store in -lndbm" >&5 @@ -10887,7 +11504,7 @@ Index: pam.debian/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -15429,189 +13229,30 @@ +@@ -15424,367 +13247,70 @@ return 0; } _ACEOF @@ -10966,7 +11583,13 @@ Index: pam.debian/configure -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> --_ACEOF ++ for ac_header in ndbm.h ++do : ++ ac_fn_c_check_header_mongrel "$LINENO" "ndbm.h" "ac_cv_header_ndbm_h" "$ac_includes_default" ++if test "x$ac_cv_header_ndbm_h" = x""yes; then : ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_NDBM_H 1 + _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in @@ -10989,14 +11612,15 @@ Index: pam.debian/configure -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -- + - ac_header_compiler=no --fi -- + fi + -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } -- ++done + -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -$as_echo_n "checking $ac_header presence... " >&6; } @@ -11007,7 +11631,15 @@ Index: pam.debian/configure -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> --_ACEOF ++ fi ++ else ++ for ac_header in db.h ++do : ++ ac_fn_c_check_header_mongrel "$LINENO" "db.h" "ac_cv_header_db_h" "$ac_includes_default" ++if test "x$ac_cv_header_db_h" = x""yes; then : ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_DB_H 1 + _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; @@ -11029,10 +11661,10 @@ Index: pam.debian/configure -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -- + - ac_header_preproc=no --fi -- + fi + -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } @@ -11073,25 +11705,29 @@ Index: pam.debian/configure - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -- --fi ++done + ++ fi + fi -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then -+ for ac_header in ndbm.h -+do : -+ ac_fn_c_check_header_mongrel "$LINENO" "ndbm.h" "ac_cv_header_ndbm_h" "$ac_includes_default" -+if test "x$ac_cv_header_ndbm_h" = x""yes; then : - cat >>confdefs.h <<_ACEOF +- cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+#define HAVE_NDBM_H 1 - _ACEOF +-_ACEOF ++ if test ! -z "$LIBDB"; then ++ HAVE_LIBDB_TRUE= ++ HAVE_LIBDB_FALSE='#' ++else ++ HAVE_LIBDB_TRUE='#' ++ HAVE_LIBDB_FALSE= fi -@@ -15620,146 +13261,12 @@ - fi - else +-done + +- fi +- else - -for ac_header in db.h -do @@ -11230,20 +11866,26 @@ Index: pam.debian/configure -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then -+ for ac_header in db.h -+do : -+ ac_fn_c_check_header_mongrel "$LINENO" "db.h" "ac_cv_header_db_h" "$ac_includes_default" -+if test "x$ac_cv_header_db_h" = x""yes; then : - cat >>confdefs.h <<_ACEOF +- cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+#define HAVE_DB_H 1 - _ACEOF - - fi -@@ -15778,18 +13285,14 @@ - fi - - +-_ACEOF +- +-fi +- +-done +- +- fi +-fi +- +- if test ! -z "$LIBDB"; then +- HAVE_LIBDB_TRUE= +- HAVE_LIBDB_FALSE='#' +-else +- HAVE_LIBDB_TRUE='#' +- HAVE_LIBDB_FALSE= +-fi +- +- -{ $as_echo "$as_me:$LINENO: checking for yp_get_default_domain in -lnsl" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for yp_get_default_domain in -lnsl" >&5 $as_echo_n "checking for yp_get_default_domain in -lnsl... " >&6; } @@ -11262,7 +11904,7 @@ Index: pam.debian/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -15807,43 +13310,18 @@ +@@ -15802,43 +13328,18 @@ return 0; } _ACEOF @@ -11312,7 +11954,7 @@ Index: pam.debian/configure LIBNSL="-lnsl" else LIBNSL="" -@@ -15851,107 +13329,12 @@ +@@ -15846,107 +13347,11 @@ BACKUP_LIBS=$LIBS LIBS="$LIBS $LIBNSL" @@ -11420,12 +12062,11 @@ Index: pam.debian/configure +do : + 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 : ++if eval test \"x\$"$as_ac_var"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF -@@ -15963,25 +13346,21 @@ +@@ -15958,25 +13363,21 @@ # Check whether --enable-selinux was given. @@ -11455,7 +12096,7 @@ Index: pam.debian/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -15999,43 +13378,18 @@ +@@ -15994,43 +13395,18 @@ return 0; } _ACEOF @@ -11505,7 +12146,7 @@ Index: pam.debian/configure LIBSELINUX="-lselinux" else LIBSELINUX="" -@@ -16055,210 +13409,28 @@ +@@ -16050,304 +13426,85 @@ if test ! -z "$LIBSELINUX" ; then @@ -11540,22 +12181,31 @@ Index: pam.debian/configure -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. - For example, HP-UX 11i <limits.h> declares gettimeofday. */ -#define $ac_func innocuous_$ac_func -- + -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since - <limits.h> exists even on freestanding compilers. */ ++fi ++done -#ifdef __STDC__ -# include <limits.h> -#else -# include <assert.h> -#endif ++ for ac_func in getseuser ++do : ++ ac_fn_c_check_func "$LINENO" "getseuser" "ac_cv_func_getseuser" ++if test "x$ac_cv_func_getseuser" = x""yes; then : ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_GETSEUSER 1 ++_ACEOF + +-#undef $ac_func +fi +done --#undef $ac_func -- -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ @@ -11569,15 +12219,32 @@ Index: pam.debian/configure -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif -- --int --main () --{ ++ 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` ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5 ++$as_echo_n "checking for $ac_hdr that defines DIR... " >&6; } ++if eval "test \"\${$as_ac_Header+set}\"" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include <sys/types.h> ++#include <$ac_hdr> + + int + main () + { -return $ac_func (); -- ; -- return 0; --} --_ACEOF ++if ((DIR *) 0) ++return 0; + ; + return 0; + } + _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in @@ -11600,32 +12267,41 @@ Index: pam.debian/configure - $as_test_x conftest$ac_exeext - }; then - eval "$as_ac_var=yes" --else ++if ac_fn_c_try_compile "$LINENO"; then : ++ eval "$as_ac_Header=yes" + else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" --fi ++ eval "$as_ac_Header=no" + fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext --fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi -ac_res=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 --$as_echo "$ac_res" >&6; } ++eval ac_res=\$$as_ac_Header ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 + $as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then -- cat >>confdefs.h <<_ACEOF ++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 --_ACEOF -- --fi ++#define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1 + _ACEOF + ++ac_header_dirent=$ac_hdr; break + fi -done - -- + -for ac_func in getseuser -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` @@ -11722,48 +12398,44 @@ Index: pam.debian/configure - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF -+ for ac_func in getseuser -+do : -+ ac_fn_c_check_func "$LINENO" "getseuser" "ac_cv_func_getseuser" -+if test "x$ac_cv_func_getseuser" = x""yes; then : -+ cat >>confdefs.h <<_ACEOF -+#define HAVE_GETSEUSER 1 -+_ACEOF - - fi - done -@@ -16266,24 +13438,15 @@ - LIBS=$BACKUP_LIBS - fi - - +-fi +-done +- +- LIBS=$BACKUP_LIBS +-fi - - - - - ac_header_dirent=no - for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do - as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` +- +- +-ac_header_dirent=no +-for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do +- as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5 - $as_echo_n "checking for $ac_hdr that defines DIR... " >&6; } +-$as_echo_n "checking for $ac_hdr that defines DIR... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then : - $as_echo_n "(cached) " >&6 - else +- $as_echo_n "(cached) " >&6 +-else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include <sys/types.h> - #include <$ac_hdr> -@@ -16297,41 +13460,18 @@ - return 0; - } - _ACEOF +-/* end confdefs.h. */ +-#include <sys/types.h> +-#include <$ac_hdr> +- +-int +-main () +-{ +-if ((DIR *) 0) +-return 0; +- ; +- return 0; +-} +-_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in @@ -11782,40 +12454,41 @@ Index: pam.debian/configure - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then -+if ac_fn_c_try_compile "$LINENO"; then : - eval "$as_ac_Header=yes" - else +- eval "$as_ac_Header=yes" +-else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Header=no" -+ eval "$as_ac_Header=no" - fi +-fi - - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+eval ac_res=\$$as_ac_Header -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 - $as_echo "$ac_res" >&6; } +-$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then -+eval as_val=\$$as_ac_Header -+ if test "x$as_val" = x""yes; then : - cat >>confdefs.h <<_ACEOF - #define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1 - _ACEOF -@@ -16342,17 +13482,13 @@ - done - # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. - if test $ac_header_dirent = dirent.h; then +- cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1 +-_ACEOF +- +-ac_header_dirent=$ac_hdr; break +-fi +- +-done +-# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. +-if test $ac_header_dirent = dirent.h; then - { $as_echo "$as_me:$LINENO: checking for library containing opendir" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5 - $as_echo_n "checking for library containing opendir... " >&6; } +-$as_echo_n "checking for library containing opendir... " >&6; } -if test "${ac_cv_search_opendir+set}" = set; then ++done ++# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. ++if test $ac_header_dirent = dirent.h; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5 ++$as_echo_n "checking for library containing opendir... " >&6; } +if test "${ac_cv_search_opendir+set}" = set; then : $as_echo_n "(cached) " >&6 else @@ -11829,7 +12502,7 @@ Index: pam.debian/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -16377,70 +13513,39 @@ +@@ -16372,70 +13529,39 @@ ac_res=-l$ac_lib LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi @@ -11911,7 +12584,7 @@ Index: pam.debian/configure /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. -@@ -16465,70 +13570,39 @@ +@@ -16460,70 +13586,39 @@ ac_res=-l$ac_lib LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi @@ -11993,7 +12666,7 @@ Index: pam.debian/configure /* end confdefs.h. */ #include <stdlib.h> #include <stdarg.h> -@@ -16543,48 +13617,23 @@ +@@ -16538,48 +13633,23 @@ return 0; } _ACEOF @@ -12047,7 +12720,7 @@ Index: pam.debian/configure else ac_cv_header_stdc=no fi -@@ -16594,18 +13643,14 @@ +@@ -16589,18 +13659,14 @@ if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. @@ -12069,7 +12742,7 @@ Index: pam.debian/configure else ac_cv_header_stdc=no fi -@@ -16615,14 +13660,10 @@ +@@ -16610,14 +13676,10 @@ if test $ac_cv_header_stdc = yes; then # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. @@ -12086,7 +12759,7 @@ Index: pam.debian/configure /* end confdefs.h. */ #include <ctype.h> #include <stdlib.h> -@@ -16649,64 +13690,31 @@ +@@ -16644,64 +13706,31 @@ return 0; } _ACEOF @@ -12161,7 +12834,7 @@ Index: pam.debian/configure /* end confdefs.h. */ #include <sys/types.h> #include <sys/wait.h> -@@ -16727,413 +13735,94 @@ +@@ -16722,413 +13751,92 @@ return 0; } _ACEOF @@ -12211,8 +12884,7 @@ Index: pam.debian/configure +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -+eval as_val=\$$as_ac_Header -+ if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF @@ -12226,8 +12898,7 @@ Index: pam.debian/configure +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -+eval as_val=\$$as_ac_Header -+ if test "x$as_val" = x""yes; then : ++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF @@ -12634,7 +13305,7 @@ Index: pam.debian/configure /* end confdefs.h. */ #include <sys/types.h> #include <sys/param.h> -@@ -17151,30 +13840,9 @@ +@@ -17146,30 +13854,9 @@ return 0; } _ACEOF @@ -12667,7 +13338,7 @@ Index: pam.debian/configure /* end confdefs.h. */ #include <sys/types.h> #include <sys/param.h> -@@ -17190,49 +13858,18 @@ +@@ -17185,49 +13872,18 @@ return 0; } _ACEOF @@ -12720,7 +13391,7 @@ Index: pam.debian/configure /* end confdefs.h. */ #include <limits.h> -@@ -17247,30 +13884,9 @@ +@@ -17242,30 +13898,9 @@ return 0; } _ACEOF @@ -12753,7 +13424,7 @@ Index: pam.debian/configure /* end confdefs.h. */ #include <limits.h> -@@ -17285,51 +13901,20 @@ +@@ -17280,51 +13915,20 @@ return 0; } _ACEOF @@ -12809,7 +13480,7 @@ Index: pam.debian/configure /* end confdefs.h. */ short int ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; -@@ -17355,24 +13940,7 @@ +@@ -17350,24 +13954,7 @@ return 0; } _ACEOF @@ -12835,7 +13506,7 @@ Index: pam.debian/configure if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then ac_cv_c_bigendian=yes fi -@@ -17384,20 +13952,10 @@ +@@ -17379,20 +13966,10 @@ ac_cv_c_bigendian=unknown fi fi @@ -12857,7 +13528,7 @@ Index: pam.debian/configure /* end confdefs.h. */ $ac_includes_default int -@@ -17417,79 +13975,41 @@ +@@ -17412,79 +13989,41 @@ return 0; } _ACEOF @@ -12929,8 +13600,8 @@ Index: pam.debian/configure -$as_echo "$as_me: error: unknown endianness - presetting ac_cv_c_bigendian=no (or yes) will help" >&2;} - { (exit 1); exit 1; }; } ;; -+ as_fn_error "unknown endianness -+ presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;; ++ as_fn_error $? "unknown endianness ++ presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;; esac -{ $as_echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5 @@ -12949,7 +13620,7 @@ Index: pam.debian/configure /* end confdefs.h. */ int -@@ -17549,60 +14069,33 @@ +@@ -17544,60 +14083,33 @@ return 0; } _ACEOF @@ -13018,7 +13689,7 @@ Index: pam.debian/configure ac_cv_type_uid_t=yes else ac_cv_type_uid_t=no -@@ -17610,117 +14103,20 @@ +@@ -17605,117 +14117,20 @@ rm -f conftest* fi @@ -13141,7 +13812,7 @@ Index: pam.debian/configure else cat >>confdefs.h <<_ACEOF -@@ -17729,102 +14125,9 @@ +@@ -17724,102 +14139,9 @@ fi @@ -13246,7 +13917,7 @@ Index: pam.debian/configure else cat >>confdefs.h <<_ACEOF -@@ -17833,102 +14136,9 @@ +@@ -17828,102 +14150,9 @@ fi @@ -13351,7 +14022,7 @@ Index: pam.debian/configure else cat >>confdefs.h <<_ACEOF -@@ -17937,16 +14147,12 @@ +@@ -17932,16 +14161,12 @@ fi @@ -13371,7 +14042,7 @@ Index: pam.debian/configure /* end confdefs.h. */ #include <sys/types.h> #include <sys/time.h> -@@ -17961,54 +14167,27 @@ +@@ -17956,54 +14181,27 @@ return 0; } _ACEOF @@ -13433,7 +14104,7 @@ Index: pam.debian/configure /* end confdefs.h. */ #include <sys/types.h> #include <time.h> -@@ -18023,58 +14202,31 @@ +@@ -18018,58 +14216,31 @@ return 0; } _ACEOF @@ -13500,7 +14171,7 @@ Index: pam.debian/configure /* end confdefs.h. */ /* Thanks to Mike Rendell for this test. */ $ac_includes_default -@@ -18100,54 +14252,23 @@ +@@ -18095,925 +14266,167 @@ return n > 0 && gidset[n] != val.gval; } _ACEOF @@ -13526,133 +14197,146 @@ Index: pam.debian/configure - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -+if ac_fn_c_try_run "$LINENO"; then : - ac_cv_type_getgroups=gid_t - else +- ac_cv_type_getgroups=gid_t +-else - $as_echo "$as_me: program exited with status $ac_status" >&5 -$as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -ac_cv_type_getgroups=int -+ ac_cv_type_getgroups=int - fi +-fi -rm -rf conftest.dSYM -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -+ conftest.$ac_objext conftest.beam conftest.$ac_ext - fi - +-fi - - if test $ac_cv_type_getgroups = cross; then +- +-if test $ac_cv_type_getgroups = cross; then - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include <unistd.h> - - _ACEOF - if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +-/* end confdefs.h. */ +-#include <unistd.h> +- +-_ACEOF +-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "getgroups.*int.*gid_t" >/dev/null 2>&1; then -+ $EGREP "getgroups.*int.*gid_t" >/dev/null 2>&1; then : ++if ac_fn_c_try_run "$LINENO"; then : ac_cv_type_getgroups=gid_t else - ac_cv_type_getgroups=int -@@ -18156,7 +14277,7 @@ - - fi - fi +- ac_cv_type_getgroups=int +-fi +-rm -f conftest* +- +-fi +-fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_getgroups" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_getgroups" >&5 - $as_echo "$ac_cv_type_getgroups" >&6; } - - cat >>confdefs.h <<_ACEOF -@@ -18165,23 +14286,19 @@ - - - if test $ac_cv_c_compiler_gnu = yes; then +-$as_echo "$ac_cv_type_getgroups" >&6; } +- +-cat >>confdefs.h <<_ACEOF +-#define GETGROUPS_T $ac_cv_type_getgroups +-_ACEOF +- +- +-if test $ac_cv_c_compiler_gnu = yes; then - { $as_echo "$as_me:$LINENO: checking whether $CC needs -traditional" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC needs -traditional" >&5 - $as_echo_n "checking whether $CC needs -traditional... " >&6; } +-$as_echo_n "checking whether $CC needs -traditional... " >&6; } -if test "${ac_cv_prog_gcc_traditional+set}" = set; then -+if test "${ac_cv_prog_gcc_traditional+set}" = set; then : - $as_echo_n "(cached) " >&6 - else - ac_pattern="Autoconf.*'x'" +- $as_echo_n "(cached) " >&6 +-else +- ac_pattern="Autoconf.*'x'" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include <sgtty.h> - Autoconf TIOCGETP - _ACEOF - if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +-/* end confdefs.h. */ +-#include <sgtty.h> +-Autoconf TIOCGETP +-_ACEOF +-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "$ac_pattern" >/dev/null 2>&1; then -+ $EGREP "$ac_pattern" >/dev/null 2>&1; then : - ac_cv_prog_gcc_traditional=yes - else - ac_cv_prog_gcc_traditional=no -@@ -18190,43 +14307,35 @@ - - - if test $ac_cv_prog_gcc_traditional = no; then +- ac_cv_prog_gcc_traditional=yes +-else +- ac_cv_prog_gcc_traditional=no +-fi +-rm -f conftest* +- +- +- if test $ac_cv_prog_gcc_traditional = no; then - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include <termio.h> - Autoconf TCGETA - _ACEOF - if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +-/* end confdefs.h. */ +-#include <termio.h> +-Autoconf TCGETA +-_ACEOF +-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "$ac_pattern" >/dev/null 2>&1; then -+ $EGREP "$ac_pattern" >/dev/null 2>&1; then : - ac_cv_prog_gcc_traditional=yes - fi - rm -f conftest* - - fi - fi +- ac_cv_prog_gcc_traditional=yes +-fi +-rm -f conftest* +- +- fi +-fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_gcc_traditional" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_gcc_traditional" >&5 - $as_echo "$ac_cv_prog_gcc_traditional" >&6; } - if test $ac_cv_prog_gcc_traditional = yes; then - CC="$CC -traditional" - fi - fi - +-$as_echo "$ac_cv_prog_gcc_traditional" >&6; } +- if test $ac_cv_prog_gcc_traditional = yes; then +- CC="$CC -traditional" +- fi +-fi +- -{ $as_echo "$as_me:$LINENO: checking for working memcmp" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working memcmp" >&5 - $as_echo_n "checking for working memcmp... " >&6; } +-$as_echo_n "checking for working memcmp... " >&6; } -if test "${ac_cv_func_memcmp_working+set}" = set; then -+if test "${ac_cv_func_memcmp_working+set}" = set; then : - $as_echo_n "(cached) " >&6 - else +- $as_echo_n "(cached) " >&6 +-else - if test "$cross_compiling" = yes; then -+ if test "$cross_compiling" = yes; then : - ac_cv_func_memcmp_working=no - else +- ac_cv_func_memcmp_working=no +-else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - $ac_includes_default - int -@@ -18261,44 +14370,17 @@ - return 0; - } - _ACEOF +-/* end confdefs.h. */ +-$ac_includes_default +-int +-main () +-{ +- +- /* Some versions of memcmp are not 8-bit clean. */ +- char c0 = '\100', c1 = '\200', c2 = '\201'; +- if (memcmp(&c0, &c2, 1) >= 0 || memcmp(&c1, &c2, 1) >= 0) +- return 1; +- +- /* The Next x86 OpenStep bug shows up only when comparing 16 bytes +- or more and with at least one buffer not starting on a 4-byte boundary. +- William Lewis provided this test program. */ +- { +- char foo[21]; +- char bar[21]; +- int i; +- for (i = 0; i < 4; i++) +- { +- char *a = foo + i; +- char *b = bar + i; +- strcpy (a, "--------01111111"); +- strcpy (b, "--------10000000"); +- if (memcmp (a, b, 16) >= 0) +- return 1; +- } +- return 0; +- } +- +- ; +- return 0; +-} +-_ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in @@ -13675,36 +14359,32 @@ Index: pam.debian/configure - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -+if ac_fn_c_try_run "$LINENO"; then : - ac_cv_func_memcmp_working=yes - else +- ac_cv_func_memcmp_working=yes +-else - $as_echo "$as_me: program exited with status $ac_status" >&5 -$as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -ac_cv_func_memcmp_working=no -+ ac_cv_func_memcmp_working=no - fi +-fi -rm -rf conftest.dSYM -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -+ conftest.$ac_objext conftest.beam conftest.$ac_ext - fi - +-fi - - fi +- +-fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_memcmp_working" >&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_memcmp_working" >&5 - $as_echo "$ac_cv_func_memcmp_working" >&6; } - test $ac_cv_func_memcmp_working = no && case " $LIBOBJS " in - *" memcmp.$ac_objext "* ) ;; -@@ -18307,194 +14389,18 @@ - esac - - +-$as_echo "$ac_cv_func_memcmp_working" >&6; } +-test $ac_cv_func_memcmp_working = no && case " $LIBOBJS " in +- *" memcmp.$ac_objext "* ) ;; +- *) LIBOBJS="$LIBOBJS memcmp.$ac_objext" +- ;; +-esac - - for ac_func in vprintf +- +- +-for ac_func in vprintf -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 @@ -13797,10 +14477,7 @@ Index: pam.debian/configure -as_val=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then -+do : -+ ac_fn_c_check_func "$LINENO" "vprintf" "ac_cv_func_vprintf" -+if test "x$ac_cv_func_vprintf" = x""yes; then : - cat >>confdefs.h <<_ACEOF +- cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF - @@ -13853,8 +14530,7 @@ Index: pam.debian/configure - ; - return 0; -} -+#define HAVE_VPRINTF 1 - _ACEOF +-_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in @@ -13883,7 +14559,7 @@ Index: pam.debian/configure - - ac_cv_func__doprnt=no -fi - +- -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext @@ -13891,27 +14567,24 @@ Index: pam.debian/configure -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func__doprnt" >&5 -$as_echo "$ac_cv_func__doprnt" >&6; } -if test "x$ac_cv_func__doprnt" = x""yes; then -+ac_fn_c_check_func "$LINENO" "_doprnt" "ac_cv_func__doprnt" -+if test "x$ac_cv_func__doprnt" = x""yes; then : - +- -cat >>confdefs.h <<\_ACEOF -#define HAVE_DOPRNT 1 -_ACEOF -+$as_echo "#define HAVE_DOPRNT 1" >>confdefs.h - - fi - -@@ -18502,105 +14408,12 @@ - done - - +- +-fi +- +-fi +-done +- - - - - - - - for ac_func in fseeko gethostname gettimeofday lckpwdf mkdir select +- +-for ac_func in fseeko gethostname gettimeofday lckpwdf mkdir select -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 @@ -14004,25 +14677,20 @@ Index: pam.debian/configure -as_val=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then -+do : -+ 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 - _ACEOF -@@ -18608,105 +14421,12 @@ - fi - done - +- cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +-_ACEOF +- +-fi +-done +- - - - - - - - for ac_func in strcspn strdup strspn strstr strtol uname +-for ac_func in strcspn strdup strspn strstr strtol uname -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 @@ -14115,24 +14783,20 @@ Index: pam.debian/configure -as_val=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then -+do : -+ 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 - _ACEOF -@@ -18714,104 +14434,12 @@ - fi - done - +- cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +-_ACEOF +- +-fi +-done - - - - - - for ac_func in getpwnam_r getpwuid_r getgrnam_r getgrgid_r getspnam_r +- +- +-for ac_func in getutent_r getpwnam_r getpwuid_r getgrnam_r getgrgid_r getspnam_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 @@ -14225,22 +14889,17 @@ Index: pam.debian/configure -as_val=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then -+do : -+ 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 - _ACEOF -@@ -18819,102 +14447,12 @@ - fi - done - +- cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +-_ACEOF +- +-fi +-done - - - - for ac_func in getgrouplist getline getdelim +- +-for ac_func in getgrouplist getline getdelim -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 @@ -14320,12 +14979,15 @@ Index: pam.debian/configure -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" --fi ++ ac_cv_type_getgroups=int + fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext --fi ++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ ++ conftest.$ac_objext conftest.beam conftest.$ac_ext + fi -ac_res=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 @@ -14333,35 +14995,55 @@ Index: pam.debian/configure -as_val=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then -+do : -+ 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 - _ACEOF -@@ -18922,102 +14460,12 @@ +- cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +-_ACEOF + ++if test $ac_cv_type_getgroups = cross; then ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include <unistd.h> ++ ++_ACEOF ++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ++ $EGREP "getgroups.*int.*gid_t" >/dev/null 2>&1; then : ++ ac_cv_type_getgroups=gid_t ++else ++ ac_cv_type_getgroups=int fi - done +-done ++rm -f conftest* -- -- -- - for ac_func in inet_ntop inet_pton ruserok_af ++fi ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_getgroups" >&5 ++$as_echo "$ac_cv_type_getgroups" >&6; } + ++cat >>confdefs.h <<_ACEOF ++#define GETGROUPS_T $ac_cv_type_getgroups ++_ACEOF + + +-for ac_func in inet_ntop inet_pton ruserok_af -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -$as_echo_n "checking for $ac_func... " >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then -- $as_echo_n "(cached) " >&6 --else ++if test $ac_cv_c_compiler_gnu = yes; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC needs -traditional" >&5 ++$as_echo_n "checking whether $CC needs -traditional... " >&6; } ++if test "${ac_cv_prog_gcc_traditional+set}" = set; then : + $as_echo_n "(cached) " >&6 + else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ ++ ac_pattern="Autoconf.*'x'" ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. - For example, HP-UX 11i <limits.h> declares gettimeofday. */ -#define $ac_func innocuous_$ac_func @@ -14370,15 +15052,36 @@ Index: pam.debian/configure - which can conflict with char $ac_func (); below. - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since - <limits.h> exists even on freestanding compilers. */ -- ++#include <sgtty.h> ++Autoconf TIOCGETP ++_ACEOF ++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ++ $EGREP "$ac_pattern" >/dev/null 2>&1; then : ++ ac_cv_prog_gcc_traditional=yes ++else ++ ac_cv_prog_gcc_traditional=no ++fi ++rm -f conftest* + -#ifdef __STDC__ -# include <limits.h> -#else -# include <assert.h> -#endif -- + -#undef $ac_func -- ++ if test $ac_cv_prog_gcc_traditional = no; then ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include <termio.h> ++Autoconf TCGETA ++_ACEOF ++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ++ $EGREP "$ac_pattern" >/dev/null 2>&1; then : ++ ac_cv_prog_gcc_traditional=yes ++fi ++rm -f conftest* + -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ @@ -14392,15 +15095,59 @@ Index: pam.debian/configure -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif -- --int --main () --{ ++ fi ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_gcc_traditional" >&5 ++$as_echo "$ac_cv_prog_gcc_traditional" >&6; } ++ if test $ac_cv_prog_gcc_traditional = yes; then ++ CC="$CC -traditional" ++ fi ++fi + ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working memcmp" >&5 ++$as_echo_n "checking for working memcmp... " >&6; } ++if test "${ac_cv_func_memcmp_working+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test "$cross_compiling" = yes; then : ++ ac_cv_func_memcmp_working=no ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++$ac_includes_default + int + main () + { -return $ac_func (); -- ; -- return 0; --} --_ACEOF ++ ++ /* Some versions of memcmp are not 8-bit clean. */ ++ char c0 = '\100', c1 = '\200', c2 = '\201'; ++ if (memcmp(&c0, &c2, 1) >= 0 || memcmp(&c1, &c2, 1) >= 0) ++ return 1; ++ ++ /* The Next x86 OpenStep bug shows up only when comparing 16 bytes ++ or more and with at least one buffer not starting on a 4-byte boundary. ++ William Lewis provided this test program. */ ++ { ++ char foo[21]; ++ char bar[21]; ++ int i; ++ for (i = 0; i < 4; i++) ++ { ++ char *a = foo + i; ++ char *b = bar + i; ++ strcpy (a, "--------01111111"); ++ strcpy (b, "--------10000000"); ++ if (memcmp (a, b, 16) >= 0) ++ return 1; ++ } ++ return 0; ++ } ++ + ; + return 0; + } + _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in @@ -14423,17 +15170,47 @@ Index: pam.debian/configure - $as_test_x conftest$ac_exeext - }; then - eval "$as_ac_var=yes" --else ++if ac_fn_c_try_run "$LINENO"; then : ++ ac_cv_func_memcmp_working=yes + else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -- ++ ac_cv_func_memcmp_working=no ++fi ++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ ++ conftest.$ac_objext conftest.beam conftest.$ac_ext ++fi ++ ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_memcmp_working" >&5 ++$as_echo "$ac_cv_func_memcmp_working" >&6; } ++test $ac_cv_func_memcmp_working = no && case " $LIBOBJS " in ++ *" memcmp.$ac_objext "* ) ;; ++ *) LIBOBJS="$LIBOBJS memcmp.$ac_objext" ++ ;; ++esac ++ ++ ++for ac_func in vprintf ++do : ++ ac_fn_c_check_func "$LINENO" "vprintf" "ac_cv_func_vprintf" ++if test "x$ac_cv_func_vprintf" = x""yes; then : ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_VPRINTF 1 ++_ACEOF ++ ++ac_fn_c_check_func "$LINENO" "_doprnt" "ac_cv_func__doprnt" ++if test "x$ac_cv_func__doprnt" = x""yes; then : ++ ++$as_echo "#define HAVE_DOPRNT 1" >>confdefs.h + - eval "$as_ac_var=no" --fi -- + fi + -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext --fi + fi -ac_res=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 @@ -14441,20 +15218,34 @@ Index: pam.debian/configure -as_val=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then ++done ++ ++ ++for ac_func in fseeko gethostname gettimeofday lckpwdf mkdir select +do : + 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 : ++if eval test \"x\$"$as_ac_var"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF -@@ -19026,102 +14474,12 @@ +@@ -19021,103 +14434,61 @@ + fi done ++for ac_func in strcspn strdup strspn strstr strtol uname ++do : ++ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" ++if eval test \"x\$"$as_ac_var"\" = x"yes"; then : ++ cat >>confdefs.h <<_ACEOF ++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++_ACEOF -- - for ac_func in unshare ++fi ++done + +-for ac_func in unshare -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 @@ -14464,7 +15255,14 @@ Index: pam.debian/configure -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ --_ACEOF ++for ac_func in getutent_r getpwnam_r getpwuid_r getgrnam_r getgrgid_r getspnam_r ++do : ++ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" ++if eval test \"x\$"$as_ac_var"\" = x"yes"; then : ++ cat >>confdefs.h <<_ACEOF ++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 + _ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ @@ -14476,15 +15274,25 @@ Index: pam.debian/configure - which can conflict with char $ac_func (); below. - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since - <limits.h> exists even on freestanding compilers. */ -- + -#ifdef __STDC__ -# include <limits.h> -#else -# include <assert.h> -#endif -- ++fi ++done + -#undef $ac_func -- ++for ac_func in getgrouplist getline getdelim ++do : ++ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" ++if eval test \"x\$"$as_ac_var"\" = x"yes"; then : ++ cat >>confdefs.h <<_ACEOF ++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++_ACEOF + -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ @@ -14498,7 +15306,9 @@ Index: pam.debian/configure -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif -- ++fi ++done + -int -main () -{ @@ -14506,7 +15316,14 @@ Index: pam.debian/configure - ; - return 0; -} --_ACEOF ++for ac_func in inet_ntop inet_pton ruserok_af ++do : ++ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" ++if eval test \"x\$"$as_ac_var"\" = x"yes"; then : ++ cat >>confdefs.h <<_ACEOF ++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 + _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in @@ -14532,10 +15349,11 @@ Index: pam.debian/configure -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -- + - eval "$as_ac_var=no" --fi -- + fi ++done + -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext @@ -14547,6 +15365,8 @@ Index: pam.debian/configure -as_val=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then ++ ++for ac_func in unshare +do : + ac_fn_c_check_func "$LINENO" "unshare" "ac_cv_func_unshare" +if test "x$ac_cv_func_unshare" = x""yes; then : @@ -14556,7 +15376,7 @@ Index: pam.debian/configure _ACEOF UNSHARE=yes else -@@ -19139,7 +14497,7 @@ +@@ -19135,7 +14506,7 @@ # Check whether --enable-regenerate-docu was given. @@ -14565,7 +15385,7 @@ Index: pam.debian/configure enableval=$enable_regenerate_docu; enable_docu=$enableval else enable_docu=yes -@@ -19147,9 +14505,9 @@ +@@ -19143,9 +14514,9 @@ # Extract the first word of "xsltproc", so it can be a program name with args. set dummy xsltproc; ac_word=$2 @@ -14577,7 +15397,7 @@ Index: pam.debian/configure $as_echo_n "(cached) " >&6 else case $XSLTPROC in -@@ -19162,14 +14520,14 @@ +@@ -19158,14 +14529,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -14595,7 +15415,7 @@ Index: pam.debian/configure IFS=$as_save_IFS ;; -@@ -19177,10 +14535,10 @@ +@@ -19173,10 +14544,10 @@ fi XSLTPROC=$ac_cv_path_XSLTPROC if test -n "$XSLTPROC"; then @@ -14608,7 +15428,7 @@ Index: pam.debian/configure $as_echo "no" >&6; } fi -@@ -19190,9 +14548,9 @@ +@@ -19186,9 +14557,9 @@ fi # Extract the first word of "xmllint", so it can be a program name with args. set dummy xmllint; ac_word=$2 @@ -14620,7 +15440,7 @@ Index: pam.debian/configure $as_echo_n "(cached) " >&6 else case $XMLLINT in -@@ -19205,14 +14563,14 @@ +@@ -19201,14 +14572,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -14638,7 +15458,7 @@ Index: pam.debian/configure IFS=$as_save_IFS test -z "$ac_cv_path_XMLLINT" && ac_cv_path_XMLLINT="/bin/true" -@@ -19221,10 +14579,10 @@ +@@ -19217,10 +14588,10 @@ fi XMLLINT=$ac_cv_path_XMLLINT if test -n "$XMLLINT"; then @@ -14651,7 +15471,7 @@ Index: pam.debian/configure $as_echo "no" >&6; } fi -@@ -19233,7 +14591,7 @@ +@@ -19229,7 +14600,7 @@ # check for the presence of the XML catalog # Check whether --with-xml-catalog was given. @@ -14660,7 +15480,7 @@ Index: pam.debian/configure withval=$with_xml_catalog; else with_xml_catalog=/etc/xml/catalog -@@ -19242,23 +14600,23 @@ +@@ -19238,23 +14609,23 @@ jh_found_xmlcatalog=true XML_CATALOG_FILE="$with_xml_catalog" @@ -14689,7 +15509,7 @@ Index: pam.debian/configure $as_echo_n "(cached) " >&6 else case $XMLCATALOG in -@@ -19271,14 +14629,14 @@ +@@ -19267,14 +14638,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -14707,7 +15527,7 @@ Index: pam.debian/configure IFS=$as_save_IFS test -z "$ac_cv_path_XMLCATALOG" && ac_cv_path_XMLCATALOG="no" -@@ -19287,10 +14645,10 @@ +@@ -19283,10 +14654,10 @@ fi XMLCATALOG=$ac_cv_path_XMLCATALOG if test -n "$XMLCATALOG"; then @@ -14720,7 +15540,7 @@ Index: pam.debian/configure $as_echo "no" >&6; } fi -@@ -19306,35 +14664,35 @@ +@@ -19302,35 +14673,35 @@ fi @@ -14768,7 +15588,7 @@ Index: pam.debian/configure $as_echo "not found" >&6; } enable_docu=no fi -@@ -19342,9 +14700,9 @@ +@@ -19338,9 +14709,9 @@ # Extract the first word of "w3m", so it can be a program name with args. set dummy w3m; ac_word=$2 @@ -14780,7 +15600,7 @@ Index: pam.debian/configure $as_echo_n "(cached) " >&6 else case $BROWSER in -@@ -19357,14 +14715,14 @@ +@@ -19353,14 +14724,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -14798,7 +15618,7 @@ Index: pam.debian/configure IFS=$as_save_IFS ;; -@@ -19372,10 +14730,10 @@ +@@ -19368,10 +14739,10 @@ fi BROWSER=$ac_cv_path_BROWSER if test -n "$BROWSER"; then @@ -14811,7 +15631,7 @@ Index: pam.debian/configure $as_echo "no" >&6; } fi -@@ -19388,9 +14746,9 @@ +@@ -19384,9 +14755,9 @@ # Extract the first word of "fop", so it can be a program name with args. set dummy fop; ac_word=$2 @@ -14823,7 +15643,7 @@ Index: pam.debian/configure $as_echo_n "(cached) " >&6 else case $FO2PDF in -@@ -19403,14 +14761,14 @@ +@@ -19399,14 +14770,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -14841,7 +15661,7 @@ Index: pam.debian/configure IFS=$as_save_IFS ;; -@@ -19418,10 +14776,10 @@ +@@ -19414,10 +14785,10 @@ fi FO2PDF=$ac_cv_path_FO2PDF if test -n "$FO2PDF"; then @@ -14854,7 +15674,7 @@ Index: pam.debian/configure $as_echo "no" >&6; } fi -@@ -19447,16 +14805,16 @@ +@@ -19443,16 +14814,16 @@ @@ -14874,7 +15694,7 @@ Index: pam.debian/configure $as_echo "$USE_NLS" >&6; } -@@ -19497,9 +14855,9 @@ +@@ -19493,9 +14864,9 @@ # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 @@ -14886,7 +15706,7 @@ Index: pam.debian/configure $as_echo_n "(cached) " >&6 else case "$MSGFMT" in -@@ -19529,18 +14887,18 @@ +@@ -19525,18 +14896,18 @@ fi MSGFMT="$ac_cv_path_MSGFMT" if test "$MSGFMT" != ":"; then @@ -14909,7 +15729,7 @@ Index: pam.debian/configure $as_echo_n "(cached) " >&6 else case $GMSGFMT in -@@ -19553,14 +14911,14 @@ +@@ -19549,14 +14920,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -14927,7 +15747,7 @@ Index: pam.debian/configure IFS=$as_save_IFS test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" -@@ -19569,10 +14927,10 @@ +@@ -19565,10 +14936,10 @@ fi GMSGFMT=$ac_cv_path_GMSGFMT if test -n "$GMSGFMT"; then @@ -14940,7 +15760,7 @@ Index: pam.debian/configure $as_echo "no" >&6; } fi -@@ -19620,9 +14978,9 @@ +@@ -19616,9 +14987,9 @@ # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 @@ -14952,7 +15772,7 @@ Index: pam.debian/configure $as_echo_n "(cached) " >&6 else case "$XGETTEXT" in -@@ -19652,10 +15010,10 @@ +@@ -19648,10 +15019,10 @@ fi XGETTEXT="$ac_cv_path_XGETTEXT" if test "$XGETTEXT" != ":"; then @@ -14965,7 +15785,7 @@ Index: pam.debian/configure $as_echo "no" >&6; } fi -@@ -19698,9 +15056,9 @@ +@@ -19694,9 +15065,9 @@ # Extract the first word of "msgmerge", so it can be a program name with args. set dummy msgmerge; ac_word=$2 @@ -14977,7 +15797,7 @@ Index: pam.debian/configure $as_echo_n "(cached) " >&6 else case "$MSGMERGE" in -@@ -19729,10 +15087,10 @@ +@@ -19725,10 +15096,10 @@ fi MSGMERGE="$ac_cv_path_MSGMERGE" if test "$MSGMERGE" != ":"; then @@ -14990,7 +15810,7 @@ Index: pam.debian/configure $as_echo "no" >&6; } fi -@@ -19764,7 +15122,7 @@ +@@ -19760,7 +15131,7 @@ # Check whether --with-gnu-ld was given. @@ -14999,7 +15819,7 @@ Index: pam.debian/configure withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes else with_gnu_ld=no -@@ -19786,7 +15144,7 @@ +@@ -19782,7 +15153,7 @@ ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. @@ -15008,7 +15828,7 @@ Index: pam.debian/configure $as_echo_n "checking for ld used by GCC... " >&6; } case $host in *-*-mingw*) -@@ -19816,13 +15174,13 @@ +@@ -19812,13 +15183,13 @@ ;; esac elif test "$with_gnu_ld" = yes; then @@ -15025,7 +15845,7 @@ Index: pam.debian/configure $as_echo_n "(cached) " >&6 else if test -z "$LD"; then -@@ -19850,18 +15208,16 @@ +@@ -19846,18 +15217,16 @@ LD="$acl_cv_path_LD" if test -n "$LD"; then @@ -15041,7 +15861,7 @@ Index: pam.debian/configure -$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} - { (exit 1); exit 1; }; } -{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 -+test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5 ++test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } -if test "${acl_cv_prog_gnu_ld+set}" = set; then @@ -15049,7 +15869,7 @@ Index: pam.debian/configure $as_echo_n "(cached) " >&6 else # I'd rather use --version here, but apparently some GNU ld's only accept -v. -@@ -19872,16 +15228,16 @@ +@@ -19868,16 +15237,16 @@ acl_cv_prog_gnu_ld=no ;; esac fi @@ -15069,7 +15889,7 @@ Index: pam.debian/configure $as_echo_n "(cached) " >&6 else -@@ -19892,7 +15248,7 @@ +@@ -19888,7 +15257,7 @@ acl_cv_rpath=done fi @@ -15078,7 +15898,7 @@ Index: pam.debian/configure $as_echo "$acl_cv_rpath" >&6; } wl="$acl_cv_wl" acl_libext="$acl_cv_libext" -@@ -19904,7 +15260,7 @@ +@@ -19900,7 +15269,7 @@ acl_hardcode_direct="$acl_cv_hardcode_direct" acl_hardcode_minus_L="$acl_cv_hardcode_minus_L" # Check whether --enable-rpath was given. @@ -15087,7 +15907,7 @@ Index: pam.debian/configure enableval=$enable_rpath; : else enable_rpath=yes -@@ -19953,7 +15309,7 @@ +@@ -19949,7 +15318,7 @@ # Check whether --with-libiconv-prefix was given. @@ -15096,7 +15916,7 @@ Index: pam.debian/configure withval=$with_libiconv_prefix; if test "X$withval" = "Xno"; then use_additional=no -@@ -20393,18 +15749,14 @@ +@@ -20389,83 +15758,48 @@ @@ -15114,14 +15934,16 @@ Index: pam.debian/configure -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include <CoreFoundation/CFPreferences.h> - int -@@ -20415,61 +15767,30 @@ - return 0; - } - _ACEOF +-/* end confdefs.h. */ +-#include <CoreFoundation/CFPreferences.h> +-int +-main () +-{ +-CFPreferencesCopyAppValue(NULL, NULL) +- ; +- return 0; +-} +-_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in @@ -15143,6 +15965,17 @@ Index: pam.debian/configure - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include <CoreFoundation/CFPreferences.h> ++int ++main () ++{ ++CFPreferencesCopyAppValue(NULL, NULL) ++ ; ++ return 0; ++} ++_ACEOF +if ac_fn_c_try_link "$LINENO"; then : gt_cv_func_CFPreferencesCopyAppValue=yes else @@ -15189,7 +16022,7 @@ Index: pam.debian/configure /* end confdefs.h. */ #include <CoreFoundation/CFLocale.h> int -@@ -20480,47 +15801,20 @@ +@@ -20476,47 +15810,20 @@ return 0; } _ACEOF @@ -15243,7 +16076,7 @@ Index: pam.debian/configure fi INTL_MACOSX_LIBS= -@@ -20565,16 +15859,12 @@ +@@ -20561,16 +15868,12 @@ gt_expression_test_code= fi @@ -15251,7 +16084,7 @@ Index: pam.debian/configure + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libc" >&5 $as_echo_n "checking for GNU gettext in libc... " >&6; } -if { as_var=$gt_func_gnugettext_libc; eval "test \"\${$as_var+set}\" = set"; }; then -+if { as_var=$gt_func_gnugettext_libc; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval "test \"\${$gt_func_gnugettext_libc+set}\"" = set; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF @@ -15263,7 +16096,7 @@ Index: pam.debian/configure /* end confdefs.h. */ #include <libintl.h> $gt_revision_test_code -@@ -20589,42 +15879,16 @@ +@@ -20585,42 +15888,16 @@ return 0; } _ACEOF @@ -15312,7 +16145,7 @@ Index: pam.debian/configure $as_echo "$ac_res" >&6; } if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then -@@ -20658,19 +15922,15 @@ +@@ -20654,19 +15931,15 @@ done @@ -15335,7 +16168,7 @@ Index: pam.debian/configure /* end confdefs.h. */ #include <stdlib.h> #include <iconv.h> -@@ -20684,46 +15944,15 @@ +@@ -20680,46 +15953,15 @@ return 0; } _ACEOF @@ -15386,7 +16219,7 @@ Index: pam.debian/configure /* end confdefs.h. */ #include <stdlib.h> #include <iconv.h> -@@ -20737,49 +15966,22 @@ +@@ -20733,49 +15975,22 @@ return 0; } _ACEOF @@ -15442,7 +16275,7 @@ Index: pam.debian/configure $as_echo_n "(cached) " >&6 else -@@ -20787,17 +15989,13 @@ +@@ -20783,17 +15998,13 @@ if test $am_cv_lib_iconv = yes; then LIBS="$LIBS $LIBICONV" fi @@ -15462,7 +16295,7 @@ Index: pam.debian/configure /* end confdefs.h. */ #include <iconv.h> -@@ -20857,46 +16055,19 @@ +@@ -20853,46 +16064,19 @@ return 0; } _ACEOF @@ -15514,7 +16347,7 @@ Index: pam.debian/configure $as_echo "$am_cv_func_iconv_works" >&6; } case "$am_cv_func_iconv_works" in *no) am_func_iconv=no am_cv_lib_iconv=no ;; -@@ -20907,15 +16078,13 @@ +@@ -20903,15 +16087,13 @@ fi if test "$am_func_iconv" = yes; then @@ -15533,7 +16366,7 @@ Index: pam.debian/configure $as_echo "$LIBICONV" >&6; } else CPPFLAGS="$am_save_CPPFLAGS" -@@ -20945,7 +16114,7 @@ +@@ -20941,7 +16123,7 @@ # Check whether --with-libintl-prefix was given. @@ -15542,7 +16375,7 @@ Index: pam.debian/configure withval=$with_libintl_prefix; if test "X$withval" = "Xno"; then use_additional=no -@@ -21361,20 +16530,16 @@ +@@ -21357,20 +16539,16 @@ done fi @@ -15550,7 +16383,7 @@ Index: pam.debian/configure + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libintl" >&5 $as_echo_n "checking for GNU gettext in libintl... " >&6; } -if { as_var=$gt_func_gnugettext_libintl; eval "test \"\${$as_var+set}\" = set"; }; then -+if { as_var=$gt_func_gnugettext_libintl; eval "test \"\${$as_var+set}\" = set"; }; then : ++if eval "test \"\${$gt_func_gnugettext_libintl+set}\"" = set; then : $as_echo_n "(cached) " >&6 else gt_save_CPPFLAGS="$CPPFLAGS" @@ -15566,7 +16399,7 @@ Index: pam.debian/configure /* end confdefs.h. */ #include <libintl.h> $gt_revision_test_code -@@ -21393,45 +16558,16 @@ +@@ -21389,45 +16567,16 @@ return 0; } _ACEOF @@ -15617,7 +16450,7 @@ Index: pam.debian/configure /* end confdefs.h. */ #include <libintl.h> $gt_revision_test_code -@@ -21450,48 +16586,20 @@ +@@ -21446,48 +16595,20 @@ return 0; } _ACEOF @@ -15671,7 +16504,7 @@ Index: pam.debian/configure $as_echo "$ac_res" >&6; } fi -@@ -21519,21 +16627,19 @@ +@@ -21515,21 +16636,19 @@ if test "$gt_use_preinstalled_gnugettext" = "yes" \ || test "$nls_cv_use_gnu_gettext" = "yes"; then @@ -15697,7 +16530,7 @@ Index: pam.debian/configure $as_echo_n "checking where the gettext function comes from... " >&6; } if test "$gt_use_preinstalled_gnugettext" = "yes"; then if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then -@@ -21544,7 +16650,7 @@ +@@ -21540,7 +16659,7 @@ else gt_source="included intl directory" fi @@ -15706,7 +16539,7 @@ Index: pam.debian/configure $as_echo "$gt_source" >&6; } fi -@@ -21552,9 +16658,9 @@ +@@ -21548,9 +16667,9 @@ if test "$gt_use_preinstalled_gnugettext" = "yes"; then if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then @@ -15718,7 +16551,7 @@ Index: pam.debian/configure $as_echo "$LIBINTL" >&6; } for element in $INCINTL; do -@@ -21582,14 +16688,10 @@ +@@ -21578,14 +16697,10 @@ fi @@ -15735,14 +16568,10 @@ Index: pam.debian/configure fi -@@ -21598,233 +16700,38 @@ +@@ -21598,229 +16713,34 @@ -- INTLLIBS="$LIBINTL" -- -- -- - - - @@ -15897,11 +16726,10 @@ Index: pam.debian/configure -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -+ INTLLIBS="$LIBINTL" - +- - ac_cv_have_decl___NR_keyctl=no -fi - +- -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl___NR_keyctl" >&5 @@ -15911,7 +16739,7 @@ Index: pam.debian/configure -else - have_key_syscalls=0 -fi - +- -{ $as_echo "$as_me:$LINENO: checking whether ENOKEY is declared" >&5 -$as_echo_n "checking whether ENOKEY is declared... " >&6; } -if test "${ac_cv_have_decl_ENOKEY+set}" = set; then @@ -15924,18 +16752,20 @@ Index: pam.debian/configure -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <errno.h> - +- -int -main () -{ -#ifndef ENOKEY - (void) ENOKEY; -#endif - +- - ; - return 0; -} + ++ ++ +for ac_func in dngettext +do : + ac_fn_c_check_func "$LINENO" "dngettext" "ac_cv_func_dngettext" @@ -15991,7 +16821,7 @@ Index: pam.debian/configure have_key_errors=1 else have_key_errors=0 -@@ -21839,9 +16746,7 @@ +@@ -21835,9 +16755,7 @@ if test $HAVE_KEY_MANAGEMENT = 1; then @@ -16002,7 +16832,7 @@ Index: pam.debian/configure fi HAVE_KEY_MANAGEMENT=$HAVE_KEY_MANAGEMENT -@@ -21885,13 +16790,13 @@ +@@ -21881,13 +16799,13 @@ case $ac_val in #( *${as_nl}*) case $ac_var in #( @@ -16018,7 +16848,7 @@ Index: pam.debian/configure esac ;; esac done -@@ -21899,8 +16804,8 @@ +@@ -21895,8 +16813,8 @@ (set) 2>&1 | case $as_nl`(ac_space=' '; set) 2>&1` in #( *${as_nl}ac_space=\ *) @@ -16029,7 +16859,7 @@ Index: pam.debian/configure sed -n \ "s/'/'\\\\''/g; s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" -@@ -21923,11 +16828,11 @@ +@@ -21919,11 +16837,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" && @@ -16043,7 +16873,14 @@ Index: pam.debian/configure $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} fi fi -@@ -21947,8 +16852,8 @@ +@@ -21937,14 +16855,15 @@ + + ac_libobjs= + ac_ltlibobjs= ++U= + for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue + # 1. Remove the extension, and $U if already installed. + ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' 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. @@ -16054,8 +16891,8 @@ Index: pam.debian/configure done LIBOBJS=$ac_libobjs -@@ -21964,105 +16869,67 @@ - fi +@@ -21952,105 +16871,67 @@ + if test -z "${STATIC_MODULES_TRUE}" && test -z "${STATIC_MODULES_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"STATIC_MODULES\" was never defined. @@ -16063,7 +16900,7 @@ Index: pam.debian/configure -$as_echo "$as_me: error: conditional \"STATIC_MODULES\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -+ as_fn_error "conditional \"STATIC_MODULES\" was never defined. ++ as_fn_error $? "conditional \"STATIC_MODULES\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then @@ -16072,7 +16909,7 @@ Index: pam.debian/configure -$as_echo "$as_me: error: conditional \"AMDEP\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -+ as_fn_error "conditional \"AMDEP\" was never defined. ++ as_fn_error $? "conditional \"AMDEP\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then @@ -16081,7 +16918,7 @@ Index: pam.debian/configure -$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -+ as_fn_error "conditional \"am__fastdepCC\" was never defined. ++ as_fn_error $? "conditional \"am__fastdepCC\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then @@ -16090,7 +16927,7 @@ Index: pam.debian/configure -$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -+ as_fn_error "conditional \"am__fastdepCC\" was never defined. ++ as_fn_error $? "conditional \"am__fastdepCC\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${HAVE_VERSIONING_TRUE}" && test -z "${HAVE_VERSIONING_FALSE}"; then @@ -16099,7 +16936,7 @@ Index: pam.debian/configure -$as_echo "$as_me: error: conditional \"HAVE_VERSIONING\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -+ as_fn_error "conditional \"HAVE_VERSIONING\" was never defined. ++ as_fn_error $? "conditional \"HAVE_VERSIONING\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${HAVE_LIBCRACK_TRUE}" && test -z "${HAVE_LIBCRACK_FALSE}"; then @@ -16108,7 +16945,7 @@ Index: pam.debian/configure -$as_echo "$as_me: error: conditional \"HAVE_LIBCRACK\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -+ as_fn_error "conditional \"HAVE_LIBCRACK\" was never defined. ++ as_fn_error $? "conditional \"HAVE_LIBCRACK\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${HAVE_AUDIT_TTY_STATUS_TRUE}" && test -z "${HAVE_AUDIT_TTY_STATUS_FALSE}"; then @@ -16117,7 +16954,7 @@ Index: pam.debian/configure -$as_echo "$as_me: error: conditional \"HAVE_AUDIT_TTY_STATUS\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -+ as_fn_error "conditional \"HAVE_AUDIT_TTY_STATUS\" was never defined. ++ as_fn_error $? "conditional \"HAVE_AUDIT_TTY_STATUS\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${HAVE_LIBDB_TRUE}" && test -z "${HAVE_LIBDB_FALSE}"; then @@ -16126,7 +16963,7 @@ Index: pam.debian/configure -$as_echo "$as_me: error: conditional \"HAVE_LIBDB\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -+ as_fn_error "conditional \"HAVE_LIBDB\" was never defined. ++ as_fn_error $? "conditional \"HAVE_LIBDB\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${HAVE_LIBSELINUX_TRUE}" && test -z "${HAVE_LIBSELINUX_FALSE}"; then @@ -16135,7 +16972,7 @@ Index: pam.debian/configure -$as_echo "$as_me: error: conditional \"HAVE_LIBSELINUX\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -+ as_fn_error "conditional \"HAVE_LIBSELINUX\" was never defined. ++ as_fn_error $? "conditional \"HAVE_LIBSELINUX\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi @@ -16145,7 +16982,7 @@ Index: pam.debian/configure -$as_echo "$as_me: error: conditional \"HAVE_UNSHARE\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -+ as_fn_error "conditional \"HAVE_UNSHARE\" was never defined. ++ as_fn_error $? "conditional \"HAVE_UNSHARE\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${ENABLE_REGENERATE_MAN_TRUE}" && test -z "${ENABLE_REGENERATE_MAN_FALSE}"; then @@ -16154,7 +16991,7 @@ Index: pam.debian/configure -$as_echo "$as_me: error: conditional \"ENABLE_REGENERATE_MAN\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -+ as_fn_error "conditional \"ENABLE_REGENERATE_MAN\" was never defined. ++ as_fn_error $? "conditional \"ENABLE_REGENERATE_MAN\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${ENABLE_GENERATE_PDF_TRUE}" && test -z "${ENABLE_GENERATE_PDF_FALSE}"; then @@ -16163,7 +17000,7 @@ Index: pam.debian/configure -$as_echo "$as_me: error: conditional \"ENABLE_GENERATE_PDF\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -+ as_fn_error "conditional \"ENABLE_GENERATE_PDF\" was never defined. ++ as_fn_error $? "conditional \"ENABLE_GENERATE_PDF\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${HAVE_KEY_MANAGEMENT_TRUE}" && test -z "${HAVE_KEY_MANAGEMENT_FALSE}"; then @@ -16172,7 +17009,7 @@ Index: pam.debian/configure -$as_echo "$as_me: error: conditional \"HAVE_KEY_MANAGEMENT\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -+ as_fn_error "conditional \"HAVE_KEY_MANAGEMENT\" was never defined. ++ as_fn_error $? "conditional \"HAVE_KEY_MANAGEMENT\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi @@ -16189,7 +17026,7 @@ Index: pam.debian/configure #! $SHELL # Generated by $as_me. # Run this file to recreate the current configuration. -@@ -22072,17 +16939,18 @@ +@@ -22060,17 +16941,18 @@ debug=false ac_cs_recheck=false ac_cs_silent=false @@ -16215,7 +17052,7 @@ Index: pam.debian/configure emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which -@@ -22090,23 +16958,15 @@ +@@ -22078,23 +16960,15 @@ alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else @@ -16244,7 +17081,7 @@ Index: pam.debian/configure as_nl=' ' export as_nl -@@ -22114,7 +16974,13 @@ +@@ -22102,7 +16976,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 @@ -16259,7 +17096,7 @@ Index: pam.debian/configure as_echo='printf %s\n' as_echo_n='printf %s' else -@@ -22125,7 +16991,7 @@ +@@ -22113,7 +16993,7 @@ as_echo_body='eval expr "X$1" : "X\\(.*\\)"' as_echo_n_body='eval arg=$1; @@ -16268,7 +17105,7 @@ Index: pam.debian/configure *"$as_nl"*) expr "X$arg" : "X\\(.*\\)$as_nl"; arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; -@@ -22148,13 +17014,6 @@ +@@ -22136,13 +17016,6 @@ } fi @@ -16282,7 +17119,7 @@ Index: pam.debian/configure # IFS # We need space, tab and new line, in precisely that order. Quoting is -@@ -22164,15 +17023,15 @@ +@@ -22152,15 +17025,15 @@ IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. @@ -16301,7 +17138,7 @@ Index: pam.debian/configure IFS=$as_save_IFS ;; -@@ -22184,12 +17043,16 @@ +@@ -22172,12 +17045,16 @@ fi if test ! -f "$as_myself"; then $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 @@ -16322,7 +17159,7 @@ Index: pam.debian/configure done PS1='$ ' PS2='> ' -@@ -22201,7 +17064,89 @@ +@@ -22189,7 +17066,89 @@ LANGUAGE=C export LANGUAGE @@ -16331,19 +17168,19 @@ Index: pam.debian/configure +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + + -+# as_fn_error ERROR [LINENO LOG_FD] -+# --------------------------------- ++# as_fn_error STATUS ERROR [LINENO LOG_FD] ++# ---------------------------------------- +# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are +# provided, also output the error to LOG_FD, referencing LINENO. Then exit the -+# script with status $?, using 1 if that was 0. ++# script with STATUS, using 1 if that was 0. +as_fn_error () +{ -+ as_status=$?; test $as_status -eq 0 && as_status=1 -+ if test "$3"; then -+ as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 ++ as_status=$1; test $as_status -eq 0 && as_status=1 ++ if test "$4"; then ++ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + fi -+ $as_echo "$as_me: error: $1" >&2 ++ $as_echo "$as_me: error: $2" >&2 + as_fn_exit $as_status +} # as_fn_error + @@ -16413,7 +17250,7 @@ Index: pam.debian/configure if expr a : '\(a\)' >/dev/null 2>&1 && test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr -@@ -22215,8 +17160,12 @@ +@@ -22203,8 +17162,12 @@ as_basename=false fi @@ -16427,7 +17264,7 @@ Index: pam.debian/configure as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ -@@ -22236,76 +17185,25 @@ +@@ -22224,76 +17187,25 @@ } s/.*/./; q'` @@ -16515,7 +17352,7 @@ Index: pam.debian/configure rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then -@@ -22334,8 +17232,56 @@ +@@ -22322,8 +17234,56 @@ rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -16563,7 +17400,7 @@ Index: pam.debian/configure + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" -+ } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" ++ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" + + +} # as_fn_mkdir_p @@ -16573,7 +17410,7 @@ Index: pam.debian/configure else test -d ./-p && rmdir ./-p as_mkdir_p=false -@@ -22354,10 +17300,10 @@ +@@ -22342,10 +17302,10 @@ if test -d "$1"; then test -d "$1/."; else @@ -16586,7 +17423,7 @@ Index: pam.debian/configure ???[sx]*):;;*)false;;esac;fi '\'' sh ' -@@ -22372,13 +17318,19 @@ +@@ -22360,13 +17320,19 @@ exec 6>&1 @@ -16604,11 +17441,11 @@ Index: pam.debian/configure ac_log=" This file was extended by $as_me, which was -generated by GNU Autoconf 2.63. Invocation command line was -+generated by GNU Autoconf 2.65. Invocation command line was ++generated by GNU Autoconf 2.67. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS -@@ -22410,13 +17362,15 @@ +@@ -22398,13 +17364,15 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ac_cs_usage="\ @@ -16627,7 +17464,7 @@ Index: pam.debian/configure -q, --quiet, --silent do not print progress messages -d, --debug don't remove temporary files -@@ -22435,16 +17389,17 @@ +@@ -22423,16 +17391,17 @@ Configuration commands: $config_commands @@ -16641,15 +17478,33 @@ Index: pam.debian/configure config.status -configured by $0, generated by GNU Autoconf 2.63, - with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" -+configured by $0, generated by GNU Autoconf 2.65, ++configured by $0, generated by GNU Autoconf 2.67, + with options \\"\$ac_cs_config\\" -Copyright (C) 2008 Free Software Foundation, Inc. -+Copyright (C) 2009 Free Software Foundation, Inc. ++Copyright (C) 2010 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." -@@ -22480,6 +17435,8 @@ +@@ -22450,11 +17419,16 @@ + while test $# != 0 + do + case $1 in +- --*=*) ++ --*=?*) + ac_option=`expr "X$1" : 'X\([^=]*\)='` + ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` + ac_shift=: + ;; ++ --*=) ++ ac_option=`expr "X$1" : 'X\([^=]*\)='` ++ ac_optarg= ++ ac_shift=: ++ ;; + *) + ac_option=$1 + ac_optarg=$2 +@@ -22468,27 +17442,29 @@ ac_cs_recheck=: ;; --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) $as_echo "$ac_cs_version"; exit ;; @@ -16658,9 +17513,10 @@ Index: pam.debian/configure --debug | --debu | --deb | --de | --d | -d ) debug=: ;; --file | --fil | --fi | --f ) -@@ -22487,20 +17444,19 @@ + $ac_shift case $ac_optarg in *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; ++ '') as_fn_error $? "missing file argument" ;; esac - CONFIG_FILES="$CONFIG_FILES '$ac_optarg'" + as_fn_append CONFIG_FILES " '$ac_optarg'" @@ -16678,19 +17534,19 @@ Index: pam.debian/configure - { $as_echo "$as_me: error: ambiguous option: $1 -Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; };; -+ as_fn_error "ambiguous option: \`$1' ++ as_fn_error $? "ambiguous option: \`$1' +Try \`$0 --help' for more information.";; --help | --hel | -h ) $as_echo "$ac_cs_usage"; exit ;; -q | -quiet | --quiet | --quie | --qui | --qu | --q \ -@@ -22508,11 +17464,10 @@ +@@ -22496,11 +17472,10 @@ ac_cs_silent=: ;; # This is an error. - -*) { $as_echo "$as_me: error: unrecognized option: $1 -Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; } ;; -+ -*) as_fn_error "unrecognized option: \`$1' ++ -*) as_fn_error $? "unrecognized option: \`$1' +Try \`$0 --help' for more information." ;; - *) ac_config_targets="$ac_config_targets $1" @@ -16698,18 +17554,18 @@ Index: pam.debian/configure ac_need_defaults=false ;; esac -@@ -22893,9 +17848,7 @@ +@@ -22881,9 +17856,7 @@ "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;; "xtests/Makefile") CONFIG_FILES="$CONFIG_FILES xtests/Makefile" ;; - *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 -$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;} - { (exit 1); exit 1; }; };; -+ *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; ++ *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;; esac done -@@ -22922,7 +17875,7 @@ +@@ -22910,7 +17883,7 @@ trap 'exit_status=$? { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status ' 0 @@ -16718,7 +17574,7 @@ Index: pam.debian/configure } # Create a (secure) tmp directory for tmp files. -@@ -22933,11 +17886,7 @@ +@@ -22921,11 +17894,7 @@ { tmp=./conf$$-$RANDOM (umask 077 && mkdir "$tmp") @@ -16727,11 +17583,11 @@ Index: pam.debian/configure - $as_echo "$as_me: cannot create a temporary directory in ." >&2 - { (exit 1); exit 1; } -} -+} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5 ++} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 # Set up the scripts for CONFIG_FILES section. # No need to generate them if there are no CONFIG_FILES. -@@ -22945,10 +17894,16 @@ +@@ -22933,7 +17902,13 @@ if test -n "$CONFIG_FILES"; then @@ -16745,27 +17601,24 @@ Index: pam.debian/configure +fi ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null` if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then -- ac_cs_awk_cr='\\r' -+ ac_cs_awk_cr='\r' - else - ac_cs_awk_cr=$ac_cr - fi -@@ -22962,24 +17917,18 @@ + ac_cs_awk_cr='\\r' +@@ -22950,24 +17925,18 @@ echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && echo "_ACEOF" } >conf$$subs.sh || - { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } -+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 - ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` +-ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` ++ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 ++ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` ac_delim='%!_!# ' for ac_last_try in false false false false false :; do . ./conf$$subs.sh || - { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } -+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 ++ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` if test $ac_delim_n = $ac_delim_num; then @@ -16774,11 +17627,11 @@ Index: pam.debian/configure - { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } -+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 ++ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi -@@ -23001,7 +17950,7 @@ +@@ -22989,7 +17958,7 @@ t delim :nl h @@ -16787,7 +17640,7 @@ Index: pam.debian/configure t more1 s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ p -@@ -23015,7 +17964,7 @@ +@@ -23003,7 +17972,7 @@ t nl :delim h @@ -16796,58 +17649,86 @@ Index: pam.debian/configure t more2 s/["\\]/\\&/g; s/^/"/; s/$/"/ p -@@ -23068,9 +18017,7 @@ +@@ -23056,22 +18025,28 @@ else cat fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ - || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5 -$as_echo "$as_me: error: could not setup config files machinery" >&2;} - { (exit 1); exit 1; }; } -+ || as_fn_error "could not setup config files machinery" "$LINENO" 5 ++ || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 _ACEOF - # VPATH may cause trouble with some makes, so we remove $(srcdir), -@@ -23111,9 +18058,7 @@ +-# VPATH may cause trouble with some makes, so we remove $(srcdir), +-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and ++# VPATH may cause trouble with some makes, so we remove sole $(srcdir), ++# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and + # trailing colons and then remove the whole line if VPATH becomes empty + # (actually we leave an empty line to preserve line numbers). + if test "x$srcdir" = x.; then +- ac_vpsub='/^[ ]*VPATH[ ]*=/{ +-s/:*\$(srcdir):*/:/ +-s/:*\${srcdir}:*/:/ +-s/:*@srcdir@:*/:/ +-s/^\([^=]*=[ ]*\):*/\1/ ++ ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ ++h ++s/// ++s/^/:/ ++s/[ ]*$/:/ ++s/:\$(srcdir):/:/g ++s/:\${srcdir}:/:/g ++s/:@srcdir@:/:/g ++s/^:*// + s/:*$// ++x ++s/\(=[ ]*\).*/\1/ ++G ++s/\n// + s/^[^=]*=[ ]*$// + }' + fi +@@ -23099,9 +18074,7 @@ if test -z "$ac_t"; then break elif $ac_last_try; then - { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5 -$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;} - { (exit 1); exit 1; }; } -+ as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5 ++ as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi -@@ -23198,9 +18143,7 @@ +@@ -23186,9 +18159,7 @@ _ACAWK _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5 -$as_echo "$as_me: error: could not setup config headers machinery" >&2;} - { (exit 1); exit 1; }; } -+ as_fn_error "could not setup config headers machinery" "$LINENO" 5 ++ as_fn_error $? "could not setup config headers machinery" "$LINENO" 5 fi # test -n "$CONFIG_HEADERS" -@@ -23213,9 +18156,7 @@ +@@ -23201,9 +18172,7 @@ esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5 -$as_echo "$as_me: error: invalid tag $ac_tag" >&2;} - { (exit 1); exit 1; }; };; -+ :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;; ++ :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac -@@ -23243,12 +18184,10 @@ +@@ -23231,12 +18200,10 @@ [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 -$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;} - { (exit 1); exit 1; }; };; -+ as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;; ++ as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;; esac case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac - ac_file_inputs="$ac_file_inputs '$ac_f'" @@ -16855,7 +17736,7 @@ Index: pam.debian/configure done # Let's still pretend it is `configure' which instantiates (i.e., don't -@@ -23259,7 +18198,7 @@ +@@ -23247,7 +18214,7 @@ `' by configure.' if test x"$ac_file" != x-; then configure_input="$ac_file. $configure_input" @@ -16864,18 +17745,18 @@ Index: pam.debian/configure $as_echo "$as_me: creating $ac_file" >&6;} fi # Neutralize special characters interpreted by sed in replacement strings. -@@ -23272,9 +18211,7 @@ +@@ -23260,9 +18227,7 @@ case $ac_tag in *:-:* | *:-) cat >"$tmp/stdin" \ - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -$as_echo "$as_me: error: could not create $ac_file" >&2;} - { (exit 1); exit 1; }; } ;; -+ || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; ++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; esac ;; esac -@@ -23302,47 +18239,7 @@ +@@ -23290,47 +18255,7 @@ q } s/.*/./; q'` @@ -16924,7 +17805,7 @@ Index: pam.debian/configure ac_builddir=. case "$ac_dir" in -@@ -23399,7 +18296,6 @@ +@@ -23387,7 +18312,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= @@ -16932,7 +17813,7 @@ Index: pam.debian/configure ac_sed_dataroot=' /datarootdir/ { p -@@ -23409,12 +18305,11 @@ +@@ -23397,12 +18321,11 @@ /@docdir@/p /@infodir@/p /@localedir@/p @@ -16947,7 +17828,7 @@ Index: pam.debian/configure $as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -@@ -23424,7 +18319,7 @@ +@@ -23412,7 +18335,7 @@ s&@infodir@&$infodir&g s&@localedir@&$localedir&g s&@mandir@&$mandir&g @@ -16956,42 +17837,46 @@ Index: pam.debian/configure esac _ACEOF -@@ -23453,14 +18348,12 @@ +@@ -23441,26 +18364,22 @@ $ac_datarootdir_hack " eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -$as_echo "$as_me: error: could not create $ac_file" >&2;} - { (exit 1); exit 1; }; } -+ || as_fn_error "could not create $ac_file" "$LINENO" 5 ++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && - { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' +-which seems to be undefined. Please make sure it is defined." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' - which seems to be undefined. Please make sure it is defined." >&5 ++which seems to be undefined. Please make sure it is defined" >&5 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' - which seems to be undefined. Please make sure it is defined." >&2;} -@@ -23470,9 +18363,7 @@ +-which seems to be undefined. Please make sure it is defined." >&2;} ++which seems to be undefined. Please make sure it is defined" >&2;} + + rm -f "$tmp/stdin" + case $ac_file in -) cat "$tmp/out" && rm -f "$tmp/out";; *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; esac \ - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -$as_echo "$as_me: error: could not create $ac_file" >&2;} - { (exit 1); exit 1; }; } -+ || as_fn_error "could not create $ac_file" "$LINENO" 5 ++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; :H) # -@@ -23483,25 +18374,19 @@ +@@ -23471,25 +18390,19 @@ $as_echo "/* $configure_input */" \ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" } >"$tmp/config.h" \ - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -$as_echo "$as_me: error: could not create $ac_file" >&2;} - { (exit 1); exit 1; }; } -+ || as_fn_error "could not create $ac_file" "$LINENO" 5 ++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then - { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 @@ -17002,7 +17887,7 @@ Index: pam.debian/configure - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -$as_echo "$as_me: error: could not create $ac_file" >&2;} - { (exit 1); exit 1; }; } -+ || as_fn_error "could not create $ac_file" "$LINENO" 5 ++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 fi else $as_echo "/* $configure_input */" \ @@ -17010,11 +17895,11 @@ Index: pam.debian/configure - || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5 -$as_echo "$as_me: error: could not create -" >&2;} - { (exit 1); exit 1; }; } -+ || as_fn_error "could not create -" "$LINENO" 5 ++ || as_fn_error $? "could not create -" "$LINENO" 5 fi # Compute "$ac_file"'s index in $config_headers. _am_arg="$ac_file" -@@ -23539,7 +18424,7 @@ +@@ -23527,25 +18440,35 @@ s/.*/./; q'`/stamp-h$_am_stamp_count ;; @@ -17023,11 +17908,102 @@ Index: pam.debian/configure $as_echo "$as_me: executing $ac_file commands" >&6;} ;; esac -@@ -23634,47 +18519,7 @@ + + + case $ac_file$ac_mode in +- "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do +- # Strip MF so we end up with the name of the file. +- mf=`echo "$mf" | sed -e 's/:.*$//'` +- # Check whether this is an Automake generated Makefile or not. +- # We used to match only the files named `Makefile.in', but +- # some people rename them; so instead we look at the file content. +- # Grep'ing the first line is not enough: some people post-process +- # each Makefile.in and add a new line on top of each file to say so. +- # Grep'ing the whole file is not good either: AIX grep has a line +- # limit of 2048, but all sed's we know have understand at least 4000. +- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then +- dirpart=`$as_dirname -- "$mf" || ++ "depfiles":C) test x"$AMDEP_TRUE" != x"" || { ++ # Autoconf 2.62 quotes --file arguments for eval, but not when files ++ # are listed without --file. Let's play safe and only enable the eval ++ # if we detect the quoting. ++ case $CONFIG_FILES in ++ *\'*) eval set x "$CONFIG_FILES" ;; ++ *) set x $CONFIG_FILES ;; ++ esac ++ shift ++ for mf ++ do ++ # Strip MF so we end up with the name of the file. ++ mf=`echo "$mf" | sed -e 's/:.*$//'` ++ # Check whether this is an Automake generated Makefile or not. ++ # We used to match only the files named `Makefile.in', but ++ # some people rename them; so instead we look at the file content. ++ # Grep'ing the first line is not enough: some people post-process ++ # each Makefile.in and add a new line on top of each file to say so. ++ # Grep'ing the whole file is not good either: AIX grep has a line ++ # limit of 2048, but all sed's we know have understand at least 4000. ++ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then ++ dirpart=`$as_dirname -- "$mf" || + $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$mf" : 'X\(//\)[^/]' \| \ + X"$mf" : 'X\(//\)$' \| \ +@@ -23568,28 +18491,28 @@ + q + } + s/.*/./; q'` +- else +- continue +- fi +- # Extract the definition of DEPDIR, am__include, and am__quote +- # from the Makefile without running `make'. +- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` +- test -z "$DEPDIR" && continue +- am__include=`sed -n 's/^am__include = //p' < "$mf"` +- test -z "am__include" && continue +- am__quote=`sed -n 's/^am__quote = //p' < "$mf"` +- # When using ansi2knr, U may be empty or an underscore; expand it +- U=`sed -n 's/^U = //p' < "$mf"` +- # Find all dependency output files, they are included files with +- # $(DEPDIR) in their names. We invoke sed twice because it is the +- # simplest approach to changing $(DEPDIR) to its actual value in the +- # expansion. +- for file in `sed -n " +- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ +- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do +- # Make sure the directory exists. +- test -f "$dirpart/$file" && continue +- fdir=`$as_dirname -- "$file" || ++ else ++ continue ++ fi ++ # Extract the definition of DEPDIR, am__include, and am__quote ++ # from the Makefile without running `make'. ++ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` ++ test -z "$DEPDIR" && continue ++ am__include=`sed -n 's/^am__include = //p' < "$mf"` ++ test -z "am__include" && continue ++ am__quote=`sed -n 's/^am__quote = //p' < "$mf"` ++ # When using ansi2knr, U may be empty or an underscore; expand it ++ U=`sed -n 's/^U = //p' < "$mf"` ++ # Find all dependency output files, they are included files with ++ # $(DEPDIR) in their names. We invoke sed twice because it is the ++ # simplest approach to changing $(DEPDIR) to its actual value in the ++ # expansion. ++ for file in `sed -n " ++ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ ++ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do ++ # Make sure the directory exists. ++ test -f "$dirpart/$file" && continue ++ fdir=`$as_dirname -- "$file" || + $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$file" : 'X\(//\)[^/]' \| \ + X"$file" : 'X\(//\)$' \| \ +@@ -23612,51 +18535,12 @@ q } s/.*/./; q'` -- { as_dir=$dirpart/$fdir +- { as_dir=$dirpart/$fdir - case $as_dir in #( - -*) as_dir=./$as_dir;; - esac @@ -17063,16 +18039,23 @@ Index: pam.debian/configure - } - s/.*/./; q'` - test -d "$as_dir" && break -- done ++ as_dir=$dirpart/$fdir; as_fn_mkdir_p ++ # echo "creating $dirpart/$file" ++ echo '# dummy' > "$dirpart/$file" + done - test -z "$as_dirs" || eval "mkdir $as_dirs" - } || 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 -@@ -24434,15 +19279,12 @@ +- # echo "creating $dirpart/$file" +- echo '# dummy' > "$dirpart/$file" + done +-done ++} + ;; + "libtool":C) + +@@ -24411,15 +19295,12 @@ done # for ac_tag @@ -17086,16 +18069,16 @@ Index: pam.debian/configure - { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5 -$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } -+ as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5 ++ as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 # configure is writing to config.log, and then calls config.status. -@@ -24463,10 +19305,10 @@ +@@ -24440,10 +19321,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. - $ac_cs_success || { (exit 1); exit 1; } -+ $ac_cs_success || as_fn_exit $? ++ $ac_cs_success || as_fn_exit 1 fi if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then - { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 @@ -17103,34 +18086,32 @@ Index: pam.debian/configure $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi -Index: pam.debian/Makefile.in +Index: pam.deb/Makefile.in =================================================================== ---- pam.debian.orig/Makefile.in -+++ pam.debian/Makefile.in -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.11 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. +--- pam.deb.orig/Makefile.in ++++ pam.deb/Makefile.in +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -46,7 +46,6 @@ +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -39,7 +40,7 @@ + DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in $(srcdir)/config.h.in \ + $(top_srcdir)/configure ABOUT-NLS AUTHORS COPYING ChangeLog \ +- INSTALL NEWS compile config.guess config.rpath config.sub \ ++ INSTALL NEWS TODO compile config.guess config.rpath config.sub \ + depcomp install-sh ltmain.sh missing mkinstalldirs ylwrap 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 @@ +@@ -172,6 +173,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -17138,7 +18119,16 @@ Index: pam.debian/Makefile.in PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PIE_CFLAGS = @PIE_CFLAGS@ -@@ -364,7 +364,7 @@ +@@ -329,7 +331,7 @@ + -rm -rf .libs _libs + + distclean-libtool: +- -rm -f libtool ++ -rm -f libtool config.lt + + # This directory's subdirectories are mostly independent; you can cd + # into them and run `make' without going through this Makefile. +@@ -338,7 +340,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): @@ -17147,7 +18137,7 @@ Index: pam.debian/Makefile.in for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ -@@ -389,7 +389,7 @@ +@@ -363,7 +365,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): @@ -17156,66 +18146,80 @@ Index: pam.debian/Makefile.in for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ -@@ -559,7 +559,8 @@ +@@ -406,7 +408,7 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS +@@ -512,7 +514,8 @@ + || exit 1; \ fi; \ done - -test -n "$(am__skip_mode_fix)" \ -- || find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ -+ || find "$(distdir)" -type d ! -perm -755 \ +- -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ ++ -find "$(distdir)" -type d ! -perm -755 \ + -exec chmod u+rwx,go+rx {} \; -o \ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ -@@ -603,17 +604,17 @@ - distcheck: dist - case '$(DIST_ARCHIVES)' in \ - *.tar.gz*) \ -- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ -+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ - *.tar.bz2*) \ -- bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ -+ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ - *.tar.lzma*) \ -- unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ -+ lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ - *.tar.xz*) \ - xz -dc $(distdir).tar.xz | $(am__untar) ;;\ - *.tar.Z*) \ - uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ - *.shar.gz*) \ -- GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ -+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ - *.zip*) \ - unzip $(distdir).zip ;;\ - esac -Index: pam.debian/modules/pam_namespace/Makefile.in +@@ -661,6 +664,8 @@ + + html: html-recursive + ++html-am: ++ + info: info-recursive + + info-am: +@@ -669,18 +674,28 @@ + + install-dvi: install-dvi-recursive + ++install-dvi-am: ++ + install-exec-am: + + install-html: install-html-recursive + ++install-html-am: ++ + install-info: install-info-recursive + ++install-info-am: ++ + install-man: + + install-pdf: install-pdf-recursive + ++install-pdf-am: ++ + install-ps: install-ps-recursive + ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-recursive +Index: pam.deb/modules/pam_namespace/Makefile.in =================================================================== ---- pam.debian.orig/modules/pam_namespace/Makefile.in -+++ pam.debian/modules/pam_namespace/Makefile.in -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.11 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. +--- pam.deb.orig/modules/pam_namespace/Makefile.in ++++ pam.deb/modules/pam_namespace/Makefile.in +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -49,7 +49,6 @@ - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ -- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ - $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ - $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ -@@ -58,7 +57,7 @@ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ -- $(top_srcdir)/configure.in -+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -@@ -206,6 +205,7 @@ +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -192,6 +193,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -17223,35 +18227,193 @@ Index: pam.debian/modules/pam_namespace/Makefile.in PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PIE_CFLAGS = @PIE_CFLAGS@ -Index: pam.debian/modules/pam_securetty/Makefile.in +@@ -303,8 +305,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +@@ -424,8 +426,8 @@ + esac; \ + done; \ + for i in $$list; do \ +- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ +- else file=$$i; fi; \ ++ if test -f $$i; then file=$$i; \ ++ else file=$(srcdir)/$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 5*) ;; \ +@@ -469,8 +471,8 @@ + esac; \ + done; \ + for i in $$list; do \ +- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ +- else file=$$i; fi; \ ++ if test -f $$i; then file=$$i; \ ++ else file=$(srcdir)/$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 8*) ;; \ +@@ -543,7 +545,7 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS +@@ -586,7 +588,7 @@ + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + check-TESTS: $(TESTS) +- @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \ ++ @failed=0; all=0; xfail=0; xpass=0; skip=0; \ + srcdir=$(srcdir); export srcdir; \ + list=' $(TESTS) '; \ + if test -n "$$list"; then \ +@@ -597,7 +599,7 @@ + if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *$$ws$$tst$$ws*) \ ++ *[\ \ ]$$tst[\ \ ]*) \ + xpass=`expr $$xpass + 1`; \ + failed=`expr $$failed + 1`; \ + echo "XPASS: $$tst"; \ +@@ -609,7 +611,7 @@ + elif test $$? -ne 77; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *$$ws$$tst$$ws*) \ ++ *[\ \ ]$$tst[\ \ ]*) \ + xfail=`expr $$xfail + 1`; \ + echo "XFAIL: $$tst"; \ + ;; \ +@@ -623,23 +625,36 @@ + echo "SKIP: $$tst"; \ + fi; \ + done; \ ++ if test "$$all" -eq 1; then \ ++ tests="test"; \ ++ All=""; \ ++ else \ ++ tests="tests"; \ ++ All="All "; \ ++ fi; \ + if test "$$failed" -eq 0; then \ + if test "$$xfail" -eq 0; then \ +- banner="All $$all tests passed"; \ ++ banner="$$All$$all $$tests passed"; \ + else \ +- banner="All $$all tests behaved as expected ($$xfail expected failures)"; \ ++ if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ ++ banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ + fi; \ + else \ + if test "$$xpass" -eq 0; then \ +- banner="$$failed of $$all tests failed"; \ ++ banner="$$failed of $$all $$tests failed"; \ + else \ +- banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \ ++ if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ ++ banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + fi; \ + fi; \ + dashes="$$banner"; \ + skipped=""; \ + if test "$$skip" -ne 0; then \ +- skipped="($$skip tests were not run)"; \ ++ if test "$$skip" -eq 1; then \ ++ skipped="($$skip test was not run)"; \ ++ else \ ++ skipped="($$skip tests were not run)"; \ ++ fi; \ + test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ + dashes="$$skipped"; \ + fi; \ +@@ -659,6 +674,19 @@ + else :; fi + + distdir: $(DISTFILES) ++ @list='$(MANS)'; if test -n "$$list"; then \ ++ list=`for p in $$list; do \ ++ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ ++ if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ ++ if test -n "$$list" && \ ++ grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ ++ echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ ++ grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ ++ echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ ++ echo " typically \`make maintainer-clean' will remove them" >&2; \ ++ exit 1; \ ++ else :; fi; \ ++ else :; fi + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ +@@ -735,6 +763,8 @@ + + html: html-am + ++html-am: ++ + info: info-am + + info-am: +@@ -745,18 +775,28 @@ + + install-dvi: install-dvi-am + ++install-dvi-am: ++ + install-exec-am: + + install-html: install-html-am + ++install-html-am: ++ + install-info: install-info-am + ++install-info-am: ++ + install-man: install-man5 install-man8 + + install-pdf: install-pdf-am + ++install-pdf-am: ++ + install-ps: install-ps-am + ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +Index: pam.deb/modules/pam_securetty/Makefile.in =================================================================== ---- pam.debian.orig/modules/pam_securetty/Makefile.in -+++ pam.debian/modules/pam_securetty/Makefile.in -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.11 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. +--- pam.deb.orig/modules/pam_securetty/Makefile.in ++++ pam.deb/modules/pam_securetty/Makefile.in +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -45,7 +45,6 @@ - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ -- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ - $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ - $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ -@@ -54,7 +53,7 @@ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ -- $(top_srcdir)/configure.in -+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -@@ -85,8 +84,8 @@ - am__installdirs = "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man8dir)" +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -68,8 +69,8 @@ + securelibLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(securelib_LTLIBRARIES) pam_securetty_la_DEPENDENCIES = -pam_securetty_la_SOURCES = pam_securetty.c @@ -17261,7 +18423,7 @@ Index: pam.debian/modules/pam_securetty/Makefile.in DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles -@@ -100,8 +99,8 @@ +@@ -82,8 +83,8 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ @@ -17272,7 +18434,7 @@ Index: pam.debian/modules/pam_securetty/Makefile.in man8dir = $(mandir)/man8 NROFF = nroff MANS = $(man_MANS) -@@ -193,6 +192,7 @@ +@@ -176,6 +177,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -17280,7 +18442,7 @@ Index: pam.debian/modules/pam_securetty/Makefile.in PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PIE_CFLAGS = @PIE_CFLAGS@ -@@ -283,6 +283,10 @@ +@@ -268,6 +270,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 @@ -17291,7 +18453,18 @@ Index: pam.debian/modules/pam_securetty/Makefile.in @ENABLE_REGENERATE_MAN_TRUE@noinst_DATA = README all: all-am -@@ -359,6 +363,7 @@ +@@ -277,8 +283,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +@@ -339,6 +345,7 @@ -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_securetty.Plo@am__quote@ @@ -17299,36 +18472,172 @@ Index: pam.debian/modules/pam_securetty/Makefile.in .c.o: @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -Index: pam.debian/modules/pam_unix/Makefile.in +@@ -377,8 +384,8 @@ + esac; \ + done; \ + for i in $$list; do \ +- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ +- else file=$$i; fi; \ ++ if test -f $$i; then file=$$i; \ ++ else file=$(srcdir)/$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 8*) ;; \ +@@ -417,7 +424,7 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS +@@ -460,7 +467,7 @@ + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + check-TESTS: $(TESTS) +- @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \ ++ @failed=0; all=0; xfail=0; xpass=0; skip=0; \ + srcdir=$(srcdir); export srcdir; \ + list=' $(TESTS) '; \ + if test -n "$$list"; then \ +@@ -471,7 +478,7 @@ + if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *$$ws$$tst$$ws*) \ ++ *[\ \ ]$$tst[\ \ ]*) \ + xpass=`expr $$xpass + 1`; \ + failed=`expr $$failed + 1`; \ + echo "XPASS: $$tst"; \ +@@ -483,7 +490,7 @@ + elif test $$? -ne 77; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *$$ws$$tst$$ws*) \ ++ *[\ \ ]$$tst[\ \ ]*) \ + xfail=`expr $$xfail + 1`; \ + echo "XFAIL: $$tst"; \ + ;; \ +@@ -497,23 +504,36 @@ + echo "SKIP: $$tst"; \ + fi; \ + done; \ ++ if test "$$all" -eq 1; then \ ++ tests="test"; \ ++ All=""; \ ++ else \ ++ tests="tests"; \ ++ All="All "; \ ++ fi; \ + if test "$$failed" -eq 0; then \ + if test "$$xfail" -eq 0; then \ +- banner="All $$all tests passed"; \ ++ banner="$$All$$all $$tests passed"; \ + else \ +- banner="All $$all tests behaved as expected ($$xfail expected failures)"; \ ++ if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ ++ banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ + fi; \ + else \ + if test "$$xpass" -eq 0; then \ +- banner="$$failed of $$all tests failed"; \ ++ banner="$$failed of $$all $$tests failed"; \ + else \ +- banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \ ++ if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ ++ banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + fi; \ + fi; \ + dashes="$$banner"; \ + skipped=""; \ + if test "$$skip" -ne 0; then \ +- skipped="($$skip tests were not run)"; \ ++ if test "$$skip" -eq 1; then \ ++ skipped="($$skip test was not run)"; \ ++ else \ ++ skipped="($$skip tests were not run)"; \ ++ fi; \ + test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ + dashes="$$skipped"; \ + fi; \ +@@ -533,6 +553,19 @@ + else :; fi + + distdir: $(DISTFILES) ++ @list='$(MANS)'; if test -n "$$list"; then \ ++ list=`for p in $$list; do \ ++ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ ++ if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ ++ if test -n "$$list" && \ ++ grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ ++ echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ ++ grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ ++ echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ ++ echo " typically \`make maintainer-clean' will remove them" >&2; \ ++ exit 1; \ ++ else :; fi; \ ++ else :; fi + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ +@@ -609,6 +642,8 @@ + + html: html-am + ++html-am: ++ + info: info-am + + info-am: +@@ -617,18 +652,28 @@ + + install-dvi: install-dvi-am + ++install-dvi-am: ++ + install-exec-am: + + install-html: install-html-am + ++install-html-am: ++ + install-info: install-info-am + ++install-info-am: ++ + install-man: install-man8 + + install-pdf: install-pdf-am + ++install-pdf-am: ++ + install-ps: install-ps-am + ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +Index: pam.deb/modules/pam_unix/Makefile.in =================================================================== ---- pam.debian.orig/modules/pam_unix/Makefile.in -+++ pam.debian/modules/pam_unix/Makefile.in -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.11 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. +--- pam.deb.orig/modules/pam_unix/Makefile.in ++++ pam.deb/modules/pam_unix/Makefile.in +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -51,7 +51,6 @@ - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ -- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ - $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ - $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ -@@ -60,7 +59,7 @@ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ -- $(top_srcdir)/configure.in -+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -@@ -91,10 +90,10 @@ - am__installdirs = "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(sbindir)" \ +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -74,10 +75,10 @@ "$(DESTDIR)$(man8dir)" + securelibLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(securelib_LTLIBRARIES) -pam_unix_la_DEPENDENCIES = +pam_unix_la_DEPENDENCIES = ../pam_securetty/tty_secure.lo @@ -17339,7 +18648,7 @@ Index: pam.debian/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) \ -@@ -236,6 +235,7 @@ +@@ -220,6 +221,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -17347,7 +18656,7 @@ Index: pam.debian/modules/pam_unix/Makefile.in PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PIE_CFLAGS = @PIE_CFLAGS@ -@@ -331,13 +331,14 @@ +@@ -317,13 +319,14 @@ pam_unix_la_LDFLAGS = -no-undefined -avoid-version -module \ $(am__append_2) pam_unix_la_LIBADD = @LIBNSL@ -L$(top_builddir)/libpam -lpam \ @@ -17364,7 +18673,18 @@ Index: pam.debian/modules/pam_unix/Makefile.in bigcrypt_SOURCES = bigcrypt.c bigcrypt_main.c bigcrypt_CFLAGS = $(AM_CFLAGS) -@@ -495,6 +496,7 @@ +@@ -349,8 +352,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +@@ -459,6 +462,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@ @@ -17372,34 +18692,170 @@ Index: pam.debian/modules/pam_unix/Makefile.in @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_unix_acct.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_unix_auth.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_unix_passwd.Plo@am__quote@ -Index: pam.debian/modules/pam_tty_audit/Makefile.in +@@ -682,8 +686,8 @@ + esac; \ + done; \ + for i in $$list; do \ +- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ +- else file=$$i; fi; \ ++ if test -f $$i; then file=$$i; \ ++ else file=$(srcdir)/$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 8*) ;; \ +@@ -722,7 +726,7 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS +@@ -765,7 +769,7 @@ + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + check-TESTS: $(TESTS) +- @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \ ++ @failed=0; all=0; xfail=0; xpass=0; skip=0; \ + srcdir=$(srcdir); export srcdir; \ + list=' $(TESTS) '; \ + if test -n "$$list"; then \ +@@ -776,7 +780,7 @@ + if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *$$ws$$tst$$ws*) \ ++ *[\ \ ]$$tst[\ \ ]*) \ + xpass=`expr $$xpass + 1`; \ + failed=`expr $$failed + 1`; \ + echo "XPASS: $$tst"; \ +@@ -788,7 +792,7 @@ + elif test $$? -ne 77; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *$$ws$$tst$$ws*) \ ++ *[\ \ ]$$tst[\ \ ]*) \ + xfail=`expr $$xfail + 1`; \ + echo "XFAIL: $$tst"; \ + ;; \ +@@ -802,23 +806,36 @@ + echo "SKIP: $$tst"; \ + fi; \ + done; \ ++ if test "$$all" -eq 1; then \ ++ tests="test"; \ ++ All=""; \ ++ else \ ++ tests="tests"; \ ++ All="All "; \ ++ fi; \ + if test "$$failed" -eq 0; then \ + if test "$$xfail" -eq 0; then \ +- banner="All $$all tests passed"; \ ++ banner="$$All$$all $$tests passed"; \ + else \ +- banner="All $$all tests behaved as expected ($$xfail expected failures)"; \ ++ if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ ++ banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ + fi; \ + else \ + if test "$$xpass" -eq 0; then \ +- banner="$$failed of $$all tests failed"; \ ++ banner="$$failed of $$all $$tests failed"; \ + else \ +- banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \ ++ if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ ++ banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + fi; \ + fi; \ + dashes="$$banner"; \ + skipped=""; \ + if test "$$skip" -ne 0; then \ +- skipped="($$skip tests were not run)"; \ ++ if test "$$skip" -eq 1; then \ ++ skipped="($$skip test was not run)"; \ ++ else \ ++ skipped="($$skip tests were not run)"; \ ++ fi; \ + test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ + dashes="$$skipped"; \ + fi; \ +@@ -838,6 +855,19 @@ + else :; fi + + distdir: $(DISTFILES) ++ @list='$(MANS)'; if test -n "$$list"; then \ ++ list=`for p in $$list; do \ ++ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ ++ if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ ++ if test -n "$$list" && \ ++ grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ ++ echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ ++ grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ ++ echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ ++ echo " typically \`make maintainer-clean' will remove them" >&2; \ ++ exit 1; \ ++ else :; fi; \ ++ else :; fi + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ +@@ -914,6 +944,8 @@ + + html: html-am + ++html-am: ++ + info: info-am + + info-am: +@@ -922,18 +954,28 @@ + + install-dvi: install-dvi-am + ++install-dvi-am: ++ + install-exec-am: install-sbinPROGRAMS + + install-html: install-html-am + ++install-html-am: ++ + install-info: install-info-am + ++install-info-am: ++ + install-man: install-man8 + + install-pdf: install-pdf-am + ++install-pdf-am: ++ + install-ps: install-ps-am + ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +Index: pam.deb/modules/pam_tty_audit/Makefile.in =================================================================== ---- pam.debian.orig/modules/pam_tty_audit/Makefile.in -+++ pam.debian/modules/pam_tty_audit/Makefile.in -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.11 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. +--- pam.deb.orig/modules/pam_tty_audit/Makefile.in ++++ pam.deb/modules/pam_tty_audit/Makefile.in +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -45,7 +45,6 @@ - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ -- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ - $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ - $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ -@@ -54,7 +53,7 @@ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ -- $(top_srcdir)/configure.in -+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -@@ -193,6 +192,7 @@ +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -178,6 +179,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -17407,45 +18863,181 @@ Index: pam.debian/modules/pam_tty_audit/Makefile.in PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PIE_CFLAGS = @PIE_CFLAGS@ -@@ -273,8 +273,8 @@ - top_srcdir = @top_srcdir@ - CLEANFILES = *~ - MAINTAINERCLEANFILES = $(MANS) README --EXTRA_DIST = README $(MANS) $(XMLS) --man_MANS = pam_tty_audit.8 -+EXTRA_DIST = README pam_tty_audit.8 $(XMLS) -+@HAVE_AUDIT_TTY_STATUS_TRUE@man_MANS = pam_tty_audit.8 - XMLS = README.xml pam_tty_audit.8.xml - securelibdir = $(SECUREDIR) - AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include -Index: pam.debian/conf/Makefile.in +@@ -278,8 +280,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +@@ -378,8 +380,8 @@ + esac; \ + done; \ + for i in $$list; do \ +- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ +- else file=$$i; fi; \ ++ if test -f $$i; then file=$$i; \ ++ else file=$(srcdir)/$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 8*) ;; \ +@@ -418,7 +420,7 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS +@@ -461,7 +463,7 @@ + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + check-TESTS: $(TESTS) +- @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \ ++ @failed=0; all=0; xfail=0; xpass=0; skip=0; \ + srcdir=$(srcdir); export srcdir; \ + list=' $(TESTS) '; \ + if test -n "$$list"; then \ +@@ -472,7 +474,7 @@ + if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *$$ws$$tst$$ws*) \ ++ *[\ \ ]$$tst[\ \ ]*) \ + xpass=`expr $$xpass + 1`; \ + failed=`expr $$failed + 1`; \ + echo "XPASS: $$tst"; \ +@@ -484,7 +486,7 @@ + elif test $$? -ne 77; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *$$ws$$tst$$ws*) \ ++ *[\ \ ]$$tst[\ \ ]*) \ + xfail=`expr $$xfail + 1`; \ + echo "XFAIL: $$tst"; \ + ;; \ +@@ -498,23 +500,36 @@ + echo "SKIP: $$tst"; \ + fi; \ + done; \ ++ if test "$$all" -eq 1; then \ ++ tests="test"; \ ++ All=""; \ ++ else \ ++ tests="tests"; \ ++ All="All "; \ ++ fi; \ + if test "$$failed" -eq 0; then \ + if test "$$xfail" -eq 0; then \ +- banner="All $$all tests passed"; \ ++ banner="$$All$$all $$tests passed"; \ + else \ +- banner="All $$all tests behaved as expected ($$xfail expected failures)"; \ ++ if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ ++ banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ + fi; \ + else \ + if test "$$xpass" -eq 0; then \ +- banner="$$failed of $$all tests failed"; \ ++ banner="$$failed of $$all $$tests failed"; \ + else \ +- banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \ ++ if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ ++ banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + fi; \ + fi; \ + dashes="$$banner"; \ + skipped=""; \ + if test "$$skip" -ne 0; then \ +- skipped="($$skip tests were not run)"; \ ++ if test "$$skip" -eq 1; then \ ++ skipped="($$skip test was not run)"; \ ++ else \ ++ skipped="($$skip tests were not run)"; \ ++ fi; \ + test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ + dashes="$$skipped"; \ + fi; \ +@@ -534,6 +549,19 @@ + else :; fi + + distdir: $(DISTFILES) ++ @list='$(MANS)'; if test -n "$$list"; then \ ++ list=`for p in $$list; do \ ++ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ ++ if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ ++ if test -n "$$list" && \ ++ grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ ++ echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ ++ grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ ++ echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ ++ echo " typically \`make maintainer-clean' will remove them" >&2; \ ++ exit 1; \ ++ else :; fi; \ ++ else :; fi + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ +@@ -610,6 +638,8 @@ + + html: html-am + ++html-am: ++ + info: info-am + + info-am: +@@ -618,18 +648,28 @@ + + install-dvi: install-dvi-am + ++install-dvi-am: ++ + install-exec-am: + + install-html: install-html-am + ++install-html-am: ++ + install-info: install-info-am + ++install-info-am: ++ + install-man: install-man8 + + install-pdf: install-pdf-am + ++install-pdf-am: ++ + install-ps: install-ps-am + ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +Index: pam.deb/conf/Makefile.in =================================================================== ---- pam.debian.orig/conf/Makefile.in -+++ pam.debian/conf/Makefile.in -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.11 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. +--- pam.deb.orig/conf/Makefile.in ++++ pam.deb/conf/Makefile.in +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -38,7 +38,6 @@ - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ -- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ - $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ - $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ -@@ -47,7 +46,7 @@ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ -- $(top_srcdir)/configure.in -+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -@@ -179,6 +178,7 @@ +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -151,6 +152,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -17453,7 +19045,18 @@ Index: pam.debian/conf/Makefile.in PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PIE_CFLAGS = @PIE_CFLAGS@ -@@ -307,7 +307,7 @@ +@@ -241,8 +243,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +@@ -280,7 +282,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): @@ -17462,7 +19065,7 @@ Index: pam.debian/conf/Makefile.in for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ -@@ -332,7 +332,7 @@ +@@ -305,7 +307,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): @@ -17471,34 +19074,70 @@ Index: pam.debian/conf/Makefile.in for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ -Index: pam.debian/conf/pam_conv1/Makefile.in +@@ -348,7 +350,7 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS +@@ -490,6 +492,8 @@ + + html: html-recursive + ++html-am: ++ + info: info-recursive + + info-am: +@@ -498,18 +502,28 @@ + + install-dvi: install-dvi-recursive + ++install-dvi-am: ++ + install-exec-am: + + install-html: install-html-recursive + ++install-html-am: ++ + install-info: install-info-recursive + ++install-info-am: ++ + install-man: + + install-pdf: install-pdf-recursive + ++install-pdf-am: ++ + install-ps: install-ps-recursive + ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-recursive +Index: pam.deb/conf/pam_conv1/Makefile.in =================================================================== ---- pam.debian.orig/conf/pam_conv1/Makefile.in -+++ pam.debian/conf/pam_conv1/Makefile.in -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.11 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. +--- pam.deb.orig/conf/pam_conv1/Makefile.in ++++ pam.deb/conf/pam_conv1/Makefile.in +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -45,7 +45,6 @@ - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ -- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ - $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ - $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ -@@ -54,7 +53,7 @@ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ -- $(top_srcdir)/configure.in -+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -@@ -172,6 +171,7 @@ +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -171,6 +172,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -17506,34 +19145,81 @@ Index: pam.debian/conf/pam_conv1/Makefile.in PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PIE_CFLAGS = @PIE_CFLAGS@ -Index: pam.debian/doc/Makefile.in +@@ -266,8 +268,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +@@ -354,7 +356,7 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS +@@ -474,6 +476,8 @@ + + html: html-am + ++html-am: ++ + info: info-am + + info-am: +@@ -482,18 +486,28 @@ + + install-dvi: install-dvi-am + ++install-dvi-am: ++ + install-exec-am: + + install-html: install-html-am + ++install-html-am: ++ + install-info: install-info-am + ++install-info-am: ++ + install-man: + + install-pdf: install-pdf-am + ++install-pdf-am: ++ + install-ps: install-ps-am + ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +Index: pam.deb/doc/Makefile.in =================================================================== ---- pam.debian.orig/doc/Makefile.in -+++ pam.debian/doc/Makefile.in -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.11 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. +--- pam.deb.orig/doc/Makefile.in ++++ pam.deb/doc/Makefile.in +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -44,7 +44,6 @@ - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ -- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ - $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ - $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ -@@ -53,7 +52,7 @@ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ -- $(top_srcdir)/configure.in -+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -@@ -208,6 +207,7 @@ +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -166,6 +167,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -17541,7 +19227,18 @@ Index: pam.debian/doc/Makefile.in PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PIE_CFLAGS = @PIE_CFLAGS@ -@@ -356,7 +356,7 @@ +@@ -256,8 +258,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +@@ -312,7 +314,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): @@ -17550,7 +19247,7 @@ Index: pam.debian/doc/Makefile.in for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ -@@ -381,7 +381,7 @@ +@@ -337,7 +339,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): @@ -17559,34 +19256,70 @@ Index: pam.debian/doc/Makefile.in for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ -Index: pam.debian/doc/adg/Makefile.in +@@ -380,7 +382,7 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS +@@ -525,6 +527,8 @@ + + html: html-recursive + ++html-am: ++ + info: info-recursive + + info-am: +@@ -533,18 +537,28 @@ + + install-dvi: install-dvi-recursive + ++install-dvi-am: ++ + install-exec-am: + + install-html: install-html-recursive + ++install-html-am: ++ + install-info: install-info-recursive + ++install-info-am: ++ + install-man: + + install-pdf: install-pdf-recursive + ++install-pdf-am: ++ + install-ps: install-ps-recursive + ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-recursive +Index: pam.deb/doc/adg/Makefile.in =================================================================== ---- pam.debian.orig/doc/adg/Makefile.in -+++ pam.debian/doc/adg/Makefile.in -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.11 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. +--- pam.deb.orig/doc/adg/Makefile.in ++++ pam.deb/doc/adg/Makefile.in +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -42,7 +42,6 @@ - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ -- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ - $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ - $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ -@@ -51,7 +50,7 @@ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ -- $(top_srcdir)/configure.in -+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -@@ -143,6 +142,7 @@ +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -143,6 +144,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -17594,34 +19327,72 @@ Index: pam.debian/doc/adg/Makefile.in PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PIE_CFLAGS = @PIE_CFLAGS@ -Index: pam.debian/doc/man/Makefile.in +@@ -235,8 +237,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +@@ -344,6 +346,8 @@ + + html: html-am + ++html-am: ++ + info: info-am + + info-am: +@@ -352,18 +356,28 @@ + + install-dvi: install-dvi-am + ++install-dvi-am: ++ + install-exec-am: + + install-html: install-html-am + ++install-html-am: ++ + install-info: install-info-am + ++install-info-am: ++ + install-man: + + install-pdf: install-pdf-am + ++install-pdf-am: ++ + install-ps: install-ps-am + ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +Index: pam.deb/doc/man/Makefile.in =================================================================== ---- pam.debian.orig/doc/man/Makefile.in -+++ pam.debian/doc/man/Makefile.in -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.11 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. +--- pam.deb.orig/doc/man/Makefile.in ++++ pam.deb/doc/man/Makefile.in +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -42,7 +42,6 @@ - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ -- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ - $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ - $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ -@@ -51,7 +50,7 @@ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ -- $(top_srcdir)/configure.in -+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -@@ -171,6 +170,7 @@ +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -150,6 +151,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -17629,34 +19400,125 @@ Index: pam.debian/doc/man/Makefile.in PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PIE_CFLAGS = @PIE_CFLAGS@ -Index: pam.debian/doc/mwg/Makefile.in +@@ -279,8 +281,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +@@ -321,8 +323,8 @@ + esac; \ + done; \ + for i in $$list; do \ +- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ +- else file=$$i; fi; \ ++ if test -f $$i; then file=$$i; \ ++ else file=$(srcdir)/$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 3*) ;; \ +@@ -366,8 +368,8 @@ + esac; \ + done; \ + for i in $$list; do \ +- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ +- else file=$$i; fi; \ ++ if test -f $$i; then file=$$i; \ ++ else file=$(srcdir)/$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 5*) ;; \ +@@ -411,8 +413,8 @@ + esac; \ + done; \ + for i in $$list; do \ +- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ +- else file=$$i; fi; \ ++ if test -f $$i; then file=$$i; \ ++ else file=$(srcdir)/$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 8*) ;; \ +@@ -453,6 +455,19 @@ + + + distdir: $(DISTFILES) ++ @list='$(MANS)'; if test -n "$$list"; then \ ++ list=`for p in $$list; do \ ++ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ ++ if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ ++ if test -n "$$list" && \ ++ grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ ++ echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ ++ grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ ++ echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ ++ echo " typically \`make maintainer-clean' will remove them" >&2; \ ++ exit 1; \ ++ else :; fi; \ ++ else :; fi + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ +@@ -525,6 +540,8 @@ + + html: html-am + ++html-am: ++ + info: info-am + + info-am: +@@ -533,18 +550,28 @@ + + install-dvi: install-dvi-am + ++install-dvi-am: ++ + install-exec-am: + + install-html: install-html-am + ++install-html-am: ++ + install-info: install-info-am + ++install-info-am: ++ + install-man: install-man3 install-man5 install-man8 + + install-pdf: install-pdf-am + ++install-pdf-am: ++ + install-ps: install-ps-am + ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +Index: pam.deb/doc/mwg/Makefile.in =================================================================== ---- pam.debian.orig/doc/mwg/Makefile.in -+++ pam.debian/doc/mwg/Makefile.in -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.11 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. +--- pam.deb.orig/doc/mwg/Makefile.in ++++ pam.deb/doc/mwg/Makefile.in +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -42,7 +42,6 @@ - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ -- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ - $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ - $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ -@@ -51,7 +50,7 @@ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ -- $(top_srcdir)/configure.in -+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -@@ -143,6 +142,7 @@ +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -143,6 +144,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -17664,34 +19526,72 @@ Index: pam.debian/doc/mwg/Makefile.in PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PIE_CFLAGS = @PIE_CFLAGS@ -Index: pam.debian/doc/sag/Makefile.in +@@ -235,8 +237,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +@@ -344,6 +346,8 @@ + + html: html-am + ++html-am: ++ + info: info-am + + info-am: +@@ -352,18 +356,28 @@ + + install-dvi: install-dvi-am + ++install-dvi-am: ++ + install-exec-am: + + install-html: install-html-am + ++install-html-am: ++ + install-info: install-info-am + ++install-info-am: ++ + install-man: + + install-pdf: install-pdf-am + ++install-pdf-am: ++ + install-ps: install-ps-am + ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +Index: pam.deb/doc/sag/Makefile.in =================================================================== ---- pam.debian.orig/doc/sag/Makefile.in -+++ pam.debian/doc/sag/Makefile.in -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.11 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. +--- pam.deb.orig/doc/sag/Makefile.in ++++ pam.deb/doc/sag/Makefile.in +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -42,7 +42,6 @@ - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ -- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ - $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ - $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ -@@ -51,7 +50,7 @@ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ -- $(top_srcdir)/configure.in -+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -@@ -143,6 +142,7 @@ +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -143,6 +144,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -17699,34 +19599,72 @@ Index: pam.debian/doc/sag/Makefile.in PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PIE_CFLAGS = @PIE_CFLAGS@ -Index: pam.debian/doc/specs/Makefile.in +@@ -235,8 +237,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +@@ -344,6 +346,8 @@ + + html: html-am + ++html-am: ++ + info: info-am + + info-am: +@@ -352,18 +356,28 @@ + + install-dvi: install-dvi-am + ++install-dvi-am: ++ + install-exec-am: + + install-html: install-html-am + ++install-html-am: ++ + install-info: install-info-am + ++install-info-am: ++ + install-man: + + install-pdf: install-pdf-am + ++install-pdf-am: ++ + install-ps: install-ps-am + ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +Index: pam.deb/doc/specs/Makefile.in =================================================================== ---- pam.debian.orig/doc/specs/Makefile.in -+++ pam.debian/doc/specs/Makefile.in -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.11 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. +--- pam.deb.orig/doc/specs/Makefile.in ++++ pam.deb/doc/specs/Makefile.in +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -46,7 +46,6 @@ - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ -- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ - $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ - $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ -@@ -55,7 +54,7 @@ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ -- $(top_srcdir)/configure.in -+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -@@ -196,6 +195,7 @@ +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -181,6 +182,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -17734,34 +19672,81 @@ Index: pam.debian/doc/specs/Makefile.in PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PIE_CFLAGS = @PIE_CFLAGS@ -Index: pam.debian/examples/Makefile.in +@@ -277,8 +279,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +@@ -382,7 +384,7 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS +@@ -505,6 +507,8 @@ + + html: html-am + ++html-am: ++ + info: info-am + + info-am: +@@ -513,18 +517,28 @@ + + install-dvi: install-dvi-am + ++install-dvi-am: ++ + install-exec-am: + + install-html: install-html-am + ++install-html-am: ++ + install-info: install-info-am + ++install-info-am: ++ + install-man: + + install-pdf: install-pdf-am + ++install-pdf-am: ++ + install-ps: install-ps-am + ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +Index: pam.deb/examples/Makefile.in =================================================================== ---- pam.debian.orig/examples/Makefile.in -+++ pam.debian/examples/Makefile.in -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.11 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. +--- pam.deb.orig/examples/Makefile.in ++++ pam.deb/examples/Makefile.in +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -45,7 +45,6 @@ - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ -- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ - $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ - $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ -@@ -54,7 +53,7 @@ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ -- $(top_srcdir)/configure.in -+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -@@ -178,6 +177,7 @@ +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -177,6 +178,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -17769,34 +19754,81 @@ Index: pam.debian/examples/Makefile.in PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PIE_CFLAGS = @PIE_CFLAGS@ -Index: pam.debian/libpam/Makefile.in +@@ -273,8 +275,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +@@ -361,7 +363,7 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS +@@ -475,6 +477,8 @@ + + html: html-am + ++html-am: ++ + info: info-am + + info-am: +@@ -483,18 +487,28 @@ + + install-dvi: install-dvi-am + ++install-dvi-am: ++ + install-exec-am: + + install-html: install-html-am + ++install-html-am: ++ + install-info: install-info-am + ++install-info-am: ++ + install-man: + + install-pdf: install-pdf-am + ++install-pdf-am: ++ + install-ps: install-ps-am + ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +Index: pam.deb/libpam/Makefile.in =================================================================== ---- pam.debian.orig/libpam/Makefile.in -+++ pam.debian/libpam/Makefile.in -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.11 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. +--- pam.deb.orig/libpam/Makefile.in ++++ pam.deb/libpam/Makefile.in +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -50,7 +50,6 @@ - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ -- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ - $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ - $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ -@@ -59,7 +58,7 @@ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ -- $(top_srcdir)/configure.in -+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -@@ -208,6 +207,7 @@ +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -195,6 +196,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -17804,34 +19836,81 @@ Index: pam.debian/libpam/Makefile.in PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PIE_CFLAGS = @PIE_CFLAGS@ -Index: pam.debian/libpam_misc/Makefile.in +@@ -312,8 +314,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +@@ -454,7 +456,7 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS +@@ -571,6 +573,8 @@ + + html: html-am + ++html-am: ++ + info: info-am + + info-am: +@@ -579,18 +583,28 @@ + + install-dvi: install-dvi-am + ++install-dvi-am: ++ + install-exec-am: install-libLTLIBRARIES + + install-html: install-html-am + ++install-html-am: ++ + install-info: install-info-am + ++install-info-am: ++ + install-man: + + install-pdf: install-pdf-am + ++install-pdf-am: ++ + install-ps: install-ps-am + ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +Index: pam.deb/libpam_misc/Makefile.in =================================================================== ---- pam.debian.orig/libpam_misc/Makefile.in -+++ pam.debian/libpam_misc/Makefile.in -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.11 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. +--- pam.deb.orig/libpam_misc/Makefile.in ++++ pam.deb/libpam_misc/Makefile.in +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -46,7 +46,6 @@ - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ -- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ - $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ - $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ -@@ -55,7 +54,7 @@ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ -- $(top_srcdir)/configure.in -+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -@@ -192,6 +191,7 @@ +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -178,6 +179,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -17839,34 +19918,81 @@ Index: pam.debian/libpam_misc/Makefile.in PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PIE_CFLAGS = @PIE_CFLAGS@ -Index: pam.debian/libpamc/Makefile.in +@@ -277,8 +279,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +@@ -390,7 +392,7 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS +@@ -507,6 +509,8 @@ + + html: html-am + ++html-am: ++ + info: info-am + + info-am: +@@ -515,18 +519,28 @@ + + install-dvi: install-dvi-am + ++install-dvi-am: ++ + install-exec-am: install-libLTLIBRARIES + + install-html: install-html-am + ++install-html-am: ++ + install-info: install-info-am + ++install-info-am: ++ + install-man: + + install-pdf: install-pdf-am + ++install-pdf-am: ++ + install-ps: install-ps-am + ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +Index: pam.deb/libpamc/Makefile.in =================================================================== ---- pam.debian.orig/libpamc/Makefile.in -+++ pam.debian/libpamc/Makefile.in -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.11 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. +--- pam.deb.orig/libpamc/Makefile.in ++++ pam.deb/libpamc/Makefile.in +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -46,7 +46,6 @@ - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ -- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ - $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ - $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ -@@ -55,7 +54,7 @@ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ -- $(top_srcdir)/configure.in -+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -@@ -230,6 +229,7 @@ +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -188,6 +189,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -17874,7 +20000,18 @@ Index: pam.debian/libpamc/Makefile.in PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PIE_CFLAGS = @PIE_CFLAGS@ -@@ -450,7 +450,7 @@ +@@ -286,8 +288,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +@@ -402,7 +404,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): @@ -17883,7 +20020,7 @@ Index: pam.debian/libpamc/Makefile.in for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ -@@ -475,7 +475,7 @@ +@@ -427,7 +429,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): @@ -17892,34 +20029,70 @@ Index: pam.debian/libpamc/Makefile.in for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ -Index: pam.debian/libpamc/test/Makefile.in +@@ -470,7 +472,7 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS +@@ -618,6 +620,8 @@ + + html: html-recursive + ++html-am: ++ + info: info-recursive + + info-am: +@@ -626,18 +630,28 @@ + + install-dvi: install-dvi-recursive + ++install-dvi-am: ++ + install-exec-am: install-libLTLIBRARIES + + install-html: install-html-recursive + ++install-html-am: ++ + install-info: install-info-recursive + ++install-info-am: ++ + install-man: + + install-pdf: install-pdf-recursive + ++install-pdf-am: ++ + install-ps: install-ps-recursive + ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-recursive +Index: pam.deb/libpamc/test/Makefile.in =================================================================== ---- pam.debian.orig/libpamc/test/Makefile.in -+++ pam.debian/libpamc/test/Makefile.in -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.11 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. +--- pam.deb.orig/libpamc/test/Makefile.in ++++ pam.deb/libpamc/test/Makefile.in +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -42,7 +42,6 @@ - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ -- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ - $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ - $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ -@@ -51,7 +50,7 @@ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ -- $(top_srcdir)/configure.in -+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -@@ -143,6 +142,7 @@ +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -143,6 +144,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -17927,34 +20100,72 @@ Index: pam.debian/libpamc/test/Makefile.in PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PIE_CFLAGS = @PIE_CFLAGS@ -Index: pam.debian/modules/Makefile.in +@@ -236,8 +238,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +@@ -343,6 +345,8 @@ + + html: html-am + ++html-am: ++ + info: info-am + + info-am: +@@ -351,18 +355,28 @@ + + install-dvi: install-dvi-am + ++install-dvi-am: ++ + install-exec-am: + + install-html: install-html-am + ++install-html-am: ++ + install-info: install-info-am + ++install-info-am: ++ + install-man: + + install-pdf: install-pdf-am + ++install-pdf-am: ++ + install-ps: install-ps-am + ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +Index: pam.deb/modules/Makefile.in =================================================================== ---- pam.debian.orig/modules/Makefile.in -+++ pam.debian/modules/Makefile.in -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.11 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. +--- pam.deb.orig/modules/Makefile.in ++++ pam.deb/modules/Makefile.in +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -42,7 +42,6 @@ - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ -- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ - $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ - $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ -@@ -51,7 +50,7 @@ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ -- $(top_srcdir)/configure.in -+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -@@ -183,6 +182,7 @@ +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -155,6 +156,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -17962,7 +20173,18 @@ Index: pam.debian/modules/Makefile.in PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PIE_CFLAGS = @PIE_CFLAGS@ -@@ -321,7 +321,7 @@ +@@ -255,8 +257,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +@@ -294,7 +296,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): @@ -17971,7 +20193,7 @@ Index: pam.debian/modules/Makefile.in for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ -@@ -346,7 +346,7 @@ +@@ -319,7 +321,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): @@ -17980,34 +20202,70 @@ Index: pam.debian/modules/Makefile.in for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ -Index: pam.debian/modules/pam_access/Makefile.in +@@ -362,7 +364,7 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS +@@ -504,6 +506,8 @@ + + html: html-recursive + ++html-am: ++ + info: info-recursive + + info-am: +@@ -512,18 +516,28 @@ + + install-dvi: install-dvi-recursive + ++install-dvi-am: ++ + install-exec-am: + + install-html: install-html-recursive + ++install-html-am: ++ + install-info: install-info-recursive + ++install-info-am: ++ + install-man: + + install-pdf: install-pdf-recursive + ++install-pdf-am: ++ + install-ps: install-ps-recursive + ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-recursive +Index: pam.deb/modules/pam_access/Makefile.in =================================================================== ---- pam.debian.orig/modules/pam_access/Makefile.in -+++ pam.debian/modules/pam_access/Makefile.in -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.11 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. +--- pam.deb.orig/modules/pam_access/Makefile.in ++++ pam.deb/modules/pam_access/Makefile.in +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -45,7 +45,6 @@ - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ -- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ - $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ - $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ -@@ -54,7 +53,7 @@ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ -- $(top_srcdir)/configure.in -+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -@@ -195,6 +194,7 @@ +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -179,6 +180,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -18015,34 +20273,192 @@ Index: pam.debian/modules/pam_access/Makefile.in PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PIE_CFLAGS = @PIE_CFLAGS@ -Index: pam.debian/modules/pam_cracklib/Makefile.in +@@ -283,8 +285,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +@@ -383,8 +385,8 @@ + esac; \ + done; \ + for i in $$list; do \ +- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ +- else file=$$i; fi; \ ++ if test -f $$i; then file=$$i; \ ++ else file=$(srcdir)/$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 5*) ;; \ +@@ -428,8 +430,8 @@ + esac; \ + done; \ + for i in $$list; do \ +- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ +- else file=$$i; fi; \ ++ if test -f $$i; then file=$$i; \ ++ else file=$(srcdir)/$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 8*) ;; \ +@@ -485,7 +487,7 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS +@@ -528,7 +530,7 @@ + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + check-TESTS: $(TESTS) +- @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \ ++ @failed=0; all=0; xfail=0; xpass=0; skip=0; \ + srcdir=$(srcdir); export srcdir; \ + list=' $(TESTS) '; \ + if test -n "$$list"; then \ +@@ -539,7 +541,7 @@ + if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *$$ws$$tst$$ws*) \ ++ *[\ \ ]$$tst[\ \ ]*) \ + xpass=`expr $$xpass + 1`; \ + failed=`expr $$failed + 1`; \ + echo "XPASS: $$tst"; \ +@@ -551,7 +553,7 @@ + elif test $$? -ne 77; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *$$ws$$tst$$ws*) \ ++ *[\ \ ]$$tst[\ \ ]*) \ + xfail=`expr $$xfail + 1`; \ + echo "XFAIL: $$tst"; \ + ;; \ +@@ -565,23 +567,36 @@ + echo "SKIP: $$tst"; \ + fi; \ + done; \ ++ if test "$$all" -eq 1; then \ ++ tests="test"; \ ++ All=""; \ ++ else \ ++ tests="tests"; \ ++ All="All "; \ ++ fi; \ + if test "$$failed" -eq 0; then \ + if test "$$xfail" -eq 0; then \ +- banner="All $$all tests passed"; \ ++ banner="$$All$$all $$tests passed"; \ + else \ +- banner="All $$all tests behaved as expected ($$xfail expected failures)"; \ ++ if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ ++ banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ + fi; \ + else \ + if test "$$xpass" -eq 0; then \ +- banner="$$failed of $$all tests failed"; \ ++ banner="$$failed of $$all $$tests failed"; \ + else \ +- banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \ ++ if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ ++ banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + fi; \ + fi; \ + dashes="$$banner"; \ + skipped=""; \ + if test "$$skip" -ne 0; then \ +- skipped="($$skip tests were not run)"; \ ++ if test "$$skip" -eq 1; then \ ++ skipped="($$skip test was not run)"; \ ++ else \ ++ skipped="($$skip tests were not run)"; \ ++ fi; \ + test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ + dashes="$$skipped"; \ + fi; \ +@@ -601,6 +616,19 @@ + else :; fi + + distdir: $(DISTFILES) ++ @list='$(MANS)'; if test -n "$$list"; then \ ++ list=`for p in $$list; do \ ++ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ ++ if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ ++ if test -n "$$list" && \ ++ grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ ++ echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ ++ grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ ++ echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ ++ echo " typically \`make maintainer-clean' will remove them" >&2; \ ++ exit 1; \ ++ else :; fi; \ ++ else :; fi + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ +@@ -677,6 +705,8 @@ + + html: html-am + ++html-am: ++ + info: info-am + + info-am: +@@ -686,18 +716,28 @@ + + install-dvi: install-dvi-am + ++install-dvi-am: ++ + install-exec-am: + + install-html: install-html-am + ++install-html-am: ++ + install-info: install-info-am + ++install-info-am: ++ + install-man: install-man5 install-man8 + + install-pdf: install-pdf-am + ++install-pdf-am: ++ + install-ps: install-ps-am + ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +Index: pam.deb/modules/pam_cracklib/Makefile.in =================================================================== ---- pam.debian.orig/modules/pam_cracklib/Makefile.in -+++ pam.debian/modules/pam_cracklib/Makefile.in -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.11 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. +--- pam.deb.orig/modules/pam_cracklib/Makefile.in ++++ pam.deb/modules/pam_cracklib/Makefile.in +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -45,7 +45,6 @@ - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ -- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ - $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ - $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ -@@ -54,7 +53,7 @@ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ -- $(top_srcdir)/configure.in -+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -@@ -194,6 +193,7 @@ +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -177,6 +178,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -18050,34 +20466,181 @@ Index: pam.debian/modules/pam_cracklib/Makefile.in PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PIE_CFLAGS = @PIE_CFLAGS@ -Index: pam.debian/modules/pam_debug/Makefile.in +@@ -280,8 +282,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +@@ -380,8 +382,8 @@ + esac; \ + done; \ + for i in $$list; do \ +- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ +- else file=$$i; fi; \ ++ if test -f $$i; then file=$$i; \ ++ else file=$(srcdir)/$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 8*) ;; \ +@@ -420,7 +422,7 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS +@@ -463,7 +465,7 @@ + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + check-TESTS: $(TESTS) +- @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \ ++ @failed=0; all=0; xfail=0; xpass=0; skip=0; \ + srcdir=$(srcdir); export srcdir; \ + list=' $(TESTS) '; \ + if test -n "$$list"; then \ +@@ -474,7 +476,7 @@ + if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *$$ws$$tst$$ws*) \ ++ *[\ \ ]$$tst[\ \ ]*) \ + xpass=`expr $$xpass + 1`; \ + failed=`expr $$failed + 1`; \ + echo "XPASS: $$tst"; \ +@@ -486,7 +488,7 @@ + elif test $$? -ne 77; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *$$ws$$tst$$ws*) \ ++ *[\ \ ]$$tst[\ \ ]*) \ + xfail=`expr $$xfail + 1`; \ + echo "XFAIL: $$tst"; \ + ;; \ +@@ -500,23 +502,36 @@ + echo "SKIP: $$tst"; \ + fi; \ + done; \ ++ if test "$$all" -eq 1; then \ ++ tests="test"; \ ++ All=""; \ ++ else \ ++ tests="tests"; \ ++ All="All "; \ ++ fi; \ + if test "$$failed" -eq 0; then \ + if test "$$xfail" -eq 0; then \ +- banner="All $$all tests passed"; \ ++ banner="$$All$$all $$tests passed"; \ + else \ +- banner="All $$all tests behaved as expected ($$xfail expected failures)"; \ ++ if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ ++ banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ + fi; \ + else \ + if test "$$xpass" -eq 0; then \ +- banner="$$failed of $$all tests failed"; \ ++ banner="$$failed of $$all $$tests failed"; \ + else \ +- banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \ ++ if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ ++ banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + fi; \ + fi; \ + dashes="$$banner"; \ + skipped=""; \ + if test "$$skip" -ne 0; then \ +- skipped="($$skip tests were not run)"; \ ++ if test "$$skip" -eq 1; then \ ++ skipped="($$skip test was not run)"; \ ++ else \ ++ skipped="($$skip tests were not run)"; \ ++ fi; \ + test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ + dashes="$$skipped"; \ + fi; \ +@@ -536,6 +551,19 @@ + else :; fi + + distdir: $(DISTFILES) ++ @list='$(MANS)'; if test -n "$$list"; then \ ++ list=`for p in $$list; do \ ++ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ ++ if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ ++ if test -n "$$list" && \ ++ grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ ++ echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ ++ grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ ++ echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ ++ echo " typically \`make maintainer-clean' will remove them" >&2; \ ++ exit 1; \ ++ else :; fi; \ ++ else :; fi + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ +@@ -612,6 +640,8 @@ + + html: html-am + ++html-am: ++ + info: info-am + + info-am: +@@ -620,18 +650,28 @@ + + install-dvi: install-dvi-am + ++install-dvi-am: ++ + install-exec-am: + + install-html: install-html-am + ++install-html-am: ++ + install-info: install-info-am + ++install-info-am: ++ + install-man: install-man8 + + install-pdf: install-pdf-am + ++install-pdf-am: ++ + install-ps: install-ps-am + ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +Index: pam.deb/modules/pam_debug/Makefile.in =================================================================== ---- pam.debian.orig/modules/pam_debug/Makefile.in -+++ pam.debian/modules/pam_debug/Makefile.in -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.11 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. +--- pam.deb.orig/modules/pam_debug/Makefile.in ++++ pam.deb/modules/pam_debug/Makefile.in +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -45,7 +45,6 @@ - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ -- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ - $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ - $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ -@@ -54,7 +53,7 @@ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ -- $(top_srcdir)/configure.in -+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -@@ -193,6 +192,7 @@ +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -176,6 +177,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -18085,34 +20648,181 @@ Index: pam.debian/modules/pam_debug/Makefile.in PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PIE_CFLAGS = @PIE_CFLAGS@ -Index: pam.debian/modules/pam_deny/Makefile.in +@@ -277,8 +279,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +@@ -377,8 +379,8 @@ + esac; \ + done; \ + for i in $$list; do \ +- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ +- else file=$$i; fi; \ ++ if test -f $$i; then file=$$i; \ ++ else file=$(srcdir)/$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 8*) ;; \ +@@ -417,7 +419,7 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS +@@ -460,7 +462,7 @@ + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + check-TESTS: $(TESTS) +- @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \ ++ @failed=0; all=0; xfail=0; xpass=0; skip=0; \ + srcdir=$(srcdir); export srcdir; \ + list=' $(TESTS) '; \ + if test -n "$$list"; then \ +@@ -471,7 +473,7 @@ + if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *$$ws$$tst$$ws*) \ ++ *[\ \ ]$$tst[\ \ ]*) \ + xpass=`expr $$xpass + 1`; \ + failed=`expr $$failed + 1`; \ + echo "XPASS: $$tst"; \ +@@ -483,7 +485,7 @@ + elif test $$? -ne 77; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *$$ws$$tst$$ws*) \ ++ *[\ \ ]$$tst[\ \ ]*) \ + xfail=`expr $$xfail + 1`; \ + echo "XFAIL: $$tst"; \ + ;; \ +@@ -497,23 +499,36 @@ + echo "SKIP: $$tst"; \ + fi; \ + done; \ ++ if test "$$all" -eq 1; then \ ++ tests="test"; \ ++ All=""; \ ++ else \ ++ tests="tests"; \ ++ All="All "; \ ++ fi; \ + if test "$$failed" -eq 0; then \ + if test "$$xfail" -eq 0; then \ +- banner="All $$all tests passed"; \ ++ banner="$$All$$all $$tests passed"; \ + else \ +- banner="All $$all tests behaved as expected ($$xfail expected failures)"; \ ++ if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ ++ banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ + fi; \ + else \ + if test "$$xpass" -eq 0; then \ +- banner="$$failed of $$all tests failed"; \ ++ banner="$$failed of $$all $$tests failed"; \ + else \ +- banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \ ++ if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ ++ banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + fi; \ + fi; \ + dashes="$$banner"; \ + skipped=""; \ + if test "$$skip" -ne 0; then \ +- skipped="($$skip tests were not run)"; \ ++ if test "$$skip" -eq 1; then \ ++ skipped="($$skip test was not run)"; \ ++ else \ ++ skipped="($$skip tests were not run)"; \ ++ fi; \ + test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ + dashes="$$skipped"; \ + fi; \ +@@ -533,6 +548,19 @@ + else :; fi + + distdir: $(DISTFILES) ++ @list='$(MANS)'; if test -n "$$list"; then \ ++ list=`for p in $$list; do \ ++ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ ++ if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ ++ if test -n "$$list" && \ ++ grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ ++ echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ ++ grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ ++ echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ ++ echo " typically \`make maintainer-clean' will remove them" >&2; \ ++ exit 1; \ ++ else :; fi; \ ++ else :; fi + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ +@@ -609,6 +637,8 @@ + + html: html-am + ++html-am: ++ + info: info-am + + info-am: +@@ -617,18 +647,28 @@ + + install-dvi: install-dvi-am + ++install-dvi-am: ++ + install-exec-am: + + install-html: install-html-am + ++install-html-am: ++ + install-info: install-info-am + ++install-info-am: ++ + install-man: install-man8 + + install-pdf: install-pdf-am + ++install-pdf-am: ++ + install-ps: install-ps-am + ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +Index: pam.deb/modules/pam_deny/Makefile.in =================================================================== ---- pam.debian.orig/modules/pam_deny/Makefile.in -+++ pam.debian/modules/pam_deny/Makefile.in -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.11 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. +--- pam.deb.orig/modules/pam_deny/Makefile.in ++++ pam.deb/modules/pam_deny/Makefile.in +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -45,7 +45,6 @@ - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ -- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ - $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ - $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ -@@ -54,7 +53,7 @@ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ -- $(top_srcdir)/configure.in -+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -@@ -193,6 +192,7 @@ +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -176,6 +177,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -18120,34 +20830,181 @@ Index: pam.debian/modules/pam_deny/Makefile.in PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PIE_CFLAGS = @PIE_CFLAGS@ -Index: pam.debian/modules/pam_echo/Makefile.in +@@ -277,8 +279,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +@@ -377,8 +379,8 @@ + esac; \ + done; \ + for i in $$list; do \ +- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ +- else file=$$i; fi; \ ++ if test -f $$i; then file=$$i; \ ++ else file=$(srcdir)/$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 8*) ;; \ +@@ -417,7 +419,7 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS +@@ -460,7 +462,7 @@ + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + check-TESTS: $(TESTS) +- @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \ ++ @failed=0; all=0; xfail=0; xpass=0; skip=0; \ + srcdir=$(srcdir); export srcdir; \ + list=' $(TESTS) '; \ + if test -n "$$list"; then \ +@@ -471,7 +473,7 @@ + if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *$$ws$$tst$$ws*) \ ++ *[\ \ ]$$tst[\ \ ]*) \ + xpass=`expr $$xpass + 1`; \ + failed=`expr $$failed + 1`; \ + echo "XPASS: $$tst"; \ +@@ -483,7 +485,7 @@ + elif test $$? -ne 77; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *$$ws$$tst$$ws*) \ ++ *[\ \ ]$$tst[\ \ ]*) \ + xfail=`expr $$xfail + 1`; \ + echo "XFAIL: $$tst"; \ + ;; \ +@@ -497,23 +499,36 @@ + echo "SKIP: $$tst"; \ + fi; \ + done; \ ++ if test "$$all" -eq 1; then \ ++ tests="test"; \ ++ All=""; \ ++ else \ ++ tests="tests"; \ ++ All="All "; \ ++ fi; \ + if test "$$failed" -eq 0; then \ + if test "$$xfail" -eq 0; then \ +- banner="All $$all tests passed"; \ ++ banner="$$All$$all $$tests passed"; \ + else \ +- banner="All $$all tests behaved as expected ($$xfail expected failures)"; \ ++ if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ ++ banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ + fi; \ + else \ + if test "$$xpass" -eq 0; then \ +- banner="$$failed of $$all tests failed"; \ ++ banner="$$failed of $$all $$tests failed"; \ + else \ +- banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \ ++ if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ ++ banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + fi; \ + fi; \ + dashes="$$banner"; \ + skipped=""; \ + if test "$$skip" -ne 0; then \ +- skipped="($$skip tests were not run)"; \ ++ if test "$$skip" -eq 1; then \ ++ skipped="($$skip test was not run)"; \ ++ else \ ++ skipped="($$skip tests were not run)"; \ ++ fi; \ + test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ + dashes="$$skipped"; \ + fi; \ +@@ -533,6 +548,19 @@ + else :; fi + + distdir: $(DISTFILES) ++ @list='$(MANS)'; if test -n "$$list"; then \ ++ list=`for p in $$list; do \ ++ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ ++ if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ ++ if test -n "$$list" && \ ++ grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ ++ echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ ++ grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ ++ echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ ++ echo " typically \`make maintainer-clean' will remove them" >&2; \ ++ exit 1; \ ++ else :; fi; \ ++ else :; fi + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ +@@ -609,6 +637,8 @@ + + html: html-am + ++html-am: ++ + info: info-am + + info-am: +@@ -617,18 +647,28 @@ + + install-dvi: install-dvi-am + ++install-dvi-am: ++ + install-exec-am: + + install-html: install-html-am + ++install-html-am: ++ + install-info: install-info-am + ++install-info-am: ++ + install-man: install-man8 + + install-pdf: install-pdf-am + ++install-pdf-am: ++ + install-ps: install-ps-am + ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +Index: pam.deb/modules/pam_echo/Makefile.in =================================================================== ---- pam.debian.orig/modules/pam_echo/Makefile.in -+++ pam.debian/modules/pam_echo/Makefile.in -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.11 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. +--- pam.deb.orig/modules/pam_echo/Makefile.in ++++ pam.deb/modules/pam_echo/Makefile.in +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -45,7 +45,6 @@ - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ -- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ - $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ - $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ -@@ -54,7 +53,7 @@ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ -- $(top_srcdir)/configure.in -+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -@@ -193,6 +192,7 @@ +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -176,6 +177,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -18155,34 +21012,181 @@ Index: pam.debian/modules/pam_echo/Makefile.in PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PIE_CFLAGS = @PIE_CFLAGS@ -Index: pam.debian/modules/pam_env/Makefile.in +@@ -277,8 +279,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +@@ -377,8 +379,8 @@ + esac; \ + done; \ + for i in $$list; do \ +- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ +- else file=$$i; fi; \ ++ if test -f $$i; then file=$$i; \ ++ else file=$(srcdir)/$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 8*) ;; \ +@@ -417,7 +419,7 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS +@@ -460,7 +462,7 @@ + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + check-TESTS: $(TESTS) +- @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \ ++ @failed=0; all=0; xfail=0; xpass=0; skip=0; \ + srcdir=$(srcdir); export srcdir; \ + list=' $(TESTS) '; \ + if test -n "$$list"; then \ +@@ -471,7 +473,7 @@ + if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *$$ws$$tst$$ws*) \ ++ *[\ \ ]$$tst[\ \ ]*) \ + xpass=`expr $$xpass + 1`; \ + failed=`expr $$failed + 1`; \ + echo "XPASS: $$tst"; \ +@@ -483,7 +485,7 @@ + elif test $$? -ne 77; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *$$ws$$tst$$ws*) \ ++ *[\ \ ]$$tst[\ \ ]*) \ + xfail=`expr $$xfail + 1`; \ + echo "XFAIL: $$tst"; \ + ;; \ +@@ -497,23 +499,36 @@ + echo "SKIP: $$tst"; \ + fi; \ + done; \ ++ if test "$$all" -eq 1; then \ ++ tests="test"; \ ++ All=""; \ ++ else \ ++ tests="tests"; \ ++ All="All "; \ ++ fi; \ + if test "$$failed" -eq 0; then \ + if test "$$xfail" -eq 0; then \ +- banner="All $$all tests passed"; \ ++ banner="$$All$$all $$tests passed"; \ + else \ +- banner="All $$all tests behaved as expected ($$xfail expected failures)"; \ ++ if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ ++ banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ + fi; \ + else \ + if test "$$xpass" -eq 0; then \ +- banner="$$failed of $$all tests failed"; \ ++ banner="$$failed of $$all $$tests failed"; \ + else \ +- banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \ ++ if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ ++ banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + fi; \ + fi; \ + dashes="$$banner"; \ + skipped=""; \ + if test "$$skip" -ne 0; then \ +- skipped="($$skip tests were not run)"; \ ++ if test "$$skip" -eq 1; then \ ++ skipped="($$skip test was not run)"; \ ++ else \ ++ skipped="($$skip tests were not run)"; \ ++ fi; \ + test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ + dashes="$$skipped"; \ + fi; \ +@@ -533,6 +548,19 @@ + else :; fi + + distdir: $(DISTFILES) ++ @list='$(MANS)'; if test -n "$$list"; then \ ++ list=`for p in $$list; do \ ++ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ ++ if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ ++ if test -n "$$list" && \ ++ grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ ++ echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ ++ grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ ++ echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ ++ echo " typically \`make maintainer-clean' will remove them" >&2; \ ++ exit 1; \ ++ else :; fi; \ ++ else :; fi + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ +@@ -609,6 +637,8 @@ + + html: html-am + ++html-am: ++ + info: info-am + + info-am: +@@ -617,18 +647,28 @@ + + install-dvi: install-dvi-am + ++install-dvi-am: ++ + install-exec-am: + + install-html: install-html-am + ++install-html-am: ++ + install-info: install-info-am + ++install-info-am: ++ + install-man: install-man8 + + install-pdf: install-pdf-am + ++install-pdf-am: ++ + install-ps: install-ps-am + ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +Index: pam.deb/modules/pam_env/Makefile.in =================================================================== ---- pam.debian.orig/modules/pam_env/Makefile.in -+++ pam.debian/modules/pam_env/Makefile.in -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.11 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. +--- pam.deb.orig/modules/pam_env/Makefile.in ++++ pam.deb/modules/pam_env/Makefile.in +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -45,7 +45,6 @@ - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ -- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ - $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ - $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ -@@ -54,7 +53,7 @@ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ -- $(top_srcdir)/configure.in -+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -@@ -196,6 +195,7 @@ +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -181,6 +182,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -18190,34 +21194,192 @@ Index: pam.debian/modules/pam_env/Makefile.in PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PIE_CFLAGS = @PIE_CFLAGS@ -Index: pam.debian/modules/pam_exec/Makefile.in +@@ -286,8 +288,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +@@ -386,8 +388,8 @@ + esac; \ + done; \ + for i in $$list; do \ +- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ +- else file=$$i; fi; \ ++ if test -f $$i; then file=$$i; \ ++ else file=$(srcdir)/$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 5*) ;; \ +@@ -431,8 +433,8 @@ + esac; \ + done; \ + for i in $$list; do \ +- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ +- else file=$$i; fi; \ ++ if test -f $$i; then file=$$i; \ ++ else file=$(srcdir)/$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 8*) ;; \ +@@ -505,7 +507,7 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS +@@ -548,7 +550,7 @@ + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + check-TESTS: $(TESTS) +- @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \ ++ @failed=0; all=0; xfail=0; xpass=0; skip=0; \ + srcdir=$(srcdir); export srcdir; \ + list=' $(TESTS) '; \ + if test -n "$$list"; then \ +@@ -559,7 +561,7 @@ + if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *$$ws$$tst$$ws*) \ ++ *[\ \ ]$$tst[\ \ ]*) \ + xpass=`expr $$xpass + 1`; \ + failed=`expr $$failed + 1`; \ + echo "XPASS: $$tst"; \ +@@ -571,7 +573,7 @@ + elif test $$? -ne 77; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *$$ws$$tst$$ws*) \ ++ *[\ \ ]$$tst[\ \ ]*) \ + xfail=`expr $$xfail + 1`; \ + echo "XFAIL: $$tst"; \ + ;; \ +@@ -585,23 +587,36 @@ + echo "SKIP: $$tst"; \ + fi; \ + done; \ ++ if test "$$all" -eq 1; then \ ++ tests="test"; \ ++ All=""; \ ++ else \ ++ tests="tests"; \ ++ All="All "; \ ++ fi; \ + if test "$$failed" -eq 0; then \ + if test "$$xfail" -eq 0; then \ +- banner="All $$all tests passed"; \ ++ banner="$$All$$all $$tests passed"; \ + else \ +- banner="All $$all tests behaved as expected ($$xfail expected failures)"; \ ++ if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ ++ banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ + fi; \ + else \ + if test "$$xpass" -eq 0; then \ +- banner="$$failed of $$all tests failed"; \ ++ banner="$$failed of $$all $$tests failed"; \ + else \ +- banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \ ++ if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ ++ banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + fi; \ + fi; \ + dashes="$$banner"; \ + skipped=""; \ + if test "$$skip" -ne 0; then \ +- skipped="($$skip tests were not run)"; \ ++ if test "$$skip" -eq 1; then \ ++ skipped="($$skip test was not run)"; \ ++ else \ ++ skipped="($$skip tests were not run)"; \ ++ fi; \ + test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ + dashes="$$skipped"; \ + fi; \ +@@ -621,6 +636,19 @@ + else :; fi + + distdir: $(DISTFILES) ++ @list='$(MANS)'; if test -n "$$list"; then \ ++ list=`for p in $$list; do \ ++ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ ++ if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ ++ if test -n "$$list" && \ ++ grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ ++ echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ ++ grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ ++ echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ ++ echo " typically \`make maintainer-clean' will remove them" >&2; \ ++ exit 1; \ ++ else :; fi; \ ++ else :; fi + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ +@@ -697,6 +725,8 @@ + + html: html-am + ++html-am: ++ + info: info-am + + info-am: +@@ -706,18 +736,28 @@ + + install-dvi: install-dvi-am + ++install-dvi-am: ++ + install-exec-am: install-sysconfDATA + + install-html: install-html-am + ++install-html-am: ++ + install-info: install-info-am + ++install-info-am: ++ + install-man: install-man5 install-man8 + + install-pdf: install-pdf-am + ++install-pdf-am: ++ + install-ps: install-ps-am + ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +Index: pam.deb/modules/pam_exec/Makefile.in =================================================================== ---- pam.debian.orig/modules/pam_exec/Makefile.in -+++ pam.debian/modules/pam_exec/Makefile.in -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.11 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. +--- pam.deb.orig/modules/pam_exec/Makefile.in ++++ pam.deb/modules/pam_exec/Makefile.in +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -45,7 +45,6 @@ - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ -- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ - $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ - $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ -@@ -54,7 +53,7 @@ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ -- $(top_srcdir)/configure.in -+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -@@ -193,6 +192,7 @@ +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -176,6 +177,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -18225,34 +21387,181 @@ Index: pam.debian/modules/pam_exec/Makefile.in PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PIE_CFLAGS = @PIE_CFLAGS@ -Index: pam.debian/modules/pam_faildelay/Makefile.in +@@ -277,8 +279,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +@@ -377,8 +379,8 @@ + esac; \ + done; \ + for i in $$list; do \ +- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ +- else file=$$i; fi; \ ++ if test -f $$i; then file=$$i; \ ++ else file=$(srcdir)/$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 8*) ;; \ +@@ -417,7 +419,7 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS +@@ -460,7 +462,7 @@ + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + check-TESTS: $(TESTS) +- @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \ ++ @failed=0; all=0; xfail=0; xpass=0; skip=0; \ + srcdir=$(srcdir); export srcdir; \ + list=' $(TESTS) '; \ + if test -n "$$list"; then \ +@@ -471,7 +473,7 @@ + if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *$$ws$$tst$$ws*) \ ++ *[\ \ ]$$tst[\ \ ]*) \ + xpass=`expr $$xpass + 1`; \ + failed=`expr $$failed + 1`; \ + echo "XPASS: $$tst"; \ +@@ -483,7 +485,7 @@ + elif test $$? -ne 77; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *$$ws$$tst$$ws*) \ ++ *[\ \ ]$$tst[\ \ ]*) \ + xfail=`expr $$xfail + 1`; \ + echo "XFAIL: $$tst"; \ + ;; \ +@@ -497,23 +499,36 @@ + echo "SKIP: $$tst"; \ + fi; \ + done; \ ++ if test "$$all" -eq 1; then \ ++ tests="test"; \ ++ All=""; \ ++ else \ ++ tests="tests"; \ ++ All="All "; \ ++ fi; \ + if test "$$failed" -eq 0; then \ + if test "$$xfail" -eq 0; then \ +- banner="All $$all tests passed"; \ ++ banner="$$All$$all $$tests passed"; \ + else \ +- banner="All $$all tests behaved as expected ($$xfail expected failures)"; \ ++ if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ ++ banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ + fi; \ + else \ + if test "$$xpass" -eq 0; then \ +- banner="$$failed of $$all tests failed"; \ ++ banner="$$failed of $$all $$tests failed"; \ + else \ +- banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \ ++ if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ ++ banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + fi; \ + fi; \ + dashes="$$banner"; \ + skipped=""; \ + if test "$$skip" -ne 0; then \ +- skipped="($$skip tests were not run)"; \ ++ if test "$$skip" -eq 1; then \ ++ skipped="($$skip test was not run)"; \ ++ else \ ++ skipped="($$skip tests were not run)"; \ ++ fi; \ + test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ + dashes="$$skipped"; \ + fi; \ +@@ -533,6 +548,19 @@ + else :; fi + + distdir: $(DISTFILES) ++ @list='$(MANS)'; if test -n "$$list"; then \ ++ list=`for p in $$list; do \ ++ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ ++ if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ ++ if test -n "$$list" && \ ++ grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ ++ echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ ++ grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ ++ echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ ++ echo " typically \`make maintainer-clean' will remove them" >&2; \ ++ exit 1; \ ++ else :; fi; \ ++ else :; fi + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ +@@ -609,6 +637,8 @@ + + html: html-am + ++html-am: ++ + info: info-am + + info-am: +@@ -617,18 +647,28 @@ + + install-dvi: install-dvi-am + ++install-dvi-am: ++ + install-exec-am: + + install-html: install-html-am + ++install-html-am: ++ + install-info: install-info-am + ++install-info-am: ++ + install-man: install-man8 + + install-pdf: install-pdf-am + ++install-pdf-am: ++ + install-ps: install-ps-am + ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +Index: pam.deb/modules/pam_faildelay/Makefile.in =================================================================== ---- pam.debian.orig/modules/pam_faildelay/Makefile.in -+++ pam.debian/modules/pam_faildelay/Makefile.in -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.11 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. +--- pam.deb.orig/modules/pam_faildelay/Makefile.in ++++ pam.deb/modules/pam_faildelay/Makefile.in +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -45,7 +45,6 @@ - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ -- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ - $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ - $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ -@@ -54,7 +53,7 @@ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ -- $(top_srcdir)/configure.in -+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -@@ -193,6 +192,7 @@ +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -176,6 +177,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -18260,34 +21569,181 @@ Index: pam.debian/modules/pam_faildelay/Makefile.in PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PIE_CFLAGS = @PIE_CFLAGS@ -Index: pam.debian/modules/pam_filter/Makefile.in +@@ -277,8 +279,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +@@ -377,8 +379,8 @@ + esac; \ + done; \ + for i in $$list; do \ +- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ +- else file=$$i; fi; \ ++ if test -f $$i; then file=$$i; \ ++ else file=$(srcdir)/$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 8*) ;; \ +@@ -417,7 +419,7 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS +@@ -460,7 +462,7 @@ + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + check-TESTS: $(TESTS) +- @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \ ++ @failed=0; all=0; xfail=0; xpass=0; skip=0; \ + srcdir=$(srcdir); export srcdir; \ + list=' $(TESTS) '; \ + if test -n "$$list"; then \ +@@ -471,7 +473,7 @@ + if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *$$ws$$tst$$ws*) \ ++ *[\ \ ]$$tst[\ \ ]*) \ + xpass=`expr $$xpass + 1`; \ + failed=`expr $$failed + 1`; \ + echo "XPASS: $$tst"; \ +@@ -483,7 +485,7 @@ + elif test $$? -ne 77; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *$$ws$$tst$$ws*) \ ++ *[\ \ ]$$tst[\ \ ]*) \ + xfail=`expr $$xfail + 1`; \ + echo "XFAIL: $$tst"; \ + ;; \ +@@ -497,23 +499,36 @@ + echo "SKIP: $$tst"; \ + fi; \ + done; \ ++ if test "$$all" -eq 1; then \ ++ tests="test"; \ ++ All=""; \ ++ else \ ++ tests="tests"; \ ++ All="All "; \ ++ fi; \ + if test "$$failed" -eq 0; then \ + if test "$$xfail" -eq 0; then \ +- banner="All $$all tests passed"; \ ++ banner="$$All$$all $$tests passed"; \ + else \ +- banner="All $$all tests behaved as expected ($$xfail expected failures)"; \ ++ if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ ++ banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ + fi; \ + else \ + if test "$$xpass" -eq 0; then \ +- banner="$$failed of $$all tests failed"; \ ++ banner="$$failed of $$all $$tests failed"; \ + else \ +- banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \ ++ if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ ++ banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + fi; \ + fi; \ + dashes="$$banner"; \ + skipped=""; \ + if test "$$skip" -ne 0; then \ +- skipped="($$skip tests were not run)"; \ ++ if test "$$skip" -eq 1; then \ ++ skipped="($$skip test was not run)"; \ ++ else \ ++ skipped="($$skip tests were not run)"; \ ++ fi; \ + test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ + dashes="$$skipped"; \ + fi; \ +@@ -533,6 +548,19 @@ + else :; fi + + distdir: $(DISTFILES) ++ @list='$(MANS)'; if test -n "$$list"; then \ ++ list=`for p in $$list; do \ ++ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ ++ if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ ++ if test -n "$$list" && \ ++ grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ ++ echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ ++ grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ ++ echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ ++ echo " typically \`make maintainer-clean' will remove them" >&2; \ ++ exit 1; \ ++ else :; fi; \ ++ else :; fi + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ +@@ -609,6 +637,8 @@ + + html: html-am + ++html-am: ++ + info: info-am + + info-am: +@@ -617,18 +647,28 @@ + + install-dvi: install-dvi-am + ++install-dvi-am: ++ + install-exec-am: + + install-html: install-html-am + ++install-html-am: ++ + install-info: install-info-am + ++install-info-am: ++ + install-man: install-man8 + + install-pdf: install-pdf-am + ++install-pdf-am: ++ + install-ps: install-ps-am + ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +Index: pam.deb/modules/pam_filter/Makefile.in =================================================================== ---- pam.debian.orig/modules/pam_filter/Makefile.in -+++ pam.debian/modules/pam_filter/Makefile.in -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.11 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. +--- pam.deb.orig/modules/pam_filter/Makefile.in ++++ pam.deb/modules/pam_filter/Makefile.in +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -47,7 +47,6 @@ - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ -- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ - $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ - $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ -@@ -56,7 +55,7 @@ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ -- $(top_srcdir)/configure.in -+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -@@ -235,6 +234,7 @@ +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -191,6 +192,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -18295,7 +21751,29 @@ Index: pam.debian/modules/pam_filter/Makefile.in PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PIE_CFLAGS = @PIE_CFLAGS@ -@@ -496,7 +496,7 @@ +@@ -294,8 +296,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +@@ -394,8 +396,8 @@ + esac; \ + done; \ + for i in $$list; do \ +- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ +- else file=$$i; fi; \ ++ if test -f $$i; then file=$$i; \ ++ else file=$(srcdir)/$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 8*) ;; \ +@@ -453,7 +455,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): @@ -18304,7 +21782,7 @@ Index: pam.debian/modules/pam_filter/Makefile.in for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ -@@ -521,7 +521,7 @@ +@@ -478,7 +480,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): @@ -18313,34 +21791,159 @@ Index: pam.debian/modules/pam_filter/Makefile.in for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ -Index: pam.debian/modules/pam_filter/upperLOWER/Makefile.in +@@ -521,7 +523,7 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS +@@ -577,7 +579,7 @@ + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + check-TESTS: $(TESTS) +- @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \ ++ @failed=0; all=0; xfail=0; xpass=0; skip=0; \ + srcdir=$(srcdir); export srcdir; \ + list=' $(TESTS) '; \ + if test -n "$$list"; then \ +@@ -588,7 +590,7 @@ + if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *$$ws$$tst$$ws*) \ ++ *[\ \ ]$$tst[\ \ ]*) \ + xpass=`expr $$xpass + 1`; \ + failed=`expr $$failed + 1`; \ + echo "XPASS: $$tst"; \ +@@ -600,7 +602,7 @@ + elif test $$? -ne 77; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *$$ws$$tst$$ws*) \ ++ *[\ \ ]$$tst[\ \ ]*) \ + xfail=`expr $$xfail + 1`; \ + echo "XFAIL: $$tst"; \ + ;; \ +@@ -614,23 +616,36 @@ + echo "SKIP: $$tst"; \ + fi; \ + done; \ ++ if test "$$all" -eq 1; then \ ++ tests="test"; \ ++ All=""; \ ++ else \ ++ tests="tests"; \ ++ All="All "; \ ++ fi; \ + if test "$$failed" -eq 0; then \ + if test "$$xfail" -eq 0; then \ +- banner="All $$all tests passed"; \ ++ banner="$$All$$all $$tests passed"; \ + else \ +- banner="All $$all tests behaved as expected ($$xfail expected failures)"; \ ++ if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ ++ banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ + fi; \ + else \ + if test "$$xpass" -eq 0; then \ +- banner="$$failed of $$all tests failed"; \ ++ banner="$$failed of $$all $$tests failed"; \ + else \ +- banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \ ++ if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ ++ banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + fi; \ + fi; \ + dashes="$$banner"; \ + skipped=""; \ + if test "$$skip" -ne 0; then \ +- skipped="($$skip tests were not run)"; \ ++ if test "$$skip" -eq 1; then \ ++ skipped="($$skip test was not run)"; \ ++ else \ ++ skipped="($$skip tests were not run)"; \ ++ fi; \ + test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ + dashes="$$skipped"; \ + fi; \ +@@ -650,6 +665,19 @@ + else :; fi + + distdir: $(DISTFILES) ++ @list='$(MANS)'; if test -n "$$list"; then \ ++ list=`for p in $$list; do \ ++ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ ++ if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ ++ if test -n "$$list" && \ ++ grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ ++ echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ ++ grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ ++ echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ ++ echo " typically \`make maintainer-clean' will remove them" >&2; \ ++ exit 1; \ ++ else :; fi; \ ++ else :; fi + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ +@@ -744,6 +772,8 @@ + + html: html-recursive + ++html-am: ++ + info: info-recursive + + info-am: +@@ -753,18 +783,28 @@ + + install-dvi: install-dvi-recursive + ++install-dvi-am: ++ + install-exec-am: + + install-html: install-html-recursive + ++install-html-am: ++ + install-info: install-info-recursive + ++install-info-am: ++ + install-man: install-man8 + + install-pdf: install-pdf-recursive + ++install-pdf-am: ++ + install-ps: install-ps-recursive + ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-recursive +Index: pam.deb/modules/pam_filter/upperLOWER/Makefile.in =================================================================== ---- pam.debian.orig/modules/pam_filter/upperLOWER/Makefile.in -+++ pam.debian/modules/pam_filter/upperLOWER/Makefile.in -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.11 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. +--- pam.deb.orig/modules/pam_filter/upperLOWER/Makefile.in ++++ pam.deb/modules/pam_filter/upperLOWER/Makefile.in +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -44,7 +44,6 @@ - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ -- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ - $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ - $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ -@@ -53,7 +52,7 @@ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ -- $(top_srcdir)/configure.in -+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -@@ -166,6 +165,7 @@ +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -166,6 +167,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -18348,34 +21951,81 @@ Index: pam.debian/modules/pam_filter/upperLOWER/Makefile.in PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PIE_CFLAGS = @PIE_CFLAGS@ -Index: pam.debian/modules/pam_ftp/Makefile.in +@@ -261,8 +263,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +@@ -358,7 +360,7 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS +@@ -475,6 +477,8 @@ + + html: html-am + ++html-am: ++ + info: info-am + + info-am: +@@ -483,18 +487,28 @@ + + install-dvi: install-dvi-am + ++install-dvi-am: ++ + install-exec-am: + + install-html: install-html-am + ++install-html-am: ++ + install-info: install-info-am + ++install-info-am: ++ + install-man: + + install-pdf: install-pdf-am + ++install-pdf-am: ++ + install-ps: install-ps-am + ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +Index: pam.deb/modules/pam_ftp/Makefile.in =================================================================== ---- pam.debian.orig/modules/pam_ftp/Makefile.in -+++ pam.debian/modules/pam_ftp/Makefile.in -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.11 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. +--- pam.deb.orig/modules/pam_ftp/Makefile.in ++++ pam.deb/modules/pam_ftp/Makefile.in +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -45,7 +45,6 @@ - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ -- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ - $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ - $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ -@@ -54,7 +53,7 @@ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ -- $(top_srcdir)/configure.in -+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -@@ -193,6 +192,7 @@ +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -176,6 +177,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -18383,34 +22033,181 @@ Index: pam.debian/modules/pam_ftp/Makefile.in PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PIE_CFLAGS = @PIE_CFLAGS@ -Index: pam.debian/modules/pam_group/Makefile.in +@@ -277,8 +279,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +@@ -377,8 +379,8 @@ + esac; \ + done; \ + for i in $$list; do \ +- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ +- else file=$$i; fi; \ ++ if test -f $$i; then file=$$i; \ ++ else file=$(srcdir)/$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 8*) ;; \ +@@ -417,7 +419,7 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS +@@ -460,7 +462,7 @@ + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + check-TESTS: $(TESTS) +- @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \ ++ @failed=0; all=0; xfail=0; xpass=0; skip=0; \ + srcdir=$(srcdir); export srcdir; \ + list=' $(TESTS) '; \ + if test -n "$$list"; then \ +@@ -471,7 +473,7 @@ + if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *$$ws$$tst$$ws*) \ ++ *[\ \ ]$$tst[\ \ ]*) \ + xpass=`expr $$xpass + 1`; \ + failed=`expr $$failed + 1`; \ + echo "XPASS: $$tst"; \ +@@ -483,7 +485,7 @@ + elif test $$? -ne 77; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *$$ws$$tst$$ws*) \ ++ *[\ \ ]$$tst[\ \ ]*) \ + xfail=`expr $$xfail + 1`; \ + echo "XFAIL: $$tst"; \ + ;; \ +@@ -497,23 +499,36 @@ + echo "SKIP: $$tst"; \ + fi; \ + done; \ ++ if test "$$all" -eq 1; then \ ++ tests="test"; \ ++ All=""; \ ++ else \ ++ tests="tests"; \ ++ All="All "; \ ++ fi; \ + if test "$$failed" -eq 0; then \ + if test "$$xfail" -eq 0; then \ +- banner="All $$all tests passed"; \ ++ banner="$$All$$all $$tests passed"; \ + else \ +- banner="All $$all tests behaved as expected ($$xfail expected failures)"; \ ++ if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ ++ banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ + fi; \ + else \ + if test "$$xpass" -eq 0; then \ +- banner="$$failed of $$all tests failed"; \ ++ banner="$$failed of $$all $$tests failed"; \ + else \ +- banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \ ++ if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ ++ banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + fi; \ + fi; \ + dashes="$$banner"; \ + skipped=""; \ + if test "$$skip" -ne 0; then \ +- skipped="($$skip tests were not run)"; \ ++ if test "$$skip" -eq 1; then \ ++ skipped="($$skip test was not run)"; \ ++ else \ ++ skipped="($$skip tests were not run)"; \ ++ fi; \ + test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ + dashes="$$skipped"; \ + fi; \ +@@ -533,6 +548,19 @@ + else :; fi + + distdir: $(DISTFILES) ++ @list='$(MANS)'; if test -n "$$list"; then \ ++ list=`for p in $$list; do \ ++ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ ++ if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ ++ if test -n "$$list" && \ ++ grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ ++ echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ ++ grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ ++ echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ ++ echo " typically \`make maintainer-clean' will remove them" >&2; \ ++ exit 1; \ ++ else :; fi; \ ++ else :; fi + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ +@@ -609,6 +637,8 @@ + + html: html-am + ++html-am: ++ + info: info-am + + info-am: +@@ -617,18 +647,28 @@ + + install-dvi: install-dvi-am + ++install-dvi-am: ++ + install-exec-am: + + install-html: install-html-am + ++install-html-am: ++ + install-info: install-info-am + ++install-info-am: ++ + install-man: install-man8 + + install-pdf: install-pdf-am + ++install-pdf-am: ++ + install-ps: install-ps-am + ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +Index: pam.deb/modules/pam_group/Makefile.in =================================================================== ---- pam.debian.orig/modules/pam_group/Makefile.in -+++ pam.debian/modules/pam_group/Makefile.in -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.11 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. +--- pam.deb.orig/modules/pam_group/Makefile.in ++++ pam.deb/modules/pam_group/Makefile.in +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -45,7 +45,6 @@ - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ -- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ - $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ - $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ -@@ -54,7 +53,7 @@ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ -- $(top_srcdir)/configure.in -+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -@@ -195,6 +194,7 @@ +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -179,6 +180,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -18418,34 +22215,192 @@ Index: pam.debian/modules/pam_group/Makefile.in PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PIE_CFLAGS = @PIE_CFLAGS@ -Index: pam.debian/modules/pam_issue/Makefile.in +@@ -283,8 +285,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +@@ -383,8 +385,8 @@ + esac; \ + done; \ + for i in $$list; do \ +- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ +- else file=$$i; fi; \ ++ if test -f $$i; then file=$$i; \ ++ else file=$(srcdir)/$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 5*) ;; \ +@@ -428,8 +430,8 @@ + esac; \ + done; \ + for i in $$list; do \ +- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ +- else file=$$i; fi; \ ++ if test -f $$i; then file=$$i; \ ++ else file=$(srcdir)/$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 8*) ;; \ +@@ -485,7 +487,7 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS +@@ -528,7 +530,7 @@ + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + check-TESTS: $(TESTS) +- @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \ ++ @failed=0; all=0; xfail=0; xpass=0; skip=0; \ + srcdir=$(srcdir); export srcdir; \ + list=' $(TESTS) '; \ + if test -n "$$list"; then \ +@@ -539,7 +541,7 @@ + if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *$$ws$$tst$$ws*) \ ++ *[\ \ ]$$tst[\ \ ]*) \ + xpass=`expr $$xpass + 1`; \ + failed=`expr $$failed + 1`; \ + echo "XPASS: $$tst"; \ +@@ -551,7 +553,7 @@ + elif test $$? -ne 77; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *$$ws$$tst$$ws*) \ ++ *[\ \ ]$$tst[\ \ ]*) \ + xfail=`expr $$xfail + 1`; \ + echo "XFAIL: $$tst"; \ + ;; \ +@@ -565,23 +567,36 @@ + echo "SKIP: $$tst"; \ + fi; \ + done; \ ++ if test "$$all" -eq 1; then \ ++ tests="test"; \ ++ All=""; \ ++ else \ ++ tests="tests"; \ ++ All="All "; \ ++ fi; \ + if test "$$failed" -eq 0; then \ + if test "$$xfail" -eq 0; then \ +- banner="All $$all tests passed"; \ ++ banner="$$All$$all $$tests passed"; \ + else \ +- banner="All $$all tests behaved as expected ($$xfail expected failures)"; \ ++ if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ ++ banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ + fi; \ + else \ + if test "$$xpass" -eq 0; then \ +- banner="$$failed of $$all tests failed"; \ ++ banner="$$failed of $$all $$tests failed"; \ + else \ +- banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \ ++ if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ ++ banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + fi; \ + fi; \ + dashes="$$banner"; \ + skipped=""; \ + if test "$$skip" -ne 0; then \ +- skipped="($$skip tests were not run)"; \ ++ if test "$$skip" -eq 1; then \ ++ skipped="($$skip test was not run)"; \ ++ else \ ++ skipped="($$skip tests were not run)"; \ ++ fi; \ + test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ + dashes="$$skipped"; \ + fi; \ +@@ -601,6 +616,19 @@ + else :; fi + + distdir: $(DISTFILES) ++ @list='$(MANS)'; if test -n "$$list"; then \ ++ list=`for p in $$list; do \ ++ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ ++ if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ ++ if test -n "$$list" && \ ++ grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ ++ echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ ++ grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ ++ echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ ++ echo " typically \`make maintainer-clean' will remove them" >&2; \ ++ exit 1; \ ++ else :; fi; \ ++ else :; fi + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ +@@ -677,6 +705,8 @@ + + html: html-am + ++html-am: ++ + info: info-am + + info-am: +@@ -686,18 +716,28 @@ + + install-dvi: install-dvi-am + ++install-dvi-am: ++ + install-exec-am: + + install-html: install-html-am + ++install-html-am: ++ + install-info: install-info-am + ++install-info-am: ++ + install-man: install-man5 install-man8 + + install-pdf: install-pdf-am + ++install-pdf-am: ++ + install-ps: install-ps-am + ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +Index: pam.deb/modules/pam_issue/Makefile.in =================================================================== ---- pam.debian.orig/modules/pam_issue/Makefile.in -+++ pam.debian/modules/pam_issue/Makefile.in -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.11 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. +--- pam.deb.orig/modules/pam_issue/Makefile.in ++++ pam.deb/modules/pam_issue/Makefile.in +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -45,7 +45,6 @@ - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ -- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ - $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ - $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ -@@ -54,7 +53,7 @@ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ -- $(top_srcdir)/configure.in -+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -@@ -193,6 +192,7 @@ +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -176,6 +177,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -18453,34 +22408,181 @@ Index: pam.debian/modules/pam_issue/Makefile.in PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PIE_CFLAGS = @PIE_CFLAGS@ -Index: pam.debian/modules/pam_keyinit/Makefile.in +@@ -277,8 +279,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +@@ -377,8 +379,8 @@ + esac; \ + done; \ + for i in $$list; do \ +- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ +- else file=$$i; fi; \ ++ if test -f $$i; then file=$$i; \ ++ else file=$(srcdir)/$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 8*) ;; \ +@@ -417,7 +419,7 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS +@@ -460,7 +462,7 @@ + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + check-TESTS: $(TESTS) +- @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \ ++ @failed=0; all=0; xfail=0; xpass=0; skip=0; \ + srcdir=$(srcdir); export srcdir; \ + list=' $(TESTS) '; \ + if test -n "$$list"; then \ +@@ -471,7 +473,7 @@ + if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *$$ws$$tst$$ws*) \ ++ *[\ \ ]$$tst[\ \ ]*) \ + xpass=`expr $$xpass + 1`; \ + failed=`expr $$failed + 1`; \ + echo "XPASS: $$tst"; \ +@@ -483,7 +485,7 @@ + elif test $$? -ne 77; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *$$ws$$tst$$ws*) \ ++ *[\ \ ]$$tst[\ \ ]*) \ + xfail=`expr $$xfail + 1`; \ + echo "XFAIL: $$tst"; \ + ;; \ +@@ -497,23 +499,36 @@ + echo "SKIP: $$tst"; \ + fi; \ + done; \ ++ if test "$$all" -eq 1; then \ ++ tests="test"; \ ++ All=""; \ ++ else \ ++ tests="tests"; \ ++ All="All "; \ ++ fi; \ + if test "$$failed" -eq 0; then \ + if test "$$xfail" -eq 0; then \ +- banner="All $$all tests passed"; \ ++ banner="$$All$$all $$tests passed"; \ + else \ +- banner="All $$all tests behaved as expected ($$xfail expected failures)"; \ ++ if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ ++ banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ + fi; \ + else \ + if test "$$xpass" -eq 0; then \ +- banner="$$failed of $$all tests failed"; \ ++ banner="$$failed of $$all $$tests failed"; \ + else \ +- banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \ ++ if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ ++ banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + fi; \ + fi; \ + dashes="$$banner"; \ + skipped=""; \ + if test "$$skip" -ne 0; then \ +- skipped="($$skip tests were not run)"; \ ++ if test "$$skip" -eq 1; then \ ++ skipped="($$skip test was not run)"; \ ++ else \ ++ skipped="($$skip tests were not run)"; \ ++ fi; \ + test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ + dashes="$$skipped"; \ + fi; \ +@@ -533,6 +548,19 @@ + else :; fi + + distdir: $(DISTFILES) ++ @list='$(MANS)'; if test -n "$$list"; then \ ++ list=`for p in $$list; do \ ++ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ ++ if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ ++ if test -n "$$list" && \ ++ grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ ++ echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ ++ grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ ++ echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ ++ echo " typically \`make maintainer-clean' will remove them" >&2; \ ++ exit 1; \ ++ else :; fi; \ ++ else :; fi + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ +@@ -609,6 +637,8 @@ + + html: html-am + ++html-am: ++ + info: info-am + + info-am: +@@ -617,18 +647,28 @@ + + install-dvi: install-dvi-am + ++install-dvi-am: ++ + install-exec-am: + + install-html: install-html-am + ++install-html-am: ++ + install-info: install-info-am + ++install-info-am: ++ + install-man: install-man8 + + install-pdf: install-pdf-am + ++install-pdf-am: ++ + install-ps: install-ps-am + ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +Index: pam.deb/modules/pam_keyinit/Makefile.in =================================================================== ---- pam.debian.orig/modules/pam_keyinit/Makefile.in -+++ pam.debian/modules/pam_keyinit/Makefile.in -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.11 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. +--- pam.deb.orig/modules/pam_keyinit/Makefile.in ++++ pam.deb/modules/pam_keyinit/Makefile.in +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -45,7 +45,6 @@ - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ -- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ - $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ - $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ -@@ -54,7 +53,7 @@ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ -- $(top_srcdir)/configure.in -+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -@@ -195,6 +194,7 @@ +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -178,6 +179,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -18488,34 +22590,181 @@ Index: pam.debian/modules/pam_keyinit/Makefile.in PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PIE_CFLAGS = @PIE_CFLAGS@ -Index: pam.debian/modules/pam_lastlog/Makefile.in +@@ -279,8 +281,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +@@ -379,8 +381,8 @@ + esac; \ + done; \ + for i in $$list; do \ +- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ +- else file=$$i; fi; \ ++ if test -f $$i; then file=$$i; \ ++ else file=$(srcdir)/$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 8*) ;; \ +@@ -419,7 +421,7 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS +@@ -462,7 +464,7 @@ + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + check-TESTS: $(TESTS) +- @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \ ++ @failed=0; all=0; xfail=0; xpass=0; skip=0; \ + srcdir=$(srcdir); export srcdir; \ + list=' $(TESTS) '; \ + if test -n "$$list"; then \ +@@ -473,7 +475,7 @@ + if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *$$ws$$tst$$ws*) \ ++ *[\ \ ]$$tst[\ \ ]*) \ + xpass=`expr $$xpass + 1`; \ + failed=`expr $$failed + 1`; \ + echo "XPASS: $$tst"; \ +@@ -485,7 +487,7 @@ + elif test $$? -ne 77; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *$$ws$$tst$$ws*) \ ++ *[\ \ ]$$tst[\ \ ]*) \ + xfail=`expr $$xfail + 1`; \ + echo "XFAIL: $$tst"; \ + ;; \ +@@ -499,23 +501,36 @@ + echo "SKIP: $$tst"; \ + fi; \ + done; \ ++ if test "$$all" -eq 1; then \ ++ tests="test"; \ ++ All=""; \ ++ else \ ++ tests="tests"; \ ++ All="All "; \ ++ fi; \ + if test "$$failed" -eq 0; then \ + if test "$$xfail" -eq 0; then \ +- banner="All $$all tests passed"; \ ++ banner="$$All$$all $$tests passed"; \ + else \ +- banner="All $$all tests behaved as expected ($$xfail expected failures)"; \ ++ if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ ++ banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ + fi; \ + else \ + if test "$$xpass" -eq 0; then \ +- banner="$$failed of $$all tests failed"; \ ++ banner="$$failed of $$all $$tests failed"; \ + else \ +- banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \ ++ if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ ++ banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + fi; \ + fi; \ + dashes="$$banner"; \ + skipped=""; \ + if test "$$skip" -ne 0; then \ +- skipped="($$skip tests were not run)"; \ ++ if test "$$skip" -eq 1; then \ ++ skipped="($$skip test was not run)"; \ ++ else \ ++ skipped="($$skip tests were not run)"; \ ++ fi; \ + test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ + dashes="$$skipped"; \ + fi; \ +@@ -535,6 +550,19 @@ + else :; fi + + distdir: $(DISTFILES) ++ @list='$(MANS)'; if test -n "$$list"; then \ ++ list=`for p in $$list; do \ ++ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ ++ if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ ++ if test -n "$$list" && \ ++ grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ ++ echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ ++ grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ ++ echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ ++ echo " typically \`make maintainer-clean' will remove them" >&2; \ ++ exit 1; \ ++ else :; fi; \ ++ else :; fi + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ +@@ -611,6 +639,8 @@ + + html: html-am + ++html-am: ++ + info: info-am + + info-am: +@@ -619,18 +649,28 @@ + + install-dvi: install-dvi-am + ++install-dvi-am: ++ + install-exec-am: + + install-html: install-html-am + ++install-html-am: ++ + install-info: install-info-am + ++install-info-am: ++ + install-man: install-man8 + + install-pdf: install-pdf-am + ++install-pdf-am: ++ + install-ps: install-ps-am + ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +Index: pam.deb/modules/pam_lastlog/Makefile.in =================================================================== ---- pam.debian.orig/modules/pam_lastlog/Makefile.in -+++ pam.debian/modules/pam_lastlog/Makefile.in -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.11 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. +--- pam.deb.orig/modules/pam_lastlog/Makefile.in ++++ pam.deb/modules/pam_lastlog/Makefile.in +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -45,7 +45,6 @@ - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ -- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ - $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ - $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ -@@ -54,7 +53,7 @@ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ -- $(top_srcdir)/configure.in -+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -@@ -193,6 +192,7 @@ +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -176,6 +177,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -18523,34 +22772,181 @@ Index: pam.debian/modules/pam_lastlog/Makefile.in PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PIE_CFLAGS = @PIE_CFLAGS@ -Index: pam.debian/modules/pam_limits/Makefile.in +@@ -277,8 +279,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +@@ -377,8 +379,8 @@ + esac; \ + done; \ + for i in $$list; do \ +- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ +- else file=$$i; fi; \ ++ if test -f $$i; then file=$$i; \ ++ else file=$(srcdir)/$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 8*) ;; \ +@@ -417,7 +419,7 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS +@@ -460,7 +462,7 @@ + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + check-TESTS: $(TESTS) +- @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \ ++ @failed=0; all=0; xfail=0; xpass=0; skip=0; \ + srcdir=$(srcdir); export srcdir; \ + list=' $(TESTS) '; \ + if test -n "$$list"; then \ +@@ -471,7 +473,7 @@ + if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *$$ws$$tst$$ws*) \ ++ *[\ \ ]$$tst[\ \ ]*) \ + xpass=`expr $$xpass + 1`; \ + failed=`expr $$failed + 1`; \ + echo "XPASS: $$tst"; \ +@@ -483,7 +485,7 @@ + elif test $$? -ne 77; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *$$ws$$tst$$ws*) \ ++ *[\ \ ]$$tst[\ \ ]*) \ + xfail=`expr $$xfail + 1`; \ + echo "XFAIL: $$tst"; \ + ;; \ +@@ -497,23 +499,36 @@ + echo "SKIP: $$tst"; \ + fi; \ + done; \ ++ if test "$$all" -eq 1; then \ ++ tests="test"; \ ++ All=""; \ ++ else \ ++ tests="tests"; \ ++ All="All "; \ ++ fi; \ + if test "$$failed" -eq 0; then \ + if test "$$xfail" -eq 0; then \ +- banner="All $$all tests passed"; \ ++ banner="$$All$$all $$tests passed"; \ + else \ +- banner="All $$all tests behaved as expected ($$xfail expected failures)"; \ ++ if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ ++ banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ + fi; \ + else \ + if test "$$xpass" -eq 0; then \ +- banner="$$failed of $$all tests failed"; \ ++ banner="$$failed of $$all $$tests failed"; \ + else \ +- banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \ ++ if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ ++ banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + fi; \ + fi; \ + dashes="$$banner"; \ + skipped=""; \ + if test "$$skip" -ne 0; then \ +- skipped="($$skip tests were not run)"; \ ++ if test "$$skip" -eq 1; then \ ++ skipped="($$skip test was not run)"; \ ++ else \ ++ skipped="($$skip tests were not run)"; \ ++ fi; \ + test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ + dashes="$$skipped"; \ + fi; \ +@@ -533,6 +548,19 @@ + else :; fi + + distdir: $(DISTFILES) ++ @list='$(MANS)'; if test -n "$$list"; then \ ++ list=`for p in $$list; do \ ++ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ ++ if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ ++ if test -n "$$list" && \ ++ grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ ++ echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ ++ grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ ++ echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ ++ echo " typically \`make maintainer-clean' will remove them" >&2; \ ++ exit 1; \ ++ else :; fi; \ ++ else :; fi + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ +@@ -609,6 +637,8 @@ + + html: html-am + ++html-am: ++ + info: info-am + + info-am: +@@ -617,18 +647,28 @@ + + install-dvi: install-dvi-am + ++install-dvi-am: ++ + install-exec-am: + + install-html: install-html-am + ++install-html-am: ++ + install-info: install-info-am + ++install-info-am: ++ + install-man: install-man8 + + install-pdf: install-pdf-am + ++install-pdf-am: ++ + install-ps: install-ps-am + ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +Index: pam.deb/modules/pam_limits/Makefile.in =================================================================== ---- pam.debian.orig/modules/pam_limits/Makefile.in -+++ pam.debian/modules/pam_limits/Makefile.in -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.11 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. +--- pam.deb.orig/modules/pam_limits/Makefile.in ++++ pam.deb/modules/pam_limits/Makefile.in +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -45,7 +45,6 @@ - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ -- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ - $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ - $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ -@@ -54,7 +53,7 @@ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ -- $(top_srcdir)/configure.in -+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -@@ -195,6 +194,7 @@ +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -179,6 +180,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -18558,34 +22954,192 @@ Index: pam.debian/modules/pam_limits/Makefile.in PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PIE_CFLAGS = @PIE_CFLAGS@ -Index: pam.debian/modules/pam_listfile/Makefile.in +@@ -285,8 +287,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +@@ -385,8 +387,8 @@ + esac; \ + done; \ + for i in $$list; do \ +- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ +- else file=$$i; fi; \ ++ if test -f $$i; then file=$$i; \ ++ else file=$(srcdir)/$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 5*) ;; \ +@@ -430,8 +432,8 @@ + esac; \ + done; \ + for i in $$list; do \ +- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ +- else file=$$i; fi; \ ++ if test -f $$i; then file=$$i; \ ++ else file=$(srcdir)/$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 8*) ;; \ +@@ -487,7 +489,7 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS +@@ -530,7 +532,7 @@ + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + check-TESTS: $(TESTS) +- @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \ ++ @failed=0; all=0; xfail=0; xpass=0; skip=0; \ + srcdir=$(srcdir); export srcdir; \ + list=' $(TESTS) '; \ + if test -n "$$list"; then \ +@@ -541,7 +543,7 @@ + if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *$$ws$$tst$$ws*) \ ++ *[\ \ ]$$tst[\ \ ]*) \ + xpass=`expr $$xpass + 1`; \ + failed=`expr $$failed + 1`; \ + echo "XPASS: $$tst"; \ +@@ -553,7 +555,7 @@ + elif test $$? -ne 77; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *$$ws$$tst$$ws*) \ ++ *[\ \ ]$$tst[\ \ ]*) \ + xfail=`expr $$xfail + 1`; \ + echo "XFAIL: $$tst"; \ + ;; \ +@@ -567,23 +569,36 @@ + echo "SKIP: $$tst"; \ + fi; \ + done; \ ++ if test "$$all" -eq 1; then \ ++ tests="test"; \ ++ All=""; \ ++ else \ ++ tests="tests"; \ ++ All="All "; \ ++ fi; \ + if test "$$failed" -eq 0; then \ + if test "$$xfail" -eq 0; then \ +- banner="All $$all tests passed"; \ ++ banner="$$All$$all $$tests passed"; \ + else \ +- banner="All $$all tests behaved as expected ($$xfail expected failures)"; \ ++ if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ ++ banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ + fi; \ + else \ + if test "$$xpass" -eq 0; then \ +- banner="$$failed of $$all tests failed"; \ ++ banner="$$failed of $$all $$tests failed"; \ + else \ +- banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \ ++ if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ ++ banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + fi; \ + fi; \ + dashes="$$banner"; \ + skipped=""; \ + if test "$$skip" -ne 0; then \ +- skipped="($$skip tests were not run)"; \ ++ if test "$$skip" -eq 1; then \ ++ skipped="($$skip test was not run)"; \ ++ else \ ++ skipped="($$skip tests were not run)"; \ ++ fi; \ + test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ + dashes="$$skipped"; \ + fi; \ +@@ -603,6 +618,19 @@ + else :; fi + + distdir: $(DISTFILES) ++ @list='$(MANS)'; if test -n "$$list"; then \ ++ list=`for p in $$list; do \ ++ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ ++ if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ ++ if test -n "$$list" && \ ++ grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ ++ echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ ++ grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ ++ echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ ++ echo " typically \`make maintainer-clean' will remove them" >&2; \ ++ exit 1; \ ++ else :; fi; \ ++ else :; fi + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ +@@ -679,6 +707,8 @@ + + html: html-am + ++html-am: ++ + info: info-am + + info-am: +@@ -688,18 +718,28 @@ + + install-dvi: install-dvi-am + ++install-dvi-am: ++ + install-exec-am: + + install-html: install-html-am + ++install-html-am: ++ + install-info: install-info-am + ++install-info-am: ++ + install-man: install-man5 install-man8 + + install-pdf: install-pdf-am + ++install-pdf-am: ++ + install-ps: install-ps-am + ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +Index: pam.deb/modules/pam_listfile/Makefile.in =================================================================== ---- pam.debian.orig/modules/pam_listfile/Makefile.in -+++ pam.debian/modules/pam_listfile/Makefile.in -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.11 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. +--- pam.deb.orig/modules/pam_listfile/Makefile.in ++++ pam.deb/modules/pam_listfile/Makefile.in +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -45,7 +45,6 @@ - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ -- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ - $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ - $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ -@@ -54,7 +53,7 @@ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ -- $(top_srcdir)/configure.in -+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -@@ -193,6 +192,7 @@ +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -176,6 +177,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -18593,34 +23147,181 @@ Index: pam.debian/modules/pam_listfile/Makefile.in PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PIE_CFLAGS = @PIE_CFLAGS@ -Index: pam.debian/modules/pam_localuser/Makefile.in +@@ -277,8 +279,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +@@ -377,8 +379,8 @@ + esac; \ + done; \ + for i in $$list; do \ +- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ +- else file=$$i; fi; \ ++ if test -f $$i; then file=$$i; \ ++ else file=$(srcdir)/$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 8*) ;; \ +@@ -417,7 +419,7 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS +@@ -460,7 +462,7 @@ + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + check-TESTS: $(TESTS) +- @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \ ++ @failed=0; all=0; xfail=0; xpass=0; skip=0; \ + srcdir=$(srcdir); export srcdir; \ + list=' $(TESTS) '; \ + if test -n "$$list"; then \ +@@ -471,7 +473,7 @@ + if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *$$ws$$tst$$ws*) \ ++ *[\ \ ]$$tst[\ \ ]*) \ + xpass=`expr $$xpass + 1`; \ + failed=`expr $$failed + 1`; \ + echo "XPASS: $$tst"; \ +@@ -483,7 +485,7 @@ + elif test $$? -ne 77; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *$$ws$$tst$$ws*) \ ++ *[\ \ ]$$tst[\ \ ]*) \ + xfail=`expr $$xfail + 1`; \ + echo "XFAIL: $$tst"; \ + ;; \ +@@ -497,23 +499,36 @@ + echo "SKIP: $$tst"; \ + fi; \ + done; \ ++ if test "$$all" -eq 1; then \ ++ tests="test"; \ ++ All=""; \ ++ else \ ++ tests="tests"; \ ++ All="All "; \ ++ fi; \ + if test "$$failed" -eq 0; then \ + if test "$$xfail" -eq 0; then \ +- banner="All $$all tests passed"; \ ++ banner="$$All$$all $$tests passed"; \ + else \ +- banner="All $$all tests behaved as expected ($$xfail expected failures)"; \ ++ if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ ++ banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ + fi; \ + else \ + if test "$$xpass" -eq 0; then \ +- banner="$$failed of $$all tests failed"; \ ++ banner="$$failed of $$all $$tests failed"; \ + else \ +- banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \ ++ if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ ++ banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + fi; \ + fi; \ + dashes="$$banner"; \ + skipped=""; \ + if test "$$skip" -ne 0; then \ +- skipped="($$skip tests were not run)"; \ ++ if test "$$skip" -eq 1; then \ ++ skipped="($$skip test was not run)"; \ ++ else \ ++ skipped="($$skip tests were not run)"; \ ++ fi; \ + test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ + dashes="$$skipped"; \ + fi; \ +@@ -533,6 +548,19 @@ + else :; fi + + distdir: $(DISTFILES) ++ @list='$(MANS)'; if test -n "$$list"; then \ ++ list=`for p in $$list; do \ ++ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ ++ if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ ++ if test -n "$$list" && \ ++ grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ ++ echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ ++ grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ ++ echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ ++ echo " typically \`make maintainer-clean' will remove them" >&2; \ ++ exit 1; \ ++ else :; fi; \ ++ else :; fi + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ +@@ -609,6 +637,8 @@ + + html: html-am + ++html-am: ++ + info: info-am + + info-am: +@@ -617,18 +647,28 @@ + + install-dvi: install-dvi-am + ++install-dvi-am: ++ + install-exec-am: + + install-html: install-html-am + ++install-html-am: ++ + install-info: install-info-am + ++install-info-am: ++ + install-man: install-man8 + + install-pdf: install-pdf-am + ++install-pdf-am: ++ + install-ps: install-ps-am + ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +Index: pam.deb/modules/pam_localuser/Makefile.in =================================================================== ---- pam.debian.orig/modules/pam_localuser/Makefile.in -+++ pam.debian/modules/pam_localuser/Makefile.in -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.11 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. +--- pam.deb.orig/modules/pam_localuser/Makefile.in ++++ pam.deb/modules/pam_localuser/Makefile.in +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -45,7 +45,6 @@ - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ -- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ - $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ - $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ -@@ -54,7 +53,7 @@ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ -- $(top_srcdir)/configure.in -+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -@@ -193,6 +192,7 @@ +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -176,6 +177,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -18628,34 +23329,181 @@ Index: pam.debian/modules/pam_localuser/Makefile.in PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PIE_CFLAGS = @PIE_CFLAGS@ -Index: pam.debian/modules/pam_loginuid/Makefile.in +@@ -277,8 +279,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +@@ -377,8 +379,8 @@ + esac; \ + done; \ + for i in $$list; do \ +- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ +- else file=$$i; fi; \ ++ if test -f $$i; then file=$$i; \ ++ else file=$(srcdir)/$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 8*) ;; \ +@@ -417,7 +419,7 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS +@@ -460,7 +462,7 @@ + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + check-TESTS: $(TESTS) +- @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \ ++ @failed=0; all=0; xfail=0; xpass=0; skip=0; \ + srcdir=$(srcdir); export srcdir; \ + list=' $(TESTS) '; \ + if test -n "$$list"; then \ +@@ -471,7 +473,7 @@ + if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *$$ws$$tst$$ws*) \ ++ *[\ \ ]$$tst[\ \ ]*) \ + xpass=`expr $$xpass + 1`; \ + failed=`expr $$failed + 1`; \ + echo "XPASS: $$tst"; \ +@@ -483,7 +485,7 @@ + elif test $$? -ne 77; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *$$ws$$tst$$ws*) \ ++ *[\ \ ]$$tst[\ \ ]*) \ + xfail=`expr $$xfail + 1`; \ + echo "XFAIL: $$tst"; \ + ;; \ +@@ -497,23 +499,36 @@ + echo "SKIP: $$tst"; \ + fi; \ + done; \ ++ if test "$$all" -eq 1; then \ ++ tests="test"; \ ++ All=""; \ ++ else \ ++ tests="tests"; \ ++ All="All "; \ ++ fi; \ + if test "$$failed" -eq 0; then \ + if test "$$xfail" -eq 0; then \ +- banner="All $$all tests passed"; \ ++ banner="$$All$$all $$tests passed"; \ + else \ +- banner="All $$all tests behaved as expected ($$xfail expected failures)"; \ ++ if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ ++ banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ + fi; \ + else \ + if test "$$xpass" -eq 0; then \ +- banner="$$failed of $$all tests failed"; \ ++ banner="$$failed of $$all $$tests failed"; \ + else \ +- banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \ ++ if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ ++ banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + fi; \ + fi; \ + dashes="$$banner"; \ + skipped=""; \ + if test "$$skip" -ne 0; then \ +- skipped="($$skip tests were not run)"; \ ++ if test "$$skip" -eq 1; then \ ++ skipped="($$skip test was not run)"; \ ++ else \ ++ skipped="($$skip tests were not run)"; \ ++ fi; \ + test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ + dashes="$$skipped"; \ + fi; \ +@@ -533,6 +548,19 @@ + else :; fi + + distdir: $(DISTFILES) ++ @list='$(MANS)'; if test -n "$$list"; then \ ++ list=`for p in $$list; do \ ++ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ ++ if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ ++ if test -n "$$list" && \ ++ grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ ++ echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ ++ grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ ++ echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ ++ echo " typically \`make maintainer-clean' will remove them" >&2; \ ++ exit 1; \ ++ else :; fi; \ ++ else :; fi + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ +@@ -609,6 +637,8 @@ + + html: html-am + ++html-am: ++ + info: info-am + + info-am: +@@ -617,18 +647,28 @@ + + install-dvi: install-dvi-am + ++install-dvi-am: ++ + install-exec-am: + + install-html: install-html-am + ++install-html-am: ++ + install-info: install-info-am + ++install-info-am: ++ + install-man: install-man8 + + install-pdf: install-pdf-am + ++install-pdf-am: ++ + install-ps: install-ps-am + ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +Index: pam.deb/modules/pam_loginuid/Makefile.in =================================================================== ---- pam.debian.orig/modules/pam_loginuid/Makefile.in -+++ pam.debian/modules/pam_loginuid/Makefile.in -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.11 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. +--- pam.deb.orig/modules/pam_loginuid/Makefile.in ++++ pam.deb/modules/pam_loginuid/Makefile.in +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -45,7 +45,6 @@ - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ -- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ - $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ - $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ -@@ -54,7 +53,7 @@ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ -- $(top_srcdir)/configure.in -+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -@@ -193,6 +192,7 @@ +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -176,6 +177,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -18663,34 +23511,181 @@ Index: pam.debian/modules/pam_loginuid/Makefile.in PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PIE_CFLAGS = @PIE_CFLAGS@ -Index: pam.debian/modules/pam_mail/Makefile.in +@@ -277,8 +279,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +@@ -377,8 +379,8 @@ + esac; \ + done; \ + for i in $$list; do \ +- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ +- else file=$$i; fi; \ ++ if test -f $$i; then file=$$i; \ ++ else file=$(srcdir)/$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 8*) ;; \ +@@ -417,7 +419,7 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS +@@ -460,7 +462,7 @@ + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + check-TESTS: $(TESTS) +- @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \ ++ @failed=0; all=0; xfail=0; xpass=0; skip=0; \ + srcdir=$(srcdir); export srcdir; \ + list=' $(TESTS) '; \ + if test -n "$$list"; then \ +@@ -471,7 +473,7 @@ + if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *$$ws$$tst$$ws*) \ ++ *[\ \ ]$$tst[\ \ ]*) \ + xpass=`expr $$xpass + 1`; \ + failed=`expr $$failed + 1`; \ + echo "XPASS: $$tst"; \ +@@ -483,7 +485,7 @@ + elif test $$? -ne 77; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *$$ws$$tst$$ws*) \ ++ *[\ \ ]$$tst[\ \ ]*) \ + xfail=`expr $$xfail + 1`; \ + echo "XFAIL: $$tst"; \ + ;; \ +@@ -497,23 +499,36 @@ + echo "SKIP: $$tst"; \ + fi; \ + done; \ ++ if test "$$all" -eq 1; then \ ++ tests="test"; \ ++ All=""; \ ++ else \ ++ tests="tests"; \ ++ All="All "; \ ++ fi; \ + if test "$$failed" -eq 0; then \ + if test "$$xfail" -eq 0; then \ +- banner="All $$all tests passed"; \ ++ banner="$$All$$all $$tests passed"; \ + else \ +- banner="All $$all tests behaved as expected ($$xfail expected failures)"; \ ++ if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ ++ banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ + fi; \ + else \ + if test "$$xpass" -eq 0; then \ +- banner="$$failed of $$all tests failed"; \ ++ banner="$$failed of $$all $$tests failed"; \ + else \ +- banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \ ++ if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ ++ banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + fi; \ + fi; \ + dashes="$$banner"; \ + skipped=""; \ + if test "$$skip" -ne 0; then \ +- skipped="($$skip tests were not run)"; \ ++ if test "$$skip" -eq 1; then \ ++ skipped="($$skip test was not run)"; \ ++ else \ ++ skipped="($$skip tests were not run)"; \ ++ fi; \ + test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ + dashes="$$skipped"; \ + fi; \ +@@ -533,6 +548,19 @@ + else :; fi + + distdir: $(DISTFILES) ++ @list='$(MANS)'; if test -n "$$list"; then \ ++ list=`for p in $$list; do \ ++ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ ++ if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ ++ if test -n "$$list" && \ ++ grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ ++ echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ ++ grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ ++ echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ ++ echo " typically \`make maintainer-clean' will remove them" >&2; \ ++ exit 1; \ ++ else :; fi; \ ++ else :; fi + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ +@@ -609,6 +637,8 @@ + + html: html-am + ++html-am: ++ + info: info-am + + info-am: +@@ -617,18 +647,28 @@ + + install-dvi: install-dvi-am + ++install-dvi-am: ++ + install-exec-am: + + install-html: install-html-am + ++install-html-am: ++ + install-info: install-info-am + ++install-info-am: ++ + install-man: install-man8 + + install-pdf: install-pdf-am + ++install-pdf-am: ++ + install-ps: install-ps-am + ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +Index: pam.deb/modules/pam_mail/Makefile.in =================================================================== ---- pam.debian.orig/modules/pam_mail/Makefile.in -+++ pam.debian/modules/pam_mail/Makefile.in -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.11 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. +--- pam.deb.orig/modules/pam_mail/Makefile.in ++++ pam.deb/modules/pam_mail/Makefile.in +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -45,7 +45,6 @@ - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ -- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ - $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ - $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ -@@ -54,7 +53,7 @@ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ -- $(top_srcdir)/configure.in -+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -@@ -193,6 +192,7 @@ +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -176,6 +177,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -18698,44 +23693,181 @@ Index: pam.debian/modules/pam_mail/Makefile.in PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PIE_CFLAGS = @PIE_CFLAGS@ -Index: pam.debian/modules/pam_mkhomedir/Makefile.in +@@ -277,8 +279,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +@@ -377,8 +379,8 @@ + esac; \ + done; \ + for i in $$list; do \ +- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ +- else file=$$i; fi; \ ++ if test -f $$i; then file=$$i; \ ++ else file=$(srcdir)/$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 8*) ;; \ +@@ -417,7 +419,7 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS +@@ -460,7 +462,7 @@ + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + check-TESTS: $(TESTS) +- @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \ ++ @failed=0; all=0; xfail=0; xpass=0; skip=0; \ + srcdir=$(srcdir); export srcdir; \ + list=' $(TESTS) '; \ + if test -n "$$list"; then \ +@@ -471,7 +473,7 @@ + if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *$$ws$$tst$$ws*) \ ++ *[\ \ ]$$tst[\ \ ]*) \ + xpass=`expr $$xpass + 1`; \ + failed=`expr $$failed + 1`; \ + echo "XPASS: $$tst"; \ +@@ -483,7 +485,7 @@ + elif test $$? -ne 77; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *$$ws$$tst$$ws*) \ ++ *[\ \ ]$$tst[\ \ ]*) \ + xfail=`expr $$xfail + 1`; \ + echo "XFAIL: $$tst"; \ + ;; \ +@@ -497,23 +499,36 @@ + echo "SKIP: $$tst"; \ + fi; \ + done; \ ++ if test "$$all" -eq 1; then \ ++ tests="test"; \ ++ All=""; \ ++ else \ ++ tests="tests"; \ ++ All="All "; \ ++ fi; \ + if test "$$failed" -eq 0; then \ + if test "$$xfail" -eq 0; then \ +- banner="All $$all tests passed"; \ ++ banner="$$All$$all $$tests passed"; \ + else \ +- banner="All $$all tests behaved as expected ($$xfail expected failures)"; \ ++ if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ ++ banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ + fi; \ + else \ + if test "$$xpass" -eq 0; then \ +- banner="$$failed of $$all tests failed"; \ ++ banner="$$failed of $$all $$tests failed"; \ + else \ +- banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \ ++ if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ ++ banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + fi; \ + fi; \ + dashes="$$banner"; \ + skipped=""; \ + if test "$$skip" -ne 0; then \ +- skipped="($$skip tests were not run)"; \ ++ if test "$$skip" -eq 1; then \ ++ skipped="($$skip test was not run)"; \ ++ else \ ++ skipped="($$skip tests were not run)"; \ ++ fi; \ + test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ + dashes="$$skipped"; \ + fi; \ +@@ -533,6 +548,19 @@ + else :; fi + + distdir: $(DISTFILES) ++ @list='$(MANS)'; if test -n "$$list"; then \ ++ list=`for p in $$list; do \ ++ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ ++ if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ ++ if test -n "$$list" && \ ++ grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ ++ echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ ++ grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ ++ echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ ++ echo " typically \`make maintainer-clean' will remove them" >&2; \ ++ exit 1; \ ++ else :; fi; \ ++ else :; fi + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ +@@ -609,6 +637,8 @@ + + html: html-am + ++html-am: ++ + info: info-am + + info-am: +@@ -617,18 +647,28 @@ + + install-dvi: install-dvi-am + ++install-dvi-am: ++ + install-exec-am: + + install-html: install-html-am + ++install-html-am: ++ + install-info: install-info-am + ++install-info-am: ++ + install-man: install-man8 + + install-pdf: install-pdf-am + ++install-pdf-am: ++ + install-ps: install-ps-am + ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +Index: pam.deb/modules/pam_mkhomedir/Makefile.in =================================================================== ---- pam.debian.orig/modules/pam_mkhomedir/Makefile.in -+++ pam.debian/modules/pam_mkhomedir/Makefile.in -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.11 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. +--- pam.deb.orig/modules/pam_mkhomedir/Makefile.in ++++ pam.deb/modules/pam_mkhomedir/Makefile.in +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -48,7 +48,6 @@ - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ -- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ - $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ - $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ -@@ -57,7 +56,7 @@ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ -- $(top_srcdir)/configure.in -+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -@@ -91,6 +90,9 @@ - pam_mkhomedir_la_DEPENDENCIES = - am_pam_mkhomedir_la_OBJECTS = pam_mkhomedir.lo - pam_mkhomedir_la_OBJECTS = $(am_pam_mkhomedir_la_OBJECTS) -+pam_mkhomedir_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(pam_mkhomedir_la_LDFLAGS) $(LDFLAGS) -o $@ - PROGRAMS = $(sbin_PROGRAMS) - am_mkhomedir_helper_OBJECTS = mkhomedir_helper.$(OBJEXT) - mkhomedir_helper_OBJECTS = $(am_mkhomedir_helper_OBJECTS) -@@ -201,6 +203,7 @@ +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -188,6 +189,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -18743,56 +23875,181 @@ Index: pam.debian/modules/pam_mkhomedir/Makefile.in PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PIE_CFLAGS = @PIE_CFLAGS@ -@@ -290,10 +293,11 @@ - AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \ - -DMKHOMEDIR_HELPER=\"$(sbindir)/mkhomedir_helper\" - --AM_LDFLAGS = -no-undefined -avoid-version -module $(am__append_1) - securelib_LTLIBRARIES = pam_mkhomedir.la - pam_mkhomedir_la_SOURCES = pam_mkhomedir.c - pam_mkhomedir_la_LIBADD = -L$(top_builddir)/libpam -lpam -+pam_mkhomedir_la_LDFLAGS = -no-undefined -avoid-version -module \ -+ $(am__append_1) - mkhomedir_helper_SOURCES = mkhomedir_helper.c - mkhomedir_helper_LDADD = -L$(top_builddir)/libpam -lpam - @ENABLE_REGENERATE_MAN_TRUE@noinst_DATA = README -@@ -363,7 +367,7 @@ - rm -f "$${dir}/so_locations"; \ - done - pam_mkhomedir.la: $(pam_mkhomedir_la_OBJECTS) $(pam_mkhomedir_la_DEPENDENCIES) -- $(LINK) -rpath $(securelibdir) $(pam_mkhomedir_la_OBJECTS) $(pam_mkhomedir_la_LIBADD) $(LIBS) -+ $(pam_mkhomedir_la_LINK) -rpath $(securelibdir) $(pam_mkhomedir_la_OBJECTS) $(pam_mkhomedir_la_LIBADD) $(LIBS) - install-sbinPROGRAMS: $(sbin_PROGRAMS) - @$(NORMAL_INSTALL) - test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)" -Index: pam.debian/modules/pam_motd/Makefile.in +@@ -295,8 +297,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +@@ -427,8 +429,8 @@ + esac; \ + done; \ + for i in $$list; do \ +- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ +- else file=$$i; fi; \ ++ if test -f $$i; then file=$$i; \ ++ else file=$(srcdir)/$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 8*) ;; \ +@@ -467,7 +469,7 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS +@@ -510,7 +512,7 @@ + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + check-TESTS: $(TESTS) +- @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \ ++ @failed=0; all=0; xfail=0; xpass=0; skip=0; \ + srcdir=$(srcdir); export srcdir; \ + list=' $(TESTS) '; \ + if test -n "$$list"; then \ +@@ -521,7 +523,7 @@ + if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *$$ws$$tst$$ws*) \ ++ *[\ \ ]$$tst[\ \ ]*) \ + xpass=`expr $$xpass + 1`; \ + failed=`expr $$failed + 1`; \ + echo "XPASS: $$tst"; \ +@@ -533,7 +535,7 @@ + elif test $$? -ne 77; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *$$ws$$tst$$ws*) \ ++ *[\ \ ]$$tst[\ \ ]*) \ + xfail=`expr $$xfail + 1`; \ + echo "XFAIL: $$tst"; \ + ;; \ +@@ -547,23 +549,36 @@ + echo "SKIP: $$tst"; \ + fi; \ + done; \ ++ if test "$$all" -eq 1; then \ ++ tests="test"; \ ++ All=""; \ ++ else \ ++ tests="tests"; \ ++ All="All "; \ ++ fi; \ + if test "$$failed" -eq 0; then \ + if test "$$xfail" -eq 0; then \ +- banner="All $$all tests passed"; \ ++ banner="$$All$$all $$tests passed"; \ + else \ +- banner="All $$all tests behaved as expected ($$xfail expected failures)"; \ ++ if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ ++ banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ + fi; \ + else \ + if test "$$xpass" -eq 0; then \ +- banner="$$failed of $$all tests failed"; \ ++ banner="$$failed of $$all $$tests failed"; \ + else \ +- banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \ ++ if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ ++ banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + fi; \ + fi; \ + dashes="$$banner"; \ + skipped=""; \ + if test "$$skip" -ne 0; then \ +- skipped="($$skip tests were not run)"; \ ++ if test "$$skip" -eq 1; then \ ++ skipped="($$skip test was not run)"; \ ++ else \ ++ skipped="($$skip tests were not run)"; \ ++ fi; \ + test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ + dashes="$$skipped"; \ + fi; \ +@@ -583,6 +598,19 @@ + else :; fi + + distdir: $(DISTFILES) ++ @list='$(MANS)'; if test -n "$$list"; then \ ++ list=`for p in $$list; do \ ++ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ ++ if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ ++ if test -n "$$list" && \ ++ grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ ++ echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ ++ grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ ++ echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ ++ echo " typically \`make maintainer-clean' will remove them" >&2; \ ++ exit 1; \ ++ else :; fi; \ ++ else :; fi + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ +@@ -659,6 +687,8 @@ + + html: html-am + ++html-am: ++ + info: info-am + + info-am: +@@ -667,18 +697,28 @@ + + install-dvi: install-dvi-am + ++install-dvi-am: ++ + install-exec-am: install-sbinPROGRAMS + + install-html: install-html-am + ++install-html-am: ++ + install-info: install-info-am + ++install-info-am: ++ + install-man: install-man8 + + install-pdf: install-pdf-am + ++install-pdf-am: ++ + install-ps: install-ps-am + ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +Index: pam.deb/modules/pam_motd/Makefile.in =================================================================== ---- pam.debian.orig/modules/pam_motd/Makefile.in -+++ pam.debian/modules/pam_motd/Makefile.in -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.11 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. +--- pam.deb.orig/modules/pam_motd/Makefile.in ++++ pam.deb/modules/pam_motd/Makefile.in +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -45,7 +45,6 @@ - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ -- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ - $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ - $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ -@@ -54,7 +53,7 @@ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ -- $(top_srcdir)/configure.in -+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -@@ -193,6 +192,7 @@ +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -176,6 +177,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -18800,34 +24057,181 @@ Index: pam.debian/modules/pam_motd/Makefile.in PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PIE_CFLAGS = @PIE_CFLAGS@ -Index: pam.debian/modules/pam_nologin/Makefile.in +@@ -277,8 +279,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +@@ -377,8 +379,8 @@ + esac; \ + done; \ + for i in $$list; do \ +- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ +- else file=$$i; fi; \ ++ if test -f $$i; then file=$$i; \ ++ else file=$(srcdir)/$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 8*) ;; \ +@@ -417,7 +419,7 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS +@@ -460,7 +462,7 @@ + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + check-TESTS: $(TESTS) +- @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \ ++ @failed=0; all=0; xfail=0; xpass=0; skip=0; \ + srcdir=$(srcdir); export srcdir; \ + list=' $(TESTS) '; \ + if test -n "$$list"; then \ +@@ -471,7 +473,7 @@ + if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *$$ws$$tst$$ws*) \ ++ *[\ \ ]$$tst[\ \ ]*) \ + xpass=`expr $$xpass + 1`; \ + failed=`expr $$failed + 1`; \ + echo "XPASS: $$tst"; \ +@@ -483,7 +485,7 @@ + elif test $$? -ne 77; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *$$ws$$tst$$ws*) \ ++ *[\ \ ]$$tst[\ \ ]*) \ + xfail=`expr $$xfail + 1`; \ + echo "XFAIL: $$tst"; \ + ;; \ +@@ -497,23 +499,36 @@ + echo "SKIP: $$tst"; \ + fi; \ + done; \ ++ if test "$$all" -eq 1; then \ ++ tests="test"; \ ++ All=""; \ ++ else \ ++ tests="tests"; \ ++ All="All "; \ ++ fi; \ + if test "$$failed" -eq 0; then \ + if test "$$xfail" -eq 0; then \ +- banner="All $$all tests passed"; \ ++ banner="$$All$$all $$tests passed"; \ + else \ +- banner="All $$all tests behaved as expected ($$xfail expected failures)"; \ ++ if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ ++ banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ + fi; \ + else \ + if test "$$xpass" -eq 0; then \ +- banner="$$failed of $$all tests failed"; \ ++ banner="$$failed of $$all $$tests failed"; \ + else \ +- banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \ ++ if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ ++ banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + fi; \ + fi; \ + dashes="$$banner"; \ + skipped=""; \ + if test "$$skip" -ne 0; then \ +- skipped="($$skip tests were not run)"; \ ++ if test "$$skip" -eq 1; then \ ++ skipped="($$skip test was not run)"; \ ++ else \ ++ skipped="($$skip tests were not run)"; \ ++ fi; \ + test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ + dashes="$$skipped"; \ + fi; \ +@@ -533,6 +548,19 @@ + else :; fi + + distdir: $(DISTFILES) ++ @list='$(MANS)'; if test -n "$$list"; then \ ++ list=`for p in $$list; do \ ++ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ ++ if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ ++ if test -n "$$list" && \ ++ grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ ++ echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ ++ grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ ++ echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ ++ echo " typically \`make maintainer-clean' will remove them" >&2; \ ++ exit 1; \ ++ else :; fi; \ ++ else :; fi + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ +@@ -609,6 +637,8 @@ + + html: html-am + ++html-am: ++ + info: info-am + + info-am: +@@ -617,18 +647,28 @@ + + install-dvi: install-dvi-am + ++install-dvi-am: ++ + install-exec-am: + + install-html: install-html-am + ++install-html-am: ++ + install-info: install-info-am + ++install-info-am: ++ + install-man: install-man8 + + install-pdf: install-pdf-am + ++install-pdf-am: ++ + install-ps: install-ps-am + ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +Index: pam.deb/modules/pam_nologin/Makefile.in =================================================================== ---- pam.debian.orig/modules/pam_nologin/Makefile.in -+++ pam.debian/modules/pam_nologin/Makefile.in -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.11 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. +--- pam.deb.orig/modules/pam_nologin/Makefile.in ++++ pam.deb/modules/pam_nologin/Makefile.in +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -45,7 +45,6 @@ - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ -- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ - $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ - $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ -@@ -54,7 +53,7 @@ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ -- $(top_srcdir)/configure.in -+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -@@ -193,6 +192,7 @@ +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -176,6 +177,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -18835,34 +24239,181 @@ Index: pam.debian/modules/pam_nologin/Makefile.in PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PIE_CFLAGS = @PIE_CFLAGS@ -Index: pam.debian/modules/pam_permit/Makefile.in +@@ -277,8 +279,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +@@ -377,8 +379,8 @@ + esac; \ + done; \ + for i in $$list; do \ +- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ +- else file=$$i; fi; \ ++ if test -f $$i; then file=$$i; \ ++ else file=$(srcdir)/$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 8*) ;; \ +@@ -417,7 +419,7 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS +@@ -460,7 +462,7 @@ + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + check-TESTS: $(TESTS) +- @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \ ++ @failed=0; all=0; xfail=0; xpass=0; skip=0; \ + srcdir=$(srcdir); export srcdir; \ + list=' $(TESTS) '; \ + if test -n "$$list"; then \ +@@ -471,7 +473,7 @@ + if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *$$ws$$tst$$ws*) \ ++ *[\ \ ]$$tst[\ \ ]*) \ + xpass=`expr $$xpass + 1`; \ + failed=`expr $$failed + 1`; \ + echo "XPASS: $$tst"; \ +@@ -483,7 +485,7 @@ + elif test $$? -ne 77; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *$$ws$$tst$$ws*) \ ++ *[\ \ ]$$tst[\ \ ]*) \ + xfail=`expr $$xfail + 1`; \ + echo "XFAIL: $$tst"; \ + ;; \ +@@ -497,23 +499,36 @@ + echo "SKIP: $$tst"; \ + fi; \ + done; \ ++ if test "$$all" -eq 1; then \ ++ tests="test"; \ ++ All=""; \ ++ else \ ++ tests="tests"; \ ++ All="All "; \ ++ fi; \ + if test "$$failed" -eq 0; then \ + if test "$$xfail" -eq 0; then \ +- banner="All $$all tests passed"; \ ++ banner="$$All$$all $$tests passed"; \ + else \ +- banner="All $$all tests behaved as expected ($$xfail expected failures)"; \ ++ if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ ++ banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ + fi; \ + else \ + if test "$$xpass" -eq 0; then \ +- banner="$$failed of $$all tests failed"; \ ++ banner="$$failed of $$all $$tests failed"; \ + else \ +- banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \ ++ if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ ++ banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + fi; \ + fi; \ + dashes="$$banner"; \ + skipped=""; \ + if test "$$skip" -ne 0; then \ +- skipped="($$skip tests were not run)"; \ ++ if test "$$skip" -eq 1; then \ ++ skipped="($$skip test was not run)"; \ ++ else \ ++ skipped="($$skip tests were not run)"; \ ++ fi; \ + test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ + dashes="$$skipped"; \ + fi; \ +@@ -533,6 +548,19 @@ + else :; fi + + distdir: $(DISTFILES) ++ @list='$(MANS)'; if test -n "$$list"; then \ ++ list=`for p in $$list; do \ ++ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ ++ if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ ++ if test -n "$$list" && \ ++ grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ ++ echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ ++ grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ ++ echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ ++ echo " typically \`make maintainer-clean' will remove them" >&2; \ ++ exit 1; \ ++ else :; fi; \ ++ else :; fi + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ +@@ -609,6 +637,8 @@ + + html: html-am + ++html-am: ++ + info: info-am + + info-am: +@@ -617,18 +647,28 @@ + + install-dvi: install-dvi-am + ++install-dvi-am: ++ + install-exec-am: + + install-html: install-html-am + ++install-html-am: ++ + install-info: install-info-am + ++install-info-am: ++ + install-man: install-man8 + + install-pdf: install-pdf-am + ++install-pdf-am: ++ + install-ps: install-ps-am + ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +Index: pam.deb/modules/pam_permit/Makefile.in =================================================================== ---- pam.debian.orig/modules/pam_permit/Makefile.in -+++ pam.debian/modules/pam_permit/Makefile.in -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.11 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. +--- pam.deb.orig/modules/pam_permit/Makefile.in ++++ pam.deb/modules/pam_permit/Makefile.in +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -45,7 +45,6 @@ - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ -- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ - $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ - $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ -@@ -54,7 +53,7 @@ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ -- $(top_srcdir)/configure.in -+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -@@ -193,6 +192,7 @@ +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -176,6 +177,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -18870,34 +24421,181 @@ Index: pam.debian/modules/pam_permit/Makefile.in PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PIE_CFLAGS = @PIE_CFLAGS@ -Index: pam.debian/modules/pam_pwhistory/Makefile.in +@@ -277,8 +279,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +@@ -377,8 +379,8 @@ + esac; \ + done; \ + for i in $$list; do \ +- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ +- else file=$$i; fi; \ ++ if test -f $$i; then file=$$i; \ ++ else file=$(srcdir)/$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 8*) ;; \ +@@ -417,7 +419,7 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS +@@ -460,7 +462,7 @@ + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + check-TESTS: $(TESTS) +- @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \ ++ @failed=0; all=0; xfail=0; xpass=0; skip=0; \ + srcdir=$(srcdir); export srcdir; \ + list=' $(TESTS) '; \ + if test -n "$$list"; then \ +@@ -471,7 +473,7 @@ + if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *$$ws$$tst$$ws*) \ ++ *[\ \ ]$$tst[\ \ ]*) \ + xpass=`expr $$xpass + 1`; \ + failed=`expr $$failed + 1`; \ + echo "XPASS: $$tst"; \ +@@ -483,7 +485,7 @@ + elif test $$? -ne 77; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *$$ws$$tst$$ws*) \ ++ *[\ \ ]$$tst[\ \ ]*) \ + xfail=`expr $$xfail + 1`; \ + echo "XFAIL: $$tst"; \ + ;; \ +@@ -497,23 +499,36 @@ + echo "SKIP: $$tst"; \ + fi; \ + done; \ ++ if test "$$all" -eq 1; then \ ++ tests="test"; \ ++ All=""; \ ++ else \ ++ tests="tests"; \ ++ All="All "; \ ++ fi; \ + if test "$$failed" -eq 0; then \ + if test "$$xfail" -eq 0; then \ +- banner="All $$all tests passed"; \ ++ banner="$$All$$all $$tests passed"; \ + else \ +- banner="All $$all tests behaved as expected ($$xfail expected failures)"; \ ++ if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ ++ banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ + fi; \ + else \ + if test "$$xpass" -eq 0; then \ +- banner="$$failed of $$all tests failed"; \ ++ banner="$$failed of $$all $$tests failed"; \ + else \ +- banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \ ++ if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ ++ banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + fi; \ + fi; \ + dashes="$$banner"; \ + skipped=""; \ + if test "$$skip" -ne 0; then \ +- skipped="($$skip tests were not run)"; \ ++ if test "$$skip" -eq 1; then \ ++ skipped="($$skip test was not run)"; \ ++ else \ ++ skipped="($$skip tests were not run)"; \ ++ fi; \ + test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ + dashes="$$skipped"; \ + fi; \ +@@ -533,6 +548,19 @@ + else :; fi + + distdir: $(DISTFILES) ++ @list='$(MANS)'; if test -n "$$list"; then \ ++ list=`for p in $$list; do \ ++ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ ++ if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ ++ if test -n "$$list" && \ ++ grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ ++ echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ ++ grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ ++ echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ ++ echo " typically \`make maintainer-clean' will remove them" >&2; \ ++ exit 1; \ ++ else :; fi; \ ++ else :; fi + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ +@@ -609,6 +637,8 @@ + + html: html-am + ++html-am: ++ + info: info-am + + info-am: +@@ -617,18 +647,28 @@ + + install-dvi: install-dvi-am + ++install-dvi-am: ++ + install-exec-am: + + install-html: install-html-am + ++install-html-am: ++ + install-info: install-info-am + ++install-info-am: ++ + install-man: install-man8 + + install-pdf: install-pdf-am + ++install-pdf-am: ++ + install-ps: install-ps-am + ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +Index: pam.deb/modules/pam_pwhistory/Makefile.in =================================================================== ---- pam.debian.orig/modules/pam_pwhistory/Makefile.in -+++ pam.debian/modules/pam_pwhistory/Makefile.in -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.11 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. +--- pam.deb.orig/modules/pam_pwhistory/Makefile.in ++++ pam.deb/modules/pam_pwhistory/Makefile.in +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -47,7 +47,6 @@ - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ -- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ - $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ - $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ -@@ -56,7 +55,7 @@ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ -- $(top_srcdir)/configure.in -+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -@@ -196,6 +195,7 @@ +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -179,6 +180,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -18905,34 +24603,181 @@ Index: pam.debian/modules/pam_pwhistory/Makefile.in PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PIE_CFLAGS = @PIE_CFLAGS@ -Index: pam.debian/modules/pam_rhosts/Makefile.in +@@ -282,8 +284,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +@@ -383,8 +385,8 @@ + esac; \ + done; \ + for i in $$list; do \ +- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ +- else file=$$i; fi; \ ++ if test -f $$i; then file=$$i; \ ++ else file=$(srcdir)/$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 8*) ;; \ +@@ -423,7 +425,7 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS +@@ -466,7 +468,7 @@ + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + check-TESTS: $(TESTS) +- @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \ ++ @failed=0; all=0; xfail=0; xpass=0; skip=0; \ + srcdir=$(srcdir); export srcdir; \ + list=' $(TESTS) '; \ + if test -n "$$list"; then \ +@@ -477,7 +479,7 @@ + if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *$$ws$$tst$$ws*) \ ++ *[\ \ ]$$tst[\ \ ]*) \ + xpass=`expr $$xpass + 1`; \ + failed=`expr $$failed + 1`; \ + echo "XPASS: $$tst"; \ +@@ -489,7 +491,7 @@ + elif test $$? -ne 77; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *$$ws$$tst$$ws*) \ ++ *[\ \ ]$$tst[\ \ ]*) \ + xfail=`expr $$xfail + 1`; \ + echo "XFAIL: $$tst"; \ + ;; \ +@@ -503,23 +505,36 @@ + echo "SKIP: $$tst"; \ + fi; \ + done; \ ++ if test "$$all" -eq 1; then \ ++ tests="test"; \ ++ All=""; \ ++ else \ ++ tests="tests"; \ ++ All="All "; \ ++ fi; \ + if test "$$failed" -eq 0; then \ + if test "$$xfail" -eq 0; then \ +- banner="All $$all tests passed"; \ ++ banner="$$All$$all $$tests passed"; \ + else \ +- banner="All $$all tests behaved as expected ($$xfail expected failures)"; \ ++ if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ ++ banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ + fi; \ + else \ + if test "$$xpass" -eq 0; then \ +- banner="$$failed of $$all tests failed"; \ ++ banner="$$failed of $$all $$tests failed"; \ + else \ +- banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \ ++ if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ ++ banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + fi; \ + fi; \ + dashes="$$banner"; \ + skipped=""; \ + if test "$$skip" -ne 0; then \ +- skipped="($$skip tests were not run)"; \ ++ if test "$$skip" -eq 1; then \ ++ skipped="($$skip test was not run)"; \ ++ else \ ++ skipped="($$skip tests were not run)"; \ ++ fi; \ + test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ + dashes="$$skipped"; \ + fi; \ +@@ -539,6 +554,19 @@ + else :; fi + + distdir: $(DISTFILES) ++ @list='$(MANS)'; if test -n "$$list"; then \ ++ list=`for p in $$list; do \ ++ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ ++ if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ ++ if test -n "$$list" && \ ++ grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ ++ echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ ++ grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ ++ echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ ++ echo " typically \`make maintainer-clean' will remove them" >&2; \ ++ exit 1; \ ++ else :; fi; \ ++ else :; fi + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ +@@ -615,6 +643,8 @@ + + html: html-am + ++html-am: ++ + info: info-am + + info-am: +@@ -623,18 +653,28 @@ + + install-dvi: install-dvi-am + ++install-dvi-am: ++ + install-exec-am: + + install-html: install-html-am + ++install-html-am: ++ + install-info: install-info-am + ++install-info-am: ++ + install-man: install-man8 + + install-pdf: install-pdf-am + ++install-pdf-am: ++ + install-ps: install-ps-am + ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +Index: pam.deb/modules/pam_rhosts/Makefile.in =================================================================== ---- pam.debian.orig/modules/pam_rhosts/Makefile.in -+++ pam.debian/modules/pam_rhosts/Makefile.in -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.11 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. +--- pam.deb.orig/modules/pam_rhosts/Makefile.in ++++ pam.deb/modules/pam_rhosts/Makefile.in +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -45,7 +45,6 @@ - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ -- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ - $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ - $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ -@@ -54,7 +53,7 @@ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ -- $(top_srcdir)/configure.in -+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -@@ -193,6 +192,7 @@ +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -176,6 +177,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -18940,34 +24785,181 @@ Index: pam.debian/modules/pam_rhosts/Makefile.in PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PIE_CFLAGS = @PIE_CFLAGS@ -Index: pam.debian/modules/pam_rootok/Makefile.in +@@ -277,8 +279,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +@@ -377,8 +379,8 @@ + esac; \ + done; \ + for i in $$list; do \ +- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ +- else file=$$i; fi; \ ++ if test -f $$i; then file=$$i; \ ++ else file=$(srcdir)/$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 8*) ;; \ +@@ -417,7 +419,7 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS +@@ -460,7 +462,7 @@ + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + check-TESTS: $(TESTS) +- @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \ ++ @failed=0; all=0; xfail=0; xpass=0; skip=0; \ + srcdir=$(srcdir); export srcdir; \ + list=' $(TESTS) '; \ + if test -n "$$list"; then \ +@@ -471,7 +473,7 @@ + if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *$$ws$$tst$$ws*) \ ++ *[\ \ ]$$tst[\ \ ]*) \ + xpass=`expr $$xpass + 1`; \ + failed=`expr $$failed + 1`; \ + echo "XPASS: $$tst"; \ +@@ -483,7 +485,7 @@ + elif test $$? -ne 77; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *$$ws$$tst$$ws*) \ ++ *[\ \ ]$$tst[\ \ ]*) \ + xfail=`expr $$xfail + 1`; \ + echo "XFAIL: $$tst"; \ + ;; \ +@@ -497,23 +499,36 @@ + echo "SKIP: $$tst"; \ + fi; \ + done; \ ++ if test "$$all" -eq 1; then \ ++ tests="test"; \ ++ All=""; \ ++ else \ ++ tests="tests"; \ ++ All="All "; \ ++ fi; \ + if test "$$failed" -eq 0; then \ + if test "$$xfail" -eq 0; then \ +- banner="All $$all tests passed"; \ ++ banner="$$All$$all $$tests passed"; \ + else \ +- banner="All $$all tests behaved as expected ($$xfail expected failures)"; \ ++ if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ ++ banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ + fi; \ + else \ + if test "$$xpass" -eq 0; then \ +- banner="$$failed of $$all tests failed"; \ ++ banner="$$failed of $$all $$tests failed"; \ + else \ +- banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \ ++ if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ ++ banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + fi; \ + fi; \ + dashes="$$banner"; \ + skipped=""; \ + if test "$$skip" -ne 0; then \ +- skipped="($$skip tests were not run)"; \ ++ if test "$$skip" -eq 1; then \ ++ skipped="($$skip test was not run)"; \ ++ else \ ++ skipped="($$skip tests were not run)"; \ ++ fi; \ + test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ + dashes="$$skipped"; \ + fi; \ +@@ -533,6 +548,19 @@ + else :; fi + + distdir: $(DISTFILES) ++ @list='$(MANS)'; if test -n "$$list"; then \ ++ list=`for p in $$list; do \ ++ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ ++ if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ ++ if test -n "$$list" && \ ++ grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ ++ echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ ++ grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ ++ echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ ++ echo " typically \`make maintainer-clean' will remove them" >&2; \ ++ exit 1; \ ++ else :; fi; \ ++ else :; fi + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ +@@ -609,6 +637,8 @@ + + html: html-am + ++html-am: ++ + info: info-am + + info-am: +@@ -617,18 +647,28 @@ + + install-dvi: install-dvi-am + ++install-dvi-am: ++ + install-exec-am: + + install-html: install-html-am + ++install-html-am: ++ + install-info: install-info-am + ++install-info-am: ++ + install-man: install-man8 + + install-pdf: install-pdf-am + ++install-pdf-am: ++ + install-ps: install-ps-am + ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +Index: pam.deb/modules/pam_rootok/Makefile.in =================================================================== ---- pam.debian.orig/modules/pam_rootok/Makefile.in -+++ pam.debian/modules/pam_rootok/Makefile.in -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.11 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. +--- pam.deb.orig/modules/pam_rootok/Makefile.in ++++ pam.deb/modules/pam_rootok/Makefile.in +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -46,7 +46,6 @@ - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ -- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ - $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ - $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ -@@ -55,7 +54,7 @@ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ -- $(top_srcdir)/configure.in -+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -@@ -194,6 +193,7 @@ +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -177,6 +178,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -18975,34 +24967,181 @@ Index: pam.debian/modules/pam_rootok/Makefile.in PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PIE_CFLAGS = @PIE_CFLAGS@ -Index: pam.debian/modules/pam_selinux/Makefile.in +@@ -279,8 +281,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +@@ -379,8 +381,8 @@ + esac; \ + done; \ + for i in $$list; do \ +- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ +- else file=$$i; fi; \ ++ if test -f $$i; then file=$$i; \ ++ else file=$(srcdir)/$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 8*) ;; \ +@@ -419,7 +421,7 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS +@@ -462,7 +464,7 @@ + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + check-TESTS: $(TESTS) +- @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \ ++ @failed=0; all=0; xfail=0; xpass=0; skip=0; \ + srcdir=$(srcdir); export srcdir; \ + list=' $(TESTS) '; \ + if test -n "$$list"; then \ +@@ -473,7 +475,7 @@ + if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *$$ws$$tst$$ws*) \ ++ *[\ \ ]$$tst[\ \ ]*) \ + xpass=`expr $$xpass + 1`; \ + failed=`expr $$failed + 1`; \ + echo "XPASS: $$tst"; \ +@@ -485,7 +487,7 @@ + elif test $$? -ne 77; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *$$ws$$tst$$ws*) \ ++ *[\ \ ]$$tst[\ \ ]*) \ + xfail=`expr $$xfail + 1`; \ + echo "XFAIL: $$tst"; \ + ;; \ +@@ -499,23 +501,36 @@ + echo "SKIP: $$tst"; \ + fi; \ + done; \ ++ if test "$$all" -eq 1; then \ ++ tests="test"; \ ++ All=""; \ ++ else \ ++ tests="tests"; \ ++ All="All "; \ ++ fi; \ + if test "$$failed" -eq 0; then \ + if test "$$xfail" -eq 0; then \ +- banner="All $$all tests passed"; \ ++ banner="$$All$$all $$tests passed"; \ + else \ +- banner="All $$all tests behaved as expected ($$xfail expected failures)"; \ ++ if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ ++ banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ + fi; \ + else \ + if test "$$xpass" -eq 0; then \ +- banner="$$failed of $$all tests failed"; \ ++ banner="$$failed of $$all $$tests failed"; \ + else \ +- banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \ ++ if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ ++ banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + fi; \ + fi; \ + dashes="$$banner"; \ + skipped=""; \ + if test "$$skip" -ne 0; then \ +- skipped="($$skip tests were not run)"; \ ++ if test "$$skip" -eq 1; then \ ++ skipped="($$skip test was not run)"; \ ++ else \ ++ skipped="($$skip tests were not run)"; \ ++ fi; \ + test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ + dashes="$$skipped"; \ + fi; \ +@@ -535,6 +550,19 @@ + else :; fi + + distdir: $(DISTFILES) ++ @list='$(MANS)'; if test -n "$$list"; then \ ++ list=`for p in $$list; do \ ++ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ ++ if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ ++ if test -n "$$list" && \ ++ grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ ++ echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ ++ grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ ++ echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ ++ echo " typically \`make maintainer-clean' will remove them" >&2; \ ++ exit 1; \ ++ else :; fi; \ ++ else :; fi + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ +@@ -611,6 +639,8 @@ + + html: html-am + ++html-am: ++ + info: info-am + + info-am: +@@ -619,18 +649,28 @@ + + install-dvi: install-dvi-am + ++install-dvi-am: ++ + install-exec-am: + + install-html: install-html-am + ++install-html-am: ++ + install-info: install-info-am + ++install-info-am: ++ + install-man: install-man8 + + install-pdf: install-pdf-am + ++install-pdf-am: ++ + install-ps: install-ps-am + ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +Index: pam.deb/modules/pam_selinux/Makefile.in =================================================================== ---- pam.debian.orig/modules/pam_selinux/Makefile.in -+++ pam.debian/modules/pam_selinux/Makefile.in -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.11 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. +--- pam.deb.orig/modules/pam_selinux/Makefile.in ++++ pam.deb/modules/pam_selinux/Makefile.in +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -47,7 +47,6 @@ - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ -- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ - $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ - $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ -@@ -56,7 +55,7 @@ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ -- $(top_srcdir)/configure.in -+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -@@ -206,6 +205,7 @@ +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -189,6 +190,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -19010,34 +25149,181 @@ Index: pam.debian/modules/pam_selinux/Makefile.in PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PIE_CFLAGS = @PIE_CFLAGS@ -Index: pam.debian/modules/pam_sepermit/Makefile.in +@@ -299,8 +301,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +@@ -410,8 +412,8 @@ + esac; \ + done; \ + for i in $$list; do \ +- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ +- else file=$$i; fi; \ ++ if test -f $$i; then file=$$i; \ ++ else file=$(srcdir)/$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 8*) ;; \ +@@ -450,7 +452,7 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS +@@ -493,7 +495,7 @@ + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + check-TESTS: $(TESTS) +- @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \ ++ @failed=0; all=0; xfail=0; xpass=0; skip=0; \ + srcdir=$(srcdir); export srcdir; \ + list=' $(TESTS) '; \ + if test -n "$$list"; then \ +@@ -504,7 +506,7 @@ + if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *$$ws$$tst$$ws*) \ ++ *[\ \ ]$$tst[\ \ ]*) \ + xpass=`expr $$xpass + 1`; \ + failed=`expr $$failed + 1`; \ + echo "XPASS: $$tst"; \ +@@ -516,7 +518,7 @@ + elif test $$? -ne 77; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *$$ws$$tst$$ws*) \ ++ *[\ \ ]$$tst[\ \ ]*) \ + xfail=`expr $$xfail + 1`; \ + echo "XFAIL: $$tst"; \ + ;; \ +@@ -530,23 +532,36 @@ + echo "SKIP: $$tst"; \ + fi; \ + done; \ ++ if test "$$all" -eq 1; then \ ++ tests="test"; \ ++ All=""; \ ++ else \ ++ tests="tests"; \ ++ All="All "; \ ++ fi; \ + if test "$$failed" -eq 0; then \ + if test "$$xfail" -eq 0; then \ +- banner="All $$all tests passed"; \ ++ banner="$$All$$all $$tests passed"; \ + else \ +- banner="All $$all tests behaved as expected ($$xfail expected failures)"; \ ++ if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ ++ banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ + fi; \ + else \ + if test "$$xpass" -eq 0; then \ +- banner="$$failed of $$all tests failed"; \ ++ banner="$$failed of $$all $$tests failed"; \ + else \ +- banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \ ++ if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ ++ banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + fi; \ + fi; \ + dashes="$$banner"; \ + skipped=""; \ + if test "$$skip" -ne 0; then \ +- skipped="($$skip tests were not run)"; \ ++ if test "$$skip" -eq 1; then \ ++ skipped="($$skip test was not run)"; \ ++ else \ ++ skipped="($$skip tests were not run)"; \ ++ fi; \ + test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ + dashes="$$skipped"; \ + fi; \ +@@ -566,6 +581,19 @@ + else :; fi + + distdir: $(DISTFILES) ++ @list='$(MANS)'; if test -n "$$list"; then \ ++ list=`for p in $$list; do \ ++ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ ++ if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ ++ if test -n "$$list" && \ ++ grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ ++ echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ ++ grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ ++ echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ ++ echo " typically \`make maintainer-clean' will remove them" >&2; \ ++ exit 1; \ ++ else :; fi; \ ++ else :; fi + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ +@@ -642,6 +670,8 @@ + + html: html-am + ++html-am: ++ + info: info-am + + info-am: +@@ -650,18 +680,28 @@ + + install-dvi: install-dvi-am + ++install-dvi-am: ++ + install-exec-am: + + install-html: install-html-am + ++install-html-am: ++ + install-info: install-info-am + ++install-info-am: ++ + install-man: install-man8 + + install-pdf: install-pdf-am + ++install-pdf-am: ++ + install-ps: install-ps-am + ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +Index: pam.deb/modules/pam_sepermit/Makefile.in =================================================================== ---- pam.debian.orig/modules/pam_sepermit/Makefile.in -+++ pam.debian/modules/pam_sepermit/Makefile.in -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.11 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. +--- pam.deb.orig/modules/pam_sepermit/Makefile.in ++++ pam.deb/modules/pam_sepermit/Makefile.in +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -46,7 +46,6 @@ - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ -- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ - $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ - $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ -@@ -55,7 +54,7 @@ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ -- $(top_srcdir)/configure.in -+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -@@ -202,6 +201,7 @@ +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -187,6 +188,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -19045,34 +25331,192 @@ Index: pam.debian/modules/pam_sepermit/Makefile.in PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PIE_CFLAGS = @PIE_CFLAGS@ -Index: pam.debian/modules/pam_shells/Makefile.in +@@ -296,8 +298,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +@@ -396,8 +398,8 @@ + esac; \ + done; \ + for i in $$list; do \ +- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ +- else file=$$i; fi; \ ++ if test -f $$i; then file=$$i; \ ++ else file=$(srcdir)/$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 5*) ;; \ +@@ -441,8 +443,8 @@ + esac; \ + done; \ + for i in $$list; do \ +- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ +- else file=$$i; fi; \ ++ if test -f $$i; then file=$$i; \ ++ else file=$(srcdir)/$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 8*) ;; \ +@@ -515,7 +517,7 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS +@@ -558,7 +560,7 @@ + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + check-TESTS: $(TESTS) +- @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \ ++ @failed=0; all=0; xfail=0; xpass=0; skip=0; \ + srcdir=$(srcdir); export srcdir; \ + list=' $(TESTS) '; \ + if test -n "$$list"; then \ +@@ -569,7 +571,7 @@ + if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *$$ws$$tst$$ws*) \ ++ *[\ \ ]$$tst[\ \ ]*) \ + xpass=`expr $$xpass + 1`; \ + failed=`expr $$failed + 1`; \ + echo "XPASS: $$tst"; \ +@@ -581,7 +583,7 @@ + elif test $$? -ne 77; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *$$ws$$tst$$ws*) \ ++ *[\ \ ]$$tst[\ \ ]*) \ + xfail=`expr $$xfail + 1`; \ + echo "XFAIL: $$tst"; \ + ;; \ +@@ -595,23 +597,36 @@ + echo "SKIP: $$tst"; \ + fi; \ + done; \ ++ if test "$$all" -eq 1; then \ ++ tests="test"; \ ++ All=""; \ ++ else \ ++ tests="tests"; \ ++ All="All "; \ ++ fi; \ + if test "$$failed" -eq 0; then \ + if test "$$xfail" -eq 0; then \ +- banner="All $$all tests passed"; \ ++ banner="$$All$$all $$tests passed"; \ + else \ +- banner="All $$all tests behaved as expected ($$xfail expected failures)"; \ ++ if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ ++ banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ + fi; \ + else \ + if test "$$xpass" -eq 0; then \ +- banner="$$failed of $$all tests failed"; \ ++ banner="$$failed of $$all $$tests failed"; \ + else \ +- banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \ ++ if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ ++ banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + fi; \ + fi; \ + dashes="$$banner"; \ + skipped=""; \ + if test "$$skip" -ne 0; then \ +- skipped="($$skip tests were not run)"; \ ++ if test "$$skip" -eq 1; then \ ++ skipped="($$skip test was not run)"; \ ++ else \ ++ skipped="($$skip tests were not run)"; \ ++ fi; \ + test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ + dashes="$$skipped"; \ + fi; \ +@@ -631,6 +646,19 @@ + else :; fi + + distdir: $(DISTFILES) ++ @list='$(MANS)'; if test -n "$$list"; then \ ++ list=`for p in $$list; do \ ++ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ ++ if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ ++ if test -n "$$list" && \ ++ grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ ++ echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ ++ grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ ++ echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ ++ echo " typically \`make maintainer-clean' will remove them" >&2; \ ++ exit 1; \ ++ else :; fi; \ ++ else :; fi + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ +@@ -707,6 +735,8 @@ + + html: html-am + ++html-am: ++ + info: info-am + + info-am: +@@ -716,18 +746,28 @@ + + install-dvi: install-dvi-am + ++install-dvi-am: ++ + install-exec-am: + + install-html: install-html-am + ++install-html-am: ++ + install-info: install-info-am + ++install-info-am: ++ + install-man: install-man5 install-man8 + + install-pdf: install-pdf-am + ++install-pdf-am: ++ + install-ps: install-ps-am + ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +Index: pam.deb/modules/pam_shells/Makefile.in =================================================================== ---- pam.debian.orig/modules/pam_shells/Makefile.in -+++ pam.debian/modules/pam_shells/Makefile.in -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.11 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. +--- pam.deb.orig/modules/pam_shells/Makefile.in ++++ pam.deb/modules/pam_shells/Makefile.in +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -45,7 +45,6 @@ - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ -- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ - $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ - $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ -@@ -54,7 +53,7 @@ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ -- $(top_srcdir)/configure.in -+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -@@ -193,6 +192,7 @@ +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -176,6 +177,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -19080,34 +25524,181 @@ Index: pam.debian/modules/pam_shells/Makefile.in PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PIE_CFLAGS = @PIE_CFLAGS@ -Index: pam.debian/modules/pam_stress/Makefile.in +@@ -277,8 +279,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +@@ -377,8 +379,8 @@ + esac; \ + done; \ + for i in $$list; do \ +- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ +- else file=$$i; fi; \ ++ if test -f $$i; then file=$$i; \ ++ else file=$(srcdir)/$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 8*) ;; \ +@@ -417,7 +419,7 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS +@@ -460,7 +462,7 @@ + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + check-TESTS: $(TESTS) +- @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \ ++ @failed=0; all=0; xfail=0; xpass=0; skip=0; \ + srcdir=$(srcdir); export srcdir; \ + list=' $(TESTS) '; \ + if test -n "$$list"; then \ +@@ -471,7 +473,7 @@ + if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *$$ws$$tst$$ws*) \ ++ *[\ \ ]$$tst[\ \ ]*) \ + xpass=`expr $$xpass + 1`; \ + failed=`expr $$failed + 1`; \ + echo "XPASS: $$tst"; \ +@@ -483,7 +485,7 @@ + elif test $$? -ne 77; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *$$ws$$tst$$ws*) \ ++ *[\ \ ]$$tst[\ \ ]*) \ + xfail=`expr $$xfail + 1`; \ + echo "XFAIL: $$tst"; \ + ;; \ +@@ -497,23 +499,36 @@ + echo "SKIP: $$tst"; \ + fi; \ + done; \ ++ if test "$$all" -eq 1; then \ ++ tests="test"; \ ++ All=""; \ ++ else \ ++ tests="tests"; \ ++ All="All "; \ ++ fi; \ + if test "$$failed" -eq 0; then \ + if test "$$xfail" -eq 0; then \ +- banner="All $$all tests passed"; \ ++ banner="$$All$$all $$tests passed"; \ + else \ +- banner="All $$all tests behaved as expected ($$xfail expected failures)"; \ ++ if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ ++ banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ + fi; \ + else \ + if test "$$xpass" -eq 0; then \ +- banner="$$failed of $$all tests failed"; \ ++ banner="$$failed of $$all $$tests failed"; \ + else \ +- banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \ ++ if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ ++ banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + fi; \ + fi; \ + dashes="$$banner"; \ + skipped=""; \ + if test "$$skip" -ne 0; then \ +- skipped="($$skip tests were not run)"; \ ++ if test "$$skip" -eq 1; then \ ++ skipped="($$skip test was not run)"; \ ++ else \ ++ skipped="($$skip tests were not run)"; \ ++ fi; \ + test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ + dashes="$$skipped"; \ + fi; \ +@@ -533,6 +548,19 @@ + else :; fi + + distdir: $(DISTFILES) ++ @list='$(MANS)'; if test -n "$$list"; then \ ++ list=`for p in $$list; do \ ++ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ ++ if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ ++ if test -n "$$list" && \ ++ grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ ++ echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ ++ grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ ++ echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ ++ echo " typically \`make maintainer-clean' will remove them" >&2; \ ++ exit 1; \ ++ else :; fi; \ ++ else :; fi + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ +@@ -609,6 +637,8 @@ + + html: html-am + ++html-am: ++ + info: info-am + + info-am: +@@ -617,18 +647,28 @@ + + install-dvi: install-dvi-am + ++install-dvi-am: ++ + install-exec-am: + + install-html: install-html-am + ++install-html-am: ++ + install-info: install-info-am + ++install-info-am: ++ + install-man: install-man8 + + install-pdf: install-pdf-am + ++install-pdf-am: ++ + install-ps: install-ps-am + ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +Index: pam.deb/modules/pam_stress/Makefile.in =================================================================== ---- pam.debian.orig/modules/pam_stress/Makefile.in -+++ pam.debian/modules/pam_stress/Makefile.in -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.11 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. +--- pam.deb.orig/modules/pam_stress/Makefile.in ++++ pam.deb/modules/pam_stress/Makefile.in +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -44,7 +44,6 @@ - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ -- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ - $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ - $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ -@@ -53,7 +52,7 @@ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ -- $(top_srcdir)/configure.in -+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -@@ -188,6 +187,7 @@ +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -171,6 +172,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -19115,34 +25706,150 @@ Index: pam.debian/modules/pam_stress/Makefile.in PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PIE_CFLAGS = @PIE_CFLAGS@ -Index: pam.debian/modules/pam_succeed_if/Makefile.in +@@ -268,8 +270,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +@@ -363,7 +365,7 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS +@@ -406,7 +408,7 @@ + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + check-TESTS: $(TESTS) +- @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \ ++ @failed=0; all=0; xfail=0; xpass=0; skip=0; \ + srcdir=$(srcdir); export srcdir; \ + list=' $(TESTS) '; \ + if test -n "$$list"; then \ +@@ -417,7 +419,7 @@ + if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *$$ws$$tst$$ws*) \ ++ *[\ \ ]$$tst[\ \ ]*) \ + xpass=`expr $$xpass + 1`; \ + failed=`expr $$failed + 1`; \ + echo "XPASS: $$tst"; \ +@@ -429,7 +431,7 @@ + elif test $$? -ne 77; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *$$ws$$tst$$ws*) \ ++ *[\ \ ]$$tst[\ \ ]*) \ + xfail=`expr $$xfail + 1`; \ + echo "XFAIL: $$tst"; \ + ;; \ +@@ -443,23 +445,36 @@ + echo "SKIP: $$tst"; \ + fi; \ + done; \ ++ if test "$$all" -eq 1; then \ ++ tests="test"; \ ++ All=""; \ ++ else \ ++ tests="tests"; \ ++ All="All "; \ ++ fi; \ + if test "$$failed" -eq 0; then \ + if test "$$xfail" -eq 0; then \ +- banner="All $$all tests passed"; \ ++ banner="$$All$$all $$tests passed"; \ + else \ +- banner="All $$all tests behaved as expected ($$xfail expected failures)"; \ ++ if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ ++ banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ + fi; \ + else \ + if test "$$xpass" -eq 0; then \ +- banner="$$failed of $$all tests failed"; \ ++ banner="$$failed of $$all $$tests failed"; \ + else \ +- banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \ ++ if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ ++ banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + fi; \ + fi; \ + dashes="$$banner"; \ + skipped=""; \ + if test "$$skip" -ne 0; then \ +- skipped="($$skip tests were not run)"; \ ++ if test "$$skip" -eq 1; then \ ++ skipped="($$skip test was not run)"; \ ++ else \ ++ skipped="($$skip tests were not run)"; \ ++ fi; \ + test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ + dashes="$$skipped"; \ + fi; \ +@@ -554,6 +569,8 @@ + + html: html-am + ++html-am: ++ + info: info-am + + info-am: +@@ -562,18 +579,28 @@ + + install-dvi: install-dvi-am + ++install-dvi-am: ++ + install-exec-am: + + install-html: install-html-am + ++install-html-am: ++ + install-info: install-info-am + ++install-info-am: ++ + install-man: + + install-pdf: install-pdf-am + ++install-pdf-am: ++ + install-ps: install-ps-am + ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +Index: pam.deb/modules/pam_succeed_if/Makefile.in =================================================================== ---- pam.debian.orig/modules/pam_succeed_if/Makefile.in -+++ pam.debian/modules/pam_succeed_if/Makefile.in -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.11 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. +--- pam.deb.orig/modules/pam_succeed_if/Makefile.in ++++ pam.deb/modules/pam_succeed_if/Makefile.in +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -45,7 +45,6 @@ - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ -- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ - $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ - $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ -@@ -54,7 +53,7 @@ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ -- $(top_srcdir)/configure.in -+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -@@ -193,6 +192,7 @@ +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -176,6 +177,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -19150,34 +25857,181 @@ Index: pam.debian/modules/pam_succeed_if/Makefile.in PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PIE_CFLAGS = @PIE_CFLAGS@ -Index: pam.debian/modules/pam_tally/Makefile.in +@@ -277,8 +279,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +@@ -377,8 +379,8 @@ + esac; \ + done; \ + for i in $$list; do \ +- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ +- else file=$$i; fi; \ ++ if test -f $$i; then file=$$i; \ ++ else file=$(srcdir)/$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 8*) ;; \ +@@ -417,7 +419,7 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS +@@ -460,7 +462,7 @@ + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + check-TESTS: $(TESTS) +- @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \ ++ @failed=0; all=0; xfail=0; xpass=0; skip=0; \ + srcdir=$(srcdir); export srcdir; \ + list=' $(TESTS) '; \ + if test -n "$$list"; then \ +@@ -471,7 +473,7 @@ + if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *$$ws$$tst$$ws*) \ ++ *[\ \ ]$$tst[\ \ ]*) \ + xpass=`expr $$xpass + 1`; \ + failed=`expr $$failed + 1`; \ + echo "XPASS: $$tst"; \ +@@ -483,7 +485,7 @@ + elif test $$? -ne 77; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *$$ws$$tst$$ws*) \ ++ *[\ \ ]$$tst[\ \ ]*) \ + xfail=`expr $$xfail + 1`; \ + echo "XFAIL: $$tst"; \ + ;; \ +@@ -497,23 +499,36 @@ + echo "SKIP: $$tst"; \ + fi; \ + done; \ ++ if test "$$all" -eq 1; then \ ++ tests="test"; \ ++ All=""; \ ++ else \ ++ tests="tests"; \ ++ All="All "; \ ++ fi; \ + if test "$$failed" -eq 0; then \ + if test "$$xfail" -eq 0; then \ +- banner="All $$all tests passed"; \ ++ banner="$$All$$all $$tests passed"; \ + else \ +- banner="All $$all tests behaved as expected ($$xfail expected failures)"; \ ++ if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ ++ banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ + fi; \ + else \ + if test "$$xpass" -eq 0; then \ +- banner="$$failed of $$all tests failed"; \ ++ banner="$$failed of $$all $$tests failed"; \ + else \ +- banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \ ++ if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ ++ banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + fi; \ + fi; \ + dashes="$$banner"; \ + skipped=""; \ + if test "$$skip" -ne 0; then \ +- skipped="($$skip tests were not run)"; \ ++ if test "$$skip" -eq 1; then \ ++ skipped="($$skip test was not run)"; \ ++ else \ ++ skipped="($$skip tests were not run)"; \ ++ fi; \ + test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ + dashes="$$skipped"; \ + fi; \ +@@ -533,6 +548,19 @@ + else :; fi + + distdir: $(DISTFILES) ++ @list='$(MANS)'; if test -n "$$list"; then \ ++ list=`for p in $$list; do \ ++ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ ++ if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ ++ if test -n "$$list" && \ ++ grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ ++ echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ ++ grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ ++ echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ ++ echo " typically \`make maintainer-clean' will remove them" >&2; \ ++ exit 1; \ ++ else :; fi; \ ++ else :; fi + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ +@@ -609,6 +637,8 @@ + + html: html-am + ++html-am: ++ + info: info-am + + info-am: +@@ -617,18 +647,28 @@ + + install-dvi: install-dvi-am + ++install-dvi-am: ++ + install-exec-am: + + install-html: install-html-am + ++install-html-am: ++ + install-info: install-info-am + ++install-info-am: ++ + install-man: install-man8 + + install-pdf: install-pdf-am + ++install-pdf-am: ++ + install-ps: install-ps-am + ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +Index: pam.deb/modules/pam_tally/Makefile.in =================================================================== ---- pam.debian.orig/modules/pam_tally/Makefile.in -+++ pam.debian/modules/pam_tally/Makefile.in -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.11 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. +--- pam.deb.orig/modules/pam_tally/Makefile.in ++++ pam.deb/modules/pam_tally/Makefile.in +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -49,7 +49,6 @@ - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ -- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ - $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ - $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ -@@ -58,7 +57,7 @@ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ -- $(top_srcdir)/configure.in -+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -@@ -206,6 +205,7 @@ +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -190,6 +191,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -19185,34 +26039,181 @@ Index: pam.debian/modules/pam_tally/Makefile.in PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PIE_CFLAGS = @PIE_CFLAGS@ -Index: pam.debian/modules/pam_tally2/Makefile.in +@@ -294,8 +296,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +@@ -426,8 +428,8 @@ + esac; \ + done; \ + for i in $$list; do \ +- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ +- else file=$$i; fi; \ ++ if test -f $$i; then file=$$i; \ ++ else file=$(srcdir)/$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 8*) ;; \ +@@ -466,7 +468,7 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS +@@ -509,7 +511,7 @@ + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + check-TESTS: $(TESTS) +- @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \ ++ @failed=0; all=0; xfail=0; xpass=0; skip=0; \ + srcdir=$(srcdir); export srcdir; \ + list=' $(TESTS) '; \ + if test -n "$$list"; then \ +@@ -520,7 +522,7 @@ + if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *$$ws$$tst$$ws*) \ ++ *[\ \ ]$$tst[\ \ ]*) \ + xpass=`expr $$xpass + 1`; \ + failed=`expr $$failed + 1`; \ + echo "XPASS: $$tst"; \ +@@ -532,7 +534,7 @@ + elif test $$? -ne 77; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *$$ws$$tst$$ws*) \ ++ *[\ \ ]$$tst[\ \ ]*) \ + xfail=`expr $$xfail + 1`; \ + echo "XFAIL: $$tst"; \ + ;; \ +@@ -546,23 +548,36 @@ + echo "SKIP: $$tst"; \ + fi; \ + done; \ ++ if test "$$all" -eq 1; then \ ++ tests="test"; \ ++ All=""; \ ++ else \ ++ tests="tests"; \ ++ All="All "; \ ++ fi; \ + if test "$$failed" -eq 0; then \ + if test "$$xfail" -eq 0; then \ +- banner="All $$all tests passed"; \ ++ banner="$$All$$all $$tests passed"; \ + else \ +- banner="All $$all tests behaved as expected ($$xfail expected failures)"; \ ++ if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ ++ banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ + fi; \ + else \ + if test "$$xpass" -eq 0; then \ +- banner="$$failed of $$all tests failed"; \ ++ banner="$$failed of $$all $$tests failed"; \ + else \ +- banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \ ++ if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ ++ banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + fi; \ + fi; \ + dashes="$$banner"; \ + skipped=""; \ + if test "$$skip" -ne 0; then \ +- skipped="($$skip tests were not run)"; \ ++ if test "$$skip" -eq 1; then \ ++ skipped="($$skip test was not run)"; \ ++ else \ ++ skipped="($$skip tests were not run)"; \ ++ fi; \ + test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ + dashes="$$skipped"; \ + fi; \ +@@ -582,6 +597,19 @@ + else :; fi + + distdir: $(DISTFILES) ++ @list='$(MANS)'; if test -n "$$list"; then \ ++ list=`for p in $$list; do \ ++ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ ++ if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ ++ if test -n "$$list" && \ ++ grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ ++ echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ ++ grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ ++ echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ ++ echo " typically \`make maintainer-clean' will remove them" >&2; \ ++ exit 1; \ ++ else :; fi; \ ++ else :; fi + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ +@@ -658,6 +686,8 @@ + + html: html-am + ++html-am: ++ + info: info-am + + info-am: +@@ -666,18 +696,28 @@ + + install-dvi: install-dvi-am + ++install-dvi-am: ++ + install-exec-am: install-sbinPROGRAMS + + install-html: install-html-am + ++install-html-am: ++ + install-info: install-info-am + ++install-info-am: ++ + install-man: install-man8 + + install-pdf: install-pdf-am + ++install-pdf-am: ++ + install-ps: install-ps-am + ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +Index: pam.deb/modules/pam_tally2/Makefile.in =================================================================== ---- pam.debian.orig/modules/pam_tally2/Makefile.in -+++ pam.debian/modules/pam_tally2/Makefile.in -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.11 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. +--- pam.deb.orig/modules/pam_tally2/Makefile.in ++++ pam.deb/modules/pam_tally2/Makefile.in +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -50,7 +50,6 @@ - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ -- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ - $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ - $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ -@@ -59,7 +58,7 @@ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ -- $(top_srcdir)/configure.in -+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -@@ -208,6 +207,7 @@ +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -192,6 +193,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -19220,34 +26221,181 @@ Index: pam.debian/modules/pam_tally2/Makefile.in PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PIE_CFLAGS = @PIE_CFLAGS@ -Index: pam.debian/modules/pam_time/Makefile.in +@@ -298,8 +300,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +@@ -430,8 +432,8 @@ + esac; \ + done; \ + for i in $$list; do \ +- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ +- else file=$$i; fi; \ ++ if test -f $$i; then file=$$i; \ ++ else file=$(srcdir)/$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 8*) ;; \ +@@ -470,7 +472,7 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS +@@ -513,7 +515,7 @@ + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + check-TESTS: $(TESTS) +- @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \ ++ @failed=0; all=0; xfail=0; xpass=0; skip=0; \ + srcdir=$(srcdir); export srcdir; \ + list=' $(TESTS) '; \ + if test -n "$$list"; then \ +@@ -524,7 +526,7 @@ + if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *$$ws$$tst$$ws*) \ ++ *[\ \ ]$$tst[\ \ ]*) \ + xpass=`expr $$xpass + 1`; \ + failed=`expr $$failed + 1`; \ + echo "XPASS: $$tst"; \ +@@ -536,7 +538,7 @@ + elif test $$? -ne 77; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *$$ws$$tst$$ws*) \ ++ *[\ \ ]$$tst[\ \ ]*) \ + xfail=`expr $$xfail + 1`; \ + echo "XFAIL: $$tst"; \ + ;; \ +@@ -550,23 +552,36 @@ + echo "SKIP: $$tst"; \ + fi; \ + done; \ ++ if test "$$all" -eq 1; then \ ++ tests="test"; \ ++ All=""; \ ++ else \ ++ tests="tests"; \ ++ All="All "; \ ++ fi; \ + if test "$$failed" -eq 0; then \ + if test "$$xfail" -eq 0; then \ +- banner="All $$all tests passed"; \ ++ banner="$$All$$all $$tests passed"; \ + else \ +- banner="All $$all tests behaved as expected ($$xfail expected failures)"; \ ++ if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ ++ banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ + fi; \ + else \ + if test "$$xpass" -eq 0; then \ +- banner="$$failed of $$all tests failed"; \ ++ banner="$$failed of $$all $$tests failed"; \ + else \ +- banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \ ++ if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ ++ banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + fi; \ + fi; \ + dashes="$$banner"; \ + skipped=""; \ + if test "$$skip" -ne 0; then \ +- skipped="($$skip tests were not run)"; \ ++ if test "$$skip" -eq 1; then \ ++ skipped="($$skip test was not run)"; \ ++ else \ ++ skipped="($$skip tests were not run)"; \ ++ fi; \ + test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ + dashes="$$skipped"; \ + fi; \ +@@ -586,6 +601,19 @@ + else :; fi + + distdir: $(DISTFILES) ++ @list='$(MANS)'; if test -n "$$list"; then \ ++ list=`for p in $$list; do \ ++ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ ++ if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ ++ if test -n "$$list" && \ ++ grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ ++ echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ ++ grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ ++ echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ ++ echo " typically \`make maintainer-clean' will remove them" >&2; \ ++ exit 1; \ ++ else :; fi; \ ++ else :; fi + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ +@@ -662,6 +690,8 @@ + + html: html-am + ++html-am: ++ + info: info-am + + info-am: +@@ -670,18 +700,28 @@ + + install-dvi: install-dvi-am + ++install-dvi-am: ++ + install-exec-am: install-sbinPROGRAMS + + install-html: install-html-am + ++install-html-am: ++ + install-info: install-info-am + ++install-info-am: ++ + install-man: install-man8 + + install-pdf: install-pdf-am + ++install-pdf-am: ++ + install-ps: install-ps-am + ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +Index: pam.deb/modules/pam_time/Makefile.in =================================================================== ---- pam.debian.orig/modules/pam_time/Makefile.in -+++ pam.debian/modules/pam_time/Makefile.in -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.11 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. +--- pam.deb.orig/modules/pam_time/Makefile.in ++++ pam.deb/modules/pam_time/Makefile.in +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -45,7 +45,6 @@ - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ -- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ - $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ - $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ -@@ -54,7 +53,7 @@ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ -- $(top_srcdir)/configure.in -+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -@@ -195,6 +194,7 @@ +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -179,6 +180,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -19255,34 +26403,192 @@ Index: pam.debian/modules/pam_time/Makefile.in PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PIE_CFLAGS = @PIE_CFLAGS@ -Index: pam.debian/modules/pam_timestamp/Makefile.in +@@ -283,8 +285,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +@@ -383,8 +385,8 @@ + esac; \ + done; \ + for i in $$list; do \ +- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ +- else file=$$i; fi; \ ++ if test -f $$i; then file=$$i; \ ++ else file=$(srcdir)/$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 5*) ;; \ +@@ -428,8 +430,8 @@ + esac; \ + done; \ + for i in $$list; do \ +- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ +- else file=$$i; fi; \ ++ if test -f $$i; then file=$$i; \ ++ else file=$(srcdir)/$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 8*) ;; \ +@@ -485,7 +487,7 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS +@@ -528,7 +530,7 @@ + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + check-TESTS: $(TESTS) +- @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \ ++ @failed=0; all=0; xfail=0; xpass=0; skip=0; \ + srcdir=$(srcdir); export srcdir; \ + list=' $(TESTS) '; \ + if test -n "$$list"; then \ +@@ -539,7 +541,7 @@ + if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *$$ws$$tst$$ws*) \ ++ *[\ \ ]$$tst[\ \ ]*) \ + xpass=`expr $$xpass + 1`; \ + failed=`expr $$failed + 1`; \ + echo "XPASS: $$tst"; \ +@@ -551,7 +553,7 @@ + elif test $$? -ne 77; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *$$ws$$tst$$ws*) \ ++ *[\ \ ]$$tst[\ \ ]*) \ + xfail=`expr $$xfail + 1`; \ + echo "XFAIL: $$tst"; \ + ;; \ +@@ -565,23 +567,36 @@ + echo "SKIP: $$tst"; \ + fi; \ + done; \ ++ if test "$$all" -eq 1; then \ ++ tests="test"; \ ++ All=""; \ ++ else \ ++ tests="tests"; \ ++ All="All "; \ ++ fi; \ + if test "$$failed" -eq 0; then \ + if test "$$xfail" -eq 0; then \ +- banner="All $$all tests passed"; \ ++ banner="$$All$$all $$tests passed"; \ + else \ +- banner="All $$all tests behaved as expected ($$xfail expected failures)"; \ ++ if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ ++ banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ + fi; \ + else \ + if test "$$xpass" -eq 0; then \ +- banner="$$failed of $$all tests failed"; \ ++ banner="$$failed of $$all $$tests failed"; \ + else \ +- banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \ ++ if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ ++ banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + fi; \ + fi; \ + dashes="$$banner"; \ + skipped=""; \ + if test "$$skip" -ne 0; then \ +- skipped="($$skip tests were not run)"; \ ++ if test "$$skip" -eq 1; then \ ++ skipped="($$skip test was not run)"; \ ++ else \ ++ skipped="($$skip tests were not run)"; \ ++ fi; \ + test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ + dashes="$$skipped"; \ + fi; \ +@@ -601,6 +616,19 @@ + else :; fi + + distdir: $(DISTFILES) ++ @list='$(MANS)'; if test -n "$$list"; then \ ++ list=`for p in $$list; do \ ++ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ ++ if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ ++ if test -n "$$list" && \ ++ grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ ++ echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ ++ grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ ++ echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ ++ echo " typically \`make maintainer-clean' will remove them" >&2; \ ++ exit 1; \ ++ else :; fi; \ ++ else :; fi + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ +@@ -677,6 +705,8 @@ + + html: html-am + ++html-am: ++ + info: info-am + + info-am: +@@ -686,18 +716,28 @@ + + install-dvi: install-dvi-am + ++install-dvi-am: ++ + install-exec-am: + + install-html: install-html-am + ++install-html-am: ++ + install-info: install-info-am + ++install-info-am: ++ + install-man: install-man5 install-man8 + + install-pdf: install-pdf-am + ++install-pdf-am: ++ + install-ps: install-ps-am + ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +Index: pam.deb/modules/pam_timestamp/Makefile.in =================================================================== ---- pam.debian.orig/modules/pam_timestamp/Makefile.in -+++ pam.debian/modules/pam_timestamp/Makefile.in -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.11 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. +--- pam.deb.orig/modules/pam_timestamp/Makefile.in ++++ pam.deb/modules/pam_timestamp/Makefile.in +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -52,7 +52,6 @@ - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ -- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ - $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ - $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ -@@ -61,7 +60,7 @@ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ -- $(top_srcdir)/configure.in -+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -@@ -221,6 +220,7 @@ +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -205,6 +206,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -19290,34 +26596,181 @@ Index: pam.debian/modules/pam_timestamp/Makefile.in PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PIE_CFLAGS = @PIE_CFLAGS@ -Index: pam.debian/modules/pam_umask/Makefile.in +@@ -315,8 +317,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +@@ -497,8 +499,8 @@ + esac; \ + done; \ + for i in $$list; do \ +- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ +- else file=$$i; fi; \ ++ if test -f $$i; then file=$$i; \ ++ else file=$(srcdir)/$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 8*) ;; \ +@@ -537,7 +539,7 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS +@@ -580,7 +582,7 @@ + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + check-TESTS: $(TESTS) +- @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \ ++ @failed=0; all=0; xfail=0; xpass=0; skip=0; \ + srcdir=$(srcdir); export srcdir; \ + list=' $(TESTS) '; \ + if test -n "$$list"; then \ +@@ -591,7 +593,7 @@ + if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *$$ws$$tst$$ws*) \ ++ *[\ \ ]$$tst[\ \ ]*) \ + xpass=`expr $$xpass + 1`; \ + failed=`expr $$failed + 1`; \ + echo "XPASS: $$tst"; \ +@@ -603,7 +605,7 @@ + elif test $$? -ne 77; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *$$ws$$tst$$ws*) \ ++ *[\ \ ]$$tst[\ \ ]*) \ + xfail=`expr $$xfail + 1`; \ + echo "XFAIL: $$tst"; \ + ;; \ +@@ -617,23 +619,36 @@ + echo "SKIP: $$tst"; \ + fi; \ + done; \ ++ if test "$$all" -eq 1; then \ ++ tests="test"; \ ++ All=""; \ ++ else \ ++ tests="tests"; \ ++ All="All "; \ ++ fi; \ + if test "$$failed" -eq 0; then \ + if test "$$xfail" -eq 0; then \ +- banner="All $$all tests passed"; \ ++ banner="$$All$$all $$tests passed"; \ + else \ +- banner="All $$all tests behaved as expected ($$xfail expected failures)"; \ ++ if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ ++ banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ + fi; \ + else \ + if test "$$xpass" -eq 0; then \ +- banner="$$failed of $$all tests failed"; \ ++ banner="$$failed of $$all $$tests failed"; \ + else \ +- banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \ ++ if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ ++ banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + fi; \ + fi; \ + dashes="$$banner"; \ + skipped=""; \ + if test "$$skip" -ne 0; then \ +- skipped="($$skip tests were not run)"; \ ++ if test "$$skip" -eq 1; then \ ++ skipped="($$skip test was not run)"; \ ++ else \ ++ skipped="($$skip tests were not run)"; \ ++ fi; \ + test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ + dashes="$$skipped"; \ + fi; \ +@@ -653,6 +668,19 @@ + else :; fi + + distdir: $(DISTFILES) ++ @list='$(MANS)'; if test -n "$$list"; then \ ++ list=`for p in $$list; do \ ++ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ ++ if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ ++ if test -n "$$list" && \ ++ grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ ++ echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ ++ grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ ++ echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ ++ echo " typically \`make maintainer-clean' will remove them" >&2; \ ++ exit 1; \ ++ else :; fi; \ ++ else :; fi + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ +@@ -729,6 +757,8 @@ + + html: html-am + ++html-am: ++ + info: info-am + + info-am: +@@ -737,18 +767,28 @@ + + install-dvi: install-dvi-am + ++install-dvi-am: ++ + install-exec-am: install-sbinPROGRAMS + + install-html: install-html-am + ++install-html-am: ++ + install-info: install-info-am + ++install-info-am: ++ + install-man: install-man8 + + install-pdf: install-pdf-am + ++install-pdf-am: ++ + install-ps: install-ps-am + ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +Index: pam.deb/modules/pam_umask/Makefile.in =================================================================== ---- pam.debian.orig/modules/pam_umask/Makefile.in -+++ pam.debian/modules/pam_umask/Makefile.in -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.11 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. +--- pam.deb.orig/modules/pam_umask/Makefile.in ++++ pam.deb/modules/pam_umask/Makefile.in +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -45,7 +45,6 @@ - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ -- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ - $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ - $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ -@@ -54,7 +53,7 @@ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ -- $(top_srcdir)/configure.in -+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -@@ -193,6 +192,7 @@ +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -176,6 +177,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -19325,34 +26778,181 @@ Index: pam.debian/modules/pam_umask/Makefile.in PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PIE_CFLAGS = @PIE_CFLAGS@ -Index: pam.debian/modules/pam_userdb/Makefile.in +@@ -277,8 +279,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +@@ -377,8 +379,8 @@ + esac; \ + done; \ + for i in $$list; do \ +- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ +- else file=$$i; fi; \ ++ if test -f $$i; then file=$$i; \ ++ else file=$(srcdir)/$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 8*) ;; \ +@@ -417,7 +419,7 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS +@@ -460,7 +462,7 @@ + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + check-TESTS: $(TESTS) +- @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \ ++ @failed=0; all=0; xfail=0; xpass=0; skip=0; \ + srcdir=$(srcdir); export srcdir; \ + list=' $(TESTS) '; \ + if test -n "$$list"; then \ +@@ -471,7 +473,7 @@ + if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *$$ws$$tst$$ws*) \ ++ *[\ \ ]$$tst[\ \ ]*) \ + xpass=`expr $$xpass + 1`; \ + failed=`expr $$failed + 1`; \ + echo "XPASS: $$tst"; \ +@@ -483,7 +485,7 @@ + elif test $$? -ne 77; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *$$ws$$tst$$ws*) \ ++ *[\ \ ]$$tst[\ \ ]*) \ + xfail=`expr $$xfail + 1`; \ + echo "XFAIL: $$tst"; \ + ;; \ +@@ -497,23 +499,36 @@ + echo "SKIP: $$tst"; \ + fi; \ + done; \ ++ if test "$$all" -eq 1; then \ ++ tests="test"; \ ++ All=""; \ ++ else \ ++ tests="tests"; \ ++ All="All "; \ ++ fi; \ + if test "$$failed" -eq 0; then \ + if test "$$xfail" -eq 0; then \ +- banner="All $$all tests passed"; \ ++ banner="$$All$$all $$tests passed"; \ + else \ +- banner="All $$all tests behaved as expected ($$xfail expected failures)"; \ ++ if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ ++ banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ + fi; \ + else \ + if test "$$xpass" -eq 0; then \ +- banner="$$failed of $$all tests failed"; \ ++ banner="$$failed of $$all $$tests failed"; \ + else \ +- banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \ ++ if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ ++ banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + fi; \ + fi; \ + dashes="$$banner"; \ + skipped=""; \ + if test "$$skip" -ne 0; then \ +- skipped="($$skip tests were not run)"; \ ++ if test "$$skip" -eq 1; then \ ++ skipped="($$skip test was not run)"; \ ++ else \ ++ skipped="($$skip tests were not run)"; \ ++ fi; \ + test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ + dashes="$$skipped"; \ + fi; \ +@@ -533,6 +548,19 @@ + else :; fi + + distdir: $(DISTFILES) ++ @list='$(MANS)'; if test -n "$$list"; then \ ++ list=`for p in $$list; do \ ++ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ ++ if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ ++ if test -n "$$list" && \ ++ grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ ++ echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ ++ grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ ++ echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ ++ echo " typically \`make maintainer-clean' will remove them" >&2; \ ++ exit 1; \ ++ else :; fi; \ ++ else :; fi + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ +@@ -609,6 +637,8 @@ + + html: html-am + ++html-am: ++ + info: info-am + + info-am: +@@ -617,18 +647,28 @@ + + install-dvi: install-dvi-am + ++install-dvi-am: ++ + install-exec-am: + + install-html: install-html-am + ++install-html-am: ++ + install-info: install-info-am + ++install-info-am: ++ + install-man: install-man8 + + install-pdf: install-pdf-am + ++install-pdf-am: ++ + install-ps: install-ps-am + ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +Index: pam.deb/modules/pam_userdb/Makefile.in =================================================================== ---- pam.debian.orig/modules/pam_userdb/Makefile.in -+++ pam.debian/modules/pam_userdb/Makefile.in -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.11 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. +--- pam.deb.orig/modules/pam_userdb/Makefile.in ++++ pam.deb/modules/pam_userdb/Makefile.in +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -47,7 +47,6 @@ - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ -- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ - $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ - $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ -@@ -56,7 +55,7 @@ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ -- $(top_srcdir)/configure.in -+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -@@ -197,6 +196,7 @@ +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -180,6 +181,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -19360,34 +26960,181 @@ Index: pam.debian/modules/pam_userdb/Makefile.in PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PIE_CFLAGS = @PIE_CFLAGS@ -Index: pam.debian/modules/pam_warn/Makefile.in +@@ -283,8 +285,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +@@ -383,8 +385,8 @@ + esac; \ + done; \ + for i in $$list; do \ +- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ +- else file=$$i; fi; \ ++ if test -f $$i; then file=$$i; \ ++ else file=$(srcdir)/$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 8*) ;; \ +@@ -423,7 +425,7 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS +@@ -466,7 +468,7 @@ + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + check-TESTS: $(TESTS) +- @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \ ++ @failed=0; all=0; xfail=0; xpass=0; skip=0; \ + srcdir=$(srcdir); export srcdir; \ + list=' $(TESTS) '; \ + if test -n "$$list"; then \ +@@ -477,7 +479,7 @@ + if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *$$ws$$tst$$ws*) \ ++ *[\ \ ]$$tst[\ \ ]*) \ + xpass=`expr $$xpass + 1`; \ + failed=`expr $$failed + 1`; \ + echo "XPASS: $$tst"; \ +@@ -489,7 +491,7 @@ + elif test $$? -ne 77; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *$$ws$$tst$$ws*) \ ++ *[\ \ ]$$tst[\ \ ]*) \ + xfail=`expr $$xfail + 1`; \ + echo "XFAIL: $$tst"; \ + ;; \ +@@ -503,23 +505,36 @@ + echo "SKIP: $$tst"; \ + fi; \ + done; \ ++ if test "$$all" -eq 1; then \ ++ tests="test"; \ ++ All=""; \ ++ else \ ++ tests="tests"; \ ++ All="All "; \ ++ fi; \ + if test "$$failed" -eq 0; then \ + if test "$$xfail" -eq 0; then \ +- banner="All $$all tests passed"; \ ++ banner="$$All$$all $$tests passed"; \ + else \ +- banner="All $$all tests behaved as expected ($$xfail expected failures)"; \ ++ if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ ++ banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ + fi; \ + else \ + if test "$$xpass" -eq 0; then \ +- banner="$$failed of $$all tests failed"; \ ++ banner="$$failed of $$all $$tests failed"; \ + else \ +- banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \ ++ if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ ++ banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + fi; \ + fi; \ + dashes="$$banner"; \ + skipped=""; \ + if test "$$skip" -ne 0; then \ +- skipped="($$skip tests were not run)"; \ ++ if test "$$skip" -eq 1; then \ ++ skipped="($$skip test was not run)"; \ ++ else \ ++ skipped="($$skip tests were not run)"; \ ++ fi; \ + test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ + dashes="$$skipped"; \ + fi; \ +@@ -539,6 +554,19 @@ + else :; fi + + distdir: $(DISTFILES) ++ @list='$(MANS)'; if test -n "$$list"; then \ ++ list=`for p in $$list; do \ ++ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ ++ if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ ++ if test -n "$$list" && \ ++ grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ ++ echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ ++ grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ ++ echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ ++ echo " typically \`make maintainer-clean' will remove them" >&2; \ ++ exit 1; \ ++ else :; fi; \ ++ else :; fi + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ +@@ -615,6 +643,8 @@ + + html: html-am + ++html-am: ++ + info: info-am + + info-am: +@@ -623,18 +653,28 @@ + + install-dvi: install-dvi-am + ++install-dvi-am: ++ + install-exec-am: + + install-html: install-html-am + ++install-html-am: ++ + install-info: install-info-am + ++install-info-am: ++ + install-man: install-man8 + + install-pdf: install-pdf-am + ++install-pdf-am: ++ + install-ps: install-ps-am + ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +Index: pam.deb/modules/pam_warn/Makefile.in =================================================================== ---- pam.debian.orig/modules/pam_warn/Makefile.in -+++ pam.debian/modules/pam_warn/Makefile.in -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.11 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. +--- pam.deb.orig/modules/pam_warn/Makefile.in ++++ pam.deb/modules/pam_warn/Makefile.in +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -45,7 +45,6 @@ - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ -- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ - $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ - $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ -@@ -54,7 +53,7 @@ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ -- $(top_srcdir)/configure.in -+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -@@ -193,6 +192,7 @@ +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -176,6 +177,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -19395,34 +27142,181 @@ Index: pam.debian/modules/pam_warn/Makefile.in PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PIE_CFLAGS = @PIE_CFLAGS@ -Index: pam.debian/modules/pam_wheel/Makefile.in +@@ -277,8 +279,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +@@ -377,8 +379,8 @@ + esac; \ + done; \ + for i in $$list; do \ +- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ +- else file=$$i; fi; \ ++ if test -f $$i; then file=$$i; \ ++ else file=$(srcdir)/$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 8*) ;; \ +@@ -417,7 +419,7 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS +@@ -460,7 +462,7 @@ + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + check-TESTS: $(TESTS) +- @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \ ++ @failed=0; all=0; xfail=0; xpass=0; skip=0; \ + srcdir=$(srcdir); export srcdir; \ + list=' $(TESTS) '; \ + if test -n "$$list"; then \ +@@ -471,7 +473,7 @@ + if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *$$ws$$tst$$ws*) \ ++ *[\ \ ]$$tst[\ \ ]*) \ + xpass=`expr $$xpass + 1`; \ + failed=`expr $$failed + 1`; \ + echo "XPASS: $$tst"; \ +@@ -483,7 +485,7 @@ + elif test $$? -ne 77; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *$$ws$$tst$$ws*) \ ++ *[\ \ ]$$tst[\ \ ]*) \ + xfail=`expr $$xfail + 1`; \ + echo "XFAIL: $$tst"; \ + ;; \ +@@ -497,23 +499,36 @@ + echo "SKIP: $$tst"; \ + fi; \ + done; \ ++ if test "$$all" -eq 1; then \ ++ tests="test"; \ ++ All=""; \ ++ else \ ++ tests="tests"; \ ++ All="All "; \ ++ fi; \ + if test "$$failed" -eq 0; then \ + if test "$$xfail" -eq 0; then \ +- banner="All $$all tests passed"; \ ++ banner="$$All$$all $$tests passed"; \ + else \ +- banner="All $$all tests behaved as expected ($$xfail expected failures)"; \ ++ if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ ++ banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ + fi; \ + else \ + if test "$$xpass" -eq 0; then \ +- banner="$$failed of $$all tests failed"; \ ++ banner="$$failed of $$all $$tests failed"; \ + else \ +- banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \ ++ if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ ++ banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + fi; \ + fi; \ + dashes="$$banner"; \ + skipped=""; \ + if test "$$skip" -ne 0; then \ +- skipped="($$skip tests were not run)"; \ ++ if test "$$skip" -eq 1; then \ ++ skipped="($$skip test was not run)"; \ ++ else \ ++ skipped="($$skip tests were not run)"; \ ++ fi; \ + test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ + dashes="$$skipped"; \ + fi; \ +@@ -533,6 +548,19 @@ + else :; fi + + distdir: $(DISTFILES) ++ @list='$(MANS)'; if test -n "$$list"; then \ ++ list=`for p in $$list; do \ ++ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ ++ if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ ++ if test -n "$$list" && \ ++ grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ ++ echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ ++ grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ ++ echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ ++ echo " typically \`make maintainer-clean' will remove them" >&2; \ ++ exit 1; \ ++ else :; fi; \ ++ else :; fi + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ +@@ -609,6 +637,8 @@ + + html: html-am + ++html-am: ++ + info: info-am + + info-am: +@@ -617,18 +647,28 @@ + + install-dvi: install-dvi-am + ++install-dvi-am: ++ + install-exec-am: + + install-html: install-html-am + ++install-html-am: ++ + install-info: install-info-am + ++install-info-am: ++ + install-man: install-man8 + + install-pdf: install-pdf-am + ++install-pdf-am: ++ + install-ps: install-ps-am + ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +Index: pam.deb/modules/pam_wheel/Makefile.in =================================================================== ---- pam.debian.orig/modules/pam_wheel/Makefile.in -+++ pam.debian/modules/pam_wheel/Makefile.in -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.11 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. +--- pam.deb.orig/modules/pam_wheel/Makefile.in ++++ pam.deb/modules/pam_wheel/Makefile.in +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -45,7 +45,6 @@ - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ -- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ - $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ - $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ -@@ -54,7 +53,7 @@ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ -- $(top_srcdir)/configure.in -+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -@@ -193,6 +192,7 @@ +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -176,6 +177,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -19430,34 +27324,181 @@ Index: pam.debian/modules/pam_wheel/Makefile.in PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PIE_CFLAGS = @PIE_CFLAGS@ -Index: pam.debian/modules/pam_xauth/Makefile.in +@@ -277,8 +279,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +@@ -377,8 +379,8 @@ + esac; \ + done; \ + for i in $$list; do \ +- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ +- else file=$$i; fi; \ ++ if test -f $$i; then file=$$i; \ ++ else file=$(srcdir)/$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 8*) ;; \ +@@ -417,7 +419,7 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS +@@ -460,7 +462,7 @@ + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + check-TESTS: $(TESTS) +- @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \ ++ @failed=0; all=0; xfail=0; xpass=0; skip=0; \ + srcdir=$(srcdir); export srcdir; \ + list=' $(TESTS) '; \ + if test -n "$$list"; then \ +@@ -471,7 +473,7 @@ + if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *$$ws$$tst$$ws*) \ ++ *[\ \ ]$$tst[\ \ ]*) \ + xpass=`expr $$xpass + 1`; \ + failed=`expr $$failed + 1`; \ + echo "XPASS: $$tst"; \ +@@ -483,7 +485,7 @@ + elif test $$? -ne 77; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *$$ws$$tst$$ws*) \ ++ *[\ \ ]$$tst[\ \ ]*) \ + xfail=`expr $$xfail + 1`; \ + echo "XFAIL: $$tst"; \ + ;; \ +@@ -497,23 +499,36 @@ + echo "SKIP: $$tst"; \ + fi; \ + done; \ ++ if test "$$all" -eq 1; then \ ++ tests="test"; \ ++ All=""; \ ++ else \ ++ tests="tests"; \ ++ All="All "; \ ++ fi; \ + if test "$$failed" -eq 0; then \ + if test "$$xfail" -eq 0; then \ +- banner="All $$all tests passed"; \ ++ banner="$$All$$all $$tests passed"; \ + else \ +- banner="All $$all tests behaved as expected ($$xfail expected failures)"; \ ++ if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ ++ banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ + fi; \ + else \ + if test "$$xpass" -eq 0; then \ +- banner="$$failed of $$all tests failed"; \ ++ banner="$$failed of $$all $$tests failed"; \ + else \ +- banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \ ++ if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ ++ banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + fi; \ + fi; \ + dashes="$$banner"; \ + skipped=""; \ + if test "$$skip" -ne 0; then \ +- skipped="($$skip tests were not run)"; \ ++ if test "$$skip" -eq 1; then \ ++ skipped="($$skip test was not run)"; \ ++ else \ ++ skipped="($$skip tests were not run)"; \ ++ fi; \ + test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ + dashes="$$skipped"; \ + fi; \ +@@ -533,6 +548,19 @@ + else :; fi + + distdir: $(DISTFILES) ++ @list='$(MANS)'; if test -n "$$list"; then \ ++ list=`for p in $$list; do \ ++ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ ++ if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ ++ if test -n "$$list" && \ ++ grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ ++ echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ ++ grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ ++ echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ ++ echo " typically \`make maintainer-clean' will remove them" >&2; \ ++ exit 1; \ ++ else :; fi; \ ++ else :; fi + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ +@@ -609,6 +637,8 @@ + + html: html-am + ++html-am: ++ + info: info-am + + info-am: +@@ -617,18 +647,28 @@ + + install-dvi: install-dvi-am + ++install-dvi-am: ++ + install-exec-am: + + install-html: install-html-am + ++install-html-am: ++ + install-info: install-info-am + ++install-info-am: ++ + install-man: install-man8 + + install-pdf: install-pdf-am + ++install-pdf-am: ++ + install-ps: install-ps-am + ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +Index: pam.deb/modules/pam_xauth/Makefile.in =================================================================== ---- pam.debian.orig/modules/pam_xauth/Makefile.in -+++ pam.debian/modules/pam_xauth/Makefile.in -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.11 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. +--- pam.deb.orig/modules/pam_xauth/Makefile.in ++++ pam.deb/modules/pam_xauth/Makefile.in +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -45,7 +45,6 @@ - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ -- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ - $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ - $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ -@@ -54,7 +53,7 @@ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ -- $(top_srcdir)/configure.in -+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -@@ -193,6 +192,7 @@ +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -176,6 +177,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -19465,34 +27506,181 @@ Index: pam.debian/modules/pam_xauth/Makefile.in PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PIE_CFLAGS = @PIE_CFLAGS@ -Index: pam.debian/tests/Makefile.in +@@ -277,8 +279,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +@@ -377,8 +379,8 @@ + esac; \ + done; \ + for i in $$list; do \ +- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ +- else file=$$i; fi; \ ++ if test -f $$i; then file=$$i; \ ++ else file=$(srcdir)/$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 8*) ;; \ +@@ -417,7 +419,7 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS +@@ -460,7 +462,7 @@ + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + check-TESTS: $(TESTS) +- @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \ ++ @failed=0; all=0; xfail=0; xpass=0; skip=0; \ + srcdir=$(srcdir); export srcdir; \ + list=' $(TESTS) '; \ + if test -n "$$list"; then \ +@@ -471,7 +473,7 @@ + if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *$$ws$$tst$$ws*) \ ++ *[\ \ ]$$tst[\ \ ]*) \ + xpass=`expr $$xpass + 1`; \ + failed=`expr $$failed + 1`; \ + echo "XPASS: $$tst"; \ +@@ -483,7 +485,7 @@ + elif test $$? -ne 77; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *$$ws$$tst$$ws*) \ ++ *[\ \ ]$$tst[\ \ ]*) \ + xfail=`expr $$xfail + 1`; \ + echo "XFAIL: $$tst"; \ + ;; \ +@@ -497,23 +499,36 @@ + echo "SKIP: $$tst"; \ + fi; \ + done; \ ++ if test "$$all" -eq 1; then \ ++ tests="test"; \ ++ All=""; \ ++ else \ ++ tests="tests"; \ ++ All="All "; \ ++ fi; \ + if test "$$failed" -eq 0; then \ + if test "$$xfail" -eq 0; then \ +- banner="All $$all tests passed"; \ ++ banner="$$All$$all $$tests passed"; \ + else \ +- banner="All $$all tests behaved as expected ($$xfail expected failures)"; \ ++ if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ ++ banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ + fi; \ + else \ + if test "$$xpass" -eq 0; then \ +- banner="$$failed of $$all tests failed"; \ ++ banner="$$failed of $$all $$tests failed"; \ + else \ +- banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \ ++ if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ ++ banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + fi; \ + fi; \ + dashes="$$banner"; \ + skipped=""; \ + if test "$$skip" -ne 0; then \ +- skipped="($$skip tests were not run)"; \ ++ if test "$$skip" -eq 1; then \ ++ skipped="($$skip test was not run)"; \ ++ else \ ++ skipped="($$skip tests were not run)"; \ ++ fi; \ + test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ + dashes="$$skipped"; \ + fi; \ +@@ -533,6 +548,19 @@ + else :; fi + + distdir: $(DISTFILES) ++ @list='$(MANS)'; if test -n "$$list"; then \ ++ list=`for p in $$list; do \ ++ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ ++ if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ ++ if test -n "$$list" && \ ++ grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ ++ echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ ++ grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ ++ echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ ++ echo " typically \`make maintainer-clean' will remove them" >&2; \ ++ exit 1; \ ++ else :; fi; \ ++ else :; fi + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ +@@ -609,6 +637,8 @@ + + html: html-am + ++html-am: ++ + info: info-am + + info-am: +@@ -617,18 +647,28 @@ + + install-dvi: install-dvi-am + ++install-dvi-am: ++ + install-exec-am: + + install-html: install-html-am + ++install-html-am: ++ + install-info: install-info-am + ++install-info-am: ++ + install-man: install-man8 + + install-pdf: install-pdf-am + ++install-pdf-am: ++ + install-ps: install-ps-am + ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +Index: pam.deb/tests/Makefile.in =================================================================== ---- pam.debian.orig/tests/Makefile.in -+++ pam.debian/tests/Makefile.in -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.11 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. +--- pam.deb.orig/tests/Makefile.in ++++ pam.deb/tests/Makefile.in +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -51,7 +51,6 @@ - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ -- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ - $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ - $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ -@@ -60,7 +59,7 @@ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ -- $(top_srcdir)/configure.in -+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -@@ -250,6 +249,7 @@ +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -247,6 +248,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -19500,34 +27688,150 @@ Index: pam.debian/tests/Makefile.in PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PIE_CFLAGS = @PIE_CFLAGS@ -Index: pam.debian/xtests/Makefile.in +@@ -341,8 +343,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +@@ -477,7 +479,7 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS +@@ -520,7 +522,7 @@ + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + check-TESTS: $(TESTS) +- @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \ ++ @failed=0; all=0; xfail=0; xpass=0; skip=0; \ + srcdir=$(srcdir); export srcdir; \ + list=' $(TESTS) '; \ + if test -n "$$list"; then \ +@@ -531,7 +533,7 @@ + if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *$$ws$$tst$$ws*) \ ++ *[\ \ ]$$tst[\ \ ]*) \ + xpass=`expr $$xpass + 1`; \ + failed=`expr $$failed + 1`; \ + echo "XPASS: $$tst"; \ +@@ -543,7 +545,7 @@ + elif test $$? -ne 77; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ +- *$$ws$$tst$$ws*) \ ++ *[\ \ ]$$tst[\ \ ]*) \ + xfail=`expr $$xfail + 1`; \ + echo "XFAIL: $$tst"; \ + ;; \ +@@ -557,23 +559,36 @@ + echo "SKIP: $$tst"; \ + fi; \ + done; \ ++ if test "$$all" -eq 1; then \ ++ tests="test"; \ ++ All=""; \ ++ else \ ++ tests="tests"; \ ++ All="All "; \ ++ fi; \ + if test "$$failed" -eq 0; then \ + if test "$$xfail" -eq 0; then \ +- banner="All $$all tests passed"; \ ++ banner="$$All$$all $$tests passed"; \ + else \ +- banner="All $$all tests behaved as expected ($$xfail expected failures)"; \ ++ if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ ++ banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ + fi; \ + else \ + if test "$$xpass" -eq 0; then \ +- banner="$$failed of $$all tests failed"; \ ++ banner="$$failed of $$all $$tests failed"; \ + else \ +- banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \ ++ if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ ++ banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + fi; \ + fi; \ + dashes="$$banner"; \ + skipped=""; \ + if test "$$skip" -ne 0; then \ +- skipped="($$skip tests were not run)"; \ ++ if test "$$skip" -eq 1; then \ ++ skipped="($$skip test was not run)"; \ ++ else \ ++ skipped="($$skip tests were not run)"; \ ++ fi; \ + test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ + dashes="$$skipped"; \ + fi; \ +@@ -666,6 +681,8 @@ + + html: html-am + ++html-am: ++ + info: info-am + + info-am: +@@ -674,18 +691,28 @@ + + install-dvi: install-dvi-am + ++install-dvi-am: ++ + install-exec-am: + + install-html: install-html-am + ++install-html-am: ++ + install-info: install-info-am + ++install-info-am: ++ + install-man: + + install-pdf: install-pdf-am + ++install-pdf-am: ++ + install-ps: install-ps-am + ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +Index: pam.deb/xtests/Makefile.in =================================================================== ---- pam.debian.orig/xtests/Makefile.in -+++ pam.debian/xtests/Makefile.in -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.11 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. +--- pam.deb.orig/xtests/Makefile.in ++++ pam.deb/xtests/Makefile.in +@@ -1,8 +1,9 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -44,7 +44,6 @@ - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ -- $(top_srcdir)/m4/japhar_grep_cflags.m4 \ - $(top_srcdir)/m4/jh_path_xml_catalog.m4 \ - $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ -@@ -53,7 +52,7 @@ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ -- $(top_srcdir)/configure.in -+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in - am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -@@ -252,6 +251,7 @@ +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -249,6 +250,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ @@ -19535,10 +27839,68 @@ Index: pam.debian/xtests/Makefile.in PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PIE_CFLAGS = @PIE_CFLAGS@ -Index: pam.debian/m4/ltversion.m4 +@@ -381,8 +383,8 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ +@@ -534,7 +536,7 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ ++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique + tags: TAGS +@@ -647,6 +649,8 @@ + + html: html-am + ++html-am: ++ + info: info-am + + info-am: +@@ -655,18 +659,28 @@ + + install-dvi: install-dvi-am + ++install-dvi-am: ++ + install-exec-am: + + install-html: install-html-am + ++install-html-am: ++ + install-info: install-info-am + ++install-info-am: ++ + install-man: + + install-pdf: install-pdf-am + ++install-pdf-am: ++ + install-ps: install-ps-am + ++install-ps-am: ++ + installcheck-am: + + maintainer-clean: maintainer-clean-am +Index: pam.deb/m4/ltversion.m4 =================================================================== ---- pam.debian.orig/m4/ltversion.m4 -+++ pam.debian/m4/ltversion.m4 +--- pam.deb.orig/m4/ltversion.m4 ++++ pam.deb/m4/ltversion.m4 @@ -9,15 +9,15 @@ # Generated from ltversion.in. diff --git a/debian/patches-applied/conditional_module,_conditional_man b/debian/patches-applied/conditional_module,_conditional_man deleted file mode 100644 index 69e15a80..00000000 --- a/debian/patches-applied/conditional_module,_conditional_man +++ /dev/null @@ -1,26 +0,0 @@ -Description: don't install manpage for pam_tty_audit if the module isn't built - If we don't have the libraries required for building pam_tty_audit, we - shouldn't install the manpage either. -Author: Steve Langasek <steve.langasek@canonical.com> -Bug-Ubuntu: https://bugs.launchpad.net/bugs/588547 -Forwarded: <20100607181348.GA28895@dario.dodds.net> -Applied-Upstream: 987, http://bzr.debian.org/pkg-pam/upstream/branches/HEAD - -Index: pam.deb/modules/pam_tty_audit/Makefile.am -=================================================================== ---- pam.deb.orig/modules/pam_tty_audit/Makefile.am -+++ pam.deb/modules/pam_tty_audit/Makefile.am -@@ -5,9 +5,11 @@ - CLEANFILES = *~ - MAINTAINERCLEANFILES = $(MANS) README - --EXTRA_DIST = README $(MANS) $(XMLS) -+EXTRA_DIST = README pam_tty_audit.8 $(XMLS) - --man_MANS = pam_tty_audit.8 -+if HAVE_AUDIT_TTY_STATUS -+ man_MANS = pam_tty_audit.8 -+endif - XMLS = README.xml pam_tty_audit.8.xml - - securelibdir = $(SECUREDIR) diff --git a/debian/patches-applied/fix-man-crud b/debian/patches-applied/fix-man-crud index 337feee6..b71a3dac 100644 --- a/debian/patches-applied/fix-man-crud +++ b/debian/patches-applied/fix-man-crud @@ -10,25 +10,29 @@ Index: pam.deb/doc/man/pam_close_session.3 =================================================================== --- pam.deb.orig/doc/man/pam_close_session.3 +++ pam.deb/doc/man/pam_close_session.3 -@@ -1,161 +1,13 @@ +@@ -1,161 +1,22 @@ +'\" t .\" Title: pam_close_session .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/> --.\" Date: 03/02/2009 +-.\" Date: 10/27/2010 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -+.\" Date: 08/25/2009 ++.\" Date: 06/04/2011 .\" Manual: Linux-PAM Manual .\" Source: Linux-PAM Manual .\" Language: English .\" --.TH "PAM_CLOSE_SESSION" "3" "03/02/2009" "Linux-PAM Manual" "Linux-PAM Manual" --.\" ----------------------------------------------------------------- +-.TH "PAM_CLOSE_SESSION" "3" "10/27/2010" "Linux-PAM Manual" "Linux-PAM Manual" ++.TH "PAM_CLOSE_SESSION" "3" "06/04/2011" "Linux-PAM Manual" "Linux-PAM Manual" + .\" ----------------------------------------------------------------- -.\" * (re)Define some macros --.\" ----------------------------------------------------------------- --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" * Define some portability stuff + .\" ----------------------------------------------------------------- + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" http://bugs.debian.org/507673 ++.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* @@ -172,11 +176,12 @@ Index: pam.deb/doc/man/pam_close_session.3 -.fi -.\} -.. -+.TH "PAM_CLOSE_SESSION" "3" "08/25/2009" "Linux-PAM Manual" "Linux-PAM Manual" ++.ie \n(.g .ds Aq \(aq ++.el .ds Aq ' .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- -@@ -166,23 +18,17 @@ +@@ -166,23 +27,17 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- @@ -202,29 +207,42 @@ Index: pam.deb/doc/man/pam_close_session.3 .SH "DESCRIPTION" .PP The +@@ -191,7 +46,7 @@ + \fBpam_open_session\fR(3)\&. + .PP + It should be noted that the effective uid, +-\fBgeteuid\fR(2)\&. of the application should be of sufficient privilege to perform such tasks as unmounting the user\'s home directory for example\&. ++\fBgeteuid\fR(2)\&. of the application should be of sufficient privilege to perform such tasks as unmounting the user\*(Aqs home directory for example\&. + .PP + The flags argument is the binary or of zero or more of the following values: + .PP Index: pam.deb/doc/man/pam_fail_delay.3 =================================================================== --- pam.deb.orig/doc/man/pam_fail_delay.3 +++ pam.deb/doc/man/pam_fail_delay.3 -@@ -1,161 +1,13 @@ +@@ -1,161 +1,22 @@ +'\" t .\" Title: pam_fail_delay .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/> --.\" Date: 03/02/2009 +-.\" Date: 10/27/2010 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -+.\" Date: 08/25/2009 ++.\" Date: 06/04/2011 .\" Manual: Linux-PAM Manual .\" Source: Linux-PAM Manual .\" Language: English .\" --.TH "PAM_FAIL_DELAY" "3" "03/02/2009" "Linux-PAM Manual" "Linux-PAM Manual" --.\" ----------------------------------------------------------------- +-.TH "PAM_FAIL_DELAY" "3" "10/27/2010" "Linux-PAM Manual" "Linux-PAM Manual" ++.TH "PAM_FAIL_DELAY" "3" "06/04/2011" "Linux-PAM Manual" "Linux-PAM Manual" + .\" ----------------------------------------------------------------- -.\" * (re)Define some macros --.\" ----------------------------------------------------------------- --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" * Define some portability stuff + .\" ----------------------------------------------------------------- + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" http://bugs.debian.org/507673 ++.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* @@ -368,11 +386,12 @@ Index: pam.deb/doc/man/pam_fail_delay.3 -.fi -.\} -.. -+.TH "PAM_FAIL_DELAY" "3" "08/25/2009" "Linux-PAM Manual" "Linux-PAM Manual" ++.ie \n(.g .ds Aq \(aq ++.el .ds Aq ' .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- -@@ -166,23 +18,17 @@ +@@ -166,23 +27,17 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- @@ -398,7 +417,7 @@ Index: pam.deb/doc/man/pam_fail_delay.3 .SH "DESCRIPTION" .PP The -@@ -204,26 +50,12 @@ +@@ -204,26 +59,12 @@ .if n \{\ .RS 4 .\} @@ -425,7 +444,7 @@ Index: pam.deb/doc/man/pam_fail_delay.3 .if n \{\ .RE .\} -@@ -239,24 +71,10 @@ +@@ -239,24 +80,10 @@ .if n \{\ .RS 4 .\} @@ -450,7 +469,7 @@ Index: pam.deb/doc/man/pam_fail_delay.3 .if n \{\ .RE .\} -@@ -290,25 +108,11 @@ +@@ -290,25 +117,11 @@ .if n \{\ .RS 4 .\} @@ -476,7 +495,7 @@ Index: pam.deb/doc/man/pam_fail_delay.3 .if n \{\ .RE .\} -@@ -320,25 +124,11 @@ +@@ -320,25 +133,11 @@ .if n \{\ .RS 4 .\} @@ -506,25 +525,29 @@ Index: pam.deb/doc/man/pam_get_data.3 =================================================================== --- pam.deb.orig/doc/man/pam_get_data.3 +++ pam.deb/doc/man/pam_get_data.3 -@@ -1,161 +1,13 @@ +@@ -1,161 +1,22 @@ +'\" t .\" Title: pam_get_data .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/> --.\" Date: 03/02/2009 +-.\" Date: 10/27/2010 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -+.\" Date: 08/25/2009 ++.\" Date: 06/04/2011 .\" Manual: Linux-PAM Manual .\" Source: Linux-PAM Manual .\" Language: English .\" --.TH "PAM_GET_DATA" "3" "03/02/2009" "Linux-PAM Manual" "Linux-PAM Manual" --.\" ----------------------------------------------------------------- +-.TH "PAM_GET_DATA" "3" "10/27/2010" "Linux-PAM Manual" "Linux-PAM Manual" ++.TH "PAM_GET_DATA" "3" "06/04/2011" "Linux-PAM Manual" "Linux-PAM Manual" + .\" ----------------------------------------------------------------- -.\" * (re)Define some macros --.\" ----------------------------------------------------------------- --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" * Define some portability stuff + .\" ----------------------------------------------------------------- + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" http://bugs.debian.org/507673 ++.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* @@ -668,11 +691,12 @@ Index: pam.deb/doc/man/pam_get_data.3 -.fi -.\} -.. -+.TH "PAM_GET_DATA" "3" "08/25/2009" "Linux-PAM Manual" "Linux-PAM Manual" ++.ie \n(.g .ds Aq \(aq ++.el .ds Aq ' .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- -@@ -166,23 +18,17 @@ +@@ -166,23 +27,17 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- @@ -702,25 +726,29 @@ Index: pam.deb/doc/man/pam_get_user.3 =================================================================== --- pam.deb.orig/doc/man/pam_get_user.3 +++ pam.deb/doc/man/pam_get_user.3 -@@ -1,161 +1,13 @@ +@@ -1,161 +1,22 @@ +'\" t .\" Title: pam_get_user .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/> --.\" Date: 03/02/2009 +-.\" Date: 10/27/2010 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -+.\" Date: 08/25/2009 ++.\" Date: 06/04/2011 .\" Manual: Linux-PAM Manual .\" Source: Linux-PAM Manual .\" Language: English .\" --.TH "PAM_GET_USER" "3" "03/02/2009" "Linux-PAM Manual" "Linux-PAM Manual" --.\" ----------------------------------------------------------------- +-.TH "PAM_GET_USER" "3" "10/27/2010" "Linux-PAM Manual" "Linux-PAM Manual" ++.TH "PAM_GET_USER" "3" "06/04/2011" "Linux-PAM Manual" "Linux-PAM Manual" + .\" ----------------------------------------------------------------- -.\" * (re)Define some macros --.\" ----------------------------------------------------------------- --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" * Define some portability stuff + .\" ----------------------------------------------------------------- + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" http://bugs.debian.org/507673 ++.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* @@ -864,11 +892,12 @@ Index: pam.deb/doc/man/pam_get_user.3 -.fi -.\} -.. -+.TH "PAM_GET_USER" "3" "08/25/2009" "Linux-PAM Manual" "Linux-PAM Manual" ++.ie \n(.g .ds Aq \(aq ++.el .ds Aq ' .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- -@@ -166,23 +18,17 @@ +@@ -166,23 +27,17 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- @@ -894,29 +923,42 @@ Index: pam.deb/doc/man/pam_get_user.3 .SH "DESCRIPTION" .PP The +@@ -233,7 +88,7 @@ + \fI*user\fR\&. Note, this memory should + \fBnot\fR + be +-\fIfree()\fR\'d or ++\fIfree()\fR\*(Aqd or + \fImodified\fR + by the module\&. + .PP Index: pam.deb/doc/man/pam_set_data.3 =================================================================== --- pam.deb.orig/doc/man/pam_set_data.3 +++ pam.deb/doc/man/pam_set_data.3 -@@ -1,161 +1,13 @@ +@@ -1,161 +1,22 @@ +'\" t .\" Title: pam_set_data .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/> --.\" Date: 03/02/2009 +-.\" Date: 10/27/2010 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -+.\" Date: 08/25/2009 ++.\" Date: 06/04/2011 .\" Manual: Linux-PAM Manual .\" Source: Linux-PAM Manual .\" Language: English .\" --.TH "PAM_SET_DATA" "3" "03/02/2009" "Linux-PAM Manual" "Linux-PAM Manual" --.\" ----------------------------------------------------------------- +-.TH "PAM_SET_DATA" "3" "10/27/2010" "Linux-PAM Manual" "Linux-PAM Manual" ++.TH "PAM_SET_DATA" "3" "06/04/2011" "Linux-PAM Manual" "Linux-PAM Manual" + .\" ----------------------------------------------------------------- -.\" * (re)Define some macros --.\" ----------------------------------------------------------------- --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" * Define some portability stuff + .\" ----------------------------------------------------------------- + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" http://bugs.debian.org/507673 ++.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* @@ -1060,11 +1102,12 @@ Index: pam.deb/doc/man/pam_set_data.3 -.fi -.\} -.. -+.TH "PAM_SET_DATA" "3" "08/25/2009" "Linux-PAM Manual" "Linux-PAM Manual" ++.ie \n(.g .ds Aq \(aq ++.el .ds Aq ' .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- -@@ -166,23 +18,17 @@ +@@ -166,23 +27,17 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- @@ -1090,29 +1133,42 @@ Index: pam.deb/doc/man/pam_set_data.3 .SH "DESCRIPTION" .PP The +@@ -226,7 +81,7 @@ + .PP + The + \fIerror_status\fR +-may have been logically OR\'d with either of the following two values: ++may have been logically OR\*(Aqd with either of the following two values: + .PP + PAM_DATA_REPLACE + .RS 4 Index: pam.deb/doc/man/pam_sm_authenticate.3 =================================================================== --- pam.deb.orig/doc/man/pam_sm_authenticate.3 +++ pam.deb/doc/man/pam_sm_authenticate.3 -@@ -1,161 +1,13 @@ +@@ -1,161 +1,22 @@ +'\" t .\" Title: pam_sm_authenticate .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/> --.\" Date: 03/02/2009 +-.\" Date: 10/27/2010 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -+.\" Date: 08/25/2009 ++.\" Date: 06/04/2011 .\" Manual: Linux-PAM Manual .\" Source: Linux-PAM Manual .\" Language: English .\" --.TH "PAM_SM_AUTHENTICATE" "3" "03/02/2009" "Linux-PAM Manual" "Linux-PAM Manual" --.\" ----------------------------------------------------------------- +-.TH "PAM_SM_AUTHENTICATE" "3" "10/27/2010" "Linux-PAM Manual" "Linux-PAM Manual" ++.TH "PAM_SM_AUTHENTICATE" "3" "06/04/2011" "Linux-PAM Manual" "Linux-PAM Manual" + .\" ----------------------------------------------------------------- -.\" * (re)Define some macros --.\" ----------------------------------------------------------------- --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" * Define some portability stuff + .\" ----------------------------------------------------------------- + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" http://bugs.debian.org/507673 ++.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* @@ -1256,11 +1312,12 @@ Index: pam.deb/doc/man/pam_sm_authenticate.3 -.fi -.\} -.. -+.TH "PAM_SM_AUTHENTICATE" "3" "08/25/2009" "Linux-PAM Manual" "Linux-PAM Manual" ++.ie \n(.g .ds Aq \(aq ++.el .ds Aq ' .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- -@@ -166,33 +18,23 @@ +@@ -166,44 +27,34 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- @@ -1296,29 +1353,46 @@ Index: pam.deb/doc/man/pam_sm_authenticate.3 .SH "DESCRIPTION" .PP The + \fBpam_sm_authenticate\fR +-function is the service module\'s implementation of the ++function is the service module\*(Aqs implementation of the + \fBpam_authenticate\fR(3) + interface\&. + .PP + This function performs the task of authenticating the user\&. + .PP +-Valid flags, which may be logically OR\'d with ++Valid flags, which may be logically OR\*(Aqd with + \fIPAM_SILENT\fR, are: + .PP + PAM_SILENT Index: pam.deb/doc/man/pam_sm_close_session.3 =================================================================== --- pam.deb.orig/doc/man/pam_sm_close_session.3 +++ pam.deb/doc/man/pam_sm_close_session.3 -@@ -1,161 +1,13 @@ +@@ -1,161 +1,22 @@ +'\" t .\" Title: pam_sm_close_session .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/> --.\" Date: 03/02/2009 +-.\" Date: 10/27/2010 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -+.\" Date: 08/25/2009 ++.\" Date: 06/04/2011 .\" Manual: Linux-PAM Manual .\" Source: Linux-PAM Manual .\" Language: English .\" --.TH "PAM_SM_CLOSE_SESSION" "3" "03/02/2009" "Linux-PAM Manual" "Linux-PAM Manual" --.\" ----------------------------------------------------------------- +-.TH "PAM_SM_CLOSE_SESSION" "3" "10/27/2010" "Linux-PAM Manual" "Linux-PAM Manual" ++.TH "PAM_SM_CLOSE_SESSION" "3" "06/04/2011" "Linux-PAM Manual" "Linux-PAM Manual" + .\" ----------------------------------------------------------------- -.\" * (re)Define some macros --.\" ----------------------------------------------------------------- --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" * Define some portability stuff + .\" ----------------------------------------------------------------- + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" http://bugs.debian.org/507673 ++.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* @@ -1462,11 +1536,12 @@ Index: pam.deb/doc/man/pam_sm_close_session.3 -.fi -.\} -.. -+.TH "PAM_SM_CLOSE_SESSION" "3" "08/25/2009" "Linux-PAM Manual" "Linux-PAM Manual" ++.ie \n(.g .ds Aq \(aq ++.el .ds Aq ' .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- -@@ -166,33 +18,23 @@ +@@ -166,38 +27,28 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- @@ -1502,29 +1577,39 @@ Index: pam.deb/doc/man/pam_sm_close_session.3 .SH "DESCRIPTION" .PP The + \fBpam_sm_close_session\fR +-function is the service module\'s implementation of the ++function is the service module\*(Aqs implementation of the + \fBpam_close_session\fR(3) + interface\&. + .PP Index: pam.deb/doc/man/pam_sm_setcred.3 =================================================================== --- pam.deb.orig/doc/man/pam_sm_setcred.3 +++ pam.deb/doc/man/pam_sm_setcred.3 -@@ -1,161 +1,13 @@ +@@ -1,161 +1,22 @@ +'\" t .\" Title: pam_sm_setcred .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/> --.\" Date: 03/02/2009 +-.\" Date: 10/27/2010 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -+.\" Date: 08/25/2009 ++.\" Date: 06/04/2011 .\" Manual: Linux-PAM Manual .\" Source: Linux-PAM Manual .\" Language: English .\" --.TH "PAM_SM_SETCRED" "3" "03/02/2009" "Linux-PAM Manual" "Linux-PAM Manual" --.\" ----------------------------------------------------------------- +-.TH "PAM_SM_SETCRED" "3" "10/27/2010" "Linux-PAM Manual" "Linux-PAM Manual" ++.TH "PAM_SM_SETCRED" "3" "06/04/2011" "Linux-PAM Manual" "Linux-PAM Manual" + .\" ----------------------------------------------------------------- -.\" * (re)Define some macros --.\" ----------------------------------------------------------------- --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" * Define some portability stuff + .\" ----------------------------------------------------------------- + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" http://bugs.debian.org/507673 ++.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* @@ -1668,11 +1753,12 @@ Index: pam.deb/doc/man/pam_sm_setcred.3 -.fi -.\} -.. -+.TH "PAM_SM_SETCRED" "3" "08/25/2009" "Linux-PAM Manual" "Linux-PAM Manual" ++.ie \n(.g .ds Aq \(aq ++.el .ds Aq ' .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- -@@ -166,33 +18,23 @@ +@@ -166,38 +27,28 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- @@ -1708,29 +1794,63 @@ Index: pam.deb/doc/man/pam_sm_setcred.3 .SH "DESCRIPTION" .PP The + \fBpam_sm_setcred\fR +-function is the service module\'s implementation of the ++function is the service module\*(Aqs implementation of the + \fBpam_setcred\fR(3) + interface\&. + .PP +@@ -205,7 +56,7 @@ + \fIafter\fR + the user has been authenticated but before a session has been established\&. + .PP +-Valid flags, which may be logically OR\'d with ++Valid flags, which may be logically OR\*(Aqd with + \fIPAM_SILENT\fR, are: + .PP + PAM_SILENT +@@ -247,12 +98,12 @@ + .PP + PAM_CRED_UNAVAIL + .RS 4 +-This module cannot retrieve the user\'s credentials\&. ++This module cannot retrieve the user\*(Aqs credentials\&. + .RE + .PP + PAM_CRED_EXPIRED + .RS 4 +-The user\'s credentials have expired\&. ++The user\*(Aqs credentials have expired\&. + .RE + .PP + PAM_CRED_ERR Index: pam.deb/modules/pam_pwhistory/pam_pwhistory.8 =================================================================== --- pam.deb.orig/modules/pam_pwhistory/pam_pwhistory.8 +++ pam.deb/modules/pam_pwhistory/pam_pwhistory.8 -@@ -1,161 +1,13 @@ +@@ -1,161 +1,22 @@ +'\" t .\" Title: pam_pwhistory .\" Author: [see the "AUTHOR" section] -.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/> --.\" Date: 06/16/2009 +-.\" Date: 10/27/2010 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -+.\" Date: 08/25/2009 ++.\" Date: 06/04/2011 .\" Manual: Linux-PAM Manual .\" Source: Linux-PAM Manual .\" Language: English .\" --.TH "PAM_PWHISTORY" "8" "06/16/2009" "Linux-PAM Manual" "Linux\-PAM Manual" --.\" ----------------------------------------------------------------- +-.TH "PAM_PWHISTORY" "8" "10/27/2010" "Linux-PAM Manual" "Linux\-PAM Manual" ++.TH "PAM_PWHISTORY" "8" "06/04/2011" "Linux-PAM Manual" "Linux\-PAM Manual" + .\" ----------------------------------------------------------------- -.\" * (re)Define some macros --.\" ----------------------------------------------------------------- --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" * Define some portability stuff + .\" ----------------------------------------------------------------- + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" http://bugs.debian.org/507673 ++.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* @@ -1874,11 +1994,12 @@ Index: pam.deb/modules/pam_pwhistory/pam_pwhistory.8 -.fi -.\} -.. -+.TH "PAM_PWHISTORY" "8" "08/25/2009" "Linux-PAM Manual" "Linux\-PAM Manual" ++.ie \n(.g .ds Aq \(aq ++.el .ds Aq ' .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- -@@ -166,13 +18,11 @@ +@@ -166,13 +27,11 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- @@ -1894,7 +2015,7 @@ Index: pam.deb/modules/pam_pwhistory/pam_pwhistory.8 .SH "DESCRIPTION" .PP This module saves the last passwords for each user in order to force password change history and keep the user from alternating between the same password too frequently\&. -@@ -205,7 +55,7 @@ +@@ -205,7 +64,7 @@ The last \fIN\fR passwords for each user are saved in @@ -1903,7 +2024,16 @@ Index: pam.deb/modules/pam_pwhistory/pam_pwhistory.8 \fI10\fR\&. .RE .PP -@@ -256,26 +106,12 @@ +@@ -232,7 +91,7 @@ + .PP + PAM_AUTHTOK_ERR + .RS 4 +-No new password was entered, the user aborted password change or new password couldn\'t be set\&. ++No new password was entered, the user aborted password change or new password couldn\*(Aqt be set\&. + .RE + .PP + PAM_IGNORE +@@ -256,26 +115,12 @@ .if n \{\ .RS 4 .\} @@ -1930,7 +2060,7 @@ Index: pam.deb/modules/pam_pwhistory/pam_pwhistory.8 .if n \{\ .RE .\} -@@ -286,34 +122,20 @@ +@@ -286,34 +131,20 @@ .if n \{\ .RS 4 .\} @@ -1970,25 +2100,29 @@ 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 @@ +@@ -1,161 +1,22 @@ +'\" t .\" Title: pam_timestamp .\" Author: [see the "AUTHOR" section] -.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/> --.\" Date: 06/16/2009 +-.\" Date: 10/27/2010 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -+.\" Date: 08/25/2009 ++.\" Date: 06/04/2011 .\" Manual: Linux-PAM Manual .\" Source: Linux-PAM Manual .\" Language: English .\" --.TH "PAM_TIMESTAMP" "8" "06/16/2009" "Linux-PAM Manual" "Linux\-PAM Manual" --.\" ----------------------------------------------------------------- +-.TH "PAM_TIMESTAMP" "8" "10/27/2010" "Linux-PAM Manual" "Linux\-PAM Manual" ++.TH "PAM_TIMESTAMP" "8" "06/04/2011" "Linux-PAM Manual" "Linux\-PAM Manual" + .\" ----------------------------------------------------------------- -.\" * (re)Define some macros --.\" ----------------------------------------------------------------- --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" * Define some portability stuff + .\" ----------------------------------------------------------------- + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" http://bugs.debian.org/507673 ++.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* @@ -2132,11 +2266,12 @@ Index: pam.deb/modules/pam_timestamp/pam_timestamp.8 -.fi -.\} -.. -+.TH "PAM_TIMESTAMP" "8" "08/25/2009" "Linux-PAM Manual" "Linux\-PAM Manual" ++.ie \n(.g .ds Aq \(aq ++.el .ds Aq ' .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- -@@ -166,13 +18,11 @@ +@@ -166,13 +27,11 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- @@ -2152,7 +2287,7 @@ Index: pam.deb/modules/pam_timestamp/pam_timestamp.8 .SH "DESCRIPTION" .PP In a nutshell, -@@ -234,34 +84,20 @@ +@@ -234,34 +93,20 @@ .if n \{\ .RS 4 .\} @@ -2192,25 +2327,29 @@ Index: pam.deb/modules/pam_unix/unix_update.8 =================================================================== --- pam.deb.orig/modules/pam_unix/unix_update.8 +++ pam.deb/modules/pam_unix/unix_update.8 -@@ -1,161 +1,13 @@ +@@ -1,161 +1,22 @@ +'\" t .\" Title: unix_update .\" Author: [see the "AUTHOR" section] -.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/> --.\" Date: 03/02/2009 +-.\" Date: 10/27/2010 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -+.\" Date: 08/25/2009 ++.\" Date: 06/04/2011 .\" Manual: Linux-PAM Manual .\" Source: Linux-PAM Manual .\" Language: English .\" --.TH "UNIX_UPDATE" "8" "03/02/2009" "Linux-PAM Manual" "Linux\-PAM Manual" --.\" ----------------------------------------------------------------- +-.TH "UNIX_UPDATE" "8" "10/27/2010" "Linux-PAM Manual" "Linux\-PAM Manual" ++.TH "UNIX_UPDATE" "8" "06/04/2011" "Linux-PAM Manual" "Linux\-PAM Manual" + .\" ----------------------------------------------------------------- -.\" * (re)Define some macros --.\" ----------------------------------------------------------------- --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" * Define some portability stuff + .\" ----------------------------------------------------------------- + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" http://bugs.debian.org/507673 ++.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* @@ -2354,11 +2493,12 @@ Index: pam.deb/modules/pam_unix/unix_update.8 -.fi -.\} -.. -+.TH "UNIX_UPDATE" "8" "08/25/2009" "Linux-PAM Manual" "Linux\-PAM Manual" ++.ie \n(.g .ds Aq \(aq ++.el .ds Aq ' .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- -@@ -166,13 +18,11 @@ +@@ -166,13 +27,11 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- @@ -2378,25 +2518,29 @@ Index: pam.deb/doc/man/pam_end.3 =================================================================== --- pam.deb.orig/doc/man/pam_end.3 +++ pam.deb/doc/man/pam_end.3 -@@ -1,161 +1,13 @@ +@@ -1,161 +1,22 @@ +'\" t .\" Title: pam_end .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/> --.\" Date: 03/02/2009 +-.\" Date: 10/27/2010 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -+.\" Date: 08/25/2009 ++.\" Date: 06/04/2011 .\" Manual: Linux-PAM Manual .\" Source: Linux-PAM Manual .\" Language: English .\" --.TH "PAM_END" "3" "03/02/2009" "Linux-PAM Manual" "Linux-PAM Manual" --.\" ----------------------------------------------------------------- +-.TH "PAM_END" "3" "10/27/2010" "Linux-PAM Manual" "Linux-PAM Manual" ++.TH "PAM_END" "3" "06/04/2011" "Linux-PAM Manual" "Linux-PAM Manual" + .\" ----------------------------------------------------------------- -.\" * (re)Define some macros --.\" ----------------------------------------------------------------- --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" * Define some portability stuff + .\" ----------------------------------------------------------------- + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" http://bugs.debian.org/507673 ++.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* @@ -2540,11 +2684,12 @@ Index: pam.deb/doc/man/pam_end.3 -.fi -.\} -.. -+.TH "PAM_END" "3" "08/25/2009" "Linux-PAM Manual" "Linux-PAM Manual" ++.ie \n(.g .ds Aq \(aq ++.el .ds Aq ' .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- -@@ -166,23 +18,17 @@ +@@ -166,23 +27,17 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- @@ -2570,29 +2715,49 @@ Index: pam.deb/doc/man/pam_end.3 .SH "DESCRIPTION" .PP The +@@ -202,13 +57,13 @@ + (See + \fBpam_set_data\fR(3) + and +-\fBpam_get_data\fR(3))\&. In this way the module can be given notification of the pass/fail nature of the tear\-down process, and perform any last minute tasks that are appropriate to the module before it is unlinked\&. This argument can be logically OR\'d with ++\fBpam_get_data\fR(3))\&. In this way the module can be given notification of the pass/fail nature of the tear\-down process, and perform any last minute tasks that are appropriate to the module before it is unlinked\&. This argument can be logically OR\*(Aqd with + \fIPAM_DATA_SILENT\fR + to indicate to indicate that the module should not treat the call too seriously\&. It is generally used to indicate that the current closing of the library is in a + \fBfork\fR(2)ed process, and that the parent will take care of cleaning up things that exist outside of the current process space (files etc\&.)\&. + .PP + This function +-\fIfree\fR\'s all memory for items associated with the ++\fIfree\fR\*(Aqs all memory for items associated with the + \fBpam_set_item\fR(3) + and + \fBpam_get_item\fR(3) Index: pam.deb/doc/man/pam_get_item.3 =================================================================== --- pam.deb.orig/doc/man/pam_get_item.3 +++ pam.deb/doc/man/pam_get_item.3 -@@ -1,161 +1,13 @@ +@@ -1,161 +1,22 @@ +'\" t .\" Title: pam_get_item .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/> --.\" Date: 03/02/2009 +-.\" Date: 10/27/2010 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -+.\" Date: 08/25/2009 ++.\" Date: 06/04/2011 .\" Manual: Linux-PAM Manual .\" Source: Linux-PAM Manual .\" Language: English .\" --.TH "PAM_GET_ITEM" "3" "03/02/2009" "Linux-PAM Manual" "Linux-PAM Manual" --.\" ----------------------------------------------------------------- +-.TH "PAM_GET_ITEM" "3" "10/27/2010" "Linux-PAM Manual" "Linux-PAM Manual" ++.TH "PAM_GET_ITEM" "3" "06/04/2011" "Linux-PAM Manual" "Linux-PAM Manual" + .\" ----------------------------------------------------------------- -.\" * (re)Define some macros --.\" ----------------------------------------------------------------- --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" * Define some portability stuff + .\" ----------------------------------------------------------------- + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" http://bugs.debian.org/507673 ++.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* @@ -2736,11 +2901,12 @@ Index: pam.deb/doc/man/pam_get_item.3 -.fi -.\} -.. -+.TH "PAM_GET_ITEM" "3" "08/25/2009" "Linux-PAM Manual" "Linux-PAM Manual" ++.ie \n(.g .ds Aq \(aq ++.el .ds Aq ' .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- -@@ -166,23 +18,17 @@ +@@ -166,23 +27,17 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- @@ -2766,7 +2932,23 @@ Index: pam.deb/doc/man/pam_get_item.3 .SH "DESCRIPTION" .PP The -@@ -220,7 +66,7 @@ +@@ -195,7 +50,7 @@ + data and should + \fBnot\fR + be +-\fIfree()\fR\'ed or over\-written! The following values are supported for ++\fIfree()\fR\*(Aqed or over\-written! The following values are supported for + \fIitem_type\fR: + .PP + PAM_SERVICE +@@ -214,13 +69,13 @@ + .PP + PAM_USER_PROMPT + .RS 4 +-The string used when prompting for a user\'s name\&. The default value for this string is a localized version of "login: "\&. ++The string used when prompting for a user\*(Aqs name\&. The default value for this string is a localized version of "login: "\&. + .RE + .PP PAM_TTY .RS 4 The terminal name: prefixed by @@ -2779,25 +2961,29 @@ Index: pam.deb/doc/man/pam_sm_acct_mgmt.3 =================================================================== --- pam.deb.orig/doc/man/pam_sm_acct_mgmt.3 +++ pam.deb/doc/man/pam_sm_acct_mgmt.3 -@@ -1,161 +1,13 @@ +@@ -1,161 +1,22 @@ +'\" t .\" Title: pam_sm_acct_mgmt .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/> --.\" Date: 03/02/2009 +-.\" Date: 10/27/2010 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -+.\" Date: 08/25/2009 ++.\" Date: 06/04/2011 .\" Manual: Linux-PAM Manual .\" Source: Linux-PAM Manual .\" Language: English .\" --.TH "PAM_SM_ACCT_MGMT" "3" "03/02/2009" "Linux-PAM Manual" "Linux-PAM Manual" --.\" ----------------------------------------------------------------- +-.TH "PAM_SM_ACCT_MGMT" "3" "10/27/2010" "Linux-PAM Manual" "Linux-PAM Manual" ++.TH "PAM_SM_ACCT_MGMT" "3" "06/04/2011" "Linux-PAM Manual" "Linux-PAM Manual" + .\" ----------------------------------------------------------------- -.\" * (re)Define some macros --.\" ----------------------------------------------------------------- --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" * Define some portability stuff + .\" ----------------------------------------------------------------- + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" http://bugs.debian.org/507673 ++.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* @@ -2941,11 +3127,12 @@ Index: pam.deb/doc/man/pam_sm_acct_mgmt.3 -.fi -.\} -.. -+.TH "PAM_SM_ACCT_MGMT" "3" "08/25/2009" "Linux-PAM Manual" "Linux-PAM Manual" ++.ie \n(.g .ds Aq \(aq ++.el .ds Aq ' .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- -@@ -166,33 +18,23 @@ +@@ -166,44 +27,34 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- @@ -2981,29 +3168,55 @@ Index: pam.deb/doc/man/pam_sm_acct_mgmt.3 .SH "DESCRIPTION" .PP The + \fBpam_sm_acct_mgmt\fR +-function is the service module\'s implementation of the ++function is the service module\*(Aqs implementation of the + \fBpam_acct_mgmt\fR(3) + interface\&. + .PP + This function performs the task of establishing whether the user is permitted to gain access at this time\&. It should be understood that the user has previously been validated by an authentication module\&. This function checks for other things\&. Such things might be: the time of day or the date, the terminal line, remote hostname, etc\&. This function may also determine things like the expiration on passwords, and respond that the user change it before continuing\&. + .PP +-Valid flags, which may be logically OR\'d with ++Valid flags, which may be logically OR\*(Aqd with + \fIPAM_SILENT\fR, are: + .PP + PAM_SILENT +@@ -233,7 +84,7 @@ + .PP + PAM_NEW_AUTHTOK_REQD + .RS 4 +-The user\'s authentication token has expired\&. Before calling this function again the application will arrange for a new one to be given\&. This will likely result in a call to ++The user\*(Aqs authentication token has expired\&. Before calling this function again the application will arrange for a new one to be given\&. This will likely result in a call to + \fBpam_sm_chauthtok()\fR\&. + .RE + .PP Index: pam.deb/doc/man/pam_sm_open_session.3 =================================================================== --- pam.deb.orig/doc/man/pam_sm_open_session.3 +++ pam.deb/doc/man/pam_sm_open_session.3 -@@ -1,161 +1,13 @@ +@@ -1,161 +1,22 @@ +'\" t .\" Title: pam_sm_open_session .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/> --.\" Date: 03/02/2009 +-.\" Date: 10/27/2010 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -+.\" Date: 08/25/2009 ++.\" Date: 06/04/2011 .\" Manual: Linux-PAM Manual .\" Source: Linux-PAM Manual .\" Language: English .\" --.TH "PAM_SM_OPEN_SESSION" "3" "03/02/2009" "Linux-PAM Manual" "Linux-PAM Manual" --.\" ----------------------------------------------------------------- +-.TH "PAM_SM_OPEN_SESSION" "3" "10/27/2010" "Linux-PAM Manual" "Linux-PAM Manual" ++.TH "PAM_SM_OPEN_SESSION" "3" "06/04/2011" "Linux-PAM Manual" "Linux-PAM Manual" + .\" ----------------------------------------------------------------- -.\" * (re)Define some macros --.\" ----------------------------------------------------------------- --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" * Define some portability stuff + .\" ----------------------------------------------------------------- + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" http://bugs.debian.org/507673 ++.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* @@ -3147,11 +3360,12 @@ Index: pam.deb/doc/man/pam_sm_open_session.3 -.fi -.\} -.. -+.TH "PAM_SM_OPEN_SESSION" "3" "08/25/2009" "Linux-PAM Manual" "Linux-PAM Manual" ++.ie \n(.g .ds Aq \(aq ++.el .ds Aq ' .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- -@@ -166,33 +18,23 @@ +@@ -166,38 +27,28 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- @@ -3187,29 +3401,39 @@ Index: pam.deb/doc/man/pam_sm_open_session.3 .SH "DESCRIPTION" .PP The + \fBpam_sm_open_session\fR +-function is the service module\'s implementation of the ++function is the service module\*(Aqs implementation of the + \fBpam_open_session\fR(3) + interface\&. + .PP Index: pam.deb/modules/pam_tally2/pam_tally2.8 =================================================================== --- pam.deb.orig/modules/pam_tally2/pam_tally2.8 +++ pam.deb/modules/pam_tally2/pam_tally2.8 -@@ -1,161 +1,13 @@ +@@ -1,161 +1,22 @@ +'\" t .\" Title: pam_tally2 .\" Author: [see the "AUTHOR" section] -.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/> --.\" Date: 06/16/2009 +-.\" Date: 10/27/2010 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -+.\" Date: 08/25/2009 ++.\" Date: 06/04/2011 .\" Manual: Linux-PAM Manual .\" Source: Linux-PAM Manual .\" Language: English .\" --.TH "PAM_TALLY2" "8" "06/16/2009" "Linux-PAM Manual" "Linux\-PAM Manual" --.\" ----------------------------------------------------------------- +-.TH "PAM_TALLY2" "8" "10/27/2010" "Linux-PAM Manual" "Linux\-PAM Manual" ++.TH "PAM_TALLY2" "8" "06/04/2011" "Linux-PAM Manual" "Linux\-PAM Manual" + .\" ----------------------------------------------------------------- -.\" * (re)Define some macros --.\" ----------------------------------------------------------------- --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" * Define some portability stuff + .\" ----------------------------------------------------------------- + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" http://bugs.debian.org/507673 ++.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* @@ -3353,11 +3577,12 @@ Index: pam.deb/modules/pam_tally2/pam_tally2.8 -.fi -.\} -.. -+.TH "PAM_TALLY2" "8" "08/25/2009" "Linux-PAM Manual" "Linux\-PAM Manual" ++.ie \n(.g .ds Aq \(aq ++.el .ds Aq ' .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- -@@ -166,17 +18,13 @@ +@@ -166,17 +27,13 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- @@ -3377,7 +3602,23 @@ Index: pam.deb/modules/pam_tally2/pam_tally2.8 .SH "DESCRIPTION" .PP This module maintains a count of attempted accesses, can reset count on success, can deny access if too many attempts fail\&. -@@ -217,7 +65,7 @@ +@@ -186,13 +43,13 @@ + and + \fBpam_tally2\fR\&. The former is the PAM module and the latter, a stand\-alone program\&. + \fBpam_tally2\fR +-is an (optional) application which can be used to interrogate and manipulate the counter file\&. It can display users\' counts, set individual counts, or clear all counts\&. Setting artificially high counts may be useful for blocking users without changing their passwords\&. For example, one might find it useful to clear all counts every midnight from a cron job\&. ++is an (optional) application which can be used to interrogate and manipulate the counter file\&. It can display users\*(Aq counts, set individual counts, or clear all counts\&. Setting artificially high counts may be useful for blocking users without changing their passwords\&. For example, one might find it useful to clear all counts every midnight from a cron job\&. + .PP + Normally, failed attempts to access + \fIroot\fR + will + \fBnot\fR +-cause the root account to become blocked, to prevent denial\-of\-service: if your users aren\'t given shell accounts and root may only login via ++cause the root account to become blocked, to prevent denial\-of\-service: if your users aren\*(Aqt given shell accounts and root may only login via + \fBsu\fR + or at the machine console (not telnet/rsh, etc), this is safe\&. + .SH "OPTIONS" +@@ -217,7 +74,7 @@ \fBfile=\fR\fB\fI/path/to/counter\fR\fR .RS 4 File where to keep counts\&. Default is @@ -3386,7 +3627,22 @@ Index: pam.deb/modules/pam_tally2/pam_tally2.8 .RE .PP \fBaudit\fR -@@ -272,7 +120,7 @@ +@@ -227,12 +84,12 @@ + .PP + \fBsilent\fR + .RS 4 +-Don\'t print informative messages\&. ++Don\*(Aqt print informative messages\&. + .RE + .PP + \fBno_log_info\fR + .RS 4 +-Don\'t log informative messages via ++Don\*(Aqt log informative messages via + \fBsyslog\fR(3)\&. + .RE + .RE +@@ -272,7 +129,7 @@ \fBno_lock_time\fR .RS 4 Do not use the \&.fail_locktime field in @@ -3395,7 +3651,16 @@ Index: pam.deb/modules/pam_tally2/pam_tally2.8 for this user\&. .RE .PP -@@ -344,7 +192,7 @@ +@@ -300,7 +157,7 @@ + .RS 4 + Account phase resets attempts counter if the user is + \fBnot\fR +-magic root\&. This phase can be used optionally for services which don\'t call ++magic root\&. This phase can be used optionally for services which don\*(Aqt call + \fBpam_setcred\fR(3) + correctly or if the reset should be done regardless of the failure of the account phase of other modules\&. + .PP +@@ -344,7 +201,7 @@ .SH "EXAMPLES" .PP Add the following line to @@ -3404,7 +3669,7 @@ Index: pam.deb/modules/pam_tally2/pam_tally2.8 to lock the account after 4 failed logins\&. Root account will be locked as well\&. The accounts will be automatically unlocked after 20 minutes\&. The module does not have to be called in the account phase because the \fBlogin\fR calls -@@ -354,15 +202,7 @@ +@@ -354,15 +211,7 @@ .if n \{\ .RS 4 .\} @@ -3420,7 +3685,7 @@ Index: pam.deb/modules/pam_tally2/pam_tally2.8 auth required pam_securetty\&.so auth required pam_tally2\&.so deny=4 even_deny_root unlock_time=1200 auth required pam_env\&.so -@@ -375,19 +215,13 @@ +@@ -375,19 +224,13 @@ session required pam_lastlog\&.so nowtmp session optional pam_mail\&.so standard @@ -3445,25 +3710,29 @@ Index: pam.deb/modules/pam_unix/unix_chkpwd.8 =================================================================== --- pam.deb.orig/modules/pam_unix/unix_chkpwd.8 +++ pam.deb/modules/pam_unix/unix_chkpwd.8 -@@ -1,161 +1,13 @@ +@@ -1,161 +1,22 @@ +'\" t .\" Title: unix_chkpwd .\" Author: [see the "AUTHOR" section] -.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/> --.\" Date: 03/02/2009 +-.\" Date: 10/27/2010 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -+.\" Date: 08/25/2009 ++.\" Date: 06/04/2011 .\" Manual: Linux-PAM Manual .\" Source: Linux-PAM Manual .\" Language: English .\" --.TH "UNIX_CHKPWD" "8" "03/02/2009" "Linux-PAM Manual" "Linux\-PAM Manual" --.\" ----------------------------------------------------------------- +-.TH "UNIX_CHKPWD" "8" "10/27/2010" "Linux-PAM Manual" "Linux\-PAM Manual" ++.TH "UNIX_CHKPWD" "8" "06/04/2011" "Linux-PAM Manual" "Linux\-PAM Manual" + .\" ----------------------------------------------------------------- -.\" * (re)Define some macros --.\" ----------------------------------------------------------------- --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" * Define some portability stuff + .\" ----------------------------------------------------------------- + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" http://bugs.debian.org/507673 ++.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* @@ -3607,11 +3876,12 @@ Index: pam.deb/modules/pam_unix/unix_chkpwd.8 -.fi -.\} -.. -+.TH "UNIX_CHKPWD" "8" "08/25/2009" "Linux-PAM Manual" "Linux\-PAM Manual" ++.ie \n(.g .ds Aq \(aq ++.el .ds Aq ' .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- -@@ -166,13 +18,11 @@ +@@ -166,13 +27,11 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- @@ -3631,25 +3901,29 @@ Index: pam.deb/doc/man/pam_sm_chauthtok.3 =================================================================== --- pam.deb.orig/doc/man/pam_sm_chauthtok.3 +++ pam.deb/doc/man/pam_sm_chauthtok.3 -@@ -1,161 +1,13 @@ +@@ -1,161 +1,22 @@ +'\" t .\" Title: pam_sm_chauthtok .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/> --.\" Date: 03/02/2009 +-.\" Date: 10/27/2010 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -+.\" Date: 08/25/2009 ++.\" Date: 06/04/2011 .\" Manual: Linux-PAM Manual .\" Source: Linux-PAM Manual .\" Language: English .\" --.TH "PAM_SM_CHAUTHTOK" "3" "03/02/2009" "Linux-PAM Manual" "Linux-PAM Manual" --.\" ----------------------------------------------------------------- +-.TH "PAM_SM_CHAUTHTOK" "3" "10/27/2010" "Linux-PAM Manual" "Linux-PAM Manual" ++.TH "PAM_SM_CHAUTHTOK" "3" "06/04/2011" "Linux-PAM Manual" "Linux-PAM Manual" + .\" ----------------------------------------------------------------- -.\" * (re)Define some macros --.\" ----------------------------------------------------------------- --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" * Define some portability stuff + .\" ----------------------------------------------------------------- + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" http://bugs.debian.org/507673 ++.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* @@ -3793,11 +4067,12 @@ Index: pam.deb/doc/man/pam_sm_chauthtok.3 -.fi -.\} -.. -+.TH "PAM_SM_CHAUTHTOK" "3" "08/25/2009" "Linux-PAM Manual" "Linux-PAM Manual" ++.ie \n(.g .ds Aq \(aq ++.el .ds Aq ' .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- -@@ -166,33 +18,23 @@ +@@ -166,44 +27,34 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- @@ -3833,29 +4108,64 @@ Index: pam.deb/doc/man/pam_sm_chauthtok.3 .SH "DESCRIPTION" .PP The + \fBpam_sm_chauthtok\fR +-function is the service module\'s implementation of the ++function is the service module\*(Aqs implementation of the + \fBpam_chauthtok\fR(3) + interface\&. + .PP + This function is used to (re\-)set the authentication token of the user\&. + .PP +-Valid flags, which may be logically OR\'d with ++Valid flags, which may be logically OR\*(Aqd with + \fIPAM_SILENT\fR, are: + .PP + PAM_SILENT +@@ -221,7 +72,7 @@ + .PP + PAM_PRELIM_CHECK + .RS 4 +-This indicates that the modules are being probed as to their ready status for altering the user\'s authentication token\&. If the module requires access to another system over some network it should attempt to verify it can connect to this system on receiving this flag\&. If a module cannot establish it is ready to update the user\'s authentication token it should return ++This indicates that the modules are being probed as to their ready status for altering the user\*(Aqs authentication token\&. If the module requires access to another system over some network it should attempt to verify it can connect to this system on receiving this flag\&. If a module cannot establish it is ready to update the user\*(Aqs authentication token it should return + \fBPAM_TRY_AGAIN\fR, this information will be passed back to the application\&. + .sp + If the control value +@@ -233,7 +84,7 @@ + .PP + PAM_UPDATE_AUTHTOK + .RS 4 +-This informs the module that this is the call it should change the authorization tokens\&. If the flag is logically OR\'d with ++This informs the module that this is the call it should change the authorization tokens\&. If the flag is logically OR\*(Aqd with + \fBPAM_CHANGE_EXPIRED_AUTHTOK\fR, the token is only changed if it has actually expired\&. + .RE + .PP Index: pam.deb/modules/pam_timestamp/pam_timestamp_check.8 =================================================================== --- pam.deb.orig/modules/pam_timestamp/pam_timestamp_check.8 +++ pam.deb/modules/pam_timestamp/pam_timestamp_check.8 -@@ -1,161 +1,13 @@ +@@ -1,161 +1,22 @@ +'\" t .\" Title: pam_timestamp_check .\" Author: [see the "AUTHOR" section] -.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/> --.\" Date: 06/16/2009 +-.\" Date: 10/27/2010 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -+.\" Date: 08/25/2009 ++.\" Date: 06/04/2011 .\" Manual: Linux-PAM Manual .\" Source: Linux-PAM Manual .\" Language: English .\" --.TH "PAM_TIMESTAMP_CHECK" "8" "06/16/2009" "Linux-PAM Manual" "Linux\-PAM Manual" --.\" ----------------------------------------------------------------- +-.TH "PAM_TIMESTAMP_CHECK" "8" "10/27/2010" "Linux-PAM Manual" "Linux\-PAM Manual" ++.TH "PAM_TIMESTAMP_CHECK" "8" "06/04/2011" "Linux-PAM Manual" "Linux\-PAM Manual" + .\" ----------------------------------------------------------------- -.\" * (re)Define some macros --.\" ----------------------------------------------------------------- --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" * Define some portability stuff + .\" ----------------------------------------------------------------- + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" http://bugs.debian.org/507673 ++.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* @@ -3999,11 +4309,12 @@ Index: pam.deb/modules/pam_timestamp/pam_timestamp_check.8 -.fi -.\} -.. -+.TH "PAM_TIMESTAMP_CHECK" "8" "08/25/2009" "Linux-PAM Manual" "Linux\-PAM Manual" ++.ie \n(.g .ds Aq \(aq ++.el .ds Aq ' .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- -@@ -166,13 +18,11 @@ +@@ -166,13 +27,11 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- @@ -4019,7 +4330,16 @@ Index: pam.deb/modules/pam_timestamp/pam_timestamp_check.8 .SH "DESCRIPTION" .PP With no arguments -@@ -246,34 +96,20 @@ +@@ -182,7 +41,7 @@ + .PP + \fB\-k\fR + .RS 4 +-Instead of checking the validity of a timestamp, remove it\&. This is analogous to sudo\'s ++Instead of checking the validity of a timestamp, remove it\&. This is analogous to sudo\*(Aqs + \fI\-k\fR + option\&. + .RE +@@ -246,34 +105,20 @@ .if n \{\ .RS 4 .\} @@ -4059,25 +4379,29 @@ Index: pam.deb/doc/man/pam_open_session.3 =================================================================== --- pam.deb.orig/doc/man/pam_open_session.3 +++ pam.deb/doc/man/pam_open_session.3 -@@ -1,161 +1,13 @@ +@@ -1,161 +1,22 @@ +'\" t .\" Title: pam_open_session .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/> --.\" Date: 03/02/2009 +-.\" Date: 10/27/2010 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -+.\" Date: 08/25/2009 ++.\" Date: 06/04/2011 .\" Manual: Linux-PAM Manual .\" Source: Linux-PAM Manual .\" Language: English .\" --.TH "PAM_OPEN_SESSION" "3" "03/02/2009" "Linux-PAM Manual" "Linux-PAM Manual" --.\" ----------------------------------------------------------------- +-.TH "PAM_OPEN_SESSION" "3" "10/27/2010" "Linux-PAM Manual" "Linux-PAM Manual" ++.TH "PAM_OPEN_SESSION" "3" "06/04/2011" "Linux-PAM Manual" "Linux-PAM Manual" + .\" ----------------------------------------------------------------- -.\" * (re)Define some macros --.\" ----------------------------------------------------------------- --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" * Define some portability stuff + .\" ----------------------------------------------------------------- + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" http://bugs.debian.org/507673 ++.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* @@ -4221,11 +4545,12 @@ Index: pam.deb/doc/man/pam_open_session.3 -.fi -.\} -.. -+.TH "PAM_OPEN_SESSION" "3" "08/25/2009" "Linux-PAM Manual" "Linux-PAM Manual" ++.ie \n(.g .ds Aq \(aq ++.el .ds Aq ' .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- -@@ -166,23 +18,17 @@ +@@ -166,23 +27,17 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- @@ -4251,29 +4576,42 @@ Index: pam.deb/doc/man/pam_open_session.3 .SH "DESCRIPTION" .PP The +@@ -191,7 +46,7 @@ + \fBpam_close_session\fR(3)\&. + .PP + It should be noted that the effective uid, +-\fBgeteuid\fR(2)\&. of the application should be of sufficient privilege to perform such tasks as creating or mounting the user\'s home directory for example\&. ++\fBgeteuid\fR(2)\&. of the application should be of sufficient privilege to perform such tasks as creating or mounting the user\*(Aqs home directory for example\&. + .PP + The flags argument is the binary or of zero or more of the following values: + .PP Index: pam.deb/doc/man/pam_set_item.3 =================================================================== --- pam.deb.orig/doc/man/pam_set_item.3 +++ pam.deb/doc/man/pam_set_item.3 -@@ -1,161 +1,13 @@ +@@ -1,161 +1,22 @@ +'\" t .\" Title: pam_set_item .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/> --.\" Date: 03/02/2009 +-.\" Date: 10/27/2010 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -+.\" Date: 08/25/2009 ++.\" Date: 06/04/2011 .\" Manual: Linux-PAM Manual .\" Source: Linux-PAM Manual .\" Language: English .\" --.TH "PAM_SET_ITEM" "3" "03/02/2009" "Linux-PAM Manual" "Linux-PAM Manual" --.\" ----------------------------------------------------------------- +-.TH "PAM_SET_ITEM" "3" "10/27/2010" "Linux-PAM Manual" "Linux-PAM Manual" ++.TH "PAM_SET_ITEM" "3" "06/04/2011" "Linux-PAM Manual" "Linux-PAM Manual" + .\" ----------------------------------------------------------------- -.\" * (re)Define some macros --.\" ----------------------------------------------------------------- --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" * Define some portability stuff + .\" ----------------------------------------------------------------- + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" http://bugs.debian.org/507673 ++.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* @@ -4417,11 +4755,12 @@ Index: pam.deb/doc/man/pam_set_item.3 -.fi -.\} -.. -+.TH "PAM_SET_ITEM" "3" "08/25/2009" "Linux-PAM Manual" "Linux-PAM Manual" ++.ie \n(.g .ds Aq \(aq ++.el .ds Aq ' .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- -@@ -166,23 +18,17 @@ +@@ -166,23 +27,17 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- @@ -4447,7 +4786,14 @@ Index: pam.deb/doc/man/pam_set_item.3 .SH "DESCRIPTION" .PP The -@@ -215,7 +61,7 @@ +@@ -209,13 +64,13 @@ + .PP + PAM_USER_PROMPT + .RS 4 +-The string used when prompting for a user\'s name\&. The default value for this string is a localized version of "login: "\&. ++The string used when prompting for a user\*(Aqs name\&. The default value for this string is a localized version of "login: "\&. + .RE + .PP PAM_TTY .RS 4 The terminal name: prefixed by @@ -4460,25 +4806,29 @@ Index: pam.deb/modules/pam_mkhomedir/mkhomedir_helper.8 =================================================================== --- pam.deb.orig/modules/pam_mkhomedir/mkhomedir_helper.8 +++ pam.deb/modules/pam_mkhomedir/mkhomedir_helper.8 -@@ -1,161 +1,13 @@ +@@ -1,161 +1,22 @@ +'\" t .\" Title: mkhomedir_helper .\" Author: [see the "AUTHOR" section] -.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/> --.\" Date: 03/02/2009 +-.\" Date: 10/27/2010 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -+.\" Date: 08/25/2009 ++.\" Date: 06/04/2011 .\" Manual: Linux-PAM Manual .\" Source: Linux-PAM Manual .\" Language: English .\" --.TH "MKHOMEDIR_HELPER" "8" "03/02/2009" "Linux-PAM Manual" "Linux\-PAM Manual" --.\" ----------------------------------------------------------------- +-.TH "MKHOMEDIR_HELPER" "8" "10/27/2010" "Linux-PAM Manual" "Linux\-PAM Manual" ++.TH "MKHOMEDIR_HELPER" "8" "06/04/2011" "Linux-PAM Manual" "Linux\-PAM Manual" + .\" ----------------------------------------------------------------- -.\" * (re)Define some macros --.\" ----------------------------------------------------------------- --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" * Define some portability stuff + .\" ----------------------------------------------------------------- + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" http://bugs.debian.org/507673 ++.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* @@ -4622,11 +4972,12 @@ Index: pam.deb/modules/pam_mkhomedir/mkhomedir_helper.8 -.fi -.\} -.. -+.TH "MKHOMEDIR_HELPER" "8" "08/25/2009" "Linux-PAM Manual" "Linux\-PAM Manual" ++.ie \n(.g .ds Aq \(aq ++.el .ds Aq ' .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- -@@ -166,13 +18,11 @@ +@@ -166,13 +27,11 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- @@ -4646,25 +4997,29 @@ Index: pam.deb/doc/man/pam.3 =================================================================== --- pam.deb.orig/doc/man/pam.3 +++ pam.deb/doc/man/pam.3 -@@ -1,161 +1,13 @@ +@@ -1,161 +1,22 @@ +'\" t .\" Title: pam .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/> --.\" Date: 03/02/2009 +-.\" Date: 10/27/2010 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -+.\" Date: 08/25/2009 ++.\" Date: 06/04/2011 .\" Manual: Linux-PAM Manual .\" Source: Linux-PAM Manual .\" Language: English .\" --.TH "PAM" "3" "03/02/2009" "Linux-PAM Manual" "Linux-PAM Manual" --.\" ----------------------------------------------------------------- +-.TH "PAM" "3" "10/27/2010" "Linux-PAM Manual" "Linux-PAM Manual" ++.TH "PAM" "3" "06/04/2011" "Linux-PAM Manual" "Linux-PAM Manual" + .\" ----------------------------------------------------------------- -.\" * (re)Define some macros --.\" ----------------------------------------------------------------- --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" * Define some portability stuff + .\" ----------------------------------------------------------------- + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" http://bugs.debian.org/507673 ++.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* @@ -4808,11 +5163,12 @@ Index: pam.deb/doc/man/pam.3 -.fi -.\} -.. -+.TH "PAM" "3" "08/25/2009" "Linux-PAM Manual" "Linux-PAM Manual" ++.ie \n(.g .ds Aq \(aq ++.el .ds Aq ' .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- -@@ -166,38 +18,26 @@ +@@ -166,38 +27,26 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- @@ -4857,25 +5213,29 @@ Index: pam.deb/doc/man/pam_start.3 =================================================================== --- pam.deb.orig/doc/man/pam_start.3 +++ pam.deb/doc/man/pam_start.3 -@@ -1,161 +1,13 @@ +@@ -1,161 +1,22 @@ +'\" t .\" Title: pam_start .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/> --.\" Date: 03/02/2009 +-.\" Date: 10/27/2010 +.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -+.\" Date: 08/25/2009 ++.\" Date: 06/04/2011 .\" Manual: Linux-PAM Manual .\" Source: Linux-PAM Manual .\" Language: English .\" --.TH "PAM_START" "3" "03/02/2009" "Linux-PAM Manual" "Linux-PAM Manual" --.\" ----------------------------------------------------------------- +-.TH "PAM_START" "3" "10/27/2010" "Linux-PAM Manual" "Linux-PAM Manual" ++.TH "PAM_START" "3" "06/04/2011" "Linux-PAM Manual" "Linux-PAM Manual" + .\" ----------------------------------------------------------------- -.\" * (re)Define some macros --.\" ----------------------------------------------------------------- --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" * Define some portability stuff + .\" ----------------------------------------------------------------- + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" toupper - uppercase a string (locale-aware) --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++.\" http://bugs.debian.org/507673 ++.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.de toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -\\$* @@ -5019,11 +5379,12 @@ Index: pam.deb/doc/man/pam_start.3 -.fi -.\} -.. -+.TH "PAM_START" "3" "08/25/2009" "Linux-PAM Manual" "Linux-PAM Manual" ++.ie \n(.g .ds Aq \(aq ++.el .ds Aq ' .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- -@@ -166,23 +18,17 @@ +@@ -166,23 +27,17 @@ .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- @@ -5049,7 +5410,7 @@ Index: pam.deb/doc/man/pam_start.3 .SH "DESCRIPTION" .PP The -@@ -192,9 +38,9 @@ +@@ -192,9 +47,9 @@ The \fIservice_name\fR argument specifies the name of the service to apply and will be stored as PAM_SERVICE item in the new context\&. The policy for the service will be read from the file @@ -5061,3 +5422,934 @@ Index: pam.deb/doc/man/pam_start.3 .PP The \fIuser\fR +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,22 @@ ++'\" t + .\" Title: pam_get_authtok + .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] +-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/> +-.\" Date: 10/27/2010 ++.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> ++.\" Date: 06/04/2011 + .\" Manual: Linux-PAM Manual + .\" Source: Linux-PAM Manual + .\" Language: English + .\" +-.TH "PAM_GET_AUTHTOK" "3" "10/27/2010" "Linux-PAM Manual" "Linux-PAM Manual" ++.TH "PAM_GET_AUTHTOK" "3" "06/04/2011" "Linux-PAM Manual" "Linux-PAM Manual" + .\" ----------------------------------------------------------------- +-.\" * (re)Define some macros ++.\" * Define some portability stuff + .\" ----------------------------------------------------------------- + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +-.\" toupper - uppercase a string (locale-aware) ++.\" http://bugs.debian.org/507673 ++.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +-.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 +-.\} +-.. ++.ie \n(.g .ds Aq \(aq ++.el .ds Aq ' + .\" ----------------------------------------------------------------- + .\" * set default formatting + .\" ----------------------------------------------------------------- +@@ -166,31 +27,21 @@ + .\" ----------------------------------------------------------------- + .\" * MAIN CONTENT STARTS HERE * + .\" ----------------------------------------------------------------- +-.SH "Name" ++.SH "NAME" + pam_get_authtok, pam_get_authtok_verify, pam_get_authtok_noverify \- get authentication token +-.SH "Synopsis" ++.SH "SYNOPSIS" + .sp + .ft B +-.fam C +-.ps -1 + .nf + #include <security/pam_ext\&.h> + .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 +-.fam C + .HP \w'int\ pam_get_authtok_noverify('u + .BI "int pam_get_authtok_noverify(pam_handle_t\ *" "pamh" ", const\ char\ **" "authtok" ", const\ char\ *" "prompt" ");" +-.fam +-.fam C + .HP \w'int\ pam_get_authtok_verify('u + .BI "int pam_get_authtok_verify(pam_handle_t\ *" "pamh" ", const\ char\ **" "authtok" ", const\ char\ *" "prompt" ");" +-.fam + .SH "DESCRIPTION" + .PP + The +@@ -202,7 +53,7 @@ + data and should + \fBnot\fR + be +-\fIfree()\fR\'ed or over\-written! ++\fIfree()\fR\*(Aqed or over\-written! + .PP + The + \fIprompt\fR +@@ -238,7 +89,7 @@ + data and should + \fBnot\fR + be +-\fIfree()\fR\'ed or over\-written! ++\fIfree()\fR\*(Aqed or over\-written! + .PP + The + \fBpam_get_authtok_verify\fR +@@ -252,7 +103,7 @@ + data and should + \fBnot\fR + be +-\fIfree()\fR\'ed or over\-written! ++\fIfree()\fR\*(Aqed or over\-written! + .SH "OPTIONS" + .PP + +@@ -261,7 +112,7 @@ + .PP + \fBtry_first_pass\fR + .RS 4 +-Before prompting the user for their password, the module first tries the previous stacked module\'s password in case that satisfies this module as well\&. ++Before prompting the user for their password, the module first tries the previous stacked module\*(Aqs password in case that satisfies this module as well\&. + .RE + .PP + \fBuse_first_pass\fR +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,22 @@ ++'\" t + .\" Title: pam_setcred + .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] +-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/> +-.\" Date: 10/27/2010 ++.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> ++.\" Date: 06/04/2011 + .\" Manual: Linux-PAM Manual + .\" Source: Linux-PAM Manual + .\" Language: English + .\" +-.TH "PAM_SETCRED" "3" "10/27/2010" "Linux-PAM Manual" "Linux-PAM Manual" ++.TH "PAM_SETCRED" "3" "06/04/2011" "Linux-PAM Manual" "Linux-PAM Manual" + .\" ----------------------------------------------------------------- +-.\" * (re)Define some macros ++.\" * Define some portability stuff + .\" ----------------------------------------------------------------- + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +-.\" toupper - uppercase a string (locale-aware) ++.\" http://bugs.debian.org/507673 ++.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +-.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 +-.\} +-.. ++.ie \n(.g .ds Aq \(aq ++.el .ds Aq ' + .\" ----------------------------------------------------------------- + .\" * set default formatting + .\" ----------------------------------------------------------------- +@@ -166,23 +27,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 <security/pam_appl\&.h> + .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 +@@ -193,15 +48,15 @@ + .PP + A credential is something that the user possesses\&. It is some property, such as a + \fIKerberos\fR +-ticket, or a supplementary group membership that make up the uniqueness of a given user\&. On a Linux system the user\'s ++ticket, or a supplementary group membership that make up the uniqueness of a given user\&. On a Linux system the user\*(Aqs + \fIUID\fR + and +-\fIGID\fR\'s are credentials too\&. However, it has been decided that these properties (along with the default supplementary groups of which the user is a member) are credentials that should be set directly by the application and not by PAM\&. Such credentials should be established, by the application, prior to a call to this function\&. For example, ++\fIGID\fR\*(Aqs are credentials too\&. However, it has been decided that these properties (along with the default supplementary groups of which the user is a member) are credentials that should be set directly by the application and not by PAM\&. Such credentials should be established, by the application, prior to a call to this function\&. For example, + \fBinitgroups\fR(2) + (or equivalent) should have been performed\&. + .PP + Valid +-\fIflags\fR, any one of which, may be logically OR\'d with ++\fIflags\fR, any one of which, may be logically OR\*(Aqd with + \fBPAM_SILENT\fR, are: + .PP + PAM_ESTABLISH_CRED +@@ -211,12 +66,12 @@ + .PP + PAM_DELETE_CRED + .RS 4 +-Delete the user\'s credentials\&. ++Delete the user\*(Aqs credentials\&. + .RE + .PP + PAM_REINITIALIZE_CRED + .RS 4 +-Fully reinitialize the user\'s credentials\&. ++Fully reinitialize the user\*(Aqs credentials\&. + .RE + .PP + PAM_REFRESH_CRED +Index: pam.deb/modules/pam_sepermit/sepermit.conf.5 +=================================================================== +--- pam.deb.orig/modules/pam_sepermit/sepermit.conf.5 ++++ pam.deb/modules/pam_sepermit/sepermit.conf.5 +@@ -1,161 +1,22 @@ ++'\" t + .\" Title: sepermit.conf + .\" Author: [see the "AUTHOR" section] +-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/> +-.\" Date: 07/08/2010 ++.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> ++.\" Date: 06/04/2011 + .\" Manual: Linux-PAM Manual + .\" Source: Linux-PAM Manual + .\" Language: English + .\" +-.TH "SEPERMIT\&.CONF" "5" "07/08/2010" "Linux-PAM Manual" "Linux\-PAM Manual" ++.TH "SEPERMIT\&.CONF" "5" "06/04/2011" "Linux-PAM Manual" "Linux\-PAM Manual" + .\" ----------------------------------------------------------------- +-.\" * (re)Define some macros ++.\" * Define some portability stuff + .\" ----------------------------------------------------------------- + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +-.\" toupper - uppercase a string (locale-aware) ++.\" http://bugs.debian.org/507673 ++.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +-.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 +-.\} +-.. ++.ie \n(.g .ds Aq \(aq ++.el .ds Aq ' + .\" ----------------------------------------------------------------- + .\" * set default formatting + .\" ----------------------------------------------------------------- +@@ -166,7 +27,7 @@ + .\" ----------------------------------------------------------------- + .\" * MAIN CONTENT STARTS HERE * + .\" ----------------------------------------------------------------- +-.SH "Name" ++.SH "NAME" + sepermit.conf \- configuration file for the pam_sepermit module + .SH "DESCRIPTION" + .PP +@@ -220,7 +81,7 @@ + .PP + \fBexclusive\fR + .RS 4 +-Only single login session will be allowed for the user and the user\'s processes will be killed on logout\&. ++Only single login session will be allowed for the user and the user\*(Aqs processes will be killed on logout\&. + .RE + .PP + \fBignore\fR +@@ -232,31 +93,17 @@ + .SH "EXAMPLES" + .PP + These are some example lines which might be specified in +-\FC/etc/security/sepermit\&.conf\F[]\&. ++/etc/security/sepermit\&.conf\&. + .sp + .if n \{\ + .RS 4 + .\} +-.fam C +-.ps -1 + .nf +-.if t \{\ +-.sp -1 +-.\} +-.BB lightgray adjust-for-leading-newline +-.sp -1 +- + %guest_u:exclusive + %staff_u:ignore + %user_u:ignore + +-.EB lightgray adjust-for-leading-newline +-.if t \{\ +-.sp 1 +-.\} + .fi +-.fam +-.ps +1 + .if n \{\ + .RE + .\} +Index: pam.deb/modules/pam_tty_audit/pam_tty_audit.8 +=================================================================== +--- pam.deb.orig/modules/pam_tty_audit/pam_tty_audit.8 ++++ pam.deb/modules/pam_tty_audit/pam_tty_audit.8 +@@ -1,161 +1,22 @@ ++'\" t + .\" Title: pam_tty_audit + .\" Author: [see the "AUTHOR" section] +-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/> +-.\" Date: 10/27/2010 ++.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> ++.\" Date: 06/04/2011 + .\" Manual: Linux-PAM Manual + .\" Source: Linux-PAM Manual + .\" Language: English + .\" +-.TH "PAM_TTY_AUDIT" "8" "10/27/2010" "Linux-PAM Manual" "Linux\-PAM Manual" ++.TH "PAM_TTY_AUDIT" "8" "06/04/2011" "Linux-PAM Manual" "Linux\-PAM Manual" + .\" ----------------------------------------------------------------- +-.\" * (re)Define some macros ++.\" * Define some portability stuff + .\" ----------------------------------------------------------------- + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +-.\" toupper - uppercase a string (locale-aware) ++.\" http://bugs.debian.org/507673 ++.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html + .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +-.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 +-.\} +-.. ++.ie \n(.g .ds Aq \(aq ++.el .ds Aq ' + .\" ----------------------------------------------------------------- + .\" * set default formatting + .\" ----------------------------------------------------------------- +@@ -166,13 +27,11 @@ + .\" ----------------------------------------------------------------- + .\" * MAIN CONTENT STARTS HERE * + .\" ----------------------------------------------------------------- +-.SH "Name" ++.SH "NAME" + pam_tty_audit \- Enable or disable TTY auditing for specified users +-.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] +-.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\&. +@@ -196,7 +55,7 @@ + .PP + \fBopen_only\fR + .RS 4 +-Set the TTY audit flag when opening the session, but do not restore it when closing the session\&. Using this option is necessary for some services that don\'t ++Set the TTY audit flag when opening the session, but do not restore it when closing the session\&. Using this option is necessary for some services that don\*(Aqt + \fBfork()\fR + to run the authenticated session, such as + \fBsudo\fR\&. +@@ -232,24 +91,10 @@ + .if n \{\ + .RS 4 + .\} +-.fam C +-.ps -1 + .nf +-.if t \{\ +-.sp -1 +-.\} +-.BB lightgray adjust-for-leading-newline +-.sp -1 +- + session required pam_tty_audit\&.so disable=* enable=root + +-.EB lightgray adjust-for-leading-newline +-.if t \{\ +-.sp 1 +-.\} + .fi +-.fam +-.ps +1 + .if n \{\ + .RE + .\} diff --git a/debian/patches-applied/hurd_no_setfsuid b/debian/patches-applied/hurd_no_setfsuid index 24ce40a0..b5e37c0a 100644 --- a/debian/patches-applied/hurd_no_setfsuid +++ b/debian/patches-applied/hurd_no_setfsuid @@ -2,115 +2,74 @@ On systems without setfsuid(), use setreuid() instead. Authors: Steve Langasek <vorlon@debian.org> -Upstream status: superseded by pam_modutil_set_euid proposal +Upstream status: to be forwarded, now that pam_modutil_{drop,regain}_priv + are implemented -Index: pam.deb/modules/pam_xauth/pam_xauth.c +Index: pam.deb/libpam/pam_modutil_priv.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" - #include <sys/types.h> +--- pam.deb.orig/libpam/pam_modutil_priv.c ++++ pam.deb/libpam/pam_modutil_priv.c +@@ -14,7 +14,9 @@ + #include <syslog.h> + #include <pwd.h> + #include <grp.h> +#ifdef HAVE_SYS_FSUID_H #include <sys/fsuid.h> +#endif /* HAVE_SYS_FSUID_H */ - #include <sys/wait.h> - #include <errno.h> - #include <fnmatch.h> -@@ -218,6 +220,9 @@ - FILE *fp; - int i; - uid_t euid; -+#ifndef HAVE_SYS_FSUID_H -+ uid_t uid; -+#endif - /* Check this user's <sense> file. */ - pwd = pam_modutil_getpwnam(pamh, this_user); - if (pwd == NULL) { -@@ -234,9 +239,34 @@ - return PAM_SESSION_ERR; - } - euid = geteuid(); + + /* + * Two setfsuid() calls in a row are necessary to check +@@ -22,17 +24,53 @@ + */ + static int change_uid(uid_t uid, uid_t *save) + { +#ifdef HAVE_SYS_FSUID_H - setfsuid(pwd->pw_uid); + uid_t tmp = setfsuid(uid); + if (save) + *save = tmp; + return (uid_t) setfsuid(uid) == uid ? 0 : -1; +#else -+ uid = getuid(); -+ if (uid == pwd->pw_uid) ++ uid_t euid = geteuid(); ++ uid_t ruid = getuid(); ++ if (save) ++ *save = ruid; ++ if (ruid == uid && uid != 0) + setreuid(euid, uid); + else { + setreuid(0, -1); + if (setreuid(-1, uid) == -1) { + setreuid(-1, 0); + setreuid(0, -1); -+ if (setreuid(-1, pwd->pw_uid)) -+ return PAM_CRED_INSUFFICIENT; ++ if (setreuid(-1, uid)) ++ return -1; + } + } +#endif - fp = fopen(path, "r"); + } + static int change_gid(gid_t gid, gid_t *save) + { +#ifdef HAVE_SYS_FSUID_H - setfsuid(euid); + gid_t tmp = setfsgid(gid); + if (save) + *save = tmp; + return (gid_t) setfsgid(gid) == gid ? 0 : -1; +#else -+ if (uid == pwd->pw_uid) -+ setreuid(uid, euid); ++ gid_t egid = getegid(); ++ gid_t rgid = getgid(); ++ if (save) ++ *save = rgid; ++ if (rgid == gid) ++ setregid(egid, gid); + else { -+ if (setreuid(-1, 0) != -1) -+ setreuid(uid, -1); -+ setreuid(-1, euid); -+ } -+#endif - if (fp != NULL) { - char buf[LINE_MAX], *tmp; - /* Scan the file for a list of specs of users to "trust". */ -@@ -306,6 +336,9 @@ - int fd, i, debug = 0; - int retval = PAM_SUCCESS; - uid_t systemuser = 499, targetuser = 0, euid; -+#ifndef HAVE_SYS_FSUID_H -+ uid_t uid; -+#endif - - /* Parse arguments. We don't understand many, so no sense in breaking - * this into a separate function. */ -@@ -554,7 +587,22 @@ - - /* Generate a new file to hold the data. */ - euid = geteuid(); -+#ifdef HAVE_SYS_FSUID_H - setfsuid(tpwd->pw_uid); -+#else -+ uid = getuid(); -+ if (uid == tpwd->pw_uid) -+ setreuid(euid, uid); -+ else { -+ setreuid(0, -1); -+ if (setreuid(-1, uid) == -1) { -+ setreuid(-1, 0); -+ setreuid(0, -1); -+ if (setreuid(-1, tpwd->pw_uid)) -+ return PAM_CRED_INSUFFICIENT; -+ } ++ setregid(0, -1); ++ if (setregid(-1, gid) == -1) { ++ setregid(-1, 0); ++ setregid(0, -1); ++ if (setregid(-1, gid)) ++ return -1; + } ++ } +#endif - - #ifdef WITH_SELINUX - if (is_selinux_enabled() > 0) { -@@ -584,7 +632,17 @@ - save_errno = errno; - #endif + } -+#ifdef HAVE_SYS_FSUID_H - setfsuid(euid); -+#else -+ if (uid == tpwd->pw_uid) -+ setreuid(uid, euid); -+ else { -+ if (setreuid(-1, 0) == -1) -+ setreuid(uid, -1); -+ setreuid(-1, euid); -+ } -+#endif - if (fd == -1) { - errno = save_errno; - pam_syslog(pamh, LOG_ERR, + static int cleanup(struct pam_modutil_privs *p) diff --git a/debian/patches-applied/mkhomedir_linking.patch b/debian/patches-applied/mkhomedir_linking.patch deleted file mode 100644 index f629b2df..00000000 --- a/debian/patches-applied/mkhomedir_linking.patch +++ /dev/null @@ -1,28 +0,0 @@ -Description: don't pass --version-script options when linking executables, - only when linking libraries -Author: Julien Cristau <jcristau@debian.org> -Bug-Debian: http://bugs.debian.org/582362 - -Index: pam/modules/pam_mkhomedir/Makefile.am -=================================================================== ---- pam.orig/modules/pam_mkhomedir/Makefile.am -+++ pam/modules/pam_mkhomedir/Makefile.am -@@ -19,14 +19,14 @@ - - AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \ - -DMKHOMEDIR_HELPER=\"$(sbindir)/mkhomedir_helper\" --AM_LDFLAGS = -no-undefined -avoid-version -module --if HAVE_VERSIONING -- AM_LDFLAGS += -Wl,--version-script=$(srcdir)/../modules.map --endif - - securelib_LTLIBRARIES = pam_mkhomedir.la - pam_mkhomedir_la_SOURCES = pam_mkhomedir.c - pam_mkhomedir_la_LIBADD = -L$(top_builddir)/libpam -lpam -+pam_mkhomedir_la_LDFLAGS = -no-undefined -avoid-version -module -+if HAVE_VERSIONING -+ pam_mkhomedir_la_LDFLAGS += -Wl,--version-script=$(srcdir)/../modules.map -+endif - - sbin_PROGRAMS = mkhomedir_helper - mkhomedir_helper_SOURCES = mkhomedir_helper.c diff --git a/debian/patches-applied/series b/debian/patches-applied/series index 85aaeb32..fc0ee341 100644 --- a/debian/patches-applied/series +++ b/debian/patches-applied/series @@ -16,8 +16,6 @@ hurd_no_setfsuid 054_pam_security_abstract_securetty_handling 055_pam_unix_nullok_secure PAM-manpage-section -conditional_module,_conditional_man -mkhomedir_linking.patch autoconf.patch update-motd fix-man-crud |