summaryrefslogtreecommitdiff
path: root/debian/patches-applied
diff options
context:
space:
mode:
authorSteve Langasek <steve.langasek@ubuntu.com>2019-01-03 16:11:36 -0800
committerSteve Langasek <steve.langasek@ubuntu.com>2019-01-03 16:11:36 -0800
commit23962fab57727030a1d2d01f0c4b43a9075681c1 (patch)
tree1e660fdf50e1bdaf0e1543f6aaf38df1b8ae5914 /debian/patches-applied
parentcccf6eb73fb02c8c7cf93e18b49ce1d9e697052a (diff)
parent3df8bf43bb3e239563ebabab30836279d0d1e1f2 (diff)
merge
Diffstat (limited to 'debian/patches-applied')
-rw-r--r--debian/patches-applied/006_docs_cleanup31
-rw-r--r--debian/patches-applied/008_modules_pam_limits_chroot139
-rw-r--r--debian/patches-applied/015_hurd_portability60
-rw-r--r--debian/patches-applied/019_pam_listfile_quiet235
-rw-r--r--debian/patches-applied/022_pam_unix_group_time_miscfixes19
-rw-r--r--debian/patches-applied/024_debian_cracklib_dict_path86
-rw-r--r--debian/patches-applied/038_support_hurd106
-rw-r--r--debian/patches-applied/043_pam_unix_unknown_user_not_alert41
-rw-r--r--debian/patches-applied/046_pam_group_example27
-rw-r--r--debian/patches-applied/055_pam_unix_nullok_secure67
-rw-r--r--debian/patches-applied/065_pam_unix_cracklib_disable19
-rw-r--r--debian/patches-applied/autoconf.patch26467
-rw-r--r--debian/patches-applied/limits_wrong_strncpy92
-rw-r--r--debian/patches-applied/misc_conv_allow_sigint.patch28
-rw-r--r--debian/patches-applied/no_pthread_mutexes205
-rw-r--r--debian/patches-applied/series12
16 files changed, 19388 insertions, 8246 deletions
diff --git a/debian/patches-applied/006_docs_cleanup b/debian/patches-applied/006_docs_cleanup
deleted file mode 100644
index b5dce7c6..00000000
--- a/debian/patches-applied/006_docs_cleanup
+++ /dev/null
@@ -1,31 +0,0 @@
-Upstream status: committed to CVS
-
-Index: Linux-PAM/doc/man/pam.conf-syntax.xml
-===================================================================
---- Linux-PAM/doc/man/pam.conf-syntax.xml.orig
-+++ Linux-PAM/doc/man/pam.conf-syntax.xml
-@@ -211,7 +211,8 @@
- <emphasis>authtok_disable_aging</emphasis>,
- <emphasis>try_again</emphasis>, <emphasis>ignore</emphasis>,
- <emphasis>abort</emphasis>, <emphasis>authtok_expired</emphasis>,
-- <emphasis>module_unknown</emphasis>, <emphasis>bad_item</emphasis>
-+ <emphasis>module_unknown</emphasis>, <emphasis>bad_item</emphasis>,
-+ <emphasis>conv_again</emphasis>, <emphasis>incomplete</emphasis>,
- and <emphasis>default</emphasis>.
- </para>
- <para>
-Index: Linux-PAM/doc/man/pam.conf.5
-===================================================================
---- Linux-PAM/doc/man/pam.conf.5.orig
-+++ Linux-PAM/doc/man/pam.conf.5
-@@ -175,7 +175,9 @@
- \fIabort\fR,
- \fIauthtok_expired\fR,
- \fImodule_unknown\fR,
--\fIbad_item\fR
-+\fIbad_item\fR,
-+\fIconv_again\fR,
-+\fIincomplete\fR,
- and
- \fIdefault\fR.
- .PP
diff --git a/debian/patches-applied/008_modules_pam_limits_chroot b/debian/patches-applied/008_modules_pam_limits_chroot
index 5155920f..f2d3cc26 100644
--- a/debian/patches-applied/008_modules_pam_limits_chroot
+++ b/debian/patches-applied/008_modules_pam_limits_chroot
@@ -1,7 +1,7 @@
-Index: pam.deb/modules/pam_limits/pam_limits.c
+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
+--- pam.debian.orig/modules/pam_limits/pam_limits.c
++++ pam.debian/modules/pam_limits/pam_limits.c
@@ -75,6 +75,7 @@
int flag_numsyslogins; /* whether to limit logins only for a
specific user or to count all logins */
@@ -27,7 +27,7 @@ Index: pam.deb/modules/pam_limits/pam_limits.c
return retval;
}
-@@ -311,6 +315,8 @@
+@@ -313,6 +317,8 @@
pl->flag_numsyslogins = 1;
} else if (strcmp(lim_item, "priority") == 0) {
limit_item = LIMIT_PRI;
@@ -36,7 +36,7 @@ Index: pam.deb/modules/pam_limits/pam_limits.c
} else {
pam_syslog(pamh, LOG_DEBUG, "unknown limit item '%s'", lim_item);
return;
-@@ -348,9 +354,9 @@
+@@ -350,9 +356,9 @@
pam_syslog(pamh, LOG_DEBUG,
"wrong limit value '%s' for limit type '%s'",
lim_value, lim_type);
@@ -48,7 +48,7 @@ Index: pam.deb/modules/pam_limits/pam_limits.c
#ifdef __USE_FILE_OFFSET64
rlimit_value = strtoull (lim_value, &endptr, 10);
#else
-@@ -409,7 +415,9 @@
+@@ -413,7 +419,9 @@
break;
}
@@ -59,7 +59,7 @@ Index: pam.deb/modules/pam_limits/pam_limits.c
&& (limit_item != LIMIT_NUMSYSLOGINS)
&& (limit_item != LIMIT_PRI) ) {
if (limit_type & LIMIT_SOFT) {
-@@ -605,6 +613,13 @@
+@@ -601,6 +609,13 @@
retval |= LOGIN_ERR;
}
@@ -73,11 +73,11 @@ Index: pam.deb/modules/pam_limits/pam_limits.c
return retval;
}
-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
-@@ -223,6 +223,12 @@
+--- pam.debian.orig/modules/pam_limits/limits.conf.5.xml
++++ pam.debian/modules/pam_limits/limits.conf.5.xml
+@@ -224,6 +224,12 @@
(Linux 2.6.12 and higher)</para>
</listitem>
</varlistentry>
@@ -90,67 +90,60 @@ Index: pam.deb/modules/pam_limits/limits.conf.5.xml
</variablelist>
</listitem>
</varlistentry>
-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
-@@ -1,11 +1,11 @@
+--- pam.debian.orig/modules/pam_limits/limits.conf.5
++++ pam.debian/modules/pam_limits/limits.conf.5
+@@ -1,17 +1,17 @@
.\" Title: limits.conf
.\" Author:
--.\" Generator: DocBook XSL Stylesheets v1.71.1 <http://docbook.sf.net/>
--.\" Date: 04/30/2007
--.\" Manual: Linux\-PAM Manual
--.\" Source: Linux\-PAM Manual
+-.\" Generator: DocBook XSL Stylesheets v1.72.0 <http://docbook.sf.net/>
+-.\" Date: 08/30/2007
+.\" Generator: DocBook XSL Stylesheets v1.73.2 <http://docbook.sf.net/>
+.\" Date: 07/22/2008
-+.\" Manual: Linux-PAM Manual
-+.\" Source: Linux-PAM Manual
+ .\" Manual: Linux-PAM Manual
+ .\" Source: Linux-PAM Manual
.\"
--.TH "LIMITS.CONF" "5" "04/30/2007" "Linux\-PAM Manual" "Linux\-PAM Manual"
-+.TH "LIMITS\&.CONF" "5" "07/22/2008" "Linux-PAM Manual" "Linux\-PAM Manual"
+-.TH "LIMITS.CONF" "5" "08/30/2007" "Linux\-PAM Manual" "Linux\-PAM Manual"
++.TH "LIMITS\.CONF" "5" "07/22/2008" "Linux-PAM Manual" "Linux\-PAM Manual"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
-@@ -26,48 +26,49 @@
+ .ad l
+ .SH "NAME"
+-limits.conf \- configuration file for the pam_limits module
++limits.conf - configuration file for the pam_limits module
+ .SH "DESCRIPTION"
+ .PP
+ The syntax of the lines is as follows:
+@@ -26,46 +26,49 @@
.PP
\fB<domain>\fR
.RS 4
+.sp
-+.RS 4
-+\h'-04'\(bu\h'+03'a username
-+.RE
+ .RS 4
+ \h'-04'\(bu\h'+03'a username
+ .RE
+.sp
.RS 4
--.TP 4
--\(bu
--a username
--.TP 4
--\(bu
--a groupname, with
-+\h'-04'\(bu\h'+03'a groupname, with
+ \h'-04'\(bu\h'+03'a groupname, with
\fB@group\fR
-syntax. This should not be confused with netgroups.
--.TP 4
--\(bu
--the wildcard
--\fB*\fR, for default entry.
--.TP 4
--\(bu
--the wildcard
-+syntax\&. This should not be confused with netgroups\&.
-+.RE
++syntax\. This should not be confused with netgroups\.
+ .RE
+.sp
-+.RS 4
-+\h'-04'\(bu\h'+03'the wildcard
-+\fB*\fR, for default entry\&.
-+.RE
+ .RS 4
+ \h'-04'\(bu\h'+03'the wildcard
+-\fB*\fR, for default entry.
++\fB*\fR, for default entry\.
+ .RE
+.sp
-+.RS 4
-+\h'-04'\(bu\h'+03'the wildcard
+ .RS 4
+ \h'-04'\(bu\h'+03'the wildcard
\fB%\fR, for maxlogins limit only, can also be used with
\fI%group\fR
-syntax.
-+syntax\&.
++syntax\.
.RE
.RE
.PP
@@ -163,7 +156,7 @@ Index: pam.deb/modules/pam_limits/limits.conf.5
for enforcing
\fBhard\fR
-resource limits. These limits are set by the superuser and enforced by the Kernel. The user cannot raise his requirement of system resources above such values.
-+resource limits\&. These limits are set by the superuser and enforced by the Kernel\&. The user cannot raise his requirement of system resources above such values\&.
++resource limits\. These limits are set by the superuser and enforced by the Kernel\. The user cannot raise his requirement of system resources above such values\.
.RE
.PP
\fBsoft\fR
@@ -171,26 +164,26 @@ Index: pam.deb/modules/pam_limits/limits.conf.5
for enforcing
\fBsoft\fR
-resource limits. These limits are ones that the user can move up or down within the permitted range by any pre\-exisiting
-+resource limits\&. These limits are ones that the user can move up or down within the permitted range by any pre\-exisiting
++resource limits\. These limits are ones that the user can move up or down within the permitted range by any pre\-exisiting
\fBhard\fR
-limits. The values specified with this token can be thought of as
-+limits\&. The values specified with this token can be thought of as
++limits\. The values specified with this token can be thought of as
\fIdefault\fR
-values, for normal system usage.
-+values, for normal system usage\&.
++values, for normal system usage\.
.RE
.PP
\fB\-\fR
-@@ -76,16 +77,14 @@
+@@ -74,16 +77,14 @@
\fBsoft\fR
and
\fBhard\fR
-resource limits together.
-+resource limits together\&.
++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. .
-.RE
-+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 \'\-\' 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
@@ -200,36 +193,36 @@ Index: pam.deb/modules/pam_limits/limits.conf.5
.PP
\fBcore\fR
.RS 4
-@@ -154,48 +153,52 @@
+@@ -153,48 +154,52 @@
.PP
\fBlocks\fR
.RS 4
-maximum locked files (Linux 2.4 and higher)
-+maximum locked files (Linux 2\&.4 and higher)
++maximum locked files (Linux 2\.4 and higher)
.RE
.PP
\fBsigpending\fR
.RS 4
-maximum number of pending signals (Linux 2.6 and higher)
-+maximum number of pending signals (Linux 2\&.6 and higher)
++maximum number of pending signals (Linux 2\.6 and higher)
.RE
.PP
\fBmsqqueue\fR
.RS 4
-maximum memory used by POSIX message queues (bytes) (Linux 2.6 and higher)
-+maximum memory used by POSIX message queues (bytes) (Linux 2\&.6 and higher)
++maximum memory used by POSIX message queues (bytes) (Linux 2\.6 and higher)
.RE
.PP
\fBnice\fR
.RS 4
-maximum nice priority allowed to raise to (Linux 2.6.12 and higher)
-+maximum nice priority allowed to raise to (Linux 2\&.6\&.12 and higher)
++maximum nice priority allowed to raise to (Linux 2\.6\.12 and higher)
.RE
.PP
\fBrtprio\fR
.RS 4
-maximum realtime priority allowed for non\-privileged processes (Linux 2.6.12 and higher)
-+maximum realtime priority allowed for non\-privileged processes (Linux 2\&.6\&.12 and higher)
++maximum realtime priority allowed for non\-privileged processes (Linux 2\.6\.12 and higher)
.RE
+.PP
+\fBchroot\fR
@@ -241,38 +234,38 @@ Index: pam.deb/modules/pam_limits/limits.conf.5
In general, individual limits have priority over group limits, so if you impose no limits for
\fIadmin\fR
-group, but one of the members in this group have a limits line, the user will have its limits set according to this line.
-+group, but one of the members in this group have a limits line, the user will have its limits set according to this line\&.
++group, but one of the members in this group have a limits line, the user will have its limits set according to this line\.
.PP
Also, please note that all limit settings are set
-\fIper login\fR. They are not global, nor are they permanent; existing only for the duration of the session.
-+\fIper login\fR\&. They are not global, nor are they permanent; existing only for the duration of the session\&.
++\fIper login\fR\. They are not global, nor are they permanent; existing only for the duration of the session\.
.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 \'\fB#\fR\' character introduces a comment \- after which the rest of the line is ignored\&.
++configuration file, the \'\fB#\fR\' character introduces a comment \- after which the rest of the line is ignored\.
.PP
The pam_limits module does its best to report configuration problems found in its configuration file via
-\fBsyslog\fR(3).
-+\fBsyslog\fR(3)\&.
++\fBsyslog\fR(3)\.
.SH "EXAMPLES"
.PP
These are some example lines which might be specified in
-\fI/etc/security/limits.conf\fR.
-+\fI/etc/security/limits\&.conf\fR\&.
++\fI/etc/security/limits\.conf\fR\.
.sp
.RS 4
.nf
-@@ -217,4 +220,4 @@
+@@ -216,4 +221,4 @@
\fBpam\fR(8)
.SH "AUTHOR"
.PP
-pam_limits was initially written by Cristian Gafton <gafton@redhat.com>
-+pam_limits was initially written by Cristian Gafton <gafton@redhat\&.com>
-Index: pam.deb/modules/pam_limits/limits.conf
++pam_limits was initially written by Cristian Gafton <gafton@redhat\.com>
+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
++++ pam.debian/modules/pam_limits/limits.conf
@@ -35,6 +35,7 @@
# - msgqueue - max memory used by POSIX message queues (bytes)
# - nice - max nice priority allowed to raise to
diff --git a/debian/patches-applied/015_hurd_portability b/debian/patches-applied/015_hurd_portability
deleted file mode 100644
index 16510318..00000000
--- a/debian/patches-applied/015_hurd_portability
+++ /dev/null
@@ -1,60 +0,0 @@
-Patch from Debian bug #76119
-Authors: Igor Khavkine <i_khavki@alcor.concordia.ca>
-
-Upstream status: committed to CVS
-
-Index: Linux-PAM/configure.in
-===================================================================
---- Linux-PAM/configure.in.orig
-+++ Linux-PAM/configure.in
-@@ -389,7 +389,7 @@
- AC_HEADER_DIRENT
- AC_HEADER_STDC
- AC_HEADER_SYS_WAIT
--AC_CHECK_HEADERS(fcntl.h limits.h malloc.h sys/file.h sys/ioctl.h sys/time.h syslog.h termio.h unistd.h sys/fsuid.h inittypes.h)
-+AC_CHECK_HEADERS(fcntl.h limits.h malloc.h sys/file.h sys/ioctl.h sys/time.h syslog.h net/if.h termio.h unistd.h sys/fsuid.h inittypes.h)
-
- AC_CHECK_HEADERS(crypt.h)
-
-Index: Linux-PAM/modules/pam_rhosts/pam_rhosts_auth.c
-===================================================================
---- Linux-PAM/modules/pam_rhosts/pam_rhosts_auth.c.orig
-+++ Linux-PAM/modules/pam_rhosts/pam_rhosts_auth.c
-@@ -64,11 +64,10 @@
- #include <sys/fsuid.h>
- #endif /* HAVE_SYS_FSUID_H */
- #ifdef HAVE_NET_IF_H
--#include <sys/if.h>
-+#include <net/if.h>
- #endif
- #include <sys/types.h>
- #include <sys/uio.h>
--#include <net/if.h>
- #include <netinet/in.h>
-
- #ifndef MAXDNAME
-Index: Linux-PAM/modules/pam_limits/pam_limits.c
-===================================================================
---- Linux-PAM/modules/pam_limits/pam_limits.c.orig
-+++ Linux-PAM/modules/pam_limits/pam_limits.c
-@@ -280,8 +280,10 @@
- limit_item = RLIMIT_NOFILE;
- else if (strcmp(lim_item, "memlock") == 0)
- limit_item = RLIMIT_MEMLOCK;
-+#ifdef RLIMIT_AS
- else if (strcmp(lim_item, "as") == 0)
- limit_item = RLIMIT_AS;
-+#endif /*RLIMIT_AS*/
- #ifdef RLIMIT_LOCKS
- else if (strcmp(lim_item, "locks") == 0)
- limit_item = RLIMIT_LOCKS;
-@@ -385,7 +387,9 @@
- case RLIMIT_CORE:
- case RLIMIT_RSS:
- case RLIMIT_MEMLOCK:
-+#ifdef RLIMIT_AS
- case RLIMIT_AS:
-+#endif
- if (rlimit_value != RLIM_INFINITY)
- rlimit_value *= 1024;
- break;
diff --git a/debian/patches-applied/019_pam_listfile_quiet b/debian/patches-applied/019_pam_listfile_quiet
deleted file mode 100644
index 113c9cfb..00000000
--- a/debian/patches-applied/019_pam_listfile_quiet
+++ /dev/null
@@ -1,235 +0,0 @@
-Patch for Debian bug #84428
-
-Support a 'quiet' option to pam_listfile, to reduce the logging output
-
-Authors: Ben Collins <bcollins@debian.org>,
- Steve Langasek <vorlon@debian.org>
-
-Upstream status: committed to CVS
-
-Index: Linux-PAM/modules/pam_listfile/pam_listfile.c
-===================================================================
---- Linux-PAM/modules/pam_listfile/pam_listfile.c.orig
-+++ Linux-PAM/modules/pam_listfile/pam_listfile.c
-@@ -68,7 +68,7 @@
- pam_sm_authenticate (pam_handle_t *pamh, int flags UNUSED,
- int argc, const char **argv)
- {
-- int retval, i, citem=0, extitem=0, onerr=PAM_SERVICE_ERR, sense=2;
-+ int retval, i, citem=0, extitem=0, onerr=PAM_SERVICE_ERR, sense=2, quiet=0;
- const void *void_citemp;
- const char *citemp;
- char *ifname=NULL;
-@@ -155,6 +155,8 @@
- apply_type=APPLY_TYPE_USER;
- strncpy(apply_val,myval,sizeof(apply_val)-1);
- }
-+ } else if (!strcmp(mybuf,"quiet")) {
-+ quiet = 1;
- } else {
- free(ifname);
- pam_syslog(pamh,LOG_ERR, "Unknown option: %s",mybuf);
-@@ -399,8 +401,9 @@
- #endif
- (void) pam_get_item(pamh, PAM_SERVICE, &service);
- (void) pam_get_user(pamh, &user_name, NULL);
-- pam_syslog (pamh, LOG_ALERT, "Refused user %s for service %s",
-- user_name, (const char *)service);
-+ if (!quiet)
-+ pam_syslog (pamh, LOG_ALERT, "Refused user %s for service %s",
-+ user_name, (const char *)service);
- return PAM_AUTH_ERR;
- }
- }
-Index: Linux-PAM/modules/pam_listfile/pam_listfile.8
-===================================================================
---- Linux-PAM/modules/pam_listfile/pam_listfile.8.orig
-+++ Linux-PAM/modules/pam_listfile/pam_listfile.8
-@@ -1,11 +1,11 @@
- .\" Title: pam_listfile
- .\" Author:
--.\" Generator: DocBook XSL Stylesheets v1.70.1 <http://docbook.sf.net/>
--.\" Date: 06/22/2006
--.\" Manual: Linux\-PAM Manual
--.\" Source: Linux\-PAM Manual
-+.\" Generator: DocBook XSL Stylesheets v1.72.0 <http://docbook.sf.net/>
-+.\" Date: 08/25/2007
-+.\" Manual: Linux-PAM Manual
-+.\" Source: Linux-PAM Manual
- .\"
--.TH "PAM_LISTFILE" "8" "06/22/2006" "Linux\-PAM Manual" "Linux\-PAM Manual"
-+.TH "PAM_LISTFILE" "8" "08/25/2007" "Linux\-PAM Manual" "Linux\-PAM Manual"
- .\" disable hyphenation
- .nh
- .\" disable justification (adjust text to left margin only)
-@@ -14,7 +14,7 @@
- pam_listfile \- deny or allow services based on an arbitrary file
- .SH "SYNOPSIS"
- .HP 16
--\fBpam_listfile.so\fR item=[tty|user|rhost|ruser|group|shell] sense=[allow|deny] file=\fI/path/filename\fR onerr=[succeed|fail] [apply=[\fIuser\fR|\fI@group\fR]]
-+\fBpam_listfile.so\fR item=[tty|user|rhost|ruser|group|shell] sense=[allow|deny] file=\fI/path/filename\fR onerr=[succeed|fail] [apply=[\fIuser\fR|\fI@group\fR]] [quiet]
- .SH "DESCRIPTION"
- .PP
- pam_listfile is a PAM module which provides a way to deny or allow services based on an arbitrary file.
-@@ -64,25 +64,40 @@
- No credentials are awarded by this module.
- .SH "OPTIONS"
- .PP
--.TP 3n
-+.PP
- \fBitem=[tty|user|rhost|ruser|group|shell]\fR
-+.RS 4
- What is listed in the file and should be checked for.
--.TP 3n
-+.RE
-+.PP
- \fBsense=[allow|deny]\fR
-+.RS 4
- Action to take if found in file, if the item is NOT found in the file, then the opposite action is requested.
--.TP 3n
-+.RE
-+.PP
- \fBfile=\fR\fB\fI/path/filename\fR\fR
-+.RS 4
- File containing one item per line. The file needs to be a plain file and not world writeable.
--.TP 3n
-+.RE
-+.PP
- \fBonerr=[succeed|fail]\fR
-+.RS 4
- What to do if something weird happens like being unable to open the file.
--.TP 3n
-+.RE
-+.PP
- \fBapply=[\fR\fB\fIuser\fR\fR\fB|\fR\fB\fI@group\fR\fR\fB]\fR
-+.RS 4
- Restrict the user class for which the restriction apply. Note that with
- \fBitem=[user|ruser|group]\fR
- this oes not make sense, but for
- \fBitem=[tty|rhost|shell]\fR
- it have a meaning.
-+.RE
-+.PP
-+\fBquiet\fR
-+.RS 4
-+Do not treat service refusals or missing list files as errors that need to be logged.
-+.RE
- .SH "MODULE SERVICES PROVIDED"
- .PP
- The services
-@@ -94,34 +109,44 @@
- are supported.
- .SH "RETURN VALUES"
- .PP
--.TP 3n
-+.PP
- PAM_AUTH_ERR
-+.RS 4
- Authentication failure.
--.TP 3n
-+.RE
-+.PP
- PAM_BUF_ERR
-+.RS 4
- Memory buffer error.
--.TP 3n
-+.RE
-+.PP
- PAM_IGNORE
-+.RS 4
- The rule does not apply to the
- \fBapply\fR
- option.
--.TP 3n
-+.RE
-+.PP
- PAM_SERVICE_ERR
-+.RS 4
- Error in service module.
--.TP 3n
-+.RE
-+.PP
- PAM_SUCCESS
-+.RS 4
- Success.
-+.RE
- .SH "EXAMPLES"
- .PP
- Classic 'ftpusers' authentication can be implemented with this entry in
- \fI/etc/pam.d/ftpd\fR:
- .sp
--.RS 3n
-+.RS 4
- .nf
- #
- # deny ftp\-access to users listed in the /etc/ftpusers file
- #
--auth required pam_listfile.so \\
-+auth required pam_listfile.so \e
- onerr=succeed item=user sense=deny file=/etc/ftpusers
-
- .fi
-@@ -137,12 +162,12 @@
- \fI/etc/pam.d/login\fR
- entry like this:
- .sp
--.RS 3n
-+.RS 4
- .nf
- #
- # permit login to users listed in /etc/loginusers
- #
--auth required pam_listfile.so \\
-+auth required pam_listfile.so \e
- onerr=fail item=user sense=allow file=/etc/loginusers
-
- .fi
-Index: Linux-PAM/modules/pam_listfile/pam_listfile.8.xml
-===================================================================
---- Linux-PAM/modules/pam_listfile/pam_listfile.8.xml.orig
-+++ Linux-PAM/modules/pam_listfile/pam_listfile.8.xml
-@@ -33,6 +33,9 @@
- <arg choice="opt">
- apply=[<replaceable>user</replaceable>|<replaceable>@group</replaceable>]
- </arg>
-+ <arg choice="opt">
-+ quiet
-+ </arg>
- </cmdsynopsis>
- </refsynopsisdiv>
-
-@@ -155,6 +158,18 @@
- </para>
- </listitem>
- </varlistentry>
-+
-+ <varlistentry>
-+ <term>
-+ <option>quiet</option>
-+ </term>
-+ <listitem>
-+ <para>
-+ Do not treat service refusals or missing list files as
-+ errors that need to be logged.
-+ </para>
-+ </listitem>
-+ </varlistentry>
- </variablelist>
-
- </para>
-Index: Linux-PAM/modules/pam_listfile/README
-===================================================================
---- Linux-PAM/modules/pam_listfile/README.orig
-+++ Linux-PAM/modules/pam_listfile/README
-@@ -58,6 +58,11 @@
- item=[user|ruser|group] this oes not make sense, but for item=[tty|rhost|
- shell] it have a meaning.
-
-+quiet
-+
-+ Do not treat service refusals or missing list files as errors that need to
-+ be logged.
-+
- EXAMPLES
-
- Classic 'ftpusers' authentication can be implemented with this entry in /etc/
diff --git a/debian/patches-applied/022_pam_unix_group_time_miscfixes b/debian/patches-applied/022_pam_unix_group_time_miscfixes
index e96dd680..44ee8783 100644
--- a/debian/patches-applied/022_pam_unix_group_time_miscfixes
+++ b/debian/patches-applied/022_pam_unix_group_time_miscfixes
@@ -1,24 +1,5 @@
* Add support for credential reinitialization in pam_group, closes: #108697
- * By default do complete matches not substring matches for pam_time.
- You can include explicit wildcard for substring, closes: #66152
-Index: Linux-PAM/modules/pam_time/pam_time.c
-===================================================================
---- Linux-PAM/modules/pam_time/pam_time.c.orig
-+++ Linux-PAM/modules/pam_time/pam_time.c
-@@ -324,7 +324,11 @@
- return FALSE;
- }
- }
-- return ( !len );
-+ /* By this point we know that we didn't treat a * in b as a wildcard.
-+ the only way we got done with the loop is if we consumed every
-+ character in b. Thus the strings are equal if their
-+ lengths are the same otherwise not equal. */
-+ return (strlen (a) == strlen (b));
- }
-
- typedef struct {
Index: Linux-PAM/modules/pam_group/pam_group.c
===================================================================
--- Linux-PAM/modules/pam_group/pam_group.c.orig
diff --git a/debian/patches-applied/024_debian_cracklib_dict_path b/debian/patches-applied/024_debian_cracklib_dict_path
deleted file mode 100644
index 229c87e8..00000000
--- a/debian/patches-applied/024_debian_cracklib_dict_path
+++ /dev/null
@@ -1,86 +0,0 @@
-Fix the cracklib autoconf check so that HAVE_CRACK_H gets defined.
-
-Don't copy around the cracklib dictpath into a fixed-width buffer, when
-we can just point at the existing strings; and allow the means to
-specify a default dictionary when no dictionary is specified in
-pam.conf.
-
-Authors: Steve Langasek <vorlon@debian.org>
-
-Upstream status: committed to CVS
-
-Index: Linux-PAM/modules/pam_cracklib/pam_cracklib.c
-===================================================================
---- Linux-PAM/modules/pam_cracklib/pam_cracklib.c.orig
-+++ Linux-PAM/modules/pam_cracklib/pam_cracklib.c
-@@ -56,6 +56,10 @@
- extern char *FascistCheck(char *pw, const char *dictpath);
- #endif
-
-+#ifndef CRACKLIB_DICTS
-+#define CRACKLIB_DICTS NULL
-+#endif
-+
- /* For Translators: "%s%s" could be replaced with "<service> " or "". */
- #define PROMPT1 _("New %s%spassword: ")
- /* For Translators: "%s%s" could be replaced with "<service> " or "". */
-@@ -94,7 +98,7 @@
- int oth_credit;
- int use_authtok;
- char prompt_type[BUFSIZ];
-- char cracklib_dictpath[PATH_MAX];
-+ char *cracklib_dictpath;
- };
-
- #define CO_RETRY_TIMES 1
-@@ -159,14 +163,15 @@
- } else if (!strncmp(*argv,"use_authtok",11)) {
- opt->use_authtok = 1;
- } else if (!strncmp(*argv,"dictpath=",9)) {
-- strncpy(opt->cracklib_dictpath, *argv+9,
-- sizeof(opt->cracklib_dictpath) - 1);
-+ opt->cracklib_dictpath = *argv+9;
-+ if (!*(opt->cracklib_dictpath)) {
-+ opt->cracklib_dictpath = CRACKLIB_DICTS;
-+ }
- } else {
- pam_syslog(pamh,LOG_ERR,"pam_parse: unknown option; %s",*argv);
- }
- }
- opt->prompt_type[sizeof(opt->prompt_type) - 1] = '\0';
-- opt->cracklib_dictpath[sizeof(opt->cracklib_dictpath) - 1] = '\0';
-
- return ctrl;
- }
-@@ -514,8 +519,7 @@
- options.use_authtok = CO_USE_AUTHTOK;
- memset(options.prompt_type, 0, BUFSIZ);
- strcpy(options.prompt_type,"UNIX");
-- memset(options.cracklib_dictpath, 0,
-- sizeof (options.cracklib_dictpath));
-+ options.cracklib_dictpath = CRACKLIB_DICTS;
-
- ctrl = _pam_parse(pamh, &options, argc, argv);
-
-@@ -609,7 +613,7 @@
- const char *crack_msg;
-
- D(("against cracklib"));
-- if ((crack_msg = FascistCheck(token1,options.cracklib_dictpath[0] == '\0'?NULL:options.cracklib_dictpath))) {
-+ if ((crack_msg = FascistCheck(token1,options.cracklib_dictpath))) {
- if (ctrl & PAM_DEBUG_ARG)
- pam_syslog(pamh,LOG_DEBUG,"bad password: %s",crack_msg);
- pam_error(pamh, _("BAD PASSWORD: %s"), crack_msg);
-Index: Linux-PAM/configure.in
-===================================================================
---- Linux-PAM/configure.in.orig
-+++ Linux-PAM/configure.in
-@@ -312,7 +312,7 @@
- AC_HELP_STRING([--disable-cracklib],[do not use cracklib]),
- WITH_CRACKLIB=$enableval, WITH_CRACKLIB=yes)
- if test x"$WITH_CRACKLIB" != xno ; then
-- AC_CHECK_HEADER([crack.h],
-+ AC_CHECK_HEADERS([crack.h],
- AC_CHECK_LIB([crack], [FascistCheck], LIBCRACK="-lcrack", LIBCRACK=""))
- else
- LIBCRACK=""
diff --git a/debian/patches-applied/038_support_hurd b/debian/patches-applied/038_support_hurd
deleted file mode 100644
index 52e04327..00000000
--- a/debian/patches-applied/038_support_hurd
+++ /dev/null
@@ -1,106 +0,0 @@
-Prefer using getline() instead of a static buffer; makes pam_rhosts
-portable to Hurd.
-
-Authors: Michal 'hramrach' Suchanek" <hramrach_l@centrum.cz>,
- Steve Langasek <vorlon@debian.org>
-
-Upstream status: committed to CVS.
-
-Index: Linux-PAM/modules/pam_rhosts/pam_rhosts_auth.c
-===================================================================
---- Linux-PAM/modules/pam_rhosts/pam_rhosts_auth.c.orig
-+++ Linux-PAM/modules/pam_rhosts/pam_rhosts_auth.c
-@@ -293,7 +293,6 @@
- /*
- luser is user entry from .rhosts/hosts.equiv file
- ruser is user id on remote host
-- rhost is the remote host name
- */
- const void *user;
-
-@@ -348,11 +347,17 @@
- register const char *user;
- register char *p;
- int hcheck, ucheck;
-- char buf[MAXHOSTNAMELEN + 128]; /* host + login */
-+ int retval = 1;
-+#ifdef HAVE_GETLINE
-+ char *buf=NULL;
-+ size_t buflen=0;
-
-- buf[sizeof (buf)-1] = '\0'; /* terminate line */
-+ while (getline(&buf,&buflen,hostf) > 0) {
-+#else
-+ char buf[MAXHOSTNAMELEN + 128]; /* host + login */
-
- while (fgets(buf, sizeof(buf), hostf) != NULL) { /* hostf file line */
-+#endif
- p = buf; /* from beginning of file.. */
-
- /* Skip empty or comment lines */
-@@ -401,7 +406,7 @@
- hcheck=__icheckhost(pamh, opts, raddr, buf, rhost);
-
- if (hcheck<0)
-- return(1);
-+ break;
-
- if (hcheck) {
- /* Then check user part */
-@@ -411,18 +416,23 @@
- ucheck=__icheckuser(pamh, opts, user, ruser);
-
- /* Positive 'host user' match? */
-- if (ucheck>0)
-- return(0);
-+ if (ucheck>0) {
-+ retval = 0;
-+ break;
-+ }
-
- /* Negative 'host -user' match? */
- if (ucheck<0)
-- return(1);
-+ break;
-
- /* Neither, go on looking for match */
- }
- }
-+#ifdef HAVE_GETLINE
-+ if(buf)free(buf);
-+#endif
-
-- return (1);
-+ return retval;
- }
-
- /*
-Index: Linux-PAM/modules/pam_limits/pam_limits.c
-===================================================================
---- Linux-PAM/modules/pam_limits/pam_limits.c.orig
-+++ Linux-PAM/modules/pam_limits/pam_limits.c
-@@ -14,7 +14,7 @@
- */
-
- #if !defined(linux) && !defined(__linux)
--#error THIS CODE IS KNOWN TO WORK ONLY ON LINUX !!!
-+#warning THIS CODE IS KNOWN TO WORK ONLY ON LINUX !!!
- #endif
-
- #include "config.h"
-Index: Linux-PAM/modules/pam_xauth/pam_xauth.c
-===================================================================
---- Linux-PAM/modules/pam_xauth/pam_xauth.c.orig
-+++ Linux-PAM/modules/pam_xauth/pam_xauth.c
-@@ -63,6 +63,11 @@
- #define XAUTHDEF ".Xauthority"
- #define XAUTHTMP ".xauthXXXXXX"
-
-+/* Hurd compatibility */
-+#ifndef PATH_MAX
-+#define PATH_MAX 4096
-+#endif
-+
- /* Possible paths to xauth executable */
- static const char * const xauthpaths[] = {
- #ifdef PAM_PATH_XAUTH
diff --git a/debian/patches-applied/043_pam_unix_unknown_user_not_alert b/debian/patches-applied/043_pam_unix_unknown_user_not_alert
deleted file mode 100644
index 1aafc4f6..00000000
--- a/debian/patches-applied/043_pam_unix_unknown_user_not_alert
+++ /dev/null
@@ -1,41 +0,0 @@
-Patch for Debian bugs #95220, #175900
-
-A wrong username doesn't need to be logged as an 'alert', a 'warning'
-should be sufficient.
-
-Authors: Sam Hartman <hartmans@debian.org>
-
-Upstream status: committed to CVS
-
-Index: Linux-PAM/modules/pam_unix/support.c
-===================================================================
---- Linux-PAM/modules/pam_unix/support.c.orig
-+++ Linux-PAM/modules/pam_unix/support.c
-@@ -675,12 +675,12 @@
- if (on(UNIX_AUDIT, ctrl)) {
- /* this might be a typo and the user has given a password
- instead of a username. Careful with this. */
-- pam_syslog(pamh, LOG_ALERT,
-+ pam_syslog(pamh, LOG_WARNING,
- "check pass; user (%s) unknown", name);
- } else {
- name = NULL;
- if (on(UNIX_DEBUG, ctrl) || pwd == NULL) {
-- pam_syslog(pamh, LOG_ALERT,
-+ pam_syslog(pamh, LOG_WARNING,
- "check pass; user unknown");
- } else {
- /* don't log failure as another pam module can succeed */
-Index: Linux-PAM/modules/pam_unix/unix_chkpwd.c
-===================================================================
---- Linux-PAM/modules/pam_unix/unix_chkpwd.c.orig
-+++ Linux-PAM/modules/pam_unix/unix_chkpwd.c
-@@ -179,7 +179,7 @@
- }
- }
- if (pwd == NULL || salt == NULL) {
-- _log_err(LOG_ALERT, "check pass; user unknown");
-+ _log_err(LOG_WARNING, "check pass; user unknown");
- p = NULL;
- return PAM_USER_UNKNOWN;
- }
diff --git a/debian/patches-applied/046_pam_group_example b/debian/patches-applied/046_pam_group_example
deleted file mode 100644
index c885c822..00000000
--- a/debian/patches-applied/046_pam_group_example
+++ /dev/null
@@ -1,27 +0,0 @@
-Patch for Debian bug #197080
-
-Don't use the 'games' group as an example in group.conf, this is a
-potential security hole.
-
-Authors: Peter Cordes <peter@llama.nslug.ns.ca>
-
-Upstream status: committed to CVS
-
-Index: Linux-PAM/modules/pam_group/group.conf
-===================================================================
---- Linux-PAM/modules/pam_group/group.conf.orig
-+++ Linux-PAM/modules/pam_group/group.conf
-@@ -88,10 +88,11 @@
- #
- # another example: running 'xsh' on tty* (any ttyXXX device),
- # the user 'sword' is given access to games (through membership of
--# the floppy group) after work hours
-+# the sound and play group) after work hours. (The games group owns
-+# high-score files and so on, so don't ever give users access to it.)
- #
-
--#xsh; tty* ;sword;!Wk0900-1800;games, sound
-+#xsh; tty* ;sword;!Wk0900-1800;sound, play
- #xsh; tty* ;*;Al0900-1800;floppy
-
- #
diff --git a/debian/patches-applied/055_pam_unix_nullok_secure b/debian/patches-applied/055_pam_unix_nullok_secure
index 98e1909d..e62c20d1 100644
--- a/debian/patches-applied/055_pam_unix_nullok_secure
+++ b/debian/patches-applied/055_pam_unix_nullok_secure
@@ -7,11 +7,11 @@ Authors: Sam Hartman <hartmans@debian.org>,
Upstream status: not yet submitted
-Index: Linux-PAM/modules/pam_unix/support.c
+Index: pam.debian/modules/pam_unix/support.c
===================================================================
---- Linux-PAM/modules/pam_unix/support.c.orig
-+++ Linux-PAM/modules/pam_unix/support.c
-@@ -87,15 +87,22 @@
+--- pam.debian.orig/modules/pam_unix/support.c
++++ pam.debian/modules/pam_unix/support.c
+@@ -84,15 +84,22 @@
/* now parse the arguments to this module */
while (argc-- > 0) {
@@ -39,7 +39,7 @@ Index: Linux-PAM/modules/pam_unix/support.c
}
}
-@@ -472,6 +479,17 @@
+@@ -469,6 +476,17 @@
if (salt)
_pam_delete(salt);
@@ -57,8 +57,8 @@ Index: Linux-PAM/modules/pam_unix/support.c
return retval;
}
-@@ -692,7 +710,7 @@
- int salt_len = strlen(salt);
+@@ -689,7 +707,7 @@
+ size_t salt_len = strlen(salt);
if (!salt_len) {
/* the stored password is NULL */
- if (off(UNIX__NONULL, ctrl)) {/* this means we've succeeded */
@@ -66,10 +66,10 @@ Index: Linux-PAM/modules/pam_unix/support.c
D(("user has empty password - access granted"));
retval = PAM_SUCCESS;
} else {
-Index: Linux-PAM/modules/pam_unix/support.h
+Index: pam.debian/modules/pam_unix/support.h
===================================================================
---- Linux-PAM/modules/pam_unix/support.h.orig
-+++ Linux-PAM/modules/pam_unix/support.h
+--- pam.debian.orig/modules/pam_unix/support.h
++++ pam.debian/modules/pam_unix/support.h
@@ -87,8 +87,9 @@
#define UNIX_MAX_PASS_LEN 23 /* internal, for compatibility only */
#define UNIX_MIN_PASS_LEN 24 /* Min length for password */
@@ -98,7 +98,7 @@ Index: Linux-PAM/modules/pam_unix/support.h
};
#define UNIX_DEFAULTS (unix_args[UNIX__NONULL].flag)
-@@ -157,6 +159,9 @@
+@@ -157,5 +159,8 @@
,const void **pass);
extern int _unix_shadowed(const struct passwd *pwd);
@@ -106,26 +106,25 @@ Index: Linux-PAM/modules/pam_unix/support.h
+ const char *uttyname);
+
extern struct spwd *_unix_run_verify_binary(pam_handle_t *pamh, unsigned int ctrl, const char *user);
-
- extern unsigned int pass_min_len;
-Index: Linux-PAM/modules/pam_unix/Makefile.am
+ #endif /* _PAM_UNIX_SUPPORT_H */
+Index: pam.debian/modules/pam_unix/Makefile.am
===================================================================
---- Linux-PAM/modules/pam_unix/Makefile.am.orig
-+++ Linux-PAM/modules/pam_unix/Makefile.am
-@@ -44,6 +44,9 @@
- pam_unix_auth.c pam_unix_passwd.c pam_unix_sess.c support.c \
- yppasswd_xdr.c md5_good.c md5_broken.c obscure.c
-
-+pam_unix_la_LIBADD = \
+--- pam.debian.orig/modules/pam_unix/Makefile.am
++++ pam.debian/modules/pam_unix/Makefile.am
+@@ -30,7 +30,8 @@
+ pam_unix_la_LDFLAGS += -Wl,--version-script=$(srcdir)/../modules.map
+ endif
+ pam_unix_la_LIBADD = @LIBCRACK@ @LIBNSL@ -L$(top_builddir)/libpam -lpam \
+- @LIBCRYPT@ @LIBSELINUX@
++ @LIBCRYPT@ @LIBSELINUX@ \
+ ../pam_securetty/tty_secure.lo
-+
- bigcrypt_SOURCES = bigcrypt.c bigcrypt_main.c
- bigcrypt_CFLAGS = $(AM_CFLAGS)
- bigcrypt_LDFLAGS = @LIBCRYPT@
-Index: Linux-PAM/modules/pam_unix/README
+
+ securelib_LTLIBRARIES = pam_unix.la
+
+Index: pam.debian/modules/pam_unix/README
===================================================================
---- Linux-PAM/modules/pam_unix/README.orig
-+++ Linux-PAM/modules/pam_unix/README
+--- pam.debian.orig/modules/pam_unix/README
++++ pam.debian/modules/pam_unix/README
@@ -57,7 +57,16 @@
The default action of this module is to not permit the user access to a
@@ -144,10 +143,10 @@ Index: Linux-PAM/modules/pam_unix/README
try_first_pass
-Index: Linux-PAM/modules/pam_unix/pam_unix.8
+Index: pam.debian/modules/pam_unix/pam_unix.8
===================================================================
---- Linux-PAM/modules/pam_unix/pam_unix.8.orig
-+++ Linux-PAM/modules/pam_unix/pam_unix.8
+--- pam.debian.orig/modules/pam_unix/pam_unix.8
++++ pam.debian/modules/pam_unix/pam_unix.8
@@ -62,7 +62,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
@@ -164,10 +163,10 @@ Index: Linux-PAM/modules/pam_unix/pam_unix.8
.RE
.PP
\fBtry_first_pass\fR
-Index: Linux-PAM/modules/pam_unix/pam_unix.8.xml
+Index: pam.debian/modules/pam_unix/pam_unix.8.xml
===================================================================
---- Linux-PAM/modules/pam_unix/pam_unix.8.xml.orig
-+++ Linux-PAM/modules/pam_unix/pam_unix.8.xml
+--- pam.debian.orig/modules/pam_unix/pam_unix.8.xml
++++ pam.debian/modules/pam_unix/pam_unix.8.xml
@@ -135,7 +135,24 @@
<para>
The default action of this module is to not permit the
diff --git a/debian/patches-applied/065_pam_unix_cracklib_disable b/debian/patches-applied/065_pam_unix_cracklib_disable
index 26aa0023..7e90796a 100644
--- a/debian/patches-applied/065_pam_unix_cracklib_disable
+++ b/debian/patches-applied/065_pam_unix_cracklib_disable
@@ -1,8 +1,8 @@
-Index: pam/Linux-PAM/modules/pam_unix/Makefile.am
+Index: pam.debian/modules/pam_unix/Makefile.am
===================================================================
---- pam.orig/Linux-PAM/modules/pam_unix/Makefile.am
-+++ pam/Linux-PAM/modules/pam_unix/Makefile.am
-@@ -21,12 +21,9 @@
+--- pam.debian.orig/modules/pam_unix/Makefile.am
++++ pam.debian/modules/pam_unix/Makefile.am
+@@ -21,15 +21,12 @@
if HAVE_LIBSELINUX
AM_CFLAGS += -D"WITH_SELINUX"
endif
@@ -10,9 +10,12 @@ Index: pam/Linux-PAM/modules/pam_unix/Makefile.am
- AM_CFLAGS += -D"USE_CRACKLIB"
-endif
- pam_unix_la_LDFLAGS = -no-undefined -avoid-version -module \
-- @LIBCRACK@ @LIBNSL@ -L$(top_builddir)/libpam -lpam \
-+ @LIBNSL@ -L$(top_builddir)/libpam -lpam \
- @LIBCRYPT@ @LIBSELINUX@
+ pam_unix_la_LDFLAGS = -no-undefined -avoid-version -module
if HAVE_VERSIONING
pam_unix_la_LDFLAGS += -Wl,--version-script=$(srcdir)/../modules.map
+ endif
+-pam_unix_la_LIBADD = @LIBCRACK@ @LIBNSL@ -L$(top_builddir)/libpam -lpam \
++pam_unix_la_LIBADD = @LIBNSL@ -L$(top_builddir)/libpam -lpam \
+ @LIBCRYPT@ @LIBSELINUX@ \
+ ../pam_securetty/tty_secure.lo
+
diff --git a/debian/patches-applied/autoconf.patch b/debian/patches-applied/autoconf.patch
index 5fcad54d..24e6e701 100644
--- a/debian/patches-applied/autoconf.patch
+++ b/debian/patches-applied/autoconf.patch
@@ -3,35 +3,92 @@ The process for refreshing this patch is:
export QUILT_PATCHES=debian/patches-applied
quilt push autoconf.patch # to get everything applied up to this point
quilt push -f autoconf.patch # to override the errors when applying
- (cd Linux-PAM && autoheader && aclocal -I m4 && automake && autoconf)
+ autoheader && aclocal -I m4 && automake && autoconf
quilt refresh
find . -name '*.rej' | xargs rm
-Index: pam.deb/Makefile.in
+Index: pam.debian/Makefile.in
===================================================================
---- pam.deb.orig/Makefile.in
-+++ pam.deb/Makefile.in
+--- pam.debian.orig/Makefile.in
++++ pam.debian/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -39,7 +39,7 @@
+@@ -17,11 +17,15 @@
+ #
+ # Copyright (c) 2005, 2006, 2007 Thorsten Kukuk <kukuk@thkukuk.de>
+ #
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = .
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -35,12 +39,12 @@
+ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
+-subdir = .
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
$(top_srcdir)/configure ABOUT-NLS AUTHORS COPYING ChangeLog \
-- INSTALL NEWS compile config.guess config.rpath config.sub \
-+ INSTALL NEWS TODO compile config.guess config.rpath config.sub \
+ INSTALL NEWS compile config.guess config.rpath config.sub \
depcomp install-sh ltmain.sh missing mkinstalldirs ylwrap
++subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
-@@ -104,6 +104,7 @@
+ $(top_srcdir)/m4/iconv.m4 \
+@@ -54,7 +58,7 @@
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+- configure.lineno config.status.lineno
++ configure.lineno configure.status.lineno
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = config.h
+ CONFIG_CLEAN_FILES =
+@@ -62,13 +66,10 @@
+ DIST_SOURCES =
+ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ html-recursive info-recursive install-data-recursive \
+- install-dvi-recursive install-exec-recursive \
+- install-html-recursive install-info-recursive \
+- install-pdf-recursive install-ps-recursive install-recursive \
+- installcheck-recursive installdirs-recursive pdf-recursive \
+- ps-recursive uninstall-recursive
+-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+- distclean-recursive maintainer-clean-recursive
++ install-exec-recursive install-info-recursive \
++ install-recursive installcheck-recursive installdirs-recursive \
++ pdf-recursive ps-recursive uninstall-info-recursive \
++ uninstall-recursive
+ ETAGS = etags
+ CTAGS = ctags
+ DIST_SUBDIRS = libpam tests libpamc libpam_misc modules po conf doc \
+@@ -85,6 +86,8 @@
+ distuninstallcheck_listfiles = find . -type f -print
+ distcleancheck_listfiles = find . -type f -print
+ ACLOCAL = @ACLOCAL@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AUTOCONF = @AUTOCONF@
+@@ -104,11 +107,16 @@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -39,7 +96,40 @@ Index: pam.deb/Makefile.in
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -156,6 +157,7 @@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
++ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
++ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
++ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -117,7 +125,18 @@
+ GMSGFMT_015 = @GMSGFMT_015@
+ GREP = @GREP@
+ HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
+-INSTALL = @INSTALL@
++HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
++HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
++HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
++HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
++HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
++HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
++HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
++HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
++HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
++HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
++HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
++HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -152,10 +171,10 @@
+ LTLIBINTL = @LTLIBINTL@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+-MKDIR_P = @MKDIR_P@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
@@ -47,98 +137,233 @@ Index: pam.deb/Makefile.in
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -171,6 +173,7 @@
- RANLIB = @RANLIB@
- SCONFIGDIR = @SCONFIGDIR@
- SECUREDIR = @SECUREDIR@
-+SED = @SED@
+@@ -174,6 +193,8 @@
+ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
++STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
++STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
STRIP = @STRIP@
-@@ -398,8 +401,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
-@@ -424,8 +427,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -435,13 +438,12 @@
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-@@ -517,6 +519,10 @@
- tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+@@ -187,13 +208,13 @@
+ XSLTPROC = @XSLTPROC@
+ YACC = @YACC@
+ YFLAGS = @YFLAGS@
+-abs_builddir = @abs_builddir@
+-abs_srcdir = @abs_srcdir@
+-abs_top_builddir = @abs_top_builddir@
+-abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -205,7 +226,6 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+-builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -236,11 +256,8 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+-srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_builddir = @top_builddir@
+-top_srcdir = @top_srcdir@
+ AUTOMAKE_OPTIONS = 1.9 gnu dist-bzip2 check-news
+ @STATIC_MODULES_FALSE@SUBDIRS = libpam tests libpamc libpam_misc modules po conf doc examples xtests
+ @STATIC_MODULES_TRUE@SUBDIRS = modules libpam libpamc libpam_misc tests po conf doc examples xtests
+@@ -301,7 +318,7 @@
+ config.h: stamp-h1
+ @if test ! -f $@; then \
+ rm -f stamp-h1; \
+- $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
++ $(MAKE) stamp-h1; \
+ else :; fi
+
+ stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
+@@ -323,6 +340,7 @@
+
+ distclean-libtool:
+ -rm -f libtool
++uninstall-info-am:
+
+ # This directory's subdirectories are mostly independent; you can cd
+ # into them and run `make' without going through this Makefile.
+@@ -355,7 +373,8 @@
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ fi; test -z "$$fail"
+
+-$(RECURSIVE_CLEAN_TARGETS):
++mostlyclean-recursive clean-recursive distclean-recursive \
++maintainer-clean-recursive:
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+@@ -463,22 +482,24 @@
+ exit 1;; \
+ esac
$(am__remove_distdir)
-
-+dist-lzma: distdir
-+ tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
-+ $(am__remove_distdir)
-+
- dist-tarZ: distdir
- tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
+- test -d $(distdir) || mkdir $(distdir)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- list='$(DISTFILES)'; \
+- dist_files=`for file in $$list; do echo $$file; done | \
+- sed -e "s|^$$srcdirstrip/||;t" \
+- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+- case $$dist_files in \
+- */*) $(MKDIR_P) `echo "$$dist_files" | \
+- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+- sort -u` ;; \
+- esac; \
+- for file in $$dist_files; do \
++ mkdir $(distdir)
++ $(mkdir_p) $(distdir)/m4 $(distdir)/po
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
+ if test -d $$d/$$file; then \
+- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -492,7 +513,7 @@
+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -d "$(distdir)/$$subdir" \
+- || $(MKDIR_P) "$(distdir)/$$subdir" \
++ || $(mkdir_p) "$(distdir)/$$subdir" \
+ || exit 1; \
+ distdir=`$(am__cd) $(distdir) && pwd`; \
+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+@@ -500,8 +521,6 @@
+ $(MAKE) $(AM_MAKEFLAGS) \
+ top_distdir="$$top_distdir" \
+ distdir="$$distdir/$$subdir" \
+- am__remove_distdir=: \
+- am__skip_length_check=: \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -509,7 +528,7 @@
+ -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
+ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
+- ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
++ ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
+ || chmod -R a+r $(distdir)
+ dist-gzip: distdir
+ tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+@@ -584,7 +603,7 @@
$(am__remove_distdir)
-@@ -544,6 +550,8 @@
- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
- *.tar.bz2*) \
- bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
-+ *.tar.lzma*) \
-+ unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
- *.tar.Z*) \
- uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
- *.shar.gz*) \
-@@ -696,8 +704,8 @@
- .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
- all all-am am--refresh check check-am clean clean-generic \
- clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
+ @(echo "$(distdir) archives ready for distribution: "; \
+ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
+- sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
++ sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
+ distuninstallcheck:
+ @cd $(distuninstallcheck_dir) \
+ && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
+@@ -655,20 +674,12 @@
+
+ install-data-am:
+
+-install-dvi: install-dvi-recursive
+-
+ install-exec-am:
+
+-install-html: install-html-recursive
+-
+ install-info: install-info-recursive
+
+ install-man:
+
+-install-pdf: install-pdf-recursive
+-
+-install-ps: install-ps-recursive
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-recursive
+@@ -689,26 +700,24 @@
+
+ ps-am:
+
+-uninstall-am:
++uninstall-am: uninstall-info-am
+
+-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+- install-strip
++uninstall-info: uninstall-info-recursive
+
+-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+- all all-am am--refresh check check-am clean clean-generic \
+- clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
- dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \
-- distclean-generic distclean-hdr distclean-libtool \
-+ dist-gzip dist-lzma dist-shar dist-tarZ dist-zip distcheck \
-+ distclean distclean-generic distclean-hdr distclean-libtool \
- distclean-tags distcleancheck distdir distuninstallcheck dvi \
- dvi-am html html-am info info-am install install-am \
- install-data install-data-am install-dvi install-dvi-am \
-Index: pam.deb/aclocal.m4
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
++ check-am clean clean-generic clean-libtool clean-recursive \
++ ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
++ dist-shar dist-tarZ dist-zip distcheck distclean \
+ distclean-generic distclean-hdr distclean-libtool \
+- distclean-tags distcleancheck distdir distuninstallcheck dvi \
+- dvi-am html html-am info info-am install install-am \
+- install-data install-data-am install-dvi install-dvi-am \
+- install-exec install-exec-am install-html install-html-am \
+- install-info install-info-am install-man install-pdf \
+- install-pdf-am install-ps install-ps-am install-strip \
+- installcheck installcheck-am installdirs installdirs-am \
+- maintainer-clean maintainer-clean-generic mostlyclean \
+- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+- tags tags-recursive uninstall uninstall-am
++ distclean-recursive distclean-tags distcleancheck distdir \
++ distuninstallcheck dvi dvi-am html html-am info info-am \
++ install install-am install-data install-data-am install-exec \
++ install-exec-am install-info install-info-am install-man \
++ install-strip installcheck installcheck-am installdirs \
++ installdirs-am maintainer-clean maintainer-clean-generic \
++ maintainer-clean-recursive mostlyclean mostlyclean-generic \
++ mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
++ tags tags-recursive uninstall uninstall-am uninstall-info-am
+
+
+ release: dist releasedocs
+Index: pam.debian/aclocal.m4
===================================================================
---- pam.deb.orig/aclocal.m4
-+++ pam.deb/aclocal.m4
+--- pam.debian.orig/aclocal.m4
++++ pam.debian/aclocal.m4
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.10 -*- Autoconf -*-
-+# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
++# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006 Free Software Foundation, Inc.
-+# 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2005 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -11,14 +11,17 @@
+@@ -11,14 +11,9 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
@@ -146,22 +371,15 @@ Index: pam.deb/aclocal.m4
-[m4_fatal([this file was generated for autoconf 2.61.
-You have another version of autoconf. If you want to use that,
-you should regenerate the build system entirely.], [63])])
-+m4_ifndef([AC_AUTOCONF_VERSION],
-+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-+m4_if(AC_AUTOCONF_VERSION, [2.61],,
-+[m4_warning([this file was generated for autoconf 2.61.
-+You have another version of autoconf. It may work, but is not guaranteed to.
-+If you have problems, you may need to regenerate the build system entirely.
-+To do so, use the procedure documented by the package, typically `autoreconf'.])])
-
+-
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
--# serial 48 AC_PROG_LIBTOOL
-+# serial 52 Debian 1.5.26-4 AC_PROG_LIBTOOL
+-# serial 51 AC_PROG_LIBTOOL
++# serial 52 Debian 1.5.26-1ubuntu1 AC_PROG_LIBTOOL
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-@@ -106,7 +109,6 @@
+@@ -106,7 +101,6 @@
AC_REQUIRE([AC_OBJEXT])dnl
AC_REQUIRE([AC_EXEEXT])dnl
dnl
@@ -169,16 +387,7 @@ Index: pam.deb/aclocal.m4
AC_LIBTOOL_SYS_MAX_CMD_LEN
AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
AC_LIBTOOL_OBJDIR
-@@ -181,7 +183,7 @@
- test -z "$ac_objext" && ac_objext=o
-
- # Determine commands to create old-style static archives.
--old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
-+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
- old_postinstall_cmds='chmod 644 $oldlib'
- old_postuninstall_cmds=
-
-@@ -208,6 +210,8 @@
+@@ -208,6 +202,8 @@
;;
esac
@@ -187,27 +396,8 @@ Index: pam.deb/aclocal.m4
AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
enable_win32_dll=yes, enable_win32_dll=no)
-@@ -268,8 +272,9 @@
- # Check for compiler boilerplate output or warnings with
- # the simple compiler test code.
- AC_DEFUN([_LT_COMPILER_BOILERPLATE],
--[ac_outfile=conftest.$ac_objext
--printf "$lt_simple_compile_test_code" >conftest.$ac_ext
-+[AC_REQUIRE([LT_AC_PROG_SED])dnl
-+ac_outfile=conftest.$ac_objext
-+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
- eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
- _lt_compiler_boilerplate=`cat conftest.err`
- $rm conftest*
-@@ -281,13 +286,85 @@
- # Check for linker boilerplate output or warnings with
- # the simple link test code.
- AC_DEFUN([_LT_LINKER_BOILERPLATE],
--[ac_outfile=conftest.$ac_objext
--printf "$lt_simple_link_test_code" >conftest.$ac_ext
-+[AC_REQUIRE([LT_AC_PROG_SED])dnl
-+ac_outfile=conftest.$ac_objext
-+echo "$lt_simple_link_test_code" >conftest.$ac_ext
+@@ -287,9 +283,80 @@
+ echo "$lt_simple_link_test_code" >conftest.$ac_ext
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
-$rm conftest*
@@ -288,62 +478,7 @@ Index: pam.deb/aclocal.m4
# _LT_AC_SYS_LIBPATH_AIX
# ----------------------
-@@ -298,12 +375,20 @@
- # If we don't find anything, use the default library path according
- # to the aix ld manual.
- AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
--[AC_LINK_IFELSE(AC_LANG_PROGRAM,[
--aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
--}'`
-+[AC_REQUIRE([LT_AC_PROG_SED])dnl
-+AC_LINK_IFELSE(AC_LANG_PROGRAM,[
-+lt_aix_libpath_sed='
-+ /Import File Strings/,/^$/ {
-+ /^0/ {
-+ s/^0 *\(.*\)$/\1/
-+ p
-+ }
-+ }'
-+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- # Check for a 64-bit object if we didn't find anything.
--if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
--}'`; fi],[])
-+if test -z "$aix_libpath"; then
-+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-+fi],[])
- if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- ])# _LT_AC_SYS_LIBPATH_AIX
-
-@@ -534,13 +619,17 @@
- rm -rf conftest*
- ;;
-
--x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
-+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
-+s390*-*linux*|sparc*-*linux*)
- # Find out which ABI we are using.
- echo 'int i;' > conftest.$ac_ext
- if AC_TRY_EVAL(ac_compile); then
- case `/usr/bin/file conftest.o` in
- *32-bit*)
- case $host in
-+ x86_64-*kfreebsd*-gnu)
-+ LD="${LD-ld} -m elf_i386_fbsd"
-+ ;;
- x86_64-*linux*)
- LD="${LD-ld} -m elf_i386"
- ;;
-@@ -557,6 +646,9 @@
- ;;
- *64-bit*)
- case $host in
-+ x86_64-*kfreebsd*-gnu)
-+ LD="${LD-ld} -m elf_x86_64_fbsd"
-+ ;;
- x86_64-*linux*)
- LD="${LD-ld} -m elf_x86_64"
- ;;
-@@ -597,7 +689,11 @@
+@@ -614,7 +681,11 @@
*64-bit*)
case $lt_cv_prog_gnu_ld in
yes*) LD="${LD-ld} -m elf64_sparc" ;;
@@ -356,31 +491,7 @@ Index: pam.deb/aclocal.m4
esac
;;
esac
-@@ -628,7 +724,7 @@
- AC_CACHE_CHECK([$1], [$2],
- [$2=no
- ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
-- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- lt_compiler_flag="$3"
- # Insert the option either (1) after the last *FLAGS variable, or
- # (2) before a word containing "conftest.", or (3) at the end.
-@@ -669,11 +765,12 @@
- # ------------------------------------------------------------
- # Check whether the given compiler option works
- AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
--[AC_CACHE_CHECK([$1], [$2],
-+[AC_REQUIRE([LT_AC_PROG_SED])dnl
-+AC_CACHE_CHECK([$1], [$2],
- [$2=no
- save_LDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS $3"
-- printf "$lt_simple_link_test_code" > conftest.$ac_ext
-+ echo "$lt_simple_link_test_code" > conftest.$ac_ext
- if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
- # The linker can only warn and ignore the option if not recognized
- # So say no if there are warnings
-@@ -689,7 +786,7 @@
+@@ -707,7 +778,7 @@
$2=yes
fi
fi
@@ -389,52 +500,7 @@ Index: pam.deb/aclocal.m4
LDFLAGS="$save_LDFLAGS"
])
-@@ -787,24 +884,27 @@
- fi
- ;;
- *)
-- # If test is not a shell built-in, we'll probably end up computing a
-- # maximum length that is only half of the actual maximum length, but
-- # we can't tell.
-- SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-- while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
-+ lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
-+ if test -n "$lt_cv_sys_max_cmd_len"; then
-+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-+ else
-+ SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-+ while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
- = "XX$teststring") >/dev/null 2>&1 &&
-- new_result=`expr "X$teststring" : ".*" 2>&1` &&
-- lt_cv_sys_max_cmd_len=$new_result &&
-- test $i != 17 # 1/2 MB should be enough
-- do
-- i=`expr $i + 1`
-- teststring=$teststring$teststring
-- done
-- teststring=
-- # Add a significant safety factor because C++ compilers can tack on massive
-- # amounts of additional arguments before passing them to the linker.
-- # It appears as though 1/2 is a usable value.
-- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
-+ new_result=`expr "X$teststring" : ".*" 2>&1` &&
-+ lt_cv_sys_max_cmd_len=$new_result &&
-+ test $i != 17 # 1/2 MB should be enough
-+ do
-+ i=`expr $i + 1`
-+ teststring=$teststring$teststring
-+ done
-+ teststring=
-+ # Add a significant safety factor because C++ compilers can tack on massive
-+ # amounts of additional arguments before passing them to the linker.
-+ # It appears as though 1/2 is a usable value.
-+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
-+ fi
- ;;
- esac
- ])
-@@ -957,7 +1057,7 @@
+@@ -978,7 +1049,7 @@
AC_CHECK_FUNC([shl_load],
[lt_cv_dlopen="shl_load"],
[AC_CHECK_LIB([dld], [shl_load],
@@ -443,7 +509,7 @@ Index: pam.deb/aclocal.m4
[AC_CHECK_FUNC([dlopen],
[lt_cv_dlopen="dlopen"],
[AC_CHECK_LIB([dl], [dlopen],
-@@ -965,7 +1065,7 @@
+@@ -986,7 +1057,7 @@
[AC_CHECK_LIB([svld], [dlopen],
[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
[AC_CHECK_LIB([dld], [dld_link],
@@ -452,108 +518,7 @@ Index: pam.deb/aclocal.m4
])
])
])
-@@ -1031,7 +1131,8 @@
- # ---------------------------------
- # Check to see if options -c and -o are simultaneously supported by compiler
- AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
--[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
-+[AC_REQUIRE([LT_AC_PROG_SED])dnl
-+AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
- AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
- [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
- [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
-@@ -1039,7 +1140,7 @@
- mkdir conftest
- cd conftest
- mkdir out
-- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
- lt_compiler_flag="-o out/conftest2.$ac_objext"
- # Insert the option either (1) after the last *FLAGS variable, or
-@@ -1179,6 +1280,7 @@
- darwin*)
- if test -n "$STRIP" ; then
- striplib="$STRIP -x"
-+ old_striplib="$STRIP -S"
- AC_MSG_RESULT([yes])
- else
- AC_MSG_RESULT([no])
-@@ -1196,7 +1298,8 @@
- # -----------------------------
- # PORTME Fill in your ld.so characteristics
- AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
--[AC_MSG_CHECKING([dynamic linker characteristics])
-+[AC_REQUIRE([LT_AC_PROG_SED])dnl
-+AC_MSG_CHECKING([dynamic linker characteristics])
- library_names_spec=
- libname_spec='lib$name'
- soname_spec=
-@@ -1210,20 +1313,58 @@
- version_type=none
- dynamic_linker="$host_os ld.so"
- sys_lib_dlsearch_path_spec="/lib /usr/lib"
-+m4_if($1,[],[
- if test "$GCC" = yes; then
-- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-- if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
-+ case $host_os in
-+ darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
-+ *) lt_awk_arg="/^libraries:/" ;;
-+ esac
-+ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-+ if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then
- # if the path contains ";" then we assume it to be the separator
- # otherwise default to the standard path separator (i.e. ":") - it is
- # assumed that no part of a normal pathname contains ";" but that should
- # okay in the real world where ";" in dirpaths is itself problematic.
-- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-+ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'`
- else
-- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-+ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
- fi
-+ # Ok, now we have the path, separated by spaces, we can step through it
-+ # and add multilib dir if necessary.
-+ lt_tmp_lt_search_path_spec=
-+ lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
-+ for lt_sys_path in $lt_search_path_spec; do
-+ if test -d "$lt_sys_path/$lt_multi_os_dir"; then
-+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
-+ else
-+ test -d "$lt_sys_path" && \
-+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
-+ fi
-+ done
-+ lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk '
-+BEGIN {RS=" "; FS="/|\n";} {
-+ lt_foo="";
-+ lt_count=0;
-+ for (lt_i = NF; lt_i > 0; lt_i--) {
-+ if ($lt_i != "" && $lt_i != ".") {
-+ if ($lt_i == "..") {
-+ lt_count++;
-+ } else {
-+ if (lt_count == 0) {
-+ lt_foo="/" $lt_i lt_foo;
-+ } else {
-+ lt_count--;
-+ }
-+ }
-+ }
-+ }
-+ if (lt_foo != "") { lt_freq[[lt_foo]]++; }
-+ if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
-+}'`
-+ sys_lib_search_path_spec=`echo $lt_search_path_spec`
- else
- sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
--fi
-+fi])
- need_lib_prefix=unknown
- hardcode_into_libs=no
-
-@@ -1241,7 +1382,7 @@
+@@ -1303,7 +1374,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
;;
@@ -562,106 +527,26 @@ Index: pam.deb/aclocal.m4
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -1380,12 +1521,8 @@
- shlibpath_overrides_runpath=yes
- shlibpath_var=DYLD_LIBRARY_PATH
- shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-- if test "$GCC" = yes; then
-- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-- else
-- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-- fi
-+ m4_if([$1], [],[
-+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"])
- sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
- ;;
-
-@@ -1402,18 +1539,6 @@
- dynamic_linker=no
- ;;
-
--kfreebsd*-gnu)
-- version_type=linux
-- need_lib_prefix=no
-- need_version=no
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-- soname_spec='${libname}${release}${shared_ext}$major'
-- shlibpath_var=LD_LIBRARY_PATH
-- shlibpath_overrides_runpath=no
-- hardcode_into_libs=yes
-- dynamic_linker='GNU ld.so'
-- ;;
--
- freebsd* | dragonfly*)
- # DragonFly does not have aout. When/if they implement a new
- # versioning mechanism, adjust this.
-@@ -1451,7 +1576,7 @@
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- ;;
-- freebsd*) # from 4.6 on
-+ *) # from 4.6 on, and DragonFly
- shlibpath_overrides_runpath=yes
- hardcode_into_libs=yes
- ;;
-@@ -1514,7 +1639,7 @@
- postinstall_cmds='chmod 555 $lib'
- ;;
-
--interix3*)
-+interix[[3-9]]*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-@@ -1569,7 +1694,7 @@
- ;;
-
- # This must be Linux ELF.
--linux*)
-+linux* | k*bsd*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-@@ -1585,7 +1710,7 @@
-
- # Append ld.so.conf contents to the search path
- if test -f /etc/ld.so.conf; then
-- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
- fi
-
-@@ -1598,7 +1723,7 @@
+@@ -1644,6 +1715,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
--knetbsd*-gnu)
+netbsdelf*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-@@ -1607,7 +1732,7 @@
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
-- dynamic_linker='GNU ld.so'
++ version_type=linux
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=no
++ hardcode_into_libs=yes
+ dynamic_linker='NetBSD ld.elf_so'
- ;;
-
- netbsd*)
-@@ -1691,6 +1816,10 @@
- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
- ;;
-
-+rdos*)
-+ dynamic_linker=no
+ ;;
+
- solaris*)
- version_type=linux
+ netbsd*)
+ version_type=sunos
need_lib_prefix=no
-@@ -1786,6 +1915,13 @@
+@@ -1824,6 +1907,13 @@
AC_MSG_RESULT([$dynamic_linker])
test "$dynamic_linker" = no && can_build_shared=no
@@ -675,44 +560,7 @@ Index: pam.deb/aclocal.m4
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
if test "$GCC" = yes; then
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-@@ -1796,7 +1932,8 @@
- # _LT_AC_TAGCONFIG
- # ----------------
- AC_DEFUN([_LT_AC_TAGCONFIG],
--[AC_ARG_WITH([tags],
-+[AC_REQUIRE([LT_AC_PROG_SED])dnl
-+AC_ARG_WITH([tags],
- [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
- [include additional configurations @<:@automatic@:>@])],
- [tagnames="$withval"])
-@@ -2057,7 +2194,7 @@
-
- # AC_PATH_TOOL_PREFIX
- # -------------------
--# find a file program which can recognise shared library
-+# find a file program which can recognize shared library
- AC_DEFUN([AC_PATH_TOOL_PREFIX],
- [AC_REQUIRE([AC_PROG_EGREP])dnl
- AC_MSG_CHECKING([for $1])
-@@ -2120,7 +2257,7 @@
-
- # AC_PATH_MAGIC
- # -------------
--# find a file program which can recognise a shared library
-+# find a file program which can recognize a shared library
- AC_DEFUN([AC_PATH_MAGIC],
- [AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
- if test -z "$lt_cv_path_MAGIC_CMD"; then
-@@ -2267,7 +2404,7 @@
- # how to check for library dependencies
- # -- PORTME fill in with the dynamic library characteristics
- AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
--[AC_CACHE_CHECK([how to recognise dependent libraries],
-+[AC_CACHE_CHECK([how to recognize dependent libraries],
- lt_cv_deplibs_check_method,
- [lt_cv_file_magic_cmd='$MAGIC_CMD'
- lt_cv_file_magic_test_file=
-@@ -2284,7 +2421,7 @@
+@@ -2323,7 +2413,7 @@
# whether `pass_all' will *always* work, you probably want this one.
case $host_os in
@@ -721,48 +569,7 @@ Index: pam.deb/aclocal.m4
lt_cv_deplibs_check_method=pass_all
;;
-@@ -2306,16 +2443,22 @@
-
- mingw* | pw32*)
- # Base MSYS/MinGW do not provide the 'file' command needed by
-- # func_win32_libid shell function, so use a weaker test based on 'objdump'.
-- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-- lt_cv_file_magic_cmd='$OBJDUMP -f'
-+ # func_win32_libid shell function, so use a weaker test based on 'objdump',
-+ # unless we find 'file', for example because we are cross-compiling.
-+ if ( file / ) >/dev/null 2>&1; then
-+ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-+ lt_cv_file_magic_cmd='func_win32_libid'
-+ else
-+ lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-+ lt_cv_file_magic_cmd='$OBJDUMP -f'
-+ fi
- ;;
-
- darwin* | rhapsody*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
--freebsd* | kfreebsd*-gnu | dragonfly*)
-+freebsd* | dragonfly*)
- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
- case $host_cpu in
- i*86 )
-@@ -2353,7 +2496,7 @@
- esac
- ;;
-
--interix3*)
-+interix[[3-9]]*)
- # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
- ;;
-@@ -2369,11 +2512,11 @@
- ;;
-
- # This must be Linux ELF.
--linux*)
-+linux* | k*bsd*-gnu)
+@@ -2418,7 +2508,7 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -771,40 +578,7 @@ Index: pam.deb/aclocal.m4
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
else
-@@ -2403,6 +2546,10 @@
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-+rdos*)
-+ lt_cv_deplibs_check_method=pass_all
-+ ;;
-+
- solaris*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-@@ -2455,7 +2602,7 @@
- lt_cv_path_NM="$NM"
- else
- lt_nm_to_check="${ac_tool_prefix}nm"
-- if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
-+ if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
- lt_nm_to_check="$lt_nm_to_check nm"
- fi
- for lt_tmp_nm in $lt_nm_to_check; do
-@@ -2671,10 +2818,10 @@
- _LT_AC_TAGVAR(objext, $1)=$objext
-
- # Code to be used in simple compile tests
--lt_simple_compile_test_code="int some_variable = 0;\n"
-+lt_simple_compile_test_code="int some_variable = 0;"
-
- # Code to be used in simple link tests
--lt_simple_link_test_code='int main(){return(0);}\n'
-+lt_simple_link_test_code='int main(){return(0);}'
-
- _LT_AC_SYS_COMPILER
-
-@@ -2710,7 +2857,7 @@
+@@ -2759,7 +2849,7 @@
fi
;;
@@ -813,7 +587,7 @@ Index: pam.deb/aclocal.m4
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
-@@ -2767,6 +2914,7 @@
+@@ -2816,6 +2906,7 @@
_LT_AC_TAGVAR(predeps, $1)=
_LT_AC_TAGVAR(postdeps, $1)=
_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
@@ -821,20 +595,7 @@ Index: pam.deb/aclocal.m4
# Source file extension for C++ test sources.
ac_ext=cpp
-@@ -2776,10 +2924,10 @@
- _LT_AC_TAGVAR(objext, $1)=$objext
-
- # Code to be used in simple compile tests
--lt_simple_compile_test_code="int some_variable = 0;\n"
-+lt_simple_compile_test_code="int some_variable = 0;"
-
- # Code to be used in simple link tests
--lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }\n'
-+lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
-
- # ltmain only uses $CC for tagged configurations so make sure $CC is set.
- _LT_AC_SYS_COMPILER
-@@ -2876,7 +3024,7 @@
+@@ -2925,7 +3016,7 @@
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
@@ -843,7 +604,7 @@ Index: pam.deb/aclocal.m4
if test "$host_cpu" = ia64; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
-@@ -2889,7 +3037,7 @@
+@@ -2938,7 +3029,7 @@
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
# need to do runtime linking.
@@ -852,16 +613,7 @@ Index: pam.deb/aclocal.m4
for ld_flag in $LDFLAGS; do
case $ld_flag in
*-brtl*)
-@@ -2925,7 +3073,7 @@
- strings "$collect2name" | grep resolve_lib_name >/dev/null
- then
- # We have reworked collect2
-- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+ :
- else
- # We have old collect2
- _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-@@ -3035,59 +3183,31 @@
+@@ -3084,51 +3175,23 @@
fi
;;
darwin* | rhapsody*)
@@ -922,55 +674,7 @@ Index: pam.deb/aclocal.m4
else
case $cc_basename in
xlc*)
- output_verbose_link_cmd='echo'
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- ;;
- *)
-@@ -3121,7 +3241,7 @@
- freebsd-elf*)
- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
- ;;
-- freebsd* | kfreebsd*-gnu | dragonfly*)
-+ freebsd* | dragonfly*)
- # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
- # conventions
- _LT_AC_TAGVAR(ld_shlibs, $1)=yes
-@@ -3170,9 +3290,7 @@
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
- case $host_cpu in
-- hppa*64*|ia64*)
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
-- ;;
-+ hppa*64*|ia64*) ;;
- *)
- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
- ;;
-@@ -3240,7 +3358,7 @@
- ;;
- esac
- ;;
-- interix3*)
-+ interix[[3-9]]*)
- _LT_AC_TAGVAR(hardcode_direct, $1)=no
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-@@ -3280,7 +3398,7 @@
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
- ;;
-- linux*)
-+ linux* | k*bsd*-gnu)
- case $cc_basename in
- KCC*)
- # Kuck and Associates, Inc. (KAI) C++ Compiler
-@@ -3332,7 +3450,7 @@
+@@ -3379,7 +3442,7 @@
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
;;
@@ -979,37 +683,7 @@ Index: pam.deb/aclocal.m4
# Portland Group C++ compiler
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-@@ -3360,6 +3478,29 @@
- # dependencies.
- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
- ;;
-+ *)
-+ case `$CC -V 2>&1 | sed 5q` in
-+ *Sun\ C*)
-+ # Sun C++ 5.9
-+ _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-+
-+ # Not sure whether something based on
-+ # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
-+ # would be better.
-+ output_verbose_link_cmd='echo'
-+
-+ # Archives containing C++ object files must be created using
-+ # "CC -xar", where "CC" is the Sun C++ compiler. This is
-+ # necessary to make sure instantiated templates are included
-+ # in the archive.
-+ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
-+ ;;
-+ esac
-+ ;;
- esac
- ;;
- lynxos*)
-@@ -3382,7 +3523,7 @@
+@@ -3452,7 +3515,7 @@
;;
esac
;;
@@ -1018,69 +692,7 @@ Index: pam.deb/aclocal.m4
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
wlarc=
-@@ -3398,16 +3539,20 @@
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
- openbsd*)
-- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+ if test -f /usr/libexec/ld.so; then
-+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+ fi
-+ output_verbose_link_cmd='echo'
-+ else
-+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
- fi
-- output_verbose_link_cmd='echo'
- ;;
- osf3*)
- case $cc_basename in
-@@ -3569,15 +3714,10 @@
- case $host_os in
- solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
- *)
-- # The C++ compiler is used as linker so we must use $wl
-- # flag to pass the commands to the underlying system
-- # linker. We must also pass each convience library through
-- # to the system linker between allextract/defaultextract.
-- # The C++ compiler will combine linker options so we
-- # cannot just pass the convience library names through
-- # without $wl.
-+ # The compiler driver will combine and reorder linker options,
-+ # but understands `-z linker_flag'.
- # Supported since Solaris 2.6 (maybe 2.5.1?)
-- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
-+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
- ;;
- esac
- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-@@ -3624,6 +3764,12 @@
- fi
-
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
-+ case $host_os in
-+ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-+ *)
-+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-+ ;;
-+ esac
- fi
- ;;
- esac
-@@ -3739,7 +3885,8 @@
+@@ -3814,7 +3877,8 @@
# compiler output when linking a shared library.
# Parse the compiler output and extract the necessary
# objects, libraries and library flags.
@@ -1090,7 +702,7 @@ Index: pam.deb/aclocal.m4
dnl we can't use the lt_simple_compile_test_code here,
dnl because it contains code intended for an executable,
dnl not a library. It's possible we should let each
-@@ -3864,10 +4011,15 @@
+@@ -3939,6 +4003,11 @@
$rm -f confest.$objext
@@ -1102,58 +714,7 @@ Index: pam.deb/aclocal.m4
# PORTME: override above test on systems where it is broken
ifelse([$1],[CXX],
[case $host_os in
--interix3*)
-+interix[[3-9]]*)
- # Interix 3.5 installs completely hosed .la files for C++, so rather than
- # hack all around it, let's just trust "g++" to DTRT.
- _LT_AC_TAGVAR(predep_objects,$1)=
-@@ -3875,19 +4027,51 @@
- _LT_AC_TAGVAR(postdeps,$1)=
- ;;
-
-+linux*)
-+ case `$CC -V 2>&1 | sed 5q` in
-+ *Sun\ C*)
-+ # Sun C++ 5.9
-+ #
-+ # The more standards-conforming stlport4 library is
-+ # incompatible with the Cstd library. Avoid specifying
-+ # it if it's in CXXFLAGS. Ignore libCrun as
-+ # -library=stlport4 depends on it.
-+ case " $CXX $CXXFLAGS " in
-+ *" -library=stlport4 "*)
-+ solaris_use_stlport4=yes
-+ ;;
-+ esac
-+ if test "$solaris_use_stlport4" != yes; then
-+ _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
-+ fi
-+ ;;
-+ esac
-+ ;;
-+
- solaris*)
- case $cc_basename in
- CC*)
-+ # The more standards-conforming stlport4 library is
-+ # incompatible with the Cstd library. Avoid specifying
-+ # it if it's in CXXFLAGS. Ignore libCrun as
-+ # -library=stlport4 depends on it.
-+ case " $CXX $CXXFLAGS " in
-+ *" -library=stlport4 "*)
-+ solaris_use_stlport4=yes
-+ ;;
-+ esac
-+
- # Adding this requires a known-good setup of shared libraries for
- # Sun compiler versions before 5.6, else PIC objects from an old
- # archive will be linked into the output, leading to subtle bugs.
-- _LT_AC_TAGVAR(postdeps,$1)='-lCstd -lCrun'
-+ if test "$solaris_use_stlport4" != yes; then
-+ _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
-+ fi
- ;;
- esac
+@@ -3995,7 +4064,6 @@
;;
esac
])
@@ -1161,27 +722,7 @@ Index: pam.deb/aclocal.m4
case " $_LT_AC_TAGVAR(postdeps, $1) " in
*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
esac
-@@ -3930,10 +4114,17 @@
- _LT_AC_TAGVAR(objext, $1)=$objext
-
- # Code to be used in simple compile tests
--lt_simple_compile_test_code=" subroutine t\n return\n end\n"
-+lt_simple_compile_test_code="\
-+ subroutine t
-+ return
-+ end
-+"
-
- # Code to be used in simple link tests
--lt_simple_link_test_code=" program t\n end\n"
-+lt_simple_link_test_code="\
-+ program t
-+ end
-+"
-
- # ltmain only uses $CC for tagged configurations so make sure $CC is set.
- _LT_AC_SYS_COMPILER
-@@ -3965,7 +4156,7 @@
+@@ -4080,7 +4148,7 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -1190,29 +731,7 @@ Index: pam.deb/aclocal.m4
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
-@@ -4012,10 +4203,10 @@
- _LT_AC_TAGVAR(objext, $1)=$objext
-
- # Code to be used in simple compile tests
--lt_simple_compile_test_code="class foo {}\n"
-+lt_simple_compile_test_code="class foo {}"
-
- # Code to be used in simple link tests
--lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }\n'
-+lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
-
- # ltmain only uses $CC for tagged configurations so make sure $CC is set.
- _LT_AC_SYS_COMPILER
-@@ -4068,7 +4259,7 @@
- _LT_AC_TAGVAR(objext, $1)=$objext
-
- # Code to be used in simple compile tests
--lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
-+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
-
- # Code to be used in simple link tests
- lt_simple_link_test_code="$lt_simple_compile_test_code"
-@@ -4142,6 +4333,7 @@
+@@ -4257,6 +4325,7 @@
_LT_AC_TAGVAR(predeps, $1) \
_LT_AC_TAGVAR(postdeps, $1) \
_LT_AC_TAGVAR(compiler_lib_search_path, $1) \
@@ -1220,24 +739,16 @@ Index: pam.deb/aclocal.m4
_LT_AC_TAGVAR(archive_cmds, $1) \
_LT_AC_TAGVAR(archive_expsym_cmds, $1) \
_LT_AC_TAGVAR(postinstall_cmds, $1) \
-@@ -4157,6 +4349,7 @@
- _LT_AC_TAGVAR(module_cmds, $1) \
- _LT_AC_TAGVAR(module_expsym_cmds, $1) \
- _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \
-+ _LT_AC_TAGVAR(fix_srcfile_path, $1) \
- _LT_AC_TAGVAR(exclude_expsyms, $1) \
- _LT_AC_TAGVAR(include_expsyms, $1); do
-
-@@ -4203,7 +4396,7 @@
+@@ -4319,7 +4388,7 @@
# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
#
--# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
+-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
# Free Software Foundation, Inc.
#
# This file is part of GNU Libtool:
-@@ -4440,6 +4633,10 @@
+@@ -4556,6 +4625,10 @@
# shared library.
postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
@@ -1248,33 +759,7 @@ Index: pam.deb/aclocal.m4
# The library search path used internally by the compiler when linking
# a shared library.
compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
-@@ -4528,7 +4725,7 @@
- sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-
- # Fix the shell variable \$srcfile for the compiler.
--fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)"
-+fix_srcfile_path=$lt_fix_srcfile_path
-
- # Set to yes if exported symbols are required.
- always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)
-@@ -4611,6 +4808,7 @@
- # ---------------------------------
- AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
- [AC_REQUIRE([AC_CANONICAL_HOST])
-+AC_REQUIRE([LT_AC_PROG_SED])
- AC_REQUIRE([AC_PROG_NM])
- AC_REQUIRE([AC_OBJEXT])
- # Check for command to grab the raw symbol name followed by C symbol from nm.
-@@ -4647,7 +4845,7 @@
- lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
- lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
- ;;
--linux*)
-+linux* | k*bsd*-gnu)
- if test "$host_cpu" = ia64; then
- symcode='[[ABCDGIRSTW]]'
- lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-@@ -4788,7 +4986,7 @@
+@@ -4905,7 +4978,7 @@
echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
cat conftest.$ac_ext >&5
fi
@@ -1283,36 +768,17 @@ Index: pam.deb/aclocal.m4
# Do not use the global_symbol_pipe unless it works.
if test "$pipe_works" = yes; then
-@@ -4837,13 +5035,16 @@
- # like `-m68040'.
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
- ;;
-- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
- # PIC is the default for these OSes.
- ;;
-- mingw* | os2* | pw32*)
-+ mingw* | cygwin* | os2* | pw32*)
- # This hack is so that the source file can tell whether it is being
+@@ -4962,7 +5035,8 @@
# built for inclusion in a dll (and should export symbols for example).
+ # Although the cygwin gcc ignores -fPIC, still need this for old-style
+ # (--disable-auto-import) libraries
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
-+ # Although the cygwin gcc ignores -fPIC, still need this for old-style
-+ # (--disable-auto-import) libraries
+ m4_if([$1], [GCJ], [],
+ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
;;
darwin* | rhapsody*)
# PIC is the default on this platform
-@@ -4854,7 +5055,7 @@
- # DJGPP does not support shared libraries at all
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
- ;;
-- interix3*)
-+ interix[[3-9]]*)
- # Interix 3.x gcc -fpic/-fPIC options generate broken code.
- # Instead, we relocate shared libraries at runtime.
- ;;
-@@ -4880,7 +5081,7 @@
+@@ -4999,7 +5073,7 @@
esac
else
case $host_os in
@@ -1321,25 +787,7 @@ Index: pam.deb/aclocal.m4
# All AIX code is PIC.
if test "$host_cpu" = ia64; then
# AIX 5 now supports IA64 processor
-@@ -4920,7 +5121,7 @@
- ;;
- esac
- ;;
-- freebsd* | kfreebsd*-gnu | dragonfly*)
-+ freebsd* | dragonfly*)
- # FreeBSD uses GNU C++
- ;;
- hpux9* | hpux10* | hpux11*)
-@@ -4963,7 +5164,7 @@
- ;;
- esac
- ;;
-- linux*)
-+ linux* | k*bsd*-gnu)
- case $cc_basename in
- KCC*)
- # KAI C++ Compiler
-@@ -4976,7 +5177,7 @@
+@@ -5095,7 +5169,7 @@
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
;;
@@ -1348,22 +796,7 @@ Index: pam.deb/aclocal.m4
# Portland Group C++ compiler.
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-@@ -4990,6 +5191,14 @@
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
- ;;
- *)
-+ case `$CC -V 2>&1 | sed 5q` in
-+ *Sun\ C*)
-+ # Sun C++ 5.9
-+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-+ ;;
-+ esac
- ;;
- esac
- ;;
-@@ -5006,7 +5215,7 @@
+@@ -5133,7 +5207,7 @@
;;
esac
;;
@@ -1372,42 +805,18 @@ Index: pam.deb/aclocal.m4
;;
osf3* | osf4* | osf5*)
case $cc_basename in
-@@ -5110,14 +5319,17 @@
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
- ;;
-
-- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
- # PIC is the default for these OSes.
- ;;
-
-- mingw* | pw32* | os2*)
-+ mingw* | cygwin* | pw32* | os2*)
- # This hack is so that the source file can tell whether it is being
+@@ -5246,7 +5320,8 @@
# built for inclusion in a dll (and should export symbols for example).
+ # Although the cygwin gcc ignores -fPIC, still need this for old-style
+ # (--disable-auto-import) libraries
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
-+ # Although the cygwin gcc ignores -fPIC, still need this for old-style
-+ # (--disable-auto-import) libraries
+ m4_if([$1], [GCJ], [],
+ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
;;
darwin* | rhapsody*)
-@@ -5126,7 +5338,7 @@
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
- ;;
-
-- interix3*)
-+ interix[[3-9]]*)
- # Interix 3.x gcc -fpic/-fPIC options generate broken code.
- # Instead, we relocate shared libraries at runtime.
- ;;
-@@ -5184,10 +5396,11 @@
- esac
- ;;
-
-- mingw* | pw32* | os2*)
-+ mingw* | cygwin* | pw32* | os2*)
+@@ -5316,7 +5391,8 @@
+ mingw* | cygwin* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
@@ -1416,50 +825,7 @@ Index: pam.deb/aclocal.m4
;;
hpux9* | hpux10* | hpux11*)
-@@ -5217,7 +5430,7 @@
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- ;;
-
-- linux*)
-+ linux* | k*bsd*-gnu)
- case $cc_basename in
- icc* | ecc*)
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-@@ -5236,6 +5449,22 @@
- # All Alpha code is PIC.
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
- ;;
-+ *)
-+ case `$CC -V 2>&1 | sed 5q` in
-+ *Sun\ C*)
-+ # Sun C 5.9
-+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ ;;
-+ *Sun\ F*)
-+ # Sun Fortran 8.3 passes all unrecognized flags to the linker
-+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=''
-+ ;;
-+ esac
-+ ;;
- esac
- ;;
-
-@@ -5245,6 +5474,10 @@
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
- ;;
-
-+ rdos*)
-+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-+ ;;
-+
- solaris*)
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-@@ -5304,7 +5537,7 @@
+@@ -5453,7 +5529,7 @@
#
if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works],
@@ -1468,7 +834,7 @@ Index: pam.deb/aclocal.m4
[$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [],
[case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in
"" | " "*) ;;
-@@ -5328,7 +5561,7 @@
+@@ -5477,7 +5553,7 @@
#
wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\"
AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
@@ -1477,13 +843,7 @@ Index: pam.deb/aclocal.m4
$lt_tmp_static_flag,
[],
[_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
-@@ -5339,11 +5572,12 @@
- # ------------------------------------
- # See if the linker supports building shared libraries.
- AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS],
--[AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
-+[AC_REQUIRE([LT_AC_PROG_SED])dnl
-+AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+@@ -5493,7 +5569,7 @@
ifelse([$1],[CXX],[
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
case $host_os in
@@ -1492,16 +852,13 @@ Index: pam.deb/aclocal.m4
# If we're using GNU nm, then we don't want the "-C" option.
# -C means demangle to AIX nm, but means don't demangle with GNU nm
if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-@@ -5356,12 +5590,16 @@
- _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
- ;;
+@@ -5508,10 +5584,14 @@
cygwin* | mingw*)
-- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
-+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
-+ ;;
+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
+ ;;
+ linux* | k*bsd*-gnu)
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=no
- ;;
++ ;;
*)
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
@@ -1510,7 +867,7 @@ Index: pam.deb/aclocal.m4
],[
runpath_var=
_LT_AC_TAGVAR(allow_undefined_flag, $1)=
-@@ -5392,12 +5630,14 @@
+@@ -5542,12 +5622,14 @@
# it will be wrapped by ` (' and `)$', so one must not match beginning or
# end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
# as well as any symbol that contains `d'.
@@ -1526,7 +883,7 @@ Index: pam.deb/aclocal.m4
extract_expsyms_cmds=
# Just being paranoid about ensuring that cc_basename is set.
_LT_CC_BASENAME([$compiler])
-@@ -5447,7 +5687,7 @@
+@@ -5597,7 +5679,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
@@ -1535,55 +892,9 @@ Index: pam.deb/aclocal.m4
# On AIX/PPC, the GNU linker is very broken
if test "$host_cpu" != ia64; then
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -5495,7 +5735,7 @@
- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
- _LT_AC_TAGVAR(always_export_symbols, $1)=no
- _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
-+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
-
- if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-@@ -5513,7 +5753,7 @@
- fi
- ;;
-
-- interix3*)
-+ interix[[3-9]]*)
- _LT_AC_TAGVAR(hardcode_direct, $1)=no
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-@@ -5528,7 +5768,7 @@
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
- ;;
-
-- linux*)
-+ gnu* | linux* | k*bsd*-gnu)
- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- tmp_addflag=
- case $cc_basename,$host_cpu in
-@@ -5546,20 +5786,30 @@
- ifc* | ifort*) # Intel Fortran compiler
- tmp_addflag=' -nofor_main' ;;
- esac
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ case `$CC -V 2>&1 | sed 5q` in
-+ *Sun\ C*) # Sun C 5.9
-+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-+ tmp_sharedflag='-G' ;;
-+ *Sun\ F*) # Sun Fortran 8.3
-+ tmp_sharedflag='-G' ;;
-+ *)
-+ tmp_sharedflag='-shared' ;;
-+ esac
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-
- if test $supports_anon_versioning = yes; then
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
- cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+@@ -5713,12 +5795,13 @@
$echo "local: *; };" >> $output_objdir/$libname.ver~
-- $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
fi
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=no
else
@@ -1596,16 +907,7 @@ Index: pam.deb/aclocal.m4
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -5592,7 +5842,7 @@
-
- sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
- case `$LD -v 2>&1` in
-- *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
-+ *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- cat <<_LT_EOF 1>&2
-
-@@ -5657,7 +5907,7 @@
+@@ -5816,7 +5899,7 @@
fi
;;
@@ -1614,7 +916,7 @@ Index: pam.deb/aclocal.m4
if test "$host_cpu" = ia64; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
-@@ -5677,7 +5927,7 @@
+@@ -5836,7 +5919,7 @@
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
# need to do runtime linking.
@@ -1623,25 +925,7 @@ Index: pam.deb/aclocal.m4
for ld_flag in $LDFLAGS; do
if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
aix_use_runtimelinking=yes
-@@ -5711,7 +5961,7 @@
- strings "$collect2name" | grep resolve_lib_name >/dev/null
- then
- # We have reworked collect2
-- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+ :
- else
- # We have old collect2
- _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-@@ -5804,7 +6054,7 @@
- # The linker will automatically build a .lib file if we build a DLL.
- _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
- # FIXME: Should let the user specify the lib program.
-- _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs'
-+ _LT_AC_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
- _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
- _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
- ;;
-@@ -5837,19 +6087,18 @@
+@@ -5996,11 +6079,10 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
if test "$GCC" = yes ; then
output_verbose_link_cmd='echo'
@@ -1657,26 +941,7 @@ Index: pam.deb/aclocal.m4
else
case $cc_basename in
xlc*)
- output_verbose_link_cmd='echo'
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- ;;
- *)
-@@ -5889,7 +6138,7 @@
- ;;
-
- # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-- freebsd* | kfreebsd*-gnu | dragonfly*)
-+ freebsd* | dragonfly*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-@@ -5991,7 +6240,7 @@
+@@ -6150,7 +6232,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
;;
@@ -1685,248 +950,425 @@ Index: pam.deb/aclocal.m4
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -6011,24 +6260,28 @@
- ;;
-
- openbsd*)
-- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+ if test -f /usr/libexec/ld.so; then
-+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+ else
-+ case $host_os in
-+ openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-+ ;;
-+ *)
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+ ;;
-+ esac
-+ fi
- else
-- case $host_os in
-- openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
-- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-- ;;
-- *)
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-- ;;
-- esac
-+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
-
-@@ -6087,17 +6340,16 @@
- case $host_os in
- solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
- *)
-- # The compiler driver will combine linker options so we
-- # cannot just pass the convience library names through
-- # without $wl, iff we do not link with $LD.
-- # Luckily, gcc supports the same syntax we need for Sun Studio.
-+ # The compiler driver will combine and reorder linker options,
-+ # but understands `-z linker_flag'. GCC discards it without `$wl',
-+ # but is careful enough not to reorder.
- # Supported since Solaris 2.6 (maybe 2.5.1?)
-- case $wlarc in
-- '')
-- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
-- *)
-- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
-- esac ;;
-+ if test "$GCC" = yes; then
-+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-+ else
-+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
-+ fi
-+ ;;
- esac
- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
- ;;
-@@ -6154,7 +6406,7 @@
- fi
- ;;
-
-- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7*)
-+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
- _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -6229,7 +6481,7 @@
- # to ld, don't add -lc before -lgcc.
- AC_MSG_CHECKING([whether -lc should be explicitly linked in])
- $rm conftest*
-- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
- if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
- soname=conftest
-@@ -6332,6 +6584,30 @@
- [AC_CHECK_TOOL(RC, windres, no)
- ])
-
-+
-+# Cheap backport of AS_EXECUTABLE_P and required macros
-+# from Autoconf 2.59; we should not use $as_executable_p directly.
-+
-+# _AS_TEST_PREPARE
-+# ----------------
-+m4_ifndef([_AS_TEST_PREPARE],
-+[m4_defun([_AS_TEST_PREPARE],
-+[if test -x / >/dev/null 2>&1; then
-+ as_executable_p='test -x'
-+else
-+ as_executable_p='test -f'
-+fi
-+])])# _AS_TEST_PREPARE
-+
-+# AS_EXECUTABLE_P
-+# ---------------
-+# Check whether a file is executable.
-+m4_ifndef([AS_EXECUTABLE_P],
-+[m4_defun([AS_EXECUTABLE_P],
-+[AS_REQUIRE([_AS_TEST_PREPARE])dnl
-+$as_executable_p $1[]dnl
-+])])# AS_EXECUTABLE_P
-+
- # NOTE: This macro has been submitted for inclusion into #
- # GNU Autoconf as AC_PROG_SED. When it is available in #
- # a released version of Autoconf we should remove this #
-@@ -6352,12 +6628,13 @@
- test -z "$as_dir" && as_dir=.
- for lt_ac_prog in sed gsed; do
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
-+ if AS_EXECUTABLE_P(["$as_dir/$lt_ac_prog$ac_exec_ext"]); then
- lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
- fi
- done
- done
- done
-+IFS=$as_save_IFS
- lt_ac_max=0
- lt_ac_count=0
- # Add /usr/xpg4/bin/sed as it is typically found on Solaris
-@@ -6390,10 +6667,11 @@
- done
- ])
- SED=$lt_cv_path_SED
-+AC_SUBST([SED])
+@@ -6581,7 +6663,7 @@
AC_MSG_RESULT([$SED])
])
-# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
-+# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc.
++# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
-@@ -6408,7 +6686,7 @@
- [am__api_version='1.10'
- dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
- dnl require some minimum version. Point them to the right macro.
+@@ -6591,29 +6673,14 @@
+ # ----------------------------
+ # Automake X.Y traces this macro to ensure aclocal.m4 has been
+ # generated from the m4 files accompanying Automake X.Y.
+-# (This private macro should not be called outside this file.)
+-AC_DEFUN([AM_AUTOMAKE_VERSION],
+-[am__api_version='1.10'
+-dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
+-dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.10], [],
-+m4_if([$1], [1.10.1], [],
- [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
- ])
-
-@@ -6424,8 +6702,10 @@
- # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
+- [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+-])
+-
+-# _AM_AUTOCONF_VERSION(VERSION)
+-# -----------------------------
+-# aclocal traces this macro to find the Autoconf version.
+-# This is a private macro too. Using m4_define simplifies
+-# the logic in aclocal, which can simply ignore this definition.
+-m4_define([_AM_AUTOCONF_VERSION], [])
++AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
+
+ # AM_SET_CURRENT_AUTOMAKE_VERSION
+ # -------------------------------
+-# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
++# Call AM_AUTOMAKE_VERSION so it can be traced.
# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.10])dnl
-_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
-+[AM_AUTOMAKE_VERSION([1.10.1])dnl
-+m4_ifndef([AC_AUTOCONF_VERSION],
-+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-+_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
++ [AM_AUTOMAKE_VERSION([1.9.6])])
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-@@ -6697,7 +6977,7 @@
+@@ -6670,14 +6737,14 @@
+
+ # AM_CONDITIONAL -*- Autoconf -*-
+
+-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
++# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
+ # Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+
+-# serial 8
++# serial 7
+
+ # AM_CONDITIONAL(NAME, SHELL-CONDITION)
+ # -------------------------------------
+@@ -6686,10 +6753,8 @@
+ [AC_PREREQ(2.52)dnl
+ ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
+ [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
+-AC_SUBST([$1_TRUE])dnl
+-AC_SUBST([$1_FALSE])dnl
+-_AM_SUBST_NOTMAKE([$1_TRUE])dnl
+-_AM_SUBST_NOTMAKE([$1_FALSE])dnl
++AC_SUBST([$1_TRUE])
++AC_SUBST([$1_FALSE])
+ if $2; then
+ $1_TRUE=
+ $1_FALSE='#'
+@@ -6703,14 +6768,15 @@
+ Usually this means the macro was only invoked conditionally.]])
+ fi])])
+
+-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
++
++# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
+ # Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+
+-# serial 9
++# serial 8
+
+ # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
+ # written in clear, in which case automake, when reading aclocal.m4,
+@@ -6738,7 +6804,6 @@
+ ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
+ [$1], CXX, [depcc="$CXX" am_compiler_list=],
+ [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+- [$1], UPC, [depcc="$UPC" am_compiler_list=],
+ [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
+ [depcc="$$1" am_compiler_list=])
+
+@@ -6804,7 +6869,6 @@
+ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+ >/dev/null 2>conftest.err &&
+- grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
+ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+@@ -6857,8 +6921,7 @@
+ AMDEPBACKSLASH='\'
+ fi
+ AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
+-AC_SUBST([AMDEPBACKSLASH])dnl
+-_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
++AC_SUBST([AMDEPBACKSLASH])
+ ])
+
+ # Generate code to set up dependency tracking. -*- Autoconf -*-
+@@ -6883,9 +6946,8 @@
+ # some people rename them; so instead we look at the file content.
+ # Grep'ing the first line is not enough: some people post-process
# each Makefile.in and add a new line on top of each file to say so.
- # Grep'ing the whole file is not good either: AIX grep has a line
- # limit of 2048, but all sed's we know have understand at least 4000.
+- # Grep'ing the whole file is not good either: AIX grep has a line
+- # limit of 2048, but all sed's we know have understand at least 4000.
- if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
-+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
++ # So let's grep whole file.
++ if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
dirpart=`AS_DIRNAME("$mf")`
else
continue
-@@ -6757,13 +7037,13 @@
+@@ -6944,8 +7006,8 @@
+
# Do all the work for Automake. -*- Autoconf -*-
- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006 Free Software Foundation, Inc.
-+# 2005, 2006, 2008 Free Software Foundation, Inc.
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
++# Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+@@ -6968,20 +7030,16 @@
+ # arguments mandatory, and then we can depend on a new Autoconf
+ # release and drop the old call support.
+ AC_DEFUN([AM_INIT_AUTOMAKE],
+-[AC_PREREQ([2.60])dnl
++[AC_PREREQ([2.58])dnl
+ dnl Autoconf wants to disallow AM_ names. We explicitly allow
+ dnl the ones we care about.
+ m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
+ AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
+ AC_REQUIRE([AC_PROG_INSTALL])dnl
+-if test "`cd $srcdir && pwd`" != "`pwd`"; then
+- # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+- # is not polluted with repeated "-I."
+- AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
+- # test to see if srcdir already configured
+- if test -f $srcdir/config.status; then
+- AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+- fi
++# test to see if srcdir already configured
++if test "`cd $srcdir && pwd`" != "`pwd`" &&
++ test -f $srcdir/config.status; then
++ AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+ fi
+
+ # test whether we have cygpath
+@@ -7001,9 +7059,6 @@
+ AC_SUBST([PACKAGE], [$1])dnl
+ AC_SUBST([VERSION], [$2])],
+ [_AM_SET_OPTIONS([$1])dnl
+-dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
+-m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
+- [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
+ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
+ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
+
+@@ -7039,10 +7094,6 @@
+ [_AM_DEPENDENCIES(CXX)],
+ [define([AC_PROG_CXX],
+ defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+-AC_PROVIDE_IFELSE([AC_PROG_OBJC],
+- [_AM_DEPENDENCIES(OBJC)],
+- [define([AC_PROG_OBJC],
+- defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
+ ])
+ ])
+
+@@ -7078,7 +7129,7 @@
+ # Define $install_sh.
+ AC_DEFUN([AM_PROG_INSTALL_SH],
+ [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+-install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
++install_sh=${install_sh-"$am_aux_dir/install-sh"}
+ AC_SUBST(install_sh)])
+
+ # Copyright (C) 2003, 2005 Free Software Foundation, Inc.
+@@ -7175,14 +7226,13 @@
+ rm -f confinc confmf
+ ])
+
+-# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005
+-# Free Software Foundation, Inc.
++# Copyright (C) 1999, 2000, 2001, 2003, 2005 Free Software Foundation, Inc.
#
# 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 12
-+# serial 13
-
- # This macro actually does too much. Some checks are only needed if
- # your package does certain things. But this isn't really a big deal.
-@@ -6868,16 +7148,17 @@
- # our stamp files there.
- AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
- [# Compute $1's index in $config_headers.
-+_am_arg=$1
- _am_stamp_count=1
- for _am_header in $config_headers :; do
- case $_am_header in
-- $1 | $1:* )
-+ $_am_arg | $_am_arg:* )
- break ;;
- * )
- _am_stamp_count=`expr $_am_stamp_count + 1` ;;
- esac
- done
--echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
-+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
+-# serial 5
++# serial 3
+
+ # AM_PROG_CC_C_O
+ # --------------
+@@ -7190,7 +7240,6 @@
+ AC_DEFUN([AM_PROG_CC_C_O],
+ [AC_REQUIRE([AC_PROG_CC_C_O])dnl
+ AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+-AC_REQUIRE_AUX_FILE([compile])dnl
+ # FIXME: we rely on the cache variable name because
+ # there is no other way.
+ set dummy $CC
+@@ -7203,22 +7252,18 @@
+ # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+ CC="$am_aux_dir/compile $CC"
+ fi
+-dnl Make sure AC_PROG_CC is never called again, or it will override our
+-dnl setting of CC.
+-m4_define([AC_PROG_CC],
+- [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])])
+ ])
+
+ # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
+
+-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005
++# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
+ # Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+
+-# serial 5
++# serial 4
+
+ # AM_MISSING_PROG(NAME, PROGRAM)
+ # ------------------------------
+@@ -7234,7 +7279,6 @@
+ # If it does, set am_missing_run to use it, otherwise, to nothing.
+ AC_DEFUN([AM_MISSING_HAS_RUN],
+ [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+-AC_REQUIRE_AUX_FILE([missing])dnl
+ test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
+ # Use eval to expand $SHELL
+ if eval "$MISSING --run true"; then
+@@ -7245,7 +7289,7 @@
+ fi
+ ])
- # Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
+-# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
#
-@@ -7204,7 +7485,7 @@
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+@@ -7253,23 +7297,60 @@
+
+ # AM_PROG_MKDIR_P
+ # ---------------
+-# Check for `mkdir -p'.
++# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
++#
++# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
++# created by `make install' are always world readable, even if the
++# installer happens to have an overly restrictive umask (e.g. 077).
++# This was a mistake. There are at least two reasons why we must not
++# use `-m 0755':
++# - it causes special bits like SGID to be ignored,
++# - it may be too restrictive (some setups expect 775 directories).
++#
++# Do not use -m 0755 and let people choose whatever they expect by
++# setting umask.
++#
++# We cannot accept any implementation of `mkdir' that recognizes `-p'.
++# Some implementations (such as Solaris 8's) are not thread-safe: if a
++# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'
++# concurrently, both version can detect that a/ is missing, but only
++# one can create it and the other will error out. Consequently we
++# restrict ourselves to GNU make (using the --version option ensures
++# this.)
+ AC_DEFUN([AM_PROG_MKDIR_P],
+-[AC_PREREQ([2.60])dnl
+-AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+-dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P,
+-dnl while keeping a definition of mkdir_p for backward compatibility.
+-dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
+-dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
+-dnl Makefile.ins that do not define MKDIR_P, so we do our own
+-dnl adjustment using top_builddir (which is defined more often than
+-dnl MKDIR_P).
+-AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
+-case $mkdir_p in
+- [[\\/$]]* | ?:[[\\/]]*) ;;
+- */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+-esac
+-])
++[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
++ # We used to keeping the `.' as first argument, in order to
++ # allow $(mkdir_p) to be used without argument. As in
++ # $(mkdir_p) $(somedir)
++ # where $(somedir) is conditionally defined. However this is wrong
++ # for two reasons:
++ # 1. if the package is installed by a user who cannot write `.'
++ # make install will fail,
++ # 2. the above comment should most certainly read
++ # $(mkdir_p) $(DESTDIR)$(somedir)
++ # so it does not work when $(somedir) is undefined and
++ # $(DESTDIR) is not.
++ # To support the latter case, we have to write
++ # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
++ # so the `.' trick is pointless.
++ mkdir_p='mkdir -p --'
++else
++ # On NextStep and OpenStep, the `mkdir' command does not
++ # recognize any option. It will interpret all options as
++ # directories to create, and then abort because `.' already
++ # exists.
++ for d in ./-p ./--version;
++ do
++ test -d $d && rmdir $d
++ done
++ # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
++ if test -f "$ac_aux_dir/mkinstalldirs"; then
++ mkdir_p='$(mkinstalldirs)'
++ else
++ mkdir_p='$(install_sh) -d'
++ fi
++fi
++AC_SUBST([mkdir_p])])
+
+ # Helper functions for option handling. -*- Autoconf -*-
- # _AM_SUBST_NOTMAKE(VARIABLE)
- # ---------------------------
+@@ -7381,21 +7462,9 @@
+ if test "$cross_compiling" != no; then
+ AC_CHECK_TOOL([STRIP], [strip], :)
+ fi
+-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
++INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
+ AC_SUBST([INSTALL_STRIP_PROGRAM])])
+
+-# Copyright (C) 2006 Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
+-
+-# _AM_SUBST_NOTMAKE(VARIABLE)
+-# ---------------------------
-# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.
-+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
- # This macro is traced by Automake.
- AC_DEFUN([_AM_SUBST_NOTMAKE])
+-# This macro is traced by Automake.
+-AC_DEFUN([_AM_SUBST_NOTMAKE])
+-
+ # Check how to create a tarball. -*- Autoconf -*-
-Index: pam.deb/conf/Makefile.in
+ # Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+Index: pam.debian/conf/Makefile.in
===================================================================
---- pam.deb.orig/conf/Makefile.in
-+++ pam.deb/conf/Makefile.in
+--- pam.debian.orig/conf/Makefile.in
++++ pam.debian/conf/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -83,6 +83,7 @@
+@@ -13,11 +13,15 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -52,18 +56,17 @@
+ DIST_SOURCES =
+ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ html-recursive info-recursive install-data-recursive \
+- install-dvi-recursive install-exec-recursive \
+- install-html-recursive install-info-recursive \
+- install-pdf-recursive install-ps-recursive install-recursive \
+- installcheck-recursive installdirs-recursive pdf-recursive \
+- ps-recursive uninstall-recursive
+-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+- distclean-recursive maintainer-clean-recursive
++ install-exec-recursive install-info-recursive \
++ install-recursive installcheck-recursive installdirs-recursive \
++ pdf-recursive ps-recursive uninstall-info-recursive \
++ uninstall-recursive
+ ETAGS = etags
+ CTAGS = ctags
+ DIST_SUBDIRS = $(SUBDIRS)
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AUTOCONF = @AUTOCONF@
+@@ -83,11 +86,16 @@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -1934,7 +1376,40 @@ Index: pam.deb/conf/Makefile.in
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -135,6 +136,7 @@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
++ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
++ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
++ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -96,7 +104,18 @@
+ GMSGFMT_015 = @GMSGFMT_015@
+ GREP = @GREP@
+ HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
+-INSTALL = @INSTALL@
++HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
++HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
++HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
++HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
++HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
++HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
++HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
++HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
++HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
++HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
++HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
++HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -131,10 +150,10 @@
+ LTLIBINTL = @LTLIBINTL@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+-MKDIR_P = @MKDIR_P@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
@@ -1942,77 +1417,271 @@ Index: pam.deb/conf/Makefile.in
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -150,6 +152,7 @@
- RANLIB = @RANLIB@
- SCONFIGDIR = @SCONFIGDIR@
- SECUREDIR = @SECUREDIR@
-+SED = @SED@
+@@ -153,6 +172,8 @@
+ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
++STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
++STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
STRIP = @STRIP@
-@@ -336,8 +339,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+@@ -166,13 +187,13 @@
+ XSLTPROC = @XSLTPROC@
+ YACC = @YACC@
+ YFLAGS = @YFLAGS@
+-abs_builddir = @abs_builddir@
+-abs_srcdir = @abs_srcdir@
+-abs_top_builddir = @abs_top_builddir@
+-abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -184,7 +205,6 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+-builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -215,11 +235,8 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+-srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_builddir = @top_builddir@
+-top_srcdir = @top_srcdir@
+ SUBDIRS = pam_conv1
+ CLEANFILES = *~
+ EXTRA_DIST = install_conf md5itall pam.conf
+@@ -262,6 +279,10 @@
+ clean-libtool:
+ -rm -rf .libs _libs
+
++distclean-libtool:
++ -rm -f libtool
++uninstall-info-am:
++
+ # This directory's subdirectories are mostly independent; you can cd
+ # into them and run `make' without going through this Makefile.
+ # To change the values of `make' variables: instead of editing Makefiles,
+@@ -293,7 +314,8 @@
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ fi; test -z "$$fail"
+
+-$(RECURSIVE_CLEAN_TARGETS):
++mostlyclean-recursive clean-recursive distclean-recursive \
++maintainer-clean-recursive:
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+@@ -394,21 +416,22 @@
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- list='$(DISTFILES)'; \
+- dist_files=`for file in $$list; do echo $$file; done | \
+- sed -e "s|^$$srcdirstrip/||;t" \
+- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+- case $$dist_files in \
+- */*) $(MKDIR_P) `echo "$$dist_files" | \
+- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+- sort -u` ;; \
+- esac; \
+- for file in $$dist_files; do \
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
+ if test -d $$d/$$file; then \
+- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -422,7 +445,7 @@
+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -d "$(distdir)/$$subdir" \
+- || $(MKDIR_P) "$(distdir)/$$subdir" \
++ || $(mkdir_p) "$(distdir)/$$subdir" \
+ || exit 1; \
+ distdir=`$(am__cd) $(distdir) && pwd`; \
+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+@@ -430,8 +453,6 @@
+ $(MAKE) $(AM_MAKEFLAGS) \
+ top_distdir="$$top_distdir" \
+ distdir="$$distdir/$$subdir" \
+- am__remove_distdir=: \
+- am__skip_length_check=: \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -472,7 +493,8 @@
+
+ distclean: distclean-recursive
+ -rm -f Makefile
+-distclean-am: clean-am distclean-generic distclean-tags
++distclean-am: clean-am distclean-generic distclean-libtool \
++ distclean-tags
+
+ dvi: dvi-recursive
+
+@@ -486,20 +508,12 @@
+
+ install-data-am:
+
+-install-dvi: install-dvi-recursive
+-
+ install-exec-am:
-@@ -362,8 +365,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -373,13 +376,12 @@
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-Index: pam.deb/conf/pam_conv1/Makefile.in
+-install-html: install-html-recursive
+-
+ install-info: install-info-recursive
+
+ install-man:
+
+-install-pdf: install-pdf-recursive
+-
+-install-ps: install-ps-recursive
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-recursive
+@@ -518,24 +532,22 @@
+
+ ps-am:
+
+-uninstall-am:
++uninstall-am: uninstall-info-am
+
+-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+- install-strip
++uninstall-info: uninstall-info-recursive
+
+-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+- all all-am check check-am clean clean-generic clean-libtool \
+- ctags ctags-recursive distclean distclean-generic \
+- distclean-libtool distclean-tags distdir dvi dvi-am html \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++ clean clean-generic clean-libtool clean-recursive ctags \
++ ctags-recursive distclean distclean-generic distclean-libtool \
++ distclean-recursive distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+- install-data-am install-dvi install-dvi-am install-exec \
+- install-exec-am install-html install-html-am install-info \
+- install-info-am install-man install-pdf install-pdf-am \
+- install-ps install-ps-am install-strip installcheck \
++ install-data-am install-exec install-exec-am install-info \
++ install-info-am install-man install-strip installcheck \
+ installcheck-am installdirs installdirs-am maintainer-clean \
+- maintainer-clean-generic mostlyclean mostlyclean-generic \
+- mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
+- uninstall uninstall-am
++ maintainer-clean-generic maintainer-clean-recursive \
++ mostlyclean mostlyclean-generic mostlyclean-libtool \
++ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
++ uninstall uninstall-am uninstall-info-am
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+Index: pam.debian/conf/pam_conv1/Makefile.in
===================================================================
---- pam.deb.orig/conf/pam_conv1/Makefile.in
-+++ pam.deb/conf/pam_conv1/Makefile.in
+--- pam.debian.orig/conf/pam_conv1/Makefile.in
++++ pam.debian/conf/pam_conv1/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -59,7 +59,7 @@
+@@ -18,11 +18,15 @@
+ # Copyright (c) 2005 Thorsten Kukuk <kukuk@suse.de>
+ #
+
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -59,31 +63,30 @@
am_pam_conv1_OBJECTS = pam_conv_l.$(OBJEXT) pam_conv_y.$(OBJEXT)
pam_conv1_OBJECTS = $(am_pam_conv1_OBJECTS)
pam_conv1_DEPENDENCIES =
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -103,6 +103,7 @@
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
++ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++ $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+- $(LDFLAGS) -o $@
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ LEXCOMPILE = $(LEX) $(LFLAGS) $(AM_LFLAGS)
+-LTLEXCOMPILE = $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=compile $(LEX) $(LFLAGS) $(AM_LFLAGS)
+-YLWRAP = $(top_srcdir)/ylwrap
++LTLEXCOMPILE = $(LIBTOOL) --mode=compile $(LEX) $(LFLAGS) $(AM_LFLAGS)
+ YACCCOMPILE = $(YACC) $(YFLAGS) $(AM_YFLAGS)
+-LTYACCCOMPILE = $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=compile $(YACC) $(YFLAGS) $(AM_YFLAGS)
++LTYACCCOMPILE = $(LIBTOOL) --mode=compile $(YACC) $(YFLAGS) \
++ $(AM_YFLAGS)
+ SOURCES = $(pam_conv1_SOURCES)
+ DIST_SOURCES = $(pam_conv1_SOURCES)
+ ETAGS = etags
+ CTAGS = ctags
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AUTOCONF = @AUTOCONF@
+@@ -103,11 +106,16 @@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -2020,7 +1689,40 @@ Index: pam.deb/conf/pam_conv1/Makefile.in
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -155,6 +156,7 @@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
++ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
++ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
++ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -116,7 +124,18 @@
+ GMSGFMT_015 = @GMSGFMT_015@
+ GREP = @GREP@
+ HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
+-INSTALL = @INSTALL@
++HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
++HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
++HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
++HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
++HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
++HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
++HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
++HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
++HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
++HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
++HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
++HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -151,10 +170,10 @@
+ LTLIBINTL = @LTLIBINTL@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+-MKDIR_P = @MKDIR_P@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
@@ -2028,87 +1730,245 @@ Index: pam.deb/conf/pam_conv1/Makefile.in
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -170,6 +172,7 @@
- RANLIB = @RANLIB@
- SCONFIGDIR = @SCONFIGDIR@
- SECUREDIR = @SECUREDIR@
-+SED = @SED@
+@@ -173,6 +192,8 @@
+ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
++STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
++STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
STRIP = @STRIP@
-@@ -342,8 +345,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+@@ -186,13 +207,13 @@
+ XSLTPROC = @XSLTPROC@
+ YACC = @YACC@
+ YFLAGS = @YFLAGS@
+-abs_builddir = @abs_builddir@
+-abs_srcdir = @abs_srcdir@
+-abs_top_builddir = @abs_top_builddir@
+-abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -204,7 +225,6 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+-builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -235,11 +255,8 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+-srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_builddir = @top_builddir@
+-top_srcdir = @top_srcdir@
+ CLEANFILES = *~
+ EXTRA_DIST = README
+ AM_YFLAGS = -d
+@@ -290,11 +307,11 @@
+ pam_conv_y.h: pam_conv_y.c
+ @if test ! -f $@; then \
+ rm -f pam_conv_y.c; \
+- $(MAKE) $(AM_MAKEFLAGS) pam_conv_y.c; \
++ $(MAKE) pam_conv_y.c; \
+ else :; fi
+ pam_conv1$(EXEEXT): $(pam_conv1_OBJECTS) $(pam_conv1_DEPENDENCIES)
+ @rm -f pam_conv1$(EXEEXT)
+- $(LINK) $(pam_conv1_OBJECTS) $(pam_conv1_LDADD) $(LIBS)
++ $(LINK) $(pam_conv1_LDFLAGS) $(pam_conv1_OBJECTS) $(pam_conv1_LDADD) $(LIBS)
+
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+@@ -306,31 +323,51 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_conv_y.Po@am__quote@
-@@ -355,8 +358,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -366,13 +369,12 @@
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ .c.o:
+-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
++@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+
+ .l.c:
+- $(am__skiplex) $(SHELL) $(YLWRAP) $< $(LEX_OUTPUT_ROOT).c $@ -- $(LEXCOMPILE)
++ $(LEXCOMPILE) $<
++ sed '/^#/ s|$(LEX_OUTPUT_ROOT)\.c|$@|' $(LEX_OUTPUT_ROOT).c >$@
++ rm -f $(LEX_OUTPUT_ROOT).c
+
+ .y.c:
+- $(am__skipyacc) $(SHELL) $(YLWRAP) $< y.tab.c $@ y.tab.h $*.h y.output $*.output -- $(YACCCOMPILE)
++ $(YACCCOMPILE) $<
++ if test -f y.tab.h; then \
++ to=`echo "$*_H" | sed \
++ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \
++ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \
++ sed -e "/^#/!b" -e "s/Y_TAB_H/$$to/g" -e "s|y\.tab\.h|$*.h|" \
++ y.tab.h >$*.ht; \
++ rm -f y.tab.h; \
++ if cmp -s $*.ht $*.h; then \
++ rm -f $*.ht ;\
++ else \
++ mv $*.ht $*.h; \
++ fi; \
++ fi
++ if test -f y.output; then \
++ mv y.output $*.output; \
++ fi
++ sed '/^#/ s|y\.tab\.c|$@|' y.tab.c >$@t && mv $@t $@
++ rm -f y.tab.c
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -338,6 +375,10 @@
+ clean-libtool:
+ -rm -rf .libs _libs
+
++distclean-libtool:
++ -rm -f libtool
++uninstall-info-am:
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-Index: pam.deb/config.h.in
-===================================================================
---- pam.deb.orig/config.h.in
-+++ pam.deb/config.h.in
-@@ -19,6 +19,9 @@
- the CoreFoundation framework. */
- #undef HAVE_CFPREFERENCESCOPYAPPVALUE
+@@ -387,21 +428,22 @@
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- list='$(DISTFILES)'; \
+- dist_files=`for file in $$list; do echo $$file; done | \
+- sed -e "s|^$$srcdirstrip/||;t" \
+- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+- case $$dist_files in \
+- */*) $(MKDIR_P) `echo "$$dist_files" | \
+- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+- sort -u` ;; \
+- esac; \
+- for file in $$dist_files; do \
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
+ if test -d $$d/$$file; then \
+- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -456,7 +498,7 @@
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-tags
++ distclean-libtool distclean-tags
+
+ dvi: dvi-am
+
+@@ -470,20 +512,12 @@
+
+ install-data-am:
+
+-install-dvi: install-dvi-am
+-
+ install-exec-am:
-+/* Define to 1 if you have the <crack.h> header file. */
-+#undef HAVE_CRACK_H
-+
- /* Define to 1 if you have the <crypt.h> header file. */
- #undef HAVE_CRYPT_H
+-install-html: install-html-am
+-
+ install-info: install-info-am
-@@ -126,6 +129,9 @@
- /* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
- #undef HAVE_NDIR_H
+ install-man:
-+/* Define to 1 if you have the <net/if.h> header file. */
-+#undef HAVE_NET_IF_H
-+
- /* Define to 1 if you have the <paths.h> header file. */
- #undef HAVE_PATHS_H
+-install-pdf: install-pdf-am
+-
+-install-ps: install-ps-am
+-
+ installcheck-am:
-Index: pam.deb/configure
+ maintainer-clean: maintainer-clean-am
+@@ -504,22 +538,19 @@
+
+ ps-am:
+
+-uninstall-am:
+-
+-.MAKE: install-am install-strip
++uninstall-am: uninstall-info-am
+
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ clean-libtool clean-noinstPROGRAMS ctags distclean \
+ distclean-compile distclean-generic distclean-libtool \
+ distclean-tags distdir dvi dvi-am html html-am info info-am \
+- install install-am install-data install-data-am install-dvi \
+- install-dvi-am install-exec install-exec-am install-html \
+- install-html-am install-info install-info-am install-man \
+- install-pdf install-pdf-am install-ps install-ps-am \
++ install install-am install-data install-data-am install-exec \
++ install-exec-am install-info install-info-am install-man \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+- pdf pdf-am ps ps-am tags uninstall uninstall-am
++ pdf pdf-am ps ps-am tags uninstall uninstall-am \
++ uninstall-info-am
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+Index: pam.debian/configure
===================================================================
---- pam.deb.orig/configure
-+++ pam.deb/configure
-@@ -859,11 +859,14 @@
- LEX_OUTPUT_ROOT
- LEXLIB
- LN_S
-+SED
- GREP
- EGREP
+--- pam.debian.orig/configure
++++ pam.debian/configure
+@@ -808,7 +808,6 @@
+ INSTALL_PROGRAM
+ INSTALL_SCRIPT
+ INSTALL_DATA
+-am__isrc
+ CYGPATH_W
+ PACKAGE
+ VERSION
+@@ -865,6 +864,8 @@
ECHO
AR
RANLIB
@@ -2117,41 +1977,188 @@ Index: pam.deb/configure
CPP
CXX
CXXFLAGS
-@@ -4259,12 +4262,13 @@
- test -z "$as_dir" && as_dir=.
- for lt_ac_prog in sed gsed; do
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
-+ if { test -f "$as_dir/$lt_ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$lt_ac_prog$ac_exec_ext"; }; then
- lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
- fi
- done
- done
- done
-+IFS=$as_save_IFS
- lt_ac_max=0
- lt_ac_count=0
- # Add /usr/xpg4/bin/sed as it is typically found on Solaris
-@@ -4299,6 +4303,7 @@
+@@ -2033,8 +2034,7 @@
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+-am__api_version='1.10'
+-
++am__api_version="1.9"
+ ac_aux_dir=
+ for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
+ if test -f "$ac_dir/install-sh"; then
+@@ -2217,53 +2217,38 @@
+ echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
fi
- SED=$lt_cv_path_SED
-+
- { echo "$as_me:$LINENO: result: $SED" >&5
- echo "${ECHO_T}$SED" >&6; }
+-{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
+-echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; }
+-if test -z "$MKDIR_P"; then
+- if test "${ac_cv_path_mkdir+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_prog in mkdir gmkdir; do
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
+- case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
+- 'mkdir (GNU coreutils) '* | \
+- 'mkdir (coreutils) '* | \
+- 'mkdir (fileutils) '4.1*)
+- ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
+- break 3;;
+- esac
+- done
+- done
+-done
+-IFS=$as_save_IFS
+-
+-fi
+-
+- if test "${ac_cv_path_mkdir+set}" = set; then
+- MKDIR_P="$ac_cv_path_mkdir -p"
++if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
++ # We used to keeping the `.' as first argument, in order to
++ # allow $(mkdir_p) to be used without argument. As in
++ # $(mkdir_p) $(somedir)
++ # where $(somedir) is conditionally defined. However this is wrong
++ # for two reasons:
++ # 1. if the package is installed by a user who cannot write `.'
++ # make install will fail,
++ # 2. the above comment should most certainly read
++ # $(mkdir_p) $(DESTDIR)$(somedir)
++ # so it does not work when $(somedir) is undefined and
++ # $(DESTDIR) is not.
++ # To support the latter case, we have to write
++ # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
++ # so the `.' trick is pointless.
++ mkdir_p='mkdir -p --'
++else
++ # On NextStep and OpenStep, the `mkdir' command does not
++ # recognize any option. It will interpret all options as
++ # directories to create, and then abort because `.' already
++ # exists.
++ for d in ./-p ./--version;
++ do
++ test -d $d && rmdir $d
++ done
++ # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
++ if test -f "$ac_aux_dir/mkinstalldirs"; then
++ mkdir_p='$(mkinstalldirs)'
+ else
+- # As a last resort, use the slow shell script. Don't cache a
+- # value for MKDIR_P within a source directory, because that will
+- # break other packages using the cache if that directory is
+- # removed, or if the value is a relative name.
+- test -d ./--version && rmdir ./--version
+- MKDIR_P="$ac_install_sh -d"
++ mkdir_p='$(install_sh) -d'
+ fi
+ fi
+-{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5
+-echo "${ECHO_T}$MKDIR_P" >&6; }
+-
+-mkdir_p="$MKDIR_P"
+-case $mkdir_p in
+- [\\/$]* | ?:[\\/]*) ;;
+- */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+-esac
+
+ for ac_prog in gawk mawk nawk awk
+ do
+@@ -2346,16 +2331,12 @@
+ fi
+ rmdir .tst 2>/dev/null
+
+-if test "`cd $srcdir && pwd`" != "`pwd`"; then
+- # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+- # is not polluted with repeated "-I."
+- am__isrc=' -I$(srcdir)'
+- # test to see if srcdir already configured
+- if test -f $srcdir/config.status; then
+- { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
++# test to see if srcdir already configured
++if test "`cd $srcdir && pwd`" != "`pwd`" &&
++ test -f $srcdir/config.status; then
++ { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
+ echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
+ { (exit 1); exit 1; }; }
+- fi
+ fi
-@@ -4649,8 +4654,8 @@
- echo "${ECHO_T}$lt_cv_path_NM" >&6; }
- NM="$lt_cv_path_NM"
+ # test whether we have cygpath
+@@ -2398,7 +2379,7 @@
--{ echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5
--echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6; }
-+{ echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5
-+echo $ECHO_N "checking how to recognize dependent libraries... $ECHO_C" >&6; }
- if test "${lt_cv_deplibs_check_method+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
+
+-install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
++install_sh=${install_sh-"$am_aux_dir/install-sh"}
+
+ # Installed binaries are usually stripped using `strip' when the user
+ # run `make install-strip'. However `strip' might not be the right
+@@ -2502,7 +2483,7 @@
+ fi
+
+ fi
+-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
++INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
+
+ # We need awk for the "check" target. The system "awk" is bad on
+ # some platforms.
+@@ -2746,7 +2727,9 @@
+
+
+ fi
+- if test "$STATIC_MODULES" != "no"; then
++
++
++if test "$STATIC_MODULES" != "no"; then
+ STATIC_MODULES_TRUE=
+ STATIC_MODULES_FALSE='#'
+ else
+@@ -3732,7 +3715,9 @@
+ am_depcomp="$ac_aux_dir/depcomp"
+ AMDEPBACKSLASH='\'
+ fi
+- if test "x$enable_dependency_tracking" != xno; then
++
++
++if test "x$enable_dependency_tracking" != xno; then
+ AMDEP_TRUE=
+ AMDEP_FALSE='#'
else
-@@ -4669,7 +4674,7 @@
+@@ -3742,6 +3727,7 @@
+
+
+
++
+ depcc="$CC" am_compiler_list=
+
+ { echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+@@ -3809,7 +3795,6 @@
+ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+ >/dev/null 2>conftest.err &&
+- grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
+ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+@@ -3839,7 +3824,9 @@
+ echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
+ CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
+
+- if
++
++
++if
+ test "x$enable_dependency_tracking" != xno \
+ && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
+ am__fastdepCC_TRUE=
+@@ -4672,7 +4659,7 @@
# whether `pass_all' will *always* work, you probably want this one.
case $host_os in
@@ -2160,48 +2167,7 @@ Index: pam.deb/configure
lt_cv_deplibs_check_method=pass_all
;;
-@@ -4691,16 +4696,22 @@
-
- mingw* | pw32*)
- # Base MSYS/MinGW do not provide the 'file' command needed by
-- # func_win32_libid shell function, so use a weaker test based on 'objdump'.
-- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-- lt_cv_file_magic_cmd='$OBJDUMP -f'
-+ # func_win32_libid shell function, so use a weaker test based on 'objdump',
-+ # unless we find 'file', for example because we are cross-compiling.
-+ if ( file / ) >/dev/null 2>&1; then
-+ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-+ lt_cv_file_magic_cmd='func_win32_libid'
-+ else
-+ lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-+ lt_cv_file_magic_cmd='$OBJDUMP -f'
-+ fi
- ;;
-
- darwin* | rhapsody*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
--freebsd* | kfreebsd*-gnu | dragonfly*)
-+freebsd* | dragonfly*)
- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
- case $host_cpu in
- i*86 )
-@@ -4738,7 +4749,7 @@
- esac
- ;;
-
--interix3*)
-+interix[3-9]*)
- # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
- lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
- ;;
-@@ -4754,11 +4765,11 @@
- ;;
-
- # This must be Linux ELF.
--linux*)
-+linux* | k*bsd*-gnu)
+@@ -4767,7 +4754,7 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -2210,57 +2176,16 @@ Index: pam.deb/configure
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
else
-@@ -4788,6 +4799,10 @@
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-+rdos*)
-+ lt_cv_deplibs_check_method=pass_all
-+ ;;
-+
- solaris*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-@@ -4874,7 +4889,7 @@
+@@ -4887,7 +4874,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
-- echo '#line 4877 "configure"' > conftest.$ac_ext
-+ echo '#line 4892 "configure"' > conftest.$ac_ext
+- echo '#line 4890 "configure"' > conftest.$ac_ext
++ echo '#line 4877 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -4909,7 +4924,8 @@
- rm -rf conftest*
- ;;
-
--x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
-+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
-+s390*-*linux*|sparc*-*linux*)
- # Find out which ABI we are using.
- echo 'int i;' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-@@ -4920,6 +4936,9 @@
- case `/usr/bin/file conftest.o` in
- *32-bit*)
- case $host in
-+ x86_64-*kfreebsd*-gnu)
-+ LD="${LD-ld} -m elf_i386_fbsd"
-+ ;;
- x86_64-*linux*)
- LD="${LD-ld} -m elf_i386"
- ;;
-@@ -4936,6 +4955,9 @@
- ;;
- *64-bit*)
- case $host in
-+ x86_64-*kfreebsd*-gnu)
-+ LD="${LD-ld} -m elf_x86_64_fbsd"
-+ ;;
- x86_64-*linux*)
- LD="${LD-ld} -m elf_x86_64"
- ;;
-@@ -5039,7 +5061,11 @@
+@@ -5059,7 +5046,11 @@
*64-bit*)
case $lt_cv_prog_gnu_ld in
yes*) LD="${LD-ld} -m elf64_sparc" ;;
@@ -2273,7 +2198,26 @@ Index: pam.deb/configure
esac
;;
esac
-@@ -6636,7 +6662,6 @@
+@@ -6118,7 +6109,6 @@
+ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+ >/dev/null 2>conftest.err &&
+- grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
+ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+@@ -6148,7 +6138,9 @@
+ echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; }
+ CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
+
+- if
++
++
++if
+ test "x$enable_dependency_tracking" != xno \
+ && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
+ am__fastdepCXX_TRUE=
+@@ -6656,7 +6648,6 @@
# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
@@ -2281,69 +2225,7 @@ Index: pam.deb/configure
# find the maximum length of command line arguments
{ echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; }
-@@ -6723,24 +6748,27 @@
- fi
- ;;
- *)
-- # If test is not a shell built-in, we'll probably end up computing a
-- # maximum length that is only half of the actual maximum length, but
-- # we can't tell.
-- SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-- while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
-+ lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
-+ if test -n "$lt_cv_sys_max_cmd_len"; then
-+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-+ else
-+ SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-+ while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
- = "XX$teststring") >/dev/null 2>&1 &&
-- new_result=`expr "X$teststring" : ".*" 2>&1` &&
-- lt_cv_sys_max_cmd_len=$new_result &&
-- test $i != 17 # 1/2 MB should be enough
-- do
-- i=`expr $i + 1`
-- teststring=$teststring$teststring
-- done
-- teststring=
-- # Add a significant safety factor because C++ compilers can tack on massive
-- # amounts of additional arguments before passing them to the linker.
-- # It appears as though 1/2 is a usable value.
-- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
-+ new_result=`expr "X$teststring" : ".*" 2>&1` &&
-+ lt_cv_sys_max_cmd_len=$new_result &&
-+ test $i != 17 # 1/2 MB should be enough
-+ do
-+ i=`expr $i + 1`
-+ teststring=$teststring$teststring
-+ done
-+ teststring=
-+ # Add a significant safety factor because C++ compilers can tack on massive
-+ # amounts of additional arguments before passing them to the linker.
-+ # It appears as though 1/2 is a usable value.
-+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
-+ fi
- ;;
- esac
-
-@@ -6757,6 +6785,7 @@
-
-
-
-+
- # Check for command to grab the raw symbol name followed by C symbol from nm.
- { echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
- echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; }
-@@ -6794,7 +6823,7 @@
- lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
- lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
- ;;
--linux*)
-+linux* | k*bsd*-gnu)
- if test "$host_cpu" = ia64; then
- symcode='[ABCDGIRSTW]'
- lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-@@ -6947,7 +6976,7 @@
+@@ -6971,7 +6962,7 @@
echo "$progname: failed program was:" >&5
cat conftest.$ac_ext >&5
fi
@@ -2352,16 +2234,7 @@ Index: pam.deb/configure
# Do not use the global_symbol_pipe unless it works.
if test "$pipe_works" = yes; then
-@@ -7345,7 +7374,7 @@
- test -z "$ac_objext" && ac_objext=o
-
- # Determine commands to create old-style static archives.
--old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
-+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
- old_postinstall_cmds='chmod 644 $oldlib'
- old_postuninstall_cmds=
-
-@@ -7507,6 +7536,318 @@
+@@ -7531,6 +7522,318 @@
;;
esac
@@ -2680,32 +2553,8 @@ Index: pam.deb/configure
enable_dlopen=no
enable_win32_dll=no
-@@ -7545,10 +7886,10 @@
- objext=$objext
-
- # Code to be used in simple compile tests
--lt_simple_compile_test_code="int some_variable = 0;\n"
-+lt_simple_compile_test_code="int some_variable = 0;"
-
- # Code to be used in simple link tests
--lt_simple_link_test_code='int main(){return(0);}\n'
-+lt_simple_link_test_code='int main(){return(0);}'
-
-
- # If no C compiler was specified, use CC.
-@@ -7563,16 +7904,16 @@
-
- # save warnings/boilerplate of simple test code
- ac_outfile=conftest.$ac_objext
--printf "$lt_simple_compile_test_code" >conftest.$ac_ext
-+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
- eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
- _lt_compiler_boilerplate=`cat conftest.err`
- $rm conftest*
-
- ac_outfile=conftest.$ac_objext
--printf "$lt_simple_link_test_code" >conftest.$ac_ext
-+echo "$lt_simple_link_test_code" >conftest.$ac_ext
+@@ -7596,7 +7899,7 @@
+ echo "$lt_simple_link_test_code" >conftest.$ac_ext
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
-$rm conftest*
@@ -2713,109 +2562,21 @@ Index: pam.deb/configure
-@@ -7589,7 +7930,7 @@
- else
- lt_cv_prog_compiler_rtti_exceptions=no
- ac_outfile=conftest.$ac_objext
-- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- lt_compiler_flag="-fno-rtti -fno-exceptions"
- # Insert the option either (1) after the last *FLAGS variable, or
- # (2) before a word containing "conftest.", or (3) at the end.
-@@ -7600,11 +7941,11 @@
+@@ -7624,11 +7927,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:7603: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:7944: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:7627: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:7930: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:7607: \$? = $ac_status" >&5
-+ echo "$as_me:7948: \$? = $ac_status" >&5
+- echo "$as_me:7631: \$? = $ac_status" >&5
++ echo "$as_me:7934: \$? = $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.
-@@ -7655,13 +7996,15 @@
- lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
- ;;
-
-- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
- # PIC is the default for these OSes.
- ;;
-
-- mingw* | pw32* | os2*)
-+ mingw* | cygwin* | pw32* | os2*)
- # This hack is so that the source file can tell whether it is being
- # built for inclusion in a dll (and should export symbols for example).
-+ # Although the cygwin gcc ignores -fPIC, still need this for old-style
-+ # (--disable-auto-import) libraries
- lt_prog_compiler_pic='-DDLL_EXPORT'
- ;;
-
-@@ -7671,7 +8014,7 @@
- lt_prog_compiler_pic='-fno-common'
- ;;
-
-- interix3*)
-+ interix[3-9]*)
- # Interix 3.x gcc -fpic/-fPIC options generate broken code.
- # Instead, we relocate shared libraries at runtime.
- ;;
-@@ -7729,7 +8072,7 @@
- esac
- ;;
-
-- mingw* | pw32* | os2*)
-+ mingw* | cygwin* | pw32* | os2*)
- # This hack is so that the source file can tell whether it is being
- # built for inclusion in a dll (and should export symbols for example).
- lt_prog_compiler_pic='-DDLL_EXPORT'
-@@ -7762,7 +8105,7 @@
- lt_prog_compiler_static='-Bstatic'
- ;;
-
-- linux*)
-+ linux* | k*bsd*-gnu)
- case $cc_basename in
- icc* | ecc*)
- lt_prog_compiler_wl='-Wl,'
-@@ -7781,6 +8124,22 @@
- # All Alpha code is PIC.
- lt_prog_compiler_static='-non_shared'
- ;;
-+ *)
-+ case `$CC -V 2>&1 | sed 5q` in
-+ *Sun\ C*)
-+ # Sun C 5.9
-+ lt_prog_compiler_pic='-KPIC'
-+ lt_prog_compiler_static='-Bstatic'
-+ lt_prog_compiler_wl='-Wl,'
-+ ;;
-+ *Sun\ F*)
-+ # Sun Fortran 8.3 passes all unrecognized flags to the linker
-+ lt_prog_compiler_pic='-KPIC'
-+ lt_prog_compiler_static='-Bstatic'
-+ lt_prog_compiler_wl=''
-+ ;;
-+ esac
-+ ;;
- esac
- ;;
-
-@@ -7790,6 +8149,10 @@
- lt_prog_compiler_static='-non_shared'
- ;;
-
-+ rdos*)
-+ lt_prog_compiler_static='-non_shared'
-+ ;;
-+
- solaris*)
- lt_prog_compiler_pic='-KPIC'
- lt_prog_compiler_static='-Bstatic'
-@@ -7852,12 +8215,12 @@
+@@ -7898,10 +8201,10 @@
{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; }
@@ -2826,22 +2587,19 @@ Index: pam.deb/configure
- lt_prog_compiler_pic_works=no
+ lt_cv_prog_compiler_pic_works=no
ac_outfile=conftest.$ac_objext
-- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
- # Insert the option either (1) after the last *FLAGS variable, or
- # (2) before a word containing "conftest.", or (3) at the end.
-@@ -7868,27 +8231,27 @@
+@@ -7914,27 +8217,27 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:7871: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8234: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:7917: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8220: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:7875: \$? = $ac_status" >&5
-+ echo "$as_me:8238: \$? = $ac_status" >&5
+- echo "$as_me:7921: \$? = $ac_status" >&5
++ echo "$as_me:8224: \$? = $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.
@@ -2865,7 +2623,7 @@ Index: pam.deb/configure
case $lt_prog_compiler_pic in
"" | " "*) ;;
*) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
-@@ -7915,13 +8278,13 @@
+@@ -7961,10 +8264,10 @@
wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
@@ -2877,12 +2635,8 @@ Index: pam.deb/configure
+ lt_cv_prog_compiler_static_works=no
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-- printf "$lt_simple_link_test_code" > conftest.$ac_ext
-+ echo "$lt_simple_link_test_code" > conftest.$ac_ext
- if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
- # The linker can only warn and ignore the option if not recognized
- # So say no if there are warnings
-@@ -7931,20 +8294,20 @@
+ echo "$lt_simple_link_test_code" > conftest.$ac_ext
+@@ -7977,20 +8280,20 @@
$echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if diff conftest.exp conftest.er2 >/dev/null; then
@@ -2909,30 +2663,21 @@ Index: pam.deb/configure
:
else
lt_prog_compiler_static=
-@@ -7961,7 +8324,7 @@
- mkdir conftest
- cd conftest
- mkdir out
-- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
- lt_compiler_flag="-o out/conftest2.$ac_objext"
- # Insert the option either (1) after the last *FLAGS variable, or
-@@ -7972,11 +8335,11 @@
+@@ -8018,11 +8321,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:7975: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8338: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:8021: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8324: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:7979: \$? = $ac_status" >&5
-+ echo "$as_me:8342: \$? = $ac_status" >&5
+- echo "$as_me:8025: \$? = $ac_status" >&5
++ echo "$as_me:8328: \$? = $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
-@@ -8056,12 +8419,13 @@
+@@ -8102,12 +8405,13 @@
# it will be wrapped by ` (' and `)$', so one must not match beginning or
# end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
# as well as any symbol that contains `d'.
@@ -2947,7 +2692,7 @@ Index: pam.deb/configure
extract_expsyms_cmds=
# Just being paranoid about ensuring that cc_basename is set.
for cc_temp in $compiler""; do
-@@ -8120,7 +8484,7 @@
+@@ -8166,7 +8470,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
@@ -2956,55 +2701,9 @@ Index: pam.deb/configure
# On AIX/PPC, the GNU linker is very broken
if test "$host_cpu" != ia64; then
ld_shlibs=no
-@@ -8168,7 +8532,7 @@
- allow_undefined_flag=unsupported
- always_export_symbols=no
- enable_shared_with_static_runtimes=yes
-- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
-+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
-
- if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-@@ -8186,7 +8550,7 @@
- fi
- ;;
-
-- interix3*)
-+ interix[3-9]*)
- hardcode_direct=no
- hardcode_shlibpath_var=no
- hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-@@ -8201,7 +8565,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'
- ;;
-
-- linux*)
-+ gnu* | linux* | k*bsd*-gnu)
- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- tmp_addflag=
- case $cc_basename,$host_cpu in
-@@ -8219,20 +8583,30 @@
- ifc* | ifort*) # Intel Fortran compiler
- tmp_addflag=' -nofor_main' ;;
- esac
-- archive_cmds='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ case `$CC -V 2>&1 | sed 5q` in
-+ *Sun\ C*) # Sun C 5.9
-+ whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-+ tmp_sharedflag='-G' ;;
-+ *Sun\ F*) # Sun Fortran 8.3
-+ tmp_sharedflag='-G' ;;
-+ *)
-+ tmp_sharedflag='-shared' ;;
-+ esac
-+ archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-
- if test $supports_anon_versioning = yes; then
- archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~
- cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+@@ -8282,12 +8586,13 @@
$echo "local: *; };" >> $output_objdir/$libname.ver~
-- $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
fi
+ link_all_deplibs=no
else
@@ -3017,7 +2716,7 @@ Index: pam.deb/configure
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -8330,7 +8704,7 @@
+@@ -8385,7 +8690,7 @@
fi
;;
@@ -3026,7 +2725,7 @@ Index: pam.deb/configure
if test "$host_cpu" = ia64; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
-@@ -8350,7 +8724,7 @@
+@@ -8405,7 +8710,7 @@
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
# need to do runtime linking.
@@ -3035,71 +2734,7 @@ Index: pam.deb/configure
for ld_flag in $LDFLAGS; do
if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
aix_use_runtimelinking=yes
-@@ -8384,7 +8758,7 @@
- strings "$collect2name" | grep resolve_lib_name >/dev/null
- then
- # We have reworked collect2
-- hardcode_direct=yes
-+ :
- else
- # We have old collect2
- hardcode_direct=unsupported
-@@ -8458,11 +8832,18 @@
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
-
--aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
--}'`
-+lt_aix_libpath_sed='
-+ /Import File Strings/,/^$/ {
-+ /^0/ {
-+ s/^0 *\(.*\)$/\1/
-+ p
-+ }
-+ }'
-+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- # Check for a 64-bit object if we didn't find anything.
--if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
--}'`; fi
-+if test -z "$aix_libpath"; then
-+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-+fi
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-@@ -8517,11 +8898,18 @@
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
-
--aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
--}'`
-+lt_aix_libpath_sed='
-+ /Import File Strings/,/^$/ {
-+ /^0/ {
-+ s/^0 *\(.*\)$/\1/
-+ p
-+ }
-+ }'
-+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- # Check for a 64-bit object if we didn't find anything.
--if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
--}'`; fi
-+if test -z "$aix_libpath"; then
-+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-+fi
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-@@ -8575,7 +8963,7 @@
- # The linker will automatically build a .lib file if we build a DLL.
- old_archive_From_new_cmds='true'
- # FIXME: Should let the user specify the lib program.
-- old_archive_cmds='lib /OUT:$oldlib$oldobjs$old_deplibs'
-+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
- fix_srcfile_path='`cygpath -w "$srcfile"`'
- enable_shared_with_static_runtimes=yes
- ;;
-@@ -8608,19 +8996,18 @@
+@@ -8677,11 +8982,10 @@
link_all_deplibs=yes
if test "$GCC" = yes ; then
output_verbose_link_cmd='echo'
@@ -3115,26 +2750,7 @@ Index: pam.deb/configure
else
case $cc_basename in
xlc*)
- output_verbose_link_cmd='echo'
-- archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
-+ archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
- module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-- archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- ;;
- *)
-@@ -8660,7 +9047,7 @@
- ;;
-
- # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-- freebsd* | kfreebsd*-gnu | dragonfly*)
-+ freebsd* | dragonfly*)
- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
- hardcode_libdir_flag_spec='-R$libdir'
- hardcode_direct=yes
-@@ -8762,7 +9149,7 @@
+@@ -8831,7 +9135,7 @@
link_all_deplibs=yes
;;
@@ -3143,158 +2759,7 @@ Index: pam.deb/configure
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -8782,24 +9169,28 @@
- ;;
-
- openbsd*)
-- hardcode_direct=yes
-- hardcode_shlibpath_var=no
-- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-- archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-- hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-- export_dynamic_flag_spec='${wl}-E'
-+ if test -f /usr/libexec/ld.so; then
-+ hardcode_direct=yes
-+ hardcode_shlibpath_var=no
-+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+ archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-+ export_dynamic_flag_spec='${wl}-E'
-+ else
-+ case $host_os in
-+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+ hardcode_libdir_flag_spec='-R$libdir'
-+ ;;
-+ *)
-+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-+ ;;
-+ esac
-+ fi
- else
-- case $host_os in
-- openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-- hardcode_libdir_flag_spec='-R$libdir'
-- ;;
-- *)
-- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-- hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-- ;;
-- esac
-+ ld_shlibs=no
- fi
- ;;
-
-@@ -8858,17 +9249,16 @@
- case $host_os in
- solaris2.[0-5] | solaris2.[0-5].*) ;;
- *)
-- # The compiler driver will combine linker options so we
-- # cannot just pass the convience library names through
-- # without $wl, iff we do not link with $LD.
-- # Luckily, gcc supports the same syntax we need for Sun Studio.
-+ # The compiler driver will combine and reorder linker options,
-+ # but understands `-z linker_flag'. GCC discards it without `$wl',
-+ # but is careful enough not to reorder.
- # Supported since Solaris 2.6 (maybe 2.5.1?)
-- case $wlarc in
-- '')
-- whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
-- *)
-- whole_archive_flag_spec='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
-- esac ;;
-+ if test "$GCC" = yes; then
-+ whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-+ else
-+ whole_archive_flag_spec='-z allextract$convenience -z defaultextract'
-+ fi
-+ ;;
- esac
- link_all_deplibs=yes
- ;;
-@@ -8925,7 +9315,7 @@
- fi
- ;;
-
-- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
-+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
- no_undefined_flag='${wl}-z,text'
- archive_cmds_need_lc=no
- hardcode_shlibpath_var=no
-@@ -9002,7 +9392,7 @@
- { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
- echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
- $rm conftest*
-- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
-@@ -9060,17 +9450,55 @@
- version_type=none
- dynamic_linker="$host_os ld.so"
- sys_lib_dlsearch_path_spec="/lib /usr/lib"
-+
- if test "$GCC" = yes; then
-- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-- if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
-+ case $host_os in
-+ darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
-+ *) lt_awk_arg="/^libraries:/" ;;
-+ esac
-+ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-+ if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then
- # if the path contains ";" then we assume it to be the separator
- # otherwise default to the standard path separator (i.e. ":") - it is
- # assumed that no part of a normal pathname contains ";" but that should
- # okay in the real world where ";" in dirpaths is itself problematic.
-- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-+ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'`
- else
-- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-+ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
- fi
-+ # Ok, now we have the path, separated by spaces, we can step through it
-+ # and add multilib dir if necessary.
-+ lt_tmp_lt_search_path_spec=
-+ lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
-+ for lt_sys_path in $lt_search_path_spec; do
-+ if test -d "$lt_sys_path/$lt_multi_os_dir"; then
-+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
-+ else
-+ test -d "$lt_sys_path" && \
-+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
-+ fi
-+ done
-+ lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk '
-+BEGIN {RS=" "; FS="/|\n";} {
-+ lt_foo="";
-+ lt_count=0;
-+ for (lt_i = NF; lt_i > 0; lt_i--) {
-+ if ($lt_i != "" && $lt_i != ".") {
-+ if ($lt_i == "..") {
-+ lt_count++;
-+ } else {
-+ if (lt_count == 0) {
-+ lt_foo="/" $lt_i lt_foo;
-+ } else {
-+ lt_count--;
-+ }
-+ }
-+ }
-+ }
-+ if (lt_foo != "") { lt_freq[lt_foo]++; }
-+ if (lt_freq[lt_foo] == 1) { print lt_foo; }
-+}'`
-+ sys_lib_search_path_spec=`echo $lt_search_path_spec`
- else
- sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
- fi
-@@ -9091,7 +9519,7 @@
+@@ -9201,7 +9505,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
;;
@@ -3303,106 +2768,26 @@ Index: pam.deb/configure
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -9230,12 +9658,8 @@
- shlibpath_overrides_runpath=yes
- shlibpath_var=DYLD_LIBRARY_PATH
- shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-- if test "$GCC" = yes; then
-- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-- else
-- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-- fi
-+
-+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"
- sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
- ;;
-
-@@ -9252,18 +9676,6 @@
- dynamic_linker=no
- ;;
-
--kfreebsd*-gnu)
-- version_type=linux
-- need_lib_prefix=no
-- need_version=no
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-- soname_spec='${libname}${release}${shared_ext}$major'
-- shlibpath_var=LD_LIBRARY_PATH
-- shlibpath_overrides_runpath=no
-- hardcode_into_libs=yes
-- dynamic_linker='GNU ld.so'
-- ;;
--
- freebsd* | dragonfly*)
- # DragonFly does not have aout. When/if they implement a new
- # versioning mechanism, adjust this.
-@@ -9301,7 +9713,7 @@
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- ;;
-- freebsd*) # from 4.6 on
-+ *) # from 4.6 on, and DragonFly
- shlibpath_overrides_runpath=yes
- hardcode_into_libs=yes
- ;;
-@@ -9364,7 +9776,7 @@
- postinstall_cmds='chmod 555 $lib'
- ;;
-
--interix3*)
-+interix[3-9]*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-@@ -9419,7 +9831,7 @@
- ;;
-
- # This must be Linux ELF.
--linux*)
-+linux* | k*bsd*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-@@ -9435,7 +9847,7 @@
-
- # Append ld.so.conf contents to the search path
- if test -f /etc/ld.so.conf; then
-- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
- fi
-
-@@ -9448,7 +9860,7 @@
+@@ -9542,6 +9846,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
--knetbsd*-gnu)
+netbsdelf*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-@@ -9457,7 +9869,7 @@
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
-- dynamic_linker='GNU ld.so'
++ version_type=linux
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=no
++ hardcode_into_libs=yes
+ dynamic_linker='NetBSD ld.elf_so'
- ;;
-
- netbsd*)
-@@ -9541,6 +9953,10 @@
- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
- ;;
-
-+rdos*)
-+ dynamic_linker=no
+ ;;
+
- solaris*)
- version_type=linux
+ netbsd*)
+ version_type=sunos
need_lib_prefix=no
-@@ -9637,6 +10053,21 @@
+@@ -9723,6 +10039,21 @@
echo "${ECHO_T}$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
@@ -3424,15 +2809,7 @@ Index: pam.deb/configure
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
if test "$GCC" = yes; then
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-@@ -9694,6 +10125,7 @@
- darwin*)
- if test -n "$STRIP" ; then
- striplib="$STRIP -x"
-+ old_striplib="$STRIP -S"
- { echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6; }
- else
-@@ -9955,7 +10387,7 @@
+@@ -10042,7 +10373,7 @@
{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
if test $ac_cv_lib_dld_shl_load = yes; then
@@ -3441,7 +2818,7 @@ Index: pam.deb/configure
else
{ echo "$as_me:$LINENO: checking for dlopen" >&5
echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }
-@@ -10231,7 +10663,7 @@
+@@ -10318,7 +10649,7 @@
{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }
if test $ac_cv_lib_dld_dld_link = yes; then
@@ -3450,25 +2827,25 @@ Index: pam.deb/configure
fi
-@@ -10280,7 +10712,7 @@
+@@ -10367,7 +10698,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 10283 "configure"
-+#line 10715 "configure"
+-#line 10370 "configure"
++#line 10701 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -10380,7 +10812,7 @@
+@@ -10467,7 +10798,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 10383 "configure"
-+#line 10815 "configure"
+-#line 10470 "configure"
++#line 10801 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -10507,7 +10939,7 @@
+@@ -10594,7 +10925,7 @@
fi
;;
@@ -3477,7 +2854,7 @@ Index: pam.deb/configure
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
-@@ -10563,6 +10995,7 @@
+@@ -10650,6 +10981,7 @@
predeps \
postdeps \
compiler_lib_search_path \
@@ -3485,24 +2862,16 @@ Index: pam.deb/configure
archive_cmds \
archive_expsym_cmds \
postinstall_cmds \
-@@ -10578,6 +11011,7 @@
- module_cmds \
- module_expsym_cmds \
- lt_cv_prog_compiler_c_o \
-+ fix_srcfile_path \
- exclude_expsyms \
- include_expsyms; do
-
-@@ -10622,7 +11056,7 @@
+@@ -10710,7 +11042,7 @@
# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
#
--# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
+-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
# Free Software Foundation, Inc.
#
# This file is part of GNU Libtool:
-@@ -10858,6 +11292,10 @@
+@@ -10946,6 +11278,10 @@
# shared library.
postdeps=$lt_postdeps
@@ -3513,16 +2882,7 @@ Index: pam.deb/configure
# The library search path used internally by the compiler when linking
# a shared library.
compiler_lib_search_path=$lt_compiler_lib_search_path
-@@ -10946,7 +11384,7 @@
- sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-
- # Fix the shell variable \$srcfile for the compiler.
--fix_srcfile_path="$fix_srcfile_path"
-+fix_srcfile_path=$lt_fix_srcfile_path
-
- # Set to yes if exported symbols are required.
- always_export_symbols=$always_export_symbols
-@@ -11106,6 +11544,7 @@
+@@ -11194,6 +11530,7 @@
predeps_CXX=
postdeps_CXX=
compiler_lib_search_path_CXX=
@@ -3530,32 +2890,8 @@ Index: pam.deb/configure
# Source file extension for C++ test sources.
ac_ext=cpp
-@@ -11115,10 +11554,10 @@
- objext_CXX=$objext
-
- # Code to be used in simple compile tests
--lt_simple_compile_test_code="int some_variable = 0;\n"
-+lt_simple_compile_test_code="int some_variable = 0;"
-
- # Code to be used in simple link tests
--lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n'
-+lt_simple_link_test_code='int main(int, char *[]) { return(0); }'
-
- # ltmain only uses $CC for tagged configurations so make sure $CC is set.
-
-@@ -11134,16 +11573,16 @@
-
- # save warnings/boilerplate of simple test code
- ac_outfile=conftest.$ac_objext
--printf "$lt_simple_compile_test_code" >conftest.$ac_ext
-+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
- eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
- _lt_compiler_boilerplate=`cat conftest.err`
- $rm conftest*
-
- ac_outfile=conftest.$ac_objext
--printf "$lt_simple_link_test_code" >conftest.$ac_ext
-+echo "$lt_simple_link_test_code" >conftest.$ac_ext
+@@ -11231,7 +11568,7 @@
+ echo "$lt_simple_link_test_code" >conftest.$ac_ext
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
-$rm conftest*
@@ -3563,7 +2899,7 @@ Index: pam.deb/configure
# Allow CC to be a program name with arguments.
-@@ -11350,7 +11789,7 @@
+@@ -11438,7 +11775,7 @@
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
@@ -3572,7 +2908,7 @@ Index: pam.deb/configure
if test "$host_cpu" = ia64; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
-@@ -11363,7 +11802,7 @@
+@@ -11451,7 +11788,7 @@
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
# need to do runtime linking.
@@ -3581,62 +2917,7 @@ Index: pam.deb/configure
for ld_flag in $LDFLAGS; do
case $ld_flag in
*-brtl*)
-@@ -11399,7 +11838,7 @@
- strings "$collect2name" | grep resolve_lib_name >/dev/null
- then
- # We have reworked collect2
-- hardcode_direct_CXX=yes
-+ :
- else
- # We have old collect2
- hardcode_direct_CXX=unsupported
-@@ -11473,11 +11912,18 @@
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
-
--aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
--}'`
-+lt_aix_libpath_sed='
-+ /Import File Strings/,/^$/ {
-+ /^0/ {
-+ s/^0 *\(.*\)$/\1/
-+ p
-+ }
-+ }'
-+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- # Check for a 64-bit object if we didn't find anything.
--if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
--}'`; fi
-+if test -z "$aix_libpath"; then
-+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-+fi
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-@@ -11533,11 +11979,18 @@
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
-
--aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
--}'`
-+lt_aix_libpath_sed='
-+ /Import File Strings/,/^$/ {
-+ /^0/ {
-+ s/^0 *\(.*\)$/\1/
-+ p
-+ }
-+ }'
-+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- # Check for a 64-bit object if we didn't find anything.
--if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
--}'`; fi
-+if test -z "$aix_libpath"; then
-+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-+fi
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-@@ -11607,59 +12060,31 @@
+@@ -11709,51 +12046,23 @@
fi
;;
darwin* | rhapsody*)
@@ -3697,55 +2978,7 @@ Index: pam.deb/configure
else
case $cc_basename in
xlc*)
- output_verbose_link_cmd='echo'
-- archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
-+ archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
- module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-- archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- ;;
- *)
-@@ -11693,7 +12118,7 @@
- freebsd-elf*)
- archive_cmds_need_lc_CXX=no
- ;;
-- freebsd* | kfreebsd*-gnu | dragonfly*)
-+ freebsd* | dragonfly*)
- # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
- # conventions
- ld_shlibs_CXX=yes
-@@ -11742,9 +12167,7 @@
- hardcode_libdir_separator_CXX=:
-
- case $host_cpu in
-- hppa*64*|ia64*)
-- hardcode_libdir_flag_spec_ld_CXX='+b $libdir'
-- ;;
-+ hppa*64*|ia64*) ;;
- *)
- export_dynamic_flag_spec_CXX='${wl}-E'
- ;;
-@@ -11812,7 +12235,7 @@
- ;;
- esac
- ;;
-- interix3*)
-+ interix[3-9]*)
- hardcode_direct_CXX=no
- hardcode_shlibpath_var_CXX=no
- hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-@@ -11852,7 +12275,7 @@
- hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
- hardcode_libdir_separator_CXX=:
- ;;
-- linux*)
-+ linux* | k*bsd*-gnu)
- case $cc_basename in
- KCC*)
- # Kuck and Associates, Inc. (KAI) C++ Compiler
-@@ -11904,7 +12327,7 @@
+@@ -12004,7 +12313,7 @@
export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
;;
@@ -3754,37 +2987,7 @@ Index: pam.deb/configure
# Portland Group C++ compiler
archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-@@ -11932,6 +12355,29 @@
- # dependencies.
- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
- ;;
-+ *)
-+ case `$CC -V 2>&1 | sed 5q` in
-+ *Sun\ C*)
-+ # Sun C++ 5.9
-+ no_undefined_flag_CXX=' -zdefs'
-+ archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+ archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
-+ hardcode_libdir_flag_spec_CXX='-R$libdir'
-+ whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-+
-+ # Not sure whether something based on
-+ # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
-+ # would be better.
-+ output_verbose_link_cmd='echo'
-+
-+ # Archives containing C++ object files must be created using
-+ # "CC -xar", where "CC" is the Sun C++ compiler. This is
-+ # necessary to make sure instantiated templates are included
-+ # in the archive.
-+ old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
-+ ;;
-+ esac
-+ ;;
- esac
- ;;
- lynxos*)
-@@ -11954,7 +12400,7 @@
+@@ -12077,7 +12386,7 @@
;;
esac
;;
@@ -3793,69 +2996,7 @@ Index: pam.deb/configure
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
wlarc=
-@@ -11970,16 +12416,20 @@
- ld_shlibs_CXX=no
- ;;
- openbsd*)
-- hardcode_direct_CXX=yes
-- hardcode_shlibpath_var_CXX=no
-- archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-- hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-- archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-- export_dynamic_flag_spec_CXX='${wl}-E'
-- whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+ if test -f /usr/libexec/ld.so; then
-+ hardcode_direct_CXX=yes
-+ hardcode_shlibpath_var_CXX=no
-+ archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-+ hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+ archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-+ export_dynamic_flag_spec_CXX='${wl}-E'
-+ whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+ fi
-+ output_verbose_link_cmd='echo'
-+ else
-+ ld_shlibs_CXX=no
- fi
-- output_verbose_link_cmd='echo'
- ;;
- osf3*)
- case $cc_basename in
-@@ -12141,15 +12591,10 @@
- case $host_os in
- solaris2.[0-5] | solaris2.[0-5].*) ;;
- *)
-- # The C++ compiler is used as linker so we must use $wl
-- # flag to pass the commands to the underlying system
-- # linker. We must also pass each convience library through
-- # to the system linker between allextract/defaultextract.
-- # The C++ compiler will combine linker options so we
-- # cannot just pass the convience library names through
-- # without $wl.
-+ # The compiler driver will combine and reorder linker options,
-+ # but understands `-z linker_flag'.
- # Supported since Solaris 2.6 (maybe 2.5.1?)
-- whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
-+ whole_archive_flag_spec_CXX='-z allextract$convenience -z defaultextract'
- ;;
- esac
- link_all_deplibs_CXX=yes
-@@ -12196,6 +12641,12 @@
- fi
-
- hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
-+ case $host_os in
-+ solaris2.[0-5] | solaris2.[0-5].*) ;;
-+ *)
-+ whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-+ ;;
-+ esac
- fi
- ;;
- esac
-@@ -12283,7 +12734,6 @@
+@@ -12411,7 +12720,6 @@
GCC_CXX="$GXX"
LD_CXX="$LD"
@@ -3863,7 +3004,7 @@ Index: pam.deb/configure
cat > conftest.$ac_ext <<EOF
class Foo
{
-@@ -12385,9 +12835,14 @@
+@@ -12513,6 +12821,11 @@
$rm -f confest.$objext
@@ -3874,58 +3015,8 @@ Index: pam.deb/configure
+
# PORTME: override above test on systems where it is broken
case $host_os in
--interix3*)
-+interix[3-9]*)
- # Interix 3.5 installs completely hosed .la files for C++, so rather than
- # hack all around it, let's just trust "g++" to DTRT.
- predep_objects_CXX=
-@@ -12395,19 +12850,51 @@
- postdeps_CXX=
- ;;
-
-+linux*)
-+ case `$CC -V 2>&1 | sed 5q` in
-+ *Sun\ C*)
-+ # Sun C++ 5.9
-+ #
-+ # The more standards-conforming stlport4 library is
-+ # incompatible with the Cstd library. Avoid specifying
-+ # it if it's in CXXFLAGS. Ignore libCrun as
-+ # -library=stlport4 depends on it.
-+ case " $CXX $CXXFLAGS " in
-+ *" -library=stlport4 "*)
-+ solaris_use_stlport4=yes
-+ ;;
-+ esac
-+ if test "$solaris_use_stlport4" != yes; then
-+ postdeps_CXX='-library=Cstd -library=Crun'
-+ fi
-+ ;;
-+ esac
-+ ;;
-+
- solaris*)
- case $cc_basename in
- CC*)
-+ # The more standards-conforming stlport4 library is
-+ # incompatible with the Cstd library. Avoid specifying
-+ # it if it's in CXXFLAGS. Ignore libCrun as
-+ # -library=stlport4 depends on it.
-+ case " $CXX $CXXFLAGS " in
-+ *" -library=stlport4 "*)
-+ solaris_use_stlport4=yes
-+ ;;
-+ esac
-+
- # Adding this requires a known-good setup of shared libraries for
- # Sun compiler versions before 5.6, else PIC objects from an old
- # archive will be linked into the output, leading to subtle bugs.
-- postdeps_CXX='-lCstd -lCrun'
-+ if test "$solaris_use_stlport4" != yes; then
-+ postdeps_CXX='-library=Cstd -library=Crun'
-+ fi
- ;;
- esac
+ interix[3-9]*)
+@@ -12568,7 +12881,6 @@
;;
esac
@@ -3933,33 +3024,7 @@ Index: pam.deb/configure
case " $postdeps_CXX " in
*" -lc "*) archive_cmds_need_lc_CXX=no ;;
esac
-@@ -12438,12 +12925,14 @@
- # like `-m68040'.
- lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'
- ;;
-- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
- # PIC is the default for these OSes.
- ;;
-- mingw* | os2* | pw32*)
-+ mingw* | cygwin* | os2* | pw32*)
- # This hack is so that the source file can tell whether it is being
- # built for inclusion in a dll (and should export symbols for example).
-+ # Although the cygwin gcc ignores -fPIC, still need this for old-style
-+ # (--disable-auto-import) libraries
- lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
- ;;
- darwin* | rhapsody*)
-@@ -12455,7 +12944,7 @@
- # DJGPP does not support shared libraries at all
- lt_prog_compiler_pic_CXX=
- ;;
-- interix3*)
-+ interix[3-9]*)
- # Interix 3.x gcc -fpic/-fPIC options generate broken code.
- # Instead, we relocate shared libraries at runtime.
- ;;
-@@ -12481,7 +12970,7 @@
+@@ -12644,7 +12956,7 @@
esac
else
case $host_os in
@@ -3968,25 +3033,7 @@ Index: pam.deb/configure
# All AIX code is PIC.
if test "$host_cpu" = ia64; then
# AIX 5 now supports IA64 processor
-@@ -12521,7 +13010,7 @@
- ;;
- esac
- ;;
-- freebsd* | kfreebsd*-gnu | dragonfly*)
-+ freebsd* | dragonfly*)
- # FreeBSD uses GNU C++
- ;;
- hpux9* | hpux10* | hpux11*)
-@@ -12564,7 +13053,7 @@
- ;;
- esac
- ;;
-- linux*)
-+ linux* | k*bsd*-gnu)
- case $cc_basename in
- KCC*)
- # KAI C++ Compiler
-@@ -12577,7 +13066,7 @@
+@@ -12740,7 +13052,7 @@
lt_prog_compiler_pic_CXX='-KPIC'
lt_prog_compiler_static_CXX='-static'
;;
@@ -3995,22 +3042,7 @@ Index: pam.deb/configure
# Portland Group C++ compiler.
lt_prog_compiler_wl_CXX='-Wl,'
lt_prog_compiler_pic_CXX='-fpic'
-@@ -12591,6 +13080,14 @@
- lt_prog_compiler_static_CXX='-non_shared'
- ;;
- *)
-+ case `$CC -V 2>&1 | sed 5q` in
-+ *Sun\ C*)
-+ # Sun C++ 5.9
-+ lt_prog_compiler_pic_CXX='-KPIC'
-+ lt_prog_compiler_static_CXX='-Bstatic'
-+ lt_prog_compiler_wl_CXX='-Qoption ld '
-+ ;;
-+ esac
- ;;
- esac
- ;;
-@@ -12607,7 +13104,7 @@
+@@ -12778,7 +13090,7 @@
;;
esac
;;
@@ -4019,7 +3051,7 @@ Index: pam.deb/configure
;;
osf3* | osf4* | osf5*)
case $cc_basename in
-@@ -12700,12 +13197,12 @@
+@@ -12871,10 +13183,10 @@
{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; }
@@ -4030,22 +3062,19 @@ Index: pam.deb/configure
- lt_prog_compiler_pic_works_CXX=no
+ lt_cv_prog_compiler_pic_works_CXX=no
ac_outfile=conftest.$ac_objext
-- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
- # Insert the option either (1) after the last *FLAGS variable, or
- # (2) before a word containing "conftest.", or (3) at the end.
-@@ -12716,27 +13213,27 @@
+@@ -12887,27 +13199,27 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:12719: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:13216: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:12890: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:13202: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:12723: \$? = $ac_status" >&5
-+ echo "$as_me:13220: \$? = $ac_status" >&5
+- echo "$as_me:12894: \$? = $ac_status" >&5
++ echo "$as_me:13206: \$? = $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.
@@ -4069,7 +3098,7 @@ Index: pam.deb/configure
case $lt_prog_compiler_pic_CXX in
"" | " "*) ;;
*) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;;
-@@ -12763,13 +13260,13 @@
+@@ -12934,10 +13246,10 @@
wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
@@ -4081,12 +3110,8 @@ Index: pam.deb/configure
+ lt_cv_prog_compiler_static_works_CXX=no
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-- printf "$lt_simple_link_test_code" > conftest.$ac_ext
-+ echo "$lt_simple_link_test_code" > conftest.$ac_ext
- if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
- # The linker can only warn and ignore the option if not recognized
- # So say no if there are warnings
-@@ -12779,20 +13276,20 @@
+ echo "$lt_simple_link_test_code" > conftest.$ac_ext
+@@ -12950,20 +13262,20 @@
$echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if diff conftest.exp conftest.er2 >/dev/null; then
@@ -4113,30 +3138,21 @@ Index: pam.deb/configure
:
else
lt_prog_compiler_static_CXX=
-@@ -12809,7 +13306,7 @@
- mkdir conftest
- cd conftest
- mkdir out
-- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
- lt_compiler_flag="-o out/conftest2.$ac_objext"
- # Insert the option either (1) after the last *FLAGS variable, or
-@@ -12820,11 +13317,11 @@
+@@ -12991,11 +13303,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:12823: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:13320: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:12994: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:13306: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:12827: \$? = $ac_status" >&5
-+ echo "$as_me:13324: \$? = $ac_status" >&5
+- echo "$as_me:12998: \$? = $ac_status" >&5
++ echo "$as_me:13310: \$? = $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
-@@ -12877,7 +13374,7 @@
+@@ -13048,7 +13360,7 @@
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
case $host_os in
@@ -4145,16 +3161,13 @@ Index: pam.deb/configure
# If we're using GNU nm, then we don't want the "-C" option.
# -C means demangle to AIX nm, but means don't demangle with GNU nm
if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-@@ -12890,12 +13387,16 @@
- export_symbols_cmds_CXX="$ltdll_cmds"
- ;;
+@@ -13063,10 +13375,14 @@
cygwin* | mingw*)
-- export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([^ ]*\) [^ ]*/\1 DATA/;/^I /d;/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
-+ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
-+ ;;
+ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
+ ;;
+ linux* | k*bsd*-gnu)
+ link_all_deplibs_CXX=no
- ;;
++ ;;
*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
@@ -4163,38 +3176,7 @@ Index: pam.deb/configure
{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
-@@ -12921,7 +13422,7 @@
- { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
- echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
- $rm conftest*
-- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
-@@ -12979,20 +13480,7 @@
- version_type=none
- dynamic_linker="$host_os ld.so"
- sys_lib_dlsearch_path_spec="/lib /usr/lib"
--if test "$GCC" = yes; then
-- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-- if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
-- # if the path contains ";" then we assume it to be the separator
-- # otherwise default to the standard path separator (i.e. ":") - it is
-- # assumed that no part of a normal pathname contains ";" but that should
-- # okay in the real world where ";" in dirpaths is itself problematic.
-- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-- else
-- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-- fi
--else
-- sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
--fi
-+
- need_lib_prefix=unknown
- hardcode_into_libs=no
-
-@@ -13010,7 +13498,7 @@
+@@ -13168,7 +13484,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
;;
@@ -4203,105 +3185,26 @@ Index: pam.deb/configure
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -13149,12 +13637,7 @@
- shlibpath_overrides_runpath=yes
- shlibpath_var=DYLD_LIBRARY_PATH
- shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-- if test "$GCC" = yes; then
-- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-- else
-- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-- fi
-+
- sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
- ;;
-
-@@ -13171,18 +13654,6 @@
- dynamic_linker=no
- ;;
-
--kfreebsd*-gnu)
-- version_type=linux
-- need_lib_prefix=no
-- need_version=no
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-- soname_spec='${libname}${release}${shared_ext}$major'
-- shlibpath_var=LD_LIBRARY_PATH
-- shlibpath_overrides_runpath=no
-- hardcode_into_libs=yes
-- dynamic_linker='GNU ld.so'
-- ;;
--
- freebsd* | dragonfly*)
- # DragonFly does not have aout. When/if they implement a new
- # versioning mechanism, adjust this.
-@@ -13220,7 +13691,7 @@
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- ;;
-- freebsd*) # from 4.6 on
-+ *) # from 4.6 on, and DragonFly
- shlibpath_overrides_runpath=yes
- hardcode_into_libs=yes
- ;;
-@@ -13283,7 +13754,7 @@
- postinstall_cmds='chmod 555 $lib'
- ;;
-
--interix3*)
-+interix[3-9]*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-@@ -13338,7 +13809,7 @@
- ;;
-
- # This must be Linux ELF.
--linux*)
-+linux* | k*bsd*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-@@ -13354,7 +13825,7 @@
-
- # Append ld.so.conf contents to the search path
- if test -f /etc/ld.so.conf; then
-- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
- fi
-
-@@ -13367,7 +13838,7 @@
+@@ -13508,6 +13824,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
--knetbsd*-gnu)
+netbsdelf*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-@@ -13376,7 +13847,7 @@
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
-- dynamic_linker='GNU ld.so'
++ version_type=linux
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=no
++ hardcode_into_libs=yes
+ dynamic_linker='NetBSD ld.elf_so'
- ;;
-
- netbsd*)
-@@ -13460,6 +13931,10 @@
- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
- ;;
-
-+rdos*)
-+ dynamic_linker=no
+ ;;
+
- solaris*)
- version_type=linux
+ netbsd*)
+ version_type=sunos
need_lib_prefix=no
-@@ -13556,6 +14031,21 @@
+@@ -13689,6 +14017,21 @@
echo "${ECHO_T}$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
@@ -4323,7 +3226,7 @@ Index: pam.deb/configure
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
if test "$GCC" = yes; then
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-@@ -13639,6 +14129,7 @@
+@@ -13772,6 +14115,7 @@
predeps_CXX \
postdeps_CXX \
compiler_lib_search_path_CXX \
@@ -4331,15 +3234,7 @@ Index: pam.deb/configure
archive_cmds_CXX \
archive_expsym_cmds_CXX \
postinstall_cmds_CXX \
-@@ -13654,6 +14145,7 @@
- module_cmds_CXX \
- module_expsym_cmds_CXX \
- lt_cv_prog_compiler_c_o_CXX \
-+ fix_srcfile_path_CXX \
- exclude_expsyms_CXX \
- include_expsyms_CXX; do
-
-@@ -13886,6 +14378,10 @@
+@@ -14020,6 +14364,10 @@
# shared library.
postdeps=$lt_postdeps_CXX
@@ -4350,48 +3245,8 @@ Index: pam.deb/configure
# The library search path used internally by the compiler when linking
# a shared library.
compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
-@@ -13974,7 +14470,7 @@
- sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-
- # Fix the shell variable \$srcfile for the compiler.
--fix_srcfile_path="$fix_srcfile_path_CXX"
-+fix_srcfile_path=$lt_fix_srcfile_path
-
- # Set to yes if exported symbols are required.
- always_export_symbols=$always_export_symbols_CXX
-@@ -14065,10 +14561,17 @@
- objext_F77=$objext
-
- # Code to be used in simple compile tests
--lt_simple_compile_test_code=" subroutine t\n return\n end\n"
-+lt_simple_compile_test_code="\
-+ subroutine t
-+ return
-+ end
-+"
-
- # Code to be used in simple link tests
--lt_simple_link_test_code=" program t\n end\n"
-+lt_simple_link_test_code="\
-+ program t
-+ end
-+"
-
- # ltmain only uses $CC for tagged configurations so make sure $CC is set.
-
-@@ -14084,16 +14587,16 @@
-
- # save warnings/boilerplate of simple test code
- ac_outfile=conftest.$ac_objext
--printf "$lt_simple_compile_test_code" >conftest.$ac_ext
-+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
- eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
- _lt_compiler_boilerplate=`cat conftest.err`
- $rm conftest*
-
- ac_outfile=conftest.$ac_objext
--printf "$lt_simple_link_test_code" >conftest.$ac_ext
-+echo "$lt_simple_link_test_code" >conftest.$ac_ext
+@@ -14234,7 +14582,7 @@
+ echo "$lt_simple_link_test_code" >conftest.$ac_ext
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
-$rm conftest*
@@ -4399,7 +3254,7 @@ Index: pam.deb/configure
# Allow CC to be a program name with arguments.
-@@ -14131,7 +14634,7 @@
+@@ -14272,7 +14620,7 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -4408,86 +3263,7 @@ Index: pam.deb/configure
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
-@@ -14177,13 +14680,15 @@
- lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4'
- ;;
-
-- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
- # PIC is the default for these OSes.
- ;;
-
-- mingw* | pw32* | os2*)
-+ mingw* | cygwin* | pw32* | os2*)
- # This hack is so that the source file can tell whether it is being
- # built for inclusion in a dll (and should export symbols for example).
-+ # Although the cygwin gcc ignores -fPIC, still need this for old-style
-+ # (--disable-auto-import) libraries
- lt_prog_compiler_pic_F77='-DDLL_EXPORT'
- ;;
-
-@@ -14193,7 +14698,7 @@
- lt_prog_compiler_pic_F77='-fno-common'
- ;;
-
-- interix3*)
-+ interix[3-9]*)
- # Interix 3.x gcc -fpic/-fPIC options generate broken code.
- # Instead, we relocate shared libraries at runtime.
- ;;
-@@ -14251,7 +14756,7 @@
- esac
- ;;
-
-- mingw* | pw32* | os2*)
-+ mingw* | cygwin* | pw32* | os2*)
- # This hack is so that the source file can tell whether it is being
- # built for inclusion in a dll (and should export symbols for example).
- lt_prog_compiler_pic_F77='-DDLL_EXPORT'
-@@ -14284,7 +14789,7 @@
- lt_prog_compiler_static_F77='-Bstatic'
- ;;
-
-- linux*)
-+ linux* | k*bsd*-gnu)
- case $cc_basename in
- icc* | ecc*)
- lt_prog_compiler_wl_F77='-Wl,'
-@@ -14303,6 +14808,22 @@
- # All Alpha code is PIC.
- lt_prog_compiler_static_F77='-non_shared'
- ;;
-+ *)
-+ case `$CC -V 2>&1 | sed 5q` in
-+ *Sun\ C*)
-+ # Sun C 5.9
-+ lt_prog_compiler_pic_F77='-KPIC'
-+ lt_prog_compiler_static_F77='-Bstatic'
-+ lt_prog_compiler_wl_F77='-Wl,'
-+ ;;
-+ *Sun\ F*)
-+ # Sun Fortran 8.3 passes all unrecognized flags to the linker
-+ lt_prog_compiler_pic_F77='-KPIC'
-+ lt_prog_compiler_static_F77='-Bstatic'
-+ lt_prog_compiler_wl_F77=''
-+ ;;
-+ esac
-+ ;;
- esac
- ;;
-
-@@ -14312,6 +14833,10 @@
- lt_prog_compiler_static_F77='-non_shared'
- ;;
-
-+ rdos*)
-+ lt_prog_compiler_static_F77='-non_shared'
-+ ;;
-+
- solaris*)
- lt_prog_compiler_pic_F77='-KPIC'
- lt_prog_compiler_static_F77='-Bstatic'
-@@ -14374,12 +14899,12 @@
+@@ -14537,10 +14885,10 @@
{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; }
@@ -4498,22 +3274,19 @@ Index: pam.deb/configure
- lt_prog_compiler_pic_works_F77=no
+ lt_cv_prog_compiler_pic_works_F77=no
ac_outfile=conftest.$ac_objext
-- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
lt_compiler_flag="$lt_prog_compiler_pic_F77"
- # Insert the option either (1) after the last *FLAGS variable, or
- # (2) before a word containing "conftest.", or (3) at the end.
-@@ -14390,27 +14915,27 @@
+@@ -14553,27 +14901,27 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:14393: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14918: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:14556: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14904: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:14397: \$? = $ac_status" >&5
-+ echo "$as_me:14922: \$? = $ac_status" >&5
+- echo "$as_me:14560: \$? = $ac_status" >&5
++ echo "$as_me:14908: \$? = $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.
@@ -4537,7 +3310,7 @@ Index: pam.deb/configure
case $lt_prog_compiler_pic_F77 in
"" | " "*) ;;
*) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;;
-@@ -14437,13 +14962,13 @@
+@@ -14600,10 +14948,10 @@
wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\"
{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
@@ -4549,12 +3322,8 @@ Index: pam.deb/configure
+ lt_cv_prog_compiler_static_works_F77=no
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-- printf "$lt_simple_link_test_code" > conftest.$ac_ext
-+ echo "$lt_simple_link_test_code" > conftest.$ac_ext
- if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
- # The linker can only warn and ignore the option if not recognized
- # So say no if there are warnings
-@@ -14453,20 +14978,20 @@
+ echo "$lt_simple_link_test_code" > conftest.$ac_ext
+@@ -14616,20 +14964,20 @@
$echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if diff conftest.exp conftest.er2 >/dev/null; then
@@ -4581,30 +3350,21 @@ Index: pam.deb/configure
:
else
lt_prog_compiler_static_F77=
-@@ -14483,7 +15008,7 @@
- mkdir conftest
- cd conftest
- mkdir out
-- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
- lt_compiler_flag="-o out/conftest2.$ac_objext"
- # Insert the option either (1) after the last *FLAGS variable, or
-@@ -14494,11 +15019,11 @@
+@@ -14657,11 +15005,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:14497: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:15022: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:14660: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:15008: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:14501: \$? = $ac_status" >&5
-+ echo "$as_me:15026: \$? = $ac_status" >&5
+- echo "$as_me:14664: \$? = $ac_status" >&5
++ echo "$as_me:15012: \$? = $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
-@@ -14578,12 +15103,13 @@
+@@ -14741,12 +15089,13 @@
# it will be wrapped by ` (' and `)$', so one must not match beginning or
# end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
# as well as any symbol that contains `d'.
@@ -4619,7 +3379,7 @@ Index: pam.deb/configure
extract_expsyms_cmds=
# Just being paranoid about ensuring that cc_basename is set.
for cc_temp in $compiler""; do
-@@ -14642,7 +15168,7 @@
+@@ -14805,7 +15154,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
@@ -4628,55 +3388,9 @@ Index: pam.deb/configure
# On AIX/PPC, the GNU linker is very broken
if test "$host_cpu" != ia64; then
ld_shlibs_F77=no
-@@ -14690,7 +15216,7 @@
- allow_undefined_flag_F77=unsupported
- always_export_symbols_F77=no
- enable_shared_with_static_runtimes_F77=yes
-- export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
-+ export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
-
- if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
- archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-@@ -14708,7 +15234,7 @@
- fi
- ;;
-
-- interix3*)
-+ interix[3-9]*)
- hardcode_direct_F77=no
- hardcode_shlibpath_var_F77=no
- hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
-@@ -14723,7 +15249,7 @@
- archive_expsym_cmds_F77='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'
- ;;
-
-- linux*)
-+ gnu* | linux* | k*bsd*-gnu)
- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- tmp_addflag=
- case $cc_basename,$host_cpu in
-@@ -14741,20 +15267,30 @@
- ifc* | ifort*) # Intel Fortran compiler
- tmp_addflag=' -nofor_main' ;;
- esac
-- archive_cmds_F77='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ case `$CC -V 2>&1 | sed 5q` in
-+ *Sun\ C*) # Sun C 5.9
-+ whole_archive_flag_spec_F77='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-+ tmp_sharedflag='-G' ;;
-+ *Sun\ F*) # Sun Fortran 8.3
-+ tmp_sharedflag='-G' ;;
-+ *)
-+ tmp_sharedflag='-shared' ;;
-+ esac
-+ archive_cmds_F77='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-
- if test $supports_anon_versioning = yes; then
- archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~
- cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+@@ -14921,12 +15270,13 @@
$echo "local: *; };" >> $output_objdir/$libname.ver~
-- $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
fi
+ link_all_deplibs_F77=no
else
@@ -4689,7 +3403,7 @@ Index: pam.deb/configure
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -14852,7 +15388,7 @@
+@@ -15024,7 +15374,7 @@
fi
;;
@@ -4698,7 +3412,7 @@ Index: pam.deb/configure
if test "$host_cpu" = ia64; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
-@@ -14872,7 +15408,7 @@
+@@ -15044,7 +15394,7 @@
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
# need to do runtime linking.
@@ -4707,71 +3421,7 @@ Index: pam.deb/configure
for ld_flag in $LDFLAGS; do
if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
aix_use_runtimelinking=yes
-@@ -14906,7 +15442,7 @@
- strings "$collect2name" | grep resolve_lib_name >/dev/null
- then
- # We have reworked collect2
-- hardcode_direct_F77=yes
-+ :
- else
- # We have old collect2
- hardcode_direct_F77=unsupported
-@@ -14970,11 +15506,18 @@
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
-
--aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
--}'`
-+lt_aix_libpath_sed='
-+ /Import File Strings/,/^$/ {
-+ /^0/ {
-+ s/^0 *\(.*\)$/\1/
-+ p
-+ }
-+ }'
-+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- # Check for a 64-bit object if we didn't find anything.
--if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
--}'`; fi
-+if test -z "$aix_libpath"; then
-+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-+fi
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-@@ -15019,11 +15562,18 @@
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
-
--aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
--}'`
-+lt_aix_libpath_sed='
-+ /Import File Strings/,/^$/ {
-+ /^0/ {
-+ s/^0 *\(.*\)$/\1/
-+ p
-+ }
-+ }'
-+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- # Check for a 64-bit object if we didn't find anything.
--if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
--}'`; fi
-+if test -z "$aix_libpath"; then
-+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-+fi
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-@@ -15077,7 +15627,7 @@
- # The linker will automatically build a .lib file if we build a DLL.
- old_archive_From_new_cmds_F77='true'
- # FIXME: Should let the user specify the lib program.
-- old_archive_cmds_F77='lib /OUT:$oldlib$oldobjs$old_deplibs'
-+ old_archive_cmds_F77='lib -OUT:$oldlib$oldobjs$old_deplibs'
- fix_srcfile_path_F77='`cygpath -w "$srcfile"`'
- enable_shared_with_static_runtimes_F77=yes
- ;;
-@@ -15110,19 +15660,18 @@
+@@ -15296,11 +15646,10 @@
link_all_deplibs_F77=yes
if test "$GCC" = yes ; then
output_verbose_link_cmd='echo'
@@ -4787,26 +3437,7 @@ Index: pam.deb/configure
else
case $cc_basename in
xlc*)
- output_verbose_link_cmd='echo'
-- archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
-+ archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
- module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-- archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- ;;
- *)
-@@ -15162,7 +15711,7 @@
- ;;
-
- # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-- freebsd* | kfreebsd*-gnu | dragonfly*)
-+ freebsd* | dragonfly*)
- archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
- hardcode_libdir_flag_spec_F77='-R$libdir'
- hardcode_direct_F77=yes
-@@ -15264,7 +15813,7 @@
+@@ -15450,7 +15799,7 @@
link_all_deplibs_F77=yes
;;
@@ -4815,120 +3446,7 @@ Index: pam.deb/configure
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -15284,24 +15833,28 @@
- ;;
-
- openbsd*)
-- hardcode_direct_F77=yes
-- hardcode_shlibpath_var_F77=no
-- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-- archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-- archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-- hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
-- export_dynamic_flag_spec_F77='${wl}-E'
-+ if test -f /usr/libexec/ld.so; then
-+ hardcode_direct_F77=yes
-+ hardcode_shlibpath_var_F77=no
-+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+ archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+ archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-+ hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
-+ export_dynamic_flag_spec_F77='${wl}-E'
-+ else
-+ case $host_os in
-+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-+ archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+ hardcode_libdir_flag_spec_F77='-R$libdir'
-+ ;;
-+ *)
-+ archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+ hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
-+ ;;
-+ esac
-+ fi
- else
-- case $host_os in
-- openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-- archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-- hardcode_libdir_flag_spec_F77='-R$libdir'
-- ;;
-- *)
-- archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-- hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
-- ;;
-- esac
-+ ld_shlibs_F77=no
- fi
- ;;
-
-@@ -15360,17 +15913,16 @@
- case $host_os in
- solaris2.[0-5] | solaris2.[0-5].*) ;;
- *)
-- # The compiler driver will combine linker options so we
-- # cannot just pass the convience library names through
-- # without $wl, iff we do not link with $LD.
-- # Luckily, gcc supports the same syntax we need for Sun Studio.
-+ # The compiler driver will combine and reorder linker options,
-+ # but understands `-z linker_flag'. GCC discards it without `$wl',
-+ # but is careful enough not to reorder.
- # Supported since Solaris 2.6 (maybe 2.5.1?)
-- case $wlarc in
-- '')
-- whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;;
-- *)
-- whole_archive_flag_spec_F77='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
-- esac ;;
-+ if test "$GCC" = yes; then
-+ whole_archive_flag_spec_F77='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-+ else
-+ whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract'
-+ fi
-+ ;;
- esac
- link_all_deplibs_F77=yes
- ;;
-@@ -15427,7 +15979,7 @@
- fi
- ;;
-
-- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
-+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
- no_undefined_flag_F77='${wl}-z,text'
- archive_cmds_need_lc_F77=no
- hardcode_shlibpath_var_F77=no
-@@ -15504,7 +16056,7 @@
- { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
- echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
- $rm conftest*
-- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
-@@ -15562,20 +16114,7 @@
- version_type=none
- dynamic_linker="$host_os ld.so"
- sys_lib_dlsearch_path_spec="/lib /usr/lib"
--if test "$GCC" = yes; then
-- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-- if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
-- # if the path contains ";" then we assume it to be the separator
-- # otherwise default to the standard path separator (i.e. ":") - it is
-- # assumed that no part of a normal pathname contains ";" but that should
-- # okay in the real world where ";" in dirpaths is itself problematic.
-- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-- else
-- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-- fi
--else
-- sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
--fi
-+
- need_lib_prefix=unknown
- hardcode_into_libs=no
-
-@@ -15593,7 +16132,7 @@
+@@ -15769,7 +16118,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
;;
@@ -4937,105 +3455,26 @@ Index: pam.deb/configure
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -15732,12 +16271,7 @@
- shlibpath_overrides_runpath=yes
- shlibpath_var=DYLD_LIBRARY_PATH
- shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-- if test "$GCC" = yes; then
-- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-- else
-- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-- fi
-+
- sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
- ;;
-
-@@ -15754,18 +16288,6 @@
- dynamic_linker=no
- ;;
-
--kfreebsd*-gnu)
-- version_type=linux
-- need_lib_prefix=no
-- need_version=no
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-- soname_spec='${libname}${release}${shared_ext}$major'
-- shlibpath_var=LD_LIBRARY_PATH
-- shlibpath_overrides_runpath=no
-- hardcode_into_libs=yes
-- dynamic_linker='GNU ld.so'
-- ;;
--
- freebsd* | dragonfly*)
- # DragonFly does not have aout. When/if they implement a new
- # versioning mechanism, adjust this.
-@@ -15803,7 +16325,7 @@
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- ;;
-- freebsd*) # from 4.6 on
-+ *) # from 4.6 on, and DragonFly
- shlibpath_overrides_runpath=yes
- hardcode_into_libs=yes
- ;;
-@@ -15866,7 +16388,7 @@
- postinstall_cmds='chmod 555 $lib'
- ;;
-
--interix3*)
-+interix[3-9]*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-@@ -15921,7 +16443,7 @@
- ;;
-
- # This must be Linux ELF.
--linux*)
-+linux* | k*bsd*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-@@ -15937,7 +16459,7 @@
-
- # Append ld.so.conf contents to the search path
- if test -f /etc/ld.so.conf; then
-- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
- fi
-
-@@ -15950,7 +16472,7 @@
+@@ -16109,6 +16458,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
--knetbsd*-gnu)
+netbsdelf*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-@@ -15959,7 +16481,7 @@
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
-- dynamic_linker='GNU ld.so'
++ version_type=linux
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=no
++ hardcode_into_libs=yes
+ dynamic_linker='NetBSD ld.elf_so'
- ;;
-
- netbsd*)
-@@ -16043,6 +16565,10 @@
- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
- ;;
-
-+rdos*)
-+ dynamic_linker=no
+ ;;
+
- solaris*)
- version_type=linux
+ netbsd*)
+ version_type=sunos
need_lib_prefix=no
-@@ -16139,6 +16665,21 @@
+@@ -16290,6 +16651,21 @@
echo "${ECHO_T}$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
@@ -5057,7 +3496,7 @@ Index: pam.deb/configure
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
if test "$GCC" = yes; then
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-@@ -16222,6 +16763,7 @@
+@@ -16373,6 +16749,7 @@
predeps_F77 \
postdeps_F77 \
compiler_lib_search_path_F77 \
@@ -5065,15 +3504,7 @@ Index: pam.deb/configure
archive_cmds_F77 \
archive_expsym_cmds_F77 \
postinstall_cmds_F77 \
-@@ -16237,6 +16779,7 @@
- module_cmds_F77 \
- module_expsym_cmds_F77 \
- lt_cv_prog_compiler_c_o_F77 \
-+ fix_srcfile_path_F77 \
- exclude_expsyms_F77 \
- include_expsyms_F77; do
-
-@@ -16469,6 +17012,10 @@
+@@ -16621,6 +16998,10 @@
# shared library.
postdeps=$lt_postdeps_F77
@@ -5084,41 +3515,8 @@ Index: pam.deb/configure
# The library search path used internally by the compiler when linking
# a shared library.
compiler_lib_search_path=$lt_compiler_lib_search_path_F77
-@@ -16557,7 +17104,7 @@
- sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-
- # Fix the shell variable \$srcfile for the compiler.
--fix_srcfile_path="$fix_srcfile_path_F77"
-+fix_srcfile_path=$lt_fix_srcfile_path
-
- # Set to yes if exported symbols are required.
- always_export_symbols=$always_export_symbols_F77
-@@ -16615,10 +17162,10 @@
- objext_GCJ=$objext
-
- # Code to be used in simple compile tests
--lt_simple_compile_test_code="class foo {}\n"
-+lt_simple_compile_test_code="class foo {}"
-
- # Code to be used in simple link tests
--lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n'
-+lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }'
-
- # ltmain only uses $CC for tagged configurations so make sure $CC is set.
-
-@@ -16634,16 +17181,16 @@
-
- # save warnings/boilerplate of simple test code
- ac_outfile=conftest.$ac_objext
--printf "$lt_simple_compile_test_code" >conftest.$ac_ext
-+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
- eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
- _lt_compiler_boilerplate=`cat conftest.err`
- $rm conftest*
-
- ac_outfile=conftest.$ac_objext
--printf "$lt_simple_link_test_code" >conftest.$ac_ext
-+echo "$lt_simple_link_test_code" >conftest.$ac_ext
+@@ -16795,7 +17176,7 @@
+ echo "$lt_simple_link_test_code" >conftest.$ac_ext
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
-$rm conftest*
@@ -5126,64 +3524,31 @@ Index: pam.deb/configure
# Allow CC to be a program name with arguments.
-@@ -16681,7 +17228,7 @@
- else
- lt_cv_prog_compiler_rtti_exceptions=no
- ac_outfile=conftest.$ac_objext
-- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- lt_compiler_flag="-fno-rtti -fno-exceptions"
- # Insert the option either (1) after the last *FLAGS variable, or
- # (2) before a word containing "conftest.", or (3) at the end.
-@@ -16692,11 +17239,11 @@
+@@ -16844,11 +17225,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:16695: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:17242: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:16847: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:17228: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:16699: \$? = $ac_status" >&5
-+ echo "$as_me:17246: \$? = $ac_status" >&5
+- echo "$as_me:16851: \$? = $ac_status" >&5
++ echo "$as_me:17232: \$? = $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.
-@@ -16747,14 +17294,16 @@
- lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4'
- ;;
-
-- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
- # PIC is the default for these OSes.
- ;;
-
-- mingw* | pw32* | os2*)
-+ mingw* | cygwin* | pw32* | os2*)
- # This hack is so that the source file can tell whether it is being
+@@ -16908,7 +17289,7 @@
# built for inclusion in a dll (and should export symbols for example).
+ # Although the cygwin gcc ignores -fPIC, still need this for old-style
+ # (--disable-auto-import) libraries
- lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
-+ # Although the cygwin gcc ignores -fPIC, still need this for old-style
-+ # (--disable-auto-import) libraries
+
;;
darwin* | rhapsody*)
-@@ -16763,7 +17312,7 @@
- lt_prog_compiler_pic_GCJ='-fno-common'
- ;;
-
-- interix3*)
-+ interix[3-9]*)
- # Interix 3.x gcc -fpic/-fPIC options generate broken code.
- # Instead, we relocate shared libraries at runtime.
- ;;
-@@ -16821,10 +17370,10 @@
- esac
- ;;
-
-- mingw* | pw32* | os2*)
-+ mingw* | cygwin* | pw32* | os2*)
+@@ -16978,7 +17359,7 @@
+ mingw* | cygwin* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
- lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
@@ -5191,50 +3556,7 @@ Index: pam.deb/configure
;;
hpux9* | hpux10* | hpux11*)
-@@ -16854,7 +17403,7 @@
- lt_prog_compiler_static_GCJ='-Bstatic'
- ;;
-
-- linux*)
-+ linux* | k*bsd*-gnu)
- case $cc_basename in
- icc* | ecc*)
- lt_prog_compiler_wl_GCJ='-Wl,'
-@@ -16873,6 +17422,22 @@
- # All Alpha code is PIC.
- lt_prog_compiler_static_GCJ='-non_shared'
- ;;
-+ *)
-+ case `$CC -V 2>&1 | sed 5q` in
-+ *Sun\ C*)
-+ # Sun C 5.9
-+ lt_prog_compiler_pic_GCJ='-KPIC'
-+ lt_prog_compiler_static_GCJ='-Bstatic'
-+ lt_prog_compiler_wl_GCJ='-Wl,'
-+ ;;
-+ *Sun\ F*)
-+ # Sun Fortran 8.3 passes all unrecognized flags to the linker
-+ lt_prog_compiler_pic_GCJ='-KPIC'
-+ lt_prog_compiler_static_GCJ='-Bstatic'
-+ lt_prog_compiler_wl_GCJ=''
-+ ;;
-+ esac
-+ ;;
- esac
- ;;
-
-@@ -16882,6 +17447,10 @@
- lt_prog_compiler_static_GCJ='-non_shared'
- ;;
-
-+ rdos*)
-+ lt_prog_compiler_static_GCJ='-non_shared'
-+ ;;
-+
- solaris*)
- lt_prog_compiler_pic_GCJ='-KPIC'
- lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -16944,12 +17513,12 @@
+@@ -17118,10 +17499,10 @@
{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; }
@@ -5245,22 +3567,19 @@ Index: pam.deb/configure
- lt_prog_compiler_pic_works_GCJ=no
+ lt_cv_prog_compiler_pic_works_GCJ=no
ac_outfile=conftest.$ac_objext
-- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
lt_compiler_flag="$lt_prog_compiler_pic_GCJ"
- # Insert the option either (1) after the last *FLAGS variable, or
- # (2) before a word containing "conftest.", or (3) at the end.
-@@ -16960,27 +17529,27 @@
+@@ -17134,27 +17515,27 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:16963: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:17532: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:17137: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:17518: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:16967: \$? = $ac_status" >&5
-+ echo "$as_me:17536: \$? = $ac_status" >&5
+- echo "$as_me:17141: \$? = $ac_status" >&5
++ echo "$as_me:17522: \$? = $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.
@@ -5284,7 +3603,7 @@ Index: pam.deb/configure
case $lt_prog_compiler_pic_GCJ in
"" | " "*) ;;
*) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;;
-@@ -17007,13 +17576,13 @@
+@@ -17181,10 +17562,10 @@
wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\"
{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
@@ -5296,12 +3615,8 @@ Index: pam.deb/configure
+ lt_cv_prog_compiler_static_works_GCJ=no
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-- printf "$lt_simple_link_test_code" > conftest.$ac_ext
-+ echo "$lt_simple_link_test_code" > conftest.$ac_ext
- if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
- # The linker can only warn and ignore the option if not recognized
- # So say no if there are warnings
-@@ -17023,20 +17592,20 @@
+ echo "$lt_simple_link_test_code" > conftest.$ac_ext
+@@ -17197,20 +17578,20 @@
$echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if diff conftest.exp conftest.er2 >/dev/null; then
@@ -5328,30 +3643,21 @@ Index: pam.deb/configure
:
else
lt_prog_compiler_static_GCJ=
-@@ -17053,7 +17622,7 @@
- mkdir conftest
- cd conftest
- mkdir out
-- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
- lt_compiler_flag="-o out/conftest2.$ac_objext"
- # Insert the option either (1) after the last *FLAGS variable, or
-@@ -17064,11 +17633,11 @@
+@@ -17238,11 +17619,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:17067: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:17636: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:17241: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:17622: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:17071: \$? = $ac_status" >&5
-+ echo "$as_me:17640: \$? = $ac_status" >&5
+- echo "$as_me:17245: \$? = $ac_status" >&5
++ echo "$as_me:17626: \$? = $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
-@@ -17148,12 +17717,13 @@
+@@ -17322,12 +17703,13 @@
# it will be wrapped by ` (' and `)$', so one must not match beginning or
# end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
# as well as any symbol that contains `d'.
@@ -5366,7 +3672,7 @@ Index: pam.deb/configure
extract_expsyms_cmds=
# Just being paranoid about ensuring that cc_basename is set.
for cc_temp in $compiler""; do
-@@ -17212,7 +17782,7 @@
+@@ -17386,7 +17768,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
@@ -5375,55 +3681,9 @@ Index: pam.deb/configure
# On AIX/PPC, the GNU linker is very broken
if test "$host_cpu" != ia64; then
ld_shlibs_GCJ=no
-@@ -17260,7 +17830,7 @@
- allow_undefined_flag_GCJ=unsupported
- always_export_symbols_GCJ=no
- enable_shared_with_static_runtimes_GCJ=yes
-- export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
-+ export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
-
- if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
- archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-@@ -17278,7 +17848,7 @@
- fi
- ;;
-
-- interix3*)
-+ interix[3-9]*)
- hardcode_direct_GCJ=no
- hardcode_shlibpath_var_GCJ=no
- hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
-@@ -17293,7 +17863,7 @@
- archive_expsym_cmds_GCJ='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'
- ;;
-
-- linux*)
-+ gnu* | linux* | k*bsd*-gnu)
- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- tmp_addflag=
- case $cc_basename,$host_cpu in
-@@ -17311,20 +17881,30 @@
- ifc* | ifort*) # Intel Fortran compiler
- tmp_addflag=' -nofor_main' ;;
- esac
-- archive_cmds_GCJ='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ case `$CC -V 2>&1 | sed 5q` in
-+ *Sun\ C*) # Sun C 5.9
-+ whole_archive_flag_spec_GCJ='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-+ tmp_sharedflag='-G' ;;
-+ *Sun\ F*) # Sun Fortran 8.3
-+ tmp_sharedflag='-G' ;;
-+ *)
-+ tmp_sharedflag='-shared' ;;
-+ esac
-+ archive_cmds_GCJ='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-
- if test $supports_anon_versioning = yes; then
- archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~
- cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+@@ -17502,12 +17884,13 @@
$echo "local: *; };" >> $output_objdir/$libname.ver~
-- $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
fi
+ link_all_deplibs_GCJ=no
else
@@ -5436,7 +3696,7 @@ Index: pam.deb/configure
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -17422,7 +18002,7 @@
+@@ -17605,7 +17988,7 @@
fi
;;
@@ -5445,7 +3705,7 @@ Index: pam.deb/configure
if test "$host_cpu" = ia64; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
-@@ -17442,7 +18022,7 @@
+@@ -17625,7 +18008,7 @@
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
# need to do runtime linking.
@@ -5454,71 +3714,7 @@ Index: pam.deb/configure
for ld_flag in $LDFLAGS; do
if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
aix_use_runtimelinking=yes
-@@ -17476,7 +18056,7 @@
- strings "$collect2name" | grep resolve_lib_name >/dev/null
- then
- # We have reworked collect2
-- hardcode_direct_GCJ=yes
-+ :
- else
- # We have old collect2
- hardcode_direct_GCJ=unsupported
-@@ -17550,11 +18130,18 @@
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
-
--aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
--}'`
-+lt_aix_libpath_sed='
-+ /Import File Strings/,/^$/ {
-+ /^0/ {
-+ s/^0 *\(.*\)$/\1/
-+ p
-+ }
-+ }'
-+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- # Check for a 64-bit object if we didn't find anything.
--if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
--}'`; fi
-+if test -z "$aix_libpath"; then
-+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-+fi
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-@@ -17609,11 +18196,18 @@
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
-
--aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
--}'`
-+lt_aix_libpath_sed='
-+ /Import File Strings/,/^$/ {
-+ /^0/ {
-+ s/^0 *\(.*\)$/\1/
-+ p
-+ }
-+ }'
-+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- # Check for a 64-bit object if we didn't find anything.
--if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
--}'`; fi
-+if test -z "$aix_libpath"; then
-+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-+fi
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-@@ -17667,7 +18261,7 @@
- # The linker will automatically build a .lib file if we build a DLL.
- old_archive_From_new_cmds_GCJ='true'
- # FIXME: Should let the user specify the lib program.
-- old_archive_cmds_GCJ='lib /OUT:$oldlib$oldobjs$old_deplibs'
-+ old_archive_cmds_GCJ='lib -OUT:$oldlib$oldobjs$old_deplibs'
- fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`'
- enable_shared_with_static_runtimes_GCJ=yes
- ;;
-@@ -17700,19 +18294,18 @@
+@@ -17897,11 +18280,10 @@
link_all_deplibs_GCJ=yes
if test "$GCC" = yes ; then
output_verbose_link_cmd='echo'
@@ -5534,26 +3730,7 @@ Index: pam.deb/configure
else
case $cc_basename in
xlc*)
- output_verbose_link_cmd='echo'
-- archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
-+ archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
- module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-- archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- ;;
- *)
-@@ -17752,7 +18345,7 @@
- ;;
-
- # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-- freebsd* | kfreebsd*-gnu | dragonfly*)
-+ freebsd* | dragonfly*)
- archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
- hardcode_libdir_flag_spec_GCJ='-R$libdir'
- hardcode_direct_GCJ=yes
-@@ -17854,7 +18447,7 @@
+@@ -18051,7 +18433,7 @@
link_all_deplibs_GCJ=yes
;;
@@ -5562,120 +3739,7 @@ Index: pam.deb/configure
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -17874,24 +18467,28 @@
- ;;
-
- openbsd*)
-- hardcode_direct_GCJ=yes
-- hardcode_shlibpath_var_GCJ=no
-- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-- archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-- archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-- hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
-- export_dynamic_flag_spec_GCJ='${wl}-E'
-+ if test -f /usr/libexec/ld.so; then
-+ hardcode_direct_GCJ=yes
-+ hardcode_shlibpath_var_GCJ=no
-+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+ archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+ archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-+ hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
-+ export_dynamic_flag_spec_GCJ='${wl}-E'
-+ else
-+ case $host_os in
-+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-+ archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+ hardcode_libdir_flag_spec_GCJ='-R$libdir'
-+ ;;
-+ *)
-+ archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+ hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
-+ ;;
-+ esac
-+ fi
- else
-- case $host_os in
-- openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-- archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-- hardcode_libdir_flag_spec_GCJ='-R$libdir'
-- ;;
-- *)
-- archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-- hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
-- ;;
-- esac
-+ ld_shlibs_GCJ=no
- fi
- ;;
-
-@@ -17950,17 +18547,16 @@
- case $host_os in
- solaris2.[0-5] | solaris2.[0-5].*) ;;
- *)
-- # The compiler driver will combine linker options so we
-- # cannot just pass the convience library names through
-- # without $wl, iff we do not link with $LD.
-- # Luckily, gcc supports the same syntax we need for Sun Studio.
-+ # The compiler driver will combine and reorder linker options,
-+ # but understands `-z linker_flag'. GCC discards it without `$wl',
-+ # but is careful enough not to reorder.
- # Supported since Solaris 2.6 (maybe 2.5.1?)
-- case $wlarc in
-- '')
-- whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;;
-- *)
-- whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
-- esac ;;
-+ if test "$GCC" = yes; then
-+ whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-+ else
-+ whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract'
-+ fi
-+ ;;
- esac
- link_all_deplibs_GCJ=yes
- ;;
-@@ -18017,7 +18613,7 @@
- fi
- ;;
-
-- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
-+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
- no_undefined_flag_GCJ='${wl}-z,text'
- archive_cmds_need_lc_GCJ=no
- hardcode_shlibpath_var_GCJ=no
-@@ -18094,7 +18690,7 @@
- { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
- echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
- $rm conftest*
-- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
-@@ -18152,20 +18748,7 @@
- version_type=none
- dynamic_linker="$host_os ld.so"
- sys_lib_dlsearch_path_spec="/lib /usr/lib"
--if test "$GCC" = yes; then
-- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-- if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
-- # if the path contains ";" then we assume it to be the separator
-- # otherwise default to the standard path separator (i.e. ":") - it is
-- # assumed that no part of a normal pathname contains ";" but that should
-- # okay in the real world where ";" in dirpaths is itself problematic.
-- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-- else
-- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-- fi
--else
-- sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
--fi
-+
- need_lib_prefix=unknown
- hardcode_into_libs=no
-
-@@ -18183,7 +18766,7 @@
+@@ -18370,7 +18752,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
;;
@@ -5684,105 +3748,26 @@ Index: pam.deb/configure
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -18322,12 +18905,7 @@
- shlibpath_overrides_runpath=yes
- shlibpath_var=DYLD_LIBRARY_PATH
- shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-- if test "$GCC" = yes; then
-- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-- else
-- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-- fi
-+
- sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
- ;;
-
-@@ -18344,18 +18922,6 @@
- dynamic_linker=no
- ;;
-
--kfreebsd*-gnu)
-- version_type=linux
-- need_lib_prefix=no
-- need_version=no
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-- soname_spec='${libname}${release}${shared_ext}$major'
-- shlibpath_var=LD_LIBRARY_PATH
-- shlibpath_overrides_runpath=no
-- hardcode_into_libs=yes
-- dynamic_linker='GNU ld.so'
-- ;;
--
- freebsd* | dragonfly*)
- # DragonFly does not have aout. When/if they implement a new
- # versioning mechanism, adjust this.
-@@ -18393,7 +18959,7 @@
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- ;;
-- freebsd*) # from 4.6 on
-+ *) # from 4.6 on, and DragonFly
- shlibpath_overrides_runpath=yes
- hardcode_into_libs=yes
- ;;
-@@ -18456,7 +19022,7 @@
- postinstall_cmds='chmod 555 $lib'
- ;;
-
--interix3*)
-+interix[3-9]*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-@@ -18511,7 +19077,7 @@
- ;;
-
- # This must be Linux ELF.
--linux*)
-+linux* | k*bsd*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-@@ -18527,7 +19093,7 @@
-
- # Append ld.so.conf contents to the search path
- if test -f /etc/ld.so.conf; then
-- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
- fi
-
-@@ -18540,7 +19106,7 @@
+@@ -18710,6 +19092,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
--knetbsd*-gnu)
+netbsdelf*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-@@ -18549,7 +19115,7 @@
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
-- dynamic_linker='GNU ld.so'
++ version_type=linux
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=no
++ hardcode_into_libs=yes
+ dynamic_linker='NetBSD ld.elf_so'
- ;;
-
- netbsd*)
-@@ -18633,6 +19199,10 @@
- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
- ;;
-
-+rdos*)
-+ dynamic_linker=no
+ ;;
+
- solaris*)
- version_type=linux
+ netbsd*)
+ version_type=sunos
need_lib_prefix=no
-@@ -18729,6 +19299,21 @@
+@@ -18891,6 +19285,21 @@
echo "${ECHO_T}$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
@@ -5804,7 +3789,7 @@ Index: pam.deb/configure
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
if test "$GCC" = yes; then
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-@@ -18812,6 +19397,7 @@
+@@ -18974,6 +19383,7 @@
predeps_GCJ \
postdeps_GCJ \
compiler_lib_search_path_GCJ \
@@ -5812,15 +3797,7 @@ Index: pam.deb/configure
archive_cmds_GCJ \
archive_expsym_cmds_GCJ \
postinstall_cmds_GCJ \
-@@ -18827,6 +19413,7 @@
- module_cmds_GCJ \
- module_expsym_cmds_GCJ \
- lt_cv_prog_compiler_c_o_GCJ \
-+ fix_srcfile_path_GCJ \
- exclude_expsyms_GCJ \
- include_expsyms_GCJ; do
-
-@@ -19059,6 +19646,10 @@
+@@ -19222,6 +19632,10 @@
# shared library.
postdeps=$lt_postdeps_GCJ
@@ -5831,37 +3808,8 @@ Index: pam.deb/configure
# The library search path used internally by the compiler when linking
# a shared library.
compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ
-@@ -19147,7 +19738,7 @@
- sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-
- # Fix the shell variable \$srcfile for the compiler.
--fix_srcfile_path="$fix_srcfile_path_GCJ"
-+fix_srcfile_path=$lt_fix_srcfile_path
-
- # Set to yes if exported symbols are required.
- always_export_symbols=$always_export_symbols_GCJ
-@@ -19204,7 +19795,7 @@
- objext_RC=$objext
-
- # Code to be used in simple compile tests
--lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
-+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
-
- # Code to be used in simple link tests
- lt_simple_link_test_code="$lt_simple_compile_test_code"
-@@ -19223,16 +19814,16 @@
-
- # save warnings/boilerplate of simple test code
- ac_outfile=conftest.$ac_objext
--printf "$lt_simple_compile_test_code" >conftest.$ac_ext
-+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
- eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
- _lt_compiler_boilerplate=`cat conftest.err`
- $rm conftest*
-
- ac_outfile=conftest.$ac_objext
--printf "$lt_simple_link_test_code" >conftest.$ac_ext
-+echo "$lt_simple_link_test_code" >conftest.$ac_ext
+@@ -19395,7 +19809,7 @@
+ echo "$lt_simple_link_test_code" >conftest.$ac_ext
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
-$rm conftest*
@@ -5869,7 +3817,7 @@ Index: pam.deb/configure
# Allow CC to be a program name with arguments.
-@@ -19292,6 +19883,7 @@
+@@ -19455,6 +19869,7 @@
predeps_RC \
postdeps_RC \
compiler_lib_search_path_RC \
@@ -5877,15 +3825,7 @@ Index: pam.deb/configure
archive_cmds_RC \
archive_expsym_cmds_RC \
postinstall_cmds_RC \
-@@ -19307,6 +19899,7 @@
- module_cmds_RC \
- module_expsym_cmds_RC \
- lt_cv_prog_compiler_c_o_RC \
-+ fix_srcfile_path_RC \
- exclude_expsyms_RC \
- include_expsyms_RC; do
-
-@@ -19539,6 +20132,10 @@
+@@ -19703,6 +20118,10 @@
# shared library.
postdeps=$lt_postdeps_RC
@@ -5896,251 +3836,239 @@ Index: pam.deb/configure
# The library search path used internally by the compiler when linking
# a shared library.
compiler_lib_search_path=$lt_compiler_lib_search_path_RC
-@@ -19627,7 +20224,7 @@
- sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+@@ -20016,7 +20435,6 @@
+ fi
- # Fix the shell variable \$srcfile for the compiler.
--fix_srcfile_path="$fix_srcfile_path_RC"
-+fix_srcfile_path=$lt_fix_srcfile_path
- # Set to yes if exported symbols are required.
- always_export_symbols=$always_export_symbols_RC
-@@ -21242,18 +21839,23 @@
+-
+ { echo "$as_me:$LINENO: checking whether ld supports --as-needed" >&5
+ echo $ECHO_N "checking whether ld supports --as-needed... $ECHO_C" >&6; }
+ if test "${pam_cv_ld_as_needed+set}" = set; then
+@@ -20624,7 +21042,9 @@
fi
-
- if test x"$WITH_CRACKLIB" != xno ; then
-- if test "${ac_cv_header_crack_h+set}" = set; then
-- { echo "$as_me:$LINENO: checking for crack.h" >&5
--echo $ECHO_N "checking for crack.h... $ECHO_C" >&6; }
--if test "${ac_cv_header_crack_h+set}" = set; then
+ { echo "$as_me:$LINENO: result: $libc_cv_ld_version_script_option" >&5
+ echo "${ECHO_T}$libc_cv_ld_version_script_option" >&6; }
+- if test "$libc_cv_ld_version_script_option" = "yes"; then
+
-+for ac_header in crack.h
-+do
-+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_header_crack_h" >&5
--echo "${ECHO_T}$ac_cv_header_crack_h" >&6; }
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
++
++if test "$libc_cv_ld_version_script_option" = "yes"; then
+ HAVE_VERSIONING_TRUE=
+ HAVE_VERSIONING_FALSE='#'
else
- # Is the header compilable?
--{ echo "$as_me:$LINENO: checking crack.h usability" >&5
--echo $ECHO_N "checking crack.h usability... $ECHO_C" >&6; }
-+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -21261,7 +21863,7 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
--#include <crack.h>
-+#include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
- if { (ac_try="$ac_compile"
-@@ -21293,15 +21895,15 @@
- echo "${ECHO_T}$ac_header_compiler" >&6; }
-
- # Is the header present?
--{ echo "$as_me:$LINENO: checking crack.h presence" >&5
--echo $ECHO_N "checking crack.h presence... $ECHO_C" >&6; }
-+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
--#include <crack.h>
-+#include <$ac_header>
- _ACEOF
- if { (ac_try="$ac_cpp conftest.$ac_ext"
- case "(($ac_try" in
-@@ -21334,41 +21936,45 @@
- # So? What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
-- { echo "$as_me:$LINENO: WARNING: crack.h: accepted by the compiler, rejected by the preprocessor!" >&5
--echo "$as_me: WARNING: crack.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-- { echo "$as_me:$LINENO: WARNING: crack.h: proceeding with the compiler's result" >&5
--echo "$as_me: WARNING: crack.h: proceeding with the compiler's result" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
-- { echo "$as_me:$LINENO: WARNING: crack.h: present but cannot be compiled" >&5
--echo "$as_me: WARNING: crack.h: present but cannot be compiled" >&2;}
-- { echo "$as_me:$LINENO: WARNING: crack.h: check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: crack.h: check for missing prerequisite headers?" >&2;}
-- { echo "$as_me:$LINENO: WARNING: crack.h: see the Autoconf documentation" >&5
--echo "$as_me: WARNING: crack.h: see the Autoconf documentation" >&2;}
-- { echo "$as_me:$LINENO: WARNING: crack.h: section \"Present But Cannot Be Compiled\"" >&5
--echo "$as_me: WARNING: crack.h: section \"Present But Cannot Be Compiled\"" >&2;}
-- { echo "$as_me:$LINENO: WARNING: crack.h: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: crack.h: proceeding with the preprocessor's result" >&2;}
-- { echo "$as_me:$LINENO: WARNING: crack.h: in the future, the compiler will take precedence" >&5
--echo "$as_me: WARNING: crack.h: in the future, the compiler will take precedence" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+@@ -21616,7 +22036,9 @@
+ LIBCRACK=""
+ fi
- ;;
- esac
--{ echo "$as_me:$LINENO: checking for crack.h" >&5
--echo $ECHO_N "checking for crack.h... $ECHO_C" >&6; }
--if test "${ac_cv_header_crack_h+set}" = set; then
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+- if test ! -z "$LIBCRACK"; then
++
++
++if test ! -z "$LIBCRACK"; then
+ HAVE_LIBCRACK_TRUE=
+ HAVE_LIBCRACK_FALSE='#'
else
-- ac_cv_header_crack_h=$ac_header_preproc
-+ eval "$as_ac_Header=\$ac_header_preproc"
+@@ -22441,7 +22863,9 @@
+ fi
fi
--{ echo "$as_me:$LINENO: result: $ac_cv_header_crack_h" >&5
--echo "${ECHO_T}$ac_cv_header_crack_h" >&6; }
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
+- if test ! -z "$LIBDB"; then
++
++
++if test ! -z "$LIBDB"; then
+ HAVE_LIBDB_TRUE=
+ HAVE_LIBDB_FALSE='#'
+ else
+@@ -22694,7 +23118,9 @@
+ LIBSELINUX=""
fi
--if test $ac_cv_header_crack_h = yes; then
-- { echo "$as_me:$LINENO: checking for FascistCheck in -lcrack" >&5
-+if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+ cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
-+ { echo "$as_me:$LINENO: checking for FascistCheck in -lcrack" >&5
- echo $ECHO_N "checking for FascistCheck in -lcrack... $ECHO_C" >&6; }
- if test "${ac_cv_lib_crack_FascistCheck+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -21437,6 +22043,7 @@
+- if test ! -z "$LIBSELINUX"; then
++
++
++if test ! -z "$LIBSELINUX"; then
+ HAVE_LIBSELINUX_TRUE=
+ HAVE_LIBSELINUX_FALSE='#'
+ else
+@@ -25329,7 +25755,9 @@
fi
+ done
+
+- if test "$UNSHARE" = yes; then
++
++
++if test "$UNSHARE" = yes; then
+ HAVE_UNSHARE_TRUE=
+ HAVE_UNSHARE_FALSE='#'
+ else
+@@ -25621,7 +26049,9 @@
+
-+done
+- if test x$enable_man != xno; then
++
++
++if test x$enable_man != xno; then
+ ENABLE_REGENERATE_MAN_TRUE=
+ ENABLE_REGENERATE_MAN_FALSE='#'
else
- LIBCRACK=""
-@@ -23029,7 +23636,8 @@
+@@ -25629,7 +26059,9 @@
+ ENABLE_REGENERATE_MAN_FALSE=
+ fi
+- if test ! -z "$FO2PDF"; then
++
++
++if test ! -z "$FO2PDF"; then
+ ENABLE_GENERATE_PDF_TRUE=
+ ENABLE_GENERATE_PDF_FALSE='#'
+ else
+@@ -27721,7 +28153,9 @@
+ HAVE_KEY_MANAGEMENT=$HAVE_KEY_MANAGEMENT
--for ac_header in fcntl.h limits.h malloc.h sys/file.h sys/ioctl.h sys/time.h syslog.h termio.h unistd.h sys/fsuid.h inittypes.h
+- if test "$have_key_syscalls" = 1; then
+
-+for ac_header in fcntl.h limits.h malloc.h sys/file.h sys/ioctl.h sys/time.h syslog.h net/if.h termio.h unistd.h sys/fsuid.h inittypes.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-@@ -28425,12 +29033,12 @@
- LEX_OUTPUT_ROOT!$LEX_OUTPUT_ROOT$ac_delim
- LEXLIB!$LEXLIB$ac_delim
- LN_S!$LN_S$ac_delim
-+SED!$SED$ac_delim
- GREP!$GREP$ac_delim
- EGREP!$EGREP$ac_delim
++
++if test "$have_key_syscalls" = 1; then
+ HAVE_KEY_MANAGEMENT_TRUE=
+ HAVE_KEY_MANAGEMENT_FALSE='#'
+ else
+@@ -28276,7 +28710,6 @@
+ ac_pwd='$ac_pwd'
+ srcdir='$srcdir'
+ INSTALL='$INSTALL'
+-MKDIR_P='$MKDIR_P'
+ _ACEOF
+
+ cat >>$CONFIG_STATUS <<\_ACEOF
+@@ -28549,7 +28982,6 @@
+ INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
+ INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
+ INSTALL_DATA!$INSTALL_DATA$ac_delim
+-am__isrc!$am__isrc$ac_delim
+ CYGPATH_W!$CYGPATH_W$ac_delim
+ PACKAGE!$PACKAGE$ac_delim
+ VERSION!$VERSION$ac_delim
+@@ -28606,6 +29038,7 @@
ECHO!$ECHO$ac_delim
AR!$AR$ac_delim
RANLIB!$RANLIB$ac_delim
--CPP!$CPP$ac_delim
++DSYMUTIL!$DSYMUTIL$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -28472,6 +29080,9 @@
+@@ -28647,6 +29080,7 @@
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
-+DSYMUTIL!$DSYMUTIL$ac_delim
+NMEDIT!$NMEDIT$ac_delim
-+CPP!$CPP$ac_delim
+ CPP!$CPP$ac_delim
CXX!$CXX$ac_delim
CXXFLAGS!$CXXFLAGS$ac_delim
- ac_ct_CXX!$ac_ct_CXX$ac_delim
-@@ -28549,7 +29160,7 @@
+@@ -28725,7 +29159,7 @@
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
-- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 75; then
-+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 78; then
+- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 76; then
++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 77; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-@@ -28950,21 +29561,22 @@
- fi
- rm -f "$tmp/out12"
- # Compute $ac_file's index in $config_headers.
-+_am_arg=$ac_file
- _am_stamp_count=1
- for _am_header in $config_headers :; do
- case $_am_header in
-- $ac_file | $ac_file:* )
-+ $_am_arg | $_am_arg:* )
- break ;;
- * )
- _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+@@ -28952,11 +29386,6 @@
+ [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
+ *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
esac
- done
--echo "timestamp for $ac_file" >`$as_dirname -- $ac_file ||
--$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-- X$ac_file : 'X\(//\)[^/]' \| \
-- X$ac_file : 'X\(//\)$' \| \
-- X$ac_file : 'X\(/\)' \| . 2>/dev/null ||
--echo X$ac_file |
-+echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
-+$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+ X"$_am_arg" : 'X\(//\)[^/]' \| \
-+ X"$_am_arg" : 'X\(//\)$' \| \
-+ X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
-+echo X"$_am_arg" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- s//\1/
- q
-@@ -29001,7 +29613,7 @@
+- ac_MKDIR_P=$MKDIR_P
+- case $MKDIR_P in
+- [\\/$]* | ?:[\\/]* ) ;;
+- */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
+- esac
+ _ACEOF
+
+ cat >>$CONFIG_STATUS <<\_ACEOF
+@@ -29010,7 +29439,6 @@
+ s&@abs_builddir@&$ac_abs_builddir&;t t
+ s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
+ s&@INSTALL@&$ac_INSTALL&;t t
+-s&@MKDIR_P@&$ac_MKDIR_P&;t t
+ $ac_datarootdir_hack
+ " $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out
+
+@@ -29175,9 +29603,8 @@
+ # some people rename them; so instead we look at the file content.
+ # Grep'ing the first line is not enough: some people post-process
# each Makefile.in and add a new line on top of each file to say so.
- # Grep'ing the whole file is not good either: AIX grep has a line
- # limit of 2048, but all sed's we know have understand at least 4000.
+- # Grep'ing the whole file is not good either: AIX grep has a line
+- # limit of 2048, but all sed's we know have understand at least 4000.
- if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
-+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
++ # So let's grep whole file.
++ if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
dirpart=`$as_dirname -- "$mf" ||
$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$mf" : 'X\(//\)[^/]' \| \
-Index: pam.deb/doc/Makefile.in
+Index: pam.debian/doc/Makefile.in
===================================================================
---- pam.deb.orig/doc/Makefile.in
-+++ pam.deb/doc/Makefile.in
+--- pam.debian.orig/doc/Makefile.in
++++ pam.debian/doc/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -98,6 +98,7 @@
+@@ -18,11 +18,15 @@
+ # Copyright (c) 2005, 2006 Thorsten Kukuk <kukuk@suse.de>
+ #
+
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -58,11 +62,10 @@
+ DIST_SOURCES =
+ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ html-recursive info-recursive install-data-recursive \
+- install-dvi-recursive install-exec-recursive \
+- install-html-recursive install-info-recursive \
+- install-pdf-recursive install-ps-recursive install-recursive \
+- installcheck-recursive installdirs-recursive pdf-recursive \
+- ps-recursive uninstall-recursive
++ install-exec-recursive install-info-recursive \
++ install-recursive installcheck-recursive installdirs-recursive \
++ pdf-recursive ps-recursive uninstall-info-recursive \
++ uninstall-recursive
+ am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+ am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+@@ -72,13 +75,13 @@
+ am__installdirs = "$(DESTDIR)$(htmldir)"
+ dist_htmlDATA_INSTALL = $(INSTALL_DATA)
+ DATA = $(dist_html_DATA)
+-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+- distclean-recursive maintainer-clean-recursive
+ ETAGS = etags
+ CTAGS = ctags
+ DIST_SUBDIRS = $(SUBDIRS)
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AUTOCONF = @AUTOCONF@
+@@ -98,11 +101,16 @@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -6148,7 +4076,40 @@ Index: pam.deb/doc/Makefile.in
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -150,6 +151,7 @@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
++ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
++ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
++ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -111,7 +119,18 @@
+ GMSGFMT_015 = @GMSGFMT_015@
+ GREP = @GREP@
+ HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
+-INSTALL = @INSTALL@
++HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
++HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
++HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
++HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
++HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
++HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
++HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
++HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
++HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
++HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
++HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
++HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -146,10 +165,10 @@
+ LTLIBINTL = @LTLIBINTL@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+-MKDIR_P = @MKDIR_P@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
@@ -6156,68 +4117,251 @@ Index: pam.deb/doc/Makefile.in
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -165,6 +167,7 @@
- RANLIB = @RANLIB@
- SCONFIGDIR = @SCONFIGDIR@
- SECUREDIR = @SECUREDIR@
-+SED = @SED@
+@@ -168,6 +187,8 @@
+ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
++STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
++STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
STRIP = @STRIP@
-@@ -368,8 +371,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+@@ -181,13 +202,13 @@
+ XSLTPROC = @XSLTPROC@
+ YACC = @YACC@
+ YFLAGS = @YFLAGS@
+-abs_builddir = @abs_builddir@
+-abs_srcdir = @abs_srcdir@
+-abs_top_builddir = @abs_top_builddir@
+-abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -199,7 +220,6 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+-builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -230,11 +250,8 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+-srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_builddir = @top_builddir@
+-top_srcdir = @top_srcdir@
+ SUBDIRS = man specs sag adg mwg
+ CLEANFILES = *~
+ dist_html_DATA = index.html
+@@ -276,9 +293,13 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
++
++distclean-libtool:
++ -rm -f libtool
++uninstall-info-am:
+ install-dist_htmlDATA: $(dist_html_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(htmldir)" || $(MKDIR_P) "$(DESTDIR)$(htmldir)"
++ test -z "$(htmldir)" || $(mkdir_p) "$(DESTDIR)$(htmldir)"
+ @list='$(dist_html_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+@@ -325,7 +346,8 @@
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ fi; test -z "$$fail"
+
+-$(RECURSIVE_CLEAN_TARGETS):
++mostlyclean-recursive clean-recursive distclean-recursive \
++maintainer-clean-recursive:
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+@@ -426,21 +448,22 @@
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- list='$(DISTFILES)'; \
+- dist_files=`for file in $$list; do echo $$file; done | \
+- sed -e "s|^$$srcdirstrip/||;t" \
+- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+- case $$dist_files in \
+- */*) $(MKDIR_P) `echo "$$dist_files" | \
+- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+- sort -u` ;; \
+- esac; \
+- for file in $$dist_files; do \
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
+ if test -d $$d/$$file; then \
+- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -454,7 +477,7 @@
+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -d "$(distdir)/$$subdir" \
+- || $(MKDIR_P) "$(distdir)/$$subdir" \
++ || $(mkdir_p) "$(distdir)/$$subdir" \
+ || exit 1; \
+ distdir=`$(am__cd) $(distdir) && pwd`; \
+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+@@ -462,8 +485,6 @@
+ $(MAKE) $(AM_MAKEFLAGS) \
+ top_distdir="$$top_distdir" \
+ distdir="$$distdir/$$subdir" \
+- am__remove_distdir=: \
+- am__skip_length_check=: \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -474,7 +495,7 @@
+ installdirs: installdirs-recursive
+ installdirs-am:
+ for dir in "$(DESTDIR)$(htmldir)"; do \
+- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
++ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
+ install: install-recursive
+ install-exec: install-exec-recursive
+@@ -507,7 +528,8 @@
-@@ -394,8 +397,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -405,13 +408,12 @@
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-Index: pam.deb/doc/adg/Makefile.in
+ distclean: distclean-recursive
+ -rm -f Makefile
+-distclean-am: clean-am distclean-generic distclean-tags
++distclean-am: clean-am distclean-generic distclean-libtool \
++ distclean-tags
+
+ dvi: dvi-recursive
+
+@@ -521,20 +543,12 @@
+
+ install-data-am: install-dist_htmlDATA
+
+-install-dvi: install-dvi-recursive
+-
+ install-exec-am:
+
+-install-html: install-html-recursive
+-
+ install-info: install-info-recursive
+
+ install-man:
+
+-install-pdf: install-pdf-recursive
+-
+-install-ps: install-ps-recursive
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-recursive
+@@ -553,25 +567,23 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-dist_htmlDATA
++uninstall-am: uninstall-dist_htmlDATA uninstall-info-am
+
+-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+- install-strip
++uninstall-info: uninstall-info-recursive
+
+-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+- all all-am check check-am clean clean-generic clean-libtool \
+- ctags ctags-recursive distclean distclean-generic \
+- distclean-libtool distclean-tags distdir dvi dvi-am html \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++ clean clean-generic clean-libtool clean-recursive ctags \
++ ctags-recursive distclean distclean-generic distclean-libtool \
++ distclean-recursive distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+- install-data-am install-dist_htmlDATA install-dvi \
+- install-dvi-am install-exec install-exec-am install-html \
+- install-html-am install-info install-info-am install-man \
+- install-pdf install-pdf-am install-ps install-ps-am \
++ install-data-am install-dist_htmlDATA install-exec \
++ install-exec-am install-info install-info-am install-man \
+ install-strip installcheck installcheck-am installdirs \
+ installdirs-am maintainer-clean maintainer-clean-generic \
+- mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+- ps ps-am tags tags-recursive uninstall uninstall-am \
+- uninstall-dist_htmlDATA
++ maintainer-clean-recursive mostlyclean mostlyclean-generic \
++ mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
++ tags tags-recursive uninstall uninstall-am \
++ uninstall-dist_htmlDATA uninstall-info-am
+
+
+ #######################################################
+Index: pam.debian/doc/adg/Makefile.in
===================================================================
---- pam.deb.orig/doc/adg/Makefile.in
-+++ pam.deb/doc/adg/Makefile.in
+--- pam.debian.orig/doc/adg/Makefile.in
++++ pam.debian/doc/adg/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -75,6 +75,7 @@
+@@ -17,11 +17,15 @@
+ #
+ # Copyright (c) 2006 Thorsten Kukuk <kukuk@thkukuk.de>
+ #
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -56,6 +60,8 @@
+ DIST_SOURCES =
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AUTOCONF = @AUTOCONF@
+@@ -75,11 +81,16 @@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -6225,7 +4369,40 @@ Index: pam.deb/doc/adg/Makefile.in
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -127,6 +128,7 @@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
++ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
++ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
++ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -88,7 +99,18 @@
+ GMSGFMT_015 = @GMSGFMT_015@
+ GREP = @GREP@
+ HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
+-INSTALL = @INSTALL@
++HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
++HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
++HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
++HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
++HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
++HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
++HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
++HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
++HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
++HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
++HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
++HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -123,10 +145,10 @@
+ LTLIBINTL = @LTLIBINTL@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+-MKDIR_P = @MKDIR_P@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
@@ -6233,30 +4410,200 @@ Index: pam.deb/doc/adg/Makefile.in
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -142,6 +144,7 @@
- RANLIB = @RANLIB@
- SCONFIGDIR = @SCONFIGDIR@
- SECUREDIR = @SECUREDIR@
-+SED = @SED@
+@@ -145,6 +167,8 @@
+ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
++STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
++STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
STRIP = @STRIP@
-Index: pam.deb/doc/man/Makefile.in
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+@@ -158,13 +182,13 @@
+ XSLTPROC = @XSLTPROC@
+ YACC = @YACC@
+ YFLAGS = @YFLAGS@
+-abs_builddir = @abs_builddir@
+-abs_srcdir = @abs_srcdir@
+-abs_top_builddir = @abs_top_builddir@
+-abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -176,7 +200,6 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+-builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -207,11 +230,8 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+-srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_builddir = @top_builddir@
+-top_srcdir = @top_srcdir@
+ CLEANFILES = Linux-PAM_ADG.fo *~
+ EXTRA_DIST = $(XMLS)
+ XMLS = Linux-PAM_ADG.xml $(shell ls $(srcdir)/pam_*.xml)
+@@ -255,6 +275,10 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
++
++distclean-libtool:
++ -rm -f libtool
++uninstall-info-am:
+ tags: TAGS
+ TAGS:
+
+@@ -263,21 +287,23 @@
+
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- list='$(DISTFILES)'; \
+- dist_files=`for file in $$list; do echo $$file; done | \
+- sed -e "s|^$$srcdirstrip/||;t" \
+- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+- case $$dist_files in \
+- */*) $(MKDIR_P) `echo "$$dist_files" | \
+- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+- sort -u` ;; \
+- esac; \
+- for file in $$dist_files; do \
++ $(mkdir_p) $(distdir)/$(srcdir)
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
+ if test -d $$d/$$file; then \
+- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -325,7 +351,8 @@
+
+ distclean: distclean-am
+ -rm -f Makefile
+-distclean-am: clean-am distclean-generic distclean-local
++distclean-am: clean-am distclean-generic distclean-libtool \
++ distclean-local
+
+ dvi: dvi-am
+
+@@ -339,20 +366,12 @@
+
+ install-data-am: install-data-local
+
+-install-dvi: install-dvi-am
+-
+ install-exec-am:
+
+-install-html: install-html-am
+-
+ install-info: install-info-am
+
+ install-man:
+
+-install-pdf: install-pdf-am
+-
+-install-ps: install-ps-am
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -371,21 +390,18 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-local
+-
+-.MAKE: install-am install-strip
++uninstall-am: uninstall-info-am uninstall-local
+
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ distclean distclean-generic distclean-libtool distclean-local \
+ distdir dvi dvi-am html html-am info info-am install \
+ install-am install-data install-data-am install-data-local \
+- install-dvi install-dvi-am install-exec install-exec-am \
+- install-html install-html-am install-info install-info-am \
+- install-man install-pdf install-pdf-am install-ps \
+- install-ps-am install-strip installcheck installcheck-am \
++ install-exec install-exec-am install-info install-info-am \
++ install-man install-strip installcheck installcheck-am \
+ installdirs maintainer-clean maintainer-clean-generic \
+ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+- ps ps-am uninstall uninstall-am uninstall-local
++ ps ps-am uninstall uninstall-am uninstall-info-am \
++ uninstall-local
+
+
+ @ENABLE_REGENERATE_MAN_TRUE@all: Linux-PAM_ADG.txt html/Linux-PAM_ADG.html Linux-PAM_ADG.pdf
+Index: pam.debian/doc/man/Makefile.in
===================================================================
---- pam.deb.orig/doc/man/Makefile.in
-+++ pam.deb/doc/man/Makefile.in
+--- pam.debian.orig/doc/man/Makefile.in
++++ pam.debian/doc/man/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -82,6 +82,7 @@
+@@ -17,11 +17,15 @@
+ #
+ # Copyright (c) 2006 Thorsten Kukuk <kukuk@thkukuk.de>
+ #
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -63,6 +67,8 @@
+ MANS = $(man_MANS)
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AUTOCONF = @AUTOCONF@
+@@ -82,11 +88,16 @@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -6264,7 +4611,40 @@ Index: pam.deb/doc/man/Makefile.in
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -134,6 +135,7 @@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
++ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
++ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
++ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -95,7 +106,18 @@
+ GMSGFMT_015 = @GMSGFMT_015@
+ GREP = @GREP@
+ HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
+-INSTALL = @INSTALL@
++HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
++HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
++HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
++HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
++HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
++HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
++HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
++HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
++HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
++HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
++HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
++HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -130,10 +152,10 @@
+ LTLIBINTL = @LTLIBINTL@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+-MKDIR_P = @MKDIR_P@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
@@ -6272,30 +4652,232 @@ Index: pam.deb/doc/man/Makefile.in
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -149,6 +151,7 @@
- RANLIB = @RANLIB@
- SCONFIGDIR = @SCONFIGDIR@
- SECUREDIR = @SECUREDIR@
-+SED = @SED@
+@@ -152,6 +174,8 @@
+ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
++STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
++STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
STRIP = @STRIP@
-Index: pam.deb/doc/mwg/Makefile.in
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+@@ -165,13 +189,13 @@
+ XSLTPROC = @XSLTPROC@
+ YACC = @YACC@
+ YFLAGS = @YFLAGS@
+-abs_builddir = @abs_builddir@
+-abs_srcdir = @abs_srcdir@
+-abs_top_builddir = @abs_top_builddir@
+-abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -183,7 +207,6 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+-builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -214,11 +237,8 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+-srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_builddir = @top_builddir@
+-top_srcdir = @top_srcdir@
+ CLEANFILES = *~
+ EXTRA_DIST = $(MANS) $(XMLS)
+ man_MANS = pam.3 PAM.8 pam.8 pam.conf.5 pam.d.5 \
+@@ -297,9 +317,13 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
++
++distclean-libtool:
++ -rm -f libtool
++uninstall-info-am:
+ install-man3: $(man3_MANS) $(man_MANS)
+ @$(NORMAL_INSTALL)
+- test -z "$(man3dir)" || $(MKDIR_P) "$(DESTDIR)$(man3dir)"
++ test -z "$(man3dir)" || $(mkdir_p) "$(DESTDIR)$(man3dir)"
+ @list='$(man3_MANS) $(dist_man3_MANS) $(nodist_man3_MANS)'; \
+ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ for i in $$l2; do \
+@@ -344,7 +368,7 @@
+ done
+ install-man5: $(man5_MANS) $(man_MANS)
+ @$(NORMAL_INSTALL)
+- test -z "$(man5dir)" || $(MKDIR_P) "$(DESTDIR)$(man5dir)"
++ test -z "$(man5dir)" || $(mkdir_p) "$(DESTDIR)$(man5dir)"
+ @list='$(man5_MANS) $(dist_man5_MANS) $(nodist_man5_MANS)'; \
+ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ for i in $$l2; do \
+@@ -389,7 +413,7 @@
+ done
+ install-man8: $(man8_MANS) $(man_MANS)
+ @$(NORMAL_INSTALL)
+- test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
++ test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
+ @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
+ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ for i in $$l2; do \
+@@ -440,21 +464,22 @@
+
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- list='$(DISTFILES)'; \
+- dist_files=`for file in $$list; do echo $$file; done | \
+- sed -e "s|^$$srcdirstrip/||;t" \
+- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+- case $$dist_files in \
+- */*) $(MKDIR_P) `echo "$$dist_files" | \
+- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+- sort -u` ;; \
+- esac; \
+- for file in $$dist_files; do \
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
+ if test -d $$d/$$file; then \
+- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -470,7 +495,7 @@
+ all-am: Makefile $(MANS)
+ installdirs:
+ for dir in "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man8dir)"; do \
+- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
++ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
+ install: install-am
+ install-exec: install-exec-am
+@@ -503,7 +528,7 @@
+
+ distclean: distclean-am
+ -rm -f Makefile
+-distclean-am: clean-am distclean-generic
++distclean-am: clean-am distclean-generic distclean-libtool
+
+ dvi: dvi-am
+
+@@ -517,20 +542,12 @@
+
+ install-data-am: install-man
+
+-install-dvi: install-dvi-am
+-
+ install-exec-am:
+
+-install-html: install-html-am
+-
+ install-info: install-info-am
+
+ install-man: install-man3 install-man5 install-man8
+
+-install-pdf: install-pdf-am
+-
+-install-ps: install-ps-am
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -549,24 +566,21 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-man
++uninstall-am: uninstall-info-am uninstall-man
+
+ uninstall-man: uninstall-man3 uninstall-man5 uninstall-man8
+
+-.MAKE: install-am install-strip
+-
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ distclean distclean-generic distclean-libtool distdir dvi \
+ dvi-am html html-am info info-am install install-am \
+- install-data install-data-am install-dvi install-dvi-am \
+- install-exec install-exec-am install-html install-html-am \
++ install-data install-data-am install-exec install-exec-am \
+ install-info install-info-am install-man install-man3 \
+- install-man5 install-man8 install-pdf install-pdf-am \
+- install-ps install-ps-am install-strip installcheck \
++ install-man5 install-man8 install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic \
+ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+- uninstall-man uninstall-man3 uninstall-man5 uninstall-man8
++ uninstall-info-am uninstall-man uninstall-man3 uninstall-man5 \
++ uninstall-man8
+
+
+ @ENABLE_REGENERATE_MAN_TRUE@pam_get_item.3: pam_item_types.inc.xml
+Index: pam.debian/doc/mwg/Makefile.in
===================================================================
---- pam.deb.orig/doc/mwg/Makefile.in
-+++ pam.deb/doc/mwg/Makefile.in
+--- pam.debian.orig/doc/mwg/Makefile.in
++++ pam.debian/doc/mwg/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -75,6 +75,7 @@
+@@ -17,11 +17,15 @@
+ #
+ # Copyright (c) 2006 Thorsten Kukuk <kukuk@thkukuk.de>
+ #
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -56,6 +60,8 @@
+ DIST_SOURCES =
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AUTOCONF = @AUTOCONF@
+@@ -75,11 +81,16 @@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -6303,7 +4885,40 @@ Index: pam.deb/doc/mwg/Makefile.in
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -127,6 +128,7 @@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
++ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
++ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
++ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -88,7 +99,18 @@
+ GMSGFMT_015 = @GMSGFMT_015@
+ GREP = @GREP@
+ HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
+-INSTALL = @INSTALL@
++HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
++HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
++HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
++HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
++HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
++HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
++HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
++HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
++HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
++HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
++HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
++HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -123,10 +145,10 @@
+ LTLIBINTL = @LTLIBINTL@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+-MKDIR_P = @MKDIR_P@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
@@ -6311,30 +4926,200 @@ Index: pam.deb/doc/mwg/Makefile.in
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -142,6 +144,7 @@
- RANLIB = @RANLIB@
- SCONFIGDIR = @SCONFIGDIR@
- SECUREDIR = @SECUREDIR@
-+SED = @SED@
+@@ -145,6 +167,8 @@
+ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
++STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
++STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
STRIP = @STRIP@
-Index: pam.deb/doc/sag/Makefile.in
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+@@ -158,13 +182,13 @@
+ XSLTPROC = @XSLTPROC@
+ YACC = @YACC@
+ YFLAGS = @YFLAGS@
+-abs_builddir = @abs_builddir@
+-abs_srcdir = @abs_srcdir@
+-abs_top_builddir = @abs_top_builddir@
+-abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -176,7 +200,6 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+-builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -207,11 +230,8 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+-srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_builddir = @top_builddir@
+-top_srcdir = @top_srcdir@
+ CLEANFILES = Linux-PAM_MWG.fo *~
+ EXTRA_DIST = $(XMLS)
+ XMLS = Linux-PAM_MWG.xml $(shell ls $(srcdir)/pam_*.xml)
+@@ -255,6 +275,10 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
++
++distclean-libtool:
++ -rm -f libtool
++uninstall-info-am:
+ tags: TAGS
+ TAGS:
+
+@@ -263,21 +287,23 @@
+
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- list='$(DISTFILES)'; \
+- dist_files=`for file in $$list; do echo $$file; done | \
+- sed -e "s|^$$srcdirstrip/||;t" \
+- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+- case $$dist_files in \
+- */*) $(MKDIR_P) `echo "$$dist_files" | \
+- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+- sort -u` ;; \
+- esac; \
+- for file in $$dist_files; do \
++ $(mkdir_p) $(distdir)/$(srcdir)
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
+ if test -d $$d/$$file; then \
+- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -325,7 +351,8 @@
+
+ distclean: distclean-am
+ -rm -f Makefile
+-distclean-am: clean-am distclean-generic distclean-local
++distclean-am: clean-am distclean-generic distclean-libtool \
++ distclean-local
+
+ dvi: dvi-am
+
+@@ -339,20 +366,12 @@
+
+ install-data-am: install-data-local
+
+-install-dvi: install-dvi-am
+-
+ install-exec-am:
+
+-install-html: install-html-am
+-
+ install-info: install-info-am
+
+ install-man:
+
+-install-pdf: install-pdf-am
+-
+-install-ps: install-ps-am
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -371,21 +390,18 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-local
+-
+-.MAKE: install-am install-strip
++uninstall-am: uninstall-info-am uninstall-local
+
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ distclean distclean-generic distclean-libtool distclean-local \
+ distdir dvi dvi-am html html-am info info-am install \
+ install-am install-data install-data-am install-data-local \
+- install-dvi install-dvi-am install-exec install-exec-am \
+- install-html install-html-am install-info install-info-am \
+- install-man install-pdf install-pdf-am install-ps \
+- install-ps-am install-strip installcheck installcheck-am \
++ install-exec install-exec-am install-info install-info-am \
++ install-man install-strip installcheck installcheck-am \
+ installdirs maintainer-clean maintainer-clean-generic \
+ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+- ps ps-am uninstall uninstall-am uninstall-local
++ ps ps-am uninstall uninstall-am uninstall-info-am \
++ uninstall-local
+
+
+ @ENABLE_REGENERATE_MAN_TRUE@all: Linux-PAM_MWG.txt html/Linux-PAM_MWG.html Linux-PAM_MWG.pdf
+Index: pam.debian/doc/sag/Makefile.in
===================================================================
---- pam.deb.orig/doc/sag/Makefile.in
-+++ pam.deb/doc/sag/Makefile.in
+--- pam.debian.orig/doc/sag/Makefile.in
++++ pam.debian/doc/sag/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -75,6 +75,7 @@
+@@ -17,11 +17,15 @@
+ #
+ # Copyright (c) 2006 Thorsten Kukuk <kukuk@thkukuk.de>
+ #
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -56,6 +60,8 @@
+ DIST_SOURCES =
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AUTOCONF = @AUTOCONF@
+@@ -75,11 +81,16 @@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -6342,7 +5127,40 @@ Index: pam.deb/doc/sag/Makefile.in
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -127,6 +128,7 @@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
++ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
++ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
++ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -88,7 +99,18 @@
+ GMSGFMT_015 = @GMSGFMT_015@
+ GREP = @GREP@
+ HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
+-INSTALL = @INSTALL@
++HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
++HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
++HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
++HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
++HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
++HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
++HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
++HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
++HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
++HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
++HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
++HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -123,10 +145,10 @@
+ LTLIBINTL = @LTLIBINTL@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+-MKDIR_P = @MKDIR_P@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
@@ -6350,39 +5168,235 @@ Index: pam.deb/doc/sag/Makefile.in
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -142,6 +144,7 @@
- RANLIB = @RANLIB@
- SCONFIGDIR = @SCONFIGDIR@
- SECUREDIR = @SECUREDIR@
-+SED = @SED@
+@@ -145,6 +167,8 @@
+ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
++STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
++STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
STRIP = @STRIP@
-Index: pam.deb/doc/specs/Makefile.in
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+@@ -158,13 +182,13 @@
+ XSLTPROC = @XSLTPROC@
+ YACC = @YACC@
+ YFLAGS = @YFLAGS@
+-abs_builddir = @abs_builddir@
+-abs_srcdir = @abs_srcdir@
+-abs_top_builddir = @abs_top_builddir@
+-abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -176,7 +200,6 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+-builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -207,11 +230,8 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+-srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_builddir = @top_builddir@
+-top_srcdir = @top_srcdir@
+ CLEANFILES = Linux-PAM_SAG.fo *~
+ EXTRA_DIST = $(XMLS)
+ XMLS = Linux-PAM_SAG.xml $(shell ls $(srcdir)/pam_*.xml)
+@@ -255,6 +275,10 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
++
++distclean-libtool:
++ -rm -f libtool
++uninstall-info-am:
+ tags: TAGS
+ TAGS:
+
+@@ -263,21 +287,23 @@
+
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- list='$(DISTFILES)'; \
+- dist_files=`for file in $$list; do echo $$file; done | \
+- sed -e "s|^$$srcdirstrip/||;t" \
+- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+- case $$dist_files in \
+- */*) $(MKDIR_P) `echo "$$dist_files" | \
+- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+- sort -u` ;; \
+- esac; \
+- for file in $$dist_files; do \
++ $(mkdir_p) $(distdir)/$(srcdir)
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
+ if test -d $$d/$$file; then \
+- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -325,7 +351,8 @@
+
+ distclean: distclean-am
+ -rm -f Makefile
+-distclean-am: clean-am distclean-generic distclean-local
++distclean-am: clean-am distclean-generic distclean-libtool \
++ distclean-local
+
+ dvi: dvi-am
+
+@@ -339,20 +366,12 @@
+
+ install-data-am: install-data-local
+
+-install-dvi: install-dvi-am
+-
+ install-exec-am:
+
+-install-html: install-html-am
+-
+ install-info: install-info-am
+
+ install-man:
+
+-install-pdf: install-pdf-am
+-
+-install-ps: install-ps-am
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -371,21 +390,18 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-local
+-
+-.MAKE: install-am install-strip
++uninstall-am: uninstall-info-am uninstall-local
+
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ distclean distclean-generic distclean-libtool distclean-local \
+ distdir dvi dvi-am html html-am info info-am install \
+ install-am install-data install-data-am install-data-local \
+- install-dvi install-dvi-am install-exec install-exec-am \
+- install-html install-html-am install-info install-info-am \
+- install-man install-pdf install-pdf-am install-ps \
+- install-ps-am install-strip installcheck installcheck-am \
++ install-exec install-exec-am install-info install-info-am \
++ install-man install-strip installcheck installcheck-am \
+ installdirs maintainer-clean maintainer-clean-generic \
+ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+- ps ps-am uninstall uninstall-am uninstall-local
++ ps ps-am uninstall uninstall-am uninstall-info-am \
++ uninstall-local
+
+
+ @ENABLE_REGENERATE_MAN_TRUE@all: Linux-PAM_SAG.txt html/Linux-PAM_SAG.html Linux-PAM_SAG.pdf
+Index: pam.debian/doc/specs/Makefile.in
===================================================================
---- pam.deb.orig/doc/specs/Makefile.in
-+++ pam.deb/doc/specs/Makefile.in
+--- pam.debian.orig/doc/specs/Makefile.in
++++ pam.debian/doc/specs/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -60,7 +60,7 @@
+@@ -19,11 +19,15 @@
+ #
+
+
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -60,25 +64,22 @@
am_padout_OBJECTS = parse_l.$(OBJEXT) parse_y.$(OBJEXT)
padout_OBJECTS = $(am_padout_OBJECTS)
padout_DEPENDENCIES =
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -113,6 +113,7 @@
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
++ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++ $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+- $(LDFLAGS) -o $@
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ LEXCOMPILE = $(LEX) $(LFLAGS) $(AM_LFLAGS)
+-LTLEXCOMPILE = $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=compile $(LEX) $(LFLAGS) $(AM_LFLAGS)
+-YLWRAP = $(top_srcdir)/ylwrap
++LTLEXCOMPILE = $(LIBTOOL) --mode=compile $(LEX) $(LFLAGS) $(AM_LFLAGS)
+ YACCCOMPILE = $(YACC) $(YFLAGS) $(AM_YFLAGS)
+-LTYACCCOMPILE = $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=compile $(YACC) $(YFLAGS) $(AM_YFLAGS)
++LTYACCCOMPILE = $(LIBTOOL) --mode=compile $(YACC) $(YFLAGS) \
++ $(AM_YFLAGS)
+ SOURCES = $(padout_SOURCES)
+ DIST_SOURCES = $(padout_SOURCES)
+ am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+@@ -94,6 +95,8 @@
+ CTAGS = ctags
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AUTOCONF = @AUTOCONF@
+@@ -113,11 +116,16 @@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -6390,7 +5404,40 @@ Index: pam.deb/doc/specs/Makefile.in
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -165,6 +166,7 @@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
++ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
++ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
++ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -126,7 +134,18 @@
+ GMSGFMT_015 = @GMSGFMT_015@
+ GREP = @GREP@
+ HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
+-INSTALL = @INSTALL@
++HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
++HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
++HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
++HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
++HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
++HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
++HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
++HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
++HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
++HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
++HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
++HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -161,10 +180,10 @@
+ LTLIBINTL = @LTLIBINTL@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+-MKDIR_P = @MKDIR_P@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
@@ -6398,77 +5445,310 @@ Index: pam.deb/doc/specs/Makefile.in
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -180,6 +182,7 @@
- RANLIB = @RANLIB@
- SCONFIGDIR = @SCONFIGDIR@
- SECUREDIR = @SECUREDIR@
-+SED = @SED@
+@@ -183,6 +202,8 @@
+ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
++STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
++STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
STRIP = @STRIP@
-@@ -370,8 +373,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+@@ -196,13 +217,13 @@
+ XSLTPROC = @XSLTPROC@
+ YACC = @YACC@
+ YFLAGS = @YFLAGS@
+-abs_builddir = @abs_builddir@
+-abs_srcdir = @abs_srcdir@
+-abs_top_builddir = @abs_top_builddir@
+-abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -214,7 +235,6 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+-builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -245,11 +265,8 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+-srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_builddir = @top_builddir@
+-top_srcdir = @top_srcdir@
+ CLEANFILES = draft-morgan-pam-current.txt *~
+ EXTRA_DIST = draft-morgan-pam.raw std-agent-id.raw rfc86.0.txt
+ AM_YFLAGS = -d
+@@ -301,11 +318,11 @@
+ parse_y.h: parse_y.c
+ @if test ! -f $@; then \
+ rm -f parse_y.c; \
+- $(MAKE) $(AM_MAKEFLAGS) parse_y.c; \
++ $(MAKE) parse_y.c; \
+ else :; fi
+ padout$(EXEEXT): $(padout_OBJECTS) $(padout_DEPENDENCIES)
+ @rm -f padout$(EXEEXT)
+- $(LINK) $(padout_OBJECTS) $(padout_LDADD) $(LIBS)
++ $(LINK) $(padout_LDFLAGS) $(padout_OBJECTS) $(padout_LDADD) $(LIBS)
+
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+@@ -317,40 +334,64 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parse_y.Po@am__quote@
-@@ -383,8 +386,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -394,13 +397,12 @@
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-Index: pam.deb/examples/Makefile.in
+ .c.o:
+-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
++@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+
+ .l.c:
+- $(am__skiplex) $(SHELL) $(YLWRAP) $< $(LEX_OUTPUT_ROOT).c $@ -- $(LEXCOMPILE)
++ $(LEXCOMPILE) $<
++ sed '/^#/ s|$(LEX_OUTPUT_ROOT)\.c|$@|' $(LEX_OUTPUT_ROOT).c >$@
++ rm -f $(LEX_OUTPUT_ROOT).c
+
+ .y.c:
+- $(am__skipyacc) $(SHELL) $(YLWRAP) $< y.tab.c $@ y.tab.h $*.h y.output $*.output -- $(YACCCOMPILE)
++ $(YACCCOMPILE) $<
++ if test -f y.tab.h; then \
++ to=`echo "$*_H" | sed \
++ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \
++ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`; \
++ sed -e "/^#/!b" -e "s/Y_TAB_H/$$to/g" -e "s|y\.tab\.h|$*.h|" \
++ y.tab.h >$*.ht; \
++ rm -f y.tab.h; \
++ if cmp -s $*.ht $*.h; then \
++ rm -f $*.ht ;\
++ else \
++ mv $*.ht $*.h; \
++ fi; \
++ fi
++ if test -f y.output; then \
++ mv y.output $*.output; \
++ fi
++ sed '/^#/ s|y\.tab\.c|$@|' y.tab.c >$@t && mv $@t $@
++ rm -f y.tab.c
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+
+ clean-libtool:
+ -rm -rf .libs _libs
++
++distclean-libtool:
++ -rm -f libtool
++uninstall-info-am:
+ install-docDATA: $(doc_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)"
++ test -z "$(docdir)" || $(mkdir_p) "$(DESTDIR)$(docdir)"
+ @list='$(doc_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+@@ -415,21 +456,22 @@
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- list='$(DISTFILES)'; \
+- dist_files=`for file in $$list; do echo $$file; done | \
+- sed -e "s|^$$srcdirstrip/||;t" \
+- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+- case $$dist_files in \
+- */*) $(MKDIR_P) `echo "$$dist_files" | \
+- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+- sort -u` ;; \
+- esac; \
+- for file in $$dist_files; do \
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
+ if test -d $$d/$$file; then \
+- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -446,7 +488,7 @@
+ all-am: Makefile $(PROGRAMS) $(DATA)
+ installdirs:
+ for dir in "$(DESTDIR)$(docdir)"; do \
+- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
++ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
+ install: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) install-am
+@@ -487,7 +529,7 @@
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-tags
++ distclean-libtool distclean-tags
+
+ dvi: dvi-am
+
+@@ -501,20 +543,12 @@
+
+ install-data-am: install-docDATA
+
+-install-dvi: install-dvi-am
+-
+ install-exec-am:
+
+-install-html: install-html-am
+-
+ install-info: install-info-am
+
+ install-man:
+
+-install-pdf: install-pdf-am
+-
+-install-ps: install-ps-am
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -535,23 +569,20 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-docDATA
+-
+-.MAKE: install-am install-strip
++uninstall-am: uninstall-docDATA uninstall-info-am
+
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ clean-libtool clean-noinstPROGRAMS ctags distclean \
+ distclean-compile distclean-generic distclean-libtool \
+ distclean-tags distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am \
+- install-docDATA install-dvi install-dvi-am install-exec \
+- install-exec-am install-html install-html-am install-info \
+- install-info-am install-man install-pdf install-pdf-am \
+- install-ps install-ps-am install-strip installcheck \
++ install-docDATA install-exec install-exec-am install-info \
++ install-info-am install-man install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+- tags uninstall uninstall-am uninstall-docDATA
++ tags uninstall uninstall-am uninstall-docDATA \
++ uninstall-info-am
+
+
+ draft-morgan-pam-current.txt: padout draft-morgan-pam.raw
+Index: pam.debian/examples/Makefile.in
===================================================================
---- pam.deb.orig/examples/Makefile.in
-+++ pam.deb/examples/Makefile.in
+--- pam.debian.orig/examples/Makefile.in
++++ pam.debian/examples/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -68,7 +68,7 @@
- xsh_SOURCES = xsh.c
+@@ -18,11 +18,15 @@
+ # Copyright (c) 2005 Thorsten Kukuk <kukuk@suse.de>
+ #
+
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -72,24 +76,25 @@
xsh_OBJECTS = xsh.$(OBJEXT)
xsh_LDADD = $(LDADD)
+ xsh_DEPENDENCIES =
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -105,6 +105,7 @@
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
++ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++ $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+- $(LDFLAGS) -o $@
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = blank.c check_user.c vpass.c xsh.c
+ DIST_SOURCES = blank.c check_user.c vpass.c xsh.c
+ ETAGS = etags
+ CTAGS = ctags
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AUTOCONF = @AUTOCONF@
+@@ -109,11 +114,16 @@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -6476,7 +5756,40 @@ Index: pam.deb/examples/Makefile.in
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -157,6 +158,7 @@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
++ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
++ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
++ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -122,7 +132,18 @@
+ GMSGFMT_015 = @GMSGFMT_015@
+ GREP = @GREP@
+ HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
+-INSTALL = @INSTALL@
++HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
++HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
++HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
++HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
++HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
++HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
++HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
++HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
++HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
++HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
++HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
++HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -157,10 +178,10 @@
+ LTLIBINTL = @LTLIBINTL@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+-MKDIR_P = @MKDIR_P@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
@@ -6484,77 +5797,277 @@ Index: pam.deb/examples/Makefile.in
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -172,6 +174,7 @@
- RANLIB = @RANLIB@
- SCONFIGDIR = @SCONFIGDIR@
- SECUREDIR = @SECUREDIR@
-+SED = @SED@
+@@ -179,6 +200,8 @@
+ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
++STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
++STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
STRIP = @STRIP@
-@@ -345,8 +348,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+@@ -192,13 +215,13 @@
+ XSLTPROC = @XSLTPROC@
+ YACC = @YACC@
+ YFLAGS = @YFLAGS@
+-abs_builddir = @abs_builddir@
+-abs_srcdir = @abs_srcdir@
+-abs_top_builddir = @abs_top_builddir@
+-abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -210,7 +233,6 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+-builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -241,11 +263,8 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+-srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_builddir = @top_builddir@
+-top_srcdir = @top_srcdir@
+ CLEANFILES = *~
+ EXTRA_DIST = README
+ AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \
+@@ -296,16 +315,16 @@
+ done
+ blank$(EXEEXT): $(blank_OBJECTS) $(blank_DEPENDENCIES)
+ @rm -f blank$(EXEEXT)
+- $(LINK) $(blank_OBJECTS) $(blank_LDADD) $(LIBS)
++ $(LINK) $(blank_LDFLAGS) $(blank_OBJECTS) $(blank_LDADD) $(LIBS)
+ check_user$(EXEEXT): $(check_user_OBJECTS) $(check_user_DEPENDENCIES)
+ @rm -f check_user$(EXEEXT)
+- $(LINK) $(check_user_OBJECTS) $(check_user_LDADD) $(LIBS)
++ $(LINK) $(check_user_LDFLAGS) $(check_user_OBJECTS) $(check_user_LDADD) $(LIBS)
+ vpass$(EXEEXT): $(vpass_OBJECTS) $(vpass_DEPENDENCIES)
+ @rm -f vpass$(EXEEXT)
+- $(LINK) $(vpass_OBJECTS) $(vpass_LDADD) $(LIBS)
++ $(LINK) $(vpass_LDFLAGS) $(vpass_OBJECTS) $(vpass_LDADD) $(LIBS)
+ xsh$(EXEEXT): $(xsh_OBJECTS) $(xsh_DEPENDENCIES)
+ @rm -f xsh$(EXEEXT)
+- $(LINK) $(xsh_OBJECTS) $(xsh_LDADD) $(LIBS)
++ $(LINK) $(xsh_LDFLAGS) $(xsh_OBJECTS) $(xsh_LDADD) $(LIBS)
+
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+@@ -319,22 +338,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xsh.Po@am__quote@
-@@ -358,8 +361,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -369,13 +372,12 @@
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ .c.o:
+-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
++@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+@@ -345,6 +364,10 @@
+ clean-libtool:
+ -rm -rf .libs _libs
+
++distclean-libtool:
++ -rm -f libtool
++uninstall-info-am:
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-Index: pam.deb/libpam/Makefile.in
+@@ -394,21 +417,22 @@
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- list='$(DISTFILES)'; \
+- dist_files=`for file in $$list; do echo $$file; done | \
+- sed -e "s|^$$srcdirstrip/||;t" \
+- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+- case $$dist_files in \
+- */*) $(MKDIR_P) `echo "$$dist_files" | \
+- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+- sort -u` ;; \
+- esac; \
+- for file in $$dist_files; do \
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
+ if test -d $$d/$$file; then \
+- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -457,7 +481,7 @@
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-tags
++ distclean-libtool distclean-tags
+
+ dvi: dvi-am
+
+@@ -471,20 +495,12 @@
+
+ install-data-am:
+
+-install-dvi: install-dvi-am
+-
+ install-exec-am:
+
+-install-html: install-html-am
+-
+ install-info: install-info-am
+
+ install-man:
+
+-install-pdf: install-pdf-am
+-
+-install-ps: install-ps-am
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -505,22 +521,19 @@
+
+ ps-am:
+
+-uninstall-am:
+-
+-.MAKE: install-am install-strip
++uninstall-am: uninstall-info-am
+
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ clean-libtool clean-noinstPROGRAMS ctags distclean \
+ distclean-compile distclean-generic distclean-libtool \
+ distclean-tags distdir dvi dvi-am html html-am info info-am \
+- install install-am install-data install-data-am install-dvi \
+- install-dvi-am install-exec install-exec-am install-html \
+- install-html-am install-info install-info-am install-man \
+- install-pdf install-pdf-am install-ps install-ps-am \
++ install install-am install-data install-data-am install-exec \
++ install-exec-am install-info install-info-am install-man \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+- pdf pdf-am ps ps-am tags uninstall uninstall-am
++ pdf pdf-am ps ps-am tags uninstall uninstall-am \
++ uninstall-info-am
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+Index: pam.debian/libpam/Makefile.in
===================================================================
---- pam.deb.orig/libpam/Makefile.in
-+++ pam.deb/libpam/Makefile.in
+--- pam.debian.orig/libpam/Makefile.in
++++ pam.debian/libpam/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -84,7 +84,7 @@
- libpam_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(libpam_la_LDFLAGS) $(LDFLAGS) -o $@
+@@ -19,11 +19,15 @@
+ #
+
+
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -83,21 +87,17 @@
+ pam_modutil_getspnam.lo pam_modutil_getlogin.lo \
+ pam_modutil_ingroup.lo
+ libpam_la_OBJECTS = $(am_libpam_la_OBJECTS)
+-libpam_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+- $(libpam_la_LDFLAGS) $(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -123,6 +123,7 @@
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
++ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++ $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+- $(LDFLAGS) -o $@
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libpam_la_SOURCES)
+ DIST_SOURCES = $(libpam_la_SOURCES)
+ includeHEADERS_INSTALL = $(INSTALL_HEADER)
+@@ -106,6 +106,8 @@
+ CTAGS = ctags
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AUTOCONF = @AUTOCONF@
+@@ -125,11 +127,16 @@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -6562,7 +6075,40 @@ Index: pam.deb/libpam/Makefile.in
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -175,6 +176,7 @@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
++ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
++ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
++ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -138,7 +145,18 @@
+ GMSGFMT_015 = @GMSGFMT_015@
+ GREP = @GREP@
+ HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
+-INSTALL = @INSTALL@
++HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
++HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
++HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
++HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
++HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
++HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
++HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
++HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
++HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
++HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
++HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
++HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -173,10 +191,10 @@
+ LTLIBINTL = @LTLIBINTL@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+-MKDIR_P = @MKDIR_P@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
@@ -6570,99 +6116,303 @@ Index: pam.deb/libpam/Makefile.in
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -190,6 +192,7 @@
- RANLIB = @RANLIB@
- SCONFIGDIR = @SCONFIGDIR@
- SECUREDIR = @SECUREDIR@
-+SED = @SED@
+@@ -195,6 +213,8 @@
+ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
++STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
++STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
STRIP = @STRIP@
-@@ -323,8 +326,8 @@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+@@ -208,13 +228,13 @@
+ XSLTPROC = @XSLTPROC@
+ YACC = @YACC@
+ YFLAGS = @YFLAGS@
+-abs_builddir = @abs_builddir@
+-abs_srcdir = @abs_srcdir@
+-abs_top_builddir = @abs_top_builddir@
+-abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -226,7 +246,6 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+-builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -257,11 +276,8 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+-srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_builddir = @top_builddir@
+-top_srcdir = @top_srcdir@
+ AM_CFLAGS = -DDEFAULT_MODULE_PATH=\"$(SECUREDIR)/\" -DLIBPAM_COMPILE \
+ -I$(srcdir)/include $(LIBPRELUDE_CFLAGS) \
+ -DPAM_VERSION=\"$(VERSION)\" $(am__append_1)
+@@ -324,7 +340,7 @@
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+- test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
++ test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
-- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
- else :; fi; \
- done
+@@ -335,7 +351,7 @@
-@@ -332,8 +335,8 @@
+ uninstall-libLTLIBRARIES:
@$(NORMAL_UNINSTALL)
- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
-- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+@@ -350,7 +366,7 @@
+ rm -f "$${dir}/so_locations"; \
done
+ libpam.la: $(libpam_la_OBJECTS) $(libpam_la_DEPENDENCIES)
+- $(libpam_la_LINK) -rpath $(libdir) $(libpam_la_OBJECTS) $(libpam_la_LIBADD) $(LIBS)
++ $(LINK) -rpath $(libdir) $(libpam_la_LDFLAGS) $(libpam_la_OBJECTS) $(libpam_la_LIBADD) $(LIBS)
- clean-libLTLIBRARIES:
-@@ -432,8 +435,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+@@ -389,22 +405,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_vprompt.Plo@am__quote@
-@@ -445,8 +448,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -456,13 +459,12 @@
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-Index: pam.deb/libpam_misc/Makefile.in
+ .c.o:
+-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
++@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+@@ -414,9 +430,13 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
++
++distclean-libtool:
++ -rm -f libtool
++uninstall-info-am:
+ install-includeHEADERS: $(include_HEADERS)
+ @$(NORMAL_INSTALL)
+- test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
++ test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
+ @list='$(include_HEADERS)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+@@ -481,21 +501,23 @@
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- list='$(DISTFILES)'; \
+- dist_files=`for file in $$list; do echo $$file; done | \
+- sed -e "s|^$$srcdirstrip/||;t" \
+- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+- case $$dist_files in \
+- */*) $(MKDIR_P) `echo "$$dist_files" | \
+- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+- sort -u` ;; \
+- esac; \
+- for file in $$dist_files; do \
++ $(mkdir_p) $(distdir)/include/security
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
+ if test -d $$d/$$file; then \
+- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -511,7 +533,7 @@
+ all-am: Makefile $(LTLIBRARIES) $(HEADERS)
+ installdirs:
+ for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"; do \
+- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
++ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
+ install: install-am
+ install-exec: install-exec-am
+@@ -547,7 +569,7 @@
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-tags
++ distclean-libtool distclean-tags
+
+ dvi: dvi-am
+
+@@ -561,20 +583,12 @@
+
+ install-data-am: install-includeHEADERS
+
+-install-dvi: install-dvi-am
+-
+ install-exec-am: install-libLTLIBRARIES
+
+-install-html: install-html-am
+-
+ install-info: install-info-am
+
+ install-man:
+
+-install-pdf: install-pdf-am
+-
+-install-ps: install-ps-am
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -595,23 +609,21 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-includeHEADERS uninstall-libLTLIBRARIES
+-
+-.MAKE: install-am install-strip
++uninstall-am: uninstall-includeHEADERS uninstall-info-am \
++ uninstall-libLTLIBRARIES
+
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ clean-libLTLIBRARIES clean-libtool ctags distclean \
+ distclean-compile distclean-generic distclean-libtool \
+ distclean-tags distdir dvi dvi-am html html-am info info-am \
+- install install-am install-data install-data-am install-dvi \
+- install-dvi-am install-exec install-exec-am install-html \
+- install-html-am install-includeHEADERS install-info \
+- install-info-am install-libLTLIBRARIES install-man install-pdf \
+- install-pdf-am install-ps install-ps-am install-strip \
+- installcheck installcheck-am installdirs maintainer-clean \
+- maintainer-clean-generic mostlyclean mostlyclean-compile \
+- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+- tags uninstall uninstall-am uninstall-includeHEADERS \
++ install install-am install-data install-data-am install-exec \
++ install-exec-am install-includeHEADERS install-info \
++ install-info-am install-libLTLIBRARIES install-man \
++ install-strip installcheck installcheck-am installdirs \
++ maintainer-clean maintainer-clean-generic mostlyclean \
++ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
++ pdf pdf-am ps ps-am tags uninstall uninstall-am \
++ uninstall-includeHEADERS uninstall-info-am \
+ uninstall-libLTLIBRARIES
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+Index: pam.debian/libpam_misc/Makefile.in
===================================================================
---- pam.deb.orig/libpam_misc/Makefile.in
-+++ pam.deb/libpam_misc/Makefile.in
+--- pam.debian.orig/libpam_misc/Makefile.in
++++ pam.debian/libpam_misc/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -71,7 +71,7 @@
- libpam_misc_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(libpam_misc_la_LDFLAGS) $(LDFLAGS) -o $@
+@@ -19,11 +19,15 @@
+ #
+
+
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -68,21 +72,17 @@
+ libpam_misc_la_DEPENDENCIES = $(top_builddir)/libpam/libpam.la
+ am_libpam_misc_la_OBJECTS = help_env.lo misc_conv.lo
+ libpam_misc_la_OBJECTS = $(am_libpam_misc_la_OBJECTS)
+-libpam_misc_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+- $(libpam_misc_la_LDFLAGS) $(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -110,6 +110,7 @@
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
++ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++ $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+- $(LDFLAGS) -o $@
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libpam_misc_la_SOURCES)
+ DIST_SOURCES = $(libpam_misc_la_SOURCES)
+ includeHEADERS_INSTALL = $(INSTALL_HEADER)
+@@ -91,6 +91,8 @@
+ CTAGS = ctags
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AUTOCONF = @AUTOCONF@
+@@ -110,11 +112,16 @@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -6670,7 +6420,40 @@ Index: pam.deb/libpam_misc/Makefile.in
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -162,6 +163,7 @@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
++ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
++ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
++ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -123,7 +130,18 @@
+ GMSGFMT_015 = @GMSGFMT_015@
+ GREP = @GREP@
+ HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
+-INSTALL = @INSTALL@
++HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
++HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
++HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
++HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
++HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
++HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
++HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
++HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
++HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
++HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
++HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
++HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -158,10 +176,10 @@
+ LTLIBINTL = @LTLIBINTL@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+-MKDIR_P = @MKDIR_P@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
@@ -6678,99 +6461,318 @@ Index: pam.deb/libpam_misc/Makefile.in
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -177,6 +179,7 @@
- RANLIB = @RANLIB@
- SCONFIGDIR = @SCONFIGDIR@
- SECUREDIR = @SECUREDIR@
-+SED = @SED@
+@@ -180,6 +198,8 @@
+ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
++STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
++STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
STRIP = @STRIP@
-@@ -296,8 +299,8 @@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+@@ -193,13 +213,13 @@
+ XSLTPROC = @XSLTPROC@
+ YACC = @YACC@
+ YFLAGS = @YFLAGS@
+-abs_builddir = @abs_builddir@
+-abs_srcdir = @abs_srcdir@
+-abs_top_builddir = @abs_top_builddir@
+-abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -211,7 +231,6 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+-builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -242,11 +261,8 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+-srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_builddir = @top_builddir@
+-top_srcdir = @top_srcdir@
+ CLEANFILES = *~
+ EXTRA_DIST = libpam_misc.map
+ include_HEADERS = include/security/pam_misc.h
+@@ -293,7 +309,7 @@
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+- test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
++ test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
-- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
- else :; fi; \
- done
+@@ -304,7 +320,7 @@
-@@ -305,8 +308,8 @@
+ uninstall-libLTLIBRARIES:
@$(NORMAL_UNINSTALL)
- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
-- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+@@ -319,7 +335,7 @@
+ rm -f "$${dir}/so_locations"; \
done
+ libpam_misc.la: $(libpam_misc_la_OBJECTS) $(libpam_misc_la_DEPENDENCIES)
+- $(libpam_misc_la_LINK) -rpath $(libdir) $(libpam_misc_la_OBJECTS) $(libpam_misc_la_LIBADD) $(LIBS)
++ $(LINK) -rpath $(libdir) $(libpam_misc_la_LDFLAGS) $(libpam_misc_la_OBJECTS) $(libpam_misc_la_LIBADD) $(LIBS)
- clean-libLTLIBRARIES:
-@@ -378,8 +381,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+@@ -331,22 +347,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/misc_conv.Plo@am__quote@
-@@ -391,8 +394,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -402,13 +405,12 @@
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-Index: pam.deb/libpamc/Makefile.in
+ .c.o:
+-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
++@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+@@ -356,9 +372,13 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
++
++distclean-libtool:
++ -rm -f libtool
++uninstall-info-am:
+ install-includeHEADERS: $(include_HEADERS)
+ @$(NORMAL_INSTALL)
+- test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
++ test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
+ @list='$(include_HEADERS)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+@@ -423,21 +443,23 @@
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- list='$(DISTFILES)'; \
+- dist_files=`for file in $$list; do echo $$file; done | \
+- sed -e "s|^$$srcdirstrip/||;t" \
+- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+- case $$dist_files in \
+- */*) $(MKDIR_P) `echo "$$dist_files" | \
+- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+- sort -u` ;; \
+- esac; \
+- for file in $$dist_files; do \
++ $(mkdir_p) $(distdir)/include/security
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
+ if test -d $$d/$$file; then \
+- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -453,7 +475,7 @@
+ all-am: Makefile $(LTLIBRARIES) $(HEADERS)
+ installdirs:
+ for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"; do \
+- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
++ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
+ install: install-am
+ install-exec: install-exec-am
+@@ -489,7 +511,7 @@
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-tags
++ distclean-libtool distclean-tags
+
+ dvi: dvi-am
+
+@@ -503,20 +525,12 @@
+
+ install-data-am: install-includeHEADERS
+
+-install-dvi: install-dvi-am
+-
+ install-exec-am: install-libLTLIBRARIES
+
+-install-html: install-html-am
+-
+ install-info: install-info-am
+
+ install-man:
+
+-install-pdf: install-pdf-am
+-
+-install-ps: install-ps-am
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -537,23 +551,21 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-includeHEADERS uninstall-libLTLIBRARIES
+-
+-.MAKE: install-am install-strip
++uninstall-am: uninstall-includeHEADERS uninstall-info-am \
++ uninstall-libLTLIBRARIES
+
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ clean-libLTLIBRARIES clean-libtool ctags distclean \
+ distclean-compile distclean-generic distclean-libtool \
+ distclean-tags distdir dvi dvi-am html html-am info info-am \
+- install install-am install-data install-data-am install-dvi \
+- install-dvi-am install-exec install-exec-am install-html \
+- install-html-am install-includeHEADERS install-info \
+- install-info-am install-libLTLIBRARIES install-man install-pdf \
+- install-pdf-am install-ps install-ps-am install-strip \
+- installcheck installcheck-am installdirs maintainer-clean \
+- maintainer-clean-generic mostlyclean mostlyclean-compile \
+- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+- tags uninstall uninstall-am uninstall-includeHEADERS \
++ install install-am install-data install-data-am install-exec \
++ install-exec-am install-includeHEADERS install-info \
++ install-info-am install-libLTLIBRARIES install-man \
++ install-strip installcheck installcheck-am installdirs \
++ maintainer-clean maintainer-clean-generic mostlyclean \
++ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
++ pdf pdf-am ps ps-am tags uninstall uninstall-am \
++ uninstall-includeHEADERS uninstall-info-am \
+ uninstall-libLTLIBRARIES
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+Index: pam.debian/libpamc/Makefile.in
===================================================================
---- pam.deb.orig/libpamc/Makefile.in
-+++ pam.deb/libpamc/Makefile.in
+--- pam.debian.orig/libpamc/Makefile.in
++++ pam.debian/libpamc/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -71,7 +71,7 @@
- libpamc_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(libpamc_la_LDFLAGS) $(LDFLAGS) -o $@
+@@ -19,11 +19,15 @@
+ #
+
+
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -68,39 +72,34 @@
+ libpamc_la_LIBADD =
+ am_libpamc_la_OBJECTS = pamc_client.lo pamc_converse.lo pamc_load.lo
+ libpamc_la_OBJECTS = $(am_libpamc_la_OBJECTS)
+-libpamc_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+- $(libpamc_la_LDFLAGS) $(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -120,6 +120,7 @@
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
++ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++ $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+- $(LDFLAGS) -o $@
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libpamc_la_SOURCES)
+ DIST_SOURCES = $(libpamc_la_SOURCES)
+ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ html-recursive info-recursive install-data-recursive \
+- install-dvi-recursive install-exec-recursive \
+- install-html-recursive install-info-recursive \
+- install-pdf-recursive install-ps-recursive install-recursive \
+- installcheck-recursive installdirs-recursive pdf-recursive \
+- ps-recursive uninstall-recursive
++ install-exec-recursive install-info-recursive \
++ install-recursive installcheck-recursive installdirs-recursive \
++ pdf-recursive ps-recursive uninstall-info-recursive \
++ uninstall-recursive
+ includeHEADERS_INSTALL = $(INSTALL_HEADER)
+ HEADERS = $(include_HEADERS) $(noinst_HEADERS)
+-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+- distclean-recursive maintainer-clean-recursive
+ ETAGS = etags
+ CTAGS = ctags
+ DIST_SUBDIRS = $(SUBDIRS)
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AUTOCONF = @AUTOCONF@
+@@ -120,11 +119,16 @@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -6778,7 +6780,40 @@ Index: pam.deb/libpamc/Makefile.in
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -172,6 +173,7 @@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
++ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
++ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
++ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -133,7 +137,18 @@
+ GMSGFMT_015 = @GMSGFMT_015@
+ GREP = @GREP@
+ HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
+-INSTALL = @INSTALL@
++HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
++HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
++HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
++HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
++HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
++HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
++HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
++HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
++HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
++HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
++HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
++HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -168,10 +183,10 @@
+ LTLIBINTL = @LTLIBINTL@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+-MKDIR_P = @MKDIR_P@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
@@ -6786,90 +6821,312 @@ Index: pam.deb/libpamc/Makefile.in
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -187,6 +189,7 @@
- RANLIB = @RANLIB@
- SCONFIGDIR = @SCONFIGDIR@
- SECUREDIR = @SECUREDIR@
-+SED = @SED@
+@@ -190,6 +205,8 @@
+ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
++STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
++STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
STRIP = @STRIP@
-@@ -305,8 +308,8 @@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+@@ -203,13 +220,13 @@
+ XSLTPROC = @XSLTPROC@
+ YACC = @YACC@
+ YFLAGS = @YFLAGS@
+-abs_builddir = @abs_builddir@
+-abs_srcdir = @abs_srcdir@
+-abs_top_builddir = @abs_top_builddir@
+-abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -221,7 +238,6 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+-builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -252,11 +268,8 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+-srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_builddir = @top_builddir@
+-top_srcdir = @top_srcdir@
+ SUBDIRS = test
+ CLEANFILES = *~
+ EXTRA_DIST = License libpamc.map
+@@ -302,7 +315,7 @@
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+- test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
++ test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
-- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
- else :; fi; \
- done
+@@ -313,7 +326,7 @@
-@@ -314,8 +317,8 @@
+ uninstall-libLTLIBRARIES:
@$(NORMAL_UNINSTALL)
- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
-- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+@@ -328,7 +341,7 @@
+ rm -f "$${dir}/so_locations"; \
done
+ libpamc.la: $(libpamc_la_OBJECTS) $(libpamc_la_DEPENDENCIES)
+- $(libpamc_la_LINK) -rpath $(libdir) $(libpamc_la_OBJECTS) $(libpamc_la_LIBADD) $(LIBS)
++ $(LINK) -rpath $(libdir) $(libpamc_la_LDFLAGS) $(libpamc_la_OBJECTS) $(libpamc_la_LIBADD) $(LIBS)
- clean-libLTLIBRARIES:
-@@ -458,8 +461,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+@@ -341,22 +354,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pamc_load.Plo@am__quote@
-@@ -484,8 +487,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -495,13 +498,12 @@
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-Index: pam.deb/libpamc/test/Makefile.in
+ .c.o:
+-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
++@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+@@ -366,9 +379,13 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
++
++distclean-libtool:
++ -rm -f libtool
++uninstall-info-am:
+ install-includeHEADERS: $(include_HEADERS)
+ @$(NORMAL_INSTALL)
+- test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
++ test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
+ @list='$(include_HEADERS)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+@@ -415,7 +432,8 @@
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ fi; test -z "$$fail"
+
+-$(RECURSIVE_CLEAN_TARGETS):
++mostlyclean-recursive clean-recursive distclean-recursive \
++maintainer-clean-recursive:
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+@@ -516,21 +534,23 @@
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- list='$(DISTFILES)'; \
+- dist_files=`for file in $$list; do echo $$file; done | \
+- sed -e "s|^$$srcdirstrip/||;t" \
+- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+- case $$dist_files in \
+- */*) $(MKDIR_P) `echo "$$dist_files" | \
+- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+- sort -u` ;; \
+- esac; \
+- for file in $$dist_files; do \
++ $(mkdir_p) $(distdir)/include/security
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
+ if test -d $$d/$$file; then \
+- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -544,7 +564,7 @@
+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -d "$(distdir)/$$subdir" \
+- || $(MKDIR_P) "$(distdir)/$$subdir" \
++ || $(mkdir_p) "$(distdir)/$$subdir" \
+ || exit 1; \
+ distdir=`$(am__cd) $(distdir) && pwd`; \
+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+@@ -552,8 +572,6 @@
+ $(MAKE) $(AM_MAKEFLAGS) \
+ top_distdir="$$top_distdir" \
+ distdir="$$distdir/$$subdir" \
+- am__remove_distdir=: \
+- am__skip_length_check=: \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -564,7 +582,7 @@
+ installdirs: installdirs-recursive
+ installdirs-am:
+ for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"; do \
+- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
++ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
+ install: install-recursive
+ install-exec: install-exec-recursive
+@@ -600,7 +618,7 @@
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-tags
++ distclean-libtool distclean-tags
+
+ dvi: dvi-recursive
+
+@@ -614,20 +632,12 @@
+
+ install-data-am: install-includeHEADERS
+
+-install-dvi: install-dvi-recursive
+-
+ install-exec-am: install-libLTLIBRARIES
+
+-install-html: install-html-recursive
+-
+ install-info: install-info-recursive
+
+ install-man:
+
+-install-pdf: install-pdf-recursive
+-
+-install-ps: install-ps-recursive
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-recursive
+@@ -648,27 +658,27 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-includeHEADERS uninstall-libLTLIBRARIES
++uninstall-am: uninstall-includeHEADERS uninstall-info-am \
++ uninstall-libLTLIBRARIES
+
+-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+- install-strip
++uninstall-info: uninstall-info-recursive
+
+-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+- all all-am check check-am clean clean-generic \
+- clean-libLTLIBRARIES clean-libtool ctags ctags-recursive \
+- distclean distclean-compile distclean-generic \
+- distclean-libtool distclean-tags distdir dvi dvi-am html \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++ clean clean-generic clean-libLTLIBRARIES clean-libtool \
++ clean-recursive ctags ctags-recursive distclean \
++ distclean-compile distclean-generic distclean-libtool \
++ distclean-recursive distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+- install-data-am install-dvi install-dvi-am install-exec \
+- install-exec-am install-html install-html-am \
++ install-data-am install-exec install-exec-am \
+ install-includeHEADERS install-info install-info-am \
+- install-libLTLIBRARIES install-man install-pdf install-pdf-am \
+- install-ps install-ps-am install-strip installcheck \
++ install-libLTLIBRARIES install-man install-strip installcheck \
+ installcheck-am installdirs installdirs-am maintainer-clean \
+- maintainer-clean-generic mostlyclean mostlyclean-compile \
+- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
++ maintainer-clean-generic maintainer-clean-recursive \
++ mostlyclean mostlyclean-compile mostlyclean-generic \
++ mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
+ tags tags-recursive uninstall uninstall-am \
+- uninstall-includeHEADERS uninstall-libLTLIBRARIES
++ uninstall-includeHEADERS uninstall-info-am \
++ uninstall-libLTLIBRARIES
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+Index: pam.debian/libpamc/test/Makefile.in
===================================================================
---- pam.deb.orig/libpamc/test/Makefile.in
-+++ pam.deb/libpamc/test/Makefile.in
+--- pam.debian.orig/libpamc/test/Makefile.in
++++ pam.debian/libpamc/test/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -75,6 +75,7 @@
+@@ -17,11 +17,15 @@
+ #
+ # Copyright (c) 2005 Thorsten Kukuk <kukuk@suse.de>
+ #
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -56,6 +60,8 @@
+ DIST_SOURCES =
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AUTOCONF = @AUTOCONF@
+@@ -75,11 +81,16 @@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -6877,7 +7134,40 @@ Index: pam.deb/libpamc/test/Makefile.in
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -127,6 +128,7 @@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
++ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
++ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
++ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -88,7 +99,18 @@
+ GMSGFMT_015 = @GMSGFMT_015@
+ GREP = @GREP@
+ HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
+-INSTALL = @INSTALL@
++HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
++HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
++HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
++HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
++HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
++HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
++HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
++HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
++HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
++HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
++HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
++HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -123,10 +145,10 @@
+ LTLIBINTL = @LTLIBINTL@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+-MKDIR_P = @MKDIR_P@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
@@ -6885,30 +7175,214 @@ Index: pam.deb/libpamc/test/Makefile.in
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -142,6 +144,7 @@
- RANLIB = @RANLIB@
- SCONFIGDIR = @SCONFIGDIR@
- SECUREDIR = @SECUREDIR@
-+SED = @SED@
+@@ -145,6 +167,8 @@
+ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
++STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
++STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
STRIP = @STRIP@
-Index: pam.deb/modules/Makefile.in
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+@@ -158,13 +182,13 @@
+ XSLTPROC = @XSLTPROC@
+ YACC = @YACC@
+ YFLAGS = @YFLAGS@
+-abs_builddir = @abs_builddir@
+-abs_srcdir = @abs_srcdir@
+-abs_top_builddir = @abs_top_builddir@
+-abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -176,7 +200,6 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+-builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -207,11 +230,8 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+-srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_builddir = @top_builddir@
+-top_srcdir = @top_srcdir@
+ AUTOMAKE_OPTIONS = 1.6 gnits
+ CLEANFILES = *~ */*~
+ EXTRA_DIST = agents/secret@here modules/Makefile modules/pam_secret.c \
+@@ -256,6 +276,10 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
++
++distclean-libtool:
++ -rm -f libtool
++uninstall-info-am:
+ tags: TAGS
+ TAGS:
+
+@@ -264,21 +288,23 @@
+
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- list='$(DISTFILES)'; \
+- dist_files=`for file in $$list; do echo $$file; done | \
+- sed -e "s|^$$srcdirstrip/||;t" \
+- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+- case $$dist_files in \
+- */*) $(MKDIR_P) `echo "$$dist_files" | \
+- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+- sort -u` ;; \
+- esac; \
+- for file in $$dist_files; do \
++ $(mkdir_p) $(distdir)/agents $(distdir)/modules $(distdir)/regress
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
+ if test -d $$d/$$file; then \
+- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -324,7 +350,7 @@
+
+ distclean: distclean-am
+ -rm -f Makefile
+-distclean-am: clean-am distclean-generic
++distclean-am: clean-am distclean-generic distclean-libtool
+
+ dvi: dvi-am
+
+@@ -338,20 +364,12 @@
+
+ install-data-am:
+
+-install-dvi: install-dvi-am
+-
+ install-exec-am:
+
+-install-html: install-html-am
+-
+ install-info: install-info-am
+
+ install-man:
+
+-install-pdf: install-pdf-am
+-
+-install-ps: install-ps-am
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -370,20 +388,17 @@
+
+ ps-am:
+
+-uninstall-am:
+-
+-.MAKE: install-am install-strip
++uninstall-am: uninstall-info-am
+
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ distclean distclean-generic distclean-libtool distdir dvi \
+ dvi-am html html-am info info-am install install-am \
+- install-data install-data-am install-dvi install-dvi-am \
+- install-exec install-exec-am install-html install-html-am \
+- install-info install-info-am install-man install-pdf \
+- install-pdf-am install-ps install-ps-am install-strip \
++ install-data install-data-am install-exec install-exec-am \
++ install-info install-info-am install-man install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic \
+- mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
++ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
++ uninstall-info-am
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+Index: pam.debian/modules/Makefile.in
===================================================================
---- pam.deb.orig/modules/Makefile.in
-+++ pam.deb/modules/Makefile.in
+--- pam.debian.orig/modules/Makefile.in
++++ pam.debian/modules/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -87,6 +87,7 @@
+@@ -17,11 +17,15 @@
+ #
+ # Copyright (c) 2005, 2006 Thorsten Kukuk <kukuk@thkukuk.de>
+ #
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -56,18 +60,17 @@
+ DIST_SOURCES =
+ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ html-recursive info-recursive install-data-recursive \
+- install-dvi-recursive install-exec-recursive \
+- install-html-recursive install-info-recursive \
+- install-pdf-recursive install-ps-recursive install-recursive \
+- installcheck-recursive installdirs-recursive pdf-recursive \
+- ps-recursive uninstall-recursive
+-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+- distclean-recursive maintainer-clean-recursive
++ install-exec-recursive install-info-recursive \
++ install-recursive installcheck-recursive installdirs-recursive \
++ pdf-recursive ps-recursive uninstall-info-recursive \
++ uninstall-recursive
+ ETAGS = etags
+ CTAGS = ctags
+ DIST_SUBDIRS = $(SUBDIRS)
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AUTOCONF = @AUTOCONF@
+@@ -87,11 +90,16 @@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -6916,7 +7390,40 @@ Index: pam.deb/modules/Makefile.in
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -139,6 +140,7 @@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
++ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
++ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
++ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -100,7 +108,18 @@
+ GMSGFMT_015 = @GMSGFMT_015@
+ GREP = @GREP@
+ HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
+-INSTALL = @INSTALL@
++HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
++HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
++HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
++HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
++HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
++HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
++HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
++HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
++HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
++HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
++HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
++HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -135,10 +154,10 @@
+ LTLIBINTL = @LTLIBINTL@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+-MKDIR_P = @MKDIR_P@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
@@ -6924,77 +7431,262 @@ Index: pam.deb/modules/Makefile.in
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -154,6 +156,7 @@
- RANLIB = @RANLIB@
- SCONFIGDIR = @SCONFIGDIR@
- SECUREDIR = @SECUREDIR@
-+SED = @SED@
+@@ -157,6 +176,8 @@
+ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
++STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
++STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
STRIP = @STRIP@
-@@ -348,8 +351,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+@@ -170,13 +191,13 @@
+ XSLTPROC = @XSLTPROC@
+ YACC = @YACC@
+ YFLAGS = @YFLAGS@
+-abs_builddir = @abs_builddir@
+-abs_srcdir = @abs_srcdir@
+-abs_top_builddir = @abs_top_builddir@
+-abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -188,7 +209,6 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+-builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -219,11 +239,8 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+-srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_builddir = @top_builddir@
+-top_srcdir = @top_srcdir@
+ SUBDIRS = pam_access pam_cracklib pam_debug pam_deny pam_echo \
+ pam_env pam_filter pam_ftp pam_group pam_issue pam_keyinit \
+ pam_lastlog pam_limits pam_listfile pam_localuser pam_mail \
+@@ -274,6 +291,10 @@
+ clean-libtool:
+ -rm -rf .libs _libs
+
++distclean-libtool:
++ -rm -f libtool
++uninstall-info-am:
++
+ # This directory's subdirectories are mostly independent; you can cd
+ # into them and run `make' without going through this Makefile.
+ # To change the values of `make' variables: instead of editing Makefiles,
+@@ -305,7 +326,8 @@
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ fi; test -z "$$fail"
+
+-$(RECURSIVE_CLEAN_TARGETS):
++mostlyclean-recursive clean-recursive distclean-recursive \
++maintainer-clean-recursive:
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+@@ -406,21 +428,22 @@
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- list='$(DISTFILES)'; \
+- dist_files=`for file in $$list; do echo $$file; done | \
+- sed -e "s|^$$srcdirstrip/||;t" \
+- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+- case $$dist_files in \
+- */*) $(MKDIR_P) `echo "$$dist_files" | \
+- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+- sort -u` ;; \
+- esac; \
+- for file in $$dist_files; do \
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
+ if test -d $$d/$$file; then \
+- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -434,7 +457,7 @@
+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -d "$(distdir)/$$subdir" \
+- || $(MKDIR_P) "$(distdir)/$$subdir" \
++ || $(mkdir_p) "$(distdir)/$$subdir" \
+ || exit 1; \
+ distdir=`$(am__cd) $(distdir) && pwd`; \
+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+@@ -442,8 +465,6 @@
+ $(MAKE) $(AM_MAKEFLAGS) \
+ top_distdir="$$top_distdir" \
+ distdir="$$distdir/$$subdir" \
+- am__remove_distdir=: \
+- am__skip_length_check=: \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -484,7 +505,8 @@
+
+ distclean: distclean-recursive
+ -rm -f Makefile
+-distclean-am: clean-am distclean-generic distclean-tags
++distclean-am: clean-am distclean-generic distclean-libtool \
++ distclean-tags
+
+ dvi: dvi-recursive
+
+@@ -498,20 +520,12 @@
+
+ install-data-am:
+
+-install-dvi: install-dvi-recursive
+-
+ install-exec-am:
-@@ -374,8 +377,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -385,13 +388,12 @@
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-Index: pam.deb/modules/pam_access/Makefile.in
+-install-html: install-html-recursive
+-
+ install-info: install-info-recursive
+
+ install-man:
+
+-install-pdf: install-pdf-recursive
+-
+-install-ps: install-ps-recursive
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-recursive
+@@ -530,24 +544,22 @@
+
+ ps-am:
+
+-uninstall-am:
++uninstall-am: uninstall-info-am
+
+-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+- install-strip
++uninstall-info: uninstall-info-recursive
+
+-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+- all all-am check check-am clean clean-generic clean-libtool \
+- ctags ctags-recursive distclean distclean-generic \
+- distclean-libtool distclean-tags distdir dvi dvi-am html \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++ clean clean-generic clean-libtool clean-recursive ctags \
++ ctags-recursive distclean distclean-generic distclean-libtool \
++ distclean-recursive distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+- install-data-am install-dvi install-dvi-am install-exec \
+- install-exec-am install-html install-html-am install-info \
+- install-info-am install-man install-pdf install-pdf-am \
+- install-ps install-ps-am install-strip installcheck \
++ install-data-am install-exec install-exec-am install-info \
++ install-info-am install-man install-strip installcheck \
+ installcheck-am installdirs installdirs-am maintainer-clean \
+- maintainer-clean-generic mostlyclean mostlyclean-generic \
+- mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
+- uninstall uninstall-am
++ maintainer-clean-generic maintainer-clean-recursive \
++ mostlyclean mostlyclean-generic mostlyclean-libtool \
++ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
++ uninstall uninstall-am uninstall-info-am
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+Index: pam.debian/modules/pam_access/Makefile.in
===================================================================
---- pam.deb.orig/modules/pam_access/Makefile.in
-+++ pam.deb/modules/pam_access/Makefile.in
+--- pam.debian.orig/modules/pam_access/Makefile.in
++++ pam.debian/modules/pam_access/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -68,7 +68,7 @@
- pam_access_la_LIBADD =
+@@ -19,11 +19,15 @@
+ #
+
+
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -68,18 +72,17 @@
+ pam_access_la_DEPENDENCIES =
pam_access_la_SOURCES = pam_access.c
pam_access_la_OBJECTS = pam_access.lo
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -111,6 +111,7 @@
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
++ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++ $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+- $(LDFLAGS) -o $@
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = pam_access.c
+ DIST_SOURCES = pam_access.c
+ man5dir = $(mandir)/man5
+@@ -92,6 +95,8 @@
+ CTAGS = ctags
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AUTOCONF = @AUTOCONF@
+@@ -111,11 +116,16 @@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -7002,7 +7694,40 @@ Index: pam.deb/modules/pam_access/Makefile.in
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -163,6 +164,7 @@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
++ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
++ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
++ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -124,7 +134,18 @@
+ GMSGFMT_015 = @GMSGFMT_015@
+ GREP = @GREP@
+ HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
+-INSTALL = @INSTALL@
++HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
++HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
++HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
++HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
++HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
++HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
++HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
++HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
++HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
++HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
++HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
++HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -159,10 +180,10 @@
+ LTLIBINTL = @LTLIBINTL@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+-MKDIR_P = @MKDIR_P@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
@@ -7010,99 +7735,348 @@ Index: pam.deb/modules/pam_access/Makefile.in
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -178,6 +180,7 @@
- RANLIB = @RANLIB@
- SCONFIGDIR = @SCONFIGDIR@
- SECUREDIR = @SECUREDIR@
-+SED = @SED@
+@@ -181,6 +202,8 @@
+ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
++STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
++STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
STRIP = @STRIP@
-@@ -301,8 +304,8 @@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+@@ -194,13 +217,13 @@
+ XSLTPROC = @XSLTPROC@
+ YACC = @YACC@
+ YFLAGS = @YFLAGS@
+-abs_builddir = @abs_builddir@
+-abs_srcdir = @abs_srcdir@
+-abs_top_builddir = @abs_top_builddir@
+-abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -212,7 +235,6 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+-builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -243,11 +265,8 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+-srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_builddir = @top_builddir@
+-top_srcdir = @top_srcdir@
+ CLEANFILES = *~
+ EXTRA_DIST = README access.conf $(MANS) $(XMLS) tst-pam_access
+ man_MANS = access.conf.5 pam_access.8
+@@ -298,7 +317,7 @@
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+- test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
++ test -z "$(securelibdir)" || $(mkdir_p) "$(DESTDIR)$(securelibdir)"
@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \
-- $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \
- else :; fi; \
- done
+@@ -309,7 +328,7 @@
-@@ -310,8 +313,8 @@
+ uninstall-securelibLTLIBRARIES:
@$(NORMAL_UNINSTALL)
- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
+- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
++ @set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
+@@ -324,7 +343,7 @@
+ rm -f "$${dir}/so_locations"; \
done
+ pam_access.la: $(pam_access_la_OBJECTS) $(pam_access_la_DEPENDENCIES)
+- $(LINK) -rpath $(securelibdir) $(pam_access_la_OBJECTS) $(pam_access_la_LIBADD) $(LIBS)
++ $(LINK) -rpath $(securelibdir) $(pam_access_la_LDFLAGS) $(pam_access_la_OBJECTS) $(pam_access_la_LIBADD) $(LIBS)
- clean-securelibLTLIBRARIES:
-@@ -472,8 +475,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+@@ -335,22 +354,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_access.Plo@am__quote@
-@@ -485,8 +488,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -496,13 +499,12 @@
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-Index: pam.deb/modules/pam_cracklib/Makefile.in
+ .c.o:
+-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
++@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+@@ -360,9 +379,13 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
++
++distclean-libtool:
++ -rm -f libtool
++uninstall-info-am:
+ install-man5: $(man5_MANS) $(man_MANS)
+ @$(NORMAL_INSTALL)
+- test -z "$(man5dir)" || $(MKDIR_P) "$(DESTDIR)$(man5dir)"
++ test -z "$(man5dir)" || $(mkdir_p) "$(DESTDIR)$(man5dir)"
+ @list='$(man5_MANS) $(dist_man5_MANS) $(nodist_man5_MANS)'; \
+ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ for i in $$l2; do \
+@@ -407,7 +430,7 @@
+ done
+ install-man8: $(man8_MANS) $(man_MANS)
+ @$(NORMAL_INSTALL)
+- test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
++ test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
+ @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
+ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ for i in $$l2; do \
+@@ -452,7 +475,7 @@
+ done
+ install-secureconfDATA: $(secureconf_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(secureconfdir)" || $(MKDIR_P) "$(DESTDIR)$(secureconfdir)"
++ test -z "$(secureconfdir)" || $(mkdir_p) "$(DESTDIR)$(secureconfdir)"
+ @list='$(secureconf_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+@@ -517,9 +540,9 @@
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ check-TESTS: $(TESTS)
+- @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
++ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
+ srcdir=$(srcdir); export srcdir; \
+- list=' $(TESTS) '; \
++ list='$(TESTS)'; \
+ if test -n "$$list"; then \
+ for tst in $$list; do \
+ if test -f ./$$tst; then dir=./; \
+@@ -528,7 +551,7 @@
+ if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *$$ws$$tst$$ws*) \
++ *" $$tst "*) \
+ xpass=`expr $$xpass + 1`; \
+ failed=`expr $$failed + 1`; \
+ echo "XPASS: $$tst"; \
+@@ -540,7 +563,7 @@
+ elif test $$? -ne 77; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *$$ws$$tst$$ws*) \
++ *" $$tst "*) \
+ xfail=`expr $$xfail + 1`; \
+ echo "XFAIL: $$tst"; \
+ ;; \
+@@ -590,21 +613,22 @@
+ else :; fi
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- list='$(DISTFILES)'; \
+- dist_files=`for file in $$list; do echo $$file; done | \
+- sed -e "s|^$$srcdirstrip/||;t" \
+- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+- case $$dist_files in \
+- */*) $(MKDIR_P) `echo "$$dist_files" | \
+- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+- sort -u` ;; \
+- esac; \
+- for file in $$dist_files; do \
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
+ if test -d $$d/$$file; then \
+- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -621,7 +645,7 @@
+ all-am: Makefile $(LTLIBRARIES) $(MANS) $(DATA)
+ installdirs:
+ for dir in "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(secureconfdir)"; do \
+- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
++ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
+ install: install-am
+ install-exec: install-exec-am
+@@ -657,7 +681,7 @@
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-tags
++ distclean-libtool distclean-tags
+
+ dvi: dvi-am
+
+@@ -672,20 +696,12 @@
+ install-data-am: install-man install-secureconfDATA \
+ install-securelibLTLIBRARIES
+
+-install-dvi: install-dvi-am
+-
+ install-exec-am:
+
+-install-html: install-html-am
+-
+ install-info: install-info-am
+
+ install-man: install-man5 install-man8
+
+-install-pdf: install-pdf-am
+-
+-install-ps: install-ps-am
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -706,29 +722,25 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-man uninstall-secureconfDATA \
++uninstall-am: uninstall-info-am uninstall-man uninstall-secureconfDATA \
+ uninstall-securelibLTLIBRARIES
+
+ uninstall-man: uninstall-man5 uninstall-man8
+
+-.MAKE: install-am install-strip
+-
+ .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
+ clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
+ distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+- install-data-am install-dvi install-dvi-am install-exec \
+- install-exec-am install-html install-html-am install-info \
++ install-data-am install-exec install-exec-am install-info \
+ install-info-am install-man install-man5 install-man8 \
+- install-pdf install-pdf-am install-ps install-ps-am \
+ install-secureconfDATA install-securelibLTLIBRARIES \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+- pdf pdf-am ps ps-am tags uninstall uninstall-am uninstall-man \
+- uninstall-man5 uninstall-man8 uninstall-secureconfDATA \
+- uninstall-securelibLTLIBRARIES
++ pdf pdf-am ps ps-am tags uninstall uninstall-am \
++ uninstall-info-am uninstall-man uninstall-man5 uninstall-man8 \
++ uninstall-secureconfDATA uninstall-securelibLTLIBRARIES
+
+
+ @ENABLE_REGENERATE_MAN_TRUE@README: pam_access.8.xml access.conf.5.xml
+Index: pam.debian/modules/pam_cracklib/Makefile.in
===================================================================
---- pam.deb.orig/modules/pam_cracklib/Makefile.in
-+++ pam.deb/modules/pam_cracklib/Makefile.in
+--- pam.debian.orig/modules/pam_cracklib/Makefile.in
++++ pam.debian/modules/pam_cracklib/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -68,7 +68,7 @@
+@@ -19,11 +19,15 @@
+ #
+
+
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -68,18 +72,17 @@
pam_cracklib_la_SOURCES = pam_cracklib.c
pam_cracklib_la_OBJECTS = pam_cracklib.lo
@HAVE_LIBCRACK_TRUE@am_pam_cracklib_la_rpath = -rpath $(securelibdir)
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -109,6 +109,7 @@
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
++ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++ $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+- $(LDFLAGS) -o $@
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = pam_cracklib.c
+ DIST_SOURCES = pam_cracklib.c
+ man8dir = $(mandir)/man8
+@@ -90,6 +93,8 @@
+ CTAGS = ctags
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AUTOCONF = @AUTOCONF@
+@@ -109,11 +114,16 @@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -7110,7 +8084,40 @@ Index: pam.deb/modules/pam_cracklib/Makefile.in
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -161,6 +162,7 @@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
++ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
++ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
++ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -122,7 +132,18 @@
+ GMSGFMT_015 = @GMSGFMT_015@
+ GREP = @GREP@
+ HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
+-INSTALL = @INSTALL@
++HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
++HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
++HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
++HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
++HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
++HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
++HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
++HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
++HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
++HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
++HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
++HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -157,10 +178,10 @@
+ LTLIBINTL = @LTLIBINTL@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+-MKDIR_P = @MKDIR_P@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
@@ -7118,99 +8125,329 @@ Index: pam.deb/modules/pam_cracklib/Makefile.in
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -176,6 +178,7 @@
- RANLIB = @RANLIB@
- SCONFIGDIR = @SCONFIGDIR@
- SECUREDIR = @SECUREDIR@
-+SED = @SED@
+@@ -179,6 +200,8 @@
+ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
++STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
++STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
STRIP = @STRIP@
-@@ -297,8 +300,8 @@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+@@ -192,13 +215,13 @@
+ XSLTPROC = @XSLTPROC@
+ YACC = @YACC@
+ YFLAGS = @YFLAGS@
+-abs_builddir = @abs_builddir@
+-abs_srcdir = @abs_srcdir@
+-abs_top_builddir = @abs_top_builddir@
+-abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -210,7 +233,6 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+-builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -241,11 +263,8 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+-srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_builddir = @top_builddir@
+-top_srcdir = @top_srcdir@
+ CLEANFILES = *~
+ EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_cracklib
+ man_MANS = pam_cracklib.8
+@@ -295,7 +314,7 @@
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+- test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
++ test -z "$(securelibdir)" || $(mkdir_p) "$(DESTDIR)$(securelibdir)"
@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \
-- $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \
- else :; fi; \
- done
+@@ -306,7 +325,7 @@
-@@ -306,8 +309,8 @@
+ uninstall-securelibLTLIBRARIES:
@$(NORMAL_UNINSTALL)
- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
+- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
++ @set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
+@@ -321,7 +340,7 @@
+ rm -f "$${dir}/so_locations"; \
done
+ pam_cracklib.la: $(pam_cracklib_la_OBJECTS) $(pam_cracklib_la_DEPENDENCIES)
+- $(LINK) $(am_pam_cracklib_la_rpath) $(pam_cracklib_la_OBJECTS) $(pam_cracklib_la_LIBADD) $(LIBS)
++ $(LINK) $(am_pam_cracklib_la_rpath) $(pam_cracklib_la_LDFLAGS) $(pam_cracklib_la_OBJECTS) $(pam_cracklib_la_LIBADD) $(LIBS)
- clean-securelibLTLIBRARIES:
-@@ -406,8 +409,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+@@ -332,22 +351,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_cracklib.Plo@am__quote@
-@@ -419,8 +422,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -430,13 +433,12 @@
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-Index: pam.deb/modules/pam_debug/Makefile.in
+ .c.o:
+-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
++@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+@@ -357,9 +376,13 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
++
++distclean-libtool:
++ -rm -f libtool
++uninstall-info-am:
+ install-man8: $(man8_MANS) $(man_MANS)
+ @$(NORMAL_INSTALL)
+- test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
++ test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
+ @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
+ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ for i in $$l2; do \
+@@ -452,9 +475,9 @@
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ check-TESTS: $(TESTS)
+- @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
++ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
+ srcdir=$(srcdir); export srcdir; \
+- list=' $(TESTS) '; \
++ list='$(TESTS)'; \
+ if test -n "$$list"; then \
+ for tst in $$list; do \
+ if test -f ./$$tst; then dir=./; \
+@@ -463,7 +486,7 @@
+ if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *$$ws$$tst$$ws*) \
++ *" $$tst "*) \
+ xpass=`expr $$xpass + 1`; \
+ failed=`expr $$failed + 1`; \
+ echo "XPASS: $$tst"; \
+@@ -475,7 +498,7 @@
+ elif test $$? -ne 77; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *$$ws$$tst$$ws*) \
++ *" $$tst "*) \
+ xfail=`expr $$xfail + 1`; \
+ echo "XFAIL: $$tst"; \
+ ;; \
+@@ -525,21 +548,22 @@
+ else :; fi
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- list='$(DISTFILES)'; \
+- dist_files=`for file in $$list; do echo $$file; done | \
+- sed -e "s|^$$srcdirstrip/||;t" \
+- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+- case $$dist_files in \
+- */*) $(MKDIR_P) `echo "$$dist_files" | \
+- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+- sort -u` ;; \
+- esac; \
+- for file in $$dist_files; do \
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
+ if test -d $$d/$$file; then \
+- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -556,7 +580,7 @@
+ all-am: Makefile $(LTLIBRARIES) $(MANS) $(DATA)
+ installdirs:
+ for dir in "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man8dir)"; do \
+- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
++ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
+ install: install-am
+ install-exec: install-exec-am
+@@ -592,7 +616,7 @@
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-tags
++ distclean-libtool distclean-tags
+
+ dvi: dvi-am
+
+@@ -606,20 +630,12 @@
+
+ install-data-am: install-man install-securelibLTLIBRARIES
+
+-install-dvi: install-dvi-am
+-
+ install-exec-am:
+
+-install-html: install-html-am
+-
+ install-info: install-info-am
+
+ install-man: install-man8
+
+-install-pdf: install-pdf-am
+-
+-install-ps: install-ps-am
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -640,27 +656,24 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-man uninstall-securelibLTLIBRARIES
++uninstall-am: uninstall-info-am uninstall-man \
++ uninstall-securelibLTLIBRARIES
+
+ uninstall-man: uninstall-man8
+
+-.MAKE: install-am install-strip
+-
+ .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
+ clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
+ distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+- install-data-am install-dvi install-dvi-am install-exec \
+- install-exec-am install-html install-html-am install-info \
+- install-info-am install-man install-man8 install-pdf \
+- install-pdf-am install-ps install-ps-am \
++ install-data-am install-exec install-exec-am install-info \
++ install-info-am install-man install-man8 \
+ install-securelibLTLIBRARIES install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+- tags uninstall uninstall-am uninstall-man uninstall-man8 \
+- uninstall-securelibLTLIBRARIES
++ tags uninstall uninstall-am uninstall-info-am uninstall-man \
++ uninstall-man8 uninstall-securelibLTLIBRARIES
+
+
+ @ENABLE_REGENERATE_MAN_TRUE@README: pam_cracklib.8.xml
+Index: pam.debian/modules/pam_debug/Makefile.in
===================================================================
---- pam.deb.orig/modules/pam_debug/Makefile.in
-+++ pam.deb/modules/pam_debug/Makefile.in
+--- pam.debian.orig/modules/pam_debug/Makefile.in
++++ pam.debian/modules/pam_debug/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -67,7 +67,7 @@
- pam_debug_la_LIBADD =
+@@ -19,11 +19,15 @@
+ #
+
+
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -67,18 +71,17 @@
+ pam_debug_la_DEPENDENCIES =
pam_debug_la_SOURCES = pam_debug.c
pam_debug_la_OBJECTS = pam_debug.lo
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -108,6 +108,7 @@
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
++ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++ $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+- $(LDFLAGS) -o $@
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = pam_debug.c
+ DIST_SOURCES = pam_debug.c
+ man8dir = $(mandir)/man8
+@@ -89,6 +92,8 @@
+ CTAGS = ctags
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AUTOCONF = @AUTOCONF@
+@@ -108,11 +113,16 @@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -7218,7 +8455,40 @@ Index: pam.deb/modules/pam_debug/Makefile.in
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -160,6 +161,7 @@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
++ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
++ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
++ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -121,7 +131,18 @@
+ GMSGFMT_015 = @GMSGFMT_015@
+ GREP = @GREP@
+ HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
+-INSTALL = @INSTALL@
++HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
++HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
++HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
++HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
++HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
++HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
++HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
++HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
++HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
++HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
++HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
++HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -156,10 +177,10 @@
+ LTLIBINTL = @LTLIBINTL@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+-MKDIR_P = @MKDIR_P@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
@@ -7226,99 +8496,329 @@ Index: pam.deb/modules/pam_debug/Makefile.in
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -175,6 +177,7 @@
- RANLIB = @RANLIB@
- SCONFIGDIR = @SCONFIGDIR@
- SECUREDIR = @SECUREDIR@
-+SED = @SED@
+@@ -178,6 +199,8 @@
+ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
++STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
++STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
STRIP = @STRIP@
-@@ -295,8 +298,8 @@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+@@ -191,13 +214,13 @@
+ XSLTPROC = @XSLTPROC@
+ YACC = @YACC@
+ YFLAGS = @YFLAGS@
+-abs_builddir = @abs_builddir@
+-abs_srcdir = @abs_srcdir@
+-abs_top_builddir = @abs_top_builddir@
+-abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -209,7 +232,6 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+-builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -240,11 +262,8 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+-srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_builddir = @top_builddir@
+-top_srcdir = @top_srcdir@
+ CLEANFILES = *~
+ EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_debug
+ man_MANS = pam_debug.8
+@@ -292,7 +311,7 @@
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+- test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
++ test -z "$(securelibdir)" || $(mkdir_p) "$(DESTDIR)$(securelibdir)"
@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \
-- $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \
- else :; fi; \
- done
+@@ -303,7 +322,7 @@
-@@ -304,8 +307,8 @@
+ uninstall-securelibLTLIBRARIES:
@$(NORMAL_UNINSTALL)
- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
+- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
++ @set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
+@@ -318,7 +337,7 @@
+ rm -f "$${dir}/so_locations"; \
done
+ pam_debug.la: $(pam_debug_la_OBJECTS) $(pam_debug_la_DEPENDENCIES)
+- $(LINK) -rpath $(securelibdir) $(pam_debug_la_OBJECTS) $(pam_debug_la_LIBADD) $(LIBS)
++ $(LINK) -rpath $(securelibdir) $(pam_debug_la_LDFLAGS) $(pam_debug_la_OBJECTS) $(pam_debug_la_LIBADD) $(LIBS)
- clean-securelibLTLIBRARIES:
-@@ -404,8 +407,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+@@ -329,22 +348,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_debug.Plo@am__quote@
-@@ -417,8 +420,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -428,13 +431,12 @@
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-Index: pam.deb/modules/pam_deny/Makefile.in
+ .c.o:
+-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
++@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+@@ -354,9 +373,13 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
++
++distclean-libtool:
++ -rm -f libtool
++uninstall-info-am:
+ install-man8: $(man8_MANS) $(man_MANS)
+ @$(NORMAL_INSTALL)
+- test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
++ test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
+ @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
+ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ for i in $$l2; do \
+@@ -449,9 +472,9 @@
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ check-TESTS: $(TESTS)
+- @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
++ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
+ srcdir=$(srcdir); export srcdir; \
+- list=' $(TESTS) '; \
++ list='$(TESTS)'; \
+ if test -n "$$list"; then \
+ for tst in $$list; do \
+ if test -f ./$$tst; then dir=./; \
+@@ -460,7 +483,7 @@
+ if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *$$ws$$tst$$ws*) \
++ *" $$tst "*) \
+ xpass=`expr $$xpass + 1`; \
+ failed=`expr $$failed + 1`; \
+ echo "XPASS: $$tst"; \
+@@ -472,7 +495,7 @@
+ elif test $$? -ne 77; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *$$ws$$tst$$ws*) \
++ *" $$tst "*) \
+ xfail=`expr $$xfail + 1`; \
+ echo "XFAIL: $$tst"; \
+ ;; \
+@@ -522,21 +545,22 @@
+ else :; fi
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- list='$(DISTFILES)'; \
+- dist_files=`for file in $$list; do echo $$file; done | \
+- sed -e "s|^$$srcdirstrip/||;t" \
+- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+- case $$dist_files in \
+- */*) $(MKDIR_P) `echo "$$dist_files" | \
+- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+- sort -u` ;; \
+- esac; \
+- for file in $$dist_files; do \
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
+ if test -d $$d/$$file; then \
+- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -553,7 +577,7 @@
+ all-am: Makefile $(LTLIBRARIES) $(MANS) $(DATA)
+ installdirs:
+ for dir in "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man8dir)"; do \
+- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
++ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
+ install: install-am
+ install-exec: install-exec-am
+@@ -589,7 +613,7 @@
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-tags
++ distclean-libtool distclean-tags
+
+ dvi: dvi-am
+
+@@ -603,20 +627,12 @@
+
+ install-data-am: install-man install-securelibLTLIBRARIES
+
+-install-dvi: install-dvi-am
+-
+ install-exec-am:
+
+-install-html: install-html-am
+-
+ install-info: install-info-am
+
+ install-man: install-man8
+
+-install-pdf: install-pdf-am
+-
+-install-ps: install-ps-am
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -637,27 +653,24 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-man uninstall-securelibLTLIBRARIES
++uninstall-am: uninstall-info-am uninstall-man \
++ uninstall-securelibLTLIBRARIES
+
+ uninstall-man: uninstall-man8
+
+-.MAKE: install-am install-strip
+-
+ .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
+ clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
+ distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+- install-data-am install-dvi install-dvi-am install-exec \
+- install-exec-am install-html install-html-am install-info \
+- install-info-am install-man install-man8 install-pdf \
+- install-pdf-am install-ps install-ps-am \
++ install-data-am install-exec install-exec-am install-info \
++ install-info-am install-man install-man8 \
+ install-securelibLTLIBRARIES install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+- tags uninstall uninstall-am uninstall-man uninstall-man8 \
+- uninstall-securelibLTLIBRARIES
++ tags uninstall uninstall-am uninstall-info-am uninstall-man \
++ uninstall-man8 uninstall-securelibLTLIBRARIES
+
+ @ENABLE_REGENERATE_MAN_TRUE@README: pam_debug.8.xml
+ @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
+Index: pam.debian/modules/pam_deny/Makefile.in
===================================================================
---- pam.deb.orig/modules/pam_deny/Makefile.in
-+++ pam.deb/modules/pam_deny/Makefile.in
+--- pam.debian.orig/modules/pam_deny/Makefile.in
++++ pam.debian/modules/pam_deny/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -67,7 +67,7 @@
- pam_deny_la_LIBADD =
+@@ -19,11 +19,15 @@
+ #
+
+
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -67,18 +71,17 @@
+ pam_deny_la_DEPENDENCIES =
pam_deny_la_SOURCES = pam_deny.c
pam_deny_la_OBJECTS = pam_deny.lo
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -108,6 +108,7 @@
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
++ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++ $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+- $(LDFLAGS) -o $@
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = pam_deny.c
+ DIST_SOURCES = pam_deny.c
+ man8dir = $(mandir)/man8
+@@ -89,6 +92,8 @@
+ CTAGS = ctags
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AUTOCONF = @AUTOCONF@
+@@ -108,11 +113,16 @@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -7326,7 +8826,40 @@ Index: pam.deb/modules/pam_deny/Makefile.in
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -160,6 +161,7 @@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
++ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
++ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
++ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -121,7 +131,18 @@
+ GMSGFMT_015 = @GMSGFMT_015@
+ GREP = @GREP@
+ HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
+-INSTALL = @INSTALL@
++HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
++HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
++HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
++HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
++HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
++HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
++HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
++HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
++HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
++HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
++HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
++HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -156,10 +177,10 @@
+ LTLIBINTL = @LTLIBINTL@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+-MKDIR_P = @MKDIR_P@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
@@ -7334,99 +8867,329 @@ Index: pam.deb/modules/pam_deny/Makefile.in
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -175,6 +177,7 @@
- RANLIB = @RANLIB@
- SCONFIGDIR = @SCONFIGDIR@
- SECUREDIR = @SECUREDIR@
-+SED = @SED@
+@@ -178,6 +199,8 @@
+ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
++STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
++STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
STRIP = @STRIP@
-@@ -295,8 +298,8 @@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+@@ -191,13 +214,13 @@
+ XSLTPROC = @XSLTPROC@
+ YACC = @YACC@
+ YFLAGS = @YFLAGS@
+-abs_builddir = @abs_builddir@
+-abs_srcdir = @abs_srcdir@
+-abs_top_builddir = @abs_top_builddir@
+-abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -209,7 +232,6 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+-builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -240,11 +262,8 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+-srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_builddir = @top_builddir@
+-top_srcdir = @top_srcdir@
+ CLEANFILES = *~
+ EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_deny
+ man_MANS = pam_deny.8
+@@ -292,7 +311,7 @@
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+- test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
++ test -z "$(securelibdir)" || $(mkdir_p) "$(DESTDIR)$(securelibdir)"
@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \
-- $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \
- else :; fi; \
- done
+@@ -303,7 +322,7 @@
-@@ -304,8 +307,8 @@
+ uninstall-securelibLTLIBRARIES:
@$(NORMAL_UNINSTALL)
- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
+- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
++ @set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
+@@ -318,7 +337,7 @@
+ rm -f "$${dir}/so_locations"; \
done
+ pam_deny.la: $(pam_deny_la_OBJECTS) $(pam_deny_la_DEPENDENCIES)
+- $(LINK) -rpath $(securelibdir) $(pam_deny_la_OBJECTS) $(pam_deny_la_LIBADD) $(LIBS)
++ $(LINK) -rpath $(securelibdir) $(pam_deny_la_LDFLAGS) $(pam_deny_la_OBJECTS) $(pam_deny_la_LIBADD) $(LIBS)
- clean-securelibLTLIBRARIES:
-@@ -404,8 +407,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+@@ -329,22 +348,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_deny.Plo@am__quote@
-@@ -417,8 +420,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -428,13 +431,12 @@
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-Index: pam.deb/modules/pam_echo/Makefile.in
+ .c.o:
+-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
++@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+@@ -354,9 +373,13 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
++
++distclean-libtool:
++ -rm -f libtool
++uninstall-info-am:
+ install-man8: $(man8_MANS) $(man_MANS)
+ @$(NORMAL_INSTALL)
+- test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
++ test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
+ @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
+ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ for i in $$l2; do \
+@@ -449,9 +472,9 @@
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ check-TESTS: $(TESTS)
+- @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
++ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
+ srcdir=$(srcdir); export srcdir; \
+- list=' $(TESTS) '; \
++ list='$(TESTS)'; \
+ if test -n "$$list"; then \
+ for tst in $$list; do \
+ if test -f ./$$tst; then dir=./; \
+@@ -460,7 +483,7 @@
+ if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *$$ws$$tst$$ws*) \
++ *" $$tst "*) \
+ xpass=`expr $$xpass + 1`; \
+ failed=`expr $$failed + 1`; \
+ echo "XPASS: $$tst"; \
+@@ -472,7 +495,7 @@
+ elif test $$? -ne 77; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *$$ws$$tst$$ws*) \
++ *" $$tst "*) \
+ xfail=`expr $$xfail + 1`; \
+ echo "XFAIL: $$tst"; \
+ ;; \
+@@ -522,21 +545,22 @@
+ else :; fi
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- list='$(DISTFILES)'; \
+- dist_files=`for file in $$list; do echo $$file; done | \
+- sed -e "s|^$$srcdirstrip/||;t" \
+- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+- case $$dist_files in \
+- */*) $(MKDIR_P) `echo "$$dist_files" | \
+- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+- sort -u` ;; \
+- esac; \
+- for file in $$dist_files; do \
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
+ if test -d $$d/$$file; then \
+- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -553,7 +577,7 @@
+ all-am: Makefile $(LTLIBRARIES) $(MANS) $(DATA)
+ installdirs:
+ for dir in "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man8dir)"; do \
+- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
++ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
+ install: install-am
+ install-exec: install-exec-am
+@@ -589,7 +613,7 @@
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-tags
++ distclean-libtool distclean-tags
+
+ dvi: dvi-am
+
+@@ -603,20 +627,12 @@
+
+ install-data-am: install-man install-securelibLTLIBRARIES
+
+-install-dvi: install-dvi-am
+-
+ install-exec-am:
+
+-install-html: install-html-am
+-
+ install-info: install-info-am
+
+ install-man: install-man8
+
+-install-pdf: install-pdf-am
+-
+-install-ps: install-ps-am
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -637,27 +653,24 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-man uninstall-securelibLTLIBRARIES
++uninstall-am: uninstall-info-am uninstall-man \
++ uninstall-securelibLTLIBRARIES
+
+ uninstall-man: uninstall-man8
+
+-.MAKE: install-am install-strip
+-
+ .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
+ clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
+ distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+- install-data-am install-dvi install-dvi-am install-exec \
+- install-exec-am install-html install-html-am install-info \
+- install-info-am install-man install-man8 install-pdf \
+- install-pdf-am install-ps install-ps-am \
++ install-data-am install-exec install-exec-am install-info \
++ install-info-am install-man install-man8 \
+ install-securelibLTLIBRARIES install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+- tags uninstall uninstall-am uninstall-man uninstall-man8 \
+- uninstall-securelibLTLIBRARIES
++ tags uninstall uninstall-am uninstall-info-am uninstall-man \
++ uninstall-man8 uninstall-securelibLTLIBRARIES
+
+
+ @ENABLE_REGENERATE_MAN_TRUE@README: pam_deny.8.xml
+Index: pam.debian/modules/pam_echo/Makefile.in
===================================================================
---- pam.deb.orig/modules/pam_echo/Makefile.in
-+++ pam.deb/modules/pam_echo/Makefile.in
+--- pam.debian.orig/modules/pam_echo/Makefile.in
++++ pam.debian/modules/pam_echo/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -67,7 +67,7 @@
- pam_echo_la_LIBADD =
+@@ -19,11 +19,15 @@
+ #
+
+
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -67,18 +71,17 @@
+ pam_echo_la_DEPENDENCIES =
pam_echo_la_SOURCES = pam_echo.c
pam_echo_la_OBJECTS = pam_echo.lo
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -108,6 +108,7 @@
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
++ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++ $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+- $(LDFLAGS) -o $@
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = pam_echo.c
+ DIST_SOURCES = pam_echo.c
+ man8dir = $(mandir)/man8
+@@ -89,6 +92,8 @@
+ CTAGS = ctags
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AUTOCONF = @AUTOCONF@
+@@ -108,11 +113,16 @@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -7434,7 +9197,40 @@ Index: pam.deb/modules/pam_echo/Makefile.in
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -160,6 +161,7 @@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
++ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
++ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
++ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -121,7 +131,18 @@
+ GMSGFMT_015 = @GMSGFMT_015@
+ GREP = @GREP@
+ HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
+-INSTALL = @INSTALL@
++HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
++HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
++HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
++HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
++HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
++HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
++HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
++HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
++HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
++HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
++HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
++HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -156,10 +177,10 @@
+ LTLIBINTL = @LTLIBINTL@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+-MKDIR_P = @MKDIR_P@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
@@ -7442,99 +9238,329 @@ Index: pam.deb/modules/pam_echo/Makefile.in
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -175,6 +177,7 @@
- RANLIB = @RANLIB@
- SCONFIGDIR = @SCONFIGDIR@
- SECUREDIR = @SECUREDIR@
-+SED = @SED@
+@@ -178,6 +199,8 @@
+ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
++STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
++STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
STRIP = @STRIP@
-@@ -295,8 +298,8 @@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+@@ -191,13 +214,13 @@
+ XSLTPROC = @XSLTPROC@
+ YACC = @YACC@
+ YFLAGS = @YFLAGS@
+-abs_builddir = @abs_builddir@
+-abs_srcdir = @abs_srcdir@
+-abs_top_builddir = @abs_top_builddir@
+-abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -209,7 +232,6 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+-builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -240,11 +262,8 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+-srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_builddir = @top_builddir@
+-top_srcdir = @top_srcdir@
+ CLEANFILES = *~
+ EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_echo
+ man_MANS = pam_echo.8
+@@ -292,7 +311,7 @@
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+- test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
++ test -z "$(securelibdir)" || $(mkdir_p) "$(DESTDIR)$(securelibdir)"
@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \
-- $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \
- else :; fi; \
- done
+@@ -303,7 +322,7 @@
-@@ -304,8 +307,8 @@
+ uninstall-securelibLTLIBRARIES:
@$(NORMAL_UNINSTALL)
- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
+- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
++ @set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
+@@ -318,7 +337,7 @@
+ rm -f "$${dir}/so_locations"; \
done
+ pam_echo.la: $(pam_echo_la_OBJECTS) $(pam_echo_la_DEPENDENCIES)
+- $(LINK) -rpath $(securelibdir) $(pam_echo_la_OBJECTS) $(pam_echo_la_LIBADD) $(LIBS)
++ $(LINK) -rpath $(securelibdir) $(pam_echo_la_LDFLAGS) $(pam_echo_la_OBJECTS) $(pam_echo_la_LIBADD) $(LIBS)
- clean-securelibLTLIBRARIES:
-@@ -404,8 +407,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+@@ -329,22 +348,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_echo.Plo@am__quote@
-@@ -417,8 +420,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -428,13 +431,12 @@
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-Index: pam.deb/modules/pam_env/Makefile.in
+ .c.o:
+-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
++@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+@@ -354,9 +373,13 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
++
++distclean-libtool:
++ -rm -f libtool
++uninstall-info-am:
+ install-man8: $(man8_MANS) $(man_MANS)
+ @$(NORMAL_INSTALL)
+- test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
++ test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
+ @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
+ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ for i in $$l2; do \
+@@ -449,9 +472,9 @@
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ check-TESTS: $(TESTS)
+- @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
++ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
+ srcdir=$(srcdir); export srcdir; \
+- list=' $(TESTS) '; \
++ list='$(TESTS)'; \
+ if test -n "$$list"; then \
+ for tst in $$list; do \
+ if test -f ./$$tst; then dir=./; \
+@@ -460,7 +483,7 @@
+ if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *$$ws$$tst$$ws*) \
++ *" $$tst "*) \
+ xpass=`expr $$xpass + 1`; \
+ failed=`expr $$failed + 1`; \
+ echo "XPASS: $$tst"; \
+@@ -472,7 +495,7 @@
+ elif test $$? -ne 77; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *$$ws$$tst$$ws*) \
++ *" $$tst "*) \
+ xfail=`expr $$xfail + 1`; \
+ echo "XFAIL: $$tst"; \
+ ;; \
+@@ -522,21 +545,22 @@
+ else :; fi
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- list='$(DISTFILES)'; \
+- dist_files=`for file in $$list; do echo $$file; done | \
+- sed -e "s|^$$srcdirstrip/||;t" \
+- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+- case $$dist_files in \
+- */*) $(MKDIR_P) `echo "$$dist_files" | \
+- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+- sort -u` ;; \
+- esac; \
+- for file in $$dist_files; do \
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
+ if test -d $$d/$$file; then \
+- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -553,7 +577,7 @@
+ all-am: Makefile $(LTLIBRARIES) $(MANS) $(DATA)
+ installdirs:
+ for dir in "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man8dir)"; do \
+- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
++ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
+ install: install-am
+ install-exec: install-exec-am
+@@ -589,7 +613,7 @@
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-tags
++ distclean-libtool distclean-tags
+
+ dvi: dvi-am
+
+@@ -603,20 +627,12 @@
+
+ install-data-am: install-man install-securelibLTLIBRARIES
+
+-install-dvi: install-dvi-am
+-
+ install-exec-am:
+
+-install-html: install-html-am
+-
+ install-info: install-info-am
+
+ install-man: install-man8
+
+-install-pdf: install-pdf-am
+-
+-install-ps: install-ps-am
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -637,27 +653,24 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-man uninstall-securelibLTLIBRARIES
++uninstall-am: uninstall-info-am uninstall-man \
++ uninstall-securelibLTLIBRARIES
+
+ uninstall-man: uninstall-man8
+
+-.MAKE: install-am install-strip
+-
+ .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
+ clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
+ distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+- install-data-am install-dvi install-dvi-am install-exec \
+- install-exec-am install-html install-html-am install-info \
+- install-info-am install-man install-man8 install-pdf \
+- install-pdf-am install-ps install-ps-am \
++ install-data-am install-exec install-exec-am install-info \
++ install-info-am install-man install-man8 \
+ install-securelibLTLIBRARIES install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+- tags uninstall uninstall-am uninstall-man uninstall-man8 \
+- uninstall-securelibLTLIBRARIES
++ tags uninstall uninstall-am uninstall-info-am uninstall-man \
++ uninstall-man8 uninstall-securelibLTLIBRARIES
+
+ @ENABLE_REGENERATE_MAN_TRUE@README: pam_echo.8.xml
+ @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
+Index: pam.debian/modules/pam_env/Makefile.in
===================================================================
---- pam.deb.orig/modules/pam_env/Makefile.in
-+++ pam.deb/modules/pam_env/Makefile.in
+--- pam.debian.orig/modules/pam_env/Makefile.in
++++ pam.debian/modules/pam_env/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -69,7 +69,7 @@
- pam_env_la_LIBADD =
+@@ -19,11 +19,15 @@
+ #
+
+
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -69,18 +73,17 @@
+ pam_env_la_DEPENDENCIES =
pam_env_la_SOURCES = pam_env.c
pam_env_la_OBJECTS = pam_env.lo
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -113,6 +113,7 @@
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
++ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++ $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+- $(LDFLAGS) -o $@
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = pam_env.c
+ DIST_SOURCES = pam_env.c
+ man5dir = $(mandir)/man5
+@@ -94,6 +97,8 @@
+ CTAGS = ctags
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AUTOCONF = @AUTOCONF@
+@@ -113,11 +118,16 @@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -7542,7 +9568,40 @@ Index: pam.deb/modules/pam_env/Makefile.in
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -165,6 +166,7 @@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
++ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
++ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
++ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -126,7 +136,18 @@
+ GMSGFMT_015 = @GMSGFMT_015@
+ GREP = @GREP@
+ HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
+-INSTALL = @INSTALL@
++HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
++HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
++HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
++HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
++HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
++HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
++HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
++HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
++HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
++HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
++HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
++HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -161,10 +182,10 @@
+ LTLIBINTL = @LTLIBINTL@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+-MKDIR_P = @MKDIR_P@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
@@ -7550,99 +9609,358 @@ Index: pam.deb/modules/pam_env/Makefile.in
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -180,6 +182,7 @@
- RANLIB = @RANLIB@
- SCONFIGDIR = @SCONFIGDIR@
- SECUREDIR = @SECUREDIR@
-+SED = @SED@
+@@ -183,6 +204,8 @@
+ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
++STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
++STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
STRIP = @STRIP@
-@@ -304,8 +307,8 @@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+@@ -196,13 +219,13 @@
+ XSLTPROC = @XSLTPROC@
+ YACC = @YACC@
+ YFLAGS = @YFLAGS@
+-abs_builddir = @abs_builddir@
+-abs_srcdir = @abs_srcdir@
+-abs_top_builddir = @abs_top_builddir@
+-abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -214,7 +237,6 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+-builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -245,11 +267,8 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+-srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_builddir = @top_builddir@
+-top_srcdir = @top_srcdir@
+ CLEANFILES = *~
+ EXTRA_DIST = README pam_env.conf $(MANS) $(XMLS) tst-pam_env environment
+ man_MANS = pam_env.conf.5 pam_env.8
+@@ -301,7 +320,7 @@
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+- test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
++ test -z "$(securelibdir)" || $(mkdir_p) "$(DESTDIR)$(securelibdir)"
@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \
-- $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \
- else :; fi; \
- done
+@@ -312,7 +331,7 @@
-@@ -313,8 +316,8 @@
+ uninstall-securelibLTLIBRARIES:
@$(NORMAL_UNINSTALL)
- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
+- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
++ @set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
+@@ -327,7 +346,7 @@
+ rm -f "$${dir}/so_locations"; \
done
+ pam_env.la: $(pam_env_la_OBJECTS) $(pam_env_la_DEPENDENCIES)
+- $(LINK) -rpath $(securelibdir) $(pam_env_la_OBJECTS) $(pam_env_la_LIBADD) $(LIBS)
++ $(LINK) -rpath $(securelibdir) $(pam_env_la_LDFLAGS) $(pam_env_la_OBJECTS) $(pam_env_la_LIBADD) $(LIBS)
- clean-securelibLTLIBRARIES:
-@@ -492,8 +495,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+@@ -338,22 +357,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_env.Plo@am__quote@
-@@ -505,8 +508,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -516,13 +519,12 @@
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-Index: pam.deb/modules/pam_exec/Makefile.in
+ .c.o:
+-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
++@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+@@ -363,9 +382,13 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
++
++distclean-libtool:
++ -rm -f libtool
++uninstall-info-am:
+ install-man5: $(man5_MANS) $(man_MANS)
+ @$(NORMAL_INSTALL)
+- test -z "$(man5dir)" || $(MKDIR_P) "$(DESTDIR)$(man5dir)"
++ test -z "$(man5dir)" || $(mkdir_p) "$(DESTDIR)$(man5dir)"
+ @list='$(man5_MANS) $(dist_man5_MANS) $(nodist_man5_MANS)'; \
+ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ for i in $$l2; do \
+@@ -410,7 +433,7 @@
+ done
+ install-man8: $(man8_MANS) $(man_MANS)
+ @$(NORMAL_INSTALL)
+- test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
++ test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
+ @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
+ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ for i in $$l2; do \
+@@ -455,7 +478,7 @@
+ done
+ install-secureconfDATA: $(secureconf_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(secureconfdir)" || $(MKDIR_P) "$(DESTDIR)$(secureconfdir)"
++ test -z "$(secureconfdir)" || $(mkdir_p) "$(DESTDIR)$(secureconfdir)"
+ @list='$(secureconf_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+@@ -472,7 +495,7 @@
+ done
+ install-sysconfDATA: $(sysconf_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(sysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)"
++ test -z "$(sysconfdir)" || $(mkdir_p) "$(DESTDIR)$(sysconfdir)"
+ @list='$(sysconf_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+@@ -537,9 +560,9 @@
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ check-TESTS: $(TESTS)
+- @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
++ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
+ srcdir=$(srcdir); export srcdir; \
+- list=' $(TESTS) '; \
++ list='$(TESTS)'; \
+ if test -n "$$list"; then \
+ for tst in $$list; do \
+ if test -f ./$$tst; then dir=./; \
+@@ -548,7 +571,7 @@
+ if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *$$ws$$tst$$ws*) \
++ *" $$tst "*) \
+ xpass=`expr $$xpass + 1`; \
+ failed=`expr $$failed + 1`; \
+ echo "XPASS: $$tst"; \
+@@ -560,7 +583,7 @@
+ elif test $$? -ne 77; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *$$ws$$tst$$ws*) \
++ *" $$tst "*) \
+ xfail=`expr $$xfail + 1`; \
+ echo "XFAIL: $$tst"; \
+ ;; \
+@@ -610,21 +633,22 @@
+ else :; fi
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- list='$(DISTFILES)'; \
+- dist_files=`for file in $$list; do echo $$file; done | \
+- sed -e "s|^$$srcdirstrip/||;t" \
+- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+- case $$dist_files in \
+- */*) $(MKDIR_P) `echo "$$dist_files" | \
+- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+- sort -u` ;; \
+- esac; \
+- for file in $$dist_files; do \
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
+ if test -d $$d/$$file; then \
+- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -641,7 +665,7 @@
+ all-am: Makefile $(LTLIBRARIES) $(MANS) $(DATA)
+ installdirs:
+ for dir in "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(secureconfdir)" "$(DESTDIR)$(sysconfdir)"; do \
+- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
++ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
+ install: install-am
+ install-exec: install-exec-am
+@@ -677,7 +701,7 @@
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-tags
++ distclean-libtool distclean-tags
+
+ dvi: dvi-am
+
+@@ -692,20 +716,12 @@
+ install-data-am: install-man install-secureconfDATA \
+ install-securelibLTLIBRARIES
+
+-install-dvi: install-dvi-am
+-
+ install-exec-am: install-sysconfDATA
+
+-install-html: install-html-am
+-
+ install-info: install-info-am
+
+ install-man: install-man5 install-man8
+
+-install-pdf: install-pdf-am
+-
+-install-ps: install-ps-am
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -726,30 +742,26 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-man uninstall-secureconfDATA \
++uninstall-am: uninstall-info-am uninstall-man uninstall-secureconfDATA \
+ uninstall-securelibLTLIBRARIES uninstall-sysconfDATA
+
+ uninstall-man: uninstall-man5 uninstall-man8
+
+-.MAKE: install-am install-strip
+-
+ .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
+ clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
+ distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+- install-data-am install-dvi install-dvi-am install-exec \
+- install-exec-am install-html install-html-am install-info \
++ install-data-am install-exec install-exec-am install-info \
+ install-info-am install-man install-man5 install-man8 \
+- install-pdf install-pdf-am install-ps install-ps-am \
+ install-secureconfDATA install-securelibLTLIBRARIES \
+ install-strip install-sysconfDATA installcheck installcheck-am \
+ installdirs maintainer-clean maintainer-clean-generic \
+ mostlyclean mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+- uninstall-am uninstall-man uninstall-man5 uninstall-man8 \
+- uninstall-secureconfDATA uninstall-securelibLTLIBRARIES \
+- uninstall-sysconfDATA
++ uninstall-am uninstall-info-am uninstall-man uninstall-man5 \
++ uninstall-man8 uninstall-secureconfDATA \
++ uninstall-securelibLTLIBRARIES uninstall-sysconfDATA
+
+ @ENABLE_REGENERATE_MAN_TRUE@README: pam_env.8.xml pam_env.conf.5.xml
+ @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
+Index: pam.debian/modules/pam_exec/Makefile.in
===================================================================
---- pam.deb.orig/modules/pam_exec/Makefile.in
-+++ pam.deb/modules/pam_exec/Makefile.in
+--- pam.debian.orig/modules/pam_exec/Makefile.in
++++ pam.debian/modules/pam_exec/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -67,7 +67,7 @@
- pam_exec_la_LIBADD =
+@@ -19,11 +19,15 @@
+ #
+
+
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -67,18 +71,17 @@
+ pam_exec_la_DEPENDENCIES =
pam_exec_la_SOURCES = pam_exec.c
pam_exec_la_OBJECTS = pam_exec.lo
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -108,6 +108,7 @@
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
++ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++ $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+- $(LDFLAGS) -o $@
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = pam_exec.c
+ DIST_SOURCES = pam_exec.c
+ man8dir = $(mandir)/man8
+@@ -89,6 +92,8 @@
+ CTAGS = ctags
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AUTOCONF = @AUTOCONF@
+@@ -108,11 +113,16 @@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -7650,7 +9968,40 @@ Index: pam.deb/modules/pam_exec/Makefile.in
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -160,6 +161,7 @@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
++ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
++ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
++ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -121,7 +131,18 @@
+ GMSGFMT_015 = @GMSGFMT_015@
+ GREP = @GREP@
+ HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
+-INSTALL = @INSTALL@
++HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
++HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
++HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
++HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
++HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
++HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
++HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
++HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
++HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
++HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
++HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
++HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -156,10 +177,10 @@
+ LTLIBINTL = @LTLIBINTL@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+-MKDIR_P = @MKDIR_P@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
@@ -7658,99 +10009,329 @@ Index: pam.deb/modules/pam_exec/Makefile.in
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -175,6 +177,7 @@
- RANLIB = @RANLIB@
- SCONFIGDIR = @SCONFIGDIR@
- SECUREDIR = @SECUREDIR@
-+SED = @SED@
+@@ -178,6 +199,8 @@
+ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
++STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
++STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
STRIP = @STRIP@
-@@ -295,8 +298,8 @@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+@@ -191,13 +214,13 @@
+ XSLTPROC = @XSLTPROC@
+ YACC = @YACC@
+ YFLAGS = @YFLAGS@
+-abs_builddir = @abs_builddir@
+-abs_srcdir = @abs_srcdir@
+-abs_top_builddir = @abs_top_builddir@
+-abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -209,7 +232,6 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+-builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -240,11 +262,8 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+-srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_builddir = @top_builddir@
+-top_srcdir = @top_srcdir@
+ CLEANFILES = *~
+ EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_exec
+ man_MANS = pam_exec.8
+@@ -292,7 +311,7 @@
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+- test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
++ test -z "$(securelibdir)" || $(mkdir_p) "$(DESTDIR)$(securelibdir)"
@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \
-- $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \
- else :; fi; \
- done
+@@ -303,7 +322,7 @@
-@@ -304,8 +307,8 @@
+ uninstall-securelibLTLIBRARIES:
@$(NORMAL_UNINSTALL)
- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
+- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
++ @set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
+@@ -318,7 +337,7 @@
+ rm -f "$${dir}/so_locations"; \
done
+ pam_exec.la: $(pam_exec_la_OBJECTS) $(pam_exec_la_DEPENDENCIES)
+- $(LINK) -rpath $(securelibdir) $(pam_exec_la_OBJECTS) $(pam_exec_la_LIBADD) $(LIBS)
++ $(LINK) -rpath $(securelibdir) $(pam_exec_la_LDFLAGS) $(pam_exec_la_OBJECTS) $(pam_exec_la_LIBADD) $(LIBS)
- clean-securelibLTLIBRARIES:
-@@ -404,8 +407,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+@@ -329,22 +348,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_exec.Plo@am__quote@
-@@ -417,8 +420,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -428,13 +431,12 @@
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-Index: pam.deb/modules/pam_faildelay/Makefile.in
+ .c.o:
+-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
++@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+@@ -354,9 +373,13 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
++
++distclean-libtool:
++ -rm -f libtool
++uninstall-info-am:
+ install-man8: $(man8_MANS) $(man_MANS)
+ @$(NORMAL_INSTALL)
+- test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
++ test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
+ @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
+ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ for i in $$l2; do \
+@@ -449,9 +472,9 @@
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ check-TESTS: $(TESTS)
+- @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
++ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
+ srcdir=$(srcdir); export srcdir; \
+- list=' $(TESTS) '; \
++ list='$(TESTS)'; \
+ if test -n "$$list"; then \
+ for tst in $$list; do \
+ if test -f ./$$tst; then dir=./; \
+@@ -460,7 +483,7 @@
+ if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *$$ws$$tst$$ws*) \
++ *" $$tst "*) \
+ xpass=`expr $$xpass + 1`; \
+ failed=`expr $$failed + 1`; \
+ echo "XPASS: $$tst"; \
+@@ -472,7 +495,7 @@
+ elif test $$? -ne 77; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *$$ws$$tst$$ws*) \
++ *" $$tst "*) \
+ xfail=`expr $$xfail + 1`; \
+ echo "XFAIL: $$tst"; \
+ ;; \
+@@ -522,21 +545,22 @@
+ else :; fi
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- list='$(DISTFILES)'; \
+- dist_files=`for file in $$list; do echo $$file; done | \
+- sed -e "s|^$$srcdirstrip/||;t" \
+- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+- case $$dist_files in \
+- */*) $(MKDIR_P) `echo "$$dist_files" | \
+- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+- sort -u` ;; \
+- esac; \
+- for file in $$dist_files; do \
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
+ if test -d $$d/$$file; then \
+- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -553,7 +577,7 @@
+ all-am: Makefile $(LTLIBRARIES) $(MANS) $(DATA)
+ installdirs:
+ for dir in "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man8dir)"; do \
+- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
++ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
+ install: install-am
+ install-exec: install-exec-am
+@@ -589,7 +613,7 @@
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-tags
++ distclean-libtool distclean-tags
+
+ dvi: dvi-am
+
+@@ -603,20 +627,12 @@
+
+ install-data-am: install-man install-securelibLTLIBRARIES
+
+-install-dvi: install-dvi-am
+-
+ install-exec-am:
+
+-install-html: install-html-am
+-
+ install-info: install-info-am
+
+ install-man: install-man8
+
+-install-pdf: install-pdf-am
+-
+-install-ps: install-ps-am
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -637,27 +653,24 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-man uninstall-securelibLTLIBRARIES
++uninstall-am: uninstall-info-am uninstall-man \
++ uninstall-securelibLTLIBRARIES
+
+ uninstall-man: uninstall-man8
+
+-.MAKE: install-am install-strip
+-
+ .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
+ clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
+ distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+- install-data-am install-dvi install-dvi-am install-exec \
+- install-exec-am install-html install-html-am install-info \
+- install-info-am install-man install-man8 install-pdf \
+- install-pdf-am install-ps install-ps-am \
++ install-data-am install-exec install-exec-am install-info \
++ install-info-am install-man install-man8 \
+ install-securelibLTLIBRARIES install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+- tags uninstall uninstall-am uninstall-man uninstall-man8 \
+- uninstall-securelibLTLIBRARIES
++ tags uninstall uninstall-am uninstall-info-am uninstall-man \
++ uninstall-man8 uninstall-securelibLTLIBRARIES
+
+
+ @ENABLE_REGENERATE_MAN_TRUE@README: pam_exec.8.xml
+Index: pam.debian/modules/pam_faildelay/Makefile.in
===================================================================
---- pam.deb.orig/modules/pam_faildelay/Makefile.in
-+++ pam.deb/modules/pam_faildelay/Makefile.in
+--- pam.debian.orig/modules/pam_faildelay/Makefile.in
++++ pam.debian/modules/pam_faildelay/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -67,7 +67,7 @@
- pam_faildelay_la_LIBADD =
+@@ -19,11 +19,15 @@
+ #
+
+
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -67,18 +71,17 @@
+ pam_faildelay_la_DEPENDENCIES =
pam_faildelay_la_SOURCES = pam_faildelay.c
pam_faildelay_la_OBJECTS = pam_faildelay.lo
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -108,6 +108,7 @@
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
++ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++ $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+- $(LDFLAGS) -o $@
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = pam_faildelay.c
+ DIST_SOURCES = pam_faildelay.c
+ man8dir = $(mandir)/man8
+@@ -89,6 +92,8 @@
+ CTAGS = ctags
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AUTOCONF = @AUTOCONF@
+@@ -108,11 +113,16 @@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -7758,7 +10339,40 @@ Index: pam.deb/modules/pam_faildelay/Makefile.in
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -160,6 +161,7 @@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
++ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
++ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
++ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -121,7 +131,18 @@
+ GMSGFMT_015 = @GMSGFMT_015@
+ GREP = @GREP@
+ HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
+-INSTALL = @INSTALL@
++HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
++HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
++HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
++HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
++HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
++HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
++HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
++HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
++HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
++HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
++HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
++HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -156,10 +177,10 @@
+ LTLIBINTL = @LTLIBINTL@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+-MKDIR_P = @MKDIR_P@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
@@ -7766,99 +10380,348 @@ Index: pam.deb/modules/pam_faildelay/Makefile.in
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -175,6 +177,7 @@
- RANLIB = @RANLIB@
- SCONFIGDIR = @SCONFIGDIR@
- SECUREDIR = @SECUREDIR@
-+SED = @SED@
+@@ -178,6 +199,8 @@
+ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
++STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
++STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
STRIP = @STRIP@
-@@ -295,8 +298,8 @@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+@@ -191,13 +214,13 @@
+ XSLTPROC = @XSLTPROC@
+ YACC = @YACC@
+ YFLAGS = @YFLAGS@
+-abs_builddir = @abs_builddir@
+-abs_srcdir = @abs_srcdir@
+-abs_top_builddir = @abs_top_builddir@
+-abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -209,7 +232,6 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+-builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -240,11 +262,8 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+-srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_builddir = @top_builddir@
+-top_srcdir = @top_srcdir@
+ CLEANFILES = *~
+ EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_faildelay
+ man_MANS = pam_faildelay.8
+@@ -292,7 +311,7 @@
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+- test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
++ test -z "$(securelibdir)" || $(mkdir_p) "$(DESTDIR)$(securelibdir)"
@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \
-- $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \
- else :; fi; \
- done
+@@ -303,7 +322,7 @@
-@@ -304,8 +307,8 @@
+ uninstall-securelibLTLIBRARIES:
@$(NORMAL_UNINSTALL)
- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
+- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
++ @set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
+@@ -318,7 +337,7 @@
+ rm -f "$${dir}/so_locations"; \
done
+ pam_faildelay.la: $(pam_faildelay_la_OBJECTS) $(pam_faildelay_la_DEPENDENCIES)
+- $(LINK) -rpath $(securelibdir) $(pam_faildelay_la_OBJECTS) $(pam_faildelay_la_LIBADD) $(LIBS)
++ $(LINK) -rpath $(securelibdir) $(pam_faildelay_la_LDFLAGS) $(pam_faildelay_la_OBJECTS) $(pam_faildelay_la_LIBADD) $(LIBS)
- clean-securelibLTLIBRARIES:
-@@ -404,8 +407,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+@@ -329,22 +348,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_faildelay.Plo@am__quote@
-@@ -417,8 +420,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -428,13 +431,12 @@
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-Index: pam.deb/modules/pam_filter/Makefile.in
+ .c.o:
+-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
++@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+@@ -354,9 +373,13 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
++
++distclean-libtool:
++ -rm -f libtool
++uninstall-info-am:
+ install-man8: $(man8_MANS) $(man_MANS)
+ @$(NORMAL_INSTALL)
+- test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
++ test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
+ @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
+ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ for i in $$l2; do \
+@@ -449,9 +472,9 @@
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ check-TESTS: $(TESTS)
+- @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
++ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
+ srcdir=$(srcdir); export srcdir; \
+- list=' $(TESTS) '; \
++ list='$(TESTS)'; \
+ if test -n "$$list"; then \
+ for tst in $$list; do \
+ if test -f ./$$tst; then dir=./; \
+@@ -460,7 +483,7 @@
+ if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *$$ws$$tst$$ws*) \
++ *" $$tst "*) \
+ xpass=`expr $$xpass + 1`; \
+ failed=`expr $$failed + 1`; \
+ echo "XPASS: $$tst"; \
+@@ -472,7 +495,7 @@
+ elif test $$? -ne 77; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *$$ws$$tst$$ws*) \
++ *" $$tst "*) \
+ xfail=`expr $$xfail + 1`; \
+ echo "XFAIL: $$tst"; \
+ ;; \
+@@ -522,21 +545,22 @@
+ else :; fi
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- list='$(DISTFILES)'; \
+- dist_files=`for file in $$list; do echo $$file; done | \
+- sed -e "s|^$$srcdirstrip/||;t" \
+- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+- case $$dist_files in \
+- */*) $(MKDIR_P) `echo "$$dist_files" | \
+- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+- sort -u` ;; \
+- esac; \
+- for file in $$dist_files; do \
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
+ if test -d $$d/$$file; then \
+- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -553,7 +577,7 @@
+ all-am: Makefile $(LTLIBRARIES) $(MANS) $(DATA)
+ installdirs:
+ for dir in "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man8dir)"; do \
+- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
++ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
+ install: install-am
+ install-exec: install-exec-am
+@@ -589,7 +613,7 @@
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-tags
++ distclean-libtool distclean-tags
+
+ dvi: dvi-am
+
+@@ -603,20 +627,12 @@
+
+ install-data-am: install-man install-securelibLTLIBRARIES
+
+-install-dvi: install-dvi-am
+-
+ install-exec-am:
+
+-install-html: install-html-am
+-
+ install-info: install-info-am
+
+ install-man: install-man8
+
+-install-pdf: install-pdf-am
+-
+-install-ps: install-ps-am
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -637,27 +653,24 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-man uninstall-securelibLTLIBRARIES
++uninstall-am: uninstall-info-am uninstall-man \
++ uninstall-securelibLTLIBRARIES
+
+ uninstall-man: uninstall-man8
+
+-.MAKE: install-am install-strip
+-
+ .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
+ clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
+ distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+- install-data-am install-dvi install-dvi-am install-exec \
+- install-exec-am install-html install-html-am install-info \
+- install-info-am install-man install-man8 install-pdf \
+- install-pdf-am install-ps install-ps-am \
++ install-data-am install-exec install-exec-am install-info \
++ install-info-am install-man install-man8 \
+ install-securelibLTLIBRARIES install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+- tags uninstall uninstall-am uninstall-man uninstall-man8 \
+- uninstall-securelibLTLIBRARIES
++ tags uninstall uninstall-am uninstall-info-am uninstall-man \
++ uninstall-man8 uninstall-securelibLTLIBRARIES
+
+ @ENABLE_REGENERATE_MAN_TRUE@README: pam_faildelay.8.xml
+ @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
+Index: pam.debian/modules/pam_filter/Makefile.in
===================================================================
---- pam.deb.orig/modules/pam_filter/Makefile.in
-+++ pam.deb/modules/pam_filter/Makefile.in
+--- pam.debian.orig/modules/pam_filter/Makefile.in
++++ pam.debian/modules/pam_filter/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -70,7 +70,7 @@
- pam_filter_la_LIBADD =
+@@ -20,11 +20,15 @@
+
+
+
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -70,40 +74,38 @@
+ pam_filter_la_DEPENDENCIES =
pam_filter_la_SOURCES = pam_filter.c
pam_filter_la_OBJECTS = pam_filter.lo
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -123,6 +123,7 @@
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
++ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++ $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+- $(LDFLAGS) -o $@
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = pam_filter.c
+ DIST_SOURCES = pam_filter.c
+ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ html-recursive info-recursive install-data-recursive \
+- install-dvi-recursive install-exec-recursive \
+- install-html-recursive install-info-recursive \
+- install-pdf-recursive install-ps-recursive install-recursive \
+- installcheck-recursive installdirs-recursive pdf-recursive \
+- ps-recursive uninstall-recursive
++ install-exec-recursive install-info-recursive \
++ install-recursive installcheck-recursive installdirs-recursive \
++ pdf-recursive ps-recursive uninstall-info-recursive \
++ uninstall-recursive
+ man8dir = $(mandir)/man8
+ NROFF = nroff
+ MANS = $(man_MANS)
+ DATA = $(noinst_DATA)
+ includeHEADERS_INSTALL = $(INSTALL_HEADER)
+ HEADERS = $(include_HEADERS)
+-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+- distclean-recursive maintainer-clean-recursive
+ ETAGS = etags
+ CTAGS = ctags
+ DIST_SUBDIRS = $(SUBDIRS)
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AUTOCONF = @AUTOCONF@
+@@ -123,11 +125,16 @@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -7866,7 +10729,40 @@ Index: pam.deb/modules/pam_filter/Makefile.in
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -175,6 +176,7 @@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
++ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
++ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
++ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -136,7 +143,18 @@
+ GMSGFMT_015 = @GMSGFMT_015@
+ GREP = @GREP@
+ HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
+-INSTALL = @INSTALL@
++HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
++HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
++HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
++HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
++HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
++HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
++HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
++HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
++HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
++HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
++HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
++HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -171,10 +189,10 @@
+ LTLIBINTL = @LTLIBINTL@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+-MKDIR_P = @MKDIR_P@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
@@ -7874,99 +10770,379 @@ Index: pam.deb/modules/pam_filter/Makefile.in
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -190,6 +192,7 @@
- RANLIB = @RANLIB@
- SCONFIGDIR = @SCONFIGDIR@
- SECUREDIR = @SECUREDIR@
-+SED = @SED@
+@@ -193,6 +211,8 @@
+ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
++STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
++STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
STRIP = @STRIP@
-@@ -312,8 +315,8 @@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+@@ -206,13 +226,13 @@
+ XSLTPROC = @XSLTPROC@
+ YACC = @YACC@
+ YFLAGS = @YFLAGS@
+-abs_builddir = @abs_builddir@
+-abs_srcdir = @abs_srcdir@
+-abs_top_builddir = @abs_top_builddir@
+-abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -224,7 +244,6 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+-builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -255,11 +274,8 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+-srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_builddir = @top_builddir@
+-top_srcdir = @top_srcdir@
+ SUBDIRS = upperLOWER
+ CLEANFILES = *~
+ EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_filter
+@@ -309,7 +325,7 @@
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+- test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
++ test -z "$(securelibdir)" || $(mkdir_p) "$(DESTDIR)$(securelibdir)"
@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \
-- $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \
- else :; fi; \
- done
+@@ -320,7 +336,7 @@
-@@ -321,8 +324,8 @@
+ uninstall-securelibLTLIBRARIES:
@$(NORMAL_UNINSTALL)
- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
+- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
++ @set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
+@@ -335,7 +351,7 @@
+ rm -f "$${dir}/so_locations"; \
done
+ pam_filter.la: $(pam_filter_la_OBJECTS) $(pam_filter_la_DEPENDENCIES)
+- $(LINK) -rpath $(securelibdir) $(pam_filter_la_OBJECTS) $(pam_filter_la_LIBADD) $(LIBS)
++ $(LINK) -rpath $(securelibdir) $(pam_filter_la_LDFLAGS) $(pam_filter_la_OBJECTS) $(pam_filter_la_LIBADD) $(LIBS)
- clean-securelibLTLIBRARIES:
-@@ -508,8 +511,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+@@ -346,22 +362,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_filter.Plo@am__quote@
-@@ -534,8 +537,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -545,13 +548,12 @@
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-Index: pam.deb/modules/pam_filter/upperLOWER/Makefile.in
+ .c.o:
+-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
++@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+@@ -371,9 +387,13 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
++
++distclean-libtool:
++ -rm -f libtool
++uninstall-info-am:
+ install-man8: $(man8_MANS) $(man_MANS)
+ @$(NORMAL_INSTALL)
+- test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
++ test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
+ @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
+ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ for i in $$l2; do \
+@@ -418,7 +438,7 @@
+ done
+ install-includeHEADERS: $(include_HEADERS)
+ @$(NORMAL_INSTALL)
+- test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
++ test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
+ @list='$(include_HEADERS)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+@@ -465,7 +485,8 @@
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ fi; test -z "$$fail"
+
+-$(RECURSIVE_CLEAN_TARGETS):
++mostlyclean-recursive clean-recursive distclean-recursive \
++maintainer-clean-recursive:
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+@@ -566,9 +587,9 @@
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ check-TESTS: $(TESTS)
+- @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
++ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
+ srcdir=$(srcdir); export srcdir; \
+- list=' $(TESTS) '; \
++ list='$(TESTS)'; \
+ if test -n "$$list"; then \
+ for tst in $$list; do \
+ if test -f ./$$tst; then dir=./; \
+@@ -577,7 +598,7 @@
+ if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *$$ws$$tst$$ws*) \
++ *" $$tst "*) \
+ xpass=`expr $$xpass + 1`; \
+ failed=`expr $$failed + 1`; \
+ echo "XPASS: $$tst"; \
+@@ -589,7 +610,7 @@
+ elif test $$? -ne 77; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *$$ws$$tst$$ws*) \
++ *" $$tst "*) \
+ xfail=`expr $$xfail + 1`; \
+ echo "XFAIL: $$tst"; \
+ ;; \
+@@ -639,21 +660,22 @@
+ else :; fi
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- list='$(DISTFILES)'; \
+- dist_files=`for file in $$list; do echo $$file; done | \
+- sed -e "s|^$$srcdirstrip/||;t" \
+- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+- case $$dist_files in \
+- */*) $(MKDIR_P) `echo "$$dist_files" | \
+- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+- sort -u` ;; \
+- esac; \
+- for file in $$dist_files; do \
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
+ if test -d $$d/$$file; then \
+- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -667,7 +689,7 @@
+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -d "$(distdir)/$$subdir" \
+- || $(MKDIR_P) "$(distdir)/$$subdir" \
++ || $(mkdir_p) "$(distdir)/$$subdir" \
+ || exit 1; \
+ distdir=`$(am__cd) $(distdir) && pwd`; \
+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+@@ -675,8 +697,6 @@
+ $(MAKE) $(AM_MAKEFLAGS) \
+ top_distdir="$$top_distdir" \
+ distdir="$$distdir/$$subdir" \
+- am__remove_distdir=: \
+- am__skip_length_check=: \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -688,7 +708,7 @@
+ installdirs: installdirs-recursive
+ installdirs-am:
+ for dir in "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(includedir)"; do \
+- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
++ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
+ install: install-recursive
+ install-exec: install-exec-recursive
+@@ -724,7 +744,7 @@
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-tags
++ distclean-libtool distclean-tags
+
+ dvi: dvi-recursive
+
+@@ -739,20 +759,12 @@
+ install-data-am: install-includeHEADERS install-man \
+ install-securelibLTLIBRARIES
+
+-install-dvi: install-dvi-recursive
+-
+ install-exec-am:
+
+-install-html: install-html-recursive
+-
+ install-info: install-info-recursive
+
+ install-man: install-man8
+
+-install-pdf: install-pdf-recursive
+-
+-install-ps: install-ps-recursive
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-recursive
+@@ -773,31 +785,29 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-includeHEADERS uninstall-man \
++uninstall-am: uninstall-includeHEADERS uninstall-info-am uninstall-man \
+ uninstall-securelibLTLIBRARIES
+
+-uninstall-man: uninstall-man8
++uninstall-info: uninstall-info-recursive
+
+-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+- install-strip
++uninstall-man: uninstall-man8
+
+-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+- all all-am check check-TESTS check-am clean clean-generic \
+- clean-libtool clean-securelibLTLIBRARIES ctags ctags-recursive \
+- distclean distclean-compile distclean-generic \
+- distclean-libtool distclean-tags distdir dvi dvi-am html \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-TESTS \
++ check-am clean clean-generic clean-libtool clean-recursive \
++ clean-securelibLTLIBRARIES ctags ctags-recursive distclean \
++ distclean-compile distclean-generic distclean-libtool \
++ distclean-recursive distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+- install-data-am install-dvi install-dvi-am install-exec \
+- install-exec-am install-html install-html-am \
++ install-data-am install-exec install-exec-am \
+ install-includeHEADERS install-info install-info-am \
+- install-man install-man8 install-pdf install-pdf-am install-ps \
+- install-ps-am install-securelibLTLIBRARIES install-strip \
+- installcheck installcheck-am installdirs installdirs-am \
+- maintainer-clean maintainer-clean-generic mostlyclean \
+- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
++ install-man install-man8 install-securelibLTLIBRARIES \
++ install-strip installcheck installcheck-am installdirs \
++ installdirs-am maintainer-clean maintainer-clean-generic \
++ maintainer-clean-recursive mostlyclean mostlyclean-compile \
++ mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
+ pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
+- uninstall-includeHEADERS uninstall-man uninstall-man8 \
+- uninstall-securelibLTLIBRARIES
++ uninstall-includeHEADERS uninstall-info-am uninstall-man \
++ uninstall-man8 uninstall-securelibLTLIBRARIES
+
+ @ENABLE_REGENERATE_MAN_TRUE@README: pam_filter.8.xml
+ @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
+Index: pam.debian/modules/pam_filter/upperLOWER/Makefile.in
===================================================================
---- pam.deb.orig/modules/pam_filter/upperLOWER/Makefile.in
-+++ 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,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -60,7 +60,7 @@
- upperLOWER_SOURCES = upperLOWER.c
+@@ -18,11 +18,15 @@
+ # Copyright (c) 2005 Thorsten Kukuk <kukuk@suse.de>
+ #
+
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ../../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -61,24 +65,25 @@
upperLOWER_OBJECTS = upperLOWER.$(OBJEXT)
upperLOWER_LDADD = $(LDADD)
+ upperLOWER_DEPENDENCIES =
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -97,6 +97,7 @@
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
++ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++ $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+- $(LDFLAGS) -o $@
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = upperLOWER.c
+ DIST_SOURCES = upperLOWER.c
+ ETAGS = etags
+ CTAGS = ctags
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AUTOCONF = @AUTOCONF@
+@@ -98,11 +103,16 @@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -7974,7 +11150,40 @@ Index: pam.deb/modules/pam_filter/upperLOWER/Makefile.in
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -149,6 +150,7 @@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
++ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
++ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
++ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -111,7 +121,18 @@
+ GMSGFMT_015 = @GMSGFMT_015@
+ GREP = @GREP@
+ HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
+-INSTALL = @INSTALL@
++HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
++HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
++HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
++HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
++HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
++HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
++HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
++HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
++HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
++HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
++HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
++HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -146,10 +167,10 @@
+ LTLIBINTL = @LTLIBINTL@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+-MKDIR_P = @MKDIR_P@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
@@ -7982,88 +11191,281 @@ Index: pam.deb/modules/pam_filter/upperLOWER/Makefile.in
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -164,6 +166,7 @@
- RANLIB = @RANLIB@
- SCONFIGDIR = @SCONFIGDIR@
- SECUREDIR = @SECUREDIR@
-+SED = @SED@
+@@ -168,6 +189,8 @@
+ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
++STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
++STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
STRIP = @STRIP@
-@@ -281,8 +284,8 @@
- || test -f $$p1 \
- ; then \
- f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(securelibfilterPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(securelibfilterdir)/$$f'"; \
-- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(securelibfilterPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(securelibfilterdir)/$$f" || exit 1; \
-+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibfilterPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(securelibfilterdir)/$$f'"; \
-+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibfilterPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(securelibfilterdir)/$$f" || exit 1; \
- else :; fi; \
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+@@ -181,13 +204,13 @@
+ XSLTPROC = @XSLTPROC@
+ YACC = @YACC@
+ YFLAGS = @YFLAGS@
+-abs_builddir = @abs_builddir@
+-abs_srcdir = @abs_srcdir@
+-abs_top_builddir = @abs_top_builddir@
+-abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -199,7 +222,6 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+-builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -230,11 +252,8 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+-srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_builddir = @top_builddir@
+-top_srcdir = @top_srcdir@
+ CLEANFILES = *~
+ securelibfilterdir = $(SECUREDIR)/pam_filter
+ AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \
+@@ -277,7 +296,7 @@
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-securelibfilterPROGRAMS: $(securelibfilter_PROGRAMS)
+ @$(NORMAL_INSTALL)
+- test -z "$(securelibfilterdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibfilterdir)"
++ test -z "$(securelibfilterdir)" || $(mkdir_p) "$(DESTDIR)$(securelibfilterdir)"
+ @list='$(securelibfilter_PROGRAMS)'; for p in $$list; do \
+ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ if test -f $$p \
+@@ -305,7 +324,7 @@
done
+ upperLOWER$(EXEEXT): $(upperLOWER_OBJECTS) $(upperLOWER_DEPENDENCIES)
+ @rm -f upperLOWER$(EXEEXT)
+- $(LINK) $(upperLOWER_OBJECTS) $(upperLOWER_LDADD) $(LIBS)
++ $(LINK) $(upperLOWER_LDFLAGS) $(upperLOWER_OBJECTS) $(upperLOWER_LDADD) $(LIBS)
-@@ -344,8 +347,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+@@ -316,22 +335,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/upperLOWER.Po@am__quote@
-@@ -357,8 +360,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -368,13 +371,12 @@
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ .c.o:
+-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
++@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+@@ -342,6 +361,10 @@
+ clean-libtool:
+ -rm -rf .libs _libs
+
++distclean-libtool:
++ -rm -f libtool
++uninstall-info-am:
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-Index: pam.deb/modules/pam_ftp/Makefile.in
+@@ -391,21 +414,22 @@
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- list='$(DISTFILES)'; \
+- dist_files=`for file in $$list; do echo $$file; done | \
+- sed -e "s|^$$srcdirstrip/||;t" \
+- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+- case $$dist_files in \
+- */*) $(MKDIR_P) `echo "$$dist_files" | \
+- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+- sort -u` ;; \
+- esac; \
+- for file in $$dist_files; do \
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
+ if test -d $$d/$$file; then \
+- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -421,7 +445,7 @@
+ all-am: Makefile $(PROGRAMS)
+ installdirs:
+ for dir in "$(DESTDIR)$(securelibfilterdir)"; do \
+- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
++ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
+ install: install-am
+ install-exec: install-exec-am
+@@ -457,7 +481,7 @@
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-tags
++ distclean-libtool distclean-tags
+
+ dvi: dvi-am
+
+@@ -471,20 +495,12 @@
+
+ install-data-am: install-securelibfilterPROGRAMS
+
+-install-dvi: install-dvi-am
+-
+ install-exec-am:
+
+-install-html: install-html-am
+-
+ install-info: install-info-am
+
+ install-man:
+
+-install-pdf: install-pdf-am
+-
+-install-ps: install-ps-am
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -505,23 +521,20 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-securelibfilterPROGRAMS
+-
+-.MAKE: install-am install-strip
++uninstall-am: uninstall-info-am uninstall-securelibfilterPROGRAMS
+
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ clean-libtool clean-securelibfilterPROGRAMS ctags distclean \
+ distclean-compile distclean-generic distclean-libtool \
+ distclean-tags distdir dvi dvi-am html html-am info info-am \
+- install install-am install-data install-data-am install-dvi \
+- install-dvi-am install-exec install-exec-am install-html \
+- install-html-am install-info install-info-am install-man \
+- install-pdf install-pdf-am install-ps install-ps-am \
++ install install-am install-data install-data-am install-exec \
++ install-exec-am install-info install-info-am install-man \
+ install-securelibfilterPROGRAMS install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+- tags uninstall uninstall-am uninstall-securelibfilterPROGRAMS
++ tags uninstall uninstall-am uninstall-info-am \
++ uninstall-securelibfilterPROGRAMS
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+Index: pam.debian/modules/pam_ftp/Makefile.in
===================================================================
---- pam.deb.orig/modules/pam_ftp/Makefile.in
-+++ pam.deb/modules/pam_ftp/Makefile.in
+--- pam.debian.orig/modules/pam_ftp/Makefile.in
++++ pam.debian/modules/pam_ftp/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -67,7 +67,7 @@
- pam_ftp_la_LIBADD =
+@@ -19,11 +19,15 @@
+ #
+
+
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -67,18 +71,17 @@
+ pam_ftp_la_DEPENDENCIES =
pam_ftp_la_SOURCES = pam_ftp.c
pam_ftp_la_OBJECTS = pam_ftp.lo
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -108,6 +108,7 @@
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
++ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++ $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+- $(LDFLAGS) -o $@
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = pam_ftp.c
+ DIST_SOURCES = pam_ftp.c
+ man8dir = $(mandir)/man8
+@@ -89,6 +92,8 @@
+ CTAGS = ctags
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AUTOCONF = @AUTOCONF@
+@@ -108,11 +113,16 @@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -8071,7 +11473,40 @@ Index: pam.deb/modules/pam_ftp/Makefile.in
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -160,6 +161,7 @@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
++ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
++ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
++ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -121,7 +131,18 @@
+ GMSGFMT_015 = @GMSGFMT_015@
+ GREP = @GREP@
+ HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
+-INSTALL = @INSTALL@
++HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
++HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
++HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
++HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
++HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
++HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
++HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
++HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
++HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
++HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
++HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
++HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -156,10 +177,10 @@
+ LTLIBINTL = @LTLIBINTL@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+-MKDIR_P = @MKDIR_P@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
@@ -8079,99 +11514,329 @@ Index: pam.deb/modules/pam_ftp/Makefile.in
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -175,6 +177,7 @@
- RANLIB = @RANLIB@
- SCONFIGDIR = @SCONFIGDIR@
- SECUREDIR = @SECUREDIR@
-+SED = @SED@
+@@ -178,6 +199,8 @@
+ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
++STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
++STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
STRIP = @STRIP@
-@@ -295,8 +298,8 @@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+@@ -191,13 +214,13 @@
+ XSLTPROC = @XSLTPROC@
+ YACC = @YACC@
+ YFLAGS = @YFLAGS@
+-abs_builddir = @abs_builddir@
+-abs_srcdir = @abs_srcdir@
+-abs_top_builddir = @abs_top_builddir@
+-abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -209,7 +232,6 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+-builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -240,11 +262,8 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+-srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_builddir = @top_builddir@
+-top_srcdir = @top_srcdir@
+ CLEANFILES = *~
+ EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_ftp
+ man_MANS = pam_ftp.8
+@@ -292,7 +311,7 @@
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+- test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
++ test -z "$(securelibdir)" || $(mkdir_p) "$(DESTDIR)$(securelibdir)"
@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \
-- $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \
- else :; fi; \
- done
+@@ -303,7 +322,7 @@
-@@ -304,8 +307,8 @@
+ uninstall-securelibLTLIBRARIES:
@$(NORMAL_UNINSTALL)
- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
+- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
++ @set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
+@@ -318,7 +337,7 @@
+ rm -f "$${dir}/so_locations"; \
done
+ pam_ftp.la: $(pam_ftp_la_OBJECTS) $(pam_ftp_la_DEPENDENCIES)
+- $(LINK) -rpath $(securelibdir) $(pam_ftp_la_OBJECTS) $(pam_ftp_la_LIBADD) $(LIBS)
++ $(LINK) -rpath $(securelibdir) $(pam_ftp_la_LDFLAGS) $(pam_ftp_la_OBJECTS) $(pam_ftp_la_LIBADD) $(LIBS)
- clean-securelibLTLIBRARIES:
-@@ -404,8 +407,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+@@ -329,22 +348,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_ftp.Plo@am__quote@
-@@ -417,8 +420,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -428,13 +431,12 @@
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-Index: pam.deb/modules/pam_group/Makefile.in
+ .c.o:
+-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
++@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+@@ -354,9 +373,13 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
++
++distclean-libtool:
++ -rm -f libtool
++uninstall-info-am:
+ install-man8: $(man8_MANS) $(man_MANS)
+ @$(NORMAL_INSTALL)
+- test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
++ test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
+ @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
+ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ for i in $$l2; do \
+@@ -449,9 +472,9 @@
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ check-TESTS: $(TESTS)
+- @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
++ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
+ srcdir=$(srcdir); export srcdir; \
+- list=' $(TESTS) '; \
++ list='$(TESTS)'; \
+ if test -n "$$list"; then \
+ for tst in $$list; do \
+ if test -f ./$$tst; then dir=./; \
+@@ -460,7 +483,7 @@
+ if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *$$ws$$tst$$ws*) \
++ *" $$tst "*) \
+ xpass=`expr $$xpass + 1`; \
+ failed=`expr $$failed + 1`; \
+ echo "XPASS: $$tst"; \
+@@ -472,7 +495,7 @@
+ elif test $$? -ne 77; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *$$ws$$tst$$ws*) \
++ *" $$tst "*) \
+ xfail=`expr $$xfail + 1`; \
+ echo "XFAIL: $$tst"; \
+ ;; \
+@@ -522,21 +545,22 @@
+ else :; fi
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- list='$(DISTFILES)'; \
+- dist_files=`for file in $$list; do echo $$file; done | \
+- sed -e "s|^$$srcdirstrip/||;t" \
+- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+- case $$dist_files in \
+- */*) $(MKDIR_P) `echo "$$dist_files" | \
+- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+- sort -u` ;; \
+- esac; \
+- for file in $$dist_files; do \
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
+ if test -d $$d/$$file; then \
+- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -553,7 +577,7 @@
+ all-am: Makefile $(LTLIBRARIES) $(MANS) $(DATA)
+ installdirs:
+ for dir in "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man8dir)"; do \
+- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
++ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
+ install: install-am
+ install-exec: install-exec-am
+@@ -589,7 +613,7 @@
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-tags
++ distclean-libtool distclean-tags
+
+ dvi: dvi-am
+
+@@ -603,20 +627,12 @@
+
+ install-data-am: install-man install-securelibLTLIBRARIES
+
+-install-dvi: install-dvi-am
+-
+ install-exec-am:
+
+-install-html: install-html-am
+-
+ install-info: install-info-am
+
+ install-man: install-man8
+
+-install-pdf: install-pdf-am
+-
+-install-ps: install-ps-am
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -637,27 +653,24 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-man uninstall-securelibLTLIBRARIES
++uninstall-am: uninstall-info-am uninstall-man \
++ uninstall-securelibLTLIBRARIES
+
+ uninstall-man: uninstall-man8
+
+-.MAKE: install-am install-strip
+-
+ .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
+ clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
+ distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+- install-data-am install-dvi install-dvi-am install-exec \
+- install-exec-am install-html install-html-am install-info \
+- install-info-am install-man install-man8 install-pdf \
+- install-pdf-am install-ps install-ps-am \
++ install-data-am install-exec install-exec-am install-info \
++ install-info-am install-man install-man8 \
+ install-securelibLTLIBRARIES install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+- tags uninstall uninstall-am uninstall-man uninstall-man8 \
+- uninstall-securelibLTLIBRARIES
++ tags uninstall uninstall-am uninstall-info-am uninstall-man \
++ uninstall-man8 uninstall-securelibLTLIBRARIES
+
+ @ENABLE_REGENERATE_MAN_TRUE@README: pam_ftp.8.xml
+ @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
+Index: pam.debian/modules/pam_group/Makefile.in
===================================================================
---- pam.deb.orig/modules/pam_group/Makefile.in
-+++ pam.deb/modules/pam_group/Makefile.in
+--- pam.debian.orig/modules/pam_group/Makefile.in
++++ pam.debian/modules/pam_group/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -68,7 +68,7 @@
- pam_group_la_LIBADD =
+@@ -19,11 +19,15 @@
+ #
+
+
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -68,18 +72,17 @@
+ pam_group_la_DEPENDENCIES =
pam_group_la_SOURCES = pam_group.c
pam_group_la_OBJECTS = pam_group.lo
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -111,6 +111,7 @@
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
++ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++ $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+- $(LDFLAGS) -o $@
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = pam_group.c
+ DIST_SOURCES = pam_group.c
+ man5dir = $(mandir)/man5
+@@ -92,6 +95,8 @@
+ CTAGS = ctags
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AUTOCONF = @AUTOCONF@
+@@ -111,11 +116,16 @@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -8179,7 +11844,40 @@ Index: pam.deb/modules/pam_group/Makefile.in
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -163,6 +164,7 @@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
++ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
++ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
++ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -124,7 +134,18 @@
+ GMSGFMT_015 = @GMSGFMT_015@
+ GREP = @GREP@
+ HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
+-INSTALL = @INSTALL@
++HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
++HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
++HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
++HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
++HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
++HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
++HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
++HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
++HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
++HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
++HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
++HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -159,10 +180,10 @@
+ LTLIBINTL = @LTLIBINTL@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+-MKDIR_P = @MKDIR_P@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
@@ -8187,99 +11885,348 @@ Index: pam.deb/modules/pam_group/Makefile.in
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -178,6 +180,7 @@
- RANLIB = @RANLIB@
- SCONFIGDIR = @SCONFIGDIR@
- SECUREDIR = @SECUREDIR@
-+SED = @SED@
+@@ -181,6 +202,8 @@
+ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
++STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
++STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
STRIP = @STRIP@
-@@ -301,8 +304,8 @@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+@@ -194,13 +217,13 @@
+ XSLTPROC = @XSLTPROC@
+ YACC = @YACC@
+ YFLAGS = @YFLAGS@
+-abs_builddir = @abs_builddir@
+-abs_srcdir = @abs_srcdir@
+-abs_top_builddir = @abs_top_builddir@
+-abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -212,7 +235,6 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+-builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -243,11 +265,8 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+-srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_builddir = @top_builddir@
+-top_srcdir = @top_srcdir@
+ CLEANFILES = *~
+ EXTRA_DIST = README group.conf $(MANS) $(XMLS) tst-pam_group
+ man_MANS = group.conf.5 pam_group.8
+@@ -298,7 +317,7 @@
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+- test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
++ test -z "$(securelibdir)" || $(mkdir_p) "$(DESTDIR)$(securelibdir)"
@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \
-- $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \
- else :; fi; \
- done
+@@ -309,7 +328,7 @@
-@@ -310,8 +313,8 @@
+ uninstall-securelibLTLIBRARIES:
@$(NORMAL_UNINSTALL)
- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
+- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
++ @set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
+@@ -324,7 +343,7 @@
+ rm -f "$${dir}/so_locations"; \
done
+ pam_group.la: $(pam_group_la_OBJECTS) $(pam_group_la_DEPENDENCIES)
+- $(LINK) -rpath $(securelibdir) $(pam_group_la_OBJECTS) $(pam_group_la_LIBADD) $(LIBS)
++ $(LINK) -rpath $(securelibdir) $(pam_group_la_LDFLAGS) $(pam_group_la_OBJECTS) $(pam_group_la_LIBADD) $(LIBS)
- clean-securelibLTLIBRARIES:
-@@ -472,8 +475,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+@@ -335,22 +354,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_group.Plo@am__quote@
-@@ -485,8 +488,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -496,13 +499,12 @@
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-Index: pam.deb/modules/pam_issue/Makefile.in
+ .c.o:
+-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
++@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+@@ -360,9 +379,13 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
++
++distclean-libtool:
++ -rm -f libtool
++uninstall-info-am:
+ install-man5: $(man5_MANS) $(man_MANS)
+ @$(NORMAL_INSTALL)
+- test -z "$(man5dir)" || $(MKDIR_P) "$(DESTDIR)$(man5dir)"
++ test -z "$(man5dir)" || $(mkdir_p) "$(DESTDIR)$(man5dir)"
+ @list='$(man5_MANS) $(dist_man5_MANS) $(nodist_man5_MANS)'; \
+ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ for i in $$l2; do \
+@@ -407,7 +430,7 @@
+ done
+ install-man8: $(man8_MANS) $(man_MANS)
+ @$(NORMAL_INSTALL)
+- test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
++ test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
+ @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
+ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ for i in $$l2; do \
+@@ -452,7 +475,7 @@
+ done
+ install-secureconfDATA: $(secureconf_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(secureconfdir)" || $(MKDIR_P) "$(DESTDIR)$(secureconfdir)"
++ test -z "$(secureconfdir)" || $(mkdir_p) "$(DESTDIR)$(secureconfdir)"
+ @list='$(secureconf_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+@@ -517,9 +540,9 @@
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ check-TESTS: $(TESTS)
+- @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
++ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
+ srcdir=$(srcdir); export srcdir; \
+- list=' $(TESTS) '; \
++ list='$(TESTS)'; \
+ if test -n "$$list"; then \
+ for tst in $$list; do \
+ if test -f ./$$tst; then dir=./; \
+@@ -528,7 +551,7 @@
+ if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *$$ws$$tst$$ws*) \
++ *" $$tst "*) \
+ xpass=`expr $$xpass + 1`; \
+ failed=`expr $$failed + 1`; \
+ echo "XPASS: $$tst"; \
+@@ -540,7 +563,7 @@
+ elif test $$? -ne 77; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *$$ws$$tst$$ws*) \
++ *" $$tst "*) \
+ xfail=`expr $$xfail + 1`; \
+ echo "XFAIL: $$tst"; \
+ ;; \
+@@ -590,21 +613,22 @@
+ else :; fi
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- list='$(DISTFILES)'; \
+- dist_files=`for file in $$list; do echo $$file; done | \
+- sed -e "s|^$$srcdirstrip/||;t" \
+- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+- case $$dist_files in \
+- */*) $(MKDIR_P) `echo "$$dist_files" | \
+- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+- sort -u` ;; \
+- esac; \
+- for file in $$dist_files; do \
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
+ if test -d $$d/$$file; then \
+- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -621,7 +645,7 @@
+ all-am: Makefile $(LTLIBRARIES) $(MANS) $(DATA)
+ installdirs:
+ for dir in "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(secureconfdir)"; do \
+- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
++ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
+ install: install-am
+ install-exec: install-exec-am
+@@ -657,7 +681,7 @@
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-tags
++ distclean-libtool distclean-tags
+
+ dvi: dvi-am
+
+@@ -672,20 +696,12 @@
+ install-data-am: install-man install-secureconfDATA \
+ install-securelibLTLIBRARIES
+
+-install-dvi: install-dvi-am
+-
+ install-exec-am:
+
+-install-html: install-html-am
+-
+ install-info: install-info-am
+
+ install-man: install-man5 install-man8
+
+-install-pdf: install-pdf-am
+-
+-install-ps: install-ps-am
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -706,29 +722,25 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-man uninstall-secureconfDATA \
++uninstall-am: uninstall-info-am uninstall-man uninstall-secureconfDATA \
+ uninstall-securelibLTLIBRARIES
+
+ uninstall-man: uninstall-man5 uninstall-man8
+
+-.MAKE: install-am install-strip
+-
+ .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
+ clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
+ distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+- install-data-am install-dvi install-dvi-am install-exec \
+- install-exec-am install-html install-html-am install-info \
++ install-data-am install-exec install-exec-am install-info \
+ install-info-am install-man install-man5 install-man8 \
+- install-pdf install-pdf-am install-ps install-ps-am \
+ install-secureconfDATA install-securelibLTLIBRARIES \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+- pdf pdf-am ps ps-am tags uninstall uninstall-am uninstall-man \
+- uninstall-man5 uninstall-man8 uninstall-secureconfDATA \
+- uninstall-securelibLTLIBRARIES
++ pdf pdf-am ps ps-am tags uninstall uninstall-am \
++ uninstall-info-am uninstall-man uninstall-man5 uninstall-man8 \
++ uninstall-secureconfDATA uninstall-securelibLTLIBRARIES
+
+ @ENABLE_REGENERATE_MAN_TRUE@README: pam_group.8.xml group.conf.5.xml
+ @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
+Index: pam.debian/modules/pam_issue/Makefile.in
===================================================================
---- pam.deb.orig/modules/pam_issue/Makefile.in
-+++ pam.deb/modules/pam_issue/Makefile.in
+--- pam.debian.orig/modules/pam_issue/Makefile.in
++++ pam.debian/modules/pam_issue/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -67,7 +67,7 @@
- pam_issue_la_LIBADD =
+@@ -19,11 +19,15 @@
+ #
+
+
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -67,18 +71,17 @@
+ pam_issue_la_DEPENDENCIES =
pam_issue_la_SOURCES = pam_issue.c
pam_issue_la_OBJECTS = pam_issue.lo
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -108,6 +108,7 @@
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
++ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++ $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+- $(LDFLAGS) -o $@
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = pam_issue.c
+ DIST_SOURCES = pam_issue.c
+ man8dir = $(mandir)/man8
+@@ -89,6 +92,8 @@
+ CTAGS = ctags
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AUTOCONF = @AUTOCONF@
+@@ -108,11 +113,16 @@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -8287,7 +12234,40 @@ Index: pam.deb/modules/pam_issue/Makefile.in
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -160,6 +161,7 @@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
++ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
++ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
++ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -121,7 +131,18 @@
+ GMSGFMT_015 = @GMSGFMT_015@
+ GREP = @GREP@
+ HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
+-INSTALL = @INSTALL@
++HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
++HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
++HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
++HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
++HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
++HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
++HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
++HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
++HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
++HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
++HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
++HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -156,10 +177,10 @@
+ LTLIBINTL = @LTLIBINTL@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+-MKDIR_P = @MKDIR_P@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
@@ -8295,99 +12275,329 @@ Index: pam.deb/modules/pam_issue/Makefile.in
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -175,6 +177,7 @@
- RANLIB = @RANLIB@
- SCONFIGDIR = @SCONFIGDIR@
- SECUREDIR = @SECUREDIR@
-+SED = @SED@
+@@ -178,6 +199,8 @@
+ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
++STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
++STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
STRIP = @STRIP@
-@@ -295,8 +298,8 @@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+@@ -191,13 +214,13 @@
+ XSLTPROC = @XSLTPROC@
+ YACC = @YACC@
+ YFLAGS = @YFLAGS@
+-abs_builddir = @abs_builddir@
+-abs_srcdir = @abs_srcdir@
+-abs_top_builddir = @abs_top_builddir@
+-abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -209,7 +232,6 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+-builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -240,11 +262,8 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+-srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_builddir = @top_builddir@
+-top_srcdir = @top_srcdir@
+ CLEANFILES = *~
+ EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_issue
+ man_MANS = pam_issue.8
+@@ -292,7 +311,7 @@
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+- test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
++ test -z "$(securelibdir)" || $(mkdir_p) "$(DESTDIR)$(securelibdir)"
@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \
-- $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \
- else :; fi; \
- done
+@@ -303,7 +322,7 @@
-@@ -304,8 +307,8 @@
+ uninstall-securelibLTLIBRARIES:
@$(NORMAL_UNINSTALL)
- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
+- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
++ @set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
+@@ -318,7 +337,7 @@
+ rm -f "$${dir}/so_locations"; \
done
+ pam_issue.la: $(pam_issue_la_OBJECTS) $(pam_issue_la_DEPENDENCIES)
+- $(LINK) -rpath $(securelibdir) $(pam_issue_la_OBJECTS) $(pam_issue_la_LIBADD) $(LIBS)
++ $(LINK) -rpath $(securelibdir) $(pam_issue_la_LDFLAGS) $(pam_issue_la_OBJECTS) $(pam_issue_la_LIBADD) $(LIBS)
- clean-securelibLTLIBRARIES:
-@@ -404,8 +407,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+@@ -329,22 +348,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_issue.Plo@am__quote@
-@@ -417,8 +420,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -428,13 +431,12 @@
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-Index: pam.deb/modules/pam_keyinit/Makefile.in
+ .c.o:
+-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
++@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+@@ -354,9 +373,13 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
++
++distclean-libtool:
++ -rm -f libtool
++uninstall-info-am:
+ install-man8: $(man8_MANS) $(man_MANS)
+ @$(NORMAL_INSTALL)
+- test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
++ test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
+ @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
+ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ for i in $$l2; do \
+@@ -449,9 +472,9 @@
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ check-TESTS: $(TESTS)
+- @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
++ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
+ srcdir=$(srcdir); export srcdir; \
+- list=' $(TESTS) '; \
++ list='$(TESTS)'; \
+ if test -n "$$list"; then \
+ for tst in $$list; do \
+ if test -f ./$$tst; then dir=./; \
+@@ -460,7 +483,7 @@
+ if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *$$ws$$tst$$ws*) \
++ *" $$tst "*) \
+ xpass=`expr $$xpass + 1`; \
+ failed=`expr $$failed + 1`; \
+ echo "XPASS: $$tst"; \
+@@ -472,7 +495,7 @@
+ elif test $$? -ne 77; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *$$ws$$tst$$ws*) \
++ *" $$tst "*) \
+ xfail=`expr $$xfail + 1`; \
+ echo "XFAIL: $$tst"; \
+ ;; \
+@@ -522,21 +545,22 @@
+ else :; fi
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- list='$(DISTFILES)'; \
+- dist_files=`for file in $$list; do echo $$file; done | \
+- sed -e "s|^$$srcdirstrip/||;t" \
+- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+- case $$dist_files in \
+- */*) $(MKDIR_P) `echo "$$dist_files" | \
+- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+- sort -u` ;; \
+- esac; \
+- for file in $$dist_files; do \
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
+ if test -d $$d/$$file; then \
+- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -553,7 +577,7 @@
+ all-am: Makefile $(LTLIBRARIES) $(MANS) $(DATA)
+ installdirs:
+ for dir in "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man8dir)"; do \
+- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
++ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
+ install: install-am
+ install-exec: install-exec-am
+@@ -589,7 +613,7 @@
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-tags
++ distclean-libtool distclean-tags
+
+ dvi: dvi-am
+
+@@ -603,20 +627,12 @@
+
+ install-data-am: install-man install-securelibLTLIBRARIES
+
+-install-dvi: install-dvi-am
+-
+ install-exec-am:
+
+-install-html: install-html-am
+-
+ install-info: install-info-am
+
+ install-man: install-man8
+
+-install-pdf: install-pdf-am
+-
+-install-ps: install-ps-am
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -637,27 +653,24 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-man uninstall-securelibLTLIBRARIES
++uninstall-am: uninstall-info-am uninstall-man \
++ uninstall-securelibLTLIBRARIES
+
+ uninstall-man: uninstall-man8
+
+-.MAKE: install-am install-strip
+-
+ .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
+ clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
+ distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+- install-data-am install-dvi install-dvi-am install-exec \
+- install-exec-am install-html install-html-am install-info \
+- install-info-am install-man install-man8 install-pdf \
+- install-pdf-am install-ps install-ps-am \
++ install-data-am install-exec install-exec-am install-info \
++ install-info-am install-man install-man8 \
+ install-securelibLTLIBRARIES install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+- tags uninstall uninstall-am uninstall-man uninstall-man8 \
+- uninstall-securelibLTLIBRARIES
++ tags uninstall uninstall-am uninstall-info-am uninstall-man \
++ uninstall-man8 uninstall-securelibLTLIBRARIES
+
+ @ENABLE_REGENERATE_MAN_TRUE@README: pam_issue.8.xml
+ @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
+Index: pam.debian/modules/pam_keyinit/Makefile.in
===================================================================
---- pam.deb.orig/modules/pam_keyinit/Makefile.in
-+++ pam.deb/modules/pam_keyinit/Makefile.in
+--- pam.debian.orig/modules/pam_keyinit/Makefile.in
++++ pam.debian/modules/pam_keyinit/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -69,7 +69,7 @@
+@@ -19,11 +19,15 @@
+ #
+
+
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -69,18 +73,17 @@
pam_keyinit_la_OBJECTS = pam_keyinit.lo
@HAVE_KEY_MANAGEMENT_TRUE@am_pam_keyinit_la_rpath = -rpath \
@HAVE_KEY_MANAGEMENT_TRUE@ $(securelibdir)
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -110,6 +110,7 @@
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
++ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++ $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+- $(LDFLAGS) -o $@
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = pam_keyinit.c
+ DIST_SOURCES = pam_keyinit.c
+ man8dir = $(mandir)/man8
+@@ -91,6 +94,8 @@
+ CTAGS = ctags
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AUTOCONF = @AUTOCONF@
+@@ -110,11 +115,16 @@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -8395,7 +12605,40 @@ Index: pam.deb/modules/pam_keyinit/Makefile.in
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -162,6 +163,7 @@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
++ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
++ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
++ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -123,7 +133,18 @@
+ GMSGFMT_015 = @GMSGFMT_015@
+ GREP = @GREP@
+ HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
+-INSTALL = @INSTALL@
++HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
++HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
++HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
++HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
++HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
++HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
++HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
++HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
++HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
++HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
++HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
++HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -158,10 +179,10 @@
+ LTLIBINTL = @LTLIBINTL@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+-MKDIR_P = @MKDIR_P@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
@@ -8403,99 +12646,329 @@ Index: pam.deb/modules/pam_keyinit/Makefile.in
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -177,6 +179,7 @@
- RANLIB = @RANLIB@
- SCONFIGDIR = @SCONFIGDIR@
- SECUREDIR = @SECUREDIR@
-+SED = @SED@
+@@ -180,6 +201,8 @@
+ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
++STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
++STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
STRIP = @STRIP@
-@@ -297,8 +300,8 @@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+@@ -193,13 +216,13 @@
+ XSLTPROC = @XSLTPROC@
+ YACC = @YACC@
+ YFLAGS = @YFLAGS@
+-abs_builddir = @abs_builddir@
+-abs_srcdir = @abs_srcdir@
+-abs_top_builddir = @abs_top_builddir@
+-abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -211,7 +234,6 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+-builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -242,11 +264,8 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+-srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_builddir = @top_builddir@
+-top_srcdir = @top_srcdir@
+ CLEANFILES = *~
+ EXTRA_DIST = README $(XMLS) pam_keyinit.8 tst-pam_keyinit
+ XMLS = README.xml pam_keyinit.8.xml
+@@ -294,7 +313,7 @@
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+- test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
++ test -z "$(securelibdir)" || $(mkdir_p) "$(DESTDIR)$(securelibdir)"
@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \
-- $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \
- else :; fi; \
- done
+@@ -305,7 +324,7 @@
-@@ -306,8 +309,8 @@
+ uninstall-securelibLTLIBRARIES:
@$(NORMAL_UNINSTALL)
- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
+- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
++ @set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
+@@ -320,7 +339,7 @@
+ rm -f "$${dir}/so_locations"; \
done
+ pam_keyinit.la: $(pam_keyinit_la_OBJECTS) $(pam_keyinit_la_DEPENDENCIES)
+- $(LINK) $(am_pam_keyinit_la_rpath) $(pam_keyinit_la_OBJECTS) $(pam_keyinit_la_LIBADD) $(LIBS)
++ $(LINK) $(am_pam_keyinit_la_rpath) $(pam_keyinit_la_LDFLAGS) $(pam_keyinit_la_OBJECTS) $(pam_keyinit_la_LIBADD) $(LIBS)
- clean-securelibLTLIBRARIES:
-@@ -406,8 +409,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+@@ -331,22 +350,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_keyinit.Plo@am__quote@
-@@ -419,8 +422,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -430,13 +433,12 @@
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-Index: pam.deb/modules/pam_lastlog/Makefile.in
+ .c.o:
+-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
++@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+@@ -356,9 +375,13 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
++
++distclean-libtool:
++ -rm -f libtool
++uninstall-info-am:
+ install-man8: $(man8_MANS) $(man_MANS)
+ @$(NORMAL_INSTALL)
+- test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
++ test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
+ @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
+ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ for i in $$l2; do \
+@@ -451,9 +474,9 @@
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ check-TESTS: $(TESTS)
+- @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
++ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
+ srcdir=$(srcdir); export srcdir; \
+- list=' $(TESTS) '; \
++ list='$(TESTS)'; \
+ if test -n "$$list"; then \
+ for tst in $$list; do \
+ if test -f ./$$tst; then dir=./; \
+@@ -462,7 +485,7 @@
+ if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *$$ws$$tst$$ws*) \
++ *" $$tst "*) \
+ xpass=`expr $$xpass + 1`; \
+ failed=`expr $$failed + 1`; \
+ echo "XPASS: $$tst"; \
+@@ -474,7 +497,7 @@
+ elif test $$? -ne 77; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *$$ws$$tst$$ws*) \
++ *" $$tst "*) \
+ xfail=`expr $$xfail + 1`; \
+ echo "XFAIL: $$tst"; \
+ ;; \
+@@ -524,21 +547,22 @@
+ else :; fi
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- list='$(DISTFILES)'; \
+- dist_files=`for file in $$list; do echo $$file; done | \
+- sed -e "s|^$$srcdirstrip/||;t" \
+- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+- case $$dist_files in \
+- */*) $(MKDIR_P) `echo "$$dist_files" | \
+- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+- sort -u` ;; \
+- esac; \
+- for file in $$dist_files; do \
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
+ if test -d $$d/$$file; then \
+- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -555,7 +579,7 @@
+ all-am: Makefile $(LTLIBRARIES) $(MANS) $(DATA)
+ installdirs:
+ for dir in "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man8dir)"; do \
+- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
++ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
+ install: install-am
+ install-exec: install-exec-am
+@@ -591,7 +615,7 @@
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-tags
++ distclean-libtool distclean-tags
+
+ dvi: dvi-am
+
+@@ -605,20 +629,12 @@
+
+ install-data-am: install-man install-securelibLTLIBRARIES
+
+-install-dvi: install-dvi-am
+-
+ install-exec-am:
+
+-install-html: install-html-am
+-
+ install-info: install-info-am
+
+ install-man: install-man8
+
+-install-pdf: install-pdf-am
+-
+-install-ps: install-ps-am
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -639,27 +655,24 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-man uninstall-securelibLTLIBRARIES
++uninstall-am: uninstall-info-am uninstall-man \
++ uninstall-securelibLTLIBRARIES
+
+ uninstall-man: uninstall-man8
+
+-.MAKE: install-am install-strip
+-
+ .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
+ clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
+ distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+- install-data-am install-dvi install-dvi-am install-exec \
+- install-exec-am install-html install-html-am install-info \
+- install-info-am install-man install-man8 install-pdf \
+- install-pdf-am install-ps install-ps-am \
++ install-data-am install-exec install-exec-am install-info \
++ install-info-am install-man install-man8 \
+ install-securelibLTLIBRARIES install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+- tags uninstall uninstall-am uninstall-man uninstall-man8 \
+- uninstall-securelibLTLIBRARIES
++ tags uninstall uninstall-am uninstall-info-am uninstall-man \
++ uninstall-man8 uninstall-securelibLTLIBRARIES
+
+ @ENABLE_REGENERATE_MAN_TRUE@README: pam_keyinit.8.xml
+ @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
+Index: pam.debian/modules/pam_lastlog/Makefile.in
===================================================================
---- pam.deb.orig/modules/pam_lastlog/Makefile.in
-+++ pam.deb/modules/pam_lastlog/Makefile.in
+--- pam.debian.orig/modules/pam_lastlog/Makefile.in
++++ pam.debian/modules/pam_lastlog/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -67,7 +67,7 @@
- pam_lastlog_la_LIBADD =
+@@ -19,11 +19,15 @@
+ #
+
+
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -67,18 +71,17 @@
+ pam_lastlog_la_DEPENDENCIES =
pam_lastlog_la_SOURCES = pam_lastlog.c
pam_lastlog_la_OBJECTS = pam_lastlog.lo
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -108,6 +108,7 @@
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
++ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++ $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+- $(LDFLAGS) -o $@
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = pam_lastlog.c
+ DIST_SOURCES = pam_lastlog.c
+ man8dir = $(mandir)/man8
+@@ -89,6 +92,8 @@
+ CTAGS = ctags
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AUTOCONF = @AUTOCONF@
+@@ -108,11 +113,16 @@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -8503,7 +12976,40 @@ Index: pam.deb/modules/pam_lastlog/Makefile.in
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -160,6 +161,7 @@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
++ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
++ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
++ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -121,7 +131,18 @@
+ GMSGFMT_015 = @GMSGFMT_015@
+ GREP = @GREP@
+ HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
+-INSTALL = @INSTALL@
++HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
++HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
++HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
++HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
++HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
++HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
++HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
++HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
++HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
++HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
++HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
++HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -156,10 +177,10 @@
+ LTLIBINTL = @LTLIBINTL@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+-MKDIR_P = @MKDIR_P@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
@@ -8511,99 +13017,329 @@ Index: pam.deb/modules/pam_lastlog/Makefile.in
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -175,6 +177,7 @@
- RANLIB = @RANLIB@
- SCONFIGDIR = @SCONFIGDIR@
- SECUREDIR = @SECUREDIR@
-+SED = @SED@
+@@ -178,6 +199,8 @@
+ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
++STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
++STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
STRIP = @STRIP@
-@@ -295,8 +298,8 @@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+@@ -191,13 +214,13 @@
+ XSLTPROC = @XSLTPROC@
+ YACC = @YACC@
+ YFLAGS = @YFLAGS@
+-abs_builddir = @abs_builddir@
+-abs_srcdir = @abs_srcdir@
+-abs_top_builddir = @abs_top_builddir@
+-abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -209,7 +232,6 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+-builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -240,11 +262,8 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+-srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_builddir = @top_builddir@
+-top_srcdir = @top_srcdir@
+ CLEANFILES = *~
+ securelibdir = $(SECUREDIR)
+ secureconfdir = $(SCONFIGDIR)
+@@ -292,7 +311,7 @@
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+- test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
++ test -z "$(securelibdir)" || $(mkdir_p) "$(DESTDIR)$(securelibdir)"
@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \
-- $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \
- else :; fi; \
- done
+@@ -303,7 +322,7 @@
-@@ -304,8 +307,8 @@
+ uninstall-securelibLTLIBRARIES:
@$(NORMAL_UNINSTALL)
- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
+- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
++ @set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
+@@ -318,7 +337,7 @@
+ rm -f "$${dir}/so_locations"; \
done
+ pam_lastlog.la: $(pam_lastlog_la_OBJECTS) $(pam_lastlog_la_DEPENDENCIES)
+- $(LINK) -rpath $(securelibdir) $(pam_lastlog_la_OBJECTS) $(pam_lastlog_la_LIBADD) $(LIBS)
++ $(LINK) -rpath $(securelibdir) $(pam_lastlog_la_LDFLAGS) $(pam_lastlog_la_OBJECTS) $(pam_lastlog_la_LIBADD) $(LIBS)
- clean-securelibLTLIBRARIES:
-@@ -404,8 +407,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+@@ -329,22 +348,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_lastlog.Plo@am__quote@
-@@ -417,8 +420,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -428,13 +431,12 @@
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-Index: pam.deb/modules/pam_limits/Makefile.in
+ .c.o:
+-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
++@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+@@ -354,9 +373,13 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
++
++distclean-libtool:
++ -rm -f libtool
++uninstall-info-am:
+ install-man8: $(man8_MANS) $(man_MANS)
+ @$(NORMAL_INSTALL)
+- test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
++ test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
+ @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
+ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ for i in $$l2; do \
+@@ -449,9 +472,9 @@
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ check-TESTS: $(TESTS)
+- @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
++ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
+ srcdir=$(srcdir); export srcdir; \
+- list=' $(TESTS) '; \
++ list='$(TESTS)'; \
+ if test -n "$$list"; then \
+ for tst in $$list; do \
+ if test -f ./$$tst; then dir=./; \
+@@ -460,7 +483,7 @@
+ if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *$$ws$$tst$$ws*) \
++ *" $$tst "*) \
+ xpass=`expr $$xpass + 1`; \
+ failed=`expr $$failed + 1`; \
+ echo "XPASS: $$tst"; \
+@@ -472,7 +495,7 @@
+ elif test $$? -ne 77; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *$$ws$$tst$$ws*) \
++ *" $$tst "*) \
+ xfail=`expr $$xfail + 1`; \
+ echo "XFAIL: $$tst"; \
+ ;; \
+@@ -522,21 +545,22 @@
+ else :; fi
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- list='$(DISTFILES)'; \
+- dist_files=`for file in $$list; do echo $$file; done | \
+- sed -e "s|^$$srcdirstrip/||;t" \
+- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+- case $$dist_files in \
+- */*) $(MKDIR_P) `echo "$$dist_files" | \
+- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+- sort -u` ;; \
+- esac; \
+- for file in $$dist_files; do \
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
+ if test -d $$d/$$file; then \
+- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -553,7 +577,7 @@
+ all-am: Makefile $(LTLIBRARIES) $(MANS) $(DATA)
+ installdirs:
+ for dir in "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man8dir)"; do \
+- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
++ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
+ install: install-am
+ install-exec: install-exec-am
+@@ -589,7 +613,7 @@
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-tags
++ distclean-libtool distclean-tags
+
+ dvi: dvi-am
+
+@@ -603,20 +627,12 @@
+
+ install-data-am: install-man install-securelibLTLIBRARIES
+
+-install-dvi: install-dvi-am
+-
+ install-exec-am:
+
+-install-html: install-html-am
+-
+ install-info: install-info-am
+
+ install-man: install-man8
+
+-install-pdf: install-pdf-am
+-
+-install-ps: install-ps-am
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -637,27 +653,24 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-man uninstall-securelibLTLIBRARIES
++uninstall-am: uninstall-info-am uninstall-man \
++ uninstall-securelibLTLIBRARIES
+
+ uninstall-man: uninstall-man8
+
+-.MAKE: install-am install-strip
+-
+ .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
+ clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
+ distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+- install-data-am install-dvi install-dvi-am install-exec \
+- install-exec-am install-html install-html-am install-info \
+- install-info-am install-man install-man8 install-pdf \
+- install-pdf-am install-ps install-ps-am \
++ install-data-am install-exec install-exec-am install-info \
++ install-info-am install-man install-man8 \
+ install-securelibLTLIBRARIES install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+- tags uninstall uninstall-am uninstall-man uninstall-man8 \
+- uninstall-securelibLTLIBRARIES
++ tags uninstall uninstall-am uninstall-info-am uninstall-man \
++ uninstall-man8 uninstall-securelibLTLIBRARIES
+
+ @ENABLE_REGENERATE_MAN_TRUE@README: pam_lastlog.8.xml
+ @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
+Index: pam.debian/modules/pam_limits/Makefile.in
===================================================================
---- pam.deb.orig/modules/pam_limits/Makefile.in
-+++ pam.deb/modules/pam_limits/Makefile.in
+--- pam.debian.orig/modules/pam_limits/Makefile.in
++++ pam.debian/modules/pam_limits/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -68,7 +68,7 @@
- pam_limits_la_LIBADD =
+@@ -19,11 +19,15 @@
+ #
+
+
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -68,18 +72,17 @@
+ pam_limits_la_DEPENDENCIES =
pam_limits_la_SOURCES = pam_limits.c
pam_limits_la_OBJECTS = pam_limits.lo
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -111,6 +111,7 @@
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
++ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++ $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+- $(LDFLAGS) -o $@
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = pam_limits.c
+ DIST_SOURCES = pam_limits.c
+ man5dir = $(mandir)/man5
+@@ -92,6 +95,8 @@
+ CTAGS = ctags
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AUTOCONF = @AUTOCONF@
+@@ -111,11 +116,16 @@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -8611,7 +13347,40 @@ Index: pam.deb/modules/pam_limits/Makefile.in
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -163,6 +164,7 @@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
++ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
++ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
++ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -124,7 +134,18 @@
+ GMSGFMT_015 = @GMSGFMT_015@
+ GREP = @GREP@
+ HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
+-INSTALL = @INSTALL@
++HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
++HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
++HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
++HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
++HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
++HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
++HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
++HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
++HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
++HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
++HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
++HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -159,10 +180,10 @@
+ LTLIBINTL = @LTLIBINTL@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+-MKDIR_P = @MKDIR_P@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
@@ -8619,99 +13388,349 @@ Index: pam.deb/modules/pam_limits/Makefile.in
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -178,6 +180,7 @@
- RANLIB = @RANLIB@
- SCONFIGDIR = @SCONFIGDIR@
- SECUREDIR = @SECUREDIR@
-+SED = @SED@
+@@ -181,6 +202,8 @@
+ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
++STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
++STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
STRIP = @STRIP@
-@@ -303,8 +306,8 @@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+@@ -194,13 +217,13 @@
+ XSLTPROC = @XSLTPROC@
+ YACC = @YACC@
+ YFLAGS = @YFLAGS@
+-abs_builddir = @abs_builddir@
+-abs_srcdir = @abs_srcdir@
+-abs_top_builddir = @abs_top_builddir@
+-abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -212,7 +235,6 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+-builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -243,11 +265,8 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+-srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_builddir = @top_builddir@
+-top_srcdir = @top_srcdir@
+ CLEANFILES = *~
+ EXTRA_DIST = README $(MANS) $(XMLS) limits.conf tst-pam_limits
+ man_MANS = limits.conf.5 pam_limits.8
+@@ -300,7 +319,7 @@
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+- test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
++ test -z "$(securelibdir)" || $(mkdir_p) "$(DESTDIR)$(securelibdir)"
@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \
-- $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \
- else :; fi; \
- done
+@@ -311,7 +330,7 @@
-@@ -312,8 +315,8 @@
+ uninstall-securelibLTLIBRARIES:
@$(NORMAL_UNINSTALL)
- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
+- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
++ @set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
+@@ -326,7 +345,7 @@
+ rm -f "$${dir}/so_locations"; \
done
+ pam_limits.la: $(pam_limits_la_OBJECTS) $(pam_limits_la_DEPENDENCIES)
+- $(LINK) -rpath $(securelibdir) $(pam_limits_la_OBJECTS) $(pam_limits_la_LIBADD) $(LIBS)
++ $(LINK) -rpath $(securelibdir) $(pam_limits_la_LDFLAGS) $(pam_limits_la_OBJECTS) $(pam_limits_la_LIBADD) $(LIBS)
- clean-securelibLTLIBRARIES:
-@@ -474,8 +477,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+@@ -337,22 +356,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_limits.Plo@am__quote@
-@@ -487,8 +490,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -498,13 +501,12 @@
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-Index: pam.deb/modules/pam_listfile/Makefile.in
+ .c.o:
+-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
++@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+@@ -362,9 +381,13 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
++
++distclean-libtool:
++ -rm -f libtool
++uninstall-info-am:
+ install-man5: $(man5_MANS) $(man_MANS)
+ @$(NORMAL_INSTALL)
+- test -z "$(man5dir)" || $(MKDIR_P) "$(DESTDIR)$(man5dir)"
++ test -z "$(man5dir)" || $(mkdir_p) "$(DESTDIR)$(man5dir)"
+ @list='$(man5_MANS) $(dist_man5_MANS) $(nodist_man5_MANS)'; \
+ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ for i in $$l2; do \
+@@ -409,7 +432,7 @@
+ done
+ install-man8: $(man8_MANS) $(man_MANS)
+ @$(NORMAL_INSTALL)
+- test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
++ test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
+ @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
+ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ for i in $$l2; do \
+@@ -454,7 +477,7 @@
+ done
+ install-secureconfDATA: $(secureconf_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(secureconfdir)" || $(MKDIR_P) "$(DESTDIR)$(secureconfdir)"
++ test -z "$(secureconfdir)" || $(mkdir_p) "$(DESTDIR)$(secureconfdir)"
+ @list='$(secureconf_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+@@ -519,9 +542,9 @@
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ check-TESTS: $(TESTS)
+- @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
++ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
+ srcdir=$(srcdir); export srcdir; \
+- list=' $(TESTS) '; \
++ list='$(TESTS)'; \
+ if test -n "$$list"; then \
+ for tst in $$list; do \
+ if test -f ./$$tst; then dir=./; \
+@@ -530,7 +553,7 @@
+ if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *$$ws$$tst$$ws*) \
++ *" $$tst "*) \
+ xpass=`expr $$xpass + 1`; \
+ failed=`expr $$failed + 1`; \
+ echo "XPASS: $$tst"; \
+@@ -542,7 +565,7 @@
+ elif test $$? -ne 77; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *$$ws$$tst$$ws*) \
++ *" $$tst "*) \
+ xfail=`expr $$xfail + 1`; \
+ echo "XFAIL: $$tst"; \
+ ;; \
+@@ -592,21 +615,22 @@
+ else :; fi
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- list='$(DISTFILES)'; \
+- dist_files=`for file in $$list; do echo $$file; done | \
+- sed -e "s|^$$srcdirstrip/||;t" \
+- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+- case $$dist_files in \
+- */*) $(MKDIR_P) `echo "$$dist_files" | \
+- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+- sort -u` ;; \
+- esac; \
+- for file in $$dist_files; do \
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
+ if test -d $$d/$$file; then \
+- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -623,7 +647,7 @@
+ all-am: Makefile $(LTLIBRARIES) $(MANS) $(DATA)
+ installdirs:
+ for dir in "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(secureconfdir)"; do \
+- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
++ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
+ install: install-am
+ install-exec: install-exec-am
+@@ -659,7 +683,7 @@
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-tags
++ distclean-libtool distclean-tags
+
+ dvi: dvi-am
+
+@@ -674,20 +698,12 @@
+ install-data-am: install-data-local install-man install-secureconfDATA \
+ install-securelibLTLIBRARIES
+
+-install-dvi: install-dvi-am
+-
+ install-exec-am:
+
+-install-html: install-html-am
+-
+ install-info: install-info-am
+
+ install-man: install-man5 install-man8
+
+-install-pdf: install-pdf-am
+-
+-install-ps: install-ps-am
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -708,29 +724,25 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-man uninstall-secureconfDATA \
++uninstall-am: uninstall-info-am uninstall-man uninstall-secureconfDATA \
+ uninstall-securelibLTLIBRARIES
+
+ uninstall-man: uninstall-man5 uninstall-man8
+
+-.MAKE: install-am install-strip
+-
+ .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
+ clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
+ distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+- install-data-am install-data-local install-dvi install-dvi-am \
+- install-exec install-exec-am install-html install-html-am \
+- install-info install-info-am install-man install-man5 \
+- install-man8 install-pdf install-pdf-am install-ps \
+- install-ps-am install-secureconfDATA \
++ install-data-am install-data-local install-exec \
++ install-exec-am install-info install-info-am install-man \
++ install-man5 install-man8 install-secureconfDATA \
+ install-securelibLTLIBRARIES install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+- tags uninstall uninstall-am uninstall-man uninstall-man5 \
+- uninstall-man8 uninstall-secureconfDATA \
++ tags uninstall uninstall-am uninstall-info-am uninstall-man \
++ uninstall-man5 uninstall-man8 uninstall-secureconfDATA \
+ uninstall-securelibLTLIBRARIES
+
+ @ENABLE_REGENERATE_MAN_TRUE@README: pam_limits.8.xml limits.conf.5.xml
+Index: pam.debian/modules/pam_listfile/Makefile.in
===================================================================
---- pam.deb.orig/modules/pam_listfile/Makefile.in
-+++ pam.deb/modules/pam_listfile/Makefile.in
+--- pam.debian.orig/modules/pam_listfile/Makefile.in
++++ pam.debian/modules/pam_listfile/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -67,7 +67,7 @@
- pam_listfile_la_LIBADD =
+@@ -19,11 +19,15 @@
+ #
+
+
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -67,18 +71,17 @@
+ pam_listfile_la_DEPENDENCIES =
pam_listfile_la_SOURCES = pam_listfile.c
pam_listfile_la_OBJECTS = pam_listfile.lo
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -108,6 +108,7 @@
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
++ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++ $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+- $(LDFLAGS) -o $@
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = pam_listfile.c
+ DIST_SOURCES = pam_listfile.c
+ man8dir = $(mandir)/man8
+@@ -89,6 +92,8 @@
+ CTAGS = ctags
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AUTOCONF = @AUTOCONF@
+@@ -108,11 +113,16 @@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -8719,7 +13738,40 @@ Index: pam.deb/modules/pam_listfile/Makefile.in
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -160,6 +161,7 @@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
++ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
++ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
++ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -121,7 +131,18 @@
+ GMSGFMT_015 = @GMSGFMT_015@
+ GREP = @GREP@
+ HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
+-INSTALL = @INSTALL@
++HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
++HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
++HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
++HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
++HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
++HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
++HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
++HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
++HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
++HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
++HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
++HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -156,10 +177,10 @@
+ LTLIBINTL = @LTLIBINTL@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+-MKDIR_P = @MKDIR_P@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
@@ -8727,99 +13779,329 @@ Index: pam.deb/modules/pam_listfile/Makefile.in
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -175,6 +177,7 @@
- RANLIB = @RANLIB@
- SCONFIGDIR = @SCONFIGDIR@
- SECUREDIR = @SECUREDIR@
-+SED = @SED@
+@@ -178,6 +199,8 @@
+ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
++STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
++STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
STRIP = @STRIP@
-@@ -295,8 +298,8 @@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+@@ -191,13 +214,13 @@
+ XSLTPROC = @XSLTPROC@
+ YACC = @YACC@
+ YFLAGS = @YFLAGS@
+-abs_builddir = @abs_builddir@
+-abs_srcdir = @abs_srcdir@
+-abs_top_builddir = @abs_top_builddir@
+-abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -209,7 +232,6 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+-builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -240,11 +262,8 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+-srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_builddir = @top_builddir@
+-top_srcdir = @top_srcdir@
+ CLEANFILES = *~
+ EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_listfile
+ man_MANS = pam_listfile.8
+@@ -292,7 +311,7 @@
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+- test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
++ test -z "$(securelibdir)" || $(mkdir_p) "$(DESTDIR)$(securelibdir)"
@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \
-- $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \
- else :; fi; \
- done
+@@ -303,7 +322,7 @@
-@@ -304,8 +307,8 @@
+ uninstall-securelibLTLIBRARIES:
@$(NORMAL_UNINSTALL)
- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
+- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
++ @set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
+@@ -318,7 +337,7 @@
+ rm -f "$${dir}/so_locations"; \
done
+ pam_listfile.la: $(pam_listfile_la_OBJECTS) $(pam_listfile_la_DEPENDENCIES)
+- $(LINK) -rpath $(securelibdir) $(pam_listfile_la_OBJECTS) $(pam_listfile_la_LIBADD) $(LIBS)
++ $(LINK) -rpath $(securelibdir) $(pam_listfile_la_LDFLAGS) $(pam_listfile_la_OBJECTS) $(pam_listfile_la_LIBADD) $(LIBS)
- clean-securelibLTLIBRARIES:
-@@ -404,8 +407,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+@@ -329,22 +348,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_listfile.Plo@am__quote@
-@@ -417,8 +420,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -428,13 +431,12 @@
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-Index: pam.deb/modules/pam_localuser/Makefile.in
+ .c.o:
+-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
++@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+@@ -354,9 +373,13 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
++
++distclean-libtool:
++ -rm -f libtool
++uninstall-info-am:
+ install-man8: $(man8_MANS) $(man_MANS)
+ @$(NORMAL_INSTALL)
+- test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
++ test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
+ @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
+ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ for i in $$l2; do \
+@@ -449,9 +472,9 @@
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ check-TESTS: $(TESTS)
+- @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
++ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
+ srcdir=$(srcdir); export srcdir; \
+- list=' $(TESTS) '; \
++ list='$(TESTS)'; \
+ if test -n "$$list"; then \
+ for tst in $$list; do \
+ if test -f ./$$tst; then dir=./; \
+@@ -460,7 +483,7 @@
+ if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *$$ws$$tst$$ws*) \
++ *" $$tst "*) \
+ xpass=`expr $$xpass + 1`; \
+ failed=`expr $$failed + 1`; \
+ echo "XPASS: $$tst"; \
+@@ -472,7 +495,7 @@
+ elif test $$? -ne 77; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *$$ws$$tst$$ws*) \
++ *" $$tst "*) \
+ xfail=`expr $$xfail + 1`; \
+ echo "XFAIL: $$tst"; \
+ ;; \
+@@ -522,21 +545,22 @@
+ else :; fi
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- list='$(DISTFILES)'; \
+- dist_files=`for file in $$list; do echo $$file; done | \
+- sed -e "s|^$$srcdirstrip/||;t" \
+- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+- case $$dist_files in \
+- */*) $(MKDIR_P) `echo "$$dist_files" | \
+- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+- sort -u` ;; \
+- esac; \
+- for file in $$dist_files; do \
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
+ if test -d $$d/$$file; then \
+- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -553,7 +577,7 @@
+ all-am: Makefile $(LTLIBRARIES) $(MANS) $(DATA)
+ installdirs:
+ for dir in "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man8dir)"; do \
+- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
++ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
+ install: install-am
+ install-exec: install-exec-am
+@@ -589,7 +613,7 @@
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-tags
++ distclean-libtool distclean-tags
+
+ dvi: dvi-am
+
+@@ -603,20 +627,12 @@
+
+ install-data-am: install-man install-securelibLTLIBRARIES
+
+-install-dvi: install-dvi-am
+-
+ install-exec-am:
+
+-install-html: install-html-am
+-
+ install-info: install-info-am
+
+ install-man: install-man8
+
+-install-pdf: install-pdf-am
+-
+-install-ps: install-ps-am
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -637,27 +653,24 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-man uninstall-securelibLTLIBRARIES
++uninstall-am: uninstall-info-am uninstall-man \
++ uninstall-securelibLTLIBRARIES
+
+ uninstall-man: uninstall-man8
+
+-.MAKE: install-am install-strip
+-
+ .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
+ clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
+ distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+- install-data-am install-dvi install-dvi-am install-exec \
+- install-exec-am install-html install-html-am install-info \
+- install-info-am install-man install-man8 install-pdf \
+- install-pdf-am install-ps install-ps-am \
++ install-data-am install-exec install-exec-am install-info \
++ install-info-am install-man install-man8 \
+ install-securelibLTLIBRARIES install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+- tags uninstall uninstall-am uninstall-man uninstall-man8 \
+- uninstall-securelibLTLIBRARIES
++ tags uninstall uninstall-am uninstall-info-am uninstall-man \
++ uninstall-man8 uninstall-securelibLTLIBRARIES
+
+ @ENABLE_REGENERATE_MAN_TRUE@README: pam_listfile.8.xml
+ @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
+Index: pam.debian/modules/pam_localuser/Makefile.in
===================================================================
---- pam.deb.orig/modules/pam_localuser/Makefile.in
-+++ pam.deb/modules/pam_localuser/Makefile.in
+--- pam.debian.orig/modules/pam_localuser/Makefile.in
++++ pam.debian/modules/pam_localuser/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -67,7 +67,7 @@
- pam_localuser_la_LIBADD =
+@@ -19,11 +19,15 @@
+ #
+
+
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -67,18 +71,17 @@
+ pam_localuser_la_DEPENDENCIES =
pam_localuser_la_SOURCES = pam_localuser.c
pam_localuser_la_OBJECTS = pam_localuser.lo
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -108,6 +108,7 @@
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
++ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++ $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+- $(LDFLAGS) -o $@
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = pam_localuser.c
+ DIST_SOURCES = pam_localuser.c
+ man8dir = $(mandir)/man8
+@@ -89,6 +92,8 @@
+ CTAGS = ctags
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AUTOCONF = @AUTOCONF@
+@@ -108,11 +113,16 @@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -8827,7 +14109,40 @@ Index: pam.deb/modules/pam_localuser/Makefile.in
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -160,6 +161,7 @@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
++ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
++ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
++ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -121,7 +131,18 @@
+ GMSGFMT_015 = @GMSGFMT_015@
+ GREP = @GREP@
+ HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
+-INSTALL = @INSTALL@
++HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
++HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
++HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
++HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
++HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
++HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
++HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
++HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
++HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
++HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
++HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
++HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -156,10 +177,10 @@
+ LTLIBINTL = @LTLIBINTL@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+-MKDIR_P = @MKDIR_P@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
@@ -8835,99 +14150,329 @@ Index: pam.deb/modules/pam_localuser/Makefile.in
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -175,6 +177,7 @@
- RANLIB = @RANLIB@
- SCONFIGDIR = @SCONFIGDIR@
- SECUREDIR = @SECUREDIR@
-+SED = @SED@
+@@ -178,6 +199,8 @@
+ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
++STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
++STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
STRIP = @STRIP@
-@@ -295,8 +298,8 @@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+@@ -191,13 +214,13 @@
+ XSLTPROC = @XSLTPROC@
+ YACC = @YACC@
+ YFLAGS = @YFLAGS@
+-abs_builddir = @abs_builddir@
+-abs_srcdir = @abs_srcdir@
+-abs_top_builddir = @abs_top_builddir@
+-abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -209,7 +232,6 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+-builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -240,11 +262,8 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+-srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_builddir = @top_builddir@
+-top_srcdir = @top_srcdir@
+ CLEANFILES = *~
+ EXTRA_DIST = README ${MANS} $(XMLS) tst-pam_localuser
+ TESTS = tst-pam_localuser
+@@ -292,7 +311,7 @@
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+- test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
++ test -z "$(securelibdir)" || $(mkdir_p) "$(DESTDIR)$(securelibdir)"
@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \
-- $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \
- else :; fi; \
- done
+@@ -303,7 +322,7 @@
-@@ -304,8 +307,8 @@
+ uninstall-securelibLTLIBRARIES:
@$(NORMAL_UNINSTALL)
- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
+- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
++ @set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
+@@ -318,7 +337,7 @@
+ rm -f "$${dir}/so_locations"; \
done
+ pam_localuser.la: $(pam_localuser_la_OBJECTS) $(pam_localuser_la_DEPENDENCIES)
+- $(LINK) -rpath $(securelibdir) $(pam_localuser_la_OBJECTS) $(pam_localuser_la_LIBADD) $(LIBS)
++ $(LINK) -rpath $(securelibdir) $(pam_localuser_la_LDFLAGS) $(pam_localuser_la_OBJECTS) $(pam_localuser_la_LIBADD) $(LIBS)
- clean-securelibLTLIBRARIES:
-@@ -404,8 +407,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+@@ -329,22 +348,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_localuser.Plo@am__quote@
-@@ -417,8 +420,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -428,13 +431,12 @@
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-Index: pam.deb/modules/pam_loginuid/Makefile.in
+ .c.o:
+-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
++@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+@@ -354,9 +373,13 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
++
++distclean-libtool:
++ -rm -f libtool
++uninstall-info-am:
+ install-man8: $(man8_MANS) $(man_MANS)
+ @$(NORMAL_INSTALL)
+- test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
++ test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
+ @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
+ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ for i in $$l2; do \
+@@ -449,9 +472,9 @@
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ check-TESTS: $(TESTS)
+- @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
++ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
+ srcdir=$(srcdir); export srcdir; \
+- list=' $(TESTS) '; \
++ list='$(TESTS)'; \
+ if test -n "$$list"; then \
+ for tst in $$list; do \
+ if test -f ./$$tst; then dir=./; \
+@@ -460,7 +483,7 @@
+ if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *$$ws$$tst$$ws*) \
++ *" $$tst "*) \
+ xpass=`expr $$xpass + 1`; \
+ failed=`expr $$failed + 1`; \
+ echo "XPASS: $$tst"; \
+@@ -472,7 +495,7 @@
+ elif test $$? -ne 77; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *$$ws$$tst$$ws*) \
++ *" $$tst "*) \
+ xfail=`expr $$xfail + 1`; \
+ echo "XFAIL: $$tst"; \
+ ;; \
+@@ -522,21 +545,22 @@
+ else :; fi
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- list='$(DISTFILES)'; \
+- dist_files=`for file in $$list; do echo $$file; done | \
+- sed -e "s|^$$srcdirstrip/||;t" \
+- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+- case $$dist_files in \
+- */*) $(MKDIR_P) `echo "$$dist_files" | \
+- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+- sort -u` ;; \
+- esac; \
+- for file in $$dist_files; do \
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
+ if test -d $$d/$$file; then \
+- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -553,7 +577,7 @@
+ all-am: Makefile $(LTLIBRARIES) $(MANS) $(DATA)
+ installdirs:
+ for dir in "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man8dir)"; do \
+- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
++ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
+ install: install-am
+ install-exec: install-exec-am
+@@ -589,7 +613,7 @@
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-tags
++ distclean-libtool distclean-tags
+
+ dvi: dvi-am
+
+@@ -603,20 +627,12 @@
+
+ install-data-am: install-man install-securelibLTLIBRARIES
+
+-install-dvi: install-dvi-am
+-
+ install-exec-am:
+
+-install-html: install-html-am
+-
+ install-info: install-info-am
+
+ install-man: install-man8
+
+-install-pdf: install-pdf-am
+-
+-install-ps: install-ps-am
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -637,27 +653,24 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-man uninstall-securelibLTLIBRARIES
++uninstall-am: uninstall-info-am uninstall-man \
++ uninstall-securelibLTLIBRARIES
+
+ uninstall-man: uninstall-man8
+
+-.MAKE: install-am install-strip
+-
+ .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
+ clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
+ distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+- install-data-am install-dvi install-dvi-am install-exec \
+- install-exec-am install-html install-html-am install-info \
+- install-info-am install-man install-man8 install-pdf \
+- install-pdf-am install-ps install-ps-am \
++ install-data-am install-exec install-exec-am install-info \
++ install-info-am install-man install-man8 \
+ install-securelibLTLIBRARIES install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+- tags uninstall uninstall-am uninstall-man uninstall-man8 \
+- uninstall-securelibLTLIBRARIES
++ tags uninstall uninstall-am uninstall-info-am uninstall-man \
++ uninstall-man8 uninstall-securelibLTLIBRARIES
+
+ @ENABLE_REGENERATE_MAN_TRUE@README: pam_localuser.8.xml
+ @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
+Index: pam.debian/modules/pam_loginuid/Makefile.in
===================================================================
---- pam.deb.orig/modules/pam_loginuid/Makefile.in
-+++ pam.deb/modules/pam_loginuid/Makefile.in
+--- pam.debian.orig/modules/pam_loginuid/Makefile.in
++++ pam.debian/modules/pam_loginuid/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -67,7 +67,7 @@
- pam_loginuid_la_LIBADD =
+@@ -19,11 +19,15 @@
+ #
+
+
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -67,18 +71,17 @@
+ pam_loginuid_la_DEPENDENCIES =
pam_loginuid_la_SOURCES = pam_loginuid.c
pam_loginuid_la_OBJECTS = pam_loginuid.lo
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -108,6 +108,7 @@
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
++ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++ $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+- $(LDFLAGS) -o $@
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = pam_loginuid.c
+ DIST_SOURCES = pam_loginuid.c
+ man8dir = $(mandir)/man8
+@@ -89,6 +92,8 @@
+ CTAGS = ctags
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AUTOCONF = @AUTOCONF@
+@@ -108,11 +113,16 @@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -8935,7 +14480,40 @@ Index: pam.deb/modules/pam_loginuid/Makefile.in
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -160,6 +161,7 @@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
++ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
++ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
++ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -121,7 +131,18 @@
+ GMSGFMT_015 = @GMSGFMT_015@
+ GREP = @GREP@
+ HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
+-INSTALL = @INSTALL@
++HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
++HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
++HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
++HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
++HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
++HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
++HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
++HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
++HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
++HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
++HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
++HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -156,10 +177,10 @@
+ LTLIBINTL = @LTLIBINTL@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+-MKDIR_P = @MKDIR_P@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
@@ -8943,99 +14521,329 @@ Index: pam.deb/modules/pam_loginuid/Makefile.in
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -175,6 +177,7 @@
- RANLIB = @RANLIB@
- SCONFIGDIR = @SCONFIGDIR@
- SECUREDIR = @SECUREDIR@
-+SED = @SED@
+@@ -178,6 +199,8 @@
+ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
++STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
++STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
STRIP = @STRIP@
-@@ -295,8 +298,8 @@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+@@ -191,13 +214,13 @@
+ XSLTPROC = @XSLTPROC@
+ YACC = @YACC@
+ YFLAGS = @YFLAGS@
+-abs_builddir = @abs_builddir@
+-abs_srcdir = @abs_srcdir@
+-abs_top_builddir = @abs_top_builddir@
+-abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -209,7 +232,6 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+-builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -240,11 +262,8 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+-srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_builddir = @top_builddir@
+-top_srcdir = @top_srcdir@
+ CLEANFILES = *~
+ EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_loginuid
+ man_MANS = pam_loginuid.8
+@@ -292,7 +311,7 @@
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+- test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
++ test -z "$(securelibdir)" || $(mkdir_p) "$(DESTDIR)$(securelibdir)"
@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \
-- $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \
- else :; fi; \
- done
+@@ -303,7 +322,7 @@
-@@ -304,8 +307,8 @@
+ uninstall-securelibLTLIBRARIES:
@$(NORMAL_UNINSTALL)
- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
+- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
++ @set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
+@@ -318,7 +337,7 @@
+ rm -f "$${dir}/so_locations"; \
done
+ pam_loginuid.la: $(pam_loginuid_la_OBJECTS) $(pam_loginuid_la_DEPENDENCIES)
+- $(LINK) -rpath $(securelibdir) $(pam_loginuid_la_OBJECTS) $(pam_loginuid_la_LIBADD) $(LIBS)
++ $(LINK) -rpath $(securelibdir) $(pam_loginuid_la_LDFLAGS) $(pam_loginuid_la_OBJECTS) $(pam_loginuid_la_LIBADD) $(LIBS)
- clean-securelibLTLIBRARIES:
-@@ -404,8 +407,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+@@ -329,22 +348,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_loginuid.Plo@am__quote@
-@@ -417,8 +420,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -428,13 +431,12 @@
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-Index: pam.deb/modules/pam_mail/Makefile.in
+ .c.o:
+-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
++@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+@@ -354,9 +373,13 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
++
++distclean-libtool:
++ -rm -f libtool
++uninstall-info-am:
+ install-man8: $(man8_MANS) $(man_MANS)
+ @$(NORMAL_INSTALL)
+- test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
++ test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
+ @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
+ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ for i in $$l2; do \
+@@ -449,9 +472,9 @@
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ check-TESTS: $(TESTS)
+- @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
++ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
+ srcdir=$(srcdir); export srcdir; \
+- list=' $(TESTS) '; \
++ list='$(TESTS)'; \
+ if test -n "$$list"; then \
+ for tst in $$list; do \
+ if test -f ./$$tst; then dir=./; \
+@@ -460,7 +483,7 @@
+ if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *$$ws$$tst$$ws*) \
++ *" $$tst "*) \
+ xpass=`expr $$xpass + 1`; \
+ failed=`expr $$failed + 1`; \
+ echo "XPASS: $$tst"; \
+@@ -472,7 +495,7 @@
+ elif test $$? -ne 77; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *$$ws$$tst$$ws*) \
++ *" $$tst "*) \
+ xfail=`expr $$xfail + 1`; \
+ echo "XFAIL: $$tst"; \
+ ;; \
+@@ -522,21 +545,22 @@
+ else :; fi
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- list='$(DISTFILES)'; \
+- dist_files=`for file in $$list; do echo $$file; done | \
+- sed -e "s|^$$srcdirstrip/||;t" \
+- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+- case $$dist_files in \
+- */*) $(MKDIR_P) `echo "$$dist_files" | \
+- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+- sort -u` ;; \
+- esac; \
+- for file in $$dist_files; do \
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
+ if test -d $$d/$$file; then \
+- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -553,7 +577,7 @@
+ all-am: Makefile $(LTLIBRARIES) $(MANS) $(DATA)
+ installdirs:
+ for dir in "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man8dir)"; do \
+- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
++ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
+ install: install-am
+ install-exec: install-exec-am
+@@ -589,7 +613,7 @@
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-tags
++ distclean-libtool distclean-tags
+
+ dvi: dvi-am
+
+@@ -603,20 +627,12 @@
+
+ install-data-am: install-man install-securelibLTLIBRARIES
+
+-install-dvi: install-dvi-am
+-
+ install-exec-am:
+
+-install-html: install-html-am
+-
+ install-info: install-info-am
+
+ install-man: install-man8
+
+-install-pdf: install-pdf-am
+-
+-install-ps: install-ps-am
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -637,27 +653,24 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-man uninstall-securelibLTLIBRARIES
++uninstall-am: uninstall-info-am uninstall-man \
++ uninstall-securelibLTLIBRARIES
+
+ uninstall-man: uninstall-man8
+
+-.MAKE: install-am install-strip
+-
+ .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
+ clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
+ distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+- install-data-am install-dvi install-dvi-am install-exec \
+- install-exec-am install-html install-html-am install-info \
+- install-info-am install-man install-man8 install-pdf \
+- install-pdf-am install-ps install-ps-am \
++ install-data-am install-exec install-exec-am install-info \
++ install-info-am install-man install-man8 \
+ install-securelibLTLIBRARIES install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+- tags uninstall uninstall-am uninstall-man uninstall-man8 \
+- uninstall-securelibLTLIBRARIES
++ tags uninstall uninstall-am uninstall-info-am uninstall-man \
++ uninstall-man8 uninstall-securelibLTLIBRARIES
+
+
+ @ENABLE_REGENERATE_MAN_TRUE@README: pam_loginuid.8.xml
+Index: pam.debian/modules/pam_mail/Makefile.in
===================================================================
---- pam.deb.orig/modules/pam_mail/Makefile.in
-+++ pam.deb/modules/pam_mail/Makefile.in
+--- pam.debian.orig/modules/pam_mail/Makefile.in
++++ pam.debian/modules/pam_mail/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -67,7 +67,7 @@
- pam_mail_la_LIBADD =
+@@ -19,11 +19,15 @@
+ #
+
+
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -67,18 +71,17 @@
+ pam_mail_la_DEPENDENCIES =
pam_mail_la_SOURCES = pam_mail.c
pam_mail_la_OBJECTS = pam_mail.lo
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -108,6 +108,7 @@
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
++ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++ $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+- $(LDFLAGS) -o $@
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = pam_mail.c
+ DIST_SOURCES = pam_mail.c
+ man8dir = $(mandir)/man8
+@@ -89,6 +92,8 @@
+ CTAGS = ctags
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AUTOCONF = @AUTOCONF@
+@@ -108,11 +113,16 @@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -9043,7 +14851,40 @@ Index: pam.deb/modules/pam_mail/Makefile.in
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -160,6 +161,7 @@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
++ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
++ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
++ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -121,7 +131,18 @@
+ GMSGFMT_015 = @GMSGFMT_015@
+ GREP = @GREP@
+ HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
+-INSTALL = @INSTALL@
++HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
++HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
++HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
++HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
++HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
++HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
++HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
++HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
++HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
++HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
++HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
++HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -156,10 +177,10 @@
+ LTLIBINTL = @LTLIBINTL@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+-MKDIR_P = @MKDIR_P@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
@@ -9051,99 +14892,329 @@ Index: pam.deb/modules/pam_mail/Makefile.in
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -175,6 +177,7 @@
- RANLIB = @RANLIB@
- SCONFIGDIR = @SCONFIGDIR@
- SECUREDIR = @SECUREDIR@
-+SED = @SED@
+@@ -178,6 +199,8 @@
+ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
++STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
++STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
STRIP = @STRIP@
-@@ -295,8 +298,8 @@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+@@ -191,13 +214,13 @@
+ XSLTPROC = @XSLTPROC@
+ YACC = @YACC@
+ YFLAGS = @YFLAGS@
+-abs_builddir = @abs_builddir@
+-abs_srcdir = @abs_srcdir@
+-abs_top_builddir = @abs_top_builddir@
+-abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -209,7 +232,6 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+-builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -240,11 +262,8 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+-srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_builddir = @top_builddir@
+-top_srcdir = @top_srcdir@
+ CLEANFILES = *~
+ EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_mail
+ man_MANS = pam_mail.8
+@@ -292,7 +311,7 @@
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+- test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
++ test -z "$(securelibdir)" || $(mkdir_p) "$(DESTDIR)$(securelibdir)"
@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \
-- $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \
- else :; fi; \
- done
+@@ -303,7 +322,7 @@
-@@ -304,8 +307,8 @@
+ uninstall-securelibLTLIBRARIES:
@$(NORMAL_UNINSTALL)
- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
+- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
++ @set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
+@@ -318,7 +337,7 @@
+ rm -f "$${dir}/so_locations"; \
done
+ pam_mail.la: $(pam_mail_la_OBJECTS) $(pam_mail_la_DEPENDENCIES)
+- $(LINK) -rpath $(securelibdir) $(pam_mail_la_OBJECTS) $(pam_mail_la_LIBADD) $(LIBS)
++ $(LINK) -rpath $(securelibdir) $(pam_mail_la_LDFLAGS) $(pam_mail_la_OBJECTS) $(pam_mail_la_LIBADD) $(LIBS)
- clean-securelibLTLIBRARIES:
-@@ -404,8 +407,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+@@ -329,22 +348,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_mail.Plo@am__quote@
-@@ -417,8 +420,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -428,13 +431,12 @@
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-Index: pam.deb/modules/pam_mkhomedir/Makefile.in
+ .c.o:
+-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
++@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+@@ -354,9 +373,13 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
++
++distclean-libtool:
++ -rm -f libtool
++uninstall-info-am:
+ install-man8: $(man8_MANS) $(man_MANS)
+ @$(NORMAL_INSTALL)
+- test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
++ test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
+ @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
+ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ for i in $$l2; do \
+@@ -449,9 +472,9 @@
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ check-TESTS: $(TESTS)
+- @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
++ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
+ srcdir=$(srcdir); export srcdir; \
+- list=' $(TESTS) '; \
++ list='$(TESTS)'; \
+ if test -n "$$list"; then \
+ for tst in $$list; do \
+ if test -f ./$$tst; then dir=./; \
+@@ -460,7 +483,7 @@
+ if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *$$ws$$tst$$ws*) \
++ *" $$tst "*) \
+ xpass=`expr $$xpass + 1`; \
+ failed=`expr $$failed + 1`; \
+ echo "XPASS: $$tst"; \
+@@ -472,7 +495,7 @@
+ elif test $$? -ne 77; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *$$ws$$tst$$ws*) \
++ *" $$tst "*) \
+ xfail=`expr $$xfail + 1`; \
+ echo "XFAIL: $$tst"; \
+ ;; \
+@@ -522,21 +545,22 @@
+ else :; fi
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- list='$(DISTFILES)'; \
+- dist_files=`for file in $$list; do echo $$file; done | \
+- sed -e "s|^$$srcdirstrip/||;t" \
+- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+- case $$dist_files in \
+- */*) $(MKDIR_P) `echo "$$dist_files" | \
+- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+- sort -u` ;; \
+- esac; \
+- for file in $$dist_files; do \
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
+ if test -d $$d/$$file; then \
+- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -553,7 +577,7 @@
+ all-am: Makefile $(LTLIBRARIES) $(MANS) $(DATA)
+ installdirs:
+ for dir in "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man8dir)"; do \
+- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
++ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
+ install: install-am
+ install-exec: install-exec-am
+@@ -589,7 +613,7 @@
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-tags
++ distclean-libtool distclean-tags
+
+ dvi: dvi-am
+
+@@ -603,20 +627,12 @@
+
+ install-data-am: install-man install-securelibLTLIBRARIES
+
+-install-dvi: install-dvi-am
+-
+ install-exec-am:
+
+-install-html: install-html-am
+-
+ install-info: install-info-am
+
+ install-man: install-man8
+
+-install-pdf: install-pdf-am
+-
+-install-ps: install-ps-am
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -637,27 +653,24 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-man uninstall-securelibLTLIBRARIES
++uninstall-am: uninstall-info-am uninstall-man \
++ uninstall-securelibLTLIBRARIES
+
+ uninstall-man: uninstall-man8
+
+-.MAKE: install-am install-strip
+-
+ .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
+ clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
+ distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+- install-data-am install-dvi install-dvi-am install-exec \
+- install-exec-am install-html install-html-am install-info \
+- install-info-am install-man install-man8 install-pdf \
+- install-pdf-am install-ps install-ps-am \
++ install-data-am install-exec install-exec-am install-info \
++ install-info-am install-man install-man8 \
+ install-securelibLTLIBRARIES install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+- tags uninstall uninstall-am uninstall-man uninstall-man8 \
+- uninstall-securelibLTLIBRARIES
++ tags uninstall uninstall-am uninstall-info-am uninstall-man \
++ uninstall-man8 uninstall-securelibLTLIBRARIES
+
+ @ENABLE_REGENERATE_MAN_TRUE@README: pam_mail.8.xml
+ @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
+Index: pam.debian/modules/pam_mkhomedir/Makefile.in
===================================================================
---- pam.deb.orig/modules/pam_mkhomedir/Makefile.in
-+++ pam.deb/modules/pam_mkhomedir/Makefile.in
+--- pam.debian.orig/modules/pam_mkhomedir/Makefile.in
++++ pam.debian/modules/pam_mkhomedir/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -67,7 +67,7 @@
- pam_mkhomedir_la_LIBADD =
+@@ -19,11 +19,15 @@
+ #
+
+
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -67,18 +71,17 @@
+ pam_mkhomedir_la_DEPENDENCIES =
am_pam_mkhomedir_la_OBJECTS = pam_mkhomedir.lo
pam_mkhomedir_la_OBJECTS = $(am_pam_mkhomedir_la_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -108,6 +108,7 @@
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
++ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++ $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+- $(LDFLAGS) -o $@
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(pam_mkhomedir_la_SOURCES)
+ DIST_SOURCES = $(pam_mkhomedir_la_SOURCES)
+ man8dir = $(mandir)/man8
+@@ -89,6 +92,8 @@
+ CTAGS = ctags
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AUTOCONF = @AUTOCONF@
+@@ -108,11 +113,16 @@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -9151,7 +15222,40 @@ Index: pam.deb/modules/pam_mkhomedir/Makefile.in
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -160,6 +161,7 @@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
++ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
++ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
++ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -121,7 +131,18 @@
+ GMSGFMT_015 = @GMSGFMT_015@
+ GREP = @GREP@
+ HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
+-INSTALL = @INSTALL@
++HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
++HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
++HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
++HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
++HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
++HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
++HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
++HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
++HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
++HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
++HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
++HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -156,10 +177,10 @@
+ LTLIBINTL = @LTLIBINTL@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+-MKDIR_P = @MKDIR_P@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
@@ -9159,99 +15263,329 @@ Index: pam.deb/modules/pam_mkhomedir/Makefile.in
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -175,6 +177,7 @@
- RANLIB = @RANLIB@
- SCONFIGDIR = @SCONFIGDIR@
- SECUREDIR = @SECUREDIR@
-+SED = @SED@
+@@ -178,6 +199,8 @@
+ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
++STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
++STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
STRIP = @STRIP@
-@@ -296,8 +299,8 @@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+@@ -191,13 +214,13 @@
+ XSLTPROC = @XSLTPROC@
+ YACC = @YACC@
+ YFLAGS = @YFLAGS@
+-abs_builddir = @abs_builddir@
+-abs_srcdir = @abs_srcdir@
+-abs_top_builddir = @abs_top_builddir@
+-abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -209,7 +232,6 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+-builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -240,11 +262,8 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+-srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_builddir = @top_builddir@
+-top_srcdir = @top_srcdir@
+ CLEANFILES = *~
+ EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_mkhomedir
+ man_MANS = pam_mkhomedir.8
+@@ -293,7 +312,7 @@
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+- test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
++ test -z "$(securelibdir)" || $(mkdir_p) "$(DESTDIR)$(securelibdir)"
@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \
-- $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \
- else :; fi; \
- done
+@@ -304,7 +323,7 @@
-@@ -305,8 +308,8 @@
+ uninstall-securelibLTLIBRARIES:
@$(NORMAL_UNINSTALL)
- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
+- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
++ @set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
+@@ -319,7 +338,7 @@
+ rm -f "$${dir}/so_locations"; \
done
+ pam_mkhomedir.la: $(pam_mkhomedir_la_OBJECTS) $(pam_mkhomedir_la_DEPENDENCIES)
+- $(LINK) -rpath $(securelibdir) $(pam_mkhomedir_la_OBJECTS) $(pam_mkhomedir_la_LIBADD) $(LIBS)
++ $(LINK) -rpath $(securelibdir) $(pam_mkhomedir_la_LDFLAGS) $(pam_mkhomedir_la_OBJECTS) $(pam_mkhomedir_la_LIBADD) $(LIBS)
- clean-securelibLTLIBRARIES:
-@@ -405,8 +408,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+@@ -330,22 +349,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_mkhomedir.Plo@am__quote@
-@@ -418,8 +421,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -429,13 +432,12 @@
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-Index: pam.deb/modules/pam_motd/Makefile.in
+ .c.o:
+-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
++@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+@@ -355,9 +374,13 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
++
++distclean-libtool:
++ -rm -f libtool
++uninstall-info-am:
+ install-man8: $(man8_MANS) $(man_MANS)
+ @$(NORMAL_INSTALL)
+- test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
++ test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
+ @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
+ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ for i in $$l2; do \
+@@ -450,9 +473,9 @@
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ check-TESTS: $(TESTS)
+- @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
++ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
+ srcdir=$(srcdir); export srcdir; \
+- list=' $(TESTS) '; \
++ list='$(TESTS)'; \
+ if test -n "$$list"; then \
+ for tst in $$list; do \
+ if test -f ./$$tst; then dir=./; \
+@@ -461,7 +484,7 @@
+ if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *$$ws$$tst$$ws*) \
++ *" $$tst "*) \
+ xpass=`expr $$xpass + 1`; \
+ failed=`expr $$failed + 1`; \
+ echo "XPASS: $$tst"; \
+@@ -473,7 +496,7 @@
+ elif test $$? -ne 77; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *$$ws$$tst$$ws*) \
++ *" $$tst "*) \
+ xfail=`expr $$xfail + 1`; \
+ echo "XFAIL: $$tst"; \
+ ;; \
+@@ -523,21 +546,22 @@
+ else :; fi
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- list='$(DISTFILES)'; \
+- dist_files=`for file in $$list; do echo $$file; done | \
+- sed -e "s|^$$srcdirstrip/||;t" \
+- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+- case $$dist_files in \
+- */*) $(MKDIR_P) `echo "$$dist_files" | \
+- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+- sort -u` ;; \
+- esac; \
+- for file in $$dist_files; do \
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
+ if test -d $$d/$$file; then \
+- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -554,7 +578,7 @@
+ all-am: Makefile $(LTLIBRARIES) $(MANS) $(DATA)
+ installdirs:
+ for dir in "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man8dir)"; do \
+- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
++ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
+ install: install-am
+ install-exec: install-exec-am
+@@ -590,7 +614,7 @@
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-tags
++ distclean-libtool distclean-tags
+
+ dvi: dvi-am
+
+@@ -604,20 +628,12 @@
+
+ install-data-am: install-man install-securelibLTLIBRARIES
+
+-install-dvi: install-dvi-am
+-
+ install-exec-am:
+
+-install-html: install-html-am
+-
+ install-info: install-info-am
+
+ install-man: install-man8
+
+-install-pdf: install-pdf-am
+-
+-install-ps: install-ps-am
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -638,27 +654,24 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-man uninstall-securelibLTLIBRARIES
++uninstall-am: uninstall-info-am uninstall-man \
++ uninstall-securelibLTLIBRARIES
+
+ uninstall-man: uninstall-man8
+
+-.MAKE: install-am install-strip
+-
+ .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
+ clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
+ distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+- install-data-am install-dvi install-dvi-am install-exec \
+- install-exec-am install-html install-html-am install-info \
+- install-info-am install-man install-man8 install-pdf \
+- install-pdf-am install-ps install-ps-am \
++ install-data-am install-exec install-exec-am install-info \
++ install-info-am install-man install-man8 \
+ install-securelibLTLIBRARIES install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+- tags uninstall uninstall-am uninstall-man uninstall-man8 \
+- uninstall-securelibLTLIBRARIES
++ tags uninstall uninstall-am uninstall-info-am uninstall-man \
++ uninstall-man8 uninstall-securelibLTLIBRARIES
+
+ @ENABLE_REGENERATE_MAN_TRUE@README: pam_mkhomedir.8.xml
+ @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
+Index: pam.debian/modules/pam_motd/Makefile.in
===================================================================
---- pam.deb.orig/modules/pam_motd/Makefile.in
-+++ pam.deb/modules/pam_motd/Makefile.in
+--- pam.debian.orig/modules/pam_motd/Makefile.in
++++ pam.debian/modules/pam_motd/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -67,7 +67,7 @@
- pam_motd_la_LIBADD =
+@@ -19,11 +19,15 @@
+ #
+
+
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -67,18 +71,17 @@
+ pam_motd_la_DEPENDENCIES =
pam_motd_la_SOURCES = pam_motd.c
pam_motd_la_OBJECTS = pam_motd.lo
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -108,6 +108,7 @@
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
++ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++ $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+- $(LDFLAGS) -o $@
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = pam_motd.c
+ DIST_SOURCES = pam_motd.c
+ man8dir = $(mandir)/man8
+@@ -89,6 +92,8 @@
+ CTAGS = ctags
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AUTOCONF = @AUTOCONF@
+@@ -108,11 +113,16 @@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -9259,7 +15593,40 @@ Index: pam.deb/modules/pam_motd/Makefile.in
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -160,6 +161,7 @@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
++ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
++ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
++ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -121,7 +131,18 @@
+ GMSGFMT_015 = @GMSGFMT_015@
+ GREP = @GREP@
+ HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
+-INSTALL = @INSTALL@
++HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
++HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
++HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
++HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
++HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
++HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
++HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
++HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
++HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
++HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
++HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
++HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -156,10 +177,10 @@
+ LTLIBINTL = @LTLIBINTL@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+-MKDIR_P = @MKDIR_P@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
@@ -9267,99 +15634,329 @@ Index: pam.deb/modules/pam_motd/Makefile.in
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -175,6 +177,7 @@
- RANLIB = @RANLIB@
- SCONFIGDIR = @SCONFIGDIR@
- SECUREDIR = @SECUREDIR@
-+SED = @SED@
+@@ -178,6 +199,8 @@
+ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
++STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
++STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
STRIP = @STRIP@
-@@ -295,8 +298,8 @@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+@@ -191,13 +214,13 @@
+ XSLTPROC = @XSLTPROC@
+ YACC = @YACC@
+ YFLAGS = @YFLAGS@
+-abs_builddir = @abs_builddir@
+-abs_srcdir = @abs_srcdir@
+-abs_top_builddir = @abs_top_builddir@
+-abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -209,7 +232,6 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+-builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -240,11 +262,8 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+-srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_builddir = @top_builddir@
+-top_srcdir = @top_srcdir@
+ CLEANFILES = *~
+ EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_motd
+ man_MANS = pam_motd.8
+@@ -292,7 +311,7 @@
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+- test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
++ test -z "$(securelibdir)" || $(mkdir_p) "$(DESTDIR)$(securelibdir)"
@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \
-- $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \
- else :; fi; \
- done
+@@ -303,7 +322,7 @@
-@@ -304,8 +307,8 @@
+ uninstall-securelibLTLIBRARIES:
@$(NORMAL_UNINSTALL)
- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
+- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
++ @set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
+@@ -318,7 +337,7 @@
+ rm -f "$${dir}/so_locations"; \
done
+ pam_motd.la: $(pam_motd_la_OBJECTS) $(pam_motd_la_DEPENDENCIES)
+- $(LINK) -rpath $(securelibdir) $(pam_motd_la_OBJECTS) $(pam_motd_la_LIBADD) $(LIBS)
++ $(LINK) -rpath $(securelibdir) $(pam_motd_la_LDFLAGS) $(pam_motd_la_OBJECTS) $(pam_motd_la_LIBADD) $(LIBS)
- clean-securelibLTLIBRARIES:
-@@ -404,8 +407,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+@@ -329,22 +348,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_motd.Plo@am__quote@
-@@ -417,8 +420,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -428,13 +431,12 @@
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-Index: pam.deb/modules/pam_namespace/Makefile.in
+ .c.o:
+-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
++@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+@@ -354,9 +373,13 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
++
++distclean-libtool:
++ -rm -f libtool
++uninstall-info-am:
+ install-man8: $(man8_MANS) $(man_MANS)
+ @$(NORMAL_INSTALL)
+- test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
++ test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
+ @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
+ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ for i in $$l2; do \
+@@ -449,9 +472,9 @@
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ check-TESTS: $(TESTS)
+- @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
++ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
+ srcdir=$(srcdir); export srcdir; \
+- list=' $(TESTS) '; \
++ list='$(TESTS)'; \
+ if test -n "$$list"; then \
+ for tst in $$list; do \
+ if test -f ./$$tst; then dir=./; \
+@@ -460,7 +483,7 @@
+ if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *$$ws$$tst$$ws*) \
++ *" $$tst "*) \
+ xpass=`expr $$xpass + 1`; \
+ failed=`expr $$failed + 1`; \
+ echo "XPASS: $$tst"; \
+@@ -472,7 +495,7 @@
+ elif test $$? -ne 77; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *$$ws$$tst$$ws*) \
++ *" $$tst "*) \
+ xfail=`expr $$xfail + 1`; \
+ echo "XFAIL: $$tst"; \
+ ;; \
+@@ -522,21 +545,22 @@
+ else :; fi
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- list='$(DISTFILES)'; \
+- dist_files=`for file in $$list; do echo $$file; done | \
+- sed -e "s|^$$srcdirstrip/||;t" \
+- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+- case $$dist_files in \
+- */*) $(MKDIR_P) `echo "$$dist_files" | \
+- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+- sort -u` ;; \
+- esac; \
+- for file in $$dist_files; do \
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
+ if test -d $$d/$$file; then \
+- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -553,7 +577,7 @@
+ all-am: Makefile $(LTLIBRARIES) $(MANS) $(DATA)
+ installdirs:
+ for dir in "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man8dir)"; do \
+- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
++ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
+ install: install-am
+ install-exec: install-exec-am
+@@ -589,7 +613,7 @@
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-tags
++ distclean-libtool distclean-tags
+
+ dvi: dvi-am
+
+@@ -603,20 +627,12 @@
+
+ install-data-am: install-man install-securelibLTLIBRARIES
+
+-install-dvi: install-dvi-am
+-
+ install-exec-am:
+
+-install-html: install-html-am
+-
+ install-info: install-info-am
+
+ install-man: install-man8
+
+-install-pdf: install-pdf-am
+-
+-install-ps: install-ps-am
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -637,27 +653,24 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-man uninstall-securelibLTLIBRARIES
++uninstall-am: uninstall-info-am uninstall-man \
++ uninstall-securelibLTLIBRARIES
+
+ uninstall-man: uninstall-man8
+
+-.MAKE: install-am install-strip
+-
+ .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
+ clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
+ distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+- install-data-am install-dvi install-dvi-am install-exec \
+- install-exec-am install-html install-html-am install-info \
+- install-info-am install-man install-man8 install-pdf \
+- install-pdf-am install-ps install-ps-am \
++ install-data-am install-exec install-exec-am install-info \
++ install-info-am install-man install-man8 \
+ install-securelibLTLIBRARIES install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+- tags uninstall uninstall-am uninstall-man uninstall-man8 \
+- uninstall-securelibLTLIBRARIES
++ tags uninstall uninstall-am uninstall-info-am uninstall-man \
++ uninstall-man8 uninstall-securelibLTLIBRARIES
+
+ @ENABLE_REGENERATE_MAN_TRUE@README: pam_motd.8.xml
+ @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
+Index: pam.debian/modules/pam_namespace/Makefile.in
===================================================================
---- pam.deb.orig/modules/pam_namespace/Makefile.in
-+++ pam.deb/modules/pam_namespace/Makefile.in
+--- pam.debian.orig/modules/pam_namespace/Makefile.in
++++ pam.debian/modules/pam_namespace/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -78,7 +78,7 @@
+@@ -21,11 +21,15 @@
+
+
+
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -78,18 +82,17 @@
@HAVE_UNSHARE_TRUE@am_pam_namespace_la_rpath = -rpath $(securelibdir)
secureconfSCRIPT_INSTALL = $(INSTALL_SCRIPT)
SCRIPTS = $(secureconf_SCRIPTS)
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -122,6 +122,7 @@
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
++ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++ $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+- $(LDFLAGS) -o $@
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(pam_namespace_la_SOURCES)
+ DIST_SOURCES = $(am__pam_namespace_la_SOURCES_DIST)
+ man5dir = $(mandir)/man5
+@@ -103,6 +106,8 @@
+ CTAGS = ctags
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AUTOCONF = @AUTOCONF@
+@@ -122,11 +127,16 @@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -9367,7 +15964,40 @@ Index: pam.deb/modules/pam_namespace/Makefile.in
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -174,6 +175,7 @@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
++ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
++ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
++ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -135,7 +145,18 @@
+ GMSGFMT_015 = @GMSGFMT_015@
+ GREP = @GREP@
+ HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
+-INSTALL = @INSTALL@
++HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
++HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
++HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
++HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
++HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
++HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
++HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
++HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
++HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
++HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
++HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
++HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -170,10 +191,10 @@
+ LTLIBINTL = @LTLIBINTL@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+-MKDIR_P = @MKDIR_P@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
@@ -9375,99 +16005,351 @@ Index: pam.deb/modules/pam_namespace/Makefile.in
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -189,6 +191,7 @@
- RANLIB = @RANLIB@
- SCONFIGDIR = @SCONFIGDIR@
- SECUREDIR = @SECUREDIR@
-+SED = @SED@
+@@ -192,6 +213,8 @@
+ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
++STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
++STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
STRIP = @STRIP@
-@@ -317,8 +320,8 @@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+@@ -205,13 +228,13 @@
+ XSLTPROC = @XSLTPROC@
+ YACC = @YACC@
+ YFLAGS = @YFLAGS@
+-abs_builddir = @abs_builddir@
+-abs_srcdir = @abs_srcdir@
+-abs_top_builddir = @abs_top_builddir@
+-abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -223,7 +246,6 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+-builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -254,11 +276,8 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+-srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_builddir = @top_builddir@
+-top_srcdir = @top_srcdir@
+ CLEANFILES = *~
+ MAN5 = namespace.conf.5
+ MAN8 = pam_namespace.8
+@@ -314,7 +333,7 @@
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+- test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
++ test -z "$(securelibdir)" || $(mkdir_p) "$(DESTDIR)$(securelibdir)"
@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \
-- $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \
- else :; fi; \
- done
+@@ -325,7 +344,7 @@
-@@ -326,8 +329,8 @@
+ uninstall-securelibLTLIBRARIES:
@$(NORMAL_UNINSTALL)
- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
+- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
++ @set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
+@@ -340,10 +359,10 @@
+ rm -f "$${dir}/so_locations"; \
done
+ pam_namespace.la: $(pam_namespace_la_OBJECTS) $(pam_namespace_la_DEPENDENCIES)
+- $(LINK) $(am_pam_namespace_la_rpath) $(pam_namespace_la_OBJECTS) $(pam_namespace_la_LIBADD) $(LIBS)
++ $(LINK) $(am_pam_namespace_la_rpath) $(pam_namespace_la_LDFLAGS) $(pam_namespace_la_OBJECTS) $(pam_namespace_la_LIBADD) $(LIBS)
+ install-secureconfSCRIPTS: $(secureconf_SCRIPTS)
+ @$(NORMAL_INSTALL)
+- test -z "$(secureconfdir)" || $(MKDIR_P) "$(DESTDIR)$(secureconfdir)"
++ test -z "$(secureconfdir)" || $(mkdir_p) "$(DESTDIR)$(secureconfdir)"
+ @list='$(secureconf_SCRIPTS)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ if test -f $$d$$p; then \
+@@ -371,22 +390,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_namespace.Plo@am__quote@
- clean-securelibLTLIBRARIES:
-@@ -508,8 +511,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
+ .c.o:
+-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
++@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+@@ -396,9 +415,13 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
++
++distclean-libtool:
++ -rm -f libtool
++uninstall-info-am:
+ install-man5: $(man5_MANS) $(man_MANS)
+ @$(NORMAL_INSTALL)
+- test -z "$(man5dir)" || $(MKDIR_P) "$(DESTDIR)$(man5dir)"
++ test -z "$(man5dir)" || $(mkdir_p) "$(DESTDIR)$(man5dir)"
+ @list='$(man5_MANS) $(dist_man5_MANS) $(nodist_man5_MANS)'; \
+ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ for i in $$l2; do \
+@@ -443,7 +466,7 @@
+ done
+ install-man8: $(man8_MANS) $(man_MANS)
+ @$(NORMAL_INSTALL)
+- test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
++ test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
+ @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
+ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ for i in $$l2; do \
+@@ -488,7 +511,7 @@
+ done
+ install-secureconfDATA: $(secureconf_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(secureconfdir)" || $(MKDIR_P) "$(DESTDIR)$(secureconfdir)"
++ test -z "$(secureconfdir)" || $(mkdir_p) "$(DESTDIR)$(secureconfdir)"
+ @list='$(secureconf_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+@@ -553,9 +576,9 @@
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ check-TESTS: $(TESTS)
+- @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
++ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
+ srcdir=$(srcdir); export srcdir; \
+- list=' $(TESTS) '; \
++ list='$(TESTS)'; \
+ if test -n "$$list"; then \
+ for tst in $$list; do \
+ if test -f ./$$tst; then dir=./; \
+@@ -564,7 +587,7 @@
+ if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *$$ws$$tst$$ws*) \
++ *" $$tst "*) \
+ xpass=`expr $$xpass + 1`; \
+ failed=`expr $$failed + 1`; \
+ echo "XPASS: $$tst"; \
+@@ -576,7 +599,7 @@
+ elif test $$? -ne 77; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *$$ws$$tst$$ws*) \
++ *" $$tst "*) \
+ xfail=`expr $$xfail + 1`; \
+ echo "XFAIL: $$tst"; \
+ ;; \
+@@ -626,21 +649,22 @@
+ else :; fi
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- list='$(DISTFILES)'; \
+- dist_files=`for file in $$list; do echo $$file; done | \
+- sed -e "s|^$$srcdirstrip/||;t" \
+- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+- case $$dist_files in \
+- */*) $(MKDIR_P) `echo "$$dist_files" | \
+- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+- sort -u` ;; \
+- esac; \
+- for file in $$dist_files; do \
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
+ if test -d $$d/$$file; then \
+- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -657,7 +681,7 @@
+ all-am: Makefile $(LTLIBRARIES) $(SCRIPTS) $(MANS) $(DATA) $(HEADERS)
+ installdirs:
+ for dir in "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(secureconfdir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(secureconfdir)"; do \
+- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
++ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
+ install: install-am
+ install-exec: install-exec-am
+@@ -693,7 +717,7 @@
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-tags
++ distclean-libtool distclean-tags
+
+ dvi: dvi-am
+
+@@ -708,20 +732,12 @@
+ install-data-am: install-man install-secureconfDATA \
+ install-secureconfSCRIPTS install-securelibLTLIBRARIES
+
+-install-dvi: install-dvi-am
+-
+ install-exec-am:
-@@ -521,8 +524,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -532,13 +535,12 @@
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-Index: pam.deb/modules/pam_nologin/Makefile.in
+-install-html: install-html-am
+-
+ install-info: install-info-am
+
+ install-man: install-man5 install-man8
+
+-install-pdf: install-pdf-am
+-
+-install-ps: install-ps-am
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -742,29 +758,25 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-man uninstall-secureconfDATA \
++uninstall-am: uninstall-info-am uninstall-man uninstall-secureconfDATA \
+ uninstall-secureconfSCRIPTS uninstall-securelibLTLIBRARIES
+
+ uninstall-man: uninstall-man5 uninstall-man8
+
+-.MAKE: install-am install-strip
+-
+ .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
+ clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
+ distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+- install-data-am install-dvi install-dvi-am install-exec \
+- install-exec-am install-html install-html-am install-info \
++ install-data-am install-exec install-exec-am install-info \
+ install-info-am install-man install-man5 install-man8 \
+- install-pdf install-pdf-am install-ps install-ps-am \
+ install-secureconfDATA install-secureconfSCRIPTS \
+ install-securelibLTLIBRARIES install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+- tags uninstall uninstall-am uninstall-man uninstall-man5 \
+- uninstall-man8 uninstall-secureconfDATA \
++ tags uninstall uninstall-am uninstall-info-am uninstall-man \
++ uninstall-man5 uninstall-man8 uninstall-secureconfDATA \
+ uninstall-secureconfSCRIPTS uninstall-securelibLTLIBRARIES
+
+ @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
+Index: pam.debian/modules/pam_nologin/Makefile.in
===================================================================
---- pam.deb.orig/modules/pam_nologin/Makefile.in
-+++ pam.deb/modules/pam_nologin/Makefile.in
+--- pam.debian.orig/modules/pam_nologin/Makefile.in
++++ pam.debian/modules/pam_nologin/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -67,7 +67,7 @@
- pam_nologin_la_LIBADD =
+@@ -19,11 +19,15 @@
+ #
+
+
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -67,18 +71,17 @@
+ pam_nologin_la_DEPENDENCIES =
pam_nologin_la_SOURCES = pam_nologin.c
pam_nologin_la_OBJECTS = pam_nologin.lo
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -108,6 +108,7 @@
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
++ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++ $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+- $(LDFLAGS) -o $@
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = pam_nologin.c
+ DIST_SOURCES = pam_nologin.c
+ man8dir = $(mandir)/man8
+@@ -89,6 +92,8 @@
+ CTAGS = ctags
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AUTOCONF = @AUTOCONF@
+@@ -108,11 +113,16 @@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -9475,7 +16357,40 @@ Index: pam.deb/modules/pam_nologin/Makefile.in
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -160,6 +161,7 @@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
++ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
++ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
++ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -121,7 +131,18 @@
+ GMSGFMT_015 = @GMSGFMT_015@
+ GREP = @GREP@
+ HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
+-INSTALL = @INSTALL@
++HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
++HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
++HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
++HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
++HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
++HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
++HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
++HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
++HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
++HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
++HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
++HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -156,10 +177,10 @@
+ LTLIBINTL = @LTLIBINTL@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+-MKDIR_P = @MKDIR_P@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
@@ -9483,99 +16398,329 @@ Index: pam.deb/modules/pam_nologin/Makefile.in
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -175,6 +177,7 @@
- RANLIB = @RANLIB@
- SCONFIGDIR = @SCONFIGDIR@
- SECUREDIR = @SECUREDIR@
-+SED = @SED@
+@@ -178,6 +199,8 @@
+ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
++STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
++STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
STRIP = @STRIP@
-@@ -295,8 +298,8 @@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+@@ -191,13 +214,13 @@
+ XSLTPROC = @XSLTPROC@
+ YACC = @YACC@
+ YFLAGS = @YFLAGS@
+-abs_builddir = @abs_builddir@
+-abs_srcdir = @abs_srcdir@
+-abs_top_builddir = @abs_top_builddir@
+-abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -209,7 +232,6 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+-builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -240,11 +262,8 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+-srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_builddir = @top_builddir@
+-top_srcdir = @top_srcdir@
+ CLEANFILES = *~
+ EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_nologin
+ TESTS = tst-pam_nologin
+@@ -292,7 +311,7 @@
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+- test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
++ test -z "$(securelibdir)" || $(mkdir_p) "$(DESTDIR)$(securelibdir)"
@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \
-- $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \
- else :; fi; \
- done
+@@ -303,7 +322,7 @@
-@@ -304,8 +307,8 @@
+ uninstall-securelibLTLIBRARIES:
@$(NORMAL_UNINSTALL)
- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
+- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
++ @set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
+@@ -318,7 +337,7 @@
+ rm -f "$${dir}/so_locations"; \
done
+ pam_nologin.la: $(pam_nologin_la_OBJECTS) $(pam_nologin_la_DEPENDENCIES)
+- $(LINK) -rpath $(securelibdir) $(pam_nologin_la_OBJECTS) $(pam_nologin_la_LIBADD) $(LIBS)
++ $(LINK) -rpath $(securelibdir) $(pam_nologin_la_LDFLAGS) $(pam_nologin_la_OBJECTS) $(pam_nologin_la_LIBADD) $(LIBS)
- clean-securelibLTLIBRARIES:
-@@ -404,8 +407,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+@@ -329,22 +348,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_nologin.Plo@am__quote@
-@@ -417,8 +420,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -428,13 +431,12 @@
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-Index: pam.deb/modules/pam_permit/Makefile.in
+ .c.o:
+-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
++@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+@@ -354,9 +373,13 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
++
++distclean-libtool:
++ -rm -f libtool
++uninstall-info-am:
+ install-man8: $(man8_MANS) $(man_MANS)
+ @$(NORMAL_INSTALL)
+- test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
++ test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
+ @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
+ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ for i in $$l2; do \
+@@ -449,9 +472,9 @@
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ check-TESTS: $(TESTS)
+- @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
++ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
+ srcdir=$(srcdir); export srcdir; \
+- list=' $(TESTS) '; \
++ list='$(TESTS)'; \
+ if test -n "$$list"; then \
+ for tst in $$list; do \
+ if test -f ./$$tst; then dir=./; \
+@@ -460,7 +483,7 @@
+ if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *$$ws$$tst$$ws*) \
++ *" $$tst "*) \
+ xpass=`expr $$xpass + 1`; \
+ failed=`expr $$failed + 1`; \
+ echo "XPASS: $$tst"; \
+@@ -472,7 +495,7 @@
+ elif test $$? -ne 77; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *$$ws$$tst$$ws*) \
++ *" $$tst "*) \
+ xfail=`expr $$xfail + 1`; \
+ echo "XFAIL: $$tst"; \
+ ;; \
+@@ -522,21 +545,22 @@
+ else :; fi
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- list='$(DISTFILES)'; \
+- dist_files=`for file in $$list; do echo $$file; done | \
+- sed -e "s|^$$srcdirstrip/||;t" \
+- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+- case $$dist_files in \
+- */*) $(MKDIR_P) `echo "$$dist_files" | \
+- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+- sort -u` ;; \
+- esac; \
+- for file in $$dist_files; do \
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
+ if test -d $$d/$$file; then \
+- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -553,7 +577,7 @@
+ all-am: Makefile $(LTLIBRARIES) $(MANS) $(DATA)
+ installdirs:
+ for dir in "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man8dir)"; do \
+- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
++ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
+ install: install-am
+ install-exec: install-exec-am
+@@ -589,7 +613,7 @@
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-tags
++ distclean-libtool distclean-tags
+
+ dvi: dvi-am
+
+@@ -603,20 +627,12 @@
+
+ install-data-am: install-man install-securelibLTLIBRARIES
+
+-install-dvi: install-dvi-am
+-
+ install-exec-am:
+
+-install-html: install-html-am
+-
+ install-info: install-info-am
+
+ install-man: install-man8
+
+-install-pdf: install-pdf-am
+-
+-install-ps: install-ps-am
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -637,27 +653,24 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-man uninstall-securelibLTLIBRARIES
++uninstall-am: uninstall-info-am uninstall-man \
++ uninstall-securelibLTLIBRARIES
+
+ uninstall-man: uninstall-man8
+
+-.MAKE: install-am install-strip
+-
+ .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
+ clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
+ distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+- install-data-am install-dvi install-dvi-am install-exec \
+- install-exec-am install-html install-html-am install-info \
+- install-info-am install-man install-man8 install-pdf \
+- install-pdf-am install-ps install-ps-am \
++ install-data-am install-exec install-exec-am install-info \
++ install-info-am install-man install-man8 \
+ install-securelibLTLIBRARIES install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+- tags uninstall uninstall-am uninstall-man uninstall-man8 \
+- uninstall-securelibLTLIBRARIES
++ tags uninstall uninstall-am uninstall-info-am uninstall-man \
++ uninstall-man8 uninstall-securelibLTLIBRARIES
+
+ @ENABLE_REGENERATE_MAN_TRUE@README: pam_nologin.8.xml
+ @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
+Index: pam.debian/modules/pam_permit/Makefile.in
===================================================================
---- pam.deb.orig/modules/pam_permit/Makefile.in
-+++ pam.deb/modules/pam_permit/Makefile.in
+--- pam.debian.orig/modules/pam_permit/Makefile.in
++++ pam.debian/modules/pam_permit/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -67,7 +67,7 @@
- pam_permit_la_LIBADD =
+@@ -19,11 +19,15 @@
+ #
+
+
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -67,18 +71,17 @@
+ pam_permit_la_DEPENDENCIES =
pam_permit_la_SOURCES = pam_permit.c
pam_permit_la_OBJECTS = pam_permit.lo
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -108,6 +108,7 @@
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
++ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++ $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+- $(LDFLAGS) -o $@
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = pam_permit.c
+ DIST_SOURCES = pam_permit.c
+ man8dir = $(mandir)/man8
+@@ -89,6 +92,8 @@
+ CTAGS = ctags
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AUTOCONF = @AUTOCONF@
+@@ -108,11 +113,16 @@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -9583,7 +16728,40 @@ Index: pam.deb/modules/pam_permit/Makefile.in
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -160,6 +161,7 @@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
++ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
++ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
++ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -121,7 +131,18 @@
+ GMSGFMT_015 = @GMSGFMT_015@
+ GREP = @GREP@
+ HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
+-INSTALL = @INSTALL@
++HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
++HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
++HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
++HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
++HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
++HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
++HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
++HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
++HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
++HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
++HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
++HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -156,10 +177,10 @@
+ LTLIBINTL = @LTLIBINTL@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+-MKDIR_P = @MKDIR_P@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
@@ -9591,99 +16769,329 @@ Index: pam.deb/modules/pam_permit/Makefile.in
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -175,6 +177,7 @@
- RANLIB = @RANLIB@
- SCONFIGDIR = @SCONFIGDIR@
- SECUREDIR = @SECUREDIR@
-+SED = @SED@
+@@ -178,6 +199,8 @@
+ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
++STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
++STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
STRIP = @STRIP@
-@@ -295,8 +298,8 @@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+@@ -191,13 +214,13 @@
+ XSLTPROC = @XSLTPROC@
+ YACC = @YACC@
+ YFLAGS = @YFLAGS@
+-abs_builddir = @abs_builddir@
+-abs_srcdir = @abs_srcdir@
+-abs_top_builddir = @abs_top_builddir@
+-abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -209,7 +232,6 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+-builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -240,11 +262,8 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+-srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_builddir = @top_builddir@
+-top_srcdir = @top_srcdir@
+ CLEANFILES = *~
+ EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_permit
+ man_MANS = pam_permit.8
+@@ -292,7 +311,7 @@
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+- test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
++ test -z "$(securelibdir)" || $(mkdir_p) "$(DESTDIR)$(securelibdir)"
@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \
-- $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \
- else :; fi; \
- done
+@@ -303,7 +322,7 @@
-@@ -304,8 +307,8 @@
+ uninstall-securelibLTLIBRARIES:
@$(NORMAL_UNINSTALL)
- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
+- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
++ @set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
+@@ -318,7 +337,7 @@
+ rm -f "$${dir}/so_locations"; \
done
+ pam_permit.la: $(pam_permit_la_OBJECTS) $(pam_permit_la_DEPENDENCIES)
+- $(LINK) -rpath $(securelibdir) $(pam_permit_la_OBJECTS) $(pam_permit_la_LIBADD) $(LIBS)
++ $(LINK) -rpath $(securelibdir) $(pam_permit_la_LDFLAGS) $(pam_permit_la_OBJECTS) $(pam_permit_la_LIBADD) $(LIBS)
- clean-securelibLTLIBRARIES:
-@@ -404,8 +407,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+@@ -329,22 +348,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_permit.Plo@am__quote@
-@@ -417,8 +420,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -428,13 +431,12 @@
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-Index: pam.deb/modules/pam_rhosts/Makefile.in
+ .c.o:
+-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
++@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+@@ -354,9 +373,13 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
++
++distclean-libtool:
++ -rm -f libtool
++uninstall-info-am:
+ install-man8: $(man8_MANS) $(man_MANS)
+ @$(NORMAL_INSTALL)
+- test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
++ test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
+ @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
+ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ for i in $$l2; do \
+@@ -449,9 +472,9 @@
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ check-TESTS: $(TESTS)
+- @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
++ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
+ srcdir=$(srcdir); export srcdir; \
+- list=' $(TESTS) '; \
++ list='$(TESTS)'; \
+ if test -n "$$list"; then \
+ for tst in $$list; do \
+ if test -f ./$$tst; then dir=./; \
+@@ -460,7 +483,7 @@
+ if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *$$ws$$tst$$ws*) \
++ *" $$tst "*) \
+ xpass=`expr $$xpass + 1`; \
+ failed=`expr $$failed + 1`; \
+ echo "XPASS: $$tst"; \
+@@ -472,7 +495,7 @@
+ elif test $$? -ne 77; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *$$ws$$tst$$ws*) \
++ *" $$tst "*) \
+ xfail=`expr $$xfail + 1`; \
+ echo "XFAIL: $$tst"; \
+ ;; \
+@@ -522,21 +545,22 @@
+ else :; fi
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- list='$(DISTFILES)'; \
+- dist_files=`for file in $$list; do echo $$file; done | \
+- sed -e "s|^$$srcdirstrip/||;t" \
+- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+- case $$dist_files in \
+- */*) $(MKDIR_P) `echo "$$dist_files" | \
+- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+- sort -u` ;; \
+- esac; \
+- for file in $$dist_files; do \
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
+ if test -d $$d/$$file; then \
+- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -553,7 +577,7 @@
+ all-am: Makefile $(LTLIBRARIES) $(MANS) $(DATA)
+ installdirs:
+ for dir in "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man8dir)"; do \
+- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
++ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
+ install: install-am
+ install-exec: install-exec-am
+@@ -589,7 +613,7 @@
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-tags
++ distclean-libtool distclean-tags
+
+ dvi: dvi-am
+
+@@ -603,20 +627,12 @@
+
+ install-data-am: install-man install-securelibLTLIBRARIES
+
+-install-dvi: install-dvi-am
+-
+ install-exec-am:
+
+-install-html: install-html-am
+-
+ install-info: install-info-am
+
+ install-man: install-man8
+
+-install-pdf: install-pdf-am
+-
+-install-ps: install-ps-am
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -637,27 +653,24 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-man uninstall-securelibLTLIBRARIES
++uninstall-am: uninstall-info-am uninstall-man \
++ uninstall-securelibLTLIBRARIES
+
+ uninstall-man: uninstall-man8
+
+-.MAKE: install-am install-strip
+-
+ .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
+ clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
+ distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+- install-data-am install-dvi install-dvi-am install-exec \
+- install-exec-am install-html install-html-am install-info \
+- install-info-am install-man install-man8 install-pdf \
+- install-pdf-am install-ps install-ps-am \
++ install-data-am install-exec install-exec-am install-info \
++ install-info-am install-man install-man8 \
+ install-securelibLTLIBRARIES install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+- tags uninstall uninstall-am uninstall-man uninstall-man8 \
+- uninstall-securelibLTLIBRARIES
++ tags uninstall uninstall-am uninstall-info-am uninstall-man \
++ uninstall-man8 uninstall-securelibLTLIBRARIES
+
+ @ENABLE_REGENERATE_MAN_TRUE@README: pam_permit.8.xml
+ @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
+Index: pam.debian/modules/pam_rhosts/Makefile.in
===================================================================
---- pam.deb.orig/modules/pam_rhosts/Makefile.in
-+++ pam.deb/modules/pam_rhosts/Makefile.in
+--- pam.debian.orig/modules/pam_rhosts/Makefile.in
++++ pam.debian/modules/pam_rhosts/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -70,7 +70,7 @@
- pam_rhosts_auth_la_LIBADD =
+@@ -19,11 +19,15 @@
+ #
+
+
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -70,18 +74,17 @@
+ pam_rhosts_auth_la_DEPENDENCIES =
pam_rhosts_auth_la_SOURCES = pam_rhosts_auth.c
pam_rhosts_auth_la_OBJECTS = pam_rhosts_auth.lo
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -111,6 +111,7 @@
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
++ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++ $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+- $(LDFLAGS) -o $@
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = pam_rhosts.c pam_rhosts_auth.c
+ DIST_SOURCES = pam_rhosts.c pam_rhosts_auth.c
+ man8dir = $(mandir)/man8
+@@ -92,6 +95,8 @@
+ CTAGS = ctags
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AUTOCONF = @AUTOCONF@
+@@ -111,11 +116,16 @@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -9691,7 +17099,40 @@ Index: pam.deb/modules/pam_rhosts/Makefile.in
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -163,6 +164,7 @@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
++ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
++ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
++ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -124,7 +134,18 @@
+ GMSGFMT_015 = @GMSGFMT_015@
+ GREP = @GREP@
+ HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
+-INSTALL = @INSTALL@
++HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
++HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
++HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
++HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
++HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
++HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
++HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
++HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
++HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
++HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
++HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
++HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -159,10 +180,10 @@
+ LTLIBINTL = @LTLIBINTL@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+-MKDIR_P = @MKDIR_P@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
@@ -9699,99 +17140,332 @@ Index: pam.deb/modules/pam_rhosts/Makefile.in
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -178,6 +180,7 @@
- RANLIB = @RANLIB@
- SCONFIGDIR = @SCONFIGDIR@
- SECUREDIR = @SECUREDIR@
-+SED = @SED@
+@@ -181,6 +202,8 @@
+ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
++STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
++STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
STRIP = @STRIP@
-@@ -298,8 +301,8 @@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+@@ -194,13 +217,13 @@
+ XSLTPROC = @XSLTPROC@
+ YACC = @YACC@
+ YFLAGS = @YFLAGS@
+-abs_builddir = @abs_builddir@
+-abs_srcdir = @abs_srcdir@
+-abs_top_builddir = @abs_top_builddir@
+-abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -212,7 +235,6 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+-builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -243,11 +265,8 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+-srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_builddir = @top_builddir@
+-top_srcdir = @top_srcdir@
+ CLEANFILES = *~
+ EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_rhosts_auth tst-pam_rhosts
+ TESTS = tst-pam_rhosts_auth tst-pam_rhosts
+@@ -296,7 +315,7 @@
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+- test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
++ test -z "$(securelibdir)" || $(mkdir_p) "$(DESTDIR)$(securelibdir)"
@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \
-- $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \
- else :; fi; \
- done
+@@ -307,7 +326,7 @@
-@@ -307,8 +310,8 @@
+ uninstall-securelibLTLIBRARIES:
@$(NORMAL_UNINSTALL)
- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
+- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
++ @set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
+@@ -322,9 +341,9 @@
+ rm -f "$${dir}/so_locations"; \
done
+ pam_rhosts.la: $(pam_rhosts_la_OBJECTS) $(pam_rhosts_la_DEPENDENCIES)
+- $(LINK) -rpath $(securelibdir) $(pam_rhosts_la_OBJECTS) $(pam_rhosts_la_LIBADD) $(LIBS)
++ $(LINK) -rpath $(securelibdir) $(pam_rhosts_la_LDFLAGS) $(pam_rhosts_la_OBJECTS) $(pam_rhosts_la_LIBADD) $(LIBS)
+ pam_rhosts_auth.la: $(pam_rhosts_auth_la_OBJECTS) $(pam_rhosts_auth_la_DEPENDENCIES)
+- $(LINK) -rpath $(securelibdir) $(pam_rhosts_auth_la_OBJECTS) $(pam_rhosts_auth_la_LIBADD) $(LIBS)
++ $(LINK) -rpath $(securelibdir) $(pam_rhosts_auth_la_LDFLAGS) $(pam_rhosts_auth_la_OBJECTS) $(pam_rhosts_auth_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+@@ -336,22 +355,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_rhosts_auth.Plo@am__quote@
- clean-securelibLTLIBRARIES:
-@@ -410,8 +413,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
+ .c.o:
+-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
++@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+@@ -361,9 +380,13 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
++
++distclean-libtool:
++ -rm -f libtool
++uninstall-info-am:
+ install-man8: $(man8_MANS) $(man_MANS)
+ @$(NORMAL_INSTALL)
+- test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
++ test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
+ @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
+ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ for i in $$l2; do \
+@@ -456,9 +479,9 @@
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ check-TESTS: $(TESTS)
+- @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
++ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
+ srcdir=$(srcdir); export srcdir; \
+- list=' $(TESTS) '; \
++ list='$(TESTS)'; \
+ if test -n "$$list"; then \
+ for tst in $$list; do \
+ if test -f ./$$tst; then dir=./; \
+@@ -467,7 +490,7 @@
+ if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *$$ws$$tst$$ws*) \
++ *" $$tst "*) \
+ xpass=`expr $$xpass + 1`; \
+ failed=`expr $$failed + 1`; \
+ echo "XPASS: $$tst"; \
+@@ -479,7 +502,7 @@
+ elif test $$? -ne 77; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *$$ws$$tst$$ws*) \
++ *" $$tst "*) \
+ xfail=`expr $$xfail + 1`; \
+ echo "XFAIL: $$tst"; \
+ ;; \
+@@ -529,21 +552,22 @@
+ else :; fi
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- list='$(DISTFILES)'; \
+- dist_files=`for file in $$list; do echo $$file; done | \
+- sed -e "s|^$$srcdirstrip/||;t" \
+- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+- case $$dist_files in \
+- */*) $(MKDIR_P) `echo "$$dist_files" | \
+- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+- sort -u` ;; \
+- esac; \
+- for file in $$dist_files; do \
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
+ if test -d $$d/$$file; then \
+- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -560,7 +584,7 @@
+ all-am: Makefile $(LTLIBRARIES) $(MANS) $(DATA)
+ installdirs:
+ for dir in "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man8dir)"; do \
+- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
++ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
+ install: install-am
+ install-exec: install-exec-am
+@@ -596,7 +620,7 @@
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-tags
++ distclean-libtool distclean-tags
-@@ -423,8 +426,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -434,13 +437,12 @@
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-Index: pam.deb/modules/pam_rootok/Makefile.in
+ dvi: dvi-am
+
+@@ -610,20 +634,12 @@
+
+ install-data-am: install-man install-securelibLTLIBRARIES
+
+-install-dvi: install-dvi-am
+-
+ install-exec-am:
+
+-install-html: install-html-am
+-
+ install-info: install-info-am
+
+ install-man: install-man8
+
+-install-pdf: install-pdf-am
+-
+-install-ps: install-ps-am
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -644,27 +660,24 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-man uninstall-securelibLTLIBRARIES
++uninstall-am: uninstall-info-am uninstall-man \
++ uninstall-securelibLTLIBRARIES
+
+ uninstall-man: uninstall-man8
+
+-.MAKE: install-am install-strip
+-
+ .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
+ clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
+ distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+- install-data-am install-dvi install-dvi-am install-exec \
+- install-exec-am install-html install-html-am install-info \
+- install-info-am install-man install-man8 install-pdf \
+- install-pdf-am install-ps install-ps-am \
++ install-data-am install-exec install-exec-am install-info \
++ install-info-am install-man install-man8 \
+ install-securelibLTLIBRARIES install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+- tags uninstall uninstall-am uninstall-man uninstall-man8 \
+- uninstall-securelibLTLIBRARIES
++ tags uninstall uninstall-am uninstall-info-am uninstall-man \
++ uninstall-man8 uninstall-securelibLTLIBRARIES
+
+ @ENABLE_REGENERATE_MAN_TRUE@README: pam_rhosts.8.xml
+ @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
+Index: pam.debian/modules/pam_rootok/Makefile.in
===================================================================
---- pam.deb.orig/modules/pam_rootok/Makefile.in
-+++ pam.deb/modules/pam_rootok/Makefile.in
+--- pam.debian.orig/modules/pam_rootok/Makefile.in
++++ pam.debian/modules/pam_rootok/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -68,7 +68,7 @@
- pam_rootok_la_LIBADD =
+@@ -19,11 +19,15 @@
+ #
+
+
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -68,18 +72,17 @@
+ pam_rootok_la_DEPENDENCIES =
pam_rootok_la_SOURCES = pam_rootok.c
pam_rootok_la_OBJECTS = pam_rootok.lo
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -109,6 +109,7 @@
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
++ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++ $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+- $(LDFLAGS) -o $@
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = pam_rootok.c
+ DIST_SOURCES = pam_rootok.c
+ man8dir = $(mandir)/man8
+@@ -90,6 +93,8 @@
+ CTAGS = ctags
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AUTOCONF = @AUTOCONF@
+@@ -109,11 +114,16 @@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -9799,7 +17473,40 @@ Index: pam.deb/modules/pam_rootok/Makefile.in
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -161,6 +162,7 @@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
++ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
++ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
++ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -122,7 +132,18 @@
+ GMSGFMT_015 = @GMSGFMT_015@
+ GREP = @GREP@
+ HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
+-INSTALL = @INSTALL@
++HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
++HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
++HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
++HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
++HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
++HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
++HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
++HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
++HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
++HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
++HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
++HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -157,10 +178,10 @@
+ LTLIBINTL = @LTLIBINTL@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+-MKDIR_P = @MKDIR_P@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
@@ -9807,114 +17514,337 @@ Index: pam.deb/modules/pam_rootok/Makefile.in
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -176,6 +178,7 @@
- RANLIB = @RANLIB@
- SCONFIGDIR = @SCONFIGDIR@
- SECUREDIR = @SECUREDIR@
-+SED = @SED@
+@@ -179,6 +200,8 @@
+ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
++STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
++STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
STRIP = @STRIP@
-@@ -297,8 +300,8 @@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+@@ -192,13 +215,13 @@
+ XSLTPROC = @XSLTPROC@
+ YACC = @YACC@
+ YFLAGS = @YFLAGS@
+-abs_builddir = @abs_builddir@
+-abs_srcdir = @abs_srcdir@
+-abs_top_builddir = @abs_top_builddir@
+-abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -210,7 +233,6 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+-builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -241,11 +263,8 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+-srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_builddir = @top_builddir@
+-top_srcdir = @top_srcdir@
+ CLEANFILES = *~
+ EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_rootok
+ man_MANS = pam_rootok.8
+@@ -294,7 +313,7 @@
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+- test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
++ test -z "$(securelibdir)" || $(mkdir_p) "$(DESTDIR)$(securelibdir)"
@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \
-- $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \
- else :; fi; \
- done
+@@ -305,7 +324,7 @@
-@@ -306,8 +309,8 @@
+ uninstall-securelibLTLIBRARIES:
@$(NORMAL_UNINSTALL)
- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
+- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
++ @set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
+@@ -320,7 +339,7 @@
+ rm -f "$${dir}/so_locations"; \
done
+ pam_rootok.la: $(pam_rootok_la_OBJECTS) $(pam_rootok_la_DEPENDENCIES)
+- $(LINK) -rpath $(securelibdir) $(pam_rootok_la_OBJECTS) $(pam_rootok_la_LIBADD) $(LIBS)
++ $(LINK) -rpath $(securelibdir) $(pam_rootok_la_LDFLAGS) $(pam_rootok_la_OBJECTS) $(pam_rootok_la_LIBADD) $(LIBS)
- clean-securelibLTLIBRARIES:
-@@ -406,8 +409,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+@@ -331,22 +350,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_rootok.Plo@am__quote@
-@@ -419,8 +422,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -430,13 +433,12 @@
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-Index: pam.deb/modules/pam_securetty/Makefile.in
+ .c.o:
+-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
++@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+@@ -356,9 +375,13 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
++
++distclean-libtool:
++ -rm -f libtool
++uninstall-info-am:
+ install-man8: $(man8_MANS) $(man_MANS)
+ @$(NORMAL_INSTALL)
+- test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
++ test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
+ @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
+ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ for i in $$l2; do \
+@@ -451,9 +474,9 @@
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ check-TESTS: $(TESTS)
+- @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
++ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
+ srcdir=$(srcdir); export srcdir; \
+- list=' $(TESTS) '; \
++ list='$(TESTS)'; \
+ if test -n "$$list"; then \
+ for tst in $$list; do \
+ if test -f ./$$tst; then dir=./; \
+@@ -462,7 +485,7 @@
+ if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *$$ws$$tst$$ws*) \
++ *" $$tst "*) \
+ xpass=`expr $$xpass + 1`; \
+ failed=`expr $$failed + 1`; \
+ echo "XPASS: $$tst"; \
+@@ -474,7 +497,7 @@
+ elif test $$? -ne 77; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *$$ws$$tst$$ws*) \
++ *" $$tst "*) \
+ xfail=`expr $$xfail + 1`; \
+ echo "XFAIL: $$tst"; \
+ ;; \
+@@ -524,21 +547,22 @@
+ else :; fi
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- list='$(DISTFILES)'; \
+- dist_files=`for file in $$list; do echo $$file; done | \
+- sed -e "s|^$$srcdirstrip/||;t" \
+- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+- case $$dist_files in \
+- */*) $(MKDIR_P) `echo "$$dist_files" | \
+- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+- sort -u` ;; \
+- esac; \
+- for file in $$dist_files; do \
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
+ if test -d $$d/$$file; then \
+- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -555,7 +579,7 @@
+ all-am: Makefile $(LTLIBRARIES) $(MANS) $(DATA)
+ installdirs:
+ for dir in "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man8dir)"; do \
+- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
++ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
+ install: install-am
+ install-exec: install-exec-am
+@@ -591,7 +615,7 @@
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-tags
++ distclean-libtool distclean-tags
+
+ dvi: dvi-am
+
+@@ -605,20 +629,12 @@
+
+ install-data-am: install-man install-securelibLTLIBRARIES
+
+-install-dvi: install-dvi-am
+-
+ install-exec-am:
+
+-install-html: install-html-am
+-
+ install-info: install-info-am
+
+ install-man: install-man8
+
+-install-pdf: install-pdf-am
+-
+-install-ps: install-ps-am
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -639,27 +655,24 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-man uninstall-securelibLTLIBRARIES
++uninstall-am: uninstall-info-am uninstall-man \
++ uninstall-securelibLTLIBRARIES
+
+ uninstall-man: uninstall-man8
+
+-.MAKE: install-am install-strip
+-
+ .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
+ clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
+ distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+- install-data-am install-dvi install-dvi-am install-exec \
+- install-exec-am install-html install-html-am install-info \
+- install-info-am install-man install-man8 install-pdf \
+- install-pdf-am install-ps install-ps-am \
++ install-data-am install-exec install-exec-am install-info \
++ install-info-am install-man install-man8 \
+ install-securelibLTLIBRARIES install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+- tags uninstall uninstall-am uninstall-man uninstall-man8 \
+- uninstall-securelibLTLIBRARIES
++ tags uninstall uninstall-am uninstall-info-am uninstall-man \
++ uninstall-man8 uninstall-securelibLTLIBRARIES
+
+ @ENABLE_REGENERATE_MAN_TRUE@README: pam_rootok.8.xml
+ @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
+Index: pam.debian/modules/pam_securetty/Makefile.in
===================================================================
---- pam.deb.orig/modules/pam_securetty/Makefile.in
-+++ pam.deb/modules/pam_securetty/Makefile.in
+--- pam.debian.orig/modules/pam_securetty/Makefile.in
++++ pam.debian/modules/pam_securetty/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -65,9 +65,9 @@
+@@ -19,11 +19,15 @@
+ #
+
+
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -65,22 +69,21 @@
securelibLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(securelib_LTLIBRARIES)
- pam_securetty_la_LIBADD =
+ pam_securetty_la_DEPENDENCIES =
-pam_securetty_la_SOURCES = pam_securetty.c
-pam_securetty_la_OBJECTS = pam_securetty.lo
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+am_pam_securetty_la_OBJECTS = pam_securetty.lo tty_secure.lo
+pam_securetty_la_OBJECTS = $(am_pam_securetty_la_OBJECTS)
-+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -79,8 +79,8 @@
- LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
++ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++ $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+- $(LDFLAGS) -o $@
-SOURCES = pam_securetty.c
-DIST_SOURCES = pam_securetty.c
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(pam_securetty_la_SOURCES)
+DIST_SOURCES = $(pam_securetty_la_SOURCES)
man8dir = $(mandir)/man8
NROFF = nroff
MANS = $(man_MANS)
-@@ -108,6 +108,7 @@
+@@ -89,6 +92,8 @@
+ CTAGS = ctags
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AUTOCONF = @AUTOCONF@
+@@ -108,11 +113,16 @@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -9922,7 +17852,40 @@ Index: pam.deb/modules/pam_securetty/Makefile.in
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -160,6 +161,7 @@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
++ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
++ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
++ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -121,7 +131,18 @@
+ GMSGFMT_015 = @GMSGFMT_015@
+ GREP = @GREP@
+ HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
+-INSTALL = @INSTALL@
++HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
++HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
++HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
++HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
++HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
++HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
++HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
++HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
++HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
++HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
++HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
++HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -156,10 +177,10 @@
+ LTLIBINTL = @LTLIBINTL@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+-MKDIR_P = @MKDIR_P@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
@@ -9930,18 +17893,57 @@ Index: pam.deb/modules/pam_securetty/Makefile.in
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -175,6 +177,7 @@
- RANLIB = @RANLIB@
- SCONFIGDIR = @SCONFIGDIR@
- SECUREDIR = @SECUREDIR@
-+SED = @SED@
+@@ -178,6 +199,8 @@
+ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
++STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
++STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
STRIP = @STRIP@
-@@ -255,6 +258,10 @@
- AM_LDFLAGS = -no-undefined -avoid-version -module \
- -L$(top_builddir)/libpam -lpam $(am__append_1)
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+@@ -191,13 +214,13 @@
+ XSLTPROC = @XSLTPROC@
+ YACC = @YACC@
+ YFLAGS = @YFLAGS@
+-abs_builddir = @abs_builddir@
+-abs_srcdir = @abs_srcdir@
+-abs_top_builddir = @abs_top_builddir@
+-abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -209,7 +232,6 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+-builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -240,11 +262,8 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+-srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_builddir = @top_builddir@
+-top_srcdir = @top_srcdir@
+ CLEANFILES = *~
+ EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_securetty
+ TESTS = tst-pam_securetty
+@@ -256,6 +275,10 @@
+ AM_LDFLAGS = -no-undefined -avoid-version -module $(am__append_1)
securelib_LTLIBRARIES = pam_securetty.la
+ pam_securetty_la_LIBADD = -L$(top_builddir)/libpam -lpam
+pam_securetty_la_SOURCES = \
+ pam_securetty.c \
+ tty_secure.c
@@ -9949,99 +17951,296 @@ Index: pam.deb/modules/pam_securetty/Makefile.in
@ENABLE_REGENERATE_MAN_TRUE@noinst_DATA = README
all: all-am
-@@ -295,8 +302,8 @@
+@@ -292,7 +315,7 @@
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+- test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
++ test -z "$(securelibdir)" || $(mkdir_p) "$(DESTDIR)$(securelibdir)"
@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \
-- $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \
- else :; fi; \
- done
+@@ -303,7 +326,7 @@
-@@ -304,8 +311,8 @@
+ uninstall-securelibLTLIBRARIES:
@$(NORMAL_UNINSTALL)
- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
+- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
++ @set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
+@@ -318,7 +341,7 @@
+ rm -f "$${dir}/so_locations"; \
done
+ pam_securetty.la: $(pam_securetty_la_OBJECTS) $(pam_securetty_la_DEPENDENCIES)
+- $(LINK) -rpath $(securelibdir) $(pam_securetty_la_OBJECTS) $(pam_securetty_la_LIBADD) $(LIBS)
++ $(LINK) -rpath $(securelibdir) $(pam_securetty_la_LDFLAGS) $(pam_securetty_la_OBJECTS) $(pam_securetty_la_LIBADD) $(LIBS)
- clean-securelibLTLIBRARIES:
-@@ -326,6 +333,7 @@
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+@@ -327,24 +350,25 @@
-rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_securetty.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tty_secure.Plo@am__quote@
.c.o:
- @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@@ -404,8 +412,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
+-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
++@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+@@ -354,9 +378,13 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
++
++distclean-libtool:
++ -rm -f libtool
++uninstall-info-am:
+ install-man8: $(man8_MANS) $(man_MANS)
+ @$(NORMAL_INSTALL)
+- test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
++ test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
+ @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
+ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ for i in $$l2; do \
+@@ -449,9 +477,9 @@
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ check-TESTS: $(TESTS)
+- @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
++ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
+ srcdir=$(srcdir); export srcdir; \
+- list=' $(TESTS) '; \
++ list='$(TESTS)'; \
+ if test -n "$$list"; then \
+ for tst in $$list; do \
+ if test -f ./$$tst; then dir=./; \
+@@ -460,7 +488,7 @@
+ if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *$$ws$$tst$$ws*) \
++ *" $$tst "*) \
+ xpass=`expr $$xpass + 1`; \
+ failed=`expr $$failed + 1`; \
+ echo "XPASS: $$tst"; \
+@@ -472,7 +500,7 @@
+ elif test $$? -ne 77; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *$$ws$$tst$$ws*) \
++ *" $$tst "*) \
+ xfail=`expr $$xfail + 1`; \
+ echo "XFAIL: $$tst"; \
+ ;; \
+@@ -522,21 +550,22 @@
+ else :; fi
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- list='$(DISTFILES)'; \
+- dist_files=`for file in $$list; do echo $$file; done | \
+- sed -e "s|^$$srcdirstrip/||;t" \
+- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+- case $$dist_files in \
+- */*) $(MKDIR_P) `echo "$$dist_files" | \
+- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+- sort -u` ;; \
+- esac; \
+- for file in $$dist_files; do \
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
+ if test -d $$d/$$file; then \
+- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -553,7 +582,7 @@
+ all-am: Makefile $(LTLIBRARIES) $(MANS) $(DATA)
+ installdirs:
+ for dir in "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man8dir)"; do \
+- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
++ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
+ install: install-am
+ install-exec: install-exec-am
+@@ -589,7 +618,7 @@
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-tags
++ distclean-libtool distclean-tags
-@@ -417,8 +425,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -428,13 +436,12 @@
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-Index: pam.deb/modules/pam_selinux/Makefile.in
+ dvi: dvi-am
+
+@@ -603,20 +632,12 @@
+
+ install-data-am: install-man install-securelibLTLIBRARIES
+
+-install-dvi: install-dvi-am
+-
+ install-exec-am:
+
+-install-html: install-html-am
+-
+ install-info: install-info-am
+
+ install-man: install-man8
+
+-install-pdf: install-pdf-am
+-
+-install-ps: install-ps-am
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -637,27 +658,24 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-man uninstall-securelibLTLIBRARIES
++uninstall-am: uninstall-info-am uninstall-man \
++ uninstall-securelibLTLIBRARIES
+
+ uninstall-man: uninstall-man8
+
+-.MAKE: install-am install-strip
+-
+ .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
+ clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
+ distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+- install-data-am install-dvi install-dvi-am install-exec \
+- install-exec-am install-html install-html-am install-info \
+- install-info-am install-man install-man8 install-pdf \
+- install-pdf-am install-ps install-ps-am \
++ install-data-am install-exec install-exec-am install-info \
++ install-info-am install-man install-man8 \
+ install-securelibLTLIBRARIES install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+- tags uninstall uninstall-am uninstall-man uninstall-man8 \
+- uninstall-securelibLTLIBRARIES
++ tags uninstall uninstall-am uninstall-info-am uninstall-man \
++ uninstall-man8 uninstall-securelibLTLIBRARIES
+
+ @ENABLE_REGENERATE_MAN_TRUE@README: pam_securetty.8.xml
+ @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
+Index: pam.debian/modules/pam_selinux/Makefile.in
===================================================================
---- pam.deb.orig/modules/pam_selinux/Makefile.in
-+++ pam.deb/modules/pam_selinux/Makefile.in
+--- pam.debian.orig/modules/pam_selinux/Makefile.in
++++ pam.debian/modules/pam_selinux/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -82,7 +82,7 @@
- pam_selinux_check_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(pam_selinux_check_LDFLAGS) $(LDFLAGS) -o $@
+@@ -20,11 +20,15 @@
+
+
+
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -69,29 +73,22 @@
+ pam_selinux_la_DEPENDENCIES =
+ pam_selinux_la_SOURCES = pam_selinux.c
+ pam_selinux_la_OBJECTS = pam_selinux.lo
+-pam_selinux_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+- $(pam_selinux_la_LDFLAGS) $(LDFLAGS) -o $@
+ @HAVE_LIBSELINUX_TRUE@am_pam_selinux_la_rpath = -rpath $(securelibdir)
+ PROGRAMS = $(noinst_PROGRAMS)
+ pam_selinux_check_SOURCES = pam_selinux_check.c
+ pam_selinux_check_OBJECTS = pam_selinux_check.$(OBJEXT)
+ pam_selinux_check_LDADD = $(LDADD)
+-pam_selinux_check_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+- $(pam_selinux_check_LDFLAGS) $(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -123,6 +123,7 @@
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
++ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++ $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+- $(LDFLAGS) -o $@
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = pam_selinux.c pam_selinux_check.c
+ DIST_SOURCES = pam_selinux.c pam_selinux_check.c
+ man8dir = $(mandir)/man8
+@@ -102,6 +99,8 @@
+ CTAGS = ctags
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AUTOCONF = @AUTOCONF@
+@@ -121,11 +120,16 @@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -10049,7 +18248,40 @@ Index: pam.deb/modules/pam_selinux/Makefile.in
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -175,6 +176,7 @@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
++ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
++ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
++ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -134,7 +138,18 @@
+ GMSGFMT_015 = @GMSGFMT_015@
+ GREP = @GREP@
+ HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
+-INSTALL = @INSTALL@
++HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
++HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
++HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
++HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
++HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
++HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
++HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
++HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
++HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
++HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
++HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
++HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -169,10 +184,10 @@
+ LTLIBINTL = @LTLIBINTL@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+-MKDIR_P = @MKDIR_P@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
@@ -10057,99 +18289,337 @@ Index: pam.deb/modules/pam_selinux/Makefile.in
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -190,6 +192,7 @@
- RANLIB = @RANLIB@
- SCONFIGDIR = @SCONFIGDIR@
- SECUREDIR = @SECUREDIR@
-+SED = @SED@
+@@ -191,6 +206,8 @@
+ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
++STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
++STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
STRIP = @STRIP@
-@@ -317,8 +320,8 @@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+@@ -204,13 +221,13 @@
+ XSLTPROC = @XSLTPROC@
+ YACC = @YACC@
+ YFLAGS = @YFLAGS@
+-abs_builddir = @abs_builddir@
+-abs_srcdir = @abs_srcdir@
+-abs_top_builddir = @abs_top_builddir@
+-abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -222,7 +239,6 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+-builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -253,11 +269,8 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+-srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_builddir = @top_builddir@
+-top_srcdir = @top_srcdir@
+ CLEANFILES = *~
+ EXTRA_DIST = README $(XMLS) pam_selinux.8 pam_selinux_check.8 \
+ tst-pam_selinux
+@@ -314,7 +327,7 @@
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+- test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
++ test -z "$(securelibdir)" || $(mkdir_p) "$(DESTDIR)$(securelibdir)"
@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \
-- $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \
- else :; fi; \
- done
+@@ -325,7 +338,7 @@
-@@ -326,8 +329,8 @@
+ uninstall-securelibLTLIBRARIES:
@$(NORMAL_UNINSTALL)
- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
+- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
++ @set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
+@@ -340,7 +353,7 @@
+ rm -f "$${dir}/so_locations"; \
done
+ pam_selinux.la: $(pam_selinux_la_OBJECTS) $(pam_selinux_la_DEPENDENCIES)
+- $(pam_selinux_la_LINK) $(am_pam_selinux_la_rpath) $(pam_selinux_la_OBJECTS) $(pam_selinux_la_LIBADD) $(LIBS)
++ $(LINK) $(am_pam_selinux_la_rpath) $(pam_selinux_la_LDFLAGS) $(pam_selinux_la_OBJECTS) $(pam_selinux_la_LIBADD) $(LIBS)
- clean-securelibLTLIBRARIES:
-@@ -437,8 +440,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
+ clean-noinstPROGRAMS:
+ @list='$(noinst_PROGRAMS)'; for p in $$list; do \
+@@ -350,7 +363,7 @@
+ done
+ pam_selinux_check$(EXEEXT): $(pam_selinux_check_OBJECTS) $(pam_selinux_check_DEPENDENCIES)
+ @rm -f pam_selinux_check$(EXEEXT)
+- $(pam_selinux_check_LINK) $(pam_selinux_check_OBJECTS) $(pam_selinux_check_LDADD) $(LIBS)
++ $(LINK) $(pam_selinux_check_LDFLAGS) $(pam_selinux_check_OBJECTS) $(pam_selinux_check_LDADD) $(LIBS)
-@@ -450,8 +453,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -461,13 +464,12 @@
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-Index: pam.deb/modules/pam_shells/Makefile.in
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+@@ -362,22 +375,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_selinux_check.Po@am__quote@
+
+ .c.o:
+-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
++@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+@@ -387,9 +400,13 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
++
++distclean-libtool:
++ -rm -f libtool
++uninstall-info-am:
+ install-man8: $(man8_MANS) $(man_MANS)
+ @$(NORMAL_INSTALL)
+- test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
++ test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
+ @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
+ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ for i in $$l2; do \
+@@ -482,9 +499,9 @@
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ check-TESTS: $(TESTS)
+- @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
++ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
+ srcdir=$(srcdir); export srcdir; \
+- list=' $(TESTS) '; \
++ list='$(TESTS)'; \
+ if test -n "$$list"; then \
+ for tst in $$list; do \
+ if test -f ./$$tst; then dir=./; \
+@@ -493,7 +510,7 @@
+ if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *$$ws$$tst$$ws*) \
++ *" $$tst "*) \
+ xpass=`expr $$xpass + 1`; \
+ failed=`expr $$failed + 1`; \
+ echo "XPASS: $$tst"; \
+@@ -505,7 +522,7 @@
+ elif test $$? -ne 77; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *$$ws$$tst$$ws*) \
++ *" $$tst "*) \
+ xfail=`expr $$xfail + 1`; \
+ echo "XFAIL: $$tst"; \
+ ;; \
+@@ -555,21 +572,22 @@
+ else :; fi
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- list='$(DISTFILES)'; \
+- dist_files=`for file in $$list; do echo $$file; done | \
+- sed -e "s|^$$srcdirstrip/||;t" \
+- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+- case $$dist_files in \
+- */*) $(MKDIR_P) `echo "$$dist_files" | \
+- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+- sort -u` ;; \
+- esac; \
+- for file in $$dist_files; do \
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
+ if test -d $$d/$$file; then \
+- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -586,7 +604,7 @@
+ all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(MANS) $(DATA)
+ installdirs:
+ for dir in "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man8dir)"; do \
+- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
++ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
+ install: install-am
+ install-exec: install-exec-am
+@@ -622,7 +640,7 @@
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-tags
++ distclean-libtool distclean-tags
+
+ dvi: dvi-am
+
+@@ -636,20 +654,12 @@
+
+ install-data-am: install-man install-securelibLTLIBRARIES
+
+-install-dvi: install-dvi-am
+-
+ install-exec-am:
+
+-install-html: install-html-am
+-
+ install-info: install-info-am
+
+ install-man: install-man8
+
+-install-pdf: install-pdf-am
+-
+-install-ps: install-ps-am
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -670,27 +680,24 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-man uninstall-securelibLTLIBRARIES
++uninstall-am: uninstall-info-am uninstall-man \
++ uninstall-securelibLTLIBRARIES
+
+ uninstall-man: uninstall-man8
+
+-.MAKE: install-am install-strip
+-
+ .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
+ clean-generic clean-libtool clean-noinstPROGRAMS \
+ clean-securelibLTLIBRARIES ctags distclean distclean-compile \
+ distclean-generic distclean-libtool distclean-tags distdir dvi \
+ dvi-am html html-am info info-am install install-am \
+- install-data install-data-am install-dvi install-dvi-am \
+- install-exec install-exec-am install-html install-html-am \
++ install-data install-data-am install-exec install-exec-am \
+ install-info install-info-am install-man install-man8 \
+- install-pdf install-pdf-am install-ps install-ps-am \
+ install-securelibLTLIBRARIES install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+- tags uninstall uninstall-am uninstall-man uninstall-man8 \
+- uninstall-securelibLTLIBRARIES
++ tags uninstall uninstall-am uninstall-info-am uninstall-man \
++ uninstall-man8 uninstall-securelibLTLIBRARIES
+
+ @ENABLE_REGENERATE_MAN_TRUE@README: pam_selinux.8.xml
+ @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
+Index: pam.debian/modules/pam_shells/Makefile.in
===================================================================
---- pam.deb.orig/modules/pam_shells/Makefile.in
-+++ pam.deb/modules/pam_shells/Makefile.in
+--- pam.debian.orig/modules/pam_shells/Makefile.in
++++ pam.debian/modules/pam_shells/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -67,7 +67,7 @@
- pam_shells_la_LIBADD =
+@@ -19,11 +19,15 @@
+ #
+
+
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -67,18 +71,17 @@
+ pam_shells_la_DEPENDENCIES =
pam_shells_la_SOURCES = pam_shells.c
pam_shells_la_OBJECTS = pam_shells.lo
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -108,6 +108,7 @@
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
++ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++ $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+- $(LDFLAGS) -o $@
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = pam_shells.c
+ DIST_SOURCES = pam_shells.c
+ man8dir = $(mandir)/man8
+@@ -89,6 +92,8 @@
+ CTAGS = ctags
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AUTOCONF = @AUTOCONF@
+@@ -108,11 +113,16 @@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -10157,7 +18627,40 @@ Index: pam.deb/modules/pam_shells/Makefile.in
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -160,6 +161,7 @@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
++ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
++ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
++ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -121,7 +131,18 @@
+ GMSGFMT_015 = @GMSGFMT_015@
+ GREP = @GREP@
+ HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
+-INSTALL = @INSTALL@
++HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
++HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
++HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
++HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
++HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
++HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
++HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
++HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
++HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
++HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
++HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
++HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -156,10 +177,10 @@
+ LTLIBINTL = @LTLIBINTL@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+-MKDIR_P = @MKDIR_P@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
@@ -10165,99 +18668,328 @@ Index: pam.deb/modules/pam_shells/Makefile.in
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -175,6 +177,7 @@
- RANLIB = @RANLIB@
- SCONFIGDIR = @SCONFIGDIR@
- SECUREDIR = @SECUREDIR@
-+SED = @SED@
+@@ -178,6 +199,8 @@
+ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
++STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
++STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
STRIP = @STRIP@
-@@ -295,8 +298,8 @@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+@@ -191,13 +214,13 @@
+ XSLTPROC = @XSLTPROC@
+ YACC = @YACC@
+ YFLAGS = @YFLAGS@
+-abs_builddir = @abs_builddir@
+-abs_srcdir = @abs_srcdir@
+-abs_top_builddir = @abs_top_builddir@
+-abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -209,7 +232,6 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+-builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -240,11 +262,8 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+-srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_builddir = @top_builddir@
+-top_srcdir = @top_srcdir@
+ CLEANFILES = *~
+ EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_shells
+ man_MANS = pam_shells.8
+@@ -292,7 +311,7 @@
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+- test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
++ test -z "$(securelibdir)" || $(mkdir_p) "$(DESTDIR)$(securelibdir)"
@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \
-- $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \
- else :; fi; \
- done
+@@ -303,7 +322,7 @@
-@@ -304,8 +307,8 @@
+ uninstall-securelibLTLIBRARIES:
@$(NORMAL_UNINSTALL)
- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
+- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
++ @set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
+@@ -318,7 +337,7 @@
+ rm -f "$${dir}/so_locations"; \
done
+ pam_shells.la: $(pam_shells_la_OBJECTS) $(pam_shells_la_DEPENDENCIES)
+- $(LINK) -rpath $(securelibdir) $(pam_shells_la_OBJECTS) $(pam_shells_la_LIBADD) $(LIBS)
++ $(LINK) -rpath $(securelibdir) $(pam_shells_la_LDFLAGS) $(pam_shells_la_OBJECTS) $(pam_shells_la_LIBADD) $(LIBS)
- clean-securelibLTLIBRARIES:
-@@ -404,8 +407,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+@@ -329,22 +348,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_shells.Plo@am__quote@
-@@ -417,8 +420,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -428,13 +431,12 @@
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-Index: pam.deb/modules/pam_stress/Makefile.in
+ .c.o:
+-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
++@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+@@ -354,9 +373,13 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
++
++distclean-libtool:
++ -rm -f libtool
++uninstall-info-am:
+ install-man8: $(man8_MANS) $(man_MANS)
+ @$(NORMAL_INSTALL)
+- test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
++ test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
+ @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
+ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ for i in $$l2; do \
+@@ -449,9 +472,9 @@
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ check-TESTS: $(TESTS)
+- @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
++ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
+ srcdir=$(srcdir); export srcdir; \
+- list=' $(TESTS) '; \
++ list='$(TESTS)'; \
+ if test -n "$$list"; then \
+ for tst in $$list; do \
+ if test -f ./$$tst; then dir=./; \
+@@ -460,7 +483,7 @@
+ if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *$$ws$$tst$$ws*) \
++ *" $$tst "*) \
+ xpass=`expr $$xpass + 1`; \
+ failed=`expr $$failed + 1`; \
+ echo "XPASS: $$tst"; \
+@@ -472,7 +495,7 @@
+ elif test $$? -ne 77; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *$$ws$$tst$$ws*) \
++ *" $$tst "*) \
+ xfail=`expr $$xfail + 1`; \
+ echo "XFAIL: $$tst"; \
+ ;; \
+@@ -522,21 +545,22 @@
+ else :; fi
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- list='$(DISTFILES)'; \
+- dist_files=`for file in $$list; do echo $$file; done | \
+- sed -e "s|^$$srcdirstrip/||;t" \
+- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+- case $$dist_files in \
+- */*) $(MKDIR_P) `echo "$$dist_files" | \
+- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+- sort -u` ;; \
+- esac; \
+- for file in $$dist_files; do \
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
+ if test -d $$d/$$file; then \
+- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -553,7 +577,7 @@
+ all-am: Makefile $(LTLIBRARIES) $(MANS) $(DATA)
+ installdirs:
+ for dir in "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man8dir)"; do \
+- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
++ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
+ install: install-am
+ install-exec: install-exec-am
+@@ -589,7 +613,7 @@
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-tags
++ distclean-libtool distclean-tags
+
+ dvi: dvi-am
+
+@@ -603,20 +627,12 @@
+
+ install-data-am: install-man install-securelibLTLIBRARIES
+
+-install-dvi: install-dvi-am
+-
+ install-exec-am:
+
+-install-html: install-html-am
+-
+ install-info: install-info-am
+
+ install-man: install-man8
+
+-install-pdf: install-pdf-am
+-
+-install-ps: install-ps-am
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -637,27 +653,24 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-man uninstall-securelibLTLIBRARIES
++uninstall-am: uninstall-info-am uninstall-man \
++ uninstall-securelibLTLIBRARIES
+
+ uninstall-man: uninstall-man8
+
+-.MAKE: install-am install-strip
+-
+ .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
+ clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
+ distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+- install-data-am install-dvi install-dvi-am install-exec \
+- install-exec-am install-html install-html-am install-info \
+- install-info-am install-man install-man8 install-pdf \
+- install-pdf-am install-ps install-ps-am \
++ install-data-am install-exec install-exec-am install-info \
++ install-info-am install-man install-man8 \
+ install-securelibLTLIBRARIES install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+- tags uninstall uninstall-am uninstall-man uninstall-man8 \
+- uninstall-securelibLTLIBRARIES
++ tags uninstall uninstall-am uninstall-info-am uninstall-man \
++ uninstall-man8 uninstall-securelibLTLIBRARIES
+
+ @ENABLE_REGENERATE_MAN_TRUE@README: pam_shells.8.xml
+ @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
+Index: pam.debian/modules/pam_stress/Makefile.in
===================================================================
---- pam.deb.orig/modules/pam_stress/Makefile.in
-+++ pam.deb/modules/pam_stress/Makefile.in
+--- pam.debian.orig/modules/pam_stress/Makefile.in
++++ pam.debian/modules/pam_stress/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -66,7 +66,7 @@
- pam_stress_la_LIBADD =
+@@ -18,11 +18,15 @@
+ # Copyright (c) 2005, 2006 Thorsten Kukuk <kukuk@suse.de>
+ #
+
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -66,24 +70,25 @@
+ pam_stress_la_DEPENDENCIES =
pam_stress_la_SOURCES = pam_stress.c
pam_stress_la_OBJECTS = pam_stress.lo
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -103,6 +103,7 @@
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
++ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++ $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+- $(LDFLAGS) -o $@
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = pam_stress.c
+ DIST_SOURCES = pam_stress.c
+ ETAGS = etags
+ CTAGS = ctags
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AUTOCONF = @AUTOCONF@
+@@ -103,11 +108,16 @@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -10265,7 +18997,40 @@ Index: pam.deb/modules/pam_stress/Makefile.in
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -155,6 +156,7 @@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
++ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
++ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
++ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -116,7 +126,18 @@
+ GMSGFMT_015 = @GMSGFMT_015@
+ GREP = @GREP@
+ HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
+-INSTALL = @INSTALL@
++HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
++HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
++HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
++HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
++HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
++HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
++HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
++HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
++HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
++HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
++HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
++HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -151,10 +172,10 @@
+ LTLIBINTL = @LTLIBINTL@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+-MKDIR_P = @MKDIR_P@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
@@ -10273,99 +19038,320 @@ Index: pam.deb/modules/pam_stress/Makefile.in
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -170,6 +172,7 @@
- RANLIB = @RANLIB@
- SCONFIGDIR = @SCONFIGDIR@
- SECUREDIR = @SECUREDIR@
-+SED = @SED@
+@@ -173,6 +194,8 @@
+ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
++STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
++STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
STRIP = @STRIP@
-@@ -287,8 +290,8 @@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+@@ -186,13 +209,13 @@
+ XSLTPROC = @XSLTPROC@
+ YACC = @YACC@
+ YFLAGS = @YFLAGS@
+-abs_builddir = @abs_builddir@
+-abs_srcdir = @abs_srcdir@
+-abs_top_builddir = @abs_top_builddir@
+-abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -204,7 +227,6 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+-builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -235,11 +257,8 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+-srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_builddir = @top_builddir@
+-top_srcdir = @top_srcdir@
+ CLEANFILES = *~
+ EXTRA_DIST = README tst-pam_stress
+ TESTS = tst-pam_stress
+@@ -284,7 +303,7 @@
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+- test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
++ test -z "$(securelibdir)" || $(mkdir_p) "$(DESTDIR)$(securelibdir)"
@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \
-- $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \
- else :; fi; \
- done
+@@ -295,7 +314,7 @@
-@@ -296,8 +299,8 @@
+ uninstall-securelibLTLIBRARIES:
@$(NORMAL_UNINSTALL)
- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
+- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
++ @set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
+@@ -310,7 +329,7 @@
+ rm -f "$${dir}/so_locations"; \
done
+ pam_stress.la: $(pam_stress_la_OBJECTS) $(pam_stress_la_DEPENDENCIES)
+- $(LINK) -rpath $(securelibdir) $(pam_stress_la_OBJECTS) $(pam_stress_la_LIBADD) $(LIBS)
++ $(LINK) -rpath $(securelibdir) $(pam_stress_la_LDFLAGS) $(pam_stress_la_OBJECTS) $(pam_stress_la_LIBADD) $(LIBS)
- clean-securelibLTLIBRARIES:
-@@ -351,8 +354,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+@@ -321,22 +340,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_stress.Plo@am__quote@
-@@ -364,8 +367,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -375,13 +378,12 @@
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ .c.o:
+-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
++@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+@@ -347,6 +366,10 @@
+ clean-libtool:
+ -rm -rf .libs _libs
+
++distclean-libtool:
++ -rm -f libtool
++uninstall-info-am:
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-Index: pam.deb/modules/pam_succeed_if/Makefile.in
+@@ -396,9 +419,9 @@
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ check-TESTS: $(TESTS)
+- @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
++ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
+ srcdir=$(srcdir); export srcdir; \
+- list=' $(TESTS) '; \
++ list='$(TESTS)'; \
+ if test -n "$$list"; then \
+ for tst in $$list; do \
+ if test -f ./$$tst; then dir=./; \
+@@ -407,7 +430,7 @@
+ if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *$$ws$$tst$$ws*) \
++ *" $$tst "*) \
+ xpass=`expr $$xpass + 1`; \
+ failed=`expr $$failed + 1`; \
+ echo "XPASS: $$tst"; \
+@@ -419,7 +442,7 @@
+ elif test $$? -ne 77; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *$$ws$$tst$$ws*) \
++ *" $$tst "*) \
+ xfail=`expr $$xfail + 1`; \
+ echo "XFAIL: $$tst"; \
+ ;; \
+@@ -469,21 +492,22 @@
+ else :; fi
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- list='$(DISTFILES)'; \
+- dist_files=`for file in $$list; do echo $$file; done | \
+- sed -e "s|^$$srcdirstrip/||;t" \
+- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+- case $$dist_files in \
+- */*) $(MKDIR_P) `echo "$$dist_files" | \
+- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+- sort -u` ;; \
+- esac; \
+- for file in $$dist_files; do \
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
+ if test -d $$d/$$file; then \
+- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -500,7 +524,7 @@
+ all-am: Makefile $(LTLIBRARIES)
+ installdirs:
+ for dir in "$(DESTDIR)$(securelibdir)"; do \
+- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
++ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
+ install: install-am
+ install-exec: install-exec-am
+@@ -536,7 +560,7 @@
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-tags
++ distclean-libtool distclean-tags
+
+ dvi: dvi-am
+
+@@ -550,20 +574,12 @@
+
+ install-data-am: install-securelibLTLIBRARIES
+
+-install-dvi: install-dvi-am
+-
+ install-exec-am:
+
+-install-html: install-html-am
+-
+ install-info: install-info-am
+
+ install-man:
+
+-install-pdf: install-pdf-am
+-
+-install-ps: install-ps-am
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -584,24 +600,20 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-securelibLTLIBRARIES
+-
+-.MAKE: install-am install-strip
++uninstall-am: uninstall-info-am uninstall-securelibLTLIBRARIES
+
+ .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
+ clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
+ distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+- install-data-am install-dvi install-dvi-am install-exec \
+- install-exec-am install-html install-html-am install-info \
+- install-info-am install-man install-pdf install-pdf-am \
+- install-ps install-ps-am install-securelibLTLIBRARIES \
++ install-data-am install-exec install-exec-am install-info \
++ install-info-am install-man install-securelibLTLIBRARIES \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+ pdf pdf-am ps ps-am tags uninstall uninstall-am \
+- uninstall-securelibLTLIBRARIES
++ uninstall-info-am uninstall-securelibLTLIBRARIES
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+Index: pam.debian/modules/pam_succeed_if/Makefile.in
===================================================================
---- pam.deb.orig/modules/pam_succeed_if/Makefile.in
-+++ 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,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -67,7 +67,7 @@
- pam_succeed_if_la_LIBADD =
+@@ -19,11 +19,15 @@
+ #
+
+
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -67,18 +71,17 @@
+ pam_succeed_if_la_DEPENDENCIES =
pam_succeed_if_la_SOURCES = pam_succeed_if.c
pam_succeed_if_la_OBJECTS = pam_succeed_if.lo
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -108,6 +108,7 @@
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
++ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++ $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+- $(LDFLAGS) -o $@
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = pam_succeed_if.c
+ DIST_SOURCES = pam_succeed_if.c
+ man8dir = $(mandir)/man8
+@@ -89,6 +92,8 @@
+ CTAGS = ctags
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AUTOCONF = @AUTOCONF@
+@@ -108,11 +113,16 @@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -10373,7 +19359,40 @@ Index: pam.deb/modules/pam_succeed_if/Makefile.in
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -160,6 +161,7 @@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
++ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
++ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
++ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -121,7 +131,18 @@
+ GMSGFMT_015 = @GMSGFMT_015@
+ GREP = @GREP@
+ HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
+-INSTALL = @INSTALL@
++HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
++HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
++HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
++HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
++HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
++HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
++HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
++HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
++HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
++HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
++HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
++HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -156,10 +177,10 @@
+ LTLIBINTL = @LTLIBINTL@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+-MKDIR_P = @MKDIR_P@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
@@ -10381,99 +19400,337 @@ Index: pam.deb/modules/pam_succeed_if/Makefile.in
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -175,6 +177,7 @@
- RANLIB = @RANLIB@
- SCONFIGDIR = @SCONFIGDIR@
- SECUREDIR = @SECUREDIR@
-+SED = @SED@
+@@ -178,6 +199,8 @@
+ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
++STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
++STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
STRIP = @STRIP@
-@@ -295,8 +298,8 @@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+@@ -191,13 +214,13 @@
+ XSLTPROC = @XSLTPROC@
+ YACC = @YACC@
+ YFLAGS = @YFLAGS@
+-abs_builddir = @abs_builddir@
+-abs_srcdir = @abs_srcdir@
+-abs_top_builddir = @abs_top_builddir@
+-abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -209,7 +232,6 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+-builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -240,11 +262,8 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+-srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_builddir = @top_builddir@
+-top_srcdir = @top_srcdir@
+ CLEANFILES = *~
+ EXTRA_DIST = README ${MANS} ${XMLS} tst-pam_succeed_if
+ TESTS = tst-pam_succeed_if
+@@ -292,7 +311,7 @@
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+- test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
++ test -z "$(securelibdir)" || $(mkdir_p) "$(DESTDIR)$(securelibdir)"
@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \
-- $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \
- else :; fi; \
- done
+@@ -303,7 +322,7 @@
-@@ -304,8 +307,8 @@
+ uninstall-securelibLTLIBRARIES:
@$(NORMAL_UNINSTALL)
- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
+- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
++ @set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
+@@ -318,7 +337,7 @@
+ rm -f "$${dir}/so_locations"; \
done
+ pam_succeed_if.la: $(pam_succeed_if_la_OBJECTS) $(pam_succeed_if_la_DEPENDENCIES)
+- $(LINK) -rpath $(securelibdir) $(pam_succeed_if_la_OBJECTS) $(pam_succeed_if_la_LIBADD) $(LIBS)
++ $(LINK) -rpath $(securelibdir) $(pam_succeed_if_la_LDFLAGS) $(pam_succeed_if_la_OBJECTS) $(pam_succeed_if_la_LIBADD) $(LIBS)
- clean-securelibLTLIBRARIES:
-@@ -404,8 +407,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+@@ -329,22 +348,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_succeed_if.Plo@am__quote@
-@@ -417,8 +420,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -428,13 +431,12 @@
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-Index: pam.deb/modules/pam_tally/Makefile.in
+ .c.o:
+-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
++@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+@@ -354,9 +373,13 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
++
++distclean-libtool:
++ -rm -f libtool
++uninstall-info-am:
+ install-man8: $(man8_MANS) $(man_MANS)
+ @$(NORMAL_INSTALL)
+- test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
++ test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
+ @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
+ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ for i in $$l2; do \
+@@ -449,9 +472,9 @@
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ check-TESTS: $(TESTS)
+- @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
++ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
+ srcdir=$(srcdir); export srcdir; \
+- list=' $(TESTS) '; \
++ list='$(TESTS)'; \
+ if test -n "$$list"; then \
+ for tst in $$list; do \
+ if test -f ./$$tst; then dir=./; \
+@@ -460,7 +483,7 @@
+ if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *$$ws$$tst$$ws*) \
++ *" $$tst "*) \
+ xpass=`expr $$xpass + 1`; \
+ failed=`expr $$failed + 1`; \
+ echo "XPASS: $$tst"; \
+@@ -472,7 +495,7 @@
+ elif test $$? -ne 77; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *$$ws$$tst$$ws*) \
++ *" $$tst "*) \
+ xfail=`expr $$xfail + 1`; \
+ echo "XFAIL: $$tst"; \
+ ;; \
+@@ -522,21 +545,22 @@
+ else :; fi
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- list='$(DISTFILES)'; \
+- dist_files=`for file in $$list; do echo $$file; done | \
+- sed -e "s|^$$srcdirstrip/||;t" \
+- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+- case $$dist_files in \
+- */*) $(MKDIR_P) `echo "$$dist_files" | \
+- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+- sort -u` ;; \
+- esac; \
+- for file in $$dist_files; do \
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
+ if test -d $$d/$$file; then \
+- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -553,7 +577,7 @@
+ all-am: Makefile $(LTLIBRARIES) $(MANS) $(DATA)
+ installdirs:
+ for dir in "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man8dir)"; do \
+- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
++ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
+ install: install-am
+ install-exec: install-exec-am
+@@ -589,7 +613,7 @@
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-tags
++ distclean-libtool distclean-tags
+
+ dvi: dvi-am
+
+@@ -603,20 +627,12 @@
+
+ install-data-am: install-man install-securelibLTLIBRARIES
+
+-install-dvi: install-dvi-am
+-
+ install-exec-am:
+
+-install-html: install-html-am
+-
+ install-info: install-info-am
+
+ install-man: install-man8
+
+-install-pdf: install-pdf-am
+-
+-install-ps: install-ps-am
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -637,27 +653,24 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-man uninstall-securelibLTLIBRARIES
++uninstall-am: uninstall-info-am uninstall-man \
++ uninstall-securelibLTLIBRARIES
+
+ uninstall-man: uninstall-man8
+
+-.MAKE: install-am install-strip
+-
+ .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
+ clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
+ distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+- install-data-am install-dvi install-dvi-am install-exec \
+- install-exec-am install-html install-html-am install-info \
+- install-info-am install-man install-man8 install-pdf \
+- install-pdf-am install-ps install-ps-am \
++ install-data-am install-exec install-exec-am install-info \
++ install-info-am install-man install-man8 \
+ install-securelibLTLIBRARIES install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+- tags uninstall uninstall-am uninstall-man uninstall-man8 \
+- uninstall-securelibLTLIBRARIES
++ tags uninstall uninstall-am uninstall-info-am uninstall-man \
++ uninstall-man8 uninstall-securelibLTLIBRARIES
+
+ @ENABLE_REGENERATE_MAN_TRUE@README: pam_succeed_if.8.xml
+ @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
+Index: pam.debian/modules/pam_tally/Makefile.in
===================================================================
---- pam.deb.orig/modules/pam_tally/Makefile.in
-+++ pam.deb/modules/pam_tally/Makefile.in
+--- pam.debian.orig/modules/pam_tally/Makefile.in
++++ pam.debian/modules/pam_tally/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -83,7 +83,7 @@
- pam_tally_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(pam_tally_LDFLAGS) $(LDFLAGS) -o $@
+@@ -21,11 +21,15 @@
+
+
+
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -72,26 +76,22 @@
+ pam_tally_la_DEPENDENCIES =
+ pam_tally_la_SOURCES = pam_tally.c
+ pam_tally_la_OBJECTS = pam_tally.lo
+-pam_tally_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+- $(pam_tally_la_LDFLAGS) $(LDFLAGS) -o $@
+ sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ PROGRAMS = $(sbin_PROGRAMS)
+ am_pam_tally_OBJECTS = pam_tally_app.$(OBJEXT)
+ pam_tally_OBJECTS = $(am_pam_tally_OBJECTS)
+ pam_tally_DEPENDENCIES =
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -125,6 +125,7 @@
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
++ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++ $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+- $(LDFLAGS) -o $@
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = pam_tally.c $(pam_tally_SOURCES)
+ DIST_SOURCES = pam_tally.c $(pam_tally_SOURCES)
+ man8dir = $(mandir)/man8
+@@ -103,6 +103,8 @@
+ CTAGS = ctags
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AUTOCONF = @AUTOCONF@
+@@ -122,11 +124,16 @@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -10481,7 +19738,40 @@ Index: pam.deb/modules/pam_tally/Makefile.in
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -177,6 +178,7 @@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
++ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
++ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
++ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -135,7 +142,18 @@
+ GMSGFMT_015 = @GMSGFMT_015@
+ GREP = @GREP@
+ HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
+-INSTALL = @INSTALL@
++HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
++HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
++HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
++HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
++HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
++HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
++HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
++HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
++HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
++HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
++HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
++HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -170,10 +188,10 @@
+ LTLIBINTL = @LTLIBINTL@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+-MKDIR_P = @MKDIR_P@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
@@ -10489,110 +19779,343 @@ Index: pam.deb/modules/pam_tally/Makefile.in
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -192,6 +194,7 @@
- RANLIB = @RANLIB@
- SCONFIGDIR = @SCONFIGDIR@
- SECUREDIR = @SECUREDIR@
-+SED = @SED@
+@@ -192,6 +210,8 @@
+ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
++STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
++STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
STRIP = @STRIP@
-@@ -315,8 +318,8 @@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+@@ -205,13 +225,13 @@
+ XSLTPROC = @XSLTPROC@
+ YACC = @YACC@
+ YFLAGS = @YFLAGS@
+-abs_builddir = @abs_builddir@
+-abs_srcdir = @abs_srcdir@
+-abs_top_builddir = @abs_top_builddir@
+-abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -223,7 +243,6 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+-builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -254,11 +273,8 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+-srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_builddir = @top_builddir@
+-top_srcdir = @top_srcdir@
+ CLEANFILES = *~
+ EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_tally
+ man_MANS = pam_tally.8
+@@ -310,7 +326,7 @@
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+- test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
++ test -z "$(securelibdir)" || $(mkdir_p) "$(DESTDIR)$(securelibdir)"
@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \
-- $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \
- else :; fi; \
- done
+@@ -321,7 +337,7 @@
-@@ -324,8 +327,8 @@
+ uninstall-securelibLTLIBRARIES:
@$(NORMAL_UNINSTALL)
- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
+- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
++ @set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
+@@ -336,10 +352,10 @@
+ rm -f "$${dir}/so_locations"; \
done
+ pam_tally.la: $(pam_tally_la_OBJECTS) $(pam_tally_la_DEPENDENCIES)
+- $(pam_tally_la_LINK) -rpath $(securelibdir) $(pam_tally_la_OBJECTS) $(pam_tally_la_LIBADD) $(LIBS)
++ $(LINK) -rpath $(securelibdir) $(pam_tally_la_LDFLAGS) $(pam_tally_la_OBJECTS) $(pam_tally_la_LIBADD) $(LIBS)
+ install-sbinPROGRAMS: $(sbin_PROGRAMS)
+ @$(NORMAL_INSTALL)
+- test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)"
++ test -z "$(sbindir)" || $(mkdir_p) "$(DESTDIR)$(sbindir)"
+ @list='$(sbin_PROGRAMS)'; for p in $$list; do \
+ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ if test -f $$p \
+@@ -367,7 +383,7 @@
+ done
+ pam_tally$(EXEEXT): $(pam_tally_OBJECTS) $(pam_tally_DEPENDENCIES)
+ @rm -f pam_tally$(EXEEXT)
+- $(LINK) $(pam_tally_OBJECTS) $(pam_tally_LDADD) $(LIBS)
++ $(LINK) $(pam_tally_LDFLAGS) $(pam_tally_OBJECTS) $(pam_tally_LDADD) $(LIBS)
+
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+@@ -379,22 +395,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_tally_app.Po@am__quote@
- clean-securelibLTLIBRARIES:
-@@ -347,8 +350,8 @@
- || test -f $$p1 \
- ; then \
- f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(sbindir)/$$f'"; \
-- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(sbindir)/$$f" || exit 1; \
-+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(sbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(sbindir)/$$f'"; \
-+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(sbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(sbindir)/$$f" || exit 1; \
- else :; fi; \
+ .c.o:
+-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
++@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+@@ -404,9 +420,13 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
++
++distclean-libtool:
++ -rm -f libtool
++uninstall-info-am:
+ install-man8: $(man8_MANS) $(man_MANS)
+ @$(NORMAL_INSTALL)
+- test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
++ test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
+ @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
+ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ for i in $$l2; do \
+@@ -499,9 +519,9 @@
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ check-TESTS: $(TESTS)
+- @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
++ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
+ srcdir=$(srcdir); export srcdir; \
+- list=' $(TESTS) '; \
++ list='$(TESTS)'; \
+ if test -n "$$list"; then \
+ for tst in $$list; do \
+ if test -f ./$$tst; then dir=./; \
+@@ -510,7 +530,7 @@
+ if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *$$ws$$tst$$ws*) \
++ *" $$tst "*) \
+ xpass=`expr $$xpass + 1`; \
+ failed=`expr $$failed + 1`; \
+ echo "XPASS: $$tst"; \
+@@ -522,7 +542,7 @@
+ elif test $$? -ne 77; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *$$ws$$tst$$ws*) \
++ *" $$tst "*) \
+ xfail=`expr $$xfail + 1`; \
+ echo "XFAIL: $$tst"; \
+ ;; \
+@@ -572,21 +592,22 @@
+ else :; fi
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- list='$(DISTFILES)'; \
+- dist_files=`for file in $$list; do echo $$file; done | \
+- sed -e "s|^$$srcdirstrip/||;t" \
+- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+- case $$dist_files in \
+- */*) $(MKDIR_P) `echo "$$dist_files" | \
+- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+- sort -u` ;; \
+- esac; \
+- for file in $$dist_files; do \
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
+ if test -d $$d/$$file; then \
+- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -603,7 +624,7 @@
+ all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(MANS) $(DATA) $(HEADERS)
+ installdirs:
+ for dir in "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man8dir)"; do \
+- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
++ test -z "$$dir" || $(mkdir_p) "$$dir"; \
done
+ install: install-am
+ install-exec: install-exec-am
+@@ -639,7 +660,7 @@
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-tags
++ distclean-libtool distclean-tags
-@@ -456,8 +459,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
+ dvi: dvi-am
-@@ -469,8 +472,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -480,13 +483,12 @@
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-Index: pam.deb/modules/pam_time/Makefile.in
+@@ -653,20 +674,12 @@
+
+ install-data-am: install-man install-securelibLTLIBRARIES
+
+-install-dvi: install-dvi-am
+-
+ install-exec-am: install-sbinPROGRAMS
+
+-install-html: install-html-am
+-
+ install-info: install-info-am
+
+ install-man: install-man8
+
+-install-pdf: install-pdf-am
+-
+-install-ps: install-ps-am
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -687,29 +700,25 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-man uninstall-sbinPROGRAMS \
++uninstall-am: uninstall-info-am uninstall-man uninstall-sbinPROGRAMS \
+ uninstall-securelibLTLIBRARIES
+
+ uninstall-man: uninstall-man8
+
+-.MAKE: install-am install-strip
+-
+ .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
+ clean-generic clean-libtool clean-sbinPROGRAMS \
+ clean-securelibLTLIBRARIES ctags distclean distclean-compile \
+ distclean-generic distclean-libtool distclean-tags distdir dvi \
+ dvi-am html html-am info info-am install install-am \
+- install-data install-data-am install-dvi install-dvi-am \
+- install-exec install-exec-am install-html install-html-am \
++ install-data install-data-am install-exec install-exec-am \
+ install-info install-info-am install-man install-man8 \
+- install-pdf install-pdf-am install-ps install-ps-am \
+ install-sbinPROGRAMS install-securelibLTLIBRARIES \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+- pdf pdf-am ps ps-am tags uninstall uninstall-am uninstall-man \
+- uninstall-man8 uninstall-sbinPROGRAMS \
+- uninstall-securelibLTLIBRARIES
++ pdf pdf-am ps ps-am tags uninstall uninstall-am \
++ uninstall-info-am uninstall-man uninstall-man8 \
++ uninstall-sbinPROGRAMS uninstall-securelibLTLIBRARIES
+
+ @ENABLE_REGENERATE_MAN_TRUE@README: pam_tally.8.xml
+ @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
+Index: pam.debian/modules/pam_time/Makefile.in
===================================================================
---- pam.deb.orig/modules/pam_time/Makefile.in
-+++ pam.deb/modules/pam_time/Makefile.in
+--- pam.debian.orig/modules/pam_time/Makefile.in
++++ pam.debian/modules/pam_time/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -68,7 +68,7 @@
- pam_time_la_LIBADD =
+@@ -19,11 +19,15 @@
+ #
+
+
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -68,18 +72,17 @@
+ pam_time_la_DEPENDENCIES =
pam_time_la_SOURCES = pam_time.c
pam_time_la_OBJECTS = pam_time.lo
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -111,6 +111,7 @@
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
++ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++ $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+- $(LDFLAGS) -o $@
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = pam_time.c
+ DIST_SOURCES = pam_time.c
+ man5dir = $(mandir)/man5
+@@ -92,6 +95,8 @@
+ CTAGS = ctags
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AUTOCONF = @AUTOCONF@
+@@ -111,11 +116,16 @@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -10600,7 +20123,40 @@ Index: pam.deb/modules/pam_time/Makefile.in
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -163,6 +164,7 @@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
++ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
++ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
++ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -124,7 +134,18 @@
+ GMSGFMT_015 = @GMSGFMT_015@
+ GREP = @GREP@
+ HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
+-INSTALL = @INSTALL@
++HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
++HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
++HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
++HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
++HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
++HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
++HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
++HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
++HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
++HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
++HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
++HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -159,10 +180,10 @@
+ LTLIBINTL = @LTLIBINTL@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+-MKDIR_P = @MKDIR_P@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
@@ -10608,99 +20164,348 @@ Index: pam.deb/modules/pam_time/Makefile.in
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -178,6 +180,7 @@
- RANLIB = @RANLIB@
- SCONFIGDIR = @SCONFIGDIR@
- SECUREDIR = @SECUREDIR@
-+SED = @SED@
+@@ -181,6 +202,8 @@
+ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
++STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
++STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
STRIP = @STRIP@
-@@ -301,8 +304,8 @@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+@@ -194,13 +217,13 @@
+ XSLTPROC = @XSLTPROC@
+ YACC = @YACC@
+ YFLAGS = @YFLAGS@
+-abs_builddir = @abs_builddir@
+-abs_srcdir = @abs_srcdir@
+-abs_top_builddir = @abs_top_builddir@
+-abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -212,7 +235,6 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+-builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -243,11 +265,8 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+-srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_builddir = @top_builddir@
+-top_srcdir = @top_srcdir@
+ CLEANFILES = *~
+ EXTRA_DIST = README $(MANS) $(XMLS) time.conf tst-pam_time
+ man_MANS = time.conf.5 pam_time.8
+@@ -298,7 +317,7 @@
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+- test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
++ test -z "$(securelibdir)" || $(mkdir_p) "$(DESTDIR)$(securelibdir)"
@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \
-- $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \
- else :; fi; \
- done
+@@ -309,7 +328,7 @@
-@@ -310,8 +313,8 @@
+ uninstall-securelibLTLIBRARIES:
@$(NORMAL_UNINSTALL)
- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
+- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
++ @set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
+@@ -324,7 +343,7 @@
+ rm -f "$${dir}/so_locations"; \
done
+ pam_time.la: $(pam_time_la_OBJECTS) $(pam_time_la_DEPENDENCIES)
+- $(LINK) -rpath $(securelibdir) $(pam_time_la_OBJECTS) $(pam_time_la_LIBADD) $(LIBS)
++ $(LINK) -rpath $(securelibdir) $(pam_time_la_LDFLAGS) $(pam_time_la_OBJECTS) $(pam_time_la_LIBADD) $(LIBS)
- clean-securelibLTLIBRARIES:
-@@ -472,8 +475,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+@@ -335,22 +354,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_time.Plo@am__quote@
-@@ -485,8 +488,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -496,13 +499,12 @@
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-Index: pam.deb/modules/pam_umask/Makefile.in
+ .c.o:
+-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
++@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+@@ -360,9 +379,13 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
++
++distclean-libtool:
++ -rm -f libtool
++uninstall-info-am:
+ install-man5: $(man5_MANS) $(man_MANS)
+ @$(NORMAL_INSTALL)
+- test -z "$(man5dir)" || $(MKDIR_P) "$(DESTDIR)$(man5dir)"
++ test -z "$(man5dir)" || $(mkdir_p) "$(DESTDIR)$(man5dir)"
+ @list='$(man5_MANS) $(dist_man5_MANS) $(nodist_man5_MANS)'; \
+ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ for i in $$l2; do \
+@@ -407,7 +430,7 @@
+ done
+ install-man8: $(man8_MANS) $(man_MANS)
+ @$(NORMAL_INSTALL)
+- test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
++ test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
+ @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
+ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ for i in $$l2; do \
+@@ -452,7 +475,7 @@
+ done
+ install-secureconfDATA: $(secureconf_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(secureconfdir)" || $(MKDIR_P) "$(DESTDIR)$(secureconfdir)"
++ test -z "$(secureconfdir)" || $(mkdir_p) "$(DESTDIR)$(secureconfdir)"
+ @list='$(secureconf_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+@@ -517,9 +540,9 @@
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ check-TESTS: $(TESTS)
+- @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
++ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
+ srcdir=$(srcdir); export srcdir; \
+- list=' $(TESTS) '; \
++ list='$(TESTS)'; \
+ if test -n "$$list"; then \
+ for tst in $$list; do \
+ if test -f ./$$tst; then dir=./; \
+@@ -528,7 +551,7 @@
+ if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *$$ws$$tst$$ws*) \
++ *" $$tst "*) \
+ xpass=`expr $$xpass + 1`; \
+ failed=`expr $$failed + 1`; \
+ echo "XPASS: $$tst"; \
+@@ -540,7 +563,7 @@
+ elif test $$? -ne 77; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *$$ws$$tst$$ws*) \
++ *" $$tst "*) \
+ xfail=`expr $$xfail + 1`; \
+ echo "XFAIL: $$tst"; \
+ ;; \
+@@ -590,21 +613,22 @@
+ else :; fi
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- list='$(DISTFILES)'; \
+- dist_files=`for file in $$list; do echo $$file; done | \
+- sed -e "s|^$$srcdirstrip/||;t" \
+- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+- case $$dist_files in \
+- */*) $(MKDIR_P) `echo "$$dist_files" | \
+- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+- sort -u` ;; \
+- esac; \
+- for file in $$dist_files; do \
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
+ if test -d $$d/$$file; then \
+- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -621,7 +645,7 @@
+ all-am: Makefile $(LTLIBRARIES) $(MANS) $(DATA)
+ installdirs:
+ for dir in "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(secureconfdir)"; do \
+- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
++ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
+ install: install-am
+ install-exec: install-exec-am
+@@ -657,7 +681,7 @@
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-tags
++ distclean-libtool distclean-tags
+
+ dvi: dvi-am
+
+@@ -672,20 +696,12 @@
+ install-data-am: install-man install-secureconfDATA \
+ install-securelibLTLIBRARIES
+
+-install-dvi: install-dvi-am
+-
+ install-exec-am:
+
+-install-html: install-html-am
+-
+ install-info: install-info-am
+
+ install-man: install-man5 install-man8
+
+-install-pdf: install-pdf-am
+-
+-install-ps: install-ps-am
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -706,29 +722,25 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-man uninstall-secureconfDATA \
++uninstall-am: uninstall-info-am uninstall-man uninstall-secureconfDATA \
+ uninstall-securelibLTLIBRARIES
+
+ uninstall-man: uninstall-man5 uninstall-man8
+
+-.MAKE: install-am install-strip
+-
+ .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
+ clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
+ distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+- install-data-am install-dvi install-dvi-am install-exec \
+- install-exec-am install-html install-html-am install-info \
++ install-data-am install-exec install-exec-am install-info \
+ install-info-am install-man install-man5 install-man8 \
+- install-pdf install-pdf-am install-ps install-ps-am \
+ install-secureconfDATA install-securelibLTLIBRARIES \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+- pdf pdf-am ps ps-am tags uninstall uninstall-am uninstall-man \
+- uninstall-man5 uninstall-man8 uninstall-secureconfDATA \
+- uninstall-securelibLTLIBRARIES
++ pdf pdf-am ps ps-am tags uninstall uninstall-am \
++ uninstall-info-am uninstall-man uninstall-man5 uninstall-man8 \
++ uninstall-secureconfDATA uninstall-securelibLTLIBRARIES
+
+ @ENABLE_REGENERATE_MAN_TRUE@README: pam_time.8.xml time.conf.5.xml
+ @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
+Index: pam.debian/modules/pam_umask/Makefile.in
===================================================================
---- pam.deb.orig/modules/pam_umask/Makefile.in
-+++ pam.deb/modules/pam_umask/Makefile.in
+--- pam.debian.orig/modules/pam_umask/Makefile.in
++++ pam.debian/modules/pam_umask/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -67,7 +67,7 @@
- pam_umask_la_LIBADD =
+@@ -19,11 +19,15 @@
+ #
+
+
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -67,18 +71,17 @@
+ pam_umask_la_DEPENDENCIES =
pam_umask_la_SOURCES = pam_umask.c
pam_umask_la_OBJECTS = pam_umask.lo
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -108,6 +108,7 @@
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
++ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++ $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+- $(LDFLAGS) -o $@
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = pam_umask.c
+ DIST_SOURCES = pam_umask.c
+ man8dir = $(mandir)/man8
+@@ -89,6 +92,8 @@
+ CTAGS = ctags
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AUTOCONF = @AUTOCONF@
+@@ -108,11 +113,16 @@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -10708,7 +20513,40 @@ Index: pam.deb/modules/pam_umask/Makefile.in
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -160,6 +161,7 @@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
++ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
++ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
++ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -121,7 +131,18 @@
+ GMSGFMT_015 = @GMSGFMT_015@
+ GREP = @GREP@
+ HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
+-INSTALL = @INSTALL@
++HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
++HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
++HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
++HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
++HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
++HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
++HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
++HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
++HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
++HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
++HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
++HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -156,10 +177,10 @@
+ LTLIBINTL = @LTLIBINTL@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+-MKDIR_P = @MKDIR_P@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
@@ -10716,90 +20554,295 @@ Index: pam.deb/modules/pam_umask/Makefile.in
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -175,6 +177,7 @@
- RANLIB = @RANLIB@
- SCONFIGDIR = @SCONFIGDIR@
- SECUREDIR = @SECUREDIR@
-+SED = @SED@
+@@ -178,6 +199,8 @@
+ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
++STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
++STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
STRIP = @STRIP@
-@@ -295,8 +298,8 @@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+@@ -191,13 +214,13 @@
+ XSLTPROC = @XSLTPROC@
+ YACC = @YACC@
+ YFLAGS = @YFLAGS@
+-abs_builddir = @abs_builddir@
+-abs_srcdir = @abs_srcdir@
+-abs_top_builddir = @abs_top_builddir@
+-abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -209,7 +232,6 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+-builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -240,11 +262,8 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+-srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_builddir = @top_builddir@
+-top_srcdir = @top_srcdir@
+ CLEANFILES = *~
+ EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_umask
+ man_MANS = pam_umask.8
+@@ -292,7 +311,7 @@
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+- test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
++ test -z "$(securelibdir)" || $(mkdir_p) "$(DESTDIR)$(securelibdir)"
@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \
-- $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \
- else :; fi; \
- done
+@@ -303,7 +322,7 @@
-@@ -304,8 +307,8 @@
+ uninstall-securelibLTLIBRARIES:
@$(NORMAL_UNINSTALL)
- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
+- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
++ @set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
+@@ -318,7 +337,7 @@
+ rm -f "$${dir}/so_locations"; \
done
+ pam_umask.la: $(pam_umask_la_OBJECTS) $(pam_umask_la_DEPENDENCIES)
+- $(LINK) -rpath $(securelibdir) $(pam_umask_la_OBJECTS) $(pam_umask_la_LIBADD) $(LIBS)
++ $(LINK) -rpath $(securelibdir) $(pam_umask_la_LDFLAGS) $(pam_umask_la_OBJECTS) $(pam_umask_la_LIBADD) $(LIBS)
- clean-securelibLTLIBRARIES:
-@@ -404,8 +407,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+@@ -329,22 +348,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_umask.Plo@am__quote@
-@@ -417,8 +420,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -428,13 +431,12 @@
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-Index: pam.deb/modules/pam_unix/Makefile.in
+ .c.o:
+-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
++@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+@@ -354,9 +373,13 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
++
++distclean-libtool:
++ -rm -f libtool
++uninstall-info-am:
+ install-man8: $(man8_MANS) $(man_MANS)
+ @$(NORMAL_INSTALL)
+- test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
++ test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
+ @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
+ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ for i in $$l2; do \
+@@ -449,9 +472,9 @@
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ check-TESTS: $(TESTS)
+- @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
++ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
+ srcdir=$(srcdir); export srcdir; \
+- list=' $(TESTS) '; \
++ list='$(TESTS)'; \
+ if test -n "$$list"; then \
+ for tst in $$list; do \
+ if test -f ./$$tst; then dir=./; \
+@@ -460,7 +483,7 @@
+ if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *$$ws$$tst$$ws*) \
++ *" $$tst "*) \
+ xpass=`expr $$xpass + 1`; \
+ failed=`expr $$failed + 1`; \
+ echo "XPASS: $$tst"; \
+@@ -472,7 +495,7 @@
+ elif test $$? -ne 77; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *$$ws$$tst$$ws*) \
++ *" $$tst "*) \
+ xfail=`expr $$xfail + 1`; \
+ echo "XFAIL: $$tst"; \
+ ;; \
+@@ -522,21 +545,22 @@
+ else :; fi
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- list='$(DISTFILES)'; \
+- dist_files=`for file in $$list; do echo $$file; done | \
+- sed -e "s|^$$srcdirstrip/||;t" \
+- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+- case $$dist_files in \
+- */*) $(MKDIR_P) `echo "$$dist_files" | \
+- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+- sort -u` ;; \
+- esac; \
+- for file in $$dist_files; do \
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
+ if test -d $$d/$$file; then \
+- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -553,7 +577,7 @@
+ all-am: Makefile $(LTLIBRARIES) $(MANS) $(DATA)
+ installdirs:
+ for dir in "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man8dir)"; do \
+- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
++ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
+ install: install-am
+ install-exec: install-exec-am
+@@ -589,7 +613,7 @@
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-tags
++ distclean-libtool distclean-tags
+
+ dvi: dvi-am
+
+@@ -603,20 +627,12 @@
+
+ install-data-am: install-man install-securelibLTLIBRARIES
+
+-install-dvi: install-dvi-am
+-
+ install-exec-am:
+
+-install-html: install-html-am
+-
+ install-info: install-info-am
+
+ install-man: install-man8
+
+-install-pdf: install-pdf-am
+-
+-install-ps: install-ps-am
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -637,27 +653,24 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-man uninstall-securelibLTLIBRARIES
++uninstall-am: uninstall-info-am uninstall-man \
++ uninstall-securelibLTLIBRARIES
+
+ uninstall-man: uninstall-man8
+
+-.MAKE: install-am install-strip
+-
+ .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
+ clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
+ distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+- install-data-am install-dvi install-dvi-am install-exec \
+- install-exec-am install-html install-html-am install-info \
+- install-info-am install-man install-man8 install-pdf \
+- install-pdf-am install-ps install-ps-am \
++ install-data-am install-exec install-exec-am install-info \
++ install-info-am install-man install-man8 \
+ install-securelibLTLIBRARIES install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+- tags uninstall uninstall-am uninstall-man uninstall-man8 \
+- uninstall-securelibLTLIBRARIES
++ tags uninstall uninstall-am uninstall-info-am uninstall-man \
++ uninstall-man8 uninstall-securelibLTLIBRARIES
+
+ @ENABLE_REGENERATE_MAN_TRUE@README: pam_umask.8.xml
+ @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
+Index: pam.debian/modules/pam_unix/Makefile.in
===================================================================
---- pam.deb.orig/modules/pam_unix/Makefile.in
-+++ pam.deb/modules/pam_unix/Makefile.in
+--- pam.debian.orig/modules/pam_unix/Makefile.in
++++ pam.debian/modules/pam_unix/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -40,8 +40,7 @@
+@@ -21,11 +21,15 @@
+
+
+
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -40,8 +44,7 @@
build_triplet = @build@
host_triplet = @host@
@HAVE_LIBSELINUX_TRUE@am__append_1 = -D"WITH_SELINUX"
@@ -10809,29 +20852,69 @@ Index: pam.deb/modules/pam_unix/Makefile.in
sbin_PROGRAMS = unix_chkpwd$(EXEEXT)
noinst_PROGRAMS = bigcrypt$(EXEEXT)
subdir = modules/pam_unix
-@@ -72,10 +71,10 @@
+@@ -72,44 +75,34 @@
"$(DESTDIR)$(man8dir)"
securelibLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(securelib_LTLIBRARIES)
--pam_unix_la_LIBADD =
+-pam_unix_la_DEPENDENCIES =
+pam_unix_la_DEPENDENCIES = ../pam_securetty/tty_secure.lo
am_pam_unix_la_OBJECTS = bigcrypt.lo pam_unix_acct.lo pam_unix_auth.lo \
pam_unix_passwd.lo pam_unix_sess.lo support.lo yppasswd_xdr.lo \
- md5_good.lo md5_broken.lo
+ md5_good.lo md5_broken.lo obscure.lo
pam_unix_la_OBJECTS = $(am_pam_unix_la_OBJECTS)
- pam_unix_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-@@ -98,7 +97,7 @@
- unix_chkpwd_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(unix_chkpwd_CFLAGS) \
- $(CFLAGS) $(unix_chkpwd_LDFLAGS) $(LDFLAGS) -o $@
+-pam_unix_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+- $(pam_unix_la_LDFLAGS) $(LDFLAGS) -o $@
+ sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ PROGRAMS = $(noinst_PROGRAMS) $(sbin_PROGRAMS)
+ am_bigcrypt_OBJECTS = bigcrypt-bigcrypt.$(OBJEXT) \
+ bigcrypt-bigcrypt_main.$(OBJEXT)
+ bigcrypt_OBJECTS = $(am_bigcrypt_OBJECTS)
+ bigcrypt_DEPENDENCIES =
+-bigcrypt_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=link $(CCLD) $(bigcrypt_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+- $(LDFLAGS) -o $@
+ am_unix_chkpwd_OBJECTS = unix_chkpwd-unix_chkpwd.$(OBJEXT) \
+ unix_chkpwd-md5_good.$(OBJEXT) \
+ unix_chkpwd-md5_broken.$(OBJEXT) \
+ unix_chkpwd-bigcrypt.$(OBJEXT)
+ unix_chkpwd_OBJECTS = $(am_unix_chkpwd_OBJECTS)
+ unix_chkpwd_DEPENDENCIES =
+-unix_chkpwd_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(unix_chkpwd_CFLAGS) \
+- $(CFLAGS) $(unix_chkpwd_LDFLAGS) $(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -142,6 +141,7 @@
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
++ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++ $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+- $(LDFLAGS) -o $@
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(pam_unix_la_SOURCES) $(bigcrypt_SOURCES) \
+ $(unix_chkpwd_SOURCES)
+ DIST_SOURCES = $(pam_unix_la_SOURCES) $(bigcrypt_SOURCES) \
+@@ -123,6 +116,8 @@
+ CTAGS = ctags
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AUTOCONF = @AUTOCONF@
+@@ -142,11 +137,16 @@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -10839,7 +20922,40 @@ Index: pam.deb/modules/pam_unix/Makefile.in
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -194,6 +194,7 @@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
++ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
++ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
++ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -155,7 +155,18 @@
+ GMSGFMT_015 = @GMSGFMT_015@
+ GREP = @GREP@
+ HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
+-INSTALL = @INSTALL@
++HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
++HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
++HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
++HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
++HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
++HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
++HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
++HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
++HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
++HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
++HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
++HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -190,10 +201,10 @@
+ LTLIBINTL = @LTLIBINTL@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+-MKDIR_P = @MKDIR_P@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
@@ -10847,72 +20963,128 @@ Index: pam.deb/modules/pam_unix/Makefile.in
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -209,6 +210,7 @@
- RANLIB = @RANLIB@
- SCONFIGDIR = @SCONFIGDIR@
- SECUREDIR = @SECUREDIR@
-+SED = @SED@
+@@ -212,6 +223,8 @@
+ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
++STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
++STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
STRIP = @STRIP@
-@@ -289,16 +291,18 @@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+@@ -225,13 +238,13 @@
+ XSLTPROC = @XSLTPROC@
+ YACC = @YACC@
+ YFLAGS = @YFLAGS@
+-abs_builddir = @abs_builddir@
+-abs_srcdir = @abs_srcdir@
+-abs_top_builddir = @abs_top_builddir@
+-abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -243,7 +256,6 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+-builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -274,11 +286,8 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+-srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_builddir = @top_builddir@
+-top_srcdir = @top_srcdir@
+ CLEANFILES = *~
+ EXTRA_DIST = README md5.c md5_crypt.c lckpwdf.-c $(MANS) CHANGELOG \
+ tst-pam_unix $(XMLS)
+@@ -290,18 +299,18 @@
secureconfdir = $(SCONFIGDIR)
AM_CFLAGS = -I$(top_srcdir)/libpam/include \
-I$(top_srcdir)/libpamc/include \
- -DCHKPWD_HELPER=\"$(sbindir)/unix_chkpwd\" $(am__append_1) \
+- $(am__append_2)
+ -DCHKPWD_HELPER=\"$(sbindir)/unix_chkpwd\" $(am__append_1)
-+pam_unix_la_LDFLAGS = -no-undefined -avoid-version -module @LIBNSL@ \
-+ -L$(top_builddir)/libpam -lpam @LIBCRYPT@ @LIBSELINUX@ \
- $(am__append_2)
--pam_unix_la_LDFLAGS = -no-undefined -avoid-version -module @LIBCRACK@ \
-- @LIBNSL@ -L$(top_builddir)/libpam -lpam @LIBCRYPT@ \
-- @LIBSELINUX@ $(am__append_3)
+ pam_unix_la_LDFLAGS = -no-undefined -avoid-version -module \
+- $(am__append_3)
+-pam_unix_la_LIBADD = @LIBCRACK@ @LIBNSL@ -L$(top_builddir)/libpam -lpam \
+- @LIBCRYPT@ @LIBSELINUX@
++ $(am__append_2)
++pam_unix_la_LIBADD = @LIBNSL@ -L$(top_builddir)/libpam -lpam \
++ @LIBCRYPT@ @LIBSELINUX@ \
++ ../pam_securetty/tty_secure.lo
+
securelib_LTLIBRARIES = pam_unix.la
noinst_HEADERS = md5.h support.h yppasswd.h bigcrypt.h
pam_unix_la_SOURCES = bigcrypt.c pam_unix_acct.c \
pam_unix_auth.c pam_unix_passwd.c pam_unix_sess.c support.c \
- yppasswd_xdr.c md5_good.c md5_broken.c
+ yppasswd_xdr.c md5_good.c md5_broken.c obscure.c
-+
-+pam_unix_la_LIBADD = \
-+ ../pam_securetty/tty_secure.lo
bigcrypt_SOURCES = bigcrypt.c bigcrypt_main.c
bigcrypt_CFLAGS = $(AM_CFLAGS)
-@@ -348,8 +352,8 @@
+@@ -346,7 +355,7 @@
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+- test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
++ test -z "$(securelibdir)" || $(mkdir_p) "$(DESTDIR)$(securelibdir)"
@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \
-- $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \
- else :; fi; \
- done
+@@ -357,7 +366,7 @@
-@@ -357,8 +361,8 @@
+ uninstall-securelibLTLIBRARIES:
@$(NORMAL_UNINSTALL)
- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
+- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
++ @set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
+@@ -372,7 +381,7 @@
+ rm -f "$${dir}/so_locations"; \
done
+ pam_unix.la: $(pam_unix_la_OBJECTS) $(pam_unix_la_DEPENDENCIES)
+- $(pam_unix_la_LINK) -rpath $(securelibdir) $(pam_unix_la_OBJECTS) $(pam_unix_la_LIBADD) $(LIBS)
++ $(LINK) -rpath $(securelibdir) $(pam_unix_la_LDFLAGS) $(pam_unix_la_OBJECTS) $(pam_unix_la_LIBADD) $(LIBS)
- clean-securelibLTLIBRARIES:
-@@ -387,8 +391,8 @@
- || test -f $$p1 \
- ; then \
- f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(sbindir)/$$f'"; \
-- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(sbindir)/$$f" || exit 1; \
-+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(sbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(sbindir)/$$f'"; \
-+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(sbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(sbindir)/$$f" || exit 1; \
- else :; fi; \
+ clean-noinstPROGRAMS:
+ @list='$(noinst_PROGRAMS)'; for p in $$list; do \
+@@ -382,7 +391,7 @@
done
-
-@@ -424,6 +428,7 @@
+ install-sbinPROGRAMS: $(sbin_PROGRAMS)
+ @$(NORMAL_INSTALL)
+- test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)"
++ test -z "$(sbindir)" || $(mkdir_p) "$(DESTDIR)$(sbindir)"
+ @list='$(sbin_PROGRAMS)'; for p in $$list; do \
+ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ if test -f $$p \
+@@ -410,10 +419,10 @@
+ done
+ bigcrypt$(EXEEXT): $(bigcrypt_OBJECTS) $(bigcrypt_DEPENDENCIES)
+ @rm -f bigcrypt$(EXEEXT)
+- $(bigcrypt_LINK) $(bigcrypt_OBJECTS) $(bigcrypt_LDADD) $(LIBS)
++ $(LINK) $(bigcrypt_LDFLAGS) $(bigcrypt_OBJECTS) $(bigcrypt_LDADD) $(LIBS)
+ unix_chkpwd$(EXEEXT): $(unix_chkpwd_OBJECTS) $(unix_chkpwd_DEPENDENCIES)
+ @rm -f unix_chkpwd$(EXEEXT)
+- $(unix_chkpwd_LINK) $(unix_chkpwd_OBJECTS) $(unix_chkpwd_LDADD) $(LIBS)
++ $(LINK) $(unix_chkpwd_LDFLAGS) $(unix_chkpwd_OBJECTS) $(unix_chkpwd_LDADD) $(LIBS)
+
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+@@ -426,6 +435,7 @@
@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@
@@ -10920,69 +21092,367 @@ Index: pam.deb/modules/pam_unix/Makefile.in
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_unix_acct.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_unix_auth.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_unix_passwd.Plo@am__quote@
-@@ -596,8 +601,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
+@@ -438,106 +448,106 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/yppasswd_xdr.Plo@am__quote@
-@@ -609,8 +614,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -620,13 +625,12 @@
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-Index: pam.deb/modules/pam_userdb/Makefile.in
+ .c.o:
+-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
++@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+
+ bigcrypt-bigcrypt.o: bigcrypt.c
+-@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bigcrypt_CFLAGS) $(CFLAGS) -MT bigcrypt-bigcrypt.o -MD -MP -MF $(DEPDIR)/bigcrypt-bigcrypt.Tpo -c -o bigcrypt-bigcrypt.o `test -f 'bigcrypt.c' || echo '$(srcdir)/'`bigcrypt.c
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/bigcrypt-bigcrypt.Tpo $(DEPDIR)/bigcrypt-bigcrypt.Po
++@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bigcrypt_CFLAGS) $(CFLAGS) -MT bigcrypt-bigcrypt.o -MD -MP -MF "$(DEPDIR)/bigcrypt-bigcrypt.Tpo" -c -o bigcrypt-bigcrypt.o `test -f 'bigcrypt.c' || echo '$(srcdir)/'`bigcrypt.c; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/bigcrypt-bigcrypt.Tpo" "$(DEPDIR)/bigcrypt-bigcrypt.Po"; else rm -f "$(DEPDIR)/bigcrypt-bigcrypt.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='bigcrypt.c' object='bigcrypt-bigcrypt.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bigcrypt_CFLAGS) $(CFLAGS) -c -o bigcrypt-bigcrypt.o `test -f 'bigcrypt.c' || echo '$(srcdir)/'`bigcrypt.c
+
+ bigcrypt-bigcrypt.obj: bigcrypt.c
+-@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bigcrypt_CFLAGS) $(CFLAGS) -MT bigcrypt-bigcrypt.obj -MD -MP -MF $(DEPDIR)/bigcrypt-bigcrypt.Tpo -c -o bigcrypt-bigcrypt.obj `if test -f 'bigcrypt.c'; then $(CYGPATH_W) 'bigcrypt.c'; else $(CYGPATH_W) '$(srcdir)/bigcrypt.c'; fi`
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/bigcrypt-bigcrypt.Tpo $(DEPDIR)/bigcrypt-bigcrypt.Po
++@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bigcrypt_CFLAGS) $(CFLAGS) -MT bigcrypt-bigcrypt.obj -MD -MP -MF "$(DEPDIR)/bigcrypt-bigcrypt.Tpo" -c -o bigcrypt-bigcrypt.obj `if test -f 'bigcrypt.c'; then $(CYGPATH_W) 'bigcrypt.c'; else $(CYGPATH_W) '$(srcdir)/bigcrypt.c'; fi`; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/bigcrypt-bigcrypt.Tpo" "$(DEPDIR)/bigcrypt-bigcrypt.Po"; else rm -f "$(DEPDIR)/bigcrypt-bigcrypt.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='bigcrypt.c' object='bigcrypt-bigcrypt.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bigcrypt_CFLAGS) $(CFLAGS) -c -o bigcrypt-bigcrypt.obj `if test -f 'bigcrypt.c'; then $(CYGPATH_W) 'bigcrypt.c'; else $(CYGPATH_W) '$(srcdir)/bigcrypt.c'; fi`
+
+ bigcrypt-bigcrypt_main.o: bigcrypt_main.c
+-@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bigcrypt_CFLAGS) $(CFLAGS) -MT bigcrypt-bigcrypt_main.o -MD -MP -MF $(DEPDIR)/bigcrypt-bigcrypt_main.Tpo -c -o bigcrypt-bigcrypt_main.o `test -f 'bigcrypt_main.c' || echo '$(srcdir)/'`bigcrypt_main.c
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/bigcrypt-bigcrypt_main.Tpo $(DEPDIR)/bigcrypt-bigcrypt_main.Po
++@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bigcrypt_CFLAGS) $(CFLAGS) -MT bigcrypt-bigcrypt_main.o -MD -MP -MF "$(DEPDIR)/bigcrypt-bigcrypt_main.Tpo" -c -o bigcrypt-bigcrypt_main.o `test -f 'bigcrypt_main.c' || echo '$(srcdir)/'`bigcrypt_main.c; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/bigcrypt-bigcrypt_main.Tpo" "$(DEPDIR)/bigcrypt-bigcrypt_main.Po"; else rm -f "$(DEPDIR)/bigcrypt-bigcrypt_main.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='bigcrypt_main.c' object='bigcrypt-bigcrypt_main.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bigcrypt_CFLAGS) $(CFLAGS) -c -o bigcrypt-bigcrypt_main.o `test -f 'bigcrypt_main.c' || echo '$(srcdir)/'`bigcrypt_main.c
+
+ bigcrypt-bigcrypt_main.obj: bigcrypt_main.c
+-@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bigcrypt_CFLAGS) $(CFLAGS) -MT bigcrypt-bigcrypt_main.obj -MD -MP -MF $(DEPDIR)/bigcrypt-bigcrypt_main.Tpo -c -o bigcrypt-bigcrypt_main.obj `if test -f 'bigcrypt_main.c'; then $(CYGPATH_W) 'bigcrypt_main.c'; else $(CYGPATH_W) '$(srcdir)/bigcrypt_main.c'; fi`
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/bigcrypt-bigcrypt_main.Tpo $(DEPDIR)/bigcrypt-bigcrypt_main.Po
++@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bigcrypt_CFLAGS) $(CFLAGS) -MT bigcrypt-bigcrypt_main.obj -MD -MP -MF "$(DEPDIR)/bigcrypt-bigcrypt_main.Tpo" -c -o bigcrypt-bigcrypt_main.obj `if test -f 'bigcrypt_main.c'; then $(CYGPATH_W) 'bigcrypt_main.c'; else $(CYGPATH_W) '$(srcdir)/bigcrypt_main.c'; fi`; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/bigcrypt-bigcrypt_main.Tpo" "$(DEPDIR)/bigcrypt-bigcrypt_main.Po"; else rm -f "$(DEPDIR)/bigcrypt-bigcrypt_main.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='bigcrypt_main.c' object='bigcrypt-bigcrypt_main.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bigcrypt_CFLAGS) $(CFLAGS) -c -o bigcrypt-bigcrypt_main.obj `if test -f 'bigcrypt_main.c'; then $(CYGPATH_W) 'bigcrypt_main.c'; else $(CYGPATH_W) '$(srcdir)/bigcrypt_main.c'; fi`
+
+ unix_chkpwd-unix_chkpwd.o: unix_chkpwd.c
+-@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unix_chkpwd_CFLAGS) $(CFLAGS) -MT unix_chkpwd-unix_chkpwd.o -MD -MP -MF $(DEPDIR)/unix_chkpwd-unix_chkpwd.Tpo -c -o unix_chkpwd-unix_chkpwd.o `test -f 'unix_chkpwd.c' || echo '$(srcdir)/'`unix_chkpwd.c
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/unix_chkpwd-unix_chkpwd.Tpo $(DEPDIR)/unix_chkpwd-unix_chkpwd.Po
++@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unix_chkpwd_CFLAGS) $(CFLAGS) -MT unix_chkpwd-unix_chkpwd.o -MD -MP -MF "$(DEPDIR)/unix_chkpwd-unix_chkpwd.Tpo" -c -o unix_chkpwd-unix_chkpwd.o `test -f 'unix_chkpwd.c' || echo '$(srcdir)/'`unix_chkpwd.c; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/unix_chkpwd-unix_chkpwd.Tpo" "$(DEPDIR)/unix_chkpwd-unix_chkpwd.Po"; else rm -f "$(DEPDIR)/unix_chkpwd-unix_chkpwd.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='unix_chkpwd.c' object='unix_chkpwd-unix_chkpwd.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unix_chkpwd_CFLAGS) $(CFLAGS) -c -o unix_chkpwd-unix_chkpwd.o `test -f 'unix_chkpwd.c' || echo '$(srcdir)/'`unix_chkpwd.c
+
+ unix_chkpwd-unix_chkpwd.obj: unix_chkpwd.c
+-@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unix_chkpwd_CFLAGS) $(CFLAGS) -MT unix_chkpwd-unix_chkpwd.obj -MD -MP -MF $(DEPDIR)/unix_chkpwd-unix_chkpwd.Tpo -c -o unix_chkpwd-unix_chkpwd.obj `if test -f 'unix_chkpwd.c'; then $(CYGPATH_W) 'unix_chkpwd.c'; else $(CYGPATH_W) '$(srcdir)/unix_chkpwd.c'; fi`
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/unix_chkpwd-unix_chkpwd.Tpo $(DEPDIR)/unix_chkpwd-unix_chkpwd.Po
++@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unix_chkpwd_CFLAGS) $(CFLAGS) -MT unix_chkpwd-unix_chkpwd.obj -MD -MP -MF "$(DEPDIR)/unix_chkpwd-unix_chkpwd.Tpo" -c -o unix_chkpwd-unix_chkpwd.obj `if test -f 'unix_chkpwd.c'; then $(CYGPATH_W) 'unix_chkpwd.c'; else $(CYGPATH_W) '$(srcdir)/unix_chkpwd.c'; fi`; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/unix_chkpwd-unix_chkpwd.Tpo" "$(DEPDIR)/unix_chkpwd-unix_chkpwd.Po"; else rm -f "$(DEPDIR)/unix_chkpwd-unix_chkpwd.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='unix_chkpwd.c' object='unix_chkpwd-unix_chkpwd.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unix_chkpwd_CFLAGS) $(CFLAGS) -c -o unix_chkpwd-unix_chkpwd.obj `if test -f 'unix_chkpwd.c'; then $(CYGPATH_W) 'unix_chkpwd.c'; else $(CYGPATH_W) '$(srcdir)/unix_chkpwd.c'; fi`
+
+ unix_chkpwd-md5_good.o: md5_good.c
+-@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unix_chkpwd_CFLAGS) $(CFLAGS) -MT unix_chkpwd-md5_good.o -MD -MP -MF $(DEPDIR)/unix_chkpwd-md5_good.Tpo -c -o unix_chkpwd-md5_good.o `test -f 'md5_good.c' || echo '$(srcdir)/'`md5_good.c
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/unix_chkpwd-md5_good.Tpo $(DEPDIR)/unix_chkpwd-md5_good.Po
++@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unix_chkpwd_CFLAGS) $(CFLAGS) -MT unix_chkpwd-md5_good.o -MD -MP -MF "$(DEPDIR)/unix_chkpwd-md5_good.Tpo" -c -o unix_chkpwd-md5_good.o `test -f 'md5_good.c' || echo '$(srcdir)/'`md5_good.c; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/unix_chkpwd-md5_good.Tpo" "$(DEPDIR)/unix_chkpwd-md5_good.Po"; else rm -f "$(DEPDIR)/unix_chkpwd-md5_good.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='md5_good.c' object='unix_chkpwd-md5_good.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unix_chkpwd_CFLAGS) $(CFLAGS) -c -o unix_chkpwd-md5_good.o `test -f 'md5_good.c' || echo '$(srcdir)/'`md5_good.c
+
+ unix_chkpwd-md5_good.obj: md5_good.c
+-@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unix_chkpwd_CFLAGS) $(CFLAGS) -MT unix_chkpwd-md5_good.obj -MD -MP -MF $(DEPDIR)/unix_chkpwd-md5_good.Tpo -c -o unix_chkpwd-md5_good.obj `if test -f 'md5_good.c'; then $(CYGPATH_W) 'md5_good.c'; else $(CYGPATH_W) '$(srcdir)/md5_good.c'; fi`
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/unix_chkpwd-md5_good.Tpo $(DEPDIR)/unix_chkpwd-md5_good.Po
++@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unix_chkpwd_CFLAGS) $(CFLAGS) -MT unix_chkpwd-md5_good.obj -MD -MP -MF "$(DEPDIR)/unix_chkpwd-md5_good.Tpo" -c -o unix_chkpwd-md5_good.obj `if test -f 'md5_good.c'; then $(CYGPATH_W) 'md5_good.c'; else $(CYGPATH_W) '$(srcdir)/md5_good.c'; fi`; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/unix_chkpwd-md5_good.Tpo" "$(DEPDIR)/unix_chkpwd-md5_good.Po"; else rm -f "$(DEPDIR)/unix_chkpwd-md5_good.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='md5_good.c' object='unix_chkpwd-md5_good.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unix_chkpwd_CFLAGS) $(CFLAGS) -c -o unix_chkpwd-md5_good.obj `if test -f 'md5_good.c'; then $(CYGPATH_W) 'md5_good.c'; else $(CYGPATH_W) '$(srcdir)/md5_good.c'; fi`
+
+ unix_chkpwd-md5_broken.o: md5_broken.c
+-@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unix_chkpwd_CFLAGS) $(CFLAGS) -MT unix_chkpwd-md5_broken.o -MD -MP -MF $(DEPDIR)/unix_chkpwd-md5_broken.Tpo -c -o unix_chkpwd-md5_broken.o `test -f 'md5_broken.c' || echo '$(srcdir)/'`md5_broken.c
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/unix_chkpwd-md5_broken.Tpo $(DEPDIR)/unix_chkpwd-md5_broken.Po
++@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unix_chkpwd_CFLAGS) $(CFLAGS) -MT unix_chkpwd-md5_broken.o -MD -MP -MF "$(DEPDIR)/unix_chkpwd-md5_broken.Tpo" -c -o unix_chkpwd-md5_broken.o `test -f 'md5_broken.c' || echo '$(srcdir)/'`md5_broken.c; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/unix_chkpwd-md5_broken.Tpo" "$(DEPDIR)/unix_chkpwd-md5_broken.Po"; else rm -f "$(DEPDIR)/unix_chkpwd-md5_broken.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='md5_broken.c' object='unix_chkpwd-md5_broken.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unix_chkpwd_CFLAGS) $(CFLAGS) -c -o unix_chkpwd-md5_broken.o `test -f 'md5_broken.c' || echo '$(srcdir)/'`md5_broken.c
+
+ unix_chkpwd-md5_broken.obj: md5_broken.c
+-@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unix_chkpwd_CFLAGS) $(CFLAGS) -MT unix_chkpwd-md5_broken.obj -MD -MP -MF $(DEPDIR)/unix_chkpwd-md5_broken.Tpo -c -o unix_chkpwd-md5_broken.obj `if test -f 'md5_broken.c'; then $(CYGPATH_W) 'md5_broken.c'; else $(CYGPATH_W) '$(srcdir)/md5_broken.c'; fi`
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/unix_chkpwd-md5_broken.Tpo $(DEPDIR)/unix_chkpwd-md5_broken.Po
++@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unix_chkpwd_CFLAGS) $(CFLAGS) -MT unix_chkpwd-md5_broken.obj -MD -MP -MF "$(DEPDIR)/unix_chkpwd-md5_broken.Tpo" -c -o unix_chkpwd-md5_broken.obj `if test -f 'md5_broken.c'; then $(CYGPATH_W) 'md5_broken.c'; else $(CYGPATH_W) '$(srcdir)/md5_broken.c'; fi`; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/unix_chkpwd-md5_broken.Tpo" "$(DEPDIR)/unix_chkpwd-md5_broken.Po"; else rm -f "$(DEPDIR)/unix_chkpwd-md5_broken.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='md5_broken.c' object='unix_chkpwd-md5_broken.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unix_chkpwd_CFLAGS) $(CFLAGS) -c -o unix_chkpwd-md5_broken.obj `if test -f 'md5_broken.c'; then $(CYGPATH_W) 'md5_broken.c'; else $(CYGPATH_W) '$(srcdir)/md5_broken.c'; fi`
+
+ unix_chkpwd-bigcrypt.o: bigcrypt.c
+-@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unix_chkpwd_CFLAGS) $(CFLAGS) -MT unix_chkpwd-bigcrypt.o -MD -MP -MF $(DEPDIR)/unix_chkpwd-bigcrypt.Tpo -c -o unix_chkpwd-bigcrypt.o `test -f 'bigcrypt.c' || echo '$(srcdir)/'`bigcrypt.c
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/unix_chkpwd-bigcrypt.Tpo $(DEPDIR)/unix_chkpwd-bigcrypt.Po
++@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unix_chkpwd_CFLAGS) $(CFLAGS) -MT unix_chkpwd-bigcrypt.o -MD -MP -MF "$(DEPDIR)/unix_chkpwd-bigcrypt.Tpo" -c -o unix_chkpwd-bigcrypt.o `test -f 'bigcrypt.c' || echo '$(srcdir)/'`bigcrypt.c; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/unix_chkpwd-bigcrypt.Tpo" "$(DEPDIR)/unix_chkpwd-bigcrypt.Po"; else rm -f "$(DEPDIR)/unix_chkpwd-bigcrypt.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='bigcrypt.c' object='unix_chkpwd-bigcrypt.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unix_chkpwd_CFLAGS) $(CFLAGS) -c -o unix_chkpwd-bigcrypt.o `test -f 'bigcrypt.c' || echo '$(srcdir)/'`bigcrypt.c
+
+ unix_chkpwd-bigcrypt.obj: bigcrypt.c
+-@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unix_chkpwd_CFLAGS) $(CFLAGS) -MT unix_chkpwd-bigcrypt.obj -MD -MP -MF $(DEPDIR)/unix_chkpwd-bigcrypt.Tpo -c -o unix_chkpwd-bigcrypt.obj `if test -f 'bigcrypt.c'; then $(CYGPATH_W) 'bigcrypt.c'; else $(CYGPATH_W) '$(srcdir)/bigcrypt.c'; fi`
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/unix_chkpwd-bigcrypt.Tpo $(DEPDIR)/unix_chkpwd-bigcrypt.Po
++@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unix_chkpwd_CFLAGS) $(CFLAGS) -MT unix_chkpwd-bigcrypt.obj -MD -MP -MF "$(DEPDIR)/unix_chkpwd-bigcrypt.Tpo" -c -o unix_chkpwd-bigcrypt.obj `if test -f 'bigcrypt.c'; then $(CYGPATH_W) 'bigcrypt.c'; else $(CYGPATH_W) '$(srcdir)/bigcrypt.c'; fi`; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/unix_chkpwd-bigcrypt.Tpo" "$(DEPDIR)/unix_chkpwd-bigcrypt.Po"; else rm -f "$(DEPDIR)/unix_chkpwd-bigcrypt.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='bigcrypt.c' object='unix_chkpwd-bigcrypt.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unix_chkpwd_CFLAGS) $(CFLAGS) -c -o unix_chkpwd-bigcrypt.obj `if test -f 'bigcrypt.c'; then $(CYGPATH_W) 'bigcrypt.c'; else $(CYGPATH_W) '$(srcdir)/bigcrypt.c'; fi`
+@@ -547,9 +557,13 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
++
++distclean-libtool:
++ -rm -f libtool
++uninstall-info-am:
+ install-man8: $(man8_MANS) $(man_MANS)
+ @$(NORMAL_INSTALL)
+- test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
++ test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
+ @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
+ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ for i in $$l2; do \
+@@ -642,9 +656,9 @@
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ check-TESTS: $(TESTS)
+- @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
++ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
+ srcdir=$(srcdir); export srcdir; \
+- list=' $(TESTS) '; \
++ list='$(TESTS)'; \
+ if test -n "$$list"; then \
+ for tst in $$list; do \
+ if test -f ./$$tst; then dir=./; \
+@@ -653,7 +667,7 @@
+ if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *$$ws$$tst$$ws*) \
++ *" $$tst "*) \
+ xpass=`expr $$xpass + 1`; \
+ failed=`expr $$failed + 1`; \
+ echo "XPASS: $$tst"; \
+@@ -665,7 +679,7 @@
+ elif test $$? -ne 77; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *$$ws$$tst$$ws*) \
++ *" $$tst "*) \
+ xfail=`expr $$xfail + 1`; \
+ echo "XFAIL: $$tst"; \
+ ;; \
+@@ -715,21 +729,22 @@
+ else :; fi
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- list='$(DISTFILES)'; \
+- dist_files=`for file in $$list; do echo $$file; done | \
+- sed -e "s|^$$srcdirstrip/||;t" \
+- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+- case $$dist_files in \
+- */*) $(MKDIR_P) `echo "$$dist_files" | \
+- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+- sort -u` ;; \
+- esac; \
+- for file in $$dist_files; do \
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
+ if test -d $$d/$$file; then \
+- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -746,7 +761,7 @@
+ all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(MANS) $(DATA) $(HEADERS)
+ installdirs:
+ for dir in "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man8dir)"; do \
+- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
++ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
+ install: install-am
+ install-exec: install-exec-am
+@@ -782,7 +797,7 @@
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-tags
++ distclean-libtool distclean-tags
+
+ dvi: dvi-am
+
+@@ -796,20 +811,12 @@
+
+ install-data-am: install-man install-securelibLTLIBRARIES
+
+-install-dvi: install-dvi-am
+-
+ install-exec-am: install-sbinPROGRAMS
+
+-install-html: install-html-am
+-
+ install-info: install-info-am
+
+ install-man: install-man8
+
+-install-pdf: install-pdf-am
+-
+-install-ps: install-ps-am
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -830,28 +837,24 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-man uninstall-sbinPROGRAMS \
++uninstall-am: uninstall-info-am uninstall-man uninstall-sbinPROGRAMS \
+ uninstall-securelibLTLIBRARIES
+
+ uninstall-man: uninstall-man8
+
+-.MAKE: install-am install-strip
+-
+ .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
+ clean-generic clean-libtool clean-noinstPROGRAMS \
+ clean-sbinPROGRAMS clean-securelibLTLIBRARIES ctags distclean \
+ distclean-compile distclean-generic distclean-libtool \
+ distclean-tags distdir dvi dvi-am html html-am info info-am \
+- install install-am install-data install-data-am install-dvi \
+- install-dvi-am install-exec install-exec-am install-html \
+- install-html-am install-info install-info-am install-man \
+- install-man8 install-pdf install-pdf-am install-ps \
+- install-ps-am install-sbinPROGRAMS \
+- install-securelibLTLIBRARIES install-strip installcheck \
+- installcheck-am installdirs maintainer-clean \
+- maintainer-clean-generic mostlyclean mostlyclean-compile \
+- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+- tags uninstall uninstall-am uninstall-man uninstall-man8 \
++ install install-am install-data install-data-am install-exec \
++ install-exec-am install-info install-info-am install-man \
++ install-man8 install-sbinPROGRAMS install-securelibLTLIBRARIES \
++ install-strip installcheck installcheck-am installdirs \
++ maintainer-clean maintainer-clean-generic mostlyclean \
++ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
++ pdf pdf-am ps ps-am tags uninstall uninstall-am \
++ uninstall-info-am uninstall-man uninstall-man8 \
+ uninstall-sbinPROGRAMS uninstall-securelibLTLIBRARIES
+
+ @ENABLE_REGENERATE_MAN_TRUE@README: pam_unix.8.xml
+Index: pam.debian/modules/pam_userdb/Makefile.in
===================================================================
---- pam.deb.orig/modules/pam_userdb/Makefile.in
-+++ pam.deb/modules/pam_userdb/Makefile.in
+--- pam.debian.orig/modules/pam_userdb/Makefile.in
++++ pam.debian/modules/pam_userdb/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -70,7 +70,7 @@
+@@ -20,11 +20,15 @@
+
+
+
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -70,18 +74,17 @@
pam_userdb_la_SOURCES = pam_userdb.c
pam_userdb_la_OBJECTS = pam_userdb.lo
@HAVE_LIBDB_TRUE@am_pam_userdb_la_rpath = -rpath $(securelibdir)
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -112,6 +112,7 @@
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
++ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++ $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+- $(LDFLAGS) -o $@
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = pam_userdb.c
+ DIST_SOURCES = pam_userdb.c
+ man8dir = $(mandir)/man8
+@@ -93,6 +96,8 @@
+ CTAGS = ctags
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AUTOCONF = @AUTOCONF@
+@@ -112,11 +117,16 @@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -10990,7 +21460,40 @@ Index: pam.deb/modules/pam_userdb/Makefile.in
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -164,6 +165,7 @@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
++ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
++ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
++ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -125,7 +135,18 @@
+ GMSGFMT_015 = @GMSGFMT_015@
+ GREP = @GREP@
+ HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
+-INSTALL = @INSTALL@
++HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
++HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
++HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
++HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
++HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
++HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
++HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
++HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
++HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
++HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
++HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
++HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -160,10 +181,10 @@
+ LTLIBINTL = @LTLIBINTL@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+-MKDIR_P = @MKDIR_P@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
@@ -10998,99 +21501,329 @@ Index: pam.deb/modules/pam_userdb/Makefile.in
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -179,6 +181,7 @@
- RANLIB = @RANLIB@
- SCONFIGDIR = @SCONFIGDIR@
- SECUREDIR = @SECUREDIR@
-+SED = @SED@
+@@ -182,6 +203,8 @@
+ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
++STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
++STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
STRIP = @STRIP@
-@@ -301,8 +304,8 @@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+@@ -195,13 +218,13 @@
+ XSLTPROC = @XSLTPROC@
+ YACC = @YACC@
+ YFLAGS = @YFLAGS@
+-abs_builddir = @abs_builddir@
+-abs_srcdir = @abs_srcdir@
+-abs_top_builddir = @abs_top_builddir@
+-abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -213,7 +236,6 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+-builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -244,11 +266,8 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+-srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_builddir = @top_builddir@
+-top_srcdir = @top_srcdir@
+ CLEANFILES = *~
+ EXTRA_DIST = README $(MANS) $(XMLS) create.pl tst-pam_userdb
+ man_MANS = pam_userdb.8
+@@ -298,7 +317,7 @@
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+- test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
++ test -z "$(securelibdir)" || $(mkdir_p) "$(DESTDIR)$(securelibdir)"
@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \
-- $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \
- else :; fi; \
- done
+@@ -309,7 +328,7 @@
-@@ -310,8 +313,8 @@
+ uninstall-securelibLTLIBRARIES:
@$(NORMAL_UNINSTALL)
- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
+- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
++ @set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
+@@ -324,7 +343,7 @@
+ rm -f "$${dir}/so_locations"; \
done
+ pam_userdb.la: $(pam_userdb_la_OBJECTS) $(pam_userdb_la_DEPENDENCIES)
+- $(LINK) $(am_pam_userdb_la_rpath) $(pam_userdb_la_OBJECTS) $(pam_userdb_la_LIBADD) $(LIBS)
++ $(LINK) $(am_pam_userdb_la_rpath) $(pam_userdb_la_LDFLAGS) $(pam_userdb_la_OBJECTS) $(pam_userdb_la_LIBADD) $(LIBS)
- clean-securelibLTLIBRARIES:
-@@ -410,8 +413,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+@@ -335,22 +354,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_userdb.Plo@am__quote@
-@@ -423,8 +426,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -434,13 +437,12 @@
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-Index: pam.deb/modules/pam_warn/Makefile.in
+ .c.o:
+-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
++@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+@@ -360,9 +379,13 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
++
++distclean-libtool:
++ -rm -f libtool
++uninstall-info-am:
+ install-man8: $(man8_MANS) $(man_MANS)
+ @$(NORMAL_INSTALL)
+- test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
++ test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
+ @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
+ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ for i in $$l2; do \
+@@ -455,9 +478,9 @@
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ check-TESTS: $(TESTS)
+- @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
++ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
+ srcdir=$(srcdir); export srcdir; \
+- list=' $(TESTS) '; \
++ list='$(TESTS)'; \
+ if test -n "$$list"; then \
+ for tst in $$list; do \
+ if test -f ./$$tst; then dir=./; \
+@@ -466,7 +489,7 @@
+ if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *$$ws$$tst$$ws*) \
++ *" $$tst "*) \
+ xpass=`expr $$xpass + 1`; \
+ failed=`expr $$failed + 1`; \
+ echo "XPASS: $$tst"; \
+@@ -478,7 +501,7 @@
+ elif test $$? -ne 77; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *$$ws$$tst$$ws*) \
++ *" $$tst "*) \
+ xfail=`expr $$xfail + 1`; \
+ echo "XFAIL: $$tst"; \
+ ;; \
+@@ -528,21 +551,22 @@
+ else :; fi
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- list='$(DISTFILES)'; \
+- dist_files=`for file in $$list; do echo $$file; done | \
+- sed -e "s|^$$srcdirstrip/||;t" \
+- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+- case $$dist_files in \
+- */*) $(MKDIR_P) `echo "$$dist_files" | \
+- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+- sort -u` ;; \
+- esac; \
+- for file in $$dist_files; do \
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
+ if test -d $$d/$$file; then \
+- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -559,7 +583,7 @@
+ all-am: Makefile $(LTLIBRARIES) $(MANS) $(DATA) $(HEADERS)
+ installdirs:
+ for dir in "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man8dir)"; do \
+- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
++ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
+ install: install-am
+ install-exec: install-exec-am
+@@ -595,7 +619,7 @@
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-tags
++ distclean-libtool distclean-tags
+
+ dvi: dvi-am
+
+@@ -609,20 +633,12 @@
+
+ install-data-am: install-man install-securelibLTLIBRARIES
+
+-install-dvi: install-dvi-am
+-
+ install-exec-am:
+
+-install-html: install-html-am
+-
+ install-info: install-info-am
+
+ install-man: install-man8
+
+-install-pdf: install-pdf-am
+-
+-install-ps: install-ps-am
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -643,27 +659,24 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-man uninstall-securelibLTLIBRARIES
++uninstall-am: uninstall-info-am uninstall-man \
++ uninstall-securelibLTLIBRARIES
+
+ uninstall-man: uninstall-man8
+
+-.MAKE: install-am install-strip
+-
+ .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
+ clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
+ distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+- install-data-am install-dvi install-dvi-am install-exec \
+- install-exec-am install-html install-html-am install-info \
+- install-info-am install-man install-man8 install-pdf \
+- install-pdf-am install-ps install-ps-am \
++ install-data-am install-exec install-exec-am install-info \
++ install-info-am install-man install-man8 \
+ install-securelibLTLIBRARIES install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+- tags uninstall uninstall-am uninstall-man uninstall-man8 \
+- uninstall-securelibLTLIBRARIES
++ tags uninstall uninstall-am uninstall-info-am uninstall-man \
++ uninstall-man8 uninstall-securelibLTLIBRARIES
+
+ @ENABLE_REGENERATE_MAN_TRUE@README: pam_userdb.8.xml
+ @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
+Index: pam.debian/modules/pam_warn/Makefile.in
===================================================================
---- pam.deb.orig/modules/pam_warn/Makefile.in
-+++ pam.deb/modules/pam_warn/Makefile.in
+--- pam.debian.orig/modules/pam_warn/Makefile.in
++++ pam.debian/modules/pam_warn/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -67,7 +67,7 @@
+@@ -19,11 +19,15 @@
+ #
+
+
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -67,18 +71,17 @@
pam_warn_la_LIBADD =
pam_warn_la_SOURCES = pam_warn.c
pam_warn_la_OBJECTS = pam_warn.lo
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -108,6 +108,7 @@
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
++ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++ $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+- $(LDFLAGS) -o $@
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = pam_warn.c
+ DIST_SOURCES = pam_warn.c
+ man8dir = $(mandir)/man8
+@@ -89,6 +92,8 @@
+ CTAGS = ctags
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AUTOCONF = @AUTOCONF@
+@@ -108,11 +113,16 @@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -11098,7 +21831,40 @@ Index: pam.deb/modules/pam_warn/Makefile.in
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -160,6 +161,7 @@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
++ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
++ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
++ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -121,7 +131,18 @@
+ GMSGFMT_015 = @GMSGFMT_015@
+ GREP = @GREP@
+ HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
+-INSTALL = @INSTALL@
++HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
++HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
++HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
++HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
++HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
++HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
++HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
++HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
++HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
++HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
++HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
++HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -156,10 +177,10 @@
+ LTLIBINTL = @LTLIBINTL@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+-MKDIR_P = @MKDIR_P@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
@@ -11106,99 +21872,329 @@ Index: pam.deb/modules/pam_warn/Makefile.in
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -175,6 +177,7 @@
- RANLIB = @RANLIB@
- SCONFIGDIR = @SCONFIGDIR@
- SECUREDIR = @SECUREDIR@
-+SED = @SED@
+@@ -178,6 +199,8 @@
+ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
++STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
++STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
STRIP = @STRIP@
-@@ -295,8 +298,8 @@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+@@ -191,13 +214,13 @@
+ XSLTPROC = @XSLTPROC@
+ YACC = @YACC@
+ YFLAGS = @YFLAGS@
+-abs_builddir = @abs_builddir@
+-abs_srcdir = @abs_srcdir@
+-abs_top_builddir = @abs_top_builddir@
+-abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -209,7 +232,6 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+-builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -240,11 +262,8 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+-srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_builddir = @top_builddir@
+-top_srcdir = @top_srcdir@
+ CLEANFILES = *~
+ EXTRA_DIST = README $(MANS) $(XMLS) tst-pam_warn
+ man_MANS = pam_warn.8
+@@ -292,7 +311,7 @@
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+- test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
++ test -z "$(securelibdir)" || $(mkdir_p) "$(DESTDIR)$(securelibdir)"
@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \
-- $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \
- else :; fi; \
- done
+@@ -303,7 +322,7 @@
-@@ -304,8 +307,8 @@
+ uninstall-securelibLTLIBRARIES:
@$(NORMAL_UNINSTALL)
- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
+- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
++ @set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
+@@ -318,7 +337,7 @@
+ rm -f "$${dir}/so_locations"; \
done
+ pam_warn.la: $(pam_warn_la_OBJECTS) $(pam_warn_la_DEPENDENCIES)
+- $(LINK) -rpath $(securelibdir) $(pam_warn_la_OBJECTS) $(pam_warn_la_LIBADD) $(LIBS)
++ $(LINK) -rpath $(securelibdir) $(pam_warn_la_LDFLAGS) $(pam_warn_la_OBJECTS) $(pam_warn_la_LIBADD) $(LIBS)
- clean-securelibLTLIBRARIES:
-@@ -404,8 +407,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+@@ -329,22 +348,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_warn.Plo@am__quote@
-@@ -417,8 +420,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -428,13 +431,12 @@
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-Index: pam.deb/modules/pam_wheel/Makefile.in
+ .c.o:
+-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
++@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+@@ -354,9 +373,13 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
++
++distclean-libtool:
++ -rm -f libtool
++uninstall-info-am:
+ install-man8: $(man8_MANS) $(man_MANS)
+ @$(NORMAL_INSTALL)
+- test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
++ test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
+ @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
+ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ for i in $$l2; do \
+@@ -449,9 +472,9 @@
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ check-TESTS: $(TESTS)
+- @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
++ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
+ srcdir=$(srcdir); export srcdir; \
+- list=' $(TESTS) '; \
++ list='$(TESTS)'; \
+ if test -n "$$list"; then \
+ for tst in $$list; do \
+ if test -f ./$$tst; then dir=./; \
+@@ -460,7 +483,7 @@
+ if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *$$ws$$tst$$ws*) \
++ *" $$tst "*) \
+ xpass=`expr $$xpass + 1`; \
+ failed=`expr $$failed + 1`; \
+ echo "XPASS: $$tst"; \
+@@ -472,7 +495,7 @@
+ elif test $$? -ne 77; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *$$ws$$tst$$ws*) \
++ *" $$tst "*) \
+ xfail=`expr $$xfail + 1`; \
+ echo "XFAIL: $$tst"; \
+ ;; \
+@@ -522,21 +545,22 @@
+ else :; fi
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- list='$(DISTFILES)'; \
+- dist_files=`for file in $$list; do echo $$file; done | \
+- sed -e "s|^$$srcdirstrip/||;t" \
+- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+- case $$dist_files in \
+- */*) $(MKDIR_P) `echo "$$dist_files" | \
+- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+- sort -u` ;; \
+- esac; \
+- for file in $$dist_files; do \
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
+ if test -d $$d/$$file; then \
+- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -553,7 +577,7 @@
+ all-am: Makefile $(LTLIBRARIES) $(MANS) $(DATA)
+ installdirs:
+ for dir in "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man8dir)"; do \
+- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
++ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
+ install: install-am
+ install-exec: install-exec-am
+@@ -589,7 +613,7 @@
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-tags
++ distclean-libtool distclean-tags
+
+ dvi: dvi-am
+
+@@ -603,20 +627,12 @@
+
+ install-data-am: install-man install-securelibLTLIBRARIES
+
+-install-dvi: install-dvi-am
+-
+ install-exec-am:
+
+-install-html: install-html-am
+-
+ install-info: install-info-am
+
+ install-man: install-man8
+
+-install-pdf: install-pdf-am
+-
+-install-ps: install-ps-am
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -637,27 +653,24 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-man uninstall-securelibLTLIBRARIES
++uninstall-am: uninstall-info-am uninstall-man \
++ uninstall-securelibLTLIBRARIES
+
+ uninstall-man: uninstall-man8
+
+-.MAKE: install-am install-strip
+-
+ .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
+ clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
+ distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+- install-data-am install-dvi install-dvi-am install-exec \
+- install-exec-am install-html install-html-am install-info \
+- install-info-am install-man install-man8 install-pdf \
+- install-pdf-am install-ps install-ps-am \
++ install-data-am install-exec install-exec-am install-info \
++ install-info-am install-man install-man8 \
+ install-securelibLTLIBRARIES install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+- tags uninstall uninstall-am uninstall-man uninstall-man8 \
+- uninstall-securelibLTLIBRARIES
++ tags uninstall uninstall-am uninstall-info-am uninstall-man \
++ uninstall-man8 uninstall-securelibLTLIBRARIES
+
+ @ENABLE_REGENERATE_MAN_TRUE@README: pam_warn.8.xml
+ @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
+Index: pam.debian/modules/pam_wheel/Makefile.in
===================================================================
---- pam.deb.orig/modules/pam_wheel/Makefile.in
-+++ pam.deb/modules/pam_wheel/Makefile.in
+--- pam.debian.orig/modules/pam_wheel/Makefile.in
++++ pam.debian/modules/pam_wheel/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -67,7 +67,7 @@
+@@ -19,11 +19,15 @@
+ #
+
+
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -67,18 +71,17 @@
pam_wheel_la_LIBADD =
pam_wheel_la_SOURCES = pam_wheel.c
pam_wheel_la_OBJECTS = pam_wheel.lo
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -108,6 +108,7 @@
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
++ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++ $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+- $(LDFLAGS) -o $@
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = pam_wheel.c
+ DIST_SOURCES = pam_wheel.c
+ man8dir = $(mandir)/man8
+@@ -89,6 +92,8 @@
+ CTAGS = ctags
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AUTOCONF = @AUTOCONF@
+@@ -108,11 +113,16 @@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -11206,7 +22202,40 @@ Index: pam.deb/modules/pam_wheel/Makefile.in
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -160,6 +161,7 @@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
++ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
++ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
++ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -121,7 +131,18 @@
+ GMSGFMT_015 = @GMSGFMT_015@
+ GREP = @GREP@
+ HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
+-INSTALL = @INSTALL@
++HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
++HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
++HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
++HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
++HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
++HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
++HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
++HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
++HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
++HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
++HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
++HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -156,10 +177,10 @@
+ LTLIBINTL = @LTLIBINTL@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+-MKDIR_P = @MKDIR_P@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
@@ -11214,99 +22243,329 @@ Index: pam.deb/modules/pam_wheel/Makefile.in
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -175,6 +177,7 @@
- RANLIB = @RANLIB@
- SCONFIGDIR = @SCONFIGDIR@
- SECUREDIR = @SECUREDIR@
-+SED = @SED@
+@@ -178,6 +199,8 @@
+ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
++STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
++STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
STRIP = @STRIP@
-@@ -295,8 +298,8 @@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+@@ -191,13 +214,13 @@
+ XSLTPROC = @XSLTPROC@
+ YACC = @YACC@
+ YFLAGS = @YFLAGS@
+-abs_builddir = @abs_builddir@
+-abs_srcdir = @abs_srcdir@
+-abs_top_builddir = @abs_top_builddir@
+-abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -209,7 +232,6 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+-builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -240,11 +262,8 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+-srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_builddir = @top_builddir@
+-top_srcdir = @top_srcdir@
+ CLEANFILES = *~
+ EXTRA_DIST = README ${MANS} $(XMLS) tst-pam_wheel
+ man_MANS = pam_wheel.8
+@@ -292,7 +311,7 @@
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+- test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
++ test -z "$(securelibdir)" || $(mkdir_p) "$(DESTDIR)$(securelibdir)"
@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \
-- $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \
- else :; fi; \
- done
+@@ -303,7 +322,7 @@
-@@ -304,8 +307,8 @@
+ uninstall-securelibLTLIBRARIES:
@$(NORMAL_UNINSTALL)
- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
+- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
++ @set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
+@@ -318,7 +337,7 @@
+ rm -f "$${dir}/so_locations"; \
done
+ pam_wheel.la: $(pam_wheel_la_OBJECTS) $(pam_wheel_la_DEPENDENCIES)
+- $(LINK) -rpath $(securelibdir) $(pam_wheel_la_OBJECTS) $(pam_wheel_la_LIBADD) $(LIBS)
++ $(LINK) -rpath $(securelibdir) $(pam_wheel_la_LDFLAGS) $(pam_wheel_la_OBJECTS) $(pam_wheel_la_LIBADD) $(LIBS)
- clean-securelibLTLIBRARIES:
-@@ -404,8 +407,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+@@ -329,22 +348,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_wheel.Plo@am__quote@
-@@ -417,8 +420,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -428,13 +431,12 @@
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-Index: pam.deb/modules/pam_xauth/Makefile.in
+ .c.o:
+-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
++@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+@@ -354,9 +373,13 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
++
++distclean-libtool:
++ -rm -f libtool
++uninstall-info-am:
+ install-man8: $(man8_MANS) $(man_MANS)
+ @$(NORMAL_INSTALL)
+- test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
++ test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
+ @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
+ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ for i in $$l2; do \
+@@ -449,9 +472,9 @@
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ check-TESTS: $(TESTS)
+- @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
++ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
+ srcdir=$(srcdir); export srcdir; \
+- list=' $(TESTS) '; \
++ list='$(TESTS)'; \
+ if test -n "$$list"; then \
+ for tst in $$list; do \
+ if test -f ./$$tst; then dir=./; \
+@@ -460,7 +483,7 @@
+ if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *$$ws$$tst$$ws*) \
++ *" $$tst "*) \
+ xpass=`expr $$xpass + 1`; \
+ failed=`expr $$failed + 1`; \
+ echo "XPASS: $$tst"; \
+@@ -472,7 +495,7 @@
+ elif test $$? -ne 77; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *$$ws$$tst$$ws*) \
++ *" $$tst "*) \
+ xfail=`expr $$xfail + 1`; \
+ echo "XFAIL: $$tst"; \
+ ;; \
+@@ -522,21 +545,22 @@
+ else :; fi
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- list='$(DISTFILES)'; \
+- dist_files=`for file in $$list; do echo $$file; done | \
+- sed -e "s|^$$srcdirstrip/||;t" \
+- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+- case $$dist_files in \
+- */*) $(MKDIR_P) `echo "$$dist_files" | \
+- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+- sort -u` ;; \
+- esac; \
+- for file in $$dist_files; do \
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
+ if test -d $$d/$$file; then \
+- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -553,7 +577,7 @@
+ all-am: Makefile $(LTLIBRARIES) $(MANS) $(DATA)
+ installdirs:
+ for dir in "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man8dir)"; do \
+- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
++ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
+ install: install-am
+ install-exec: install-exec-am
+@@ -589,7 +613,7 @@
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-tags
++ distclean-libtool distclean-tags
+
+ dvi: dvi-am
+
+@@ -603,20 +627,12 @@
+
+ install-data-am: install-man install-securelibLTLIBRARIES
+
+-install-dvi: install-dvi-am
+-
+ install-exec-am:
+
+-install-html: install-html-am
+-
+ install-info: install-info-am
+
+ install-man: install-man8
+
+-install-pdf: install-pdf-am
+-
+-install-ps: install-ps-am
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -637,27 +653,24 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-man uninstall-securelibLTLIBRARIES
++uninstall-am: uninstall-info-am uninstall-man \
++ uninstall-securelibLTLIBRARIES
+
+ uninstall-man: uninstall-man8
+
+-.MAKE: install-am install-strip
+-
+ .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
+ clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
+ distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+- install-data-am install-dvi install-dvi-am install-exec \
+- install-exec-am install-html install-html-am install-info \
+- install-info-am install-man install-man8 install-pdf \
+- install-pdf-am install-ps install-ps-am \
++ install-data-am install-exec install-exec-am install-info \
++ install-info-am install-man install-man8 \
+ install-securelibLTLIBRARIES install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+- tags uninstall uninstall-am uninstall-man uninstall-man8 \
+- uninstall-securelibLTLIBRARIES
++ tags uninstall uninstall-am uninstall-info-am uninstall-man \
++ uninstall-man8 uninstall-securelibLTLIBRARIES
+
+ @ENABLE_REGENERATE_MAN_TRUE@README: pam_wheel.8.xml
+ @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
+Index: pam.debian/modules/pam_xauth/Makefile.in
===================================================================
---- pam.deb.orig/modules/pam_xauth/Makefile.in
-+++ pam.deb/modules/pam_xauth/Makefile.in
+--- pam.debian.orig/modules/pam_xauth/Makefile.in
++++ pam.debian/modules/pam_xauth/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -67,7 +67,7 @@
+@@ -19,11 +19,15 @@
+ #
+
+
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -67,18 +71,17 @@
pam_xauth_la_LIBADD =
pam_xauth_la_SOURCES = pam_xauth.c
pam_xauth_la_OBJECTS = pam_xauth.lo
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -108,6 +108,7 @@
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
++ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++ $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+- $(LDFLAGS) -o $@
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = pam_xauth.c
+ DIST_SOURCES = pam_xauth.c
+ man8dir = $(mandir)/man8
+@@ -89,6 +92,8 @@
+ CTAGS = ctags
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AUTOCONF = @AUTOCONF@
+@@ -108,11 +113,16 @@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -11314,7 +22573,40 @@ Index: pam.deb/modules/pam_xauth/Makefile.in
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -160,6 +161,7 @@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
++ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
++ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
++ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -121,7 +131,18 @@
+ GMSGFMT_015 = @GMSGFMT_015@
+ GREP = @GREP@
+ HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
+-INSTALL = @INSTALL@
++HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
++HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
++HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
++HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
++HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
++HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
++HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
++HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
++HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
++HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
++HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
++HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -156,10 +177,10 @@
+ LTLIBINTL = @LTLIBINTL@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+-MKDIR_P = @MKDIR_P@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
@@ -11322,99 +22614,343 @@ Index: pam.deb/modules/pam_xauth/Makefile.in
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -175,6 +177,7 @@
- RANLIB = @RANLIB@
- SCONFIGDIR = @SCONFIGDIR@
- SECUREDIR = @SECUREDIR@
-+SED = @SED@
+@@ -178,6 +199,8 @@
+ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
++STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
++STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
STRIP = @STRIP@
-@@ -295,8 +298,8 @@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+@@ -191,13 +214,13 @@
+ XSLTPROC = @XSLTPROC@
+ YACC = @YACC@
+ YFLAGS = @YFLAGS@
+-abs_builddir = @abs_builddir@
+-abs_srcdir = @abs_srcdir@
+-abs_top_builddir = @abs_top_builddir@
+-abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -209,7 +232,6 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+-builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -240,11 +262,8 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+-srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_builddir = @top_builddir@
+-top_srcdir = @top_srcdir@
+ CLEANFILES = *~
+ EXTRA_DIST = README ${MANS} $(XMLS) tst-pam_xauth
+ man_MANS = pam_xauth.8
+@@ -292,7 +311,7 @@
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+- test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
++ test -z "$(securelibdir)" || $(mkdir_p) "$(DESTDIR)$(securelibdir)"
@list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \
-- $(LIBTOOL) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \
- else :; fi; \
- done
+@@ -303,7 +322,7 @@
-@@ -304,8 +307,8 @@
+ uninstall-securelibLTLIBRARIES:
@$(NORMAL_UNINSTALL)
- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
+- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
++ @set -x; list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
p=$(am__strip_dir) \
-- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
+@@ -318,7 +337,7 @@
+ rm -f "$${dir}/so_locations"; \
done
+ pam_xauth.la: $(pam_xauth_la_OBJECTS) $(pam_xauth_la_DEPENDENCIES)
+- $(LINK) -rpath $(securelibdir) $(pam_xauth_la_OBJECTS) $(pam_xauth_la_LIBADD) $(LIBS)
++ $(LINK) -rpath $(securelibdir) $(pam_xauth_la_LDFLAGS) $(pam_xauth_la_OBJECTS) $(pam_xauth_la_LIBADD) $(LIBS)
- clean-securelibLTLIBRARIES:
-@@ -404,8 +407,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+@@ -329,22 +348,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_xauth.Plo@am__quote@
-@@ -417,8 +420,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -428,13 +431,12 @@
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-Index: pam.deb/tests/Makefile.in
+ .c.o:
+-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
++@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+@@ -354,9 +373,13 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
++
++distclean-libtool:
++ -rm -f libtool
++uninstall-info-am:
+ install-man8: $(man8_MANS) $(man_MANS)
+ @$(NORMAL_INSTALL)
+- test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
++ test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
+ @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
+ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ for i in $$l2; do \
+@@ -449,9 +472,9 @@
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ check-TESTS: $(TESTS)
+- @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
++ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
+ srcdir=$(srcdir); export srcdir; \
+- list=' $(TESTS) '; \
++ list='$(TESTS)'; \
+ if test -n "$$list"; then \
+ for tst in $$list; do \
+ if test -f ./$$tst; then dir=./; \
+@@ -460,7 +483,7 @@
+ if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *$$ws$$tst$$ws*) \
++ *" $$tst "*) \
+ xpass=`expr $$xpass + 1`; \
+ failed=`expr $$failed + 1`; \
+ echo "XPASS: $$tst"; \
+@@ -472,7 +495,7 @@
+ elif test $$? -ne 77; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *$$ws$$tst$$ws*) \
++ *" $$tst "*) \
+ xfail=`expr $$xfail + 1`; \
+ echo "XFAIL: $$tst"; \
+ ;; \
+@@ -522,21 +545,22 @@
+ else :; fi
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- list='$(DISTFILES)'; \
+- dist_files=`for file in $$list; do echo $$file; done | \
+- sed -e "s|^$$srcdirstrip/||;t" \
+- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+- case $$dist_files in \
+- */*) $(MKDIR_P) `echo "$$dist_files" | \
+- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+- sort -u` ;; \
+- esac; \
+- for file in $$dist_files; do \
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
+ if test -d $$d/$$file; then \
+- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -553,7 +577,7 @@
+ all-am: Makefile $(LTLIBRARIES) $(MANS) $(DATA)
+ installdirs:
+ for dir in "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man8dir)"; do \
+- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
++ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
+ install: install-am
+ install-exec: install-exec-am
+@@ -589,7 +613,7 @@
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-tags
++ distclean-libtool distclean-tags
+
+ dvi: dvi-am
+
+@@ -603,20 +627,12 @@
+
+ install-data-am: install-man install-securelibLTLIBRARIES
+
+-install-dvi: install-dvi-am
+-
+ install-exec-am:
+
+-install-html: install-html-am
+-
+ install-info: install-info-am
+
+ install-man: install-man8
+
+-install-pdf: install-pdf-am
+-
+-install-ps: install-ps-am
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -637,27 +653,24 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-man uninstall-securelibLTLIBRARIES
++uninstall-am: uninstall-info-am uninstall-man \
++ uninstall-securelibLTLIBRARIES
+
+ uninstall-man: uninstall-man8
+
+-.MAKE: install-am install-strip
+-
+ .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
+ clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
+ distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+- install-data-am install-dvi install-dvi-am install-exec \
+- install-exec-am install-html install-html-am install-info \
+- install-info-am install-man install-man8 install-pdf \
+- install-pdf-am install-ps install-ps-am \
++ install-data-am install-exec install-exec-am install-info \
++ install-info-am install-man install-man8 \
+ install-securelibLTLIBRARIES install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+- tags uninstall uninstall-am uninstall-man uninstall-man8 \
+- uninstall-securelibLTLIBRARIES
++ tags uninstall uninstall-am uninstall-info-am uninstall-man \
++ uninstall-man8 uninstall-securelibLTLIBRARIES
+
+ @ENABLE_REGENERATE_MAN_TRUE@README: pam_xauth.8.xml
+ @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
+Index: pam.debian/tests/Makefile.in
===================================================================
---- pam.deb.orig/tests/Makefile.in
-+++ pam.deb/tests/Makefile.in
+--- pam.debian.orig/tests/Makefile.in
++++ pam.debian/tests/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -112,7 +112,7 @@
- tst_pam_start_SOURCES = tst-pam_start.c
+@@ -17,11 +17,15 @@
+ #
+ # Copyright (c) 2006 Thorsten Kukuk <kukuk@suse.de>
+ #
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -35,13 +39,6 @@
+ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
+-TESTS = tst-pam_start$(EXEEXT) tst-pam_end$(EXEEXT) \
+- tst-pam_fail_delay$(EXEEXT) tst-pam_open_session$(EXEEXT) \
+- tst-pam_close_session$(EXEEXT) tst-pam_acct_mgmt$(EXEEXT) \
+- tst-pam_authenticate$(EXEEXT) tst-pam_chauthtok$(EXEEXT) \
+- tst-pam_setcred$(EXEEXT) tst-pam_get_item$(EXEEXT) \
+- tst-pam_set_item$(EXEEXT) tst-pam_getenvlist$(EXEEXT) \
+- tst-pam_get_user$(EXEEXT) tst-pam_set_data$(EXEEXT)
+ check_PROGRAMS = $(am__EXEEXT_1) tst-dlopen$(EXEEXT)
+ subdir = tests
+ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+@@ -126,18 +123,17 @@
tst_pam_start_OBJECTS = tst-pam_start.$(OBJEXT)
tst_pam_start_LDADD = $(LDADD)
+ tst_pam_start_DEPENDENCIES =
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -157,6 +157,7 @@
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
++ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++ $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+- $(LDFLAGS) -o $@
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = tst-dlopen.c tst-pam_acct_mgmt.c tst-pam_authenticate.c \
+ tst-pam_chauthtok.c tst-pam_close_session.c tst-pam_end.c \
+ tst-pam_fail_delay.c tst-pam_get_item.c tst-pam_get_user.c \
+@@ -152,6 +148,8 @@
+ CTAGS = ctags
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AUTOCONF = @AUTOCONF@
+@@ -171,11 +169,16 @@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -11422,7 +22958,40 @@ Index: pam.deb/tests/Makefile.in
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -209,6 +210,7 @@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
++ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
++ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
++ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -184,7 +187,18 @@
+ GMSGFMT_015 = @GMSGFMT_015@
+ GREP = @GREP@
+ HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
+-INSTALL = @INSTALL@
++HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
++HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
++HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
++HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
++HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
++HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
++HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
++HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
++HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
++HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
++HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
++HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -219,10 +233,10 @@
+ LTLIBINTL = @LTLIBINTL@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+-MKDIR_P = @MKDIR_P@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
@@ -11430,77 +22999,358 @@ Index: pam.deb/tests/Makefile.in
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -224,6 +226,7 @@
- RANLIB = @RANLIB@
- SCONFIGDIR = @SCONFIGDIR@
- SECUREDIR = @SECUREDIR@
-+SED = @SED@
+@@ -241,6 +255,8 @@
+ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
++STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
++STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
STRIP = @STRIP@
-@@ -439,8 +442,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+@@ -254,13 +270,13 @@
+ XSLTPROC = @XSLTPROC@
+ YACC = @YACC@
+ YFLAGS = @YFLAGS@
+-abs_builddir = @abs_builddir@
+-abs_srcdir = @abs_srcdir@
+-abs_top_builddir = @abs_top_builddir@
+-abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -272,7 +288,6 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+-builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -303,16 +318,18 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+-srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_builddir = @top_builddir@
+-top_srcdir = @top_srcdir@
+ AM_CFLAGS = -DLIBPAM_COMPILE -I$(top_srcdir)/libpam/include \
+ -I$(top_srcdir)/libpam
+
+ LDADD = -L$(top_builddir)/libpam -lpam
+ CLEANFILES = *~
++TESTS = tst-pam_start tst-pam_end tst-pam_fail_delay tst-pam_open_session \
++ tst-pam_close_session tst-pam_acct_mgmt tst-pam_authenticate \
++ tst-pam_chauthtok tst-pam_setcred tst-pam_get_item tst-pam_set_item \
++ tst-pam_getenvlist tst-pam_get_user tst-pam_set_data
++
+ tst_dlopen_LDADD = -ldl
+ all: all-am
-@@ -452,8 +455,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -463,13 +466,12 @@
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+@@ -356,49 +373,49 @@
+ done
+ tst-dlopen$(EXEEXT): $(tst_dlopen_OBJECTS) $(tst_dlopen_DEPENDENCIES)
+ @rm -f tst-dlopen$(EXEEXT)
+- $(LINK) $(tst_dlopen_OBJECTS) $(tst_dlopen_LDADD) $(LIBS)
++ $(LINK) $(tst_dlopen_LDFLAGS) $(tst_dlopen_OBJECTS) $(tst_dlopen_LDADD) $(LIBS)
+ tst-pam_acct_mgmt$(EXEEXT): $(tst_pam_acct_mgmt_OBJECTS) $(tst_pam_acct_mgmt_DEPENDENCIES)
+ @rm -f tst-pam_acct_mgmt$(EXEEXT)
+- $(LINK) $(tst_pam_acct_mgmt_OBJECTS) $(tst_pam_acct_mgmt_LDADD) $(LIBS)
++ $(LINK) $(tst_pam_acct_mgmt_LDFLAGS) $(tst_pam_acct_mgmt_OBJECTS) $(tst_pam_acct_mgmt_LDADD) $(LIBS)
+ tst-pam_authenticate$(EXEEXT): $(tst_pam_authenticate_OBJECTS) $(tst_pam_authenticate_DEPENDENCIES)
+ @rm -f tst-pam_authenticate$(EXEEXT)
+- $(LINK) $(tst_pam_authenticate_OBJECTS) $(tst_pam_authenticate_LDADD) $(LIBS)
++ $(LINK) $(tst_pam_authenticate_LDFLAGS) $(tst_pam_authenticate_OBJECTS) $(tst_pam_authenticate_LDADD) $(LIBS)
+ tst-pam_chauthtok$(EXEEXT): $(tst_pam_chauthtok_OBJECTS) $(tst_pam_chauthtok_DEPENDENCIES)
+ @rm -f tst-pam_chauthtok$(EXEEXT)
+- $(LINK) $(tst_pam_chauthtok_OBJECTS) $(tst_pam_chauthtok_LDADD) $(LIBS)
++ $(LINK) $(tst_pam_chauthtok_LDFLAGS) $(tst_pam_chauthtok_OBJECTS) $(tst_pam_chauthtok_LDADD) $(LIBS)
+ tst-pam_close_session$(EXEEXT): $(tst_pam_close_session_OBJECTS) $(tst_pam_close_session_DEPENDENCIES)
+ @rm -f tst-pam_close_session$(EXEEXT)
+- $(LINK) $(tst_pam_close_session_OBJECTS) $(tst_pam_close_session_LDADD) $(LIBS)
++ $(LINK) $(tst_pam_close_session_LDFLAGS) $(tst_pam_close_session_OBJECTS) $(tst_pam_close_session_LDADD) $(LIBS)
+ tst-pam_end$(EXEEXT): $(tst_pam_end_OBJECTS) $(tst_pam_end_DEPENDENCIES)
+ @rm -f tst-pam_end$(EXEEXT)
+- $(LINK) $(tst_pam_end_OBJECTS) $(tst_pam_end_LDADD) $(LIBS)
++ $(LINK) $(tst_pam_end_LDFLAGS) $(tst_pam_end_OBJECTS) $(tst_pam_end_LDADD) $(LIBS)
+ tst-pam_fail_delay$(EXEEXT): $(tst_pam_fail_delay_OBJECTS) $(tst_pam_fail_delay_DEPENDENCIES)
+ @rm -f tst-pam_fail_delay$(EXEEXT)
+- $(LINK) $(tst_pam_fail_delay_OBJECTS) $(tst_pam_fail_delay_LDADD) $(LIBS)
++ $(LINK) $(tst_pam_fail_delay_LDFLAGS) $(tst_pam_fail_delay_OBJECTS) $(tst_pam_fail_delay_LDADD) $(LIBS)
+ tst-pam_get_item$(EXEEXT): $(tst_pam_get_item_OBJECTS) $(tst_pam_get_item_DEPENDENCIES)
+ @rm -f tst-pam_get_item$(EXEEXT)
+- $(LINK) $(tst_pam_get_item_OBJECTS) $(tst_pam_get_item_LDADD) $(LIBS)
++ $(LINK) $(tst_pam_get_item_LDFLAGS) $(tst_pam_get_item_OBJECTS) $(tst_pam_get_item_LDADD) $(LIBS)
+ tst-pam_get_user$(EXEEXT): $(tst_pam_get_user_OBJECTS) $(tst_pam_get_user_DEPENDENCIES)
+ @rm -f tst-pam_get_user$(EXEEXT)
+- $(LINK) $(tst_pam_get_user_OBJECTS) $(tst_pam_get_user_LDADD) $(LIBS)
++ $(LINK) $(tst_pam_get_user_LDFLAGS) $(tst_pam_get_user_OBJECTS) $(tst_pam_get_user_LDADD) $(LIBS)
+ tst-pam_getenvlist$(EXEEXT): $(tst_pam_getenvlist_OBJECTS) $(tst_pam_getenvlist_DEPENDENCIES)
+ @rm -f tst-pam_getenvlist$(EXEEXT)
+- $(LINK) $(tst_pam_getenvlist_OBJECTS) $(tst_pam_getenvlist_LDADD) $(LIBS)
++ $(LINK) $(tst_pam_getenvlist_LDFLAGS) $(tst_pam_getenvlist_OBJECTS) $(tst_pam_getenvlist_LDADD) $(LIBS)
+ tst-pam_open_session$(EXEEXT): $(tst_pam_open_session_OBJECTS) $(tst_pam_open_session_DEPENDENCIES)
+ @rm -f tst-pam_open_session$(EXEEXT)
+- $(LINK) $(tst_pam_open_session_OBJECTS) $(tst_pam_open_session_LDADD) $(LIBS)
++ $(LINK) $(tst_pam_open_session_LDFLAGS) $(tst_pam_open_session_OBJECTS) $(tst_pam_open_session_LDADD) $(LIBS)
+ tst-pam_set_data$(EXEEXT): $(tst_pam_set_data_OBJECTS) $(tst_pam_set_data_DEPENDENCIES)
+ @rm -f tst-pam_set_data$(EXEEXT)
+- $(LINK) $(tst_pam_set_data_OBJECTS) $(tst_pam_set_data_LDADD) $(LIBS)
++ $(LINK) $(tst_pam_set_data_LDFLAGS) $(tst_pam_set_data_OBJECTS) $(tst_pam_set_data_LDADD) $(LIBS)
+ tst-pam_set_item$(EXEEXT): $(tst_pam_set_item_OBJECTS) $(tst_pam_set_item_DEPENDENCIES)
+ @rm -f tst-pam_set_item$(EXEEXT)
+- $(LINK) $(tst_pam_set_item_OBJECTS) $(tst_pam_set_item_LDADD) $(LIBS)
++ $(LINK) $(tst_pam_set_item_LDFLAGS) $(tst_pam_set_item_OBJECTS) $(tst_pam_set_item_LDADD) $(LIBS)
+ tst-pam_setcred$(EXEEXT): $(tst_pam_setcred_OBJECTS) $(tst_pam_setcred_DEPENDENCIES)
+ @rm -f tst-pam_setcred$(EXEEXT)
+- $(LINK) $(tst_pam_setcred_OBJECTS) $(tst_pam_setcred_LDADD) $(LIBS)
++ $(LINK) $(tst_pam_setcred_LDFLAGS) $(tst_pam_setcred_OBJECTS) $(tst_pam_setcred_LDADD) $(LIBS)
+ tst-pam_start$(EXEEXT): $(tst_pam_start_OBJECTS) $(tst_pam_start_DEPENDENCIES)
+ @rm -f tst-pam_start$(EXEEXT)
+- $(LINK) $(tst_pam_start_OBJECTS) $(tst_pam_start_LDADD) $(LIBS)
++ $(LINK) $(tst_pam_start_LDFLAGS) $(tst_pam_start_OBJECTS) $(tst_pam_start_LDADD) $(LIBS)
+
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+@@ -423,22 +440,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tst-pam_start.Po@am__quote@
+
+ .c.o:
+-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
++@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+@@ -449,6 +466,10 @@
+ clean-libtool:
+ -rm -rf .libs _libs
+
++distclean-libtool:
++ -rm -f libtool
++uninstall-info-am:
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-Index: pam.deb/xtests/Makefile.in
+@@ -498,9 +519,9 @@
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ check-TESTS: $(TESTS)
+- @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
++ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
+ srcdir=$(srcdir); export srcdir; \
+- list=' $(TESTS) '; \
++ list='$(TESTS)'; \
+ if test -n "$$list"; then \
+ for tst in $$list; do \
+ if test -f ./$$tst; then dir=./; \
+@@ -509,7 +530,7 @@
+ if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *$$ws$$tst$$ws*) \
++ *" $$tst "*) \
+ xpass=`expr $$xpass + 1`; \
+ failed=`expr $$failed + 1`; \
+ echo "XPASS: $$tst"; \
+@@ -521,7 +542,7 @@
+ elif test $$? -ne 77; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *$$ws$$tst$$ws*) \
++ *" $$tst "*) \
+ xfail=`expr $$xfail + 1`; \
+ echo "XFAIL: $$tst"; \
+ ;; \
+@@ -571,21 +592,22 @@
+ else :; fi
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- list='$(DISTFILES)'; \
+- dist_files=`for file in $$list; do echo $$file; done | \
+- sed -e "s|^$$srcdirstrip/||;t" \
+- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+- case $$dist_files in \
+- */*) $(MKDIR_P) `echo "$$dist_files" | \
+- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+- sort -u` ;; \
+- esac; \
+- for file in $$dist_files; do \
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
+ if test -d $$d/$$file; then \
+- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -636,7 +658,7 @@
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-tags
++ distclean-libtool distclean-tags
+
+ dvi: dvi-am
+
+@@ -650,20 +672,12 @@
+
+ install-data-am:
+
+-install-dvi: install-dvi-am
+-
+ install-exec-am:
+
+-install-html: install-html-am
+-
+ install-info: install-info-am
+
+ install-man:
+
+-install-pdf: install-pdf-am
+-
+-install-ps: install-ps-am
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -684,23 +698,19 @@
+
+ ps-am:
+
+-uninstall-am:
+-
+-.MAKE: install-am install-strip
++uninstall-am: uninstall-info-am
+
+ .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
+ clean-checkPROGRAMS clean-generic clean-libtool ctags \
+ distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+- install-data-am install-dvi install-dvi-am install-exec \
+- install-exec-am install-html install-html-am install-info \
+- install-info-am install-man install-pdf install-pdf-am \
+- install-ps install-ps-am install-strip installcheck \
++ install-data-am install-exec install-exec-am install-info \
++ install-info-am install-man install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+- tags uninstall uninstall-am
++ tags uninstall uninstall-am uninstall-info-am
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+Index: pam.debian/xtests/Makefile.in
===================================================================
---- pam.deb.orig/xtests/Makefile.in
-+++ pam.deb/xtests/Makefile.in
+--- pam.debian.orig/xtests/Makefile.in
++++ pam.debian/xtests/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -104,7 +104,7 @@
+@@ -18,11 +18,15 @@
+ # Copyright (c) 2006 Thorsten Kukuk <kukuk@suse.de>
+ #
+
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -111,18 +115,17 @@
tst_pam_unix3_SOURCES = tst-pam_unix3.c
tst_pam_unix3_OBJECTS = tst-pam_unix3.$(OBJEXT)
tst_pam_unix3_LDADD = $(LDADD)
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
-+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -149,6 +149,7 @@
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
++ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++ $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+- $(LDFLAGS) -o $@
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = tst-pam_access1.c tst-pam_access2.c tst-pam_access3.c \
+ tst-pam_access4.c tst-pam_cracklib1.c tst-pam_cracklib2.c \
+ tst-pam_dispatch1.c tst-pam_dispatch2.c tst-pam_dispatch3.c \
+@@ -139,6 +142,8 @@
+ CTAGS = ctags
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AUTOCONF = @AUTOCONF@
+@@ -158,11 +163,16 @@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -11508,7 +23358,40 @@ Index: pam.deb/xtests/Makefile.in
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
-@@ -201,6 +202,7 @@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
++ENABLE_GENERATE_PDF_FALSE = @ENABLE_GENERATE_PDF_FALSE@
++ENABLE_GENERATE_PDF_TRUE = @ENABLE_GENERATE_PDF_TRUE@
++ENABLE_REGENERATE_MAN_FALSE = @ENABLE_REGENERATE_MAN_FALSE@
++ENABLE_REGENERATE_MAN_TRUE = @ENABLE_REGENERATE_MAN_TRUE@
+ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+@@ -171,7 +181,18 @@
+ GMSGFMT_015 = @GMSGFMT_015@
+ GREP = @GREP@
+ HAVE_KEY_MANAGEMENT = @HAVE_KEY_MANAGEMENT@
+-INSTALL = @INSTALL@
++HAVE_KEY_MANAGEMENT_FALSE = @HAVE_KEY_MANAGEMENT_FALSE@
++HAVE_KEY_MANAGEMENT_TRUE = @HAVE_KEY_MANAGEMENT_TRUE@
++HAVE_LIBCRACK_FALSE = @HAVE_LIBCRACK_FALSE@
++HAVE_LIBCRACK_TRUE = @HAVE_LIBCRACK_TRUE@
++HAVE_LIBDB_FALSE = @HAVE_LIBDB_FALSE@
++HAVE_LIBDB_TRUE = @HAVE_LIBDB_TRUE@
++HAVE_LIBSELINUX_FALSE = @HAVE_LIBSELINUX_FALSE@
++HAVE_LIBSELINUX_TRUE = @HAVE_LIBSELINUX_TRUE@
++HAVE_UNSHARE_FALSE = @HAVE_UNSHARE_FALSE@
++HAVE_UNSHARE_TRUE = @HAVE_UNSHARE_TRUE@
++HAVE_VERSIONING_FALSE = @HAVE_VERSIONING_FALSE@
++HAVE_VERSIONING_TRUE = @HAVE_VERSIONING_TRUE@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -206,10 +227,10 @@
+ LTLIBINTL = @LTLIBINTL@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+-MKDIR_P = @MKDIR_P@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
@@ -11516,49 +23399,253 @@ Index: pam.deb/xtests/Makefile.in
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-@@ -216,6 +218,7 @@
- RANLIB = @RANLIB@
- SCONFIGDIR = @SCONFIGDIR@
- SECUREDIR = @SECUREDIR@
-+SED = @SED@
+@@ -228,6 +249,8 @@
+ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
++STATIC_MODULES_FALSE = @STATIC_MODULES_FALSE@
++STATIC_MODULES_TRUE = @STATIC_MODULES_TRUE@
STRIP = @STRIP@
-@@ -445,8 +448,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+@@ -241,13 +264,13 @@
+ XSLTPROC = @XSLTPROC@
+ YACC = @YACC@
+ YFLAGS = @YFLAGS@
+-abs_builddir = @abs_builddir@
+-abs_srcdir = @abs_srcdir@
+-abs_top_builddir = @abs_top_builddir@
+-abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -259,7 +282,6 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+-builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -290,11 +312,8 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+-srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-top_builddir = @top_builddir@
+-top_srcdir = @top_srcdir@
+ AM_CFLAGS = -DLIBPAM_COMPILE -I$(top_srcdir)/libpam/include \
+ -I$(top_srcdir)/libpamc/include -I$(top_srcdir)/libpam_misc/include
+
+@@ -364,52 +383,52 @@
+ done
+ tst-pam_access1$(EXEEXT): $(tst_pam_access1_OBJECTS) $(tst_pam_access1_DEPENDENCIES)
+ @rm -f tst-pam_access1$(EXEEXT)
+- $(LINK) $(tst_pam_access1_OBJECTS) $(tst_pam_access1_LDADD) $(LIBS)
++ $(LINK) $(tst_pam_access1_LDFLAGS) $(tst_pam_access1_OBJECTS) $(tst_pam_access1_LDADD) $(LIBS)
+ tst-pam_access2$(EXEEXT): $(tst_pam_access2_OBJECTS) $(tst_pam_access2_DEPENDENCIES)
+ @rm -f tst-pam_access2$(EXEEXT)
+- $(LINK) $(tst_pam_access2_OBJECTS) $(tst_pam_access2_LDADD) $(LIBS)
++ $(LINK) $(tst_pam_access2_LDFLAGS) $(tst_pam_access2_OBJECTS) $(tst_pam_access2_LDADD) $(LIBS)
+ tst-pam_access3$(EXEEXT): $(tst_pam_access3_OBJECTS) $(tst_pam_access3_DEPENDENCIES)
+ @rm -f tst-pam_access3$(EXEEXT)
+- $(LINK) $(tst_pam_access3_OBJECTS) $(tst_pam_access3_LDADD) $(LIBS)
++ $(LINK) $(tst_pam_access3_LDFLAGS) $(tst_pam_access3_OBJECTS) $(tst_pam_access3_LDADD) $(LIBS)
+ tst-pam_access4$(EXEEXT): $(tst_pam_access4_OBJECTS) $(tst_pam_access4_DEPENDENCIES)
+ @rm -f tst-pam_access4$(EXEEXT)
+- $(LINK) $(tst_pam_access4_OBJECTS) $(tst_pam_access4_LDADD) $(LIBS)
++ $(LINK) $(tst_pam_access4_LDFLAGS) $(tst_pam_access4_OBJECTS) $(tst_pam_access4_LDADD) $(LIBS)
+ tst-pam_cracklib1$(EXEEXT): $(tst_pam_cracklib1_OBJECTS) $(tst_pam_cracklib1_DEPENDENCIES)
+ @rm -f tst-pam_cracklib1$(EXEEXT)
+- $(LINK) $(tst_pam_cracklib1_OBJECTS) $(tst_pam_cracklib1_LDADD) $(LIBS)
++ $(LINK) $(tst_pam_cracklib1_LDFLAGS) $(tst_pam_cracklib1_OBJECTS) $(tst_pam_cracklib1_LDADD) $(LIBS)
+ tst-pam_cracklib2$(EXEEXT): $(tst_pam_cracklib2_OBJECTS) $(tst_pam_cracklib2_DEPENDENCIES)
+ @rm -f tst-pam_cracklib2$(EXEEXT)
+- $(LINK) $(tst_pam_cracklib2_OBJECTS) $(tst_pam_cracklib2_LDADD) $(LIBS)
++ $(LINK) $(tst_pam_cracklib2_LDFLAGS) $(tst_pam_cracklib2_OBJECTS) $(tst_pam_cracklib2_LDADD) $(LIBS)
+ tst-pam_dispatch1$(EXEEXT): $(tst_pam_dispatch1_OBJECTS) $(tst_pam_dispatch1_DEPENDENCIES)
+ @rm -f tst-pam_dispatch1$(EXEEXT)
+- $(LINK) $(tst_pam_dispatch1_OBJECTS) $(tst_pam_dispatch1_LDADD) $(LIBS)
++ $(LINK) $(tst_pam_dispatch1_LDFLAGS) $(tst_pam_dispatch1_OBJECTS) $(tst_pam_dispatch1_LDADD) $(LIBS)
+ tst-pam_dispatch2$(EXEEXT): $(tst_pam_dispatch2_OBJECTS) $(tst_pam_dispatch2_DEPENDENCIES)
+ @rm -f tst-pam_dispatch2$(EXEEXT)
+- $(LINK) $(tst_pam_dispatch2_OBJECTS) $(tst_pam_dispatch2_LDADD) $(LIBS)
++ $(LINK) $(tst_pam_dispatch2_LDFLAGS) $(tst_pam_dispatch2_OBJECTS) $(tst_pam_dispatch2_LDADD) $(LIBS)
+ tst-pam_dispatch3$(EXEEXT): $(tst_pam_dispatch3_OBJECTS) $(tst_pam_dispatch3_DEPENDENCIES)
+ @rm -f tst-pam_dispatch3$(EXEEXT)
+- $(LINK) $(tst_pam_dispatch3_OBJECTS) $(tst_pam_dispatch3_LDADD) $(LIBS)
++ $(LINK) $(tst_pam_dispatch3_LDFLAGS) $(tst_pam_dispatch3_OBJECTS) $(tst_pam_dispatch3_LDADD) $(LIBS)
+ tst-pam_dispatch4$(EXEEXT): $(tst_pam_dispatch4_OBJECTS) $(tst_pam_dispatch4_DEPENDENCIES)
+ @rm -f tst-pam_dispatch4$(EXEEXT)
+- $(LINK) $(tst_pam_dispatch4_OBJECTS) $(tst_pam_dispatch4_LDADD) $(LIBS)
++ $(LINK) $(tst_pam_dispatch4_LDFLAGS) $(tst_pam_dispatch4_OBJECTS) $(tst_pam_dispatch4_LDADD) $(LIBS)
+ tst-pam_group1$(EXEEXT): $(tst_pam_group1_OBJECTS) $(tst_pam_group1_DEPENDENCIES)
+ @rm -f tst-pam_group1$(EXEEXT)
+- $(LINK) $(tst_pam_group1_OBJECTS) $(tst_pam_group1_LDADD) $(LIBS)
++ $(LINK) $(tst_pam_group1_LDFLAGS) $(tst_pam_group1_OBJECTS) $(tst_pam_group1_LDADD) $(LIBS)
+ tst-pam_limits1$(EXEEXT): $(tst_pam_limits1_OBJECTS) $(tst_pam_limits1_DEPENDENCIES)
+ @rm -f tst-pam_limits1$(EXEEXT)
+- $(LINK) $(tst_pam_limits1_OBJECTS) $(tst_pam_limits1_LDADD) $(LIBS)
++ $(LINK) $(tst_pam_limits1_LDFLAGS) $(tst_pam_limits1_OBJECTS) $(tst_pam_limits1_LDADD) $(LIBS)
+ tst-pam_succeed_if1$(EXEEXT): $(tst_pam_succeed_if1_OBJECTS) $(tst_pam_succeed_if1_DEPENDENCIES)
+ @rm -f tst-pam_succeed_if1$(EXEEXT)
+- $(LINK) $(tst_pam_succeed_if1_OBJECTS) $(tst_pam_succeed_if1_LDADD) $(LIBS)
++ $(LINK) $(tst_pam_succeed_if1_LDFLAGS) $(tst_pam_succeed_if1_OBJECTS) $(tst_pam_succeed_if1_LDADD) $(LIBS)
+ tst-pam_unix1$(EXEEXT): $(tst_pam_unix1_OBJECTS) $(tst_pam_unix1_DEPENDENCIES)
+ @rm -f tst-pam_unix1$(EXEEXT)
+- $(LINK) $(tst_pam_unix1_OBJECTS) $(tst_pam_unix1_LDADD) $(LIBS)
++ $(LINK) $(tst_pam_unix1_LDFLAGS) $(tst_pam_unix1_OBJECTS) $(tst_pam_unix1_LDADD) $(LIBS)
+ tst-pam_unix2$(EXEEXT): $(tst_pam_unix2_OBJECTS) $(tst_pam_unix2_DEPENDENCIES)
+ @rm -f tst-pam_unix2$(EXEEXT)
+- $(LINK) $(tst_pam_unix2_OBJECTS) $(tst_pam_unix2_LDADD) $(LIBS)
++ $(LINK) $(tst_pam_unix2_LDFLAGS) $(tst_pam_unix2_OBJECTS) $(tst_pam_unix2_LDADD) $(LIBS)
+ tst-pam_unix3$(EXEEXT): $(tst_pam_unix3_OBJECTS) $(tst_pam_unix3_DEPENDENCIES)
+ @rm -f tst-pam_unix3$(EXEEXT)
+- $(LINK) $(tst_pam_unix3_OBJECTS) $(tst_pam_unix3_LDADD) $(LIBS)
++ $(LINK) $(tst_pam_unix3_LDFLAGS) $(tst_pam_unix3_OBJECTS) $(tst_pam_unix3_LDADD) $(LIBS)
+
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+@@ -435,22 +454,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tst-pam_unix3.Po@am__quote@
-@@ -458,8 +461,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -469,13 +472,12 @@
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ .c.o:
+-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ .c.lo:
+-@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
++@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+@@ -461,6 +480,10 @@
+ clean-libtool:
+ -rm -rf .libs _libs
+
++distclean-libtool:
++ -rm -f libtool
++uninstall-info-am:
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
+@@ -510,21 +533,22 @@
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+- list='$(DISTFILES)'; \
+- dist_files=`for file in $$list; do echo $$file; done | \
+- sed -e "s|^$$srcdirstrip/||;t" \
+- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+- case $$dist_files in \
+- */*) $(MKDIR_P) `echo "$$dist_files" | \
+- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+- sort -u` ;; \
+- esac; \
+- for file in $$dist_files; do \
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
+ if test -d $$d/$$file; then \
+- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -573,7 +597,7 @@
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-tags
++ distclean-libtool distclean-tags
+
+ dvi: dvi-am
+
+@@ -587,20 +611,12 @@
+
+ install-data-am:
+
+-install-dvi: install-dvi-am
+-
+ install-exec-am:
+
+-install-html: install-html-am
+-
+ install-info: install-info-am
+
+ install-man:
+
+-install-pdf: install-pdf-am
+-
+-install-ps: install-ps-am
+-
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -621,22 +637,19 @@
+
+ ps-am:
+
+-uninstall-am:
+-
+-.MAKE: install-am install-strip
++uninstall-am: uninstall-info-am
+
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ clean-libtool clean-noinstPROGRAMS ctags distclean \
+ distclean-compile distclean-generic distclean-libtool \
+ distclean-tags distdir dvi dvi-am html html-am info info-am \
+- install install-am install-data install-data-am install-dvi \
+- install-dvi-am install-exec install-exec-am install-html \
+- install-html-am install-info install-info-am install-man \
+- install-pdf install-pdf-am install-ps install-ps-am \
++ install install-am install-data install-data-am install-exec \
++ install-exec-am install-info install-info-am install-man \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+- pdf pdf-am ps ps-am tags uninstall uninstall-am
++ pdf pdf-am ps ps-am tags uninstall uninstall-am \
++ uninstall-info-am
+
+
+ xtests: $(XTESTS) run-xtests.sh
diff --git a/debian/patches-applied/limits_wrong_strncpy b/debian/patches-applied/limits_wrong_strncpy
deleted file mode 100644
index 155eab51..00000000
--- a/debian/patches-applied/limits_wrong_strncpy
+++ /dev/null
@@ -1,92 +0,0 @@
-Patch for Debian bug #331278
-
-Remove a number of unnecessary string manipulations, including a
-strncpy() that was acting on overlapping memory.
-
-Authors: Steve Langasek <vorlon@debian.org>
-
-Upstream status: committed to CVS
-
-Index: pam/Linux-PAM/modules/pam_limits/pam_limits.c
-===================================================================
---- pam.orig/Linux-PAM/modules/pam_limits/pam_limits.c
-+++ pam/Linux-PAM/modules/pam_limits/pam_limits.c
-@@ -492,8 +492,6 @@
- }
- #undef CONF_FILE
-
-- /* init things */
-- memset(buf, 0, sizeof(buf));
- /* start the show */
- while (fgets(buf, LINE_LENGTH, fil) != NULL) {
- char domain[LINE_LENGTH];
-@@ -502,46 +500,40 @@
- char value[LINE_LENGTH];
- int i;
- size_t j;
-- char *tptr;
-+ char *tptr,*line;
-
-- tptr = buf;
-+ line = buf;
- /* skip the leading white space */
-- while (*tptr && isspace(*tptr))
-- tptr++;
-- strncpy(buf, tptr, sizeof(buf)-1);
-- buf[sizeof(buf)-1] = '\0';
-+ while (*line && isspace(*line))
-+ line++;
-
- /* Rip off the comments */
-- tptr = strchr(buf,'#');
-+ tptr = strchr(line,'#');
- if (tptr)
- *tptr = '\0';
- /* Rip off the newline char */
-- tptr = strchr(buf,'\n');
-+ tptr = strchr(line,'\n');
- if (tptr)
- *tptr = '\0';
- /* Anything left ? */
-- if (!strlen(buf)) {
-- memset(buf, 0, sizeof(buf));
-+ if (!strlen(line))
- continue;
-- }
-
-- memset(domain, 0, sizeof(domain));
-- memset(ltype, 0, sizeof(ltype));
-- memset(item, 0, sizeof(item));
-- memset(value, 0, sizeof(value));
-+ domain[0] = ltype[0] = item[0] = value[0] = '\0';
-
-- i = sscanf(buf,"%s%s%s%s", domain, ltype, item, value);
-+ i = sscanf(line,"%s%s%s%s", domain, ltype, item, value);
- D(("scanned line[%d]: domain[%s], ltype[%s], item[%s], value[%s]",
- i, domain, ltype, item, value));
-
- for(j=0; j < strlen(ltype); j++)
- ltype[j]=tolower(ltype[j]);
-- for(j=0; j < strlen(item); j++)
-- item[j]=tolower(item[j]);
-- for(j=0; j < strlen(value); j++)
-- value[j]=tolower(value[j]);
-
- if (i == 4) { /* a complete line */
-+ for(j=0; j < strlen(item); j++)
-+ item[j]=tolower(item[j]);
-+ for(j=0; j < strlen(value); j++)
-+ value[j]=tolower(value[j]);
-+
- if (strcmp(uname, domain) == 0) /* this user have a limit */
- process_limit(pamh, LIMITS_DEF_USER, ltype, item, value, ctrl, pl);
- else if (domain[0]=='@' && !pl->root) {
-@@ -587,7 +579,7 @@
- return PAM_IGNORE;
- }
- } else {
-- pam_syslog(pamh, LOG_WARNING, "invalid line '%s' - skipped", buf);
-+ pam_syslog(pamh, LOG_WARNING, "invalid line '%s' - skipped", line);
- }
- }
- fclose(fil);
diff --git a/debian/patches-applied/misc_conv_allow_sigint.patch b/debian/patches-applied/misc_conv_allow_sigint.patch
deleted file mode 100644
index 75ffe8b7..00000000
--- a/debian/patches-applied/misc_conv_allow_sigint.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Patch for Debian bug #1708
-
-Don't block SIGINT in misc_conv, it's perfectly valid to allow the user
-to interrupt at a prompt if the application hasn't otherwise blocked the
-signal.
-
-Authors: Steve Langasek <vorlon@debian.org>
-
-Upstream status: committed to CVS
-
-Index: pam/Linux-PAM/libpam_misc/misc_conv.c
-===================================================================
---- pam.orig/Linux-PAM/libpam_misc/misc_conv.c
-+++ pam/Linux-PAM/libpam_misc/misc_conv.c
-@@ -150,12 +150,11 @@
- have_term = 1;
-
- /*
-- * We make a simple attempt to block TTY signals from terminating
-+ * We make a simple attempt to block TTY signals from suspending
- * the conversation without giving PAM a chance to clean up.
- */
-
- sigemptyset(&nset);
-- sigaddset(&nset, SIGINT);
- sigaddset(&nset, SIGTSTP);
- (void) sigprocmask(SIG_BLOCK, &nset, &oset);
-
diff --git a/debian/patches-applied/no_pthread_mutexes b/debian/patches-applied/no_pthread_mutexes
deleted file mode 100644
index 8983e11e..00000000
--- a/debian/patches-applied/no_pthread_mutexes
+++ /dev/null
@@ -1,205 +0,0 @@
-Don't use pthread mutexes in libpam unnecessarily; this avoids linking
-problems on non-Linux platforms.
-
-Authors: Steve Langasek <vorlon@debian.org>
-
-Upstream status: committed to CVS
-
-Index: pam/Linux-PAM/libpam/pam_modutil_getgrgid.c
-===================================================================
---- pam.orig/Linux-PAM/libpam/pam_modutil_getgrgid.c
-+++ pam/Linux-PAM/libpam/pam_modutil_getgrgid.c
-@@ -12,20 +12,9 @@
- #include <errno.h>
- #include <limits.h>
- #include <grp.h>
--#include <pthread.h>
- #include <stdio.h>
- #include <stdlib.h>
-
--static pthread_mutex_t _pammodutil_mutex = PTHREAD_MUTEX_INITIALIZER;
--static void _pammodutil_lock(void)
--{
-- pthread_mutex_lock(&_pammodutil_mutex);
--}
--static void _pammodutil_unlock(void)
--{
-- pthread_mutex_unlock(&_pammodutil_mutex);
--}
--
- static int intlen(int number)
- {
- int len = 2;
-@@ -95,13 +84,11 @@
- for (i = 0; i < INT_MAX; i++) {
- sprintf(data_name, "_pammodutil_getgrgid_%ld_%d",
- (long) gid, i);
-- _pammodutil_lock();
- status = PAM_NO_MODULE_DATA;
- if (pam_get_data(pamh, data_name, &ignore) != PAM_SUCCESS) {
- status = pam_set_data(pamh, data_name,
- result, pam_modutil_cleanup);
- }
-- _pammodutil_unlock();
- if (status == PAM_SUCCESS) {
- break;
- }
-Index: pam/Linux-PAM/libpam/pam_modutil_getgrnam.c
-===================================================================
---- pam.orig/Linux-PAM/libpam/pam_modutil_getgrnam.c
-+++ pam/Linux-PAM/libpam/pam_modutil_getgrnam.c
-@@ -12,20 +12,9 @@
- #include <errno.h>
- #include <limits.h>
- #include <grp.h>
--#include <pthread.h>
- #include <stdio.h>
- #include <stdlib.h>
-
--static pthread_mutex_t _pammodutil_mutex = PTHREAD_MUTEX_INITIALIZER;
--static void _pammodutil_lock(void)
--{
-- pthread_mutex_lock(&_pammodutil_mutex);
--}
--static void _pammodutil_unlock(void)
--{
-- pthread_mutex_unlock(&_pammodutil_mutex);
--}
--
- static int intlen(int number)
- {
- int len = 2;
-@@ -84,13 +73,11 @@
- if (pamh != NULL) {
- for (i = 0; i < INT_MAX; i++) {
- sprintf(data_name, "_pammodutil_getgrnam_%s_%d", group, i);
-- _pammodutil_lock();
- status = PAM_NO_MODULE_DATA;
- if (pam_get_data(pamh, data_name, &ignore) != PAM_SUCCESS) {
- status = pam_set_data(pamh, data_name,
- result, pam_modutil_cleanup);
- }
-- _pammodutil_unlock();
- if (status == PAM_SUCCESS) {
- break;
- }
-Index: pam/Linux-PAM/libpam/pam_modutil_getpwnam.c
-===================================================================
---- pam.orig/Linux-PAM/libpam/pam_modutil_getpwnam.c
-+++ pam/Linux-PAM/libpam/pam_modutil_getpwnam.c
-@@ -11,21 +11,10 @@
-
- #include <errno.h>
- #include <limits.h>
--#include <pthread.h>
- #include <pwd.h>
- #include <stdio.h>
- #include <stdlib.h>
-
--static pthread_mutex_t _pammodutil_mutex = PTHREAD_MUTEX_INITIALIZER;
--static void _pammodutil_lock(void)
--{
-- pthread_mutex_lock(&_pammodutil_mutex);
--}
--static void _pammodutil_unlock(void)
--{
-- pthread_mutex_unlock(&_pammodutil_mutex);
--}
--
- static int intlen(int number)
- {
- int len = 2;
-@@ -84,13 +73,11 @@
- if (pamh != NULL) {
- for (i = 0; i < INT_MAX; i++) {
- sprintf(data_name, "_pammodutil_getpwnam_%s_%d", user, i);
-- _pammodutil_lock();
- status = PAM_NO_MODULE_DATA;
- if (pam_get_data(pamh, data_name, &ignore) != PAM_SUCCESS) {
- status = pam_set_data(pamh, data_name,
- result, pam_modutil_cleanup);
- }
-- _pammodutil_unlock();
- if (status == PAM_SUCCESS) {
- break;
- }
-Index: pam/Linux-PAM/libpam/pam_modutil_getpwuid.c
-===================================================================
---- pam.orig/Linux-PAM/libpam/pam_modutil_getpwuid.c
-+++ pam/Linux-PAM/libpam/pam_modutil_getpwuid.c
-@@ -11,21 +11,10 @@
-
- #include <errno.h>
- #include <limits.h>
--#include <pthread.h>
- #include <pwd.h>
- #include <stdio.h>
- #include <stdlib.h>
-
--static pthread_mutex_t _pammodutil_mutex = PTHREAD_MUTEX_INITIALIZER;
--static void _pammodutil_lock(void)
--{
-- pthread_mutex_lock(&_pammodutil_mutex);
--}
--static void _pammodutil_unlock(void)
--{
-- pthread_mutex_unlock(&_pammodutil_mutex);
--}
--
- static int intlen(int number)
- {
- int len = 2;
-@@ -95,13 +84,11 @@
- for (i = 0; i < INT_MAX; i++) {
- sprintf(data_name, "_pammodutil_getpwuid_%ld_%d",
- (long) uid, i);
-- _pammodutil_lock();
- status = PAM_NO_MODULE_DATA;
- if (pam_get_data(pamh, data_name, &ignore) != PAM_SUCCESS) {
- status = pam_set_data(pamh, data_name,
- result, pam_modutil_cleanup);
- }
-- _pammodutil_unlock();
- if (status == PAM_SUCCESS) {
- break;
- }
-Index: pam/Linux-PAM/libpam/pam_modutil_getspnam.c
-===================================================================
---- pam.orig/Linux-PAM/libpam/pam_modutil_getspnam.c
-+++ pam/Linux-PAM/libpam/pam_modutil_getspnam.c
-@@ -11,21 +11,10 @@
-
- #include <errno.h>
- #include <limits.h>
--#include <pthread.h>
- #include <shadow.h>
- #include <stdio.h>
- #include <stdlib.h>
-
--static pthread_mutex_t _pammodutil_mutex = PTHREAD_MUTEX_INITIALIZER;
--static void _pammodutil_lock(void)
--{
-- pthread_mutex_lock(&_pammodutil_mutex);
--}
--static void _pammodutil_unlock(void)
--{
-- pthread_mutex_unlock(&_pammodutil_mutex);
--}
--
- static int intlen(int number)
- {
- int len = 2;
-@@ -84,13 +73,11 @@
- if (pamh != NULL) {
- for (i = 0; i < INT_MAX; i++) {
- sprintf(data_name, "_pammodutil_getspnam_%s_%d", user, i);
-- _pammodutil_lock();
- status = PAM_NO_MODULE_DATA;
- if (pam_get_data(pamh, data_name, &ignore) != PAM_SUCCESS) {
- status = pam_set_data(pamh, data_name,
- result, pam_modutil_cleanup);
- }
-- _pammodutil_unlock();
- if (status == PAM_SUCCESS) {
- break;
- }
diff --git a/debian/patches-applied/series b/debian/patches-applied/series
index 796c3acb..87d53fcf 100644
--- a/debian/patches-applied/series
+++ b/debian/patches-applied/series
@@ -1,31 +1,21 @@
-006_docs_cleanup
007_modules_pam_unix
008_modules_pam_limits_chroot
-015_hurd_portability
-019_pam_listfile_quiet
021_nis_cleanup
022_pam_unix_group_time_miscfixes
-024_debian_cracklib_dict_path
026_pam_unix_passwd_unknown_user
027_pam_limits_better_init_allow_explicit_root
031_pam_include -p2
032_pam_limits_EPERM_NOT_FATAL
036_pam_wheel_getlogin_considered_harmful
-038_support_hurd
hurd_no_setfsuid
040_pam_limits_log_failure
-043_pam_unix_unknown_user_not_alert
045_pam_dispatch_jump_is_ignore
-046_pam_group_example
049_pam_unix_sane_locking
054_pam_security_abstract_securetty_handling
055_pam_unix_nullok_secure
057_pam_unix_passwd_OOM_check
-065_pam_unix_cracklib_disable -p2
+065_pam_unix_cracklib_disable
PAM-manpage-section -p2
-no_pthread_mutexes -p2
-limits_wrong_strncpy -p2
-misc_conv_allow_sigint.patch -p2
pam_env_ignore_garbage.patch -p2
pam_tally_audit.patch
autoconf.patch
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-19 08:52:16 +0000