summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/patches-applied/007_modules_pam_unix8
-rw-r--r--debian/patches-applied/008_modules_pam_limits_chroot8
-rw-r--r--debian/patches-applied/036_pam_wheel_getlogin_considered_harmful8
-rw-r--r--debian/patches-applied/PAM-manpage-section482
-rw-r--r--debian/patches-applied/autoconf.patch25916
-rw-r--r--debian/patches-applied/fix-man-crud1123
6 files changed, 4052 insertions, 23493 deletions
diff --git a/debian/patches-applied/007_modules_pam_unix b/debian/patches-applied/007_modules_pam_unix
index 31b0c693..07f27629 100644
--- a/debian/patches-applied/007_modules_pam_unix
+++ b/debian/patches-applied/007_modules_pam_unix
@@ -447,15 +447,15 @@ Index: pam.deb/modules/pam_unix/pam_unix.8
.\" Title: pam_unix
.\" Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 08/17/2010
+-.\" Date: 10/27/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/31/2010
++.\" Date: 05/31/2011
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_UNIX" "8" "08/17/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
-+.TH "PAM_UNIX" "8" "08/31/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
+-.TH "PAM_UNIX" "8" "10/27/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
++.TH "PAM_UNIX" "8" "05/31/2011" "Linux-PAM Manual" "Linux\-PAM Manual"
.\" -----------------------------------------------------------------
-.\" * (re)Define some macros
+.\" * Define some portability stuff
diff --git a/debian/patches-applied/008_modules_pam_limits_chroot b/debian/patches-applied/008_modules_pam_limits_chroot
index 7dd3ebbd..46befadd 100644
--- a/debian/patches-applied/008_modules_pam_limits_chroot
+++ b/debian/patches-applied/008_modules_pam_limits_chroot
@@ -99,15 +99,15 @@ Index: pam.deb/modules/pam_limits/limits.conf.5
.\" Title: limits.conf
.\" Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 07/08/2010
+-.\" Date: 10/27/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/31/2010
++.\" Date: 05/31/2011
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "LIMITS\&.CONF" "5" "07/08/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
-+.TH "LIMITS\&.CONF" "5" "08/31/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
+-.TH "LIMITS\&.CONF" "5" "10/27/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
++.TH "LIMITS\&.CONF" "5" "05/31/2011" "Linux-PAM Manual" "Linux\-PAM Manual"
.\" -----------------------------------------------------------------
-.\" * (re)Define some macros
+.\" * Define some portability stuff
diff --git a/debian/patches-applied/036_pam_wheel_getlogin_considered_harmful b/debian/patches-applied/036_pam_wheel_getlogin_considered_harmful
index 5eb09b32..6dee95c7 100644
--- a/debian/patches-applied/036_pam_wheel_getlogin_considered_harmful
+++ b/debian/patches-applied/036_pam_wheel_getlogin_considered_harmful
@@ -110,15 +110,15 @@ Index: pam.deb/modules/pam_wheel/pam_wheel.8
.\" Title: pam_wheel
.\" Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 07/08/2010
+-.\" Date: 10/27/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/31/2010
++.\" Date: 05/31/2011
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_WHEEL" "8" "07/08/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
-+.TH "PAM_WHEEL" "8" "08/31/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
+-.TH "PAM_WHEEL" "8" "10/27/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
++.TH "PAM_WHEEL" "8" "05/31/2011" "Linux-PAM Manual" "Linux\-PAM Manual"
.\" -----------------------------------------------------------------
-.\" * (re)Define some macros
+.\" * Define some portability stuff
diff --git a/debian/patches-applied/PAM-manpage-section b/debian/patches-applied/PAM-manpage-section
index b99e7bda..202d4d3b 100644
--- a/debian/patches-applied/PAM-manpage-section
+++ b/debian/patches-applied/PAM-manpage-section
@@ -14,15 +14,15 @@ Index: pam.deb/doc/man/PAM.8
.\" Title: pam
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 04/01/2010
+-.\" Date: 10/27/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/31/2010
++.\" Date: 06/04/2011
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM" "8" "04/01/2010" "Linux-PAM Manual" "Linux-PAM Manual"
-+.TH "PAM" "7" "08/31/2010" "Linux-PAM Manual" "Linux-PAM Manual"
+-.TH "PAM" "8" "10/27/2010" "Linux-PAM Manual" "Linux-PAM Manual"
++.TH "PAM" "7" "06/04/2011" "Linux-PAM Manual" "Linux-PAM Manual"
.\" -----------------------------------------------------------------
-.\" * (re)Define some macros
+.\" * Define some portability stuff
@@ -266,8 +266,8 @@ Index: pam.deb/doc/man/PAM.8
Index: pam.deb/doc/man/pam.8
===================================================================
--- pam.deb.orig/doc/man/pam.8
-+++ /dev/null
-@@ -1,1 +1,1 @@
++++ pam.deb/doc/man/pam.8
+@@ -1 +1 @@
-.so man8/PAM.8
+.so man7/PAM.7
Index: pam.deb/doc/man/pam.8.xml
@@ -301,15 +301,15 @@ Index: pam.deb/modules/pam_access/access.conf.5
.\" Title: access.conf
.\" Author: [see the "AUTHORS" section]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 07/08/2010
+-.\" Date: 10/27/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/31/2010
++.\" Date: 06/04/2011
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "ACCESS\&.CONF" "5" "07/08/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
-+.TH "ACCESS\&.CONF" "5" "08/31/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
+-.TH "ACCESS\&.CONF" "5" "10/27/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
++.TH "ACCESS\&.CONF" "5" "06/04/2011" "Linux-PAM Manual" "Linux\-PAM Manual"
.\" -----------------------------------------------------------------
-.\" * (re)Define some macros
+.\" * Define some portability stuff
@@ -542,15 +542,15 @@ Index: pam.deb/modules/pam_env/pam_env.conf.5
.\" Title: pam_env.conf
.\" Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 07/08/2010
+-.\" Date: 10/27/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/31/2010
++.\" Date: 06/04/2011
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_ENV\&.CONF" "5" "07/08/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
-+.TH "PAM_ENV\&.CONF" "5" "08/31/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
+-.TH "PAM_ENV\&.CONF" "5" "10/27/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
++.TH "PAM_ENV\&.CONF" "5" "06/04/2011" "Linux-PAM Manual" "Linux\-PAM Manual"
.\" -----------------------------------------------------------------
-.\" * (re)Define some macros
+.\" * Define some portability stuff
@@ -877,15 +877,15 @@ Index: pam.deb/modules/pam_group/group.conf.5
.\" Title: group.conf
.\" Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 08/04/2010
+-.\" Date: 10/27/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/31/2010
++.\" Date: 06/04/2011
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "GROUP\&.CONF" "5" "08/04/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
-+.TH "GROUP\&.CONF" "5" "08/31/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
+-.TH "GROUP\&.CONF" "5" "10/27/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
++.TH "GROUP\&.CONF" "5" "06/04/2011" "Linux-PAM Manual" "Linux\-PAM Manual"
.\" -----------------------------------------------------------------
-.\" * (re)Define some macros
+.\" * Define some portability stuff
@@ -1232,15 +1232,15 @@ Index: pam.deb/modules/pam_namespace/namespace.conf.5
.\" Title: namespace.conf
.\" Author: [see the "AUTHORS" section]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 07/08/2010
+-.\" Date: 10/27/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/31/2010
++.\" Date: 06/04/2011
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "NAMESPACE\&.CONF" "5" "07/08/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
-+.TH "NAMESPACE\&.CONF" "5" "08/31/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
+-.TH "NAMESPACE\&.CONF" "5" "10/27/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
++.TH "NAMESPACE\&.CONF" "5" "06/04/2011" "Linux-PAM Manual" "Linux\-PAM Manual"
.\" -----------------------------------------------------------------
-.\" * (re)Define some macros
+.\" * Define some portability stuff
@@ -1537,15 +1537,15 @@ Index: pam.deb/modules/pam_time/time.conf.5
.\" Title: time.conf
.\" Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 07/08/2010
+-.\" Date: 10/27/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/31/2010
++.\" Date: 06/04/2011
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "TIME\&.CONF" "5" "07/08/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
-+.TH "TIME\&.CONF" "5" "08/31/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
+-.TH "TIME\&.CONF" "5" "10/27/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
++.TH "TIME\&.CONF" "5" "06/04/2011" "Linux-PAM Manual" "Linux\-PAM Manual"
.\" -----------------------------------------------------------------
-.\" * (re)Define some macros
+.\" * Define some portability stuff
@@ -1829,15 +1829,15 @@ Index: pam.deb/modules/pam_access/pam_access.8
.\" Title: pam_access
.\" Author: [see the "AUTHORS" section]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 07/08/2010
+-.\" Date: 10/27/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/31/2010
++.\" Date: 06/04/2011
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_ACCESS" "8" "07/08/2010" "Linux-PAM Manual" "Linux-PAM Manual"
-+.TH "PAM_ACCESS" "8" "08/31/2010" "Linux-PAM Manual" "Linux-PAM Manual"
+-.TH "PAM_ACCESS" "8" "10/27/2010" "Linux-PAM Manual" "Linux-PAM Manual"
++.TH "PAM_ACCESS" "8" "06/04/2011" "Linux-PAM Manual" "Linux-PAM Manual"
.\" -----------------------------------------------------------------
-.\" * (re)Define some macros
+.\" * Define some portability stuff
@@ -2089,15 +2089,15 @@ Index: pam.deb/modules/pam_cracklib/pam_cracklib.8
.\" Title: pam_cracklib
.\" Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 07/08/2010
+-.\" Date: 10/27/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/31/2010
++.\" Date: 06/04/2011
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_CRACKLIB" "8" "07/08/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
-+.TH "PAM_CRACKLIB" "8" "08/31/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
+-.TH "PAM_CRACKLIB" "8" "10/27/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
++.TH "PAM_CRACKLIB" "8" "06/04/2011" "Linux-PAM Manual" "Linux\-PAM Manual"
.\" -----------------------------------------------------------------
-.\" * (re)Define some macros
+.\" * Define some portability stuff
@@ -2409,15 +2409,15 @@ Index: pam.deb/modules/pam_debug/pam_debug.8
.\" Title: pam_debug
.\" Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 07/08/2010
+-.\" Date: 10/27/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/31/2010
++.\" Date: 06/04/2011
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_DEBUG" "8" "07/08/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
-+.TH "PAM_DEBUG" "8" "08/31/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
+-.TH "PAM_DEBUG" "8" "10/27/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
++.TH "PAM_DEBUG" "8" "06/04/2011" "Linux-PAM Manual" "Linux\-PAM Manual"
.\" -----------------------------------------------------------------
-.\" * (re)Define some macros
+.\" * Define some portability stuff
@@ -2652,15 +2652,15 @@ Index: pam.deb/modules/pam_deny/pam_deny.8
.\" Title: pam_deny
.\" Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 07/08/2010
+-.\" Date: 10/27/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/31/2010
++.\" Date: 06/04/2011
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_DENY" "8" "07/08/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
-+.TH "PAM_DENY" "8" "08/31/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
+-.TH "PAM_DENY" "8" "10/27/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
++.TH "PAM_DENY" "8" "06/04/2011" "Linux-PAM Manual" "Linux\-PAM Manual"
.\" -----------------------------------------------------------------
-.\" * (re)Define some macros
+.\" * Define some portability stuff
@@ -2899,15 +2899,15 @@ Index: pam.deb/modules/pam_echo/pam_echo.8
.\" Title: pam_echo
.\" Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 07/08/2010
+-.\" Date: 10/27/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/31/2010
++.\" Date: 06/04/2011
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_ECHO" "8" "07/08/2010" "Linux-PAM Manual" "Linux-PAM Manual"
-+.TH "PAM_ECHO" "8" "08/31/2010" "Linux-PAM Manual" "Linux-PAM Manual"
+-.TH "PAM_ECHO" "8" "10/27/2010" "Linux-PAM Manual" "Linux-PAM Manual"
++.TH "PAM_ECHO" "8" "06/04/2011" "Linux-PAM Manual" "Linux-PAM Manual"
.\" -----------------------------------------------------------------
-.\" * (re)Define some macros
+.\" * Define some portability stuff
@@ -3147,15 +3147,15 @@ Index: pam.deb/modules/pam_env/pam_env.8
.\" Title: pam_env
.\" Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 07/08/2010
+-.\" Date: 10/27/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/31/2010
++.\" Date: 06/04/2011
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_ENV" "8" "07/08/2010" "Linux-PAM Manual" "Linux-PAM Manual"
-+.TH "PAM_ENV" "8" "08/31/2010" "Linux-PAM Manual" "Linux-PAM Manual"
+-.TH "PAM_ENV" "8" "10/27/2010" "Linux-PAM Manual" "Linux-PAM Manual"
++.TH "PAM_ENV" "8" "06/04/2011" "Linux-PAM Manual" "Linux-PAM Manual"
.\" -----------------------------------------------------------------
-.\" * (re)Define some macros
+.\" * Define some portability stuff
@@ -3344,7 +3344,7 @@ Index: pam.deb/modules/pam_env/pam_env.8
by default)\&. You can change the default file to parse, with the
\fIenvfile\fR
flag and turn it on or off by setting the
-@@ -196,7 +55,7 @@
+@@ -198,7 +57,7 @@
\fBconffile=\fR\fB\fI/path/to/pam_env\&.conf\fR\fR
.RS 4
Indicate an alternative
@@ -3353,7 +3353,7 @@ Index: pam.deb/modules/pam_env/pam_env.8
style configuration file to override the default\&. This can be useful when different services need different environments\&.
.RE
.PP
-@@ -209,7 +68,7 @@
+@@ -211,7 +70,7 @@
\fBenvfile=\fR\fB\fI/path/to/environment\fR\fR
.RS 4
Indicate an alternative
@@ -3362,7 +3362,7 @@ Index: pam.deb/modules/pam_env/pam_env.8
file to override the default\&. This can be useful when different services need different environments\&.
.RE
.PP
-@@ -221,7 +80,7 @@
+@@ -223,7 +82,7 @@
\fBuser_envfile=\fR\fB\fIfilename\fR\fR
.RS 4
Indicate an alternative
@@ -3371,7 +3371,7 @@ Index: pam.deb/modules/pam_env/pam_env.8
file to override the default\&. This can be useful when different services need different environments\&. The filename is relative to the user home directory\&.
.RE
.PP
-@@ -259,17 +118,17 @@
+@@ -261,17 +120,17 @@
.RE
.SH "FILES"
.PP
@@ -3392,7 +3392,7 @@ Index: pam.deb/modules/pam_env/pam_env.8
.RS 4
User specific environment file
.RE
-@@ -278,7 +137,7 @@
+@@ -280,7 +139,7 @@
\fBpam_env.conf\fR(5),
\fBpam.d\fR(5),
@@ -3405,7 +3405,7 @@ Index: pam.deb/modules/pam_env/pam_env.8.xml
===================================================================
--- pam.deb.orig/modules/pam_env/pam_env.8.xml
+++ pam.deb/modules/pam_env/pam_env.8.xml
-@@ -231,7 +231,7 @@
+@@ -235,7 +235,7 @@
<refentrytitle>pam.d</refentrytitle><manvolnum>5</manvolnum>
</citerefentry>,
<citerefentry>
@@ -3423,15 +3423,15 @@ Index: pam.deb/modules/pam_exec/pam_exec.8
.\" Title: pam_exec
.\" Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 07/08/2010
+-.\" Date: 10/27/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/31/2010
++.\" Date: 06/04/2011
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_EXEC" "8" "07/08/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
-+.TH "PAM_EXEC" "8" "08/31/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
+-.TH "PAM_EXEC" "8" "10/27/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
++.TH "PAM_EXEC" "8" "06/04/2011" "Linux-PAM Manual" "Linux\-PAM Manual"
.\" -----------------------------------------------------------------
-.\" * (re)Define some macros
+.\" * Define some portability stuff
@@ -3611,7 +3611,7 @@ Index: pam.deb/modules/pam_exec/pam_exec.8
\fBpam_getenvlist\fR(3)
In addition, the following PAM items are exported as environment variables:
\fIPAM_RHOST\fR,
-@@ -210,7 +69,7 @@
+@@ -212,7 +71,7 @@
\fBlog=\fR\fB\fIfile\fR\fR
.RS 4
The output of the command is appended to
@@ -3620,7 +3620,7 @@ Index: pam.deb/modules/pam_exec/pam_exec.8
.RE
.PP
\fBquiet\fR
-@@ -256,30 +115,16 @@
+@@ -258,30 +117,16 @@
.SH "EXAMPLES"
.PP
Add the following line to
@@ -3652,7 +3652,7 @@ Index: pam.deb/modules/pam_exec/pam_exec.8
.if n \{\
.RE
.\}
-@@ -289,15 +134,9 @@
+@@ -291,15 +136,9 @@
.if n \{\
.RS 4
.\}
@@ -3668,7 +3668,7 @@ Index: pam.deb/modules/pam_exec/pam_exec.8
.if n \{\
.RE
.\}
-@@ -308,7 +147,7 @@
+@@ -310,7 +149,7 @@
\fBpam.conf\fR(5),
\fBpam.d\fR(5),
@@ -3681,7 +3681,7 @@ Index: pam.deb/modules/pam_exec/pam_exec.8.xml
===================================================================
--- pam.deb.orig/modules/pam_exec/pam_exec.8.xml
+++ pam.deb/modules/pam_exec/pam_exec.8.xml
-@@ -223,7 +223,7 @@
+@@ -228,7 +228,7 @@
<refentrytitle>pam.d</refentrytitle><manvolnum>5</manvolnum>
</citerefentry>,
<citerefentry>
@@ -3699,15 +3699,15 @@ Index: pam.deb/modules/pam_faildelay/pam_faildelay.8
.\" Title: pam_faildelay
.\" Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 07/08/2010
+-.\" Date: 10/27/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/31/2010
++.\" Date: 06/04/2011
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_FAILDELAY" "8" "07/08/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
-+.TH "PAM_FAILDELAY" "8" "08/31/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
+-.TH "PAM_FAILDELAY" "8" "10/27/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
++.TH "PAM_FAILDELAY" "8" "06/04/2011" "Linux-PAM Manual" "Linux\-PAM Manual"
.\" -----------------------------------------------------------------
-.\" * (re)Define some macros
+.\" * Define some portability stuff
@@ -3946,15 +3946,15 @@ Index: pam.deb/modules/pam_filter/pam_filter.8
.\" Title: pam_filter
.\" Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 07/08/2010
+-.\" Date: 10/27/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/31/2010
++.\" Date: 06/04/2011
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_FILTER" "8" "07/08/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
-+.TH "PAM_FILTER" "8" "08/31/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
+-.TH "PAM_FILTER" "8" "10/27/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
++.TH "PAM_FILTER" "8" "06/04/2011" "Linux-PAM Manual" "Linux\-PAM Manual"
.\" -----------------------------------------------------------------
-.\" * (re)Define some macros
+.\" * Define some portability stuff
@@ -4209,15 +4209,15 @@ Index: pam.deb/modules/pam_ftp/pam_ftp.8
.\" Title: pam_ftp
.\" Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 07/08/2010
+-.\" Date: 10/27/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/31/2010
++.\" Date: 06/04/2011
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_FTP" "8" "07/08/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
-+.TH "PAM_FTP" "8" "08/31/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
+-.TH "PAM_FTP" "8" "10/27/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
++.TH "PAM_FTP" "8" "06/04/2011" "Linux-PAM Manual" "Linux\-PAM Manual"
.\" -----------------------------------------------------------------
-.\" * (re)Define some macros
+.\" * Define some portability stuff
@@ -4469,15 +4469,15 @@ Index: pam.deb/modules/pam_group/pam_group.8
.\" Title: pam_group
.\" Author: [see the "AUTHORS" section]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 07/08/2010
+-.\" Date: 10/27/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/31/2010
++.\" Date: 06/04/2011
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_GROUP" "8" "07/08/2010" "Linux-PAM Manual" "Linux-PAM Manual"
-+.TH "PAM_GROUP" "8" "08/31/2010" "Linux-PAM Manual" "Linux-PAM Manual"
+-.TH "PAM_GROUP" "8" "10/27/2010" "Linux-PAM Manual" "Linux-PAM Manual"
++.TH "PAM_GROUP" "8" "06/04/2011" "Linux-PAM Manual" "Linux-PAM Manual"
.\" -----------------------------------------------------------------
-.\" * (re)Define some macros
+.\" * Define some portability stuff
@@ -4715,15 +4715,15 @@ Index: pam.deb/modules/pam_issue/pam_issue.8
.\" Title: pam_issue
.\" Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 07/08/2010
+-.\" Date: 10/27/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/31/2010
++.\" Date: 06/04/2011
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_ISSUE" "8" "07/08/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
-+.TH "PAM_ISSUE" "8" "08/31/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
+-.TH "PAM_ISSUE" "8" "10/27/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
++.TH "PAM_ISSUE" "8" "06/04/2011" "Linux-PAM Manual" "Linux\-PAM Manual"
.\" -----------------------------------------------------------------
-.\" * (re)Define some macros
+.\" * Define some portability stuff
@@ -4973,15 +4973,15 @@ Index: pam.deb/modules/pam_keyinit/pam_keyinit.8
.\" Title: pam_keyinit
.\" Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 07/08/2010
+-.\" Date: 10/27/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/31/2010
++.\" Date: 06/04/2011
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_KEYINIT" "8" "07/08/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
-+.TH "PAM_KEYINIT" "8" "08/31/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
+-.TH "PAM_KEYINIT" "8" "10/27/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
++.TH "PAM_KEYINIT" "8" "06/04/2011" "Linux-PAM Manual" "Linux\-PAM Manual"
.\" -----------------------------------------------------------------
-.\" * (re)Define some macros
+.\" * Define some portability stuff
@@ -5232,15 +5232,15 @@ Index: pam.deb/modules/pam_lastlog/pam_lastlog.8
.\" Title: pam_lastlog
.\" Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 07/08/2010
+-.\" Date: 10/27/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/31/2010
++.\" Date: 06/04/2011
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_LASTLOG" "8" "07/08/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
-+.TH "PAM_LASTLOG" "8" "08/31/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
+-.TH "PAM_LASTLOG" "8" "10/27/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
++.TH "PAM_LASTLOG" "8" "06/04/2011" "Linux-PAM Manual" "Linux\-PAM Manual"
.\" -----------------------------------------------------------------
-.\" * (re)Define some macros
+.\" * Define some portability stuff
@@ -5539,15 +5539,15 @@ Index: pam.deb/modules/pam_limits/pam_limits.8
.\" Title: pam_limits
.\" Author: [see the "AUTHORS" section]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 07/08/2010
+-.\" Date: 10/27/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/31/2010
++.\" Date: 06/04/2011
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_LIMITS" "8" "07/08/2010" "Linux-PAM Manual" "Linux-PAM Manual"
-+.TH "PAM_LIMITS" "8" "08/31/2010" "Linux-PAM Manual" "Linux-PAM Manual"
+-.TH "PAM_LIMITS" "8" "10/27/2010" "Linux-PAM Manual" "Linux-PAM Manual"
++.TH "PAM_LIMITS" "8" "06/04/2011" "Linux-PAM Manual" "Linux-PAM Manual"
.\" -----------------------------------------------------------------
-.\" * (re)Define some macros
+.\" * Define some portability stuff
@@ -5808,15 +5808,15 @@ Index: pam.deb/modules/pam_listfile/pam_listfile.8
.\" Title: pam_listfile
.\" Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 07/08/2010
+-.\" Date: 10/27/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/31/2010
++.\" Date: 06/04/2011
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_LISTFILE" "8" "07/08/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
-+.TH "PAM_LISTFILE" "8" "08/31/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
+-.TH "PAM_LISTFILE" "8" "10/27/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
++.TH "PAM_LISTFILE" "8" "06/04/2011" "Linux-PAM Manual" "Linux\-PAM Manual"
.\" -----------------------------------------------------------------
-.\" * (re)Define some macros
+.\" * Define some portability stuff
@@ -6126,15 +6126,15 @@ Index: pam.deb/modules/pam_localuser/pam_localuser.8
.\" Title: pam_localuser
.\" Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 07/08/2010
+-.\" Date: 10/27/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/31/2010
++.\" Date: 06/04/2011
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_LOCALUSER" "8" "07/08/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
-+.TH "PAM_LOCALUSER" "8" "08/31/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
+-.TH "PAM_LOCALUSER" "8" "10/27/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
++.TH "PAM_LOCALUSER" "8" "06/04/2011" "Linux-PAM Manual" "Linux\-PAM Manual"
.\" -----------------------------------------------------------------
-.\" * (re)Define some macros
+.\" * Define some portability stuff
@@ -6396,15 +6396,15 @@ Index: pam.deb/modules/pam_loginuid/pam_loginuid.8
.\" Title: pam_loginuid
.\" Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 07/08/2010
+-.\" Date: 10/27/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/31/2010
++.\" Date: 06/04/2011
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_LOGINUID" "8" "07/08/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
-+.TH "PAM_LOGINUID" "8" "08/31/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
+-.TH "PAM_LOGINUID" "8" "10/27/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
++.TH "PAM_LOGINUID" "8" "06/04/2011" "Linux-PAM Manual" "Linux\-PAM Manual"
.\" -----------------------------------------------------------------
-.\" * (re)Define some macros
+.\" * Define some portability stuff
@@ -6640,15 +6640,15 @@ Index: pam.deb/modules/pam_mail/pam_mail.8
.\" Title: pam_mail
.\" Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 07/08/2010
+-.\" Date: 10/27/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/31/2010
++.\" Date: 06/04/2011
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_MAIL" "8" "07/08/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
-+.TH "PAM_MAIL" "8" "08/31/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
+-.TH "PAM_MAIL" "8" "10/27/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
++.TH "PAM_MAIL" "8" "06/04/2011" "Linux-PAM Manual" "Linux\-PAM Manual"
.\" -----------------------------------------------------------------
-.\" * (re)Define some macros
+.\" * Define some portability stuff
@@ -6941,15 +6941,15 @@ Index: pam.deb/modules/pam_mkhomedir/pam_mkhomedir.8
.\" Title: pam_mkhomedir
.\" Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 07/08/2010
+-.\" Date: 10/27/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/31/2010
++.\" Date: 06/04/2011
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_MKHOMEDIR" "8" "07/08/2010" "Linux-PAM Manual" "Linux-PAM Manual"
-+.TH "PAM_MKHOMEDIR" "8" "08/31/2010" "Linux-PAM Manual" "Linux-PAM Manual"
+-.TH "PAM_MKHOMEDIR" "8" "10/27/2010" "Linux-PAM Manual" "Linux-PAM Manual"
++.TH "PAM_MKHOMEDIR" "8" "06/04/2011" "Linux-PAM Manual" "Linux-PAM Manual"
.\" -----------------------------------------------------------------
-.\" * (re)Define some macros
+.\" * Define some portability stuff
@@ -7218,15 +7218,15 @@ Index: pam.deb/modules/pam_motd/pam_motd.8
.\" Title: pam_motd
.\" Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 07/08/2010
+-.\" Date: 10/27/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/31/2010
++.\" Date: 06/04/2011
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_MOTD" "8" "07/08/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
-+.TH "PAM_MOTD" "8" "08/31/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
+-.TH "PAM_MOTD" "8" "10/27/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
++.TH "PAM_MOTD" "8" "06/04/2011" "Linux-PAM Manual" "Linux\-PAM Manual"
.\" -----------------------------------------------------------------
-.\" * (re)Define some macros
+.\" * Define some portability stuff
@@ -7476,15 +7476,15 @@ Index: pam.deb/modules/pam_namespace/pam_namespace.8
.\" Title: pam_namespace
.\" Author: [see the "AUTHORS" section]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 07/08/2010
+-.\" Date: 10/27/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/31/2010
++.\" Date: 06/04/2011
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_NAMESPACE" "8" "07/08/2010" "Linux-PAM Manual" "Linux-PAM Manual"
-+.TH "PAM_NAMESPACE" "8" "08/31/2010" "Linux-PAM Manual" "Linux-PAM Manual"
+-.TH "PAM_NAMESPACE" "8" "10/27/2010" "Linux-PAM Manual" "Linux-PAM Manual"
++.TH "PAM_NAMESPACE" "8" "06/04/2011" "Linux-PAM Manual" "Linux-PAM Manual"
.\" -----------------------------------------------------------------
-.\" * (re)Define some macros
+.\" * Define some portability stuff
@@ -7756,15 +7756,15 @@ Index: pam.deb/modules/pam_nologin/pam_nologin.8
.\" Title: pam_nologin
.\" Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 08/30/2010
+-.\" Date: 10/27/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/31/2010
++.\" Date: 06/04/2011
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_NOLOGIN" "8" "08/30/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
-+.TH "PAM_NOLOGIN" "8" "08/31/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
+-.TH "PAM_NOLOGIN" "8" "10/27/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
++.TH "PAM_NOLOGIN" "8" "06/04/2011" "Linux-PAM Manual" "Linux\-PAM Manual"
.\" -----------------------------------------------------------------
-.\" * (re)Define some macros
+.\" * Define some portability stuff
@@ -8028,15 +8028,15 @@ Index: pam.deb/modules/pam_permit/pam_permit.8
.\" Title: pam_permit
.\" Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 07/08/2010
+-.\" Date: 10/27/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/31/2010
++.\" Date: 06/04/2011
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_PERMIT" "8" "07/08/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
-+.TH "PAM_PERMIT" "8" "08/31/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
+-.TH "PAM_PERMIT" "8" "10/27/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
++.TH "PAM_PERMIT" "8" "06/04/2011" "Linux-PAM Manual" "Linux\-PAM Manual"
.\" -----------------------------------------------------------------
-.\" * (re)Define some macros
+.\" * Define some portability stuff
@@ -8275,15 +8275,15 @@ Index: pam.deb/modules/pam_rhosts/pam_rhosts.8
.\" Title: pam_rhosts
.\" Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 07/08/2010
+-.\" Date: 10/27/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/31/2010
++.\" Date: 06/04/2011
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_RHOSTS" "8" "07/08/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
-+.TH "PAM_RHOSTS" "8" "08/31/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
+-.TH "PAM_RHOSTS" "8" "10/27/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
++.TH "PAM_RHOSTS" "8" "06/04/2011" "Linux-PAM Manual" "Linux\-PAM Manual"
.\" -----------------------------------------------------------------
-.\" * (re)Define some macros
+.\" * Define some portability stuff
@@ -8566,15 +8566,15 @@ Index: pam.deb/modules/pam_rootok/pam_rootok.8
.\" Title: pam_rootok
.\" Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 07/08/2010
+-.\" Date: 10/27/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/31/2010
++.\" Date: 06/04/2011
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_ROOTOK" "8" "07/08/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
-+.TH "PAM_ROOTOK" "8" "08/31/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
+-.TH "PAM_ROOTOK" "8" "10/27/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
++.TH "PAM_ROOTOK" "8" "06/04/2011" "Linux-PAM Manual" "Linux\-PAM Manual"
.\" -----------------------------------------------------------------
-.\" * (re)Define some macros
+.\" * Define some portability stuff
@@ -8813,15 +8813,15 @@ Index: pam.deb/modules/pam_securetty/pam_securetty.8
.\" Title: pam_securetty
.\" Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 07/08/2010
+-.\" Date: 10/27/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/31/2010
++.\" Date: 06/04/2011
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_SECURETTY" "8" "07/08/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
-+.TH "PAM_SECURETTY" "8" "08/31/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
+-.TH "PAM_SECURETTY" "8" "10/27/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
++.TH "PAM_SECURETTY" "8" "06/04/2011" "Linux-PAM Manual" "Linux\-PAM Manual"
.\" -----------------------------------------------------------------
-.\" * (re)Define some macros
+.\" * Define some portability stuff
@@ -9591,15 +9591,15 @@ Index: pam.deb/modules/pam_shells/pam_shells.8
.\" Title: pam_shells
.\" Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 07/08/2010
+-.\" Date: 10/27/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/31/2010
++.\" Date: 06/04/2011
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_SHELLS" "8" "07/08/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
-+.TH "PAM_SHELLS" "8" "08/31/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
+-.TH "PAM_SHELLS" "8" "10/27/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
++.TH "PAM_SHELLS" "8" "06/04/2011" "Linux-PAM Manual" "Linux\-PAM Manual"
.\" -----------------------------------------------------------------
-.\" * (re)Define some macros
+.\" * Define some portability stuff
@@ -9847,15 +9847,15 @@ Index: pam.deb/modules/pam_succeed_if/pam_succeed_if.8
.\" Title: pam_succeed_if
.\" Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 07/08/2010
+-.\" Date: 10/27/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/31/2010
++.\" Date: 06/04/2011
.\" Manual: Linux-PAM
.\" Source: Linux-PAM
.\" Language: English
.\"
--.TH "PAM_SUCCEED_IF" "8" "07/08/2010" "Linux-PAM" "Linux\-PAM"
-+.TH "PAM_SUCCEED_IF" "8" "08/31/2010" "Linux-PAM" "Linux\-PAM"
+-.TH "PAM_SUCCEED_IF" "8" "10/27/2010" "Linux-PAM" "Linux\-PAM"
++.TH "PAM_SUCCEED_IF" "8" "06/04/2011" "Linux-PAM" "Linux\-PAM"
.\" -----------------------------------------------------------------
-.\" * (re)Define some macros
+.\" * Define some portability stuff
@@ -10141,15 +10141,15 @@ Index: pam.deb/modules/pam_tally/pam_tally.8
.\" Title: pam_tally
.\" Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 08/09/2010
+-.\" Date: 10/27/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/31/2010
++.\" Date: 06/04/2011
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_TALLY" "8" "08/09/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
-+.TH "PAM_TALLY" "8" "08/31/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
+-.TH "PAM_TALLY" "8" "10/27/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
++.TH "PAM_TALLY" "8" "06/04/2011" "Linux-PAM Manual" "Linux\-PAM Manual"
.\" -----------------------------------------------------------------
-.\" * (re)Define some macros
+.\" * Define some portability stuff
@@ -10503,15 +10503,15 @@ Index: pam.deb/modules/pam_time/pam_time.8
.\" Title: pam_time
.\" Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 07/08/2010
+-.\" Date: 10/27/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/31/2010
++.\" Date: 06/04/2011
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_TIME" "8" "07/08/2010" "Linux-PAM Manual" "Linux-PAM Manual"
-+.TH "PAM_TIME" "8" "08/31/2010" "Linux-PAM Manual" "Linux-PAM Manual"
+-.TH "PAM_TIME" "8" "10/27/2010" "Linux-PAM Manual" "Linux-PAM Manual"
++.TH "PAM_TIME" "8" "06/04/2011" "Linux-PAM Manual" "Linux-PAM Manual"
.\" -----------------------------------------------------------------
-.\" * (re)Define some macros
+.\" * Define some portability stuff
@@ -10761,15 +10761,15 @@ Index: pam.deb/modules/pam_umask/pam_umask.8
.\" Title: pam_umask
.\" Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 07/08/2010
+-.\" Date: 10/27/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/31/2010
++.\" Date: 06/04/2011
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_UMASK" "8" "07/08/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
-+.TH "PAM_UMASK" "8" "08/31/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
+-.TH "PAM_UMASK" "8" "10/27/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
++.TH "PAM_UMASK" "8" "06/04/2011" "Linux-PAM Manual" "Linux\-PAM Manual"
.\" -----------------------------------------------------------------
-.\" * (re)Define some macros
+.\" * Define some portability stuff
@@ -11058,15 +11058,15 @@ Index: pam.deb/doc/man/misc_conv.3
.\" Title: misc_conv
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 04/01/2010
+-.\" Date: 10/27/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/31/2010
++.\" Date: 06/04/2011
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "MISC_CONV" "3" "04/01/2010" "Linux-PAM Manual" "Linux-PAM Manual"
-+.TH "MISC_CONV" "3" "08/31/2010" "Linux-PAM Manual" "Linux-PAM Manual"
+-.TH "MISC_CONV" "3" "10/27/2010" "Linux-PAM Manual" "Linux-PAM Manual"
++.TH "MISC_CONV" "3" "06/04/2011" "Linux-PAM Manual" "Linux-PAM Manual"
.\" -----------------------------------------------------------------
-.\" * (re)Define some macros
+.\" * Define some portability stuff
@@ -11281,15 +11281,15 @@ Index: pam.deb/doc/man/pam_acct_mgmt.3
.\" Title: pam_acct_mgmt
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 04/01/2010
+-.\" Date: 10/27/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/31/2010
++.\" Date: 06/04/2011
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_ACCT_MGMT" "3" "04/01/2010" "Linux-PAM Manual" "Linux-PAM Manual"
-+.TH "PAM_ACCT_MGMT" "3" "08/31/2010" "Linux-PAM Manual" "Linux-PAM Manual"
+-.TH "PAM_ACCT_MGMT" "3" "10/27/2010" "Linux-PAM Manual" "Linux-PAM Manual"
++.TH "PAM_ACCT_MGMT" "3" "06/04/2011" "Linux-PAM Manual" "Linux-PAM Manual"
.\" -----------------------------------------------------------------
-.\" * (re)Define some macros
+.\" * Define some portability stuff
@@ -11501,15 +11501,15 @@ Index: pam.deb/doc/man/pam_authenticate.3
.\" Title: pam_authenticate
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 04/01/2010
+-.\" Date: 10/27/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/31/2010
++.\" Date: 06/04/2011
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_AUTHENTICATE" "3" "04/01/2010" "Linux-PAM Manual" "Linux-PAM Manual"
-+.TH "PAM_AUTHENTICATE" "3" "08/31/2010" "Linux-PAM Manual" "Linux-PAM Manual"
+-.TH "PAM_AUTHENTICATE" "3" "10/27/2010" "Linux-PAM Manual" "Linux-PAM Manual"
++.TH "PAM_AUTHENTICATE" "3" "06/04/2011" "Linux-PAM Manual" "Linux-PAM Manual"
.\" -----------------------------------------------------------------
-.\" * (re)Define some macros
+.\" * Define some portability stuff
@@ -11721,15 +11721,15 @@ Index: pam.deb/doc/man/pam_chauthtok.3
.\" Title: pam_chauthtok
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 04/01/2010
+-.\" Date: 10/27/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/31/2010
++.\" Date: 06/04/2011
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_CHAUTHTOK" "3" "04/01/2010" "Linux-PAM Manual" "Linux-PAM Manual"
-+.TH "PAM_CHAUTHTOK" "3" "08/31/2010" "Linux-PAM Manual" "Linux-PAM Manual"
+-.TH "PAM_CHAUTHTOK" "3" "10/27/2010" "Linux-PAM Manual" "Linux-PAM Manual"
++.TH "PAM_CHAUTHTOK" "3" "06/04/2011" "Linux-PAM Manual" "Linux-PAM Manual"
.\" -----------------------------------------------------------------
-.\" * (re)Define some macros
+.\" * Define some portability stuff
@@ -11950,15 +11950,15 @@ Index: pam.deb/doc/man/pam_conv.3
.\" Title: pam_conv
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 04/01/2010
+-.\" Date: 10/27/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/31/2010
++.\" Date: 06/04/2011
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_CONV" "3" "04/01/2010" "Linux-PAM Manual" "Linux-PAM Manual"
-+.TH "PAM_CONV" "3" "08/31/2010" "Linux-PAM Manual" "Linux-PAM Manual"
+-.TH "PAM_CONV" "3" "10/27/2010" "Linux-PAM Manual" "Linux-PAM Manual"
++.TH "PAM_CONV" "3" "06/04/2011" "Linux-PAM Manual" "Linux-PAM Manual"
.\" -----------------------------------------------------------------
-.\" * (re)Define some macros
+.\" * Define some portability stuff
@@ -12230,15 +12230,15 @@ Index: pam.deb/doc/man/pam_error.3
.\" Title: pam_error
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 04/01/2010
+-.\" Date: 10/27/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/31/2010
++.\" Date: 06/04/2011
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_ERROR" "3" "04/01/2010" "Linux-PAM Manual" "Linux-PAM Manual"
-+.TH "PAM_ERROR" "3" "08/31/2010" "Linux-PAM Manual" "Linux-PAM Manual"
+-.TH "PAM_ERROR" "3" "10/27/2010" "Linux-PAM Manual" "Linux-PAM Manual"
++.TH "PAM_ERROR" "3" "06/04/2011" "Linux-PAM Manual" "Linux-PAM Manual"
.\" -----------------------------------------------------------------
-.\" * (re)Define some macros
+.\" * Define some portability stuff
@@ -12457,15 +12457,15 @@ Index: pam.deb/doc/man/pam_getenv.3
.\" Title: pam_getenv
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 04/01/2010
+-.\" Date: 10/27/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/31/2010
++.\" Date: 06/04/2011
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_GETENV" "3" "04/01/2010" "Linux-PAM Manual" "Linux-PAM Manual"
-+.TH "PAM_GETENV" "3" "08/31/2010" "Linux-PAM Manual" "Linux-PAM Manual"
+-.TH "PAM_GETENV" "3" "10/27/2010" "Linux-PAM Manual" "Linux-PAM Manual"
++.TH "PAM_GETENV" "3" "06/04/2011" "Linux-PAM Manual" "Linux-PAM Manual"
.\" -----------------------------------------------------------------
-.\" * (re)Define some macros
+.\" * Define some portability stuff
@@ -12677,15 +12677,15 @@ Index: pam.deb/doc/man/pam_getenvlist.3
.\" Title: pam_getenvlist
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 04/01/2010
+-.\" Date: 10/27/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/31/2010
++.\" Date: 06/04/2011
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_GETENVLIST" "3" "04/01/2010" "Linux-PAM Manual" "Linux-PAM Manual"
-+.TH "PAM_GETENVLIST" "3" "08/31/2010" "Linux-PAM Manual" "Linux-PAM Manual"
+-.TH "PAM_GETENVLIST" "3" "10/27/2010" "Linux-PAM Manual" "Linux-PAM Manual"
++.TH "PAM_GETENVLIST" "3" "06/04/2011" "Linux-PAM Manual" "Linux-PAM Manual"
.\" -----------------------------------------------------------------
-.\" * (re)Define some macros
+.\" * Define some portability stuff
@@ -12909,15 +12909,15 @@ Index: pam.deb/doc/man/pam_info.3
.\" Title: pam_info
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 04/01/2010
+-.\" Date: 10/27/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/31/2010
++.\" Date: 06/04/2011
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_INFO" "3" "04/01/2010" "Linux-PAM Manual" "Linux-PAM Manual"
-+.TH "PAM_INFO" "3" "08/31/2010" "Linux-PAM Manual" "Linux-PAM Manual"
+-.TH "PAM_INFO" "3" "10/27/2010" "Linux-PAM Manual" "Linux-PAM Manual"
++.TH "PAM_INFO" "3" "06/04/2011" "Linux-PAM Manual" "Linux-PAM Manual"
.\" -----------------------------------------------------------------
-.\" * (re)Define some macros
+.\" * Define some portability stuff
@@ -13136,15 +13136,15 @@ Index: pam.deb/doc/man/pam_misc_drop_env.3
.\" Title: pam_misc_drop_env
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 04/01/2010
+-.\" Date: 10/27/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/31/2010
++.\" Date: 06/04/2011
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_MISC_DROP_ENV" "3" "04/01/2010" "Linux-PAM Manual" "Linux-PAM Manual"
-+.TH "PAM_MISC_DROP_ENV" "3" "08/31/2010" "Linux-PAM Manual" "Linux-PAM Manual"
+-.TH "PAM_MISC_DROP_ENV" "3" "10/27/2010" "Linux-PAM Manual" "Linux-PAM Manual"
++.TH "PAM_MISC_DROP_ENV" "3" "06/04/2011" "Linux-PAM Manual" "Linux-PAM Manual"
.\" -----------------------------------------------------------------
-.\" * (re)Define some macros
+.\" * Define some portability stuff
@@ -13359,15 +13359,15 @@ Index: pam.deb/doc/man/pam_misc_paste_env.3
.\" Title: pam_misc_paste_env
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 04/01/2010
+-.\" Date: 10/27/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/31/2010
++.\" Date: 06/04/2011
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_MISC_PASTE_ENV" "3" "04/01/2010" "Linux-PAM Manual" "Linux-PAM Manual"
-+.TH "PAM_MISC_PASTE_ENV" "3" "08/31/2010" "Linux-PAM Manual" "Linux-PAM Manual"
+-.TH "PAM_MISC_PASTE_ENV" "3" "10/27/2010" "Linux-PAM Manual" "Linux-PAM Manual"
++.TH "PAM_MISC_PASTE_ENV" "3" "06/04/2011" "Linux-PAM Manual" "Linux-PAM Manual"
.\" -----------------------------------------------------------------
-.\" * (re)Define some macros
+.\" * Define some portability stuff
@@ -13582,15 +13582,15 @@ Index: pam.deb/doc/man/pam_misc_setenv.3
.\" Title: pam_misc_setenv
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 04/01/2010
+-.\" Date: 10/27/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/31/2010
++.\" Date: 06/04/2011
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_MISC_SETENV" "3" "04/01/2010" "Linux-PAM Manual" "Linux-PAM Manual"
-+.TH "PAM_MISC_SETENV" "3" "08/31/2010" "Linux-PAM Manual" "Linux-PAM Manual"
+-.TH "PAM_MISC_SETENV" "3" "10/27/2010" "Linux-PAM Manual" "Linux-PAM Manual"
++.TH "PAM_MISC_SETENV" "3" "06/04/2011" "Linux-PAM Manual" "Linux-PAM Manual"
.\" -----------------------------------------------------------------
-.\" * (re)Define some macros
+.\" * Define some portability stuff
@@ -13813,15 +13813,15 @@ Index: pam.deb/doc/man/pam_prompt.3
.\" Title: pam_prompt
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 04/01/2010
+-.\" Date: 10/27/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/31/2010
++.\" Date: 06/04/2011
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_PROMPT" "3" "04/01/2010" "Linux-PAM Manual" "Linux-PAM Manual"
-+.TH "PAM_PROMPT" "3" "08/31/2010" "Linux-PAM Manual" "Linux-PAM Manual"
+-.TH "PAM_PROMPT" "3" "10/27/2010" "Linux-PAM Manual" "Linux-PAM Manual"
++.TH "PAM_PROMPT" "3" "06/04/2011" "Linux-PAM Manual" "Linux-PAM Manual"
.\" -----------------------------------------------------------------
-.\" * (re)Define some macros
+.\" * Define some portability stuff
@@ -14040,15 +14040,15 @@ Index: pam.deb/doc/man/pam_putenv.3
.\" Title: pam_putenv
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 04/01/2010
+-.\" Date: 10/27/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/31/2010
++.\" Date: 06/04/2011
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_PUTENV" "3" "04/01/2010" "Linux-PAM Manual" "Linux-PAM Manual"
-+.TH "PAM_PUTENV" "3" "08/31/2010" "Linux-PAM Manual" "Linux-PAM Manual"
+-.TH "PAM_PUTENV" "3" "10/27/2010" "Linux-PAM Manual" "Linux-PAM Manual"
++.TH "PAM_PUTENV" "3" "06/04/2011" "Linux-PAM Manual" "Linux-PAM Manual"
.\" -----------------------------------------------------------------
-.\" * (re)Define some macros
+.\" * Define some portability stuff
@@ -14269,15 +14269,15 @@ Index: pam.deb/doc/man/pam_strerror.3
.\" Title: pam_strerror
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 04/01/2010
+-.\" Date: 10/27/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/31/2010
++.\" Date: 06/04/2011
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_STRERROR" "3" "04/01/2010" "Linux-PAM Manual" "Linux-PAM Manual"
-+.TH "PAM_STRERROR" "3" "08/31/2010" "Linux-PAM Manual" "Linux-PAM Manual"
+-.TH "PAM_STRERROR" "3" "10/27/2010" "Linux-PAM Manual" "Linux-PAM Manual"
++.TH "PAM_STRERROR" "3" "06/04/2011" "Linux-PAM Manual" "Linux-PAM Manual"
.\" -----------------------------------------------------------------
-.\" * (re)Define some macros
+.\" * Define some portability stuff
@@ -14489,15 +14489,15 @@ Index: pam.deb/doc/man/pam_syslog.3
.\" Title: pam_syslog
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 04/01/2010
+-.\" Date: 10/27/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/31/2010
++.\" Date: 06/04/2011
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_SYSLOG" "3" "04/01/2010" "Linux-PAM Manual" "Linux-PAM Manual"
-+.TH "PAM_SYSLOG" "3" "08/31/2010" "Linux-PAM Manual" "Linux-PAM Manual"
+-.TH "PAM_SYSLOG" "3" "10/27/2010" "Linux-PAM Manual" "Linux-PAM Manual"
++.TH "PAM_SYSLOG" "3" "06/04/2011" "Linux-PAM Manual" "Linux-PAM Manual"
.\" -----------------------------------------------------------------
-.\" * (re)Define some macros
+.\" * Define some portability stuff
@@ -14726,15 +14726,15 @@ Index: pam.deb/modules/pam_userdb/pam_userdb.8
.\" Title: pam_userdb
.\" Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 07/08/2010
+-.\" Date: 10/27/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/31/2010
++.\" Date: 06/04/2011
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_USERDB" "8" "07/08/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
-+.TH "PAM_USERDB" "8" "08/31/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
+-.TH "PAM_USERDB" "8" "10/27/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
++.TH "PAM_USERDB" "8" "06/04/2011" "Linux-PAM Manual" "Linux\-PAM Manual"
.\" -----------------------------------------------------------------
-.\" * (re)Define some macros
+.\" * Define some portability stuff
@@ -14991,15 +14991,15 @@ Index: pam.deb/modules/pam_warn/pam_warn.8
.\" Title: pam_warn
.\" Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 07/08/2010
+-.\" Date: 10/27/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/31/2010
++.\" Date: 06/04/2011
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_WARN" "8" "07/08/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
-+.TH "PAM_WARN" "8" "08/31/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
+-.TH "PAM_WARN" "8" "10/27/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
++.TH "PAM_WARN" "8" "06/04/2011" "Linux-PAM Manual" "Linux\-PAM Manual"
.\" -----------------------------------------------------------------
-.\" * (re)Define some macros
+.\" * Define some portability stuff
@@ -15264,15 +15264,15 @@ Index: pam.deb/modules/pam_xauth/pam_xauth.8
.\" Title: pam_xauth
.\" Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 07/08/2010
+-.\" Date: 10/27/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/31/2010
++.\" Date: 06/04/2011
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_XAUTH" "8" "07/08/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
-+.TH "PAM_XAUTH" "8" "08/31/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
+-.TH "PAM_XAUTH" "8" "10/27/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
++.TH "PAM_XAUTH" "8" "06/04/2011" "Linux-PAM Manual" "Linux\-PAM Manual"
.\" -----------------------------------------------------------------
-.\" * (re)Define some macros
+.\" * Define some portability stuff
diff --git a/debian/patches-applied/autoconf.patch b/debian/patches-applied/autoconf.patch
index 70866bea..11d3135b 100644
--- a/debian/patches-applied/autoconf.patch
+++ b/debian/patches-applied/autoconf.patch
@@ -7,10 +7,10 @@ The process for refreshing this patch is:
quilt refresh
find . -name '*.rej' | xargs rm
-Index: pam.debian/ltmain.sh
+Index: pam.deb/ltmain.sh
===================================================================
---- pam.debian.orig/ltmain.sh
-+++ pam.debian/ltmain.sh
+--- pam.deb.orig/ltmain.sh
++++ pam.deb/ltmain.sh
@@ -1,6 +1,6 @@
# Generated from ltmain.m4sh.
@@ -120,10 +120,10 @@ Index: pam.debian/ltmain.sh
esac
;;
no)
-Index: pam.debian/m4/libtool.m4
+Index: pam.deb/m4/libtool.m4
===================================================================
---- pam.debian.orig/m4/libtool.m4
-+++ pam.debian/m4/libtool.m4
+--- pam.deb.orig/m4/libtool.m4
++++ pam.deb/m4/libtool.m4
@@ -2445,7 +2445,7 @@
;;
@@ -265,13 +265,13 @@ Index: pam.debian/m4/libtool.m4
case $cc_basename in
KCC*)
# Kuck and Associates, Inc. (KAI) C++ Compiler
-Index: pam.debian/aclocal.m4
+Index: pam.deb/aclocal.m4
===================================================================
---- pam.debian.orig/aclocal.m4
-+++ pam.debian/aclocal.m4
+--- pam.deb.orig/aclocal.m4
++++ pam.deb/aclocal.m4
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
-+# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
++# generated automatically by aclocal 1.10.3 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
@@ -285,8 +285,8 @@ Index: pam.debian/aclocal.m4
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(AC_AUTOCONF_VERSION, [2.63],,
-[m4_warning([this file was generated for autoconf 2.63.
-+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
-+[m4_warning([this file was generated for autoconf 2.65.
++m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],,
++[m4_warning([this file was generated for autoconf 2.67.
You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically `autoreconf'.])])
@@ -296,16 +296,12 @@ Index: pam.debian/aclocal.m4
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
-@@ -31,10 +31,10 @@
- # 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'
-+[am__api_version='1.11'
+@@ -34,7 +34,7 @@
+ [am__api_version='1.10'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.10.1], [],
-+m4_if([$1], [1.11.1], [],
++m4_if([$1], [1.10.3], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -317,7 +313,7 @@ Index: pam.debian/aclocal.m4
+# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.10.1])dnl
-+[AM_AUTOMAKE_VERSION([1.11.1])dnl
++[AM_AUTOMAKE_VERSION([1.10.3])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
@@ -325,32 +321,7 @@ Index: pam.debian/aclocal.m4
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-@@ -110,14 +110,14 @@
-
- # AM_CONDITIONAL -*- Autoconf -*-
-
--# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
-+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
- # Free Software Foundation, Inc.
- #
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-
--# serial 8
-+# serial 9
-
- # AM_CONDITIONAL(NAME, SHELL-CONDITION)
- # -------------------------------------
-@@ -130,6 +130,7 @@
- AC_SUBST([$1_FALSE])dnl
- _AM_SUBST_NOTMAKE([$1_TRUE])dnl
- _AM_SUBST_NOTMAKE([$1_FALSE])dnl
-+m4_define([_AM_COND_VALUE_$1], [$2])dnl
- if $2; then
- $1_TRUE=
- $1_FALSE='#'
-@@ -143,14 +144,14 @@
+@@ -143,14 +143,14 @@
Usually this means the macro was only invoked conditionally.]])
fi])])
@@ -367,7 +338,7 @@ Index: pam.debian/aclocal.m4
# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
# written in clear, in which case automake, when reading aclocal.m4,
-@@ -207,6 +208,16 @@
+@@ -207,6 +207,16 @@
if test "$am_compiler_list" = ""; then
am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
fi
@@ -384,7 +355,7 @@ Index: pam.debian/aclocal.m4
for depmode in $am_compiler_list; do
# Setup a source with many dependencies, because some compilers
# like to wrap large dependency lists on column 80 (with \), and
-@@ -224,7 +235,17 @@
+@@ -224,7 +234,17 @@
done
echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
@@ -402,7 +373,7 @@ Index: pam.debian/aclocal.m4
nosideeffect)
# after this tag, mechanisms are not by side-effect, so they'll
# only be used when explicitly requested
-@@ -234,19 +255,23 @@
+@@ -234,19 +254,23 @@
break
fi
;;
@@ -432,7 +403,7 @@ Index: pam.debian/aclocal.m4
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
# icc doesn't choke on unknown options, it will just issue warnings
# or remarks (even with -Werror). So we grep stderr for any message
-@@ -303,57 +328,68 @@
+@@ -303,57 +327,68 @@
# Generate code to set up dependency tracking. -*- Autoconf -*-
@@ -541,7 +512,7 @@ Index: pam.debian/aclocal.m4
])# _AM_OUTPUT_DEPENDENCY_COMMANDS
-@@ -373,13 +409,13 @@
+@@ -373,7 +408,7 @@
# Do all the work for Automake. -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
@@ -550,23 +521,7 @@ Index: pam.debian/aclocal.m4
#
# 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 13
-+# serial 16
-
- # 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.
-@@ -396,7 +432,7 @@
- # 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.62])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
-@@ -447,8 +483,8 @@
+@@ -447,8 +482,8 @@
AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
AM_MISSING_PROG(AUTOHEADER, autoheader)
AM_MISSING_PROG(MAKEINFO, makeinfo)
@@ -577,147 +532,7 @@ Index: pam.debian/aclocal.m4
AC_REQUIRE([AM_PROG_MKDIR_P])dnl
# We need awk for the "check" target. The system "awk" is bad on
# some platforms.
-@@ -456,23 +492,36 @@
- AC_REQUIRE([AC_PROG_MAKE_SET])dnl
- AC_REQUIRE([AM_SET_LEADING_DOT])dnl
- _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
-- [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
-- [_AM_PROG_TAR([v7])])])
-+ [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
-+ [_AM_PROG_TAR([v7])])])
- _AM_IF_OPTION([no-dependencies],,
- [AC_PROVIDE_IFELSE([AC_PROG_CC],
-- [_AM_DEPENDENCIES(CC)],
-- [define([AC_PROG_CC],
-- defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
-+ [_AM_DEPENDENCIES(CC)],
-+ [define([AC_PROG_CC],
-+ defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
- AC_PROVIDE_IFELSE([AC_PROG_CXX],
-- [_AM_DEPENDENCIES(CXX)],
-- [define([AC_PROG_CXX],
-- defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
-+ [_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
--])
--])
-+ [_AM_DEPENDENCIES(OBJC)],
-+ [define([AC_PROG_OBJC],
-+ defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
-+])
-+_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
-+dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
-+dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro
-+dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
-+AC_CONFIG_COMMANDS_PRE(dnl
-+[m4_provide_if([_AM_COMPILER_EXEEXT],
-+ [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
-+])
-+
-+dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
-+dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
-+dnl mangled by Autoconf and run in a shell conditional statement.
-+m4_define([_AC_COMPILER_EXEEXT],
-+m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
-
-
- # When config.status generates a header, we must update the stamp-h file.
-@@ -496,7 +545,7 @@
- done
- echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-
--# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
-+# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc.
- #
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
-@@ -507,7 +556,14 @@
- # 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"}
-+if test x"${install_sh}" != xset; then
-+ case $am_aux_dir in
-+ *\ * | *\ *)
-+ install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
-+ *)
-+ install_sh="\${SHELL} $am_aux_dir/install-sh"
-+ esac
-+fi
- AC_SUBST(install_sh)])
-
- # Copyright (C) 2003, 2005 Free Software Foundation, Inc.
-@@ -554,13 +610,13 @@
-
- # Check to see how 'make' treats includes. -*- Autoconf -*-
-
--# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
-+# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc.
- #
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-
--# serial 3
-+# serial 4
-
- # AM_MAKE_INCLUDE()
- # -----------------
-@@ -569,7 +625,7 @@
- [am_make=${MAKE-make}
- cat > confinc << 'END'
- am__doit:
-- @echo done
-+ @echo this is the am__doit target
- .PHONY: am__doit
- END
- # If we don't find an include directive, just comment out the code.
-@@ -579,24 +635,24 @@
- _am_result=none
- # First try GNU make style include.
- echo "include confinc" > confmf
--# We grep out `Entering directory' and `Leaving directory'
--# messages which can occur if `w' ends up in MAKEFLAGS.
--# In particular we don't look at `^make:' because GNU make might
--# be invoked under some other name (usually "gmake"), in which
--# case it prints its new name instead of `make'.
--if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
-- am__include=include
-- am__quote=
-- _am_result=GNU
--fi
-+# Ignore all kinds of additional output from `make'.
-+case `$am_make -s -f confmf 2> /dev/null` in #(
-+*the\ am__doit\ target*)
-+ am__include=include
-+ am__quote=
-+ _am_result=GNU
-+ ;;
-+esac
- # Now try BSD make style include.
- if test "$am__include" = "#"; then
- echo '.include "confinc"' > confmf
-- if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
-- am__include=.include
-- am__quote="\""
-- _am_result=BSD
-- fi
-+ case `$am_make -s -f confmf 2> /dev/null` in #(
-+ *the\ am__doit\ target*)
-+ am__include=.include
-+ am__quote="\""
-+ _am_result=BSD
-+ ;;
-+ esac
- fi
- AC_SUBST([am__include])
- AC_SUBST([am__quote])
-@@ -604,14 +660,14 @@
+@@ -604,14 +639,14 @@
rm -f confinc confmf
])
@@ -734,7 +549,7 @@ Index: pam.debian/aclocal.m4
# AM_PROG_CC_C_O
# --------------
-@@ -623,8 +679,9 @@
+@@ -623,8 +658,9 @@
# FIXME: we rely on the cache variable name because
# there is no other way.
set dummy $CC
@@ -746,40 +561,7 @@ Index: pam.debian/aclocal.m4
# Losing compiler, so override with the script.
# FIXME: It is wrong to rewrite CC.
# But if we don't then we get into trouble of one sort or another.
-@@ -640,14 +697,14 @@
-
- # 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, 2004, 2005, 2008
- # Free Software Foundation, Inc.
- #
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-
--# serial 5
-+# serial 6
-
- # AM_MISSING_PROG(NAME, PROGRAM)
- # ------------------------------
-@@ -664,7 +721,14 @@
- 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"
-+if test x"${MISSING+set}" != xset; then
-+ case $am_aux_dir in
-+ *\ * | *\ *)
-+ MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
-+ *)
-+ MISSING="\${SHELL} $am_aux_dir/missing" ;;
-+ esac
-+fi
- # Use eval to expand $SHELL
- if eval "$MISSING --run true"; then
- am_missing_run="$MISSING --run "
-@@ -702,13 +766,13 @@
+@@ -702,13 +738,13 @@
# Helper functions for option handling. -*- Autoconf -*-
@@ -795,7 +577,7 @@ Index: pam.debian/aclocal.m4
# _AM_MANGLE_OPTION(NAME)
# -----------------------
-@@ -725,7 +789,7 @@
+@@ -725,7 +761,7 @@
# ----------------------------------
# OPTIONS is a space-separated list of Automake options.
AC_DEFUN([_AM_SET_OPTIONS],
@@ -804,87 +586,11 @@ Index: pam.debian/aclocal.m4
# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
# -------------------------------------------
-@@ -735,14 +799,14 @@
-
- # Check to make sure that the build environment is sane. -*- Autoconf -*-
-
--# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
-+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
- # Free Software Foundation, Inc.
- #
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-
--# serial 4
-+# serial 5
-
- # AM_SANITY_CHECK
- # ---------------
-@@ -751,16 +815,29 @@
- # Just in case
- sleep 1
- echo timestamp > conftest.file
-+# Reject unsafe characters in $srcdir or the absolute working directory
-+# name. Accept space and tab only in the latter.
-+am_lf='
-+'
-+case `pwd` in
-+ *[[\\\"\#\$\&\'\`$am_lf]]*)
-+ AC_MSG_ERROR([unsafe absolute working directory name]);;
-+esac
-+case $srcdir in
-+ *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*)
-+ AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
-+esac
-+
- # Do `set' in a subshell so we don't clobber the current shell's
- # arguments. Must try -L first in case configure is actually a
- # symlink; some systems play weird games with the mod time of symlinks
- # (eg FreeBSD returns the mod time of the symlink's containing
- # directory).
- if (
-- set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
-+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
- if test "$[*]" = "X"; then
- # -L didn't work.
-- set X `ls -t $srcdir/configure conftest.file`
-+ set X `ls -t "$srcdir/configure" conftest.file`
- fi
- rm -f conftest.file
- if test "$[*]" != "X $srcdir/configure conftest.file" \
-@@ -813,18 +890,25 @@
- INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
- AC_SUBST([INSTALL_STRIP_PROGRAM])])
-
--# Copyright (C) 2006 Free Software Foundation, Inc.
-+# Copyright (C) 2006, 2008 Free Software Foundation, Inc.
- #
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-
-+# serial 2
-+
- # _AM_SUBST_NOTMAKE(VARIABLE)
- # ---------------------------
- # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
- # This macro is traced by Automake.
- AC_DEFUN([_AM_SUBST_NOTMAKE])
-
-+# AM_SUBST_NOTMAKE(VARIABLE)
-+# ---------------------------
-+# Public sister of _AM_SUBST_NOTMAKE.
-+AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
-+
- # Check how to create a tarball. -*- Autoconf -*-
-
- # Copyright (C) 2004, 2005 Free Software Foundation, Inc.
-Index: pam.debian/config.h.in
+Index: pam.deb/config.h.in
===================================================================
---- pam.debian.orig/config.h.in
-+++ pam.debian/config.h.in
-@@ -297,6 +297,9 @@
+--- pam.deb.orig/config.h.in
++++ pam.deb/config.h.in
+@@ -303,6 +303,9 @@
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
@@ -894,21 +600,21 @@ Index: pam.debian/config.h.in
/* Define to the version of this package. */
#undef PACKAGE_VERSION
-Index: pam.debian/configure
+Index: pam.deb/configure
===================================================================
---- pam.debian.orig/configure
-+++ pam.debian/configure
+--- pam.deb.orig/configure
++++ pam.deb/configure
@@ -1,18 +1,22 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63.
-+# Generated by GNU Autoconf 2.65.
++# Generated by GNU Autoconf 2.67.
+#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-+# Inc.
++# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
++# Foundation, Inc.
+#
+#
# This configure script is free software; the Free Software Foundation
@@ -1368,7 +1074,7 @@ Index: pam.debian/configure
+# Unset more variables known to interfere with behavior of common tools.
+CLICOLOR_FORCE= GREP_OPTIONS=
+unset CLICOLOR_FORCE GREP_OPTIONS
-
++
+## --------------------- ##
+## M4sh Shell Functions. ##
+## --------------------- ##
@@ -1404,7 +1110,7 @@ Index: pam.debian/configure
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
-+
+
+ case $as_dir in #(
+ -*) as_dir=./$as_dir;;
+ esac
@@ -1442,7 +1148,7 @@ Index: pam.debian/configure
+ test -d "$as_dir" && break
+ done
+ test -z "$as_dirs" || eval "mkdir $as_dirs"
-+ } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
++ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
-(eval "as_func_return () {
@@ -1509,19 +1215,19 @@ Index: pam.debian/configure
-if as_func_ret_success; then
- :
-+# as_fn_error ERROR [LINENO LOG_FD]
-+# ---------------------------------
++# as_fn_error STATUS ERROR [LINENO LOG_FD]
++# ----------------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-+# script with status $?, using 1 if that was 0.
++# script with STATUS, using 1 if that was 0.
+as_fn_error ()
+{
-+ as_status=$?; test $as_status -eq 0 && as_status=1
-+ if test "$3"; then
-+ as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
++ as_status=$1; test $as_status -eq 0 && as_status=1
++ if test "$4"; then
++ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
++ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+ fi
-+ $as_echo "$as_me: error: $1" >&2
++ $as_echo "$as_me: error: $2" >&2
+ as_fn_exit $as_status
+} # as_fn_error
+
@@ -1685,7 +1391,7 @@ Index: pam.debian/configure
# Check that we are running under the correct shell.
SHELL=${CONFIG_SHELL-/bin/sh}
-@@ -720,7 +675,8 @@
+@@ -720,10 +675,11 @@
@@ -1694,7 +1400,11 @@ Index: pam.debian/configure
+exec 6>&1
# Name of the host.
- # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
++# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
+ # so uname gets run too.
+ ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
+
@@ -738,7 +694,6 @@
subdirs=
MFLAGS=
@@ -1711,18 +1421,7 @@ Index: pam.debian/configure
ac_unique_file="conf/pam_conv1/pam_conv_y.y"
ac_default_prefix=/usr
-@@ -786,7 +742,9 @@
- #endif"
-
- gt_needs=
--ac_subst_vars='LTLIBOBJS
-+ac_subst_vars='am__EXEEXT_FALSE
-+am__EXEEXT_TRUE
-+LTLIBOBJS
- HAVE_KEY_MANAGEMENT_FALSE
- HAVE_KEY_MANAGEMENT_TRUE
- HAVE_KEY_MANAGEMENT
-@@ -956,6 +914,7 @@
+@@ -960,6 +916,7 @@
program_transform_name
prefix
exec_prefix
@@ -1730,55 +1429,67 @@ Index: pam.debian/configure
PACKAGE_BUGREPORT
PACKAGE_STRING
PACKAGE_VERSION
-@@ -1119,8 +1078,7 @@
+@@ -1077,8 +1034,9 @@
+ fi
+
+ case $ac_option in
+- *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+- *) ac_optarg=yes ;;
++ *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
++ *=) ac_optarg= ;;
++ *) ac_optarg=yes ;;
+ esac
+
+ # Accept the important Cygnus configure options, so we can diagnose typos.
+@@ -1123,8 +1081,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
- { (exit 1); exit 1; }; }
-+ as_fn_error "invalid feature name: $ac_useropt"
++ as_fn_error $? "invalid feature name: $ac_useropt"
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1146,8 +1104,7 @@
+@@ -1150,8 +1107,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
- { (exit 1); exit 1; }; }
-+ as_fn_error "invalid feature name: $ac_useropt"
++ as_fn_error $? "invalid feature name: $ac_useropt"
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1351,8 +1308,7 @@
+@@ -1355,8 +1311,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
- { (exit 1); exit 1; }; }
-+ as_fn_error "invalid package name: $ac_useropt"
++ as_fn_error $? "invalid package name: $ac_useropt"
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1368,8 +1324,7 @@
+@@ -1372,8 +1327,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
- { (exit 1); exit 1; }; }
-+ as_fn_error "invalid package name: $ac_useropt"
++ as_fn_error $? "invalid package name: $ac_useropt"
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1399,17 +1354,17 @@
+@@ -1403,17 +1357,17 @@
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
x_libraries=$ac_optarg ;;
- -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
-Try \`$0 --help' for more information." >&2
- { (exit 1); exit 1; }; }
-+ -*) as_fn_error "unrecognized option: \`$ac_option'
-+Try \`$0 --help' for more information."
++ -*) as_fn_error $? "unrecognized option: \`$ac_option'
++Try \`$0 --help' for more information"
;;
*=*)
@@ -1789,18 +1500,18 @@ Index: pam.debian/configure
- { (exit 1); exit 1; }; }
+ case $ac_envvar in #(
+ '' | [0-9]* | *[!_$as_cr_alnum]* )
-+ as_fn_error "invalid variable name: \`$ac_envvar'" ;;
++ as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
+ esac
eval $ac_envvar=\$ac_optarg
export $ac_envvar ;;
-@@ -1426,15 +1381,13 @@
+@@ -1430,15 +1384,13 @@
if test -n "$ac_prev"; then
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
- { $as_echo "$as_me: error: missing argument to $ac_option" >&2
- { (exit 1); exit 1; }; }
-+ as_fn_error "missing argument to $ac_option"
++ as_fn_error $? "missing argument to $ac_option"
fi
if test -n "$ac_unrecognized_opts"; then
@@ -1808,51 +1519,71 @@ Index: pam.debian/configure
no) ;;
- fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2
- { (exit 1); exit 1; }; } ;;
-+ fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
++ fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
*) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
esac
fi
-@@ -1457,8 +1410,7 @@
+@@ -1461,8 +1413,7 @@
[\\/$]* | ?:[\\/]* ) continue;;
NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
esac
- { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
- { (exit 1); exit 1; }; }
-+ as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
++ as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
done
# There might be people who depend on the old broken behavior: `$host'
-@@ -1488,11 +1440,9 @@
+@@ -1476,8 +1427,8 @@
+ if test "x$host_alias" != x; then
+ if test "x$build_alias" = x; then
+ cross_compiling=maybe
+- $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+- If a cross compiler is detected then cross compile mode will be used." >&2
++ $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
++ If a cross compiler is detected then cross compile mode will be used" >&2
+ elif test "x$build_alias" != "x$host_alias"; then
+ cross_compiling=yes
+ fi
+@@ -1492,11 +1443,9 @@
ac_pwd=`pwd` && test -n "$ac_pwd" &&
ac_ls_di=`ls -di .` &&
ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
- { $as_echo "$as_me: error: working directory cannot be determined" >&2
- { (exit 1); exit 1; }; }
-+ as_fn_error "working directory cannot be determined"
++ as_fn_error $? "working directory cannot be determined"
test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
- { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
- { (exit 1); exit 1; }; }
-+ as_fn_error "pwd does not report name of working directory"
++ as_fn_error $? "pwd does not report name of working directory"
# Find the source files, if location was not specified.
-@@ -1531,13 +1481,11 @@
+@@ -1535,13 +1484,11 @@
fi
if test ! -r "$srcdir/$ac_unique_file"; then
test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
- { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
- { (exit 1); exit 1; }; }
-+ as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
++ as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
fi
ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
ac_abs_confdir=`(
- cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
- { (exit 1); exit 1; }; }
-+ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
++ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
pwd)`
# When building in place, set srcdir=.
if test "$ac_abs_confdir" = "$ac_pwd"; then
-@@ -1704,7 +1652,7 @@
+@@ -1581,7 +1528,7 @@
+ --help=short display options specific to this package
+ --help=recursive display the short help of all the included packages
+ -V, --version display version information and exit
+- -q, --quiet, --silent do not print \`checking...' messages
++ -q, --quiet, --silent do not print \`checking ...' messages
+ --cache-file=FILE cache test results in FILE [disabled]
+ -C, --config-cache alias for \`--cache-file=config.cache'
+ -n, --no-create do not create output files
+@@ -1708,7 +1655,7 @@
LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
nonstandard directory <lib dir>
LIBS libraries to pass to the linker, e.g. -l<library>
@@ -1861,7 +1592,7 @@ Index: pam.debian/configure
you have headers in a nonstandard directory <include dir>
CPP C preprocessor
YACC The `Yet Another C Compiler' implementation to use. Defaults to
-@@ -1716,6 +1664,7 @@
+@@ -1720,6 +1667,7 @@
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
@@ -1869,16 +1600,16 @@ Index: pam.debian/configure
_ACEOF
ac_status=$?
fi
-@@ -1779,21 +1728,465 @@
+@@ -1783,21 +1731,472 @@
if $ac_init_version; then
cat <<\_ACEOF
configure
-generated by GNU Autoconf 2.63
-+generated by GNU Autoconf 2.65
++generated by GNU Autoconf 2.67
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-+Copyright (C) 2009 Free Software Foundation, Inc.
++Copyright (C) 2010 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
_ACEOF
@@ -1948,7 +1679,7 @@ Index: pam.debian/configure
+ mv -f conftest.er1 conftest.err
+ fi
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; } >/dev/null && {
++ test $ac_status = 0; } > conftest.i && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then :
@@ -1972,10 +1703,10 @@ Index: pam.debian/configure
+ac_fn_c_check_header_mongrel ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-+ if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
++ if eval "test \"\${$3+set}\"" = set; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
-+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
++if eval "test \"\${$3+set}\"" = set; then :
+ $as_echo_n "(cached) " >&6
+fi
+eval ac_res=\$$3
@@ -2011,7 +1742,7 @@ Index: pam.debian/configure
+else
+ ac_header_preproc=no
+fi
-+rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
@@ -2038,7 +1769,7 @@ Index: pam.debian/configure
+esac
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
-+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
++if eval "test \"\${$3+set}\"" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ eval "$3=\$ac_header_compiler"
@@ -2102,7 +1833,7 @@ Index: pam.debian/configure
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
-+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
++if eval "test \"\${$3+set}\"" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2178,7 +1909,7 @@ Index: pam.debian/configure
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
-+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
++if eval "test \"\${$3+set}\"" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2246,7 +1977,7 @@ Index: pam.debian/configure
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
-+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
++if eval "test \"\${$3+set}\"" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ eval "$3=no"
@@ -2291,15 +2022,18 @@ Index: pam.debian/configure
+
+} # ac_fn_c_check_type
+
-+# ac_fn_c_check_decl LINENO SYMBOL VAR
-+# ------------------------------------
-+# Tests whether SYMBOL is declared, setting cache variable VAR accordingly.
++# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES
++# ---------------------------------------------
++# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR
++# accordingly.
+ac_fn_c_check_decl ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $2 is declared" >&5
-+$as_echo_n "checking whether $2 is declared... " >&6; }
-+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
++ as_decl_name=`echo $2|sed 's/ *(.*//'`
++ as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
++$as_echo_n "checking whether $as_decl_name is declared... " >&6; }
++if eval "test \"\${$3+set}\"" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2308,8 +2042,12 @@ Index: pam.debian/configure
+int
+main ()
+{
-+#ifndef $2
-+ (void) $2;
++#ifndef $as_decl_name
++#ifdef __cplusplus
++ (void) $as_decl_use;
++#else
++ (void) $as_decl_name;
++#endif
+#endif
+
+ ;
@@ -2335,11 +2073,11 @@ Index: pam.debian/configure
It was created by $as_me, which was
-generated by GNU Autoconf 2.63. Invocation command line was
-+generated by GNU Autoconf 2.65. Invocation command line was
++generated by GNU Autoconf 2.67. Invocation command line was
$ $0 $@
-@@ -1829,8 +2222,8 @@
+@@ -1833,8 +2232,8 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2350,7 +2088,7 @@ Index: pam.debian/configure
IFS=$as_save_IFS
} >&5
-@@ -1867,9 +2260,9 @@
+@@ -1871,9 +2270,9 @@
ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
case $ac_pass in
@@ -2362,7 +2100,7 @@ Index: pam.debian/configure
if test $ac_must_keep_next = true; then
ac_must_keep_next=false # Got value, back to normal.
else
-@@ -1885,13 +2278,13 @@
+@@ -1889,13 +2288,13 @@
-* ) ac_must_keep_next=true ;;
esac
fi
@@ -2379,7 +2117,21 @@ Index: pam.debian/configure
# When interrupted or exit'd, cleanup temporary files, and complete
# config.log. We remove comments because anyway the quotes in there
-@@ -1916,13 +2309,13 @@
+@@ -1907,11 +2306,9 @@
+ {
+ echo
+
+- cat <<\_ASBOX
+-## ---------------- ##
++ $as_echo "## ---------------- ##
+ ## Cache variables. ##
+-## ---------------- ##
+-_ASBOX
++## ---------------- ##"
+ echo
+ # The following way of writing the cache mishandles newlines in values,
+ (
+@@ -1920,13 +2317,13 @@
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
@@ -2395,7 +2147,49 @@ Index: pam.debian/configure
esac ;;
esac
done
-@@ -1994,39 +2387,41 @@
+@@ -1945,11 +2342,9 @@
+ )
+ echo
+
+- cat <<\_ASBOX
+-## ----------------- ##
++ $as_echo "## ----------------- ##
+ ## Output variables. ##
+-## ----------------- ##
+-_ASBOX
++## ----------------- ##"
+ echo
+ for ac_var in $ac_subst_vars
+ do
+@@ -1962,11 +2357,9 @@
+ echo
+
+ if test -n "$ac_subst_files"; then
+- cat <<\_ASBOX
+-## ------------------- ##
++ $as_echo "## ------------------- ##
+ ## File substitutions. ##
+-## ------------------- ##
+-_ASBOX
++## ------------------- ##"
+ echo
+ for ac_var in $ac_subst_files
+ do
+@@ -1980,11 +2373,9 @@
+ fi
+
+ if test -s confdefs.h; then
+- cat <<\_ASBOX
+-## ----------- ##
++ $as_echo "## ----------- ##
+ ## confdefs.h. ##
+-## ----------- ##
+-_ASBOX
++## ----------- ##"
+ echo
+ cat confdefs.h
+ echo
+@@ -1998,46 +2389,53 @@
exit $exit_status
' 0
for ac_signal in 1 2 13 15; do
@@ -2442,7 +2236,20 @@ Index: pam.debian/configure
# Let the site file select an alternate cache file if it wants to.
# Prefer an explicitly selected file to automatically selected ones.
-@@ -2044,8 +2439,8 @@
+ ac_site_file1=NONE
+ ac_site_file2=NONE
+ if test -n "$CONFIG_SITE"; then
+- ac_site_file1=$CONFIG_SITE
++ # We do not want a PATH search for config.site.
++ case $CONFIG_SITE in #((
++ -*) ac_site_file1=./$CONFIG_SITE;;
++ */*) ac_site_file1=$CONFIG_SITE;;
++ *) ac_site_file1=./$CONFIG_SITE;;
++ esac
+ elif test "x$prefix" != xNONE; then
+ ac_site_file1=$prefix/share/config.site
+ ac_site_file2=$prefix/etc/config.site
+@@ -2048,19 +2446,23 @@
for ac_site_file in "$ac_site_file1" "$ac_site_file2"
do
test "x$ac_site_file" = xNONE && continue
@@ -2452,8 +2259,13 @@ Index: pam.debian/configure
+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
$as_echo "$as_me: loading site script $ac_site_file" >&6;}
sed 's/^/| /' "$ac_site_file" >&5
- . "$ac_site_file"
-@@ -2053,10 +2448,10 @@
+- . "$ac_site_file"
++ . "$ac_site_file" \
++ || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++as_fn_error $? "failed to load site script $ac_site_file
++See \`config.log' for more details" "$LINENO" 5 ; }
+ fi
done
if test -r "$cache_file"; then
@@ -2468,7 +2280,7 @@ Index: pam.debian/configure
$as_echo "$as_me: loading cache $cache_file" >&6;}
case $cache_file in
[\\/]* | ?:[\\/]* ) . "$cache_file";;
-@@ -2064,7 +2459,7 @@
+@@ -2068,7 +2470,7 @@
esac
fi
else
@@ -2477,7 +2289,7 @@ Index: pam.debian/configure
$as_echo "$as_me: creating cache $cache_file" >&6;}
>$cache_file
fi
-@@ -2080,11 +2475,11 @@
+@@ -2084,11 +2486,11 @@
eval ac_new_val=\$ac_env_${ac_var}_value
case $ac_old_set,$ac_new_set in
set,)
@@ -2491,7 +2303,7 @@ Index: pam.debian/configure
$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
ac_cache_corrupted=: ;;
,);;
-@@ -2094,17 +2489,17 @@
+@@ -2098,17 +2500,17 @@
ac_old_val_w=`echo x $ac_old_val`
ac_new_val_w=`echo x $ac_new_val`
if test "$ac_old_val_w" != "$ac_new_val_w"; then
@@ -2513,7 +2325,7 @@ Index: pam.debian/configure
$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
fi;;
esac
-@@ -2116,35 +2511,20 @@
+@@ -2120,45 +2522,30 @@
esac
case " $ac_configure_args " in
*" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy.
@@ -2532,8 +2344,20 @@ Index: pam.debian/configure
- { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
- { (exit 1); exit 1; }; }
-+ as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
++ as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
fi
++## -------------------- ##
++## Main body of script. ##
++## -------------------- ##
+
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+
-
-
-
@@ -2547,54 +2371,31 @@ Index: pam.debian/configure
-
-
-
+-ac_ext=c
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-+## -------------------- ##
-+## Main body of script. ##
-+## -------------------- ##
-
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
-@@ -2154,28 +2534,20 @@
-
-
-
-am__api_version='1.10'
-+am__api_version='1.11'
++am__api_version='1.10'
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
-- if test -f "$ac_dir/install-sh"; then
-- ac_aux_dir=$ac_dir
-- ac_install_sh="$ac_aux_dir/install-sh -c"
-- break
-- elif test -f "$ac_dir/install.sh"; then
-- ac_aux_dir=$ac_dir
-- ac_install_sh="$ac_aux_dir/install.sh -c"
-- break
-- elif test -f "$ac_dir/shtool"; then
-- ac_aux_dir=$ac_dir
-- ac_install_sh="$ac_aux_dir/shtool install -c"
-- break
-- fi
-+ for ac_t in install-sh install.sh shtool; do
-+ if test -f "$ac_dir/$ac_t"; then
-+ ac_aux_dir=$ac_dir
-+ ac_install_sh="$ac_aux_dir/$ac_t -c"
-+ break 2
-+ fi
-+ done
+@@ -2177,9 +2564,7 @@
+ fi
done
if test -z "$ac_aux_dir"; then
- { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
-$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
- { (exit 1); exit 1; }; }
-+ as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
++ as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
fi
# These three variables are undocumented and unsupported,
-@@ -2201,10 +2573,10 @@
+@@ -2205,10 +2590,10 @@
# OS/2's system install, which has a completely different semantic
# ./install, which can be erroneously created by make from ./install.sh.
# Reject install programs that cannot install multiple files.
@@ -2607,7 +2408,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -2212,11 +2584,11 @@
+@@ -2216,11 +2601,11 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2623,7 +2424,7 @@ Index: pam.debian/configure
/usr/ucb/* ) ;;
*)
# OSF1 and SCO ODT 3.0 have their own names for install.
-@@ -2253,7 +2625,7 @@
+@@ -2257,7 +2642,7 @@
;;
esac
@@ -2632,7 +2433,7 @@ Index: pam.debian/configure
IFS=$as_save_IFS
rm -rf conftest.one conftest.two conftest.dir
-@@ -2269,7 +2641,7 @@
+@@ -2273,7 +2658,7 @@
INSTALL=$ac_install_sh
fi
fi
@@ -2641,7 +2442,7 @@ Index: pam.debian/configure
$as_echo "$INSTALL" >&6; }
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-@@ -2280,21 +2652,34 @@
+@@ -2284,7 +2669,7 @@
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
@@ -2650,36 +2451,7 @@ Index: pam.debian/configure
$as_echo_n "checking whether build environment is sane... " >&6; }
# Just in case
sleep 1
- echo timestamp > conftest.file
-+# Reject unsafe characters in $srcdir or the absolute working directory
-+# name. Accept space and tab only in the latter.
-+am_lf='
-+'
-+case `pwd` in
-+ *[\\\"\#\$\&\'\`$am_lf]*)
-+ as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
-+esac
-+case $srcdir in
-+ *[\\\"\#\$\&\'\`$am_lf\ \ ]*)
-+ as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
-+esac
-+
- # Do `set' in a subshell so we don't clobber the current shell's
- # arguments. Must try -L first in case configure is actually a
- # symlink; some systems play weird games with the mod time of symlinks
- # (eg FreeBSD returns the mod time of the symlink's containing
- # directory).
- if (
-- set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
-+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
- if test "$*" = "X"; then
- # -L didn't work.
-- set X `ls -t $srcdir/configure conftest.file`
-+ set X `ls -t "$srcdir/configure" conftest.file`
- fi
- rm -f conftest.file
- if test "$*" != "X $srcdir/configure conftest.file" \
-@@ -2304,11 +2689,8 @@
+@@ -2308,11 +2693,8 @@
# if, for instance, CONFIG_SHELL is bash and it inherits a
# broken ls alias from the environment. This has actually
# happened. Such a system could not be considered "sane".
@@ -2688,12 +2460,12 @@ Index: pam.debian/configure
-$as_echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken
-alias in your environment" >&2;}
- { (exit 1); exit 1; }; }
-+ as_fn_error "ls -t appears to fail. Make sure there is not a broken
++ as_fn_error $? "ls -t appears to fail. Make sure there is not a broken
+alias in your environment" "$LINENO" 5
fi
test "$2" = conftest.file
-@@ -2317,13 +2699,10 @@
+@@ -2321,13 +2703,10 @@
# Ok.
:
else
@@ -2702,7 +2474,7 @@ Index: pam.debian/configure
-$as_echo "$as_me: error: newly created file is older than distributed files!
-Check your system clock" >&2;}
- { (exit 1); exit 1; }; }
-+ as_fn_error "newly created file is older than distributed files!
++ as_fn_error $? "newly created file is older than distributed files!
+Check your system clock" "$LINENO" 5
fi
-{ $as_echo "$as_me:$LINENO: result: yes" >&5
@@ -2710,21 +2482,7 @@ Index: pam.debian/configure
$as_echo "yes" >&6; }
test "$program_prefix" != NONE &&
program_transform_name="s&^&$program_prefix&;$program_transform_name"
-@@ -2338,20 +2717,136 @@
- # expand $ac_aux_dir to an absolute path
- am_aux_dir=`cd $ac_aux_dir && pwd`
-
--test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
-+if test x"${MISSING+set}" != xset; then
-+ case $am_aux_dir in
-+ *\ * | *\ *)
-+ MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
-+ *)
-+ MISSING="\${SHELL} $am_aux_dir/missing" ;;
-+ esac
-+fi
- # Use eval to expand $SHELL
- if eval "$MISSING --run true"; then
+@@ -2348,14 +2727,116 @@
am_missing_run="$MISSING --run "
else
am_missing_run=
@@ -2734,14 +2492,7 @@ Index: pam.debian/configure
fi
-{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
-+if test x"${install_sh}" != xset; then
-+ case $am_aux_dir in
-+ *\ * | *\ *)
-+ install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
-+ *)
-+ install_sh="\${SHELL} $am_aux_dir/install-sh"
-+ esac
-+fi
++install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
+
+# Installed binaries are usually stripped using `strip' when the user
+# run `make install-strip'. However `strip' might not be the right
@@ -2851,7 +2602,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -2359,7 +2854,7 @@
+@@ -2363,7 +2844,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2860,7 +2611,7 @@ Index: pam.debian/configure
for ac_exec_ext in '' $ac_executable_extensions; do
{ test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
-@@ -2371,11 +2866,12 @@
+@@ -2375,11 +2856,12 @@
esac
done
done
@@ -2874,7 +2625,7 @@ Index: pam.debian/configure
if test "${ac_cv_path_mkdir+set}" = set; then
MKDIR_P="$ac_cv_path_mkdir -p"
else
-@@ -2383,11 +2879,10 @@
+@@ -2387,11 +2869,10 @@
# value for MKDIR_P within a source directory, because that will
# break other packages using the cache if that directory is
# removed, or if the value is a relative name.
@@ -2887,7 +2638,7 @@ Index: pam.debian/configure
$as_echo "$MKDIR_P" >&6; }
mkdir_p="$MKDIR_P"
-@@ -2400,9 +2895,9 @@
+@@ -2404,9 +2885,9 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -2899,7 +2650,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
if test -n "$AWK"; then
-@@ -2413,24 +2908,24 @@
+@@ -2417,24 +2898,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2929,7 +2680,7 @@ Index: pam.debian/configure
$as_echo "no" >&6; }
fi
-@@ -2438,11 +2933,11 @@
+@@ -2442,11 +2923,11 @@
test -n "$AWK" && break
done
@@ -2939,11 +2690,20 @@ Index: pam.debian/configure
set x ${MAKE-make}
ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
-+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
++if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :
$as_echo_n "(cached) " >&6
else
cat >conftest.make <<\_ACEOF
-@@ -2460,11 +2955,11 @@
+@@ -2454,7 +2935,7 @@
+ all:
+ @echo '@@@%%%=$(MAKE)=@@@%%%'
+ _ACEOF
+-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
++# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
+ case `${MAKE-make} -f conftest.make 2>/dev/null` in
+ *@@@%%%=?*=@@@%%%*)
+ eval ac_cv_prog_make_${ac_make}_set=yes;;
+@@ -2464,11 +2945,11 @@
rm -f conftest.make
fi
if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
@@ -2957,18 +2717,18 @@ Index: pam.debian/configure
$as_echo "no" >&6; }
SET_MAKE="MAKE=${MAKE-make}"
fi
-@@ -2484,9 +2979,7 @@
+@@ -2488,9 +2969,7 @@
am__isrc=' -I$(srcdir)'
# test to see if srcdir already configured
if test -f $srcdir/config.status; then
- { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
-$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
- { (exit 1); exit 1; }; }
-+ as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
++ as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
fi
fi
-@@ -2530,108 +3023,6 @@
+@@ -2534,108 +3013,6 @@
MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
@@ -3077,14 +2837,14 @@ Index: pam.debian/configure
# We need awk for the "check" target. The system "awk" is bad on
# some platforms.
# Always define AMTAR for backward compatibility.
-@@ -2650,35 +3041,27 @@
+@@ -2654,35 +3031,27 @@
# Make sure we can run config.sub.
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
- { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
-$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
- { (exit 1); exit 1; }; }
-+ as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
++ as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
-{ $as_echo "$as_me:$LINENO: checking build system type" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
@@ -3100,12 +2860,12 @@ Index: pam.debian/configure
- { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
-$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
- { (exit 1); exit 1; }; }
-+ as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
++ as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
- { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
-$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
- { (exit 1); exit 1; }; }
-+ as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
++ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5
@@ -3116,11 +2876,11 @@ Index: pam.debian/configure
-*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
-$as_echo "$as_me: error: invalid value of canonical build" >&2;}
- { (exit 1); exit 1; }; };;
-+*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
++*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;;
esac
build=$ac_cv_build
ac_save_IFS=$IFS; IFS='-'
-@@ -2694,28 +3077,24 @@
+@@ -2698,28 +3067,24 @@
case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
@@ -3138,7 +2898,7 @@ Index: pam.debian/configure
- { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
-$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
- { (exit 1); exit 1; }; }
-+ as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
++ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
fi
fi
@@ -3150,11 +2910,11 @@ Index: pam.debian/configure
-*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
-$as_echo "$as_me: error: invalid value of canonical host" >&2;}
- { (exit 1); exit 1; }; };;
-+*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
++*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;;
esac
host=$ac_cv_host
ac_save_IFS=$IFS; IFS='-'
-@@ -2774,7 +3153,7 @@
+@@ -2778,7 +3143,7 @@
fi
# Check whether --enable-static-modules was given.
@@ -3163,7 +2923,7 @@ Index: pam.debian/configure
enableval=$enable_static_modules; STATIC_MODULES=$enableval
else
STATIC_MODULES=no
-@@ -2783,7 +3162,7 @@
+@@ -2787,7 +3152,7 @@
if test "$STATIC_MODULES" != "no" ; then
CFLAGS="$CFLAGS -DPAM_STATIC"
# Check whether --enable-static was given.
@@ -3172,7 +2932,7 @@ Index: pam.debian/configure
enableval=$enable_static; p=${PACKAGE-default}
case $enableval in
yes) enable_static=yes ;;
-@@ -2814,7 +3193,7 @@
+@@ -2818,7 +3183,7 @@
# Check whether --enable-shared was given.
@@ -3181,7 +2941,7 @@ Index: pam.debian/configure
enableval=$enable_shared; p=${PACKAGE-default}
case $enableval in
yes) enable_shared=yes ;;
-@@ -2847,7 +3226,7 @@
+@@ -2851,7 +3216,7 @@
else
# per default don't build static libraries
# Check whether --enable-static was given.
@@ -3190,7 +2950,7 @@ Index: pam.debian/configure
enableval=$enable_static; p=${PACKAGE-default}
case $enableval in
yes) enable_static=yes ;;
-@@ -2875,7 +3254,7 @@
+@@ -2879,7 +3244,7 @@
# Check whether --enable-shared was given.
@@ -3199,12 +2959,7 @@ Index: pam.debian/configure
enableval=$enable_shared; p=${PACKAGE-default}
case $enableval in
yes) enable_shared=yes ;;
-@@ -2920,44 +3299,44 @@
- am_make=${MAKE-make}
- cat > confinc << 'END'
- am__doit:
-- @echo done
-+ @echo this is the am__doit target
+@@ -2928,7 +3293,7 @@
.PHONY: am__doit
END
# If we don't find an include directive, just comment out the code.
@@ -3213,42 +2968,7 @@ Index: pam.debian/configure
$as_echo_n "checking for style of include used by $am_make... " >&6; }
am__include="#"
am__quote=
- _am_result=none
- # First try GNU make style include.
- echo "include confinc" > confmf
--# We grep out `Entering directory' and `Leaving directory'
--# messages which can occur if `w' ends up in MAKEFLAGS.
--# In particular we don't look at `^make:' because GNU make might
--# be invoked under some other name (usually "gmake"), in which
--# case it prints its new name instead of `make'.
--if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
-- am__include=include
-- am__quote=
-- _am_result=GNU
--fi
-+# Ignore all kinds of additional output from `make'.
-+case `$am_make -s -f confmf 2> /dev/null` in #(
-+*the\ am__doit\ target*)
-+ am__include=include
-+ am__quote=
-+ _am_result=GNU
-+ ;;
-+esac
- # Now try BSD make style include.
- if test "$am__include" = "#"; then
- echo '.include "confinc"' > confmf
-- if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
-- am__include=.include
-- am__quote="\""
-- _am_result=BSD
-- fi
-+ case `$am_make -s -f confmf 2> /dev/null` in #(
-+ *the\ am__doit\ target*)
-+ am__include=.include
-+ am__quote="\""
-+ _am_result=BSD
-+ ;;
-+ esac
+@@ -2956,12 +3321,12 @@
fi
@@ -3263,7 +2983,7 @@ Index: pam.debian/configure
enableval=$enable_dependency_tracking;
fi
-@@ -2982,9 +3361,9 @@
+@@ -2986,9 +3351,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
set dummy ${ac_tool_prefix}gcc; ac_word=$2
@@ -3275,7 +2995,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -2995,24 +3374,24 @@
+@@ -2999,24 +3364,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3305,7 +3025,7 @@ Index: pam.debian/configure
$as_echo "no" >&6; }
fi
-@@ -3022,9 +3401,9 @@
+@@ -3026,9 +3391,9 @@
ac_ct_CC=$CC
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
@@ -3317,7 +3037,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -3035,24 +3414,24 @@
+@@ -3039,24 +3404,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3347,7 +3067,7 @@ Index: pam.debian/configure
$as_echo "no" >&6; }
fi
-@@ -3061,7 +3440,7 @@
+@@ -3065,7 +3430,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -3356,7 +3076,7 @@ Index: pam.debian/configure
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -3075,9 +3454,9 @@
+@@ -3079,9 +3444,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
set dummy ${ac_tool_prefix}cc; ac_word=$2
@@ -3368,7 +3088,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3088,24 +3467,24 @@
+@@ -3092,24 +3457,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3398,7 +3118,7 @@ Index: pam.debian/configure
$as_echo "no" >&6; }
fi
-@@ -3115,9 +3494,9 @@
+@@ -3119,9 +3484,9 @@
if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
@@ -3410,7 +3130,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3129,18 +3508,18 @@
+@@ -3133,18 +3498,18 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3432,7 +3152,7 @@ Index: pam.debian/configure
IFS=$as_save_IFS
if test $ac_prog_rejected = yes; then
-@@ -3159,10 +3538,10 @@
+@@ -3163,10 +3528,10 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -3445,7 +3165,7 @@ Index: pam.debian/configure
$as_echo "no" >&6; }
fi
-@@ -3174,9 +3553,9 @@
+@@ -3178,9 +3543,9 @@
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -3457,7 +3177,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3187,24 +3566,24 @@
+@@ -3191,24 +3556,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3487,7 +3207,7 @@ Index: pam.debian/configure
$as_echo "no" >&6; }
fi
-@@ -3218,9 +3597,9 @@
+@@ -3222,9 +3587,9 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -3499,7 +3219,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -3231,24 +3610,24 @@
+@@ -3235,24 +3600,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3529,7 +3249,7 @@ Index: pam.debian/configure
$as_echo "no" >&6; }
fi
-@@ -3261,7 +3640,7 @@
+@@ -3265,7 +3630,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -3538,7 +3258,7 @@ Index: pam.debian/configure
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -3272,57 +3651,37 @@
+@@ -3276,57 +3641,37 @@
fi
@@ -3550,8 +3270,8 @@ Index: pam.debian/configure
-$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }; }
-+as_fn_error "no acceptable C compiler found in \$PATH
-+See \`config.log' for more details." "$LINENO" 5; }
++as_fn_error $? "no acceptable C compiler found in \$PATH
++See \`config.log' for more details" "$LINENO" 5 ; }
# Provide some information about the compiler.
-$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
@@ -3616,7 +3336,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
int
-@@ -3338,8 +3697,8 @@
+@@ -3342,8 +3687,8 @@
# Try to create an executable without -o first, disregard a.out.
# It will help us diagnose broken compilers, and finding out an intuition
# of exeext.
@@ -3627,7 +3347,7 @@ Index: pam.debian/configure
ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
# The possible output files:
-@@ -3355,17 +3714,17 @@
+@@ -3359,17 +3704,17 @@
done
rm -f $ac_rmfiles
@@ -3650,7 +3370,7 @@ Index: pam.debian/configure
# Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
# in a Makefile. We should not override ac_cv_exeext if it was cached,
-@@ -3382,7 +3741,7 @@
+@@ -3386,7 +3731,7 @@
# certainly right.
break;;
*.* )
@@ -3659,7 +3379,7 @@ Index: pam.debian/configure
then :; else
ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
fi
-@@ -3401,84 +3760,42 @@
+@@ -3405,84 +3750,41 @@
else
ac_file=''
fi
@@ -3682,9 +3402,8 @@ Index: pam.debian/configure
-$as_echo "$as_me: error: C compiler cannot create executables
-See \`config.log' for more details." >&2;}
- { (exit 77); exit 77; }; }; }
-+{ as_fn_set_status 77
-+as_fn_error "C compiler cannot create executables
-+See \`config.log' for more details." "$LINENO" 5; }; }
++as_fn_error 77 "C compiler cannot create executables
++See \`config.log' for more details" "$LINENO" 5 ; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
@@ -3705,9 +3424,15 @@ Index: pam.debian/configure
-if test "$cross_compiling" != yes; then
- if { ac_try='./$ac_file'
- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
++rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
++ac_clean_files=$ac_clean_files_save
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
++$as_echo_n "checking for suffix of executables... " >&6; }
++if { { ac_try="$ac_link"
++case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_try") 2>&5
@@ -3734,8 +3459,8 @@ Index: pam.debian/configure
-{ $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-
- rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
- ac_clean_files=$ac_clean_files_save
+-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
+-ac_clean_files=$ac_clean_files_save
-# Check that the compiler produces executables we can run. If not, either
-# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
@@ -3744,14 +3469,12 @@ Index: pam.debian/configure
-$as_echo "$cross_compiling" >&6; }
-
-{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
- $as_echo_n "checking for suffix of executables... " >&6; }
+-$as_echo_n "checking for suffix of executables... " >&6; }
-if { (ac_try="$ac_link"
-+if { { ac_try="$ac_link"
- case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
@@ -3765,7 +3488,7 @@ Index: pam.debian/configure
# If both `conftest.exe' and `conftest' are `present' (well, observable)
# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
# work properly (i.e., refer to `conftest.exe'), while it won't with
-@@ -3493,32 +3810,83 @@
+@@ -3497,32 +3799,83 @@
esac
done
else
@@ -3777,8 +3500,8 @@ Index: pam.debian/configure
-$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }; }
-+as_fn_error "cannot compute suffix of executables: cannot compile and link
-+See \`config.log' for more details." "$LINENO" 5; }
++as_fn_error $? "cannot compute suffix of executables: cannot compile and link
++See \`config.log' for more details" "$LINENO" 5 ; }
fi
-
-rm -f conftest$ac_cv_exeext
@@ -3839,9 +3562,9 @@ Index: pam.debian/configure
+ else
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+as_fn_error "cannot run C compiled programs.
++as_fn_error $? "cannot run C compiled programs.
+If you meant to cross compile, use \`--host'.
-+See \`config.log' for more details." "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
+ fi
+ fi
+fi
@@ -3865,7 +3588,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
int
-@@ -3530,17 +3898,17 @@
+@@ -3534,17 +3887,17 @@
}
_ACEOF
rm -f conftest.o conftest.obj
@@ -3888,7 +3611,7 @@ Index: pam.debian/configure
for ac_file in conftest.o conftest.obj conftest.*; do
test -f "$ac_file" || continue;
case $ac_file in
-@@ -3553,31 +3921,23 @@
+@@ -3557,31 +3910,23 @@
$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -3900,8 +3623,8 @@ Index: pam.debian/configure
-$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }; }
-+as_fn_error "cannot compute suffix of object files: cannot compile
-+See \`config.log' for more details." "$LINENO" 5; }
++as_fn_error $? "cannot compute suffix of object files: cannot compile
++See \`config.log' for more details" "$LINENO" 5 ; }
fi
-
rm -f conftest.$ac_cv_objext conftest.$ac_ext
@@ -3927,7 +3650,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
int
-@@ -3591,37 +3951,16 @@
+@@ -3595,37 +3940,16 @@
return 0;
}
_ACEOF
@@ -3968,7 +3691,7 @@ Index: pam.debian/configure
$as_echo "$ac_cv_c_compiler_gnu" >&6; }
if test $ac_compiler_gnu = yes; then
GCC=yes
-@@ -3630,20 +3969,16 @@
+@@ -3634,20 +3958,16 @@
fi
ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
@@ -3992,7 +3715,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
int
-@@ -3654,35 +3989,11 @@
+@@ -3658,35 +3978,11 @@
return 0;
}
_ACEOF
@@ -4031,7 +3754,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
int
-@@ -3693,36 +4004,12 @@
+@@ -3697,36 +3993,12 @@
return 0;
}
_ACEOF
@@ -4072,7 +3795,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
int
-@@ -3733,42 +4020,17 @@
+@@ -3737,42 +4009,17 @@
return 0;
}
_ACEOF
@@ -4117,7 +3840,7 @@ Index: pam.debian/configure
$as_echo "$ac_cv_prog_cc_g" >&6; }
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
-@@ -3785,18 +4047,14 @@
+@@ -3789,18 +4036,14 @@
CFLAGS=
fi
fi
@@ -4139,7 +3862,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
-@@ -3853,32 +4111,9 @@
+@@ -3857,32 +4100,9 @@
-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
do
CC="$ac_save_CC $ac_arg"
@@ -4173,7 +3896,7 @@ Index: pam.debian/configure
rm -f core conftest.err conftest.$ac_objext
test "x$ac_cv_prog_cc_c89" != "xno" && break
done
-@@ -3889,17 +4124,19 @@
+@@ -3893,17 +4113,19 @@
# AC_CACHE_VAL
case "x$ac_cv_prog_cc_c89" in
x)
@@ -4196,7 +3919,7 @@ Index: pam.debian/configure
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -3909,9 +4146,9 @@
+@@ -3913,9 +4135,9 @@
depcc="$CC" am_compiler_list=
@@ -4208,7 +3931,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -3937,6 +4174,11 @@
+@@ -3941,6 +4163,11 @@
if test "$am_compiler_list" = ""; then
am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
fi
@@ -4220,7 +3943,7 @@ Index: pam.debian/configure
for depmode in $am_compiler_list; do
# Setup a source with many dependencies, because some compilers
# like to wrap large dependency lists on column 80 (with \), and
-@@ -3954,7 +4196,17 @@
+@@ -3958,7 +4185,17 @@
done
echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
@@ -4238,7 +3961,7 @@ Index: pam.debian/configure
nosideeffect)
# after this tag, mechanisms are not by side-effect, so they'll
# only be used when explicitly requested
-@@ -3964,19 +4216,23 @@
+@@ -3968,19 +4205,23 @@
break
fi
;;
@@ -4268,7 +3991,7 @@ Index: pam.debian/configure
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
# icc doesn't choke on unknown options, it will just issue warnings
# or remarks (even with -Werror). So we grep stderr for any message
-@@ -4000,7 +4256,7 @@
+@@ -4004,7 +4245,7 @@
fi
fi
@@ -4277,7 +4000,7 @@ Index: pam.debian/configure
$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-@@ -4021,14 +4277,14 @@
+@@ -4025,14 +4266,14 @@
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -4294,7 +4017,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
# Double quotes because CPP needs to be expanded
-@@ -4043,11 +4299,7 @@
+@@ -4047,11 +4288,7 @@
# <limits.h> exists even on freestanding compilers.
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. "Syntax error" is here to catch this case.
@@ -4307,7 +4030,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
-@@ -4056,78 +4308,34 @@
+@@ -4060,78 +4297,34 @@
#endif
Syntax error
_ACEOF
@@ -4339,7 +4062,8 @@ Index: pam.debian/configure
continue
fi
-
- rm -f conftest.err conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
# OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
@@ -4381,17 +4105,19 @@ Index: pam.debian/configure
break
fi
-
- rm -f conftest.err conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
done
# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
- rm -f conftest.err conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
++rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
break
fi
-@@ -4139,7 +4347,7 @@
+@@ -4143,7 +4336,7 @@
else
ac_cv_prog_CPP=$CPP
fi
@@ -4400,7 +4126,7 @@ Index: pam.debian/configure
$as_echo "$CPP" >&6; }
ac_preproc_ok=false
for ac_c_preproc_warn_flag in '' yes
-@@ -4150,11 +4358,7 @@
+@@ -4154,11 +4347,7 @@
# <limits.h> exists even on freestanding compilers.
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. "Syntax error" is here to catch this case.
@@ -4413,7 +4139,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
-@@ -4163,87 +4367,40 @@
+@@ -4167,87 +4356,40 @@
#endif
Syntax error
_ACEOF
@@ -4445,7 +4171,8 @@ Index: pam.debian/configure
continue
fi
-
- rm -f conftest.err conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
# OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
@@ -4487,13 +4214,15 @@ Index: pam.debian/configure
break
fi
-
- rm -f conftest.err conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
done
# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
- rm -f conftest.err conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
- :
++rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+
else
@@ -4505,12 +4234,12 @@ Index: pam.debian/configure
-$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }; }
-+as_fn_error "C preprocessor \"$CPP\" fails sanity check
-+See \`config.log' for more details." "$LINENO" 5; }
++as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
++See \`config.log' for more details" "$LINENO" 5 ; }
fi
ac_ext=c
-@@ -4253,9 +4410,9 @@
+@@ -4257,9 +4399,9 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -4522,7 +4251,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
if test -z "$GREP"; then
-@@ -4266,7 +4423,7 @@
+@@ -4270,7 +4412,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4531,7 +4260,7 @@ Index: pam.debian/configure
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
{ test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-@@ -4286,7 +4443,7 @@
+@@ -4290,7 +4432,7 @@
$as_echo 'GREP' >> "conftest.nl"
"$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
@@ -4540,7 +4269,7 @@ Index: pam.debian/configure
if test $ac_count -gt ${ac_path_GREP_max-0}; then
# Best one so far, save it but keep looking for a better one
ac_cv_path_GREP="$ac_path_GREP"
-@@ -4301,26 +4458,24 @@
+@@ -4305,26 +4447,24 @@
$ac_path_GREP_found && break 3
done
done
@@ -4551,7 +4280,7 @@ Index: pam.debian/configure
- { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
- { (exit 1); exit 1; }; }
-+ as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
++ as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
fi
else
ac_cv_path_GREP=$GREP
@@ -4572,7 +4301,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-@@ -4334,7 +4489,7 @@
+@@ -4338,7 +4478,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4581,7 +4310,7 @@ Index: pam.debian/configure
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
{ test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-@@ -4354,7 +4509,7 @@
+@@ -4358,7 +4498,7 @@
$as_echo 'EGREP' >> "conftest.nl"
"$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
@@ -4590,7 +4319,7 @@ Index: pam.debian/configure
if test $ac_count -gt ${ac_path_EGREP_max-0}; then
# Best one so far, save it but keep looking for a better one
ac_cv_path_EGREP="$ac_path_EGREP"
-@@ -4369,12 +4524,10 @@
+@@ -4373,12 +4513,10 @@
$ac_path_EGREP_found && break 3
done
done
@@ -4601,11 +4330,11 @@ Index: pam.debian/configure
- { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
- { (exit 1); exit 1; }; }
-+ as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
++ as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
fi
else
ac_cv_path_EGREP=$EGREP
-@@ -4382,21 +4535,17 @@
+@@ -4386,21 +4524,17 @@
fi
fi
@@ -4631,7 +4360,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
#include <stdlib.h>
#include <stdarg.h>
-@@ -4411,48 +4560,23 @@
+@@ -4415,48 +4549,23 @@
return 0;
}
_ACEOF
@@ -4685,7 +4414,7 @@ Index: pam.debian/configure
else
ac_cv_header_stdc=no
fi
-@@ -4462,18 +4586,14 @@
+@@ -4466,18 +4575,14 @@
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
@@ -4707,7 +4436,7 @@ Index: pam.debian/configure
else
ac_cv_header_stdc=no
fi
-@@ -4483,14 +4603,10 @@
+@@ -4487,14 +4592,10 @@
if test $ac_cv_header_stdc = yes; then
# /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
@@ -4724,7 +4453,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
#include <ctype.h>
#include <stdlib.h>
-@@ -4517,256 +4633,46 @@
+@@ -4521,118 +4622,33 @@
return 0;
}
_ACEOF
@@ -4784,30 +4513,17 @@ Index: pam.debian/configure
fi
# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-+for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-+ inttypes.h stdint.h unistd.h
-+do :
-+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
-+"
-+eval as_val=\$$as_ac_Header
-+ if test "x$as_val" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
-
-+fi
-
-+done
-
-
-
-
-
-
-
--for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-- inttypes.h stdint.h unistd.h
+-
+-
+-
+-
+-
+ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
+ inttypes.h stdint.h unistd.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
@@ -4860,16 +4576,18 @@ Index: pam.debian/configure
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-- cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
--_ACEOF
--
--fi
--
--done
--
--
--
++do :
++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
++"
++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+ cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+@@ -4643,134 +4659,8 @@
+
+
+
- if test "${ac_cv_header_minix_config_h+set}" = set; then
- { $as_echo "$as_me:$LINENO: checking for minix/config.h" >&5
-$as_echo_n "checking for minix/config.h... " >&6; }
@@ -5003,7 +4721,7 @@ Index: pam.debian/configure
MINIX=yes
else
MINIX=
-@@ -4775,34 +4681,23 @@
+@@ -4779,34 +4669,23 @@
if test "$MINIX" = yes; then
@@ -5044,7 +4762,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
# define __EXTENSIONS__ 1
-@@ -4815,56 +4710,25 @@
+@@ -4819,56 +4698,25 @@
return 0;
}
_ACEOF
@@ -5109,7 +4827,7 @@ Index: pam.debian/configure
ac_ext=c
-@@ -4875,9 +4739,9 @@
+@@ -4879,9 +4727,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
set dummy ${ac_tool_prefix}gcc; ac_word=$2
@@ -5121,7 +4839,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -4888,24 +4752,24 @@
+@@ -4892,24 +4740,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5151,7 +4869,7 @@ Index: pam.debian/configure
$as_echo "no" >&6; }
fi
-@@ -4915,9 +4779,9 @@
+@@ -4919,9 +4767,9 @@
ac_ct_CC=$CC
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
@@ -5163,7 +4881,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -4928,24 +4792,24 @@
+@@ -4932,24 +4780,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5193,7 +4911,7 @@ Index: pam.debian/configure
$as_echo "no" >&6; }
fi
-@@ -4954,7 +4818,7 @@
+@@ -4958,7 +4806,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -5202,7 +4920,7 @@ Index: pam.debian/configure
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -4968,9 +4832,9 @@
+@@ -4972,9 +4820,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
set dummy ${ac_tool_prefix}cc; ac_word=$2
@@ -5214,7 +4932,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -4981,24 +4845,24 @@
+@@ -4985,24 +4833,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5244,7 +4962,7 @@ Index: pam.debian/configure
$as_echo "no" >&6; }
fi
-@@ -5008,9 +4872,9 @@
+@@ -5012,9 +4860,9 @@
if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
@@ -5256,7 +4974,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -5022,18 +4886,18 @@
+@@ -5026,18 +4874,18 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5278,7 +4996,7 @@ Index: pam.debian/configure
IFS=$as_save_IFS
if test $ac_prog_rejected = yes; then
-@@ -5052,10 +4916,10 @@
+@@ -5056,10 +4904,10 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -5291,7 +5009,7 @@ Index: pam.debian/configure
$as_echo "no" >&6; }
fi
-@@ -5067,9 +4931,9 @@
+@@ -5071,9 +4919,9 @@
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -5303,7 +5021,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -5080,24 +4944,24 @@
+@@ -5084,24 +4932,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5333,7 +5051,7 @@ Index: pam.debian/configure
$as_echo "no" >&6; }
fi
-@@ -5111,9 +4975,9 @@
+@@ -5115,9 +4963,9 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -5345,7 +5063,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -5124,24 +4988,24 @@
+@@ -5128,24 +4976,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5375,7 +5093,7 @@ Index: pam.debian/configure
$as_echo "no" >&6; }
fi
-@@ -5154,7 +5018,7 @@
+@@ -5158,7 +5006,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -5384,7 +5102,7 @@ Index: pam.debian/configure
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -5165,62 +5029,42 @@
+@@ -5169,62 +5017,42 @@
fi
@@ -5396,8 +5114,8 @@ Index: pam.debian/configure
-$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }; }
-+as_fn_error "no acceptable C compiler found in \$PATH
-+See \`config.log' for more details." "$LINENO" 5; }
++as_fn_error $? "no acceptable C compiler found in \$PATH
++See \`config.log' for more details" "$LINENO" 5 ; }
# Provide some information about the compiler.
-$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
@@ -5469,7 +5187,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
int
-@@ -5234,37 +5078,16 @@
+@@ -5238,37 +5066,16 @@
return 0;
}
_ACEOF
@@ -5510,7 +5228,7 @@ Index: pam.debian/configure
$as_echo "$ac_cv_c_compiler_gnu" >&6; }
if test $ac_compiler_gnu = yes; then
GCC=yes
-@@ -5273,20 +5096,16 @@
+@@ -5277,20 +5084,16 @@
fi
ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
@@ -5534,7 +5252,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
int
-@@ -5297,35 +5116,11 @@
+@@ -5301,35 +5104,11 @@
return 0;
}
_ACEOF
@@ -5573,7 +5291,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
int
-@@ -5336,36 +5131,12 @@
+@@ -5340,36 +5119,12 @@
return 0;
}
_ACEOF
@@ -5614,7 +5332,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
int
-@@ -5376,42 +5147,17 @@
+@@ -5380,42 +5135,17 @@
return 0;
}
_ACEOF
@@ -5659,7 +5377,7 @@ Index: pam.debian/configure
$as_echo "$ac_cv_prog_cc_g" >&6; }
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
-@@ -5428,18 +5174,14 @@
+@@ -5432,18 +5162,14 @@
CFLAGS=
fi
fi
@@ -5681,7 +5399,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
-@@ -5496,32 +5238,9 @@
+@@ -5500,32 +5226,9 @@
-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
do
CC="$ac_save_CC $ac_arg"
@@ -5715,7 +5433,7 @@ Index: pam.debian/configure
rm -f core conftest.err conftest.$ac_objext
test "x$ac_cv_prog_cc_c89" != "xno" && break
done
-@@ -5532,17 +5251,19 @@
+@@ -5536,17 +5239,19 @@
# AC_CACHE_VAL
case "x$ac_cv_prog_cc_c89" in
x)
@@ -5738,7 +5456,7 @@ Index: pam.debian/configure
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -5552,9 +5273,9 @@
+@@ -5556,9 +5261,9 @@
depcc="$CC" am_compiler_list=
@@ -5750,7 +5468,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -5580,6 +5301,11 @@
+@@ -5584,6 +5289,11 @@
if test "$am_compiler_list" = ""; then
am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
fi
@@ -5762,7 +5480,7 @@ Index: pam.debian/configure
for depmode in $am_compiler_list; do
# Setup a source with many dependencies, because some compilers
# like to wrap large dependency lists on column 80 (with \), and
-@@ -5597,7 +5323,17 @@
+@@ -5601,7 +5311,17 @@
done
echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
@@ -5780,7 +5498,7 @@ Index: pam.debian/configure
nosideeffect)
# after this tag, mechanisms are not by side-effect, so they'll
# only be used when explicitly requested
-@@ -5607,19 +5343,23 @@
+@@ -5611,19 +5331,23 @@
break
fi
;;
@@ -5810,7 +5528,7 @@ Index: pam.debian/configure
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
# icc doesn't choke on unknown options, it will just issue warnings
# or remarks (even with -Werror). So we grep stderr for any message
-@@ -5643,7 +5383,7 @@
+@@ -5647,7 +5371,7 @@
fi
fi
@@ -5819,7 +5537,7 @@ Index: pam.debian/configure
$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-@@ -5662,9 +5402,9 @@
+@@ -5666,9 +5390,9 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -5831,7 +5549,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
if test -n "$YACC"; then
-@@ -5675,24 +5415,24 @@
+@@ -5679,24 +5403,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5861,7 +5579,7 @@ Index: pam.debian/configure
$as_echo "no" >&6; }
fi
-@@ -5705,9 +5445,9 @@
+@@ -5709,9 +5433,9 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -5873,7 +5591,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
if test -n "$LEX"; then
-@@ -5718,24 +5458,24 @@
+@@ -5722,24 +5446,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5903,7 +5621,7 @@ Index: pam.debian/configure
$as_echo "no" >&6; }
fi
-@@ -5764,20 +5504,20 @@
+@@ -5768,20 +5492,20 @@
return ! yylex () + ! yywrap ();
}
_ACEOF
@@ -5931,14 +5649,14 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
-@@ -5786,19 +5526,17 @@
+@@ -5790,19 +5514,17 @@
elif test -f lexyy.c; then
ac_cv_prog_lex_root=lexyy
else
- { { $as_echo "$as_me:$LINENO: error: cannot find output from $LEX; giving up" >&5
-$as_echo "$as_me: error: cannot find output from $LEX; giving up" >&2;}
- { (exit 1); exit 1; }; }
-+ as_fn_error "cannot find output from $LEX; giving up" "$LINENO" 5
++ as_fn_error $? "cannot find output from $LEX; giving up" "$LINENO" 5
fi
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_lex_root" >&5
@@ -5955,7 +5673,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
-@@ -5806,55 +5544,29 @@
+@@ -5810,55 +5532,29 @@
ac_cv_lib_lex='none needed'
for ac_lib in '' -lfl -ll; do
LIBS="$ac_lib $ac_save_LIBS"
@@ -6019,7 +5737,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
# POSIX says lex can declare yytext either as a pointer or an array; the
-@@ -5863,52 +5575,24 @@
+@@ -5867,52 +5563,24 @@
ac_cv_prog_lex_yytext_pointer=no
ac_save_LIBS=$LIBS
LIBS="$LEXLIB $ac_save_LIBS"
@@ -6079,7 +5797,7 @@ Index: pam.debian/configure
fi
rm -f conftest.l $LEX_OUTPUT_ROOT.c
-@@ -5917,115 +5601,23 @@
+@@ -5921,115 +5589,23 @@
if test "$LEX" = :; then
LEX=${am_missing_run}flex
fi
@@ -6173,9 +5891,9 @@ Index: pam.debian/configure
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
--
--test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+-
-{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
$as_echo_n "checking whether ln -s works... " >&6; }
@@ -6196,11 +5914,20 @@ Index: pam.debian/configure
set x ${MAKE-make}
ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
-+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
++if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :
$as_echo_n "(cached) " >&6
else
cat >conftest.make <<\_ACEOF
-@@ -6043,25 +5635,25 @@
+@@ -6037,7 +5613,7 @@
+ all:
+ @echo '@@@%%%=$(MAKE)=@@@%%%'
+ _ACEOF
+-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
++# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
+ case `${MAKE-make} -f conftest.make 2>/dev/null` in
+ *@@@%%%=?*=@@@%%%*)
+ eval ac_cv_prog_make_${ac_make}_set=yes;;
+@@ -6047,25 +5623,25 @@
rm -f conftest.make
fi
if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
@@ -6231,7 +5958,7 @@ Index: pam.debian/configure
-@@ -6077,9 +5669,9 @@
+@@ -6081,9 +5657,9 @@
ltmain="$ac_aux_dir/ltmain.sh"
@@ -6243,7 +5970,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
-@@ -6087,7 +5679,7 @@
+@@ -6091,7 +5667,7 @@
ac_script="$ac_script$as_nl$ac_script"
done
echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
@@ -6252,7 +5979,7 @@ Index: pam.debian/configure
if test -z "$SED"; then
ac_path_SED_found=false
# Loop through the user's path and test for each of PROGNAME-LIST
-@@ -6096,7 +5688,7 @@
+@@ -6100,7 +5676,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6261,7 +5988,7 @@ Index: pam.debian/configure
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
{ test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
-@@ -6116,7 +5708,7 @@
+@@ -6120,7 +5696,7 @@
$as_echo '' >> "conftest.nl"
"$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
@@ -6270,7 +5997,7 @@ Index: pam.debian/configure
if test $ac_count -gt ${ac_path_SED_max-0}; then
# Best one so far, save it but keep looking for a better one
ac_cv_path_SED="$ac_path_SED"
-@@ -6131,19 +5723,17 @@
+@@ -6135,19 +5711,17 @@
$ac_path_SED_found && break 3
done
done
@@ -6281,7 +6008,7 @@ Index: pam.debian/configure
- { { $as_echo "$as_me:$LINENO: error: no acceptable sed could be found in \$PATH" >&5
-$as_echo "$as_me: error: no acceptable sed could be found in \$PATH" >&2;}
- { (exit 1); exit 1; }; }
-+ as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5
++ as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
fi
else
ac_cv_path_SED=$SED
@@ -6293,7 +6020,7 @@ Index: pam.debian/configure
$as_echo "$ac_cv_path_SED" >&6; }
SED="$ac_cv_path_SED"
rm -f conftest.sed
-@@ -6161,9 +5751,9 @@
+@@ -6165,9 +5739,9 @@
@@ -6305,7 +6032,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
-@@ -6177,7 +5767,7 @@
+@@ -6181,7 +5755,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6314,7 +6041,7 @@ Index: pam.debian/configure
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
{ test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
-@@ -6197,7 +5787,7 @@
+@@ -6201,7 +5775,7 @@
$as_echo 'FGREP' >> "conftest.nl"
"$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
@@ -6323,7 +6050,7 @@ Index: pam.debian/configure
if test $ac_count -gt ${ac_path_FGREP_max-0}; then
# Best one so far, save it but keep looking for a better one
ac_cv_path_FGREP="$ac_path_FGREP"
-@@ -6212,12 +5802,10 @@
+@@ -6216,12 +5790,10 @@
$ac_path_FGREP_found && break 3
done
done
@@ -6334,11 +6061,11 @@ Index: pam.debian/configure
- { { $as_echo "$as_me:$LINENO: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-$as_echo "$as_me: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
- { (exit 1); exit 1; }; }
-+ as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
++ as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
fi
else
ac_cv_path_FGREP=$FGREP
-@@ -6225,7 +5813,7 @@
+@@ -6229,7 +5801,7 @@
fi
fi
@@ -6347,7 +6074,7 @@ Index: pam.debian/configure
$as_echo "$ac_cv_path_FGREP" >&6; }
FGREP="$ac_cv_path_FGREP"
-@@ -6251,7 +5839,7 @@
+@@ -6255,7 +5827,7 @@
# Check whether --with-gnu-ld was given.
@@ -6356,7 +6083,7 @@ Index: pam.debian/configure
withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
else
with_gnu_ld=no
-@@ -6260,7 +5848,7 @@
+@@ -6264,7 +5836,7 @@
ac_prog=ld
if test "$GCC" = yes; then
# Check if gcc -print-prog-name=ld gives a path.
@@ -6365,7 +6092,7 @@ Index: pam.debian/configure
$as_echo_n "checking for ld used by $CC... " >&6; }
case $host in
*-*-mingw*)
-@@ -6290,13 +5878,13 @@
+@@ -6294,13 +5866,13 @@
;;
esac
elif test "$with_gnu_ld" = yes; then
@@ -6382,7 +6109,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
if test -z "$LD"; then
-@@ -6327,18 +5915,16 @@
+@@ -6331,18 +5903,16 @@
LD="$lt_cv_path_LD"
if test -n "$LD"; then
@@ -6398,7 +6125,7 @@ Index: pam.debian/configure
-$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
- { (exit 1); exit 1; }; }
-{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
-+test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
++test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
-if test "${lt_cv_prog_gnu_ld+set}" = set; then
@@ -6406,7 +6133,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
# I'd rather use --version here, but apparently some GNU lds only accept -v.
-@@ -6351,7 +5937,7 @@
+@@ -6355,7 +5925,7 @@
;;
esac
fi
@@ -6415,7 +6142,7 @@ Index: pam.debian/configure
$as_echo "$lt_cv_prog_gnu_ld" >&6; }
with_gnu_ld=$lt_cv_prog_gnu_ld
-@@ -6363,9 +5949,9 @@
+@@ -6367,9 +5937,9 @@
@@ -6427,7 +6154,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
if test -n "$NM"; then
-@@ -6412,7 +5998,7 @@
+@@ -6416,7 +5986,7 @@
: ${lt_cv_path_NM=no}
fi
fi
@@ -6436,7 +6163,7 @@ Index: pam.debian/configure
$as_echo "$lt_cv_path_NM" >&6; }
if test "$lt_cv_path_NM" != "no"; then
NM="$lt_cv_path_NM"
-@@ -6423,9 +6009,9 @@
+@@ -6427,9 +5997,9 @@
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -6448,7 +6175,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
if test -n "$DUMPBIN"; then
-@@ -6436,24 +6022,24 @@
+@@ -6440,24 +6010,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6478,7 +6205,7 @@ Index: pam.debian/configure
$as_echo "no" >&6; }
fi
-@@ -6467,9 +6053,9 @@
+@@ -6471,9 +6041,9 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -6490,7 +6217,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DUMPBIN"; then
-@@ -6480,24 +6066,24 @@
+@@ -6484,24 +6054,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6520,7 +6247,7 @@ Index: pam.debian/configure
$as_echo "no" >&6; }
fi
-@@ -6510,7 +6096,7 @@
+@@ -6514,7 +6084,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -6529,7 +6256,7 @@ Index: pam.debian/configure
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -6530,33 +6116,33 @@
+@@ -6534,33 +6104,33 @@
@@ -6542,16 +6269,16 @@ Index: pam.debian/configure
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
-- (eval echo "\"\$as_me:6540: $ac_compile\"" >&5)
-+ (eval echo "\"\$as_me:6126: $ac_compile\"" >&5)
+- (eval echo "\"\$as_me:6544: $ac_compile\"" >&5)
++ (eval echo "\"\$as_me:6114: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
-- (eval echo "\"\$as_me:6543: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-+ (eval echo "\"\$as_me:6129: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+- (eval echo "\"\$as_me:6547: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
++ (eval echo "\"\$as_me:6117: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
-- (eval echo "\"\$as_me:6546: output\"" >&5)
-+ (eval echo "\"\$as_me:6132: output\"" >&5)
+- (eval echo "\"\$as_me:6550: output\"" >&5)
++ (eval echo "\"\$as_me:6120: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -6571,7 +6298,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
i=0
-@@ -6674,10 +6260,10 @@
+@@ -6678,10 +6248,10 @@
fi
if test -n $lt_cv_sys_max_cmd_len ; then
@@ -6584,7 +6311,7 @@ Index: pam.debian/configure
$as_echo "none" >&6; }
fi
max_cmd_len=$lt_cv_sys_max_cmd_len
-@@ -6691,7 +6277,7 @@
+@@ -6695,7 +6265,7 @@
: ${MV="mv -f"}
: ${RM="rm -f"}
@@ -6593,7 +6320,7 @@ Index: pam.debian/configure
$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
# Try some XSI features
xsi_shell=no
-@@ -6701,17 +6287,17 @@
+@@ -6705,17 +6275,17 @@
&& eval 'test $(( 1 + 1 )) -eq 2 \
&& test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
&& xsi_shell=yes
@@ -6614,7 +6341,7 @@ Index: pam.debian/configure
$as_echo "$lt_shell_append" >&6; }
-@@ -6746,14 +6332,14 @@
+@@ -6750,14 +6320,14 @@
@@ -6632,7 +6359,7 @@ Index: pam.debian/configure
$as_echo "$lt_cv_ld_reload_flag" >&6; }
reload_flag=$lt_cv_ld_reload_flag
case $reload_flag in
-@@ -6782,9 +6368,9 @@
+@@ -6786,9 +6356,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
set dummy ${ac_tool_prefix}objdump; ac_word=$2
@@ -6644,7 +6371,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
if test -n "$OBJDUMP"; then
-@@ -6795,24 +6381,24 @@
+@@ -6799,24 +6369,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6674,7 +6401,7 @@ Index: pam.debian/configure
$as_echo "no" >&6; }
fi
-@@ -6822,9 +6408,9 @@
+@@ -6826,9 +6396,9 @@
ac_ct_OBJDUMP=$OBJDUMP
# Extract the first word of "objdump", so it can be a program name with args.
set dummy objdump; ac_word=$2
@@ -6686,7 +6413,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OBJDUMP"; then
-@@ -6835,24 +6421,24 @@
+@@ -6839,24 +6409,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6716,7 +6443,7 @@ Index: pam.debian/configure
$as_echo "no" >&6; }
fi
-@@ -6861,7 +6447,7 @@
+@@ -6865,7 +6435,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -6725,7 +6452,7 @@ Index: pam.debian/configure
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -6881,9 +6467,9 @@
+@@ -6885,9 +6455,9 @@
@@ -6737,7 +6464,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
lt_cv_file_magic_cmd='$MAGIC_CMD'
-@@ -6998,11 +6584,11 @@
+@@ -7002,11 +6572,11 @@
;;
# This must be Linux ELF.
@@ -6751,7 +6478,7 @@ Index: pam.debian/configure
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
else
-@@ -7077,7 +6663,7 @@
+@@ -7081,7 +6651,7 @@
esac
fi
@@ -6760,7 +6487,7 @@ Index: pam.debian/configure
$as_echo "$lt_cv_deplibs_check_method" >&6; }
file_magic_cmd=$lt_cv_file_magic_cmd
deplibs_check_method=$lt_cv_deplibs_check_method
-@@ -7097,9 +6683,9 @@
+@@ -7101,9 +6671,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
set dummy ${ac_tool_prefix}ar; ac_word=$2
@@ -6772,7 +6499,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
if test -n "$AR"; then
-@@ -7110,24 +6696,24 @@
+@@ -7114,24 +6684,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6802,7 +6529,7 @@ Index: pam.debian/configure
$as_echo "no" >&6; }
fi
-@@ -7137,9 +6723,9 @@
+@@ -7141,9 +6711,9 @@
ac_ct_AR=$AR
# Extract the first word of "ar", so it can be a program name with args.
set dummy ar; ac_word=$2
@@ -6814,7 +6541,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_AR"; then
-@@ -7150,24 +6736,24 @@
+@@ -7154,24 +6724,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6844,7 +6571,7 @@ Index: pam.debian/configure
$as_echo "no" >&6; }
fi
-@@ -7176,7 +6762,7 @@
+@@ -7180,7 +6750,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -6853,7 +6580,7 @@ Index: pam.debian/configure
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -7202,9 +6788,9 @@
+@@ -7206,9 +6776,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
set dummy ${ac_tool_prefix}strip; ac_word=$2
@@ -6865,7 +6592,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
if test -n "$STRIP"; then
-@@ -7215,24 +6801,24 @@
+@@ -7219,24 +6789,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6895,7 +6622,7 @@ Index: pam.debian/configure
$as_echo "no" >&6; }
fi
-@@ -7242,9 +6828,9 @@
+@@ -7246,9 +6816,9 @@
ac_ct_STRIP=$STRIP
# Extract the first word of "strip", so it can be a program name with args.
set dummy strip; ac_word=$2
@@ -6907,7 +6634,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_STRIP"; then
-@@ -7255,24 +6841,24 @@
+@@ -7259,24 +6829,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6937,7 +6664,7 @@ Index: pam.debian/configure
$as_echo "no" >&6; }
fi
-@@ -7281,7 +6867,7 @@
+@@ -7285,7 +6855,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -6946,7 +6673,7 @@ Index: pam.debian/configure
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -7301,9 +6887,9 @@
+@@ -7305,9 +6875,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
set dummy ${ac_tool_prefix}ranlib; ac_word=$2
@@ -6958,7 +6685,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
if test -n "$RANLIB"; then
-@@ -7314,24 +6900,24 @@
+@@ -7318,24 +6888,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6988,7 +6715,7 @@ Index: pam.debian/configure
$as_echo "no" >&6; }
fi
-@@ -7341,9 +6927,9 @@
+@@ -7345,9 +6915,9 @@
ac_ct_RANLIB=$RANLIB
# Extract the first word of "ranlib", so it can be a program name with args.
set dummy ranlib; ac_word=$2
@@ -7000,7 +6727,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_RANLIB"; then
-@@ -7354,24 +6940,24 @@
+@@ -7358,24 +6928,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7030,7 +6757,7 @@ Index: pam.debian/configure
$as_echo "no" >&6; }
fi
-@@ -7380,7 +6966,7 @@
+@@ -7384,7 +6954,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -7039,7 +6766,7 @@ Index: pam.debian/configure
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -7458,9 +7044,9 @@
+@@ -7462,9 +7032,9 @@
# Check for command to grab the raw symbol name followed by C symbol from nm.
@@ -7051,7 +6778,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
-@@ -7576,18 +7162,18 @@
+@@ -7580,18 +7150,18 @@
int main(){nm_test_var='a';nm_test_func();return(0);}
_LT_EOF
@@ -7076,7 +6803,7 @@ Index: pam.debian/configure
# Try sorting and uniquifying the output.
if sort "$nlist" | uniq > "$nlist"T; then
mv -f "$nlist"T "$nlist"
-@@ -7640,11 +7226,11 @@
+@@ -7644,11 +7214,11 @@
lt_save_CFLAGS="$CFLAGS"
LIBS="conftstm.$ac_objext"
CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
@@ -7091,7 +6818,7 @@ Index: pam.debian/configure
pipe_works=yes
fi
LIBS="$lt_save_LIBS"
-@@ -7678,10 +7264,10 @@
+@@ -7682,10 +7252,10 @@
lt_cv_sys_global_symbol_to_cdecl=
fi
if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
@@ -7104,7 +6831,7 @@ Index: pam.debian/configure
$as_echo "ok" >&6; }
fi
-@@ -7707,7 +7293,7 @@
+@@ -7711,7 +7281,7 @@
# Check whether --enable-libtool-lock was given.
@@ -7113,7 +6840,7 @@ Index: pam.debian/configure
enableval=$enable_libtool_lock;
fi
-@@ -7719,11 +7305,11 @@
+@@ -7723,11 +7293,11 @@
ia64-*-hpux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -7128,13 +6855,13 @@ Index: pam.debian/configure
case `/usr/bin/file conftest.$ac_objext` in
*ELF-32*)
HPUX_IA64_MODE="32"
-@@ -7737,12 +7323,12 @@
+@@ -7741,12 +7311,12 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
-- echo '#line 7740 "configure"' > conftest.$ac_ext
+- echo '#line 7744 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ echo '#line 7326 "configure"' > conftest.$ac_ext
++ echo '#line 7314 "configure"' > conftest.$ac_ext
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -7145,7 +6872,7 @@ Index: pam.debian/configure
if test "$lt_cv_prog_gnu_ld" = yes; then
case `/usr/bin/file conftest.$ac_objext` in
*32-bit*)
-@@ -7776,11 +7362,11 @@
+@@ -7780,11 +7350,11 @@
s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -7160,7 +6887,7 @@ Index: pam.debian/configure
case `/usr/bin/file conftest.o` in
*32-bit*)
case $host in
-@@ -7829,9 +7415,9 @@
+@@ -7833,9 +7403,9 @@
# On SCO OpenServer 5, we need -belf to get full-featured binaries.
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -belf"
@@ -7172,7 +6899,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
ac_ext=c
-@@ -7840,11 +7426,7 @@
+@@ -7844,11 +7414,7 @@
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -7185,7 +6912,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
int
-@@ -7855,38 +7437,13 @@
+@@ -7859,38 +7425,13 @@
return 0;
}
_ACEOF
@@ -7228,7 +6955,7 @@ Index: pam.debian/configure
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -7894,7 +7451,7 @@
+@@ -7898,7 +7439,7 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
@@ -7237,7 +6964,7 @@ Index: pam.debian/configure
$as_echo "$lt_cv_cc_needs_belf" >&6; }
if test x"$lt_cv_cc_needs_belf" != x"yes"; then
# this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-@@ -7904,11 +7461,11 @@
+@@ -7908,11 +7449,11 @@
sparc*-*solaris*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -7252,7 +6979,7 @@ Index: pam.debian/configure
case `/usr/bin/file conftest.o` in
*64-bit*)
case $lt_cv_prog_gnu_ld in
-@@ -7934,9 +7491,9 @@
+@@ -7938,9 +7479,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
@@ -7264,7 +6991,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
if test -n "$DSYMUTIL"; then
-@@ -7947,24 +7504,24 @@
+@@ -7951,24 +7492,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7294,7 +7021,7 @@ Index: pam.debian/configure
$as_echo "no" >&6; }
fi
-@@ -7974,9 +7531,9 @@
+@@ -7978,9 +7519,9 @@
ac_ct_DSYMUTIL=$DSYMUTIL
# Extract the first word of "dsymutil", so it can be a program name with args.
set dummy dsymutil; ac_word=$2
@@ -7306,7 +7033,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DSYMUTIL"; then
-@@ -7987,24 +7544,24 @@
+@@ -7991,24 +7532,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7336,7 +7063,7 @@ Index: pam.debian/configure
$as_echo "no" >&6; }
fi
-@@ -8013,7 +7570,7 @@
+@@ -8017,7 +7558,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -7345,7 +7072,7 @@ Index: pam.debian/configure
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -8026,9 +7583,9 @@
+@@ -8030,9 +7571,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
set dummy ${ac_tool_prefix}nmedit; ac_word=$2
@@ -7357,7 +7084,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
if test -n "$NMEDIT"; then
-@@ -8039,24 +7596,24 @@
+@@ -8043,24 +7584,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7387,7 +7114,7 @@ Index: pam.debian/configure
$as_echo "no" >&6; }
fi
-@@ -8066,9 +7623,9 @@
+@@ -8070,9 +7611,9 @@
ac_ct_NMEDIT=$NMEDIT
# Extract the first word of "nmedit", so it can be a program name with args.
set dummy nmedit; ac_word=$2
@@ -7399,7 +7126,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_NMEDIT"; then
-@@ -8079,24 +7636,24 @@
+@@ -8083,24 +7624,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7429,7 +7156,7 @@ Index: pam.debian/configure
$as_echo "no" >&6; }
fi
-@@ -8105,7 +7662,7 @@
+@@ -8109,7 +7650,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -7438,7 +7165,7 @@ Index: pam.debian/configure
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -8118,9 +7675,9 @@
+@@ -8122,9 +7663,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
set dummy ${ac_tool_prefix}lipo; ac_word=$2
@@ -7450,7 +7177,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
if test -n "$LIPO"; then
-@@ -8131,24 +7688,24 @@
+@@ -8135,24 +7676,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7480,7 +7207,7 @@ Index: pam.debian/configure
$as_echo "no" >&6; }
fi
-@@ -8158,9 +7715,9 @@
+@@ -8162,9 +7703,9 @@
ac_ct_LIPO=$LIPO
# Extract the first word of "lipo", so it can be a program name with args.
set dummy lipo; ac_word=$2
@@ -7492,7 +7219,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_LIPO"; then
-@@ -8171,24 +7728,24 @@
+@@ -8175,24 +7716,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7522,7 +7249,7 @@ Index: pam.debian/configure
$as_echo "no" >&6; }
fi
-@@ -8197,7 +7754,7 @@
+@@ -8201,7 +7742,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -7531,7 +7258,7 @@ Index: pam.debian/configure
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -8210,9 +7767,9 @@
+@@ -8214,9 +7755,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
set dummy ${ac_tool_prefix}otool; ac_word=$2
@@ -7543,7 +7270,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
if test -n "$OTOOL"; then
-@@ -8223,24 +7780,24 @@
+@@ -8227,24 +7768,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7573,7 +7300,7 @@ Index: pam.debian/configure
$as_echo "no" >&6; }
fi
-@@ -8250,9 +7807,9 @@
+@@ -8254,9 +7795,9 @@
ac_ct_OTOOL=$OTOOL
# Extract the first word of "otool", so it can be a program name with args.
set dummy otool; ac_word=$2
@@ -7585,7 +7312,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OTOOL"; then
-@@ -8263,24 +7820,24 @@
+@@ -8267,24 +7808,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7615,7 +7342,7 @@ Index: pam.debian/configure
$as_echo "no" >&6; }
fi
-@@ -8289,7 +7846,7 @@
+@@ -8293,7 +7834,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -7624,7 +7351,7 @@ Index: pam.debian/configure
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -8302,9 +7859,9 @@
+@@ -8306,9 +7847,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
set dummy ${ac_tool_prefix}otool64; ac_word=$2
@@ -7636,7 +7363,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
if test -n "$OTOOL64"; then
-@@ -8315,24 +7872,24 @@
+@@ -8319,24 +7860,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7666,7 +7393,7 @@ Index: pam.debian/configure
$as_echo "no" >&6; }
fi
-@@ -8342,9 +7899,9 @@
+@@ -8346,9 +7887,9 @@
ac_ct_OTOOL64=$OTOOL64
# Extract the first word of "otool64", so it can be a program name with args.
set dummy otool64; ac_word=$2
@@ -7678,7 +7405,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OTOOL64"; then
-@@ -8355,24 +7912,24 @@
+@@ -8359,24 +7900,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7708,7 +7435,7 @@ Index: pam.debian/configure
$as_echo "no" >&6; }
fi
-@@ -8381,7 +7938,7 @@
+@@ -8385,7 +7926,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -7717,7 +7444,7 @@ Index: pam.debian/configure
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -8417,9 +7974,9 @@
+@@ -8421,9 +7962,9 @@
@@ -7729,7 +7456,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
lt_cv_apple_cc_single_mod=no
-@@ -8444,22 +8001,18 @@
+@@ -8448,22 +7989,18 @@
rm -f conftest.*
fi
fi
@@ -7756,7 +7483,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
int
-@@ -8470,42 +8023,17 @@
+@@ -8474,42 +8011,17 @@
return 0;
}
_ACEOF
@@ -7804,7 +7531,7 @@ Index: pam.debian/configure
$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
case $host_os in
rhapsody* | darwin1.[012])
-@@ -8542,62 +8070,13 @@
+@@ -8546,62 +8058,13 @@
;;
esac
@@ -7872,7 +7599,7 @@ Index: pam.debian/configure
_ACEOF
fi
-@@ -8620,7 +8099,7 @@
+@@ -8624,7 +8087,7 @@
# Check whether --with-pic was given.
@@ -7881,7 +7608,7 @@ Index: pam.debian/configure
withval=$with_pic; pic_mode="$withval"
else
pic_mode=default
-@@ -8636,7 +8115,7 @@
+@@ -8640,7 +8103,7 @@
# Check whether --enable-fast-install was given.
@@ -7890,7 +7617,7 @@ Index: pam.debian/configure
enableval=$enable_fast_install; p=${PACKAGE-default}
case $enableval in
yes) enable_fast_install=yes ;;
-@@ -8717,9 +8196,9 @@
+@@ -8721,9 +8184,9 @@
setopt NO_GLOB_SUBST
fi
@@ -7902,7 +7629,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
rm -f .libs 2>/dev/null
-@@ -8732,7 +8211,7 @@
+@@ -8736,7 +8199,7 @@
fi
rmdir .libs 2>/dev/null
fi
@@ -7911,7 +7638,7 @@ Index: pam.debian/configure
$as_echo "$lt_cv_objdir" >&6; }
objdir=$lt_cv_objdir
-@@ -8825,9 +8304,9 @@
+@@ -8829,9 +8292,9 @@
case $deplibs_check_method in
file_magic*)
if test "$file_magic_cmd" = '$MAGIC_CMD'; then
@@ -7923,7 +7650,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
case $MAGIC_CMD in
-@@ -8878,10 +8357,10 @@
+@@ -8882,10 +8345,10 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -7936,7 +7663,7 @@ Index: pam.debian/configure
$as_echo "no" >&6; }
fi
-@@ -8891,9 +8370,9 @@
+@@ -8895,9 +8358,9 @@
if test -z "$lt_cv_path_MAGIC_CMD"; then
if test -n "$ac_tool_prefix"; then
@@ -7948,7 +7675,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
case $MAGIC_CMD in
-@@ -8944,10 +8423,10 @@
+@@ -8948,10 +8411,10 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -7961,7 +7688,7 @@ Index: pam.debian/configure
$as_echo "no" >&6; }
fi
-@@ -9028,9 +8507,9 @@
+@@ -9032,9 +8495,9 @@
if test "$GCC" = yes; then
lt_prog_compiler_no_builtin_flag=' -fno-builtin'
@@ -7973,21 +7700,21 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_rtti_exceptions=no
-@@ -9046,11 +8525,11 @@
+@@ -9050,11 +8513,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:9049: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8528: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9053: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8516: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:9053: \$? = $ac_status" >&5
-+ echo "$as_me:8532: \$? = $ac_status" >&5
+- echo "$as_me:9057: \$? = $ac_status" >&5
++ echo "$as_me:8520: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-@@ -9063,7 +8542,7 @@
+@@ -9067,7 +8530,7 @@
$RM conftest*
fi
@@ -7996,7 +7723,7 @@ Index: pam.debian/configure
$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
-@@ -9083,7 +8562,7 @@
+@@ -9087,7 +8550,7 @@
lt_prog_compiler_pic=
lt_prog_compiler_static=
@@ -8005,7 +7732,7 @@ Index: pam.debian/configure
$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
if test "$GCC" = yes; then
-@@ -9215,7 +8694,7 @@
+@@ -9219,7 +8682,7 @@
lt_prog_compiler_static='-non_shared'
;;
@@ -8014,7 +7741,7 @@ Index: pam.debian/configure
case $cc_basename in
# old Intel for x86_64 which still supported -KPIC.
ecc*)
-@@ -9355,7 +8834,7 @@
+@@ -9359,7 +8822,7 @@
lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
;;
esac
@@ -8023,7 +7750,7 @@ Index: pam.debian/configure
$as_echo "$lt_prog_compiler_pic" >&6; }
-@@ -9367,9 +8846,9 @@
+@@ -9371,9 +8834,9 @@
# Check to make sure the PIC flag actually works.
#
if test -n "$lt_prog_compiler_pic"; then
@@ -8035,21 +7762,21 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_pic_works=no
-@@ -9385,11 +8864,11 @@
+@@ -9389,11 +8852,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:9388: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8867: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9392: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8855: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:9392: \$? = $ac_status" >&5
-+ echo "$as_me:8871: \$? = $ac_status" >&5
+- echo "$as_me:9396: \$? = $ac_status" >&5
++ echo "$as_me:8859: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-@@ -9402,7 +8881,7 @@
+@@ -9406,7 +8869,7 @@
$RM conftest*
fi
@@ -8058,7 +7785,7 @@ Index: pam.debian/configure
$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
-@@ -9426,9 +8905,9 @@
+@@ -9430,9 +8893,9 @@
# Check to make sure the static flag actually works.
#
wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
@@ -8070,7 +7797,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_static_works=no
-@@ -9454,7 +8933,7 @@
+@@ -9458,7 +8921,7 @@
LDFLAGS="$save_LDFLAGS"
fi
@@ -8079,7 +7806,7 @@ Index: pam.debian/configure
$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
if test x"$lt_cv_prog_compiler_static_works" = xyes; then
-@@ -9469,9 +8948,9 @@
+@@ -9473,9 +8936,9 @@
@@ -8091,21 +7818,21 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o=no
-@@ -9490,11 +8969,11 @@
+@@ -9494,11 +8957,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:9493: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8972: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9497: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8960: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:9497: \$? = $ac_status" >&5
-+ echo "$as_me:8976: \$? = $ac_status" >&5
+- echo "$as_me:9501: \$? = $ac_status" >&5
++ echo "$as_me:8964: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -9516,7 +8995,7 @@
+@@ -9520,7 +8983,7 @@
$RM conftest*
fi
@@ -8114,7 +7841,7 @@ Index: pam.debian/configure
$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-@@ -9524,9 +9003,9 @@
+@@ -9528,9 +8991,9 @@
@@ -8126,21 +7853,21 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o=no
-@@ -9545,11 +9024,11 @@
+@@ -9549,11 +9012,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:9548: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9027: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9552: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9015: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:9552: \$? = $ac_status" >&5
-+ echo "$as_me:9031: \$? = $ac_status" >&5
+- echo "$as_me:9556: \$? = $ac_status" >&5
++ echo "$as_me:9019: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -9571,7 +9050,7 @@
+@@ -9575,7 +9038,7 @@
$RM conftest*
fi
@@ -8149,7 +7876,7 @@ Index: pam.debian/configure
$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-@@ -9580,7 +9059,7 @@
+@@ -9584,7 +9047,7 @@
hard_links="nottested"
if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
# do not overwrite the value of need_locks provided by the user
@@ -8158,7 +7885,7 @@ Index: pam.debian/configure
$as_echo_n "checking if we can lock with hard links... " >&6; }
hard_links=yes
$RM conftest*
-@@ -9588,10 +9067,10 @@
+@@ -9592,10 +9055,10 @@
touch conftest.a
ln conftest.a conftest.b 2>&5 || hard_links=no
ln conftest.a conftest.b 2>/dev/null && hard_links=no
@@ -8171,7 +7898,7 @@ Index: pam.debian/configure
$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
need_locks=warn
fi
-@@ -9604,7 +9083,7 @@
+@@ -9608,7 +9071,7 @@
@@ -8180,7 +7907,7 @@ Index: pam.debian/configure
$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
runpath_var=
-@@ -9664,6 +9143,9 @@
+@@ -9668,6 +9131,9 @@
openbsd*)
with_gnu_ld=no
;;
@@ -8190,7 +7917,7 @@ Index: pam.debian/configure
esac
ld_shlibs=yes
-@@ -9685,6 +9167,7 @@
+@@ -9689,6 +9155,7 @@
fi
supports_anon_versioning=no
case `$LD -v 2>&1` in
@@ -8198,7 +7925,7 @@ Index: pam.debian/configure
*\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
*\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
*\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-@@ -9776,7 +9259,7 @@
+@@ -9780,7 +9247,7 @@
archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
@@ -8207,7 +7934,7 @@ Index: pam.debian/configure
tmp_diet=no
if test "$host_os" = linux-dietlibc; then
case $cc_basename in
-@@ -9846,7 +9329,7 @@
+@@ -9850,7 +9317,7 @@
fi
;;
@@ -8216,7 +7943,7 @@ Index: pam.debian/configure
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -10021,6 +9504,7 @@
+@@ -10025,6 +9492,7 @@
if test "$aix_use_runtimelinking" = yes; then
shared_flag="$shared_flag "'${wl}-G'
fi
@@ -8224,7 +7951,7 @@ Index: pam.debian/configure
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -10046,11 +9530,7 @@
+@@ -10050,11 +9518,7 @@
allow_undefined_flag='-berok'
# Determine the default libpath from the value encoded in an
# empty executable.
@@ -8237,7 +7964,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
int
-@@ -10061,27 +9541,7 @@
+@@ -10065,27 +9529,7 @@
return 0;
}
_ACEOF
@@ -8266,7 +7993,7 @@ Index: pam.debian/configure
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -10095,16 +9555,9 @@
+@@ -10099,16 +9543,9 @@
if test -z "$aix_libpath"; then
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
fi
@@ -8285,7 +8012,7 @@ Index: pam.debian/configure
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -10117,11 +9570,7 @@
+@@ -10121,11 +9558,7 @@
else
# Determine the default libpath from the value encoded in an
# empty executable.
@@ -8298,7 +8025,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
int
-@@ -10132,27 +9581,7 @@
+@@ -10136,27 +9569,7 @@
return 0;
}
_ACEOF
@@ -8327,7 +8054,7 @@ Index: pam.debian/configure
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -10166,16 +9595,9 @@
+@@ -10170,16 +9583,9 @@
if test -z "$aix_libpath"; then
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
fi
@@ -8346,7 +8073,7 @@ Index: pam.debian/configure
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -10387,42 +9809,16 @@
+@@ -10391,42 +9797,16 @@
# implicitly export all symbols.
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
@@ -8394,7 +8121,7 @@ Index: pam.debian/configure
LDFLAGS="$save_LDFLAGS"
else
archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -10435,7 +9831,7 @@
+@@ -10439,7 +9819,7 @@
link_all_deplibs=yes
;;
@@ -8403,7 +8130,7 @@ Index: pam.debian/configure
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -10678,7 +10074,7 @@
+@@ -10682,7 +10062,7 @@
fi
fi
@@ -8412,7 +8139,7 @@ Index: pam.debian/configure
$as_echo "$ld_shlibs" >&6; }
test "$ld_shlibs" = no && can_build_shared=no
-@@ -10715,16 +10111,16 @@
+@@ -10719,16 +10099,16 @@
# Test whether the compiler implicitly links with -lc since on some
# systems, -lgcc has to come before -lc. If gcc already passes -lc
# to ld, don't add -lc before -lgcc.
@@ -8433,7 +8160,7 @@ Index: pam.debian/configure
soname=conftest
lib=conftest
libobjs=conftest.$ac_objext
-@@ -10738,11 +10134,11 @@
+@@ -10742,11 +10122,11 @@
libname=conftest
lt_save_allow_undefined_flag=$allow_undefined_flag
allow_undefined_flag=
@@ -8448,7 +8175,7 @@ Index: pam.debian/configure
then
archive_cmds_need_lc=no
else
-@@ -10753,7 +10149,7 @@
+@@ -10757,7 +10137,7 @@
cat conftest.err 1>&5
fi
$RM conftest*
@@ -8457,7 +8184,7 @@ Index: pam.debian/configure
$as_echo "$archive_cmds_need_lc" >&6; }
;;
esac
-@@ -10917,7 +10313,7 @@
+@@ -10921,7 +10301,7 @@
@@ -8466,7 +8193,7 @@ Index: pam.debian/configure
$as_echo_n "checking dynamic linker characteristics... " >&6; }
if test "$GCC" = yes; then
-@@ -11325,7 +10721,7 @@
+@@ -11329,7 +10709,7 @@
;;
# This must be Linux ELF.
@@ -8475,7 +8202,7 @@ Index: pam.debian/configure
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -11339,11 +10735,7 @@
+@@ -11343,11 +10723,7 @@
save_libdir=$libdir
eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
@@ -8488,7 +8215,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
int
-@@ -11354,41 +10746,13 @@
+@@ -11358,41 +10734,13 @@
return 0;
}
_ACEOF
@@ -8534,7 +8261,7 @@ Index: pam.debian/configure
LDFLAGS=$save_LDFLAGS
libdir=$save_libdir
-@@ -11412,6 +10776,18 @@
+@@ -11416,6 +10764,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -8553,7 +8280,7 @@ Index: pam.debian/configure
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -11600,7 +10976,7 @@
+@@ -11604,7 +10964,7 @@
dynamic_linker=no
;;
esac
@@ -8562,7 +8289,7 @@ Index: pam.debian/configure
$as_echo "$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
-@@ -11702,7 +11078,7 @@
+@@ -11706,7 +11066,7 @@
@@ -8571,7 +8298,7 @@ Index: pam.debian/configure
$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
hardcode_action=
if test -n "$hardcode_libdir_flag_spec" ||
-@@ -11727,7 +11103,7 @@
+@@ -11731,7 +11091,7 @@
# directories.
hardcode_action=unsupported
fi
@@ -8580,7 +8307,7 @@ Index: pam.debian/configure
$as_echo "$hardcode_action" >&6; }
if test "$hardcode_action" = relink ||
-@@ -11772,18 +11148,14 @@
+@@ -11776,18 +11136,14 @@
darwin*)
# if libdl is installed we need to link against it
@@ -8602,7 +8329,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -11801,43 +11173,18 @@
+@@ -11805,43 +11161,18 @@
return 0;
}
_ACEOF
@@ -8652,7 +8379,7 @@ Index: pam.debian/configure
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
else
-@@ -11850,106 +11197,18 @@
+@@ -11854,106 +11185,18 @@
;;
*)
@@ -8764,7 +8491,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -11967,145 +11226,32 @@
+@@ -11971,145 +11214,32 @@
return 0;
}
_ACEOF
@@ -8921,7 +8648,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -12123,57 +11269,28 @@
+@@ -12127,57 +11257,28 @@
return 0;
}
_ACEOF
@@ -8988,7 +8715,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -12191,57 +11308,28 @@
+@@ -12195,57 +11296,28 @@
return 0;
}
_ACEOF
@@ -9055,7 +8782,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -12259,43 +11347,18 @@
+@@ -12263,43 +11335,18 @@
return 0;
}
_ACEOF
@@ -9105,7 +8832,7 @@ Index: pam.debian/configure
lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
fi
-@@ -12334,9 +11397,9 @@
+@@ -12338,9 +11385,9 @@
save_LIBS="$LIBS"
LIBS="$lt_cv_dlopen_libs $LIBS"
@@ -9117,16 +8844,16 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
-@@ -12345,7 +11408,7 @@
+@@ -12349,7 +11396,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
--#line 12348 "configure"
-+#line 11411 "configure"
+-#line 12352 "configure"
++#line 11399 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -12404,11 +11467,11 @@
+@@ -12408,11 +11455,11 @@
return status;
}
_LT_EOF
@@ -9141,7 +8868,7 @@ Index: pam.debian/configure
(./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
case x$lt_status in
-@@ -12425,14 +11488,14 @@
+@@ -12429,14 +11476,14 @@
fi
@@ -9159,16 +8886,16 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
-@@ -12441,7 +11504,7 @@
+@@ -12445,7 +11492,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
--#line 12444 "configure"
-+#line 11507 "configure"
+-#line 12448 "configure"
++#line 11495 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -12500,11 +11563,11 @@
+@@ -12504,11 +11551,11 @@
return status;
}
_LT_EOF
@@ -9183,7 +8910,7 @@ Index: pam.debian/configure
(./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
case x$lt_status in
-@@ -12521,7 +11584,7 @@
+@@ -12525,7 +11572,7 @@
fi
@@ -9192,7 +8919,7 @@ Index: pam.debian/configure
$as_echo "$lt_cv_dlopen_self_static" >&6; }
fi
-@@ -12560,12 +11623,12 @@
+@@ -12564,12 +11611,12 @@
striplib=
old_striplib=
@@ -9207,7 +8934,7 @@ Index: pam.debian/configure
$as_echo "yes" >&6; }
else
# FIXME - insert some real tests, host_os isn't really good enough
-@@ -12574,15 +11637,15 @@
+@@ -12578,15 +11625,15 @@
if test -n "$STRIP" ; then
striplib="$STRIP -x"
old_striplib="$STRIP -S"
@@ -9226,7 +8953,7 @@ Index: pam.debian/configure
$as_echo "no" >&6; }
;;
esac
-@@ -12600,12 +11663,12 @@
+@@ -12604,12 +11651,12 @@
# Report which library types will actually be built
@@ -9242,7 +8969,7 @@ Index: pam.debian/configure
$as_echo_n "checking whether to build shared libraries... " >&6; }
test "$can_build_shared" = "no" && enable_shared=no
-@@ -12626,14 +11689,14 @@
+@@ -12630,14 +11677,14 @@
fi
;;
esac
@@ -9260,7 +8987,7 @@ Index: pam.debian/configure
$as_echo "$enable_static" >&6; }
-@@ -12669,22 +11732,18 @@
+@@ -12673,22 +11720,18 @@
if test "x$CC" != xcc; then
@@ -9275,7 +9002,7 @@ Index: pam.debian/configure
set dummy $CC; ac_cc=`$as_echo "$2" |
sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
-if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then
-+if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then :
++if eval "test \"\${ac_cv_prog_cc_${ac_cc}_c_o+set}\"" = set; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
@@ -9287,7 +9014,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
int
-@@ -12700,63 +11759,63 @@
+@@ -12704,63 +11747,63 @@
# existing .o file with -o, though they will create one.
ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
rm -f conftest2.*
@@ -9376,7 +9103,7 @@ Index: pam.debian/configure
then
# cc works too.
:
-@@ -12773,23 +11832,22 @@
+@@ -12777,23 +11820,22 @@
fi
if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
@@ -9406,7 +9133,7 @@ Index: pam.debian/configure
# Losing compiler, so override with the script.
# FIXME: It is wrong to rewrite CC.
# But if we don't then we get into trouble of one sort or another.
-@@ -12800,9 +11858,9 @@
+@@ -12804,9 +11846,9 @@
@@ -9418,7 +9145,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
cat > conftest.c <<EOF
-@@ -12811,11 +11869,11 @@
+@@ -12815,11 +11857,11 @@
if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
-o conftest.o conftest.c
-Wl,--as-needed 1>&5'
@@ -9433,7 +9160,7 @@ Index: pam.debian/configure
then
pam_cv_ld_as_needed=yes
LDFLAGS="$LDFLAGS -Wl,--as-needed"
-@@ -12824,15 +11882,15 @@
+@@ -12828,15 +11870,15 @@
fi
rm -f conftest*
fi
@@ -9444,6 +9171,40 @@ Index: pam.debian/configure
+- { $as_echo "$as_me:$LINENO: checking whether ld supports --no-undefined" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ld supports --no-undefined" >&5
+ $as_echo_n "checking whether ld supports --no-undefined... " >&6; }
+-if test "${pam_cv_ld_no_undefined+set}" = set; then
++if test "${pam_cv_ld_no_undefined+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ cat > conftest.c <<EOF
+@@ -12845,11 +11887,11 @@
+ if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
+ -o conftest.o conftest.c
+ -Wl,--no-undefined 1>&5'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; }
+ then
+ pam_cv_ld_no_undefined=yes
+ LDFLAGS="$LDFLAGS -Wl,--no-undefined"
+@@ -12858,15 +11900,15 @@
+ fi
+ rm -f conftest*
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $pam_cv_ld_no_undefined" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pam_cv_ld_no_undefined" >&5
+ $as_echo "$pam_cv_ld_no_undefined" >&6; }
+
+
+
+
- { $as_echo "$as_me:$LINENO: checking whether ld supports -O1" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ld supports -O1" >&5
$as_echo_n "checking whether ld supports -O1... " >&6; }
@@ -9452,7 +9213,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
cat > conftest.c <<EOF
-@@ -12841,11 +11899,11 @@
+@@ -12875,11 +11917,11 @@
if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
-o conftest.o conftest.c
-Wl,-O1 1>&5'
@@ -9467,7 +9228,7 @@ Index: pam.debian/configure
then
pam_cv_ld_O1=yes
LDFLAGS="$LDFLAGS -Wl,-O1"
-@@ -12854,7 +11912,7 @@
+@@ -12888,22 +11930,22 @@
fi
rm -f conftest*
fi
@@ -9476,50 +9237,7 @@ Index: pam.debian/configure
$as_echo "$pam_cv_ld_O1" >&6; }
-@@ -12865,9 +11923,9 @@
- do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_CC_FOR_BUILD+set}" = set; then
-+if test "${ac_cv_prog_CC_FOR_BUILD+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- if test -n "$CC_FOR_BUILD"; then
-@@ -12878,24 +11936,24 @@
- do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-+ for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_CC_FOR_BUILD="$ac_prog"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
--done
-+ done
- IFS=$as_save_IFS
-
- fi
- fi
- CC_FOR_BUILD=$ac_cv_prog_CC_FOR_BUILD
- if test -n "$CC_FOR_BUILD"; then
-- { $as_echo "$as_me:$LINENO: result: $CC_FOR_BUILD" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC_FOR_BUILD" >&5
- $as_echo "$CC_FOR_BUILD" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
-@@ -12908,15 +11966,15 @@
- fi
# Check whether --enable-largefile was given.
-if test "${enable_largefile+set}" = set; then
@@ -9537,7 +9255,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
ac_cv_sys_largefile_CC=no
-@@ -12925,11 +11983,7 @@
+@@ -12912,11 +11954,7 @@
while :; do
# IRIX 6.2 and later do not support large files by default,
# so use the C compiler's -n32 option if that helps.
@@ -9550,7 +9268,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
#include <sys/types.h>
/* Check that off_t can represent 2**63 - 1 correctly.
-@@ -12948,60 +12002,14 @@
+@@ -12935,60 +11973,14 @@
return 0;
}
_ACEOF
@@ -9613,7 +9331,7 @@ Index: pam.debian/configure
rm -f core conftest.err conftest.$ac_objext
break
done
-@@ -13009,23 +12017,19 @@
+@@ -12996,23 +11988,19 @@
rm -f conftest.$ac_ext
fi
fi
@@ -9641,7 +9359,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
#include <sys/types.h>
/* Check that off_t can represent 2**63 - 1 correctly.
-@@ -13044,38 +12048,11 @@
+@@ -13031,38 +12019,11 @@
return 0;
}
_ACEOF
@@ -9682,7 +9400,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
#define _FILE_OFFSET_BITS 64
#include <sys/types.h>
-@@ -13095,38 +12072,15 @@
+@@ -13082,38 +12043,15 @@
return 0;
}
_ACEOF
@@ -9723,7 +9441,7 @@ Index: pam.debian/configure
$as_echo "$ac_cv_sys_file_offset_bits" >&6; }
case $ac_cv_sys_file_offset_bits in #(
no | unknown) ;;
-@@ -13138,17 +12092,13 @@
+@@ -13125,17 +12063,13 @@
esac
rm -rf conftest*
if test $ac_cv_sys_file_offset_bits = unknown; then
@@ -9744,7 +9462,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
#include <sys/types.h>
/* Check that off_t can represent 2**63 - 1 correctly.
-@@ -13167,38 +12117,11 @@
+@@ -13154,38 +12088,11 @@
return 0;
}
_ACEOF
@@ -9785,7 +9503,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
#define _LARGE_FILES 1
#include <sys/types.h>
-@@ -13218,38 +12141,15 @@
+@@ -13205,38 +12112,15 @@
return 0;
}
_ACEOF
@@ -9826,8 +9544,62 @@ Index: pam.debian/configure
$as_echo "$ac_cv_sys_large_files" >&6; }
case $ac_cv_sys_large_files in #(
no | unknown) ;;
-@@ -13318,17 +12218,13 @@
+@@ -13310,9 +12194,9 @@
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_CC_FOR_BUILD+set}" = set; then
++if test "${ac_cv_prog_CC_FOR_BUILD+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$CC_FOR_BUILD"; then
+@@ -13323,24 +12207,24 @@
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
++ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_CC_FOR_BUILD="$ac_prog"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+-done
++ done
+ IFS=$as_save_IFS
+
+ fi
+ fi
+ CC_FOR_BUILD=$ac_cv_prog_CC_FOR_BUILD
+ if test -n "$CC_FOR_BUILD"; then
+- { $as_echo "$as_me:$LINENO: result: $CC_FOR_BUILD" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC_FOR_BUILD" >&5
+ $as_echo "$CC_FOR_BUILD" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+
+@@ -13352,9 +12236,9 @@
+ CC_FOR_BUILD=${CC}
+ fi
fi
+-{ $as_echo "$as_me:$LINENO: checking for CC_FOR_BUILD" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CC_FOR_BUILD" >&5
+ $as_echo_n "checking for CC_FOR_BUILD... " >&6; }
+-{ $as_echo "$as_me:$LINENO: result: $CC_FOR_BUILD" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC_FOR_BUILD" >&5
+ $as_echo "$CC_FOR_BUILD" >&6; }
+
+
+@@ -13377,17 +12261,13 @@
+
-{ $as_echo "$as_me:$LINENO: checking for __attribute__" >&5
@@ -9847,7 +9619,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
#include <stdlib.h>
-@@ -13350,54 +12246,29 @@
+@@ -13409,54 +12289,29 @@
return 0;
}
_ACEOF
@@ -9909,7 +9681,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
cat > conftest.s <<EOF
-@@ -13412,11 +12283,11 @@
+@@ -13471,11 +12326,11 @@
fi
rm -f conftest*
fi
@@ -9924,7 +9696,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
if test $libc_cv_asm_symver_directive = yes; then
-@@ -13441,11 +12312,11 @@
+@@ -13500,11 +12355,11 @@
-nostartfiles -nostdlib
-Wl,--version-script,conftest.map
1>&5'
@@ -9939,7 +9711,7 @@ Index: pam.debian/configure
then
libc_cv_ld_version_script_option=yes
else
-@@ -13459,7 +12330,7 @@
+@@ -13518,7 +12373,7 @@
fi
rm -f conftest*
fi
@@ -9948,7 +9720,7 @@ Index: pam.debian/configure
$as_echo "$libc_cv_ld_version_script_option" >&6; }
if test "$libc_cv_ld_version_script_option" = "yes"; then
HAVE_VERSIONING_TRUE=
-@@ -13471,16 +12342,16 @@
+@@ -13530,16 +12385,16 @@
# Check whether --enable-pie was given.
@@ -9968,7 +9740,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
cat > conftest.c <<EOF
-@@ -13490,11 +12361,11 @@
+@@ -13549,11 +12404,11 @@
if test "$USE_PIE" = "yes" -a "$CC" != "icc" &&
{ ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -pie -fpie
-o conftest conftest.c 1>&5'
@@ -9983,7 +9755,7 @@ Index: pam.debian/configure
then
libc_cv_fpie=yes
PIE_CFLAGS="-fpie"
-@@ -13506,7 +12377,7 @@
+@@ -13565,7 +12420,7 @@
fi
rm -f conftest*
fi
@@ -9992,7 +9764,7 @@ Index: pam.debian/configure
$as_echo "$libc_cv_fpie" >&6; }
-@@ -13515,7 +12386,7 @@
+@@ -13574,7 +12429,7 @@
# Check whether --enable-prelude was given.
@@ -10001,7 +9773,7 @@ Index: pam.debian/configure
enableval=$enable_prelude; WITH_PRELUDE=$enableval
else
WITH_PRELUDE=yes
-@@ -13524,7 +12395,7 @@
+@@ -13583,7 +12438,7 @@
if test "$WITH_PRELUDE" == "yes" ; then
# Check whether --with-libprelude-prefix was given.
@@ -10010,7 +9782,7 @@ Index: pam.debian/configure
withval=$with_libprelude_prefix; libprelude_config_prefix="$withval"
else
libprelude_config_prefix=""
-@@ -13539,9 +12410,9 @@
+@@ -13598,9 +12453,9 @@
# Extract the first word of "libprelude-config", so it can be a program name with args.
set dummy libprelude-config; ac_word=$2
@@ -10022,7 +9794,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
case $LIBPRELUDE_CONFIG in
-@@ -13554,14 +12425,14 @@
+@@ -13613,14 +12468,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10040,7 +9812,7 @@ Index: pam.debian/configure
IFS=$as_save_IFS
test -z "$ac_cv_path_LIBPRELUDE_CONFIG" && ac_cv_path_LIBPRELUDE_CONFIG="no"
-@@ -13570,16 +12441,16 @@
+@@ -13629,16 +12484,16 @@
fi
LIBPRELUDE_CONFIG=$ac_cv_path_LIBPRELUDE_CONFIG
if test -n "$LIBPRELUDE_CONFIG"; then
@@ -10060,7 +9832,7 @@ Index: pam.debian/configure
$as_echo_n "checking for libprelude - version >= $min_libprelude_version... " >&6; }
no_libprelude=""
if test "$LIBPRELUDE_CONFIG" = "no" ; then
-@@ -13601,14 +12472,10 @@
+@@ -13660,14 +12515,10 @@
LDFLAGS="$LDFLAGS $LIBPRELUDE_LDFLAGS"
LIBS="$LIBS $LIBPRELUDE_LIBS"
rm -f conf.libpreludetest
@@ -10077,7 +9849,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
#include <stdio.h>
-@@ -13666,56 +12533,29 @@
+@@ -13725,56 +12576,29 @@
}
_ACEOF
@@ -10141,7 +9913,7 @@ Index: pam.debian/configure
$as_echo "no" >&6; }
fi
if test "$LIBPRELUDE_CONFIG" = "no" ; then
-@@ -13731,11 +12571,7 @@
+@@ -13790,11 +12614,7 @@
CFLAGS="$CFLAGS $LIBPRELUDE_CFLAGS"
LDFLAGS="$LDFLAGS $LIBPRELUDE_LDFLAGS"
LIBS="$LIBS $LIBPRELUDE_LIBS"
@@ -10154,7 +9926,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
#include <stdio.h>
-@@ -13751,27 +12587,7 @@
+@@ -13810,27 +12630,7 @@
return 0;
}
_ACEOF
@@ -10183,7 +9955,7 @@ Index: pam.debian/configure
echo "*** The test program compiled, but did not run. This usually means"
echo "*** that the run-time linker is not finding LIBPRELUDE or finding the wrong"
echo "*** version of LIBPRELUDE. If it is not finding LIBPRELUDE, you'll need to set your"
-@@ -13783,18 +12599,13 @@
+@@ -13842,18 +12642,13 @@
echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
echo "***"
else
@@ -10205,7 +9977,7 @@ Index: pam.debian/configure
CFLAGS="$ac_save_CFLAGS"
LDFLAGS="$ac_save_LDFLAGS"
LIBS="$ac_save_LIBS"
-@@ -13819,21 +12630,19 @@
+@@ -13878,21 +12673,19 @@
fi
# Check whether --enable-debug was given.
@@ -10230,7 +10002,7 @@ Index: pam.debian/configure
enableval=$enable_securedir; SECUREDIR=$enableval
else
SECUREDIR=$libdir/security
-@@ -13842,7 +12651,7 @@
+@@ -13901,7 +12694,7 @@
# Check whether --enable-isadir was given.
@@ -10239,7 +10011,7 @@ Index: pam.debian/configure
enableval=$enable_isadir; ISA=$enableval
else
ISA=../../`basename $libdir`/security
-@@ -13854,11 +12663,11 @@
+@@ -13913,11 +12706,11 @@
#define _PAM_ISA "$ISA"
_ACEOF
@@ -10253,7 +10025,7 @@ Index: pam.debian/configure
enableval=$enable_sconfigdir; SCONFIGDIR=$enableval
else
SCONFIGDIR=$sysconfdir/security
-@@ -13867,35 +12676,31 @@
+@@ -13926,35 +12719,31 @@
# Check whether --enable-pamlocking was given.
@@ -10294,7 +10066,7 @@ Index: pam.debian/configure
enableval=$enable_lckpwdf; WITH_LCKPWDF=$enableval
else
WITH_LCKPWDF=yes
-@@ -13903,152 +12708,16 @@
+@@ -13962,152 +12751,16 @@
if test "$WITH_LCKPWDF" == "yes" ; then
@@ -10452,7 +10224,7 @@ Index: pam.debian/configure
_ACEOF
fi
-@@ -14057,21 +12726,17 @@
+@@ -14116,21 +12769,17 @@
# Check whether --with-mailspool was given.
@@ -10477,7 +10249,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
#include <paths.h>
-@@ -14083,42 +12748,15 @@
+@@ -14142,42 +12791,15 @@
#endif
}
_ACEOF
@@ -10524,7 +10296,7 @@ Index: pam.debian/configure
fi
cat >>confdefs.h <<_ACEOF
-@@ -14128,16 +12766,16 @@
+@@ -14187,16 +12809,16 @@
# Check whether --with-xauth was given.
@@ -10544,7 +10316,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
case $pam_xauth_path in
-@@ -14150,14 +12788,14 @@
+@@ -14209,14 +12831,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -10562,7 +10334,7 @@ Index: pam.debian/configure
IFS=$as_save_IFS
;;
-@@ -14165,10 +12803,10 @@
+@@ -14224,10 +12846,10 @@
fi
pam_xauth_path=$ac_cv_path_pam_xauth_path
if test -n "$pam_xauth_path"; then
@@ -10575,7 +10347,7 @@ Index: pam.debian/configure
$as_echo "no" >&6; }
fi
-@@ -14186,18 +12824,14 @@
+@@ -14245,18 +12867,14 @@
fi
@@ -10597,7 +10369,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -14215,43 +12849,18 @@
+@@ -14274,43 +12892,18 @@
return 0;
}
_ACEOF
@@ -10647,7 +10419,7 @@ Index: pam.debian/configure
LIBDL="-ldl"
else
LIBDL=""
-@@ -14261,166 +12870,28 @@
+@@ -14320,166 +12913,28 @@
# Check for cracklib
# Check whether --enable-cracklib was given.
@@ -10667,13 +10439,23 @@ Index: pam.debian/configure
- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
++ for ac_header in crack.h
++do :
++ ac_fn_c_check_header_mongrel "$LINENO" "crack.h" "ac_cv_header_crack_h" "$ac_includes_default"
++if test "x$ac_cv_header_crack_h" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_CRACK_H 1
++_ACEOF
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FascistCheck in -lcrack" >&5
++$as_echo_n "checking for FascistCheck in -lcrack... " >&6; }
++if test "${ac_cv_lib_crack_FascistCheck+set}" = set; then :
+ $as_echo_n "(cached) " >&6
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
--else
+ else
- # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-$as_echo_n "checking $ac_header usability... " >&6; }
@@ -10797,33 +10579,28 @@ Index: pam.debian/configure
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-+ for ac_header in crack.h
-+do :
-+ ac_fn_c_check_header_mongrel "$LINENO" "crack.h" "ac_cv_header_crack_h" "$ac_includes_default"
-+if test "x$ac_cv_header_crack_h" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
+- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define HAVE_CRACK_H 1
- _ACEOF
+-_ACEOF
- { $as_echo "$as_me:$LINENO: checking for FascistCheck in -lcrack" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FascistCheck in -lcrack" >&5
- $as_echo_n "checking for FascistCheck in -lcrack... " >&6; }
+-$as_echo_n "checking for FascistCheck in -lcrack... " >&6; }
-if test "${ac_cv_lib_crack_FascistCheck+set}" = set; then
-+if test "${ac_cv_lib_crack_FascistCheck+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lcrack $LIBS"
+- $as_echo_n "(cached) " >&6
+-else
+- ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lcrack $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
++ ac_check_lib_save_LIBS=$LIBS
++LIBS="-lcrack $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -14438,43 +12909,18 @@
+@@ -14497,43 +12952,18 @@
return 0;
}
_ACEOF
@@ -10873,7 +10650,7 @@ Index: pam.debian/configure
LIBCRACK="-lcrack"
else
LIBCRACK=""
-@@ -14498,153 +12944,23 @@
+@@ -14557,153 +12987,23 @@
# Check whether --enable-audit was given.
@@ -11033,7 +10810,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -14662,145 +12978,26 @@
+@@ -14721,145 +13021,26 @@
return 0;
}
_ACEOF
@@ -11188,7 +10965,7 @@ Index: pam.debian/configure
HAVE_AUDIT_TTY_STATUS=yes
else
HAVE_AUDIT_TTY_STATUS=""
-@@ -14812,16 +13009,12 @@
+@@ -14871,16 +13052,12 @@
if test ! -z "$LIBAUDIT" -a "$ac_cv_header_libaudit_h" != "no" ; then
@@ -11207,7 +10984,7 @@ Index: pam.debian/configure
fi
else
-@@ -14837,172 +13030,34 @@
+@@ -14896,172 +13073,33 @@
fi
@@ -11241,8 +11018,7 @@ Index: pam.debian/configure
+do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+ if test "x$as_val" = x""yes; then :
++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
@@ -11393,7 +11169,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -15027,155 +13082,39 @@
+@@ -15086,155 +13124,38 @@
ac_res=-l$ac_lib
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
fi
@@ -11557,12 +11333,11 @@ Index: pam.debian/configure
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+ if test "x$as_val" = x""yes; then :
++if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-@@ -15187,15 +13126,13 @@
+@@ -15246,15 +13167,13 @@
if test "$LIBCRYPT" = "-lxcrypt" -a "$ac_cv_header_xcrypt_h" = "yes" ; then
@@ -11580,7 +11355,7 @@ Index: pam.debian/configure
withval=$with_randomdev; opt_randomdev=$withval
fi
-@@ -15213,7 +13150,7 @@
+@@ -15272,7 +13191,7 @@
fi
# Check whether --enable-db was given.
@@ -11589,7 +11364,7 @@ Index: pam.debian/configure
enableval=$enable_db; WITH_DB=$enableval
else
WITH_DB=yes
-@@ -15221,25 +13158,21 @@
+@@ -15280,7 +13199,7 @@
# Check whether --with-db-uniquename was given.
@@ -11598,109 +11373,67 @@ Index: pam.debian/configure
withval=$with_db_uniquename;
fi
- if test x"$WITH_DB" != xno ; then
+@@ -15288,103 +13207,11 @@
if test x"$WITH_DB" = xyes -o x"$WITH_DB" = xdb ; then
- as_ac_Lib=`$as_echo "ac_cv_lib_db$with_db_uniquename''_db_create$with_db_uniquename" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking for db_create$with_db_uniquename in -ldb$with_db_uniquename" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for db_create$with_db_uniquename in -ldb$with_db_uniquename" >&5
- $as_echo_n "checking for db_create$with_db_uniquename in -ldb$with_db_uniquename... " >&6; }
--if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-+if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldb$with_db_uniquename $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
+ old_libs=$LIBS
+ LIBS="$LIBS -ldb$with_db_uniquename"
+-
+-
+-
+-
+-for ac_func in db_create$with_db_uniquename db_create dbm_store$with_db_uniquename dbm_store
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+- $as_echo_n "(cached) " >&6
+-else
+- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- /* Override any GCC internal prototype to avoid an error.
-@@ -15257,47 +13190,20 @@
- return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
+-/* end confdefs.h. */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+- For example, HP-UX 11i <limits.h> declares gettimeofday. */
+-#define $ac_func innocuous_$ac_func
-
-- eval "$as_ac_Lib=no"
-+ eval "$as_ac_Lib=no"
- fi
+-/* System header to define __stub macros and hopefully few prototypes,
+- which can conflict with char $ac_func (); below.
+- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+- <limits.h> exists even on freestanding compilers. */
-
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--ac_res=`eval 'as_val=${'$as_ac_Lib'}
-- $as_echo "$as_val"'`
-- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-+eval ac_res=\$$as_ac_Lib
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
- $as_echo "$ac_res" >&6; }
--as_val=`eval 'as_val=${'$as_ac_Lib'}
-- $as_echo "$as_val"'`
-- if test "x$as_val" = x""yes; then
-+eval as_val=\$$as_ac_Lib
-+ if test "x$as_val" = x""yes; then :
- LIBDB="-ldb$with_db_uniquename"
- else
- LIBDB=""
-@@ -15305,18 +13211,14 @@
-
- if test -z "$LIBDB" ; then
- as_ac_Lib=`$as_echo "ac_cv_lib_db$with_db_uniquename''_dbm_store$with_db_uniquename" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking for dbm_store$with_db_uniquename in -ldb$with_db_uniquename" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dbm_store$with_db_uniquename in -ldb$with_db_uniquename" >&5
- $as_echo_n "checking for dbm_store$with_db_uniquename in -ldb$with_db_uniquename... " >&6; }
--if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-+if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldb$with_db_uniquename $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef $ac_func
+-
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char $ac_func ();
+-/* The GNU C library defines this for functions which it implements
+- to always fail with ENOSYS. Some functions are actually named
+- something starting with __ and the normal name is an alias. */
+-#if defined __stub_$ac_func || defined __stub___$ac_func
+-choke me
+-#endif
+-
+-int
+-main ()
+-{
+-return $ac_func ();
+- ;
+- return 0;
+-}
-_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- /* Override any GCC internal prototype to avoid an error.
-@@ -15334,47 +13236,20 @@
- return 0;
- }
- _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -11722,39 +11455,35 @@ Index: pam.debian/configure
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-+if ac_fn_c_try_link "$LINENO"; then :
- eval "$as_ac_Lib=yes"
- else
+- eval "$as_ac_var=yes"
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-- eval "$as_ac_Lib=no"
-+ eval "$as_ac_Lib=no"
- fi
+- eval "$as_ac_var=no"
+-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--ac_res=`eval 'as_val=${'$as_ac_Lib'}
+-fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-+eval ac_res=\$$as_ac_Lib
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
- $as_echo "$ac_res" >&6; }
--as_val=`eval 'as_val=${'$as_ac_Lib'}
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-+eval as_val=\$$as_ac_Lib
-+ if test "x$as_val" = x""yes; then :
- LIBDB="-ldb$with_db_uniquename"
- else
- LIBDB=""
-@@ -15383,18 +13258,14 @@
- fi
++ for ac_func in db_create$with_db_uniquename db_create dbm_store$with_db_uniquename dbm_store
++do :
++ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
++if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+ cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+@@ -15395,18 +13222,14 @@
+ LIBS=$old_libs
fi
if test -z "$LIBDB" ; then
- { $as_echo "$as_me:$LINENO: checking for dbm_store in -lndbm" >&5
@@ -11775,7 +11504,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -15412,367 +13283,70 @@
+@@ -15424,367 +13247,70 @@
return 0;
}
_ACEOF
@@ -11996,10 +11725,10 @@ Index: pam.debian/configure
fi
-done
--
+
- fi
- else
-
+-
-for ac_header in db.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -12007,16 +11736,13 @@ Index: pam.debian/configure
- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for yp_get_default_domain in -lnsl" >&5
-+$as_echo_n "checking for yp_get_default_domain in -lnsl... " >&6; }
-+if test "${ac_cv_lib_nsl_yp_get_default_domain+set}" = set; then :
- $as_echo_n "(cached) " >&6
+- $as_echo_n "(cached) " >&6
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
- else
+-else
- # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-$as_echo_n "checking $ac_header usability... " >&6; }
@@ -12161,24 +11887,24 @@ Index: pam.debian/configure
-
-
-{ $as_echo "$as_me:$LINENO: checking for yp_get_default_domain in -lnsl" >&5
--$as_echo_n "checking for yp_get_default_domain in -lnsl... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for yp_get_default_domain in -lnsl" >&5
+ $as_echo_n "checking for yp_get_default_domain in -lnsl... " >&6; }
-if test "${ac_cv_lib_nsl_yp_get_default_domain+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
-- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lnsl $LIBS"
++if test "${ac_cv_lib_nsl_yp_get_default_domain+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lnsl $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lnsl $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -15790,43 +13364,18 @@
+@@ -15802,43 +13328,18 @@
return 0;
}
_ACEOF
@@ -12228,7 +11954,7 @@ Index: pam.debian/configure
LIBNSL="-lnsl"
else
LIBNSL=""
-@@ -15834,107 +13383,12 @@
+@@ -15846,107 +13347,11 @@
BACKUP_LIBS=$LIBS
LIBS="$LIBS $LIBNSL"
@@ -12336,12 +12062,11 @@ Index: pam.debian/configure
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+ if test "x$as_val" = x""yes; then :
++if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-@@ -15946,25 +13400,21 @@
+@@ -15958,25 +13363,21 @@
# Check whether --enable-selinux was given.
@@ -12371,7 +12096,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -15982,43 +13432,18 @@
+@@ -15994,43 +13395,18 @@
return 0;
}
_ACEOF
@@ -12421,7 +12146,7 @@ Index: pam.debian/configure
LIBSELINUX="-lselinux"
else
LIBSELINUX=""
-@@ -16038,304 +13463,86 @@
+@@ -16050,304 +13426,85 @@
if test ! -z "$LIBSELINUX" ; then
@@ -12502,7 +12227,7 @@ Index: pam.debian/configure
+ as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5
+$as_echo_n "checking for $ac_hdr that defines DIR... " >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then :
++if eval "test \"\${$as_ac_Header+set}\"" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -12566,8 +12291,7 @@ Index: pam.debian/configure
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-+eval as_val=\$$as_ac_Header
-+ if test "x$as_val" = x""yes; then :
++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
@@ -12576,22 +12300,16 @@ Index: pam.debian/configure
+ac_header_dirent=$ac_hdr; break
fi
-done
-
-
+
-for ac_func in getseuser
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+done
-+# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
-+if test $ac_header_dirent = dirent.h; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5
-+$as_echo_n "checking for library containing opendir... " >&6; }
-+if test "${ac_cv_search_opendir+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
+- $as_echo_n "(cached) " >&6
+-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
@@ -12766,20 +12484,25 @@ Index: pam.debian/configure
- { $as_echo "$as_me:$LINENO: checking for library containing opendir" >&5
-$as_echo_n "checking for library containing opendir... " >&6; }
-if test "${ac_cv_search_opendir+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
-- ac_func_search_save_LIBS=$LIBS
++done
++# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
++if test $ac_header_dirent = dirent.h; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5
++$as_echo_n "checking for library containing opendir... " >&6; }
++if test "${ac_cv_search_opendir+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_func_search_save_LIBS=$LIBS
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+ ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -16360,70 +13567,39 @@
+@@ -16372,70 +13529,39 @@
ac_res=-l$ac_lib
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
fi
@@ -12861,7 +12584,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -16448,70 +13624,39 @@
+@@ -16460,70 +13586,39 @@
ac_res=-l$ac_lib
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
fi
@@ -12943,7 +12666,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
#include <stdlib.h>
#include <stdarg.h>
-@@ -16526,48 +13671,23 @@
+@@ -16538,48 +13633,23 @@
return 0;
}
_ACEOF
@@ -12997,7 +12720,7 @@ Index: pam.debian/configure
else
ac_cv_header_stdc=no
fi
-@@ -16577,18 +13697,14 @@
+@@ -16589,18 +13659,14 @@
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
@@ -13019,7 +12742,7 @@ Index: pam.debian/configure
else
ac_cv_header_stdc=no
fi
-@@ -16598,14 +13714,10 @@
+@@ -16610,14 +13676,10 @@
if test $ac_cv_header_stdc = yes; then
# /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
@@ -13036,7 +12759,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
#include <ctype.h>
#include <stdlib.h>
-@@ -16632,64 +13744,31 @@
+@@ -16644,64 +13706,31 @@
return 0;
}
_ACEOF
@@ -13111,7 +12834,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/wait.h>
-@@ -16710,413 +13789,94 @@
+@@ -16722,413 +13751,92 @@
return 0;
}
_ACEOF
@@ -13161,8 +12884,7 @@ Index: pam.debian/configure
+do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+ if test "x$as_val" = x""yes; then :
++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
@@ -13176,8 +12898,7 @@ Index: pam.debian/configure
+do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+ if test "x$as_val" = x""yes; then :
++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
@@ -13252,33 +12973,11 @@ Index: pam.debian/configure
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+if ac_fn_c_try_compile "$LINENO"; then :
-
+-
- ac_header_compiler=no
-+ # Check for potential -arch flags. It is not universal unless
-+ # there are at least two -arch flags with different values.
-+ ac_arch=
-+ ac_prev=
-+ for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do
-+ if test -n "$ac_prev"; then
-+ case $ac_word in
-+ i?86 | x86_64 | ppc | ppc64)
-+ if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then
-+ ac_arch=$ac_word
-+ else
-+ ac_cv_c_bigendian=universal
-+ break
-+ fi
-+ ;;
-+ esac
-+ ac_prev=
-+ elif test "x$ac_word" = "x-arch"; then
-+ ac_prev=arch
-+ fi
-+ done
- fi
+-fi
-
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
@@ -13559,8 +13258,9 @@ Index: pam.debian/configure
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
--
-- # Check for potential -arch flags. It is not universal unless
++if ac_fn_c_try_compile "$LINENO"; then :
+
+ # Check for potential -arch flags. It is not universal unless
- # there are some -arch flags. Note that *ppc* also matches
- # ppc64. This check is also rather less than ideal.
- case "${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}" in #(
@@ -13571,23 +13271,41 @@ Index: pam.debian/configure
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
--fi
++ # there are at least two -arch flags with different values.
++ ac_arch=
++ ac_prev=
++ for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do
++ if test -n "$ac_prev"; then
++ case $ac_word in
++ i?86 | x86_64 | ppc | ppc64)
++ if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then
++ ac_arch=$ac_word
++ else
++ ac_cv_c_bigendian=universal
++ break
++ fi
++ ;;
++ esac
++ ac_prev=
++ elif test "x$ac_word" = "x-arch"; then
++ ac_prev=arch
++ fi
++ done
+ fi
-
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-- if test $ac_cv_c_bigendian = unknown; then
-- # See if sys/param.h defines the BYTE_ORDER macro.
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ if test $ac_cv_c_bigendian = unknown; then
+ # See if sys/param.h defines the BYTE_ORDER macro.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+ if test $ac_cv_c_bigendian = unknown; then
-+ # See if sys/param.h defines the BYTE_ORDER macro.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/param.h>
-@@ -17134,30 +13894,9 @@
+@@ -17146,30 +13854,9 @@
return 0;
}
_ACEOF
@@ -13620,7 +13338,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/param.h>
-@@ -17173,49 +13912,18 @@
+@@ -17185,49 +13872,18 @@
return 0;
}
_ACEOF
@@ -13673,7 +13391,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
#include <limits.h>
-@@ -17230,30 +13938,9 @@
+@@ -17242,30 +13898,9 @@
return 0;
}
_ACEOF
@@ -13706,7 +13424,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
#include <limits.h>
-@@ -17268,51 +13955,20 @@
+@@ -17280,51 +13915,20 @@
return 0;
}
_ACEOF
@@ -13762,7 +13480,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
short int ascii_mm[] =
{ 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
-@@ -17338,24 +13994,7 @@
+@@ -17350,24 +13954,7 @@
return 0;
}
_ACEOF
@@ -13788,7 +13506,7 @@ Index: pam.debian/configure
if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
ac_cv_c_bigendian=yes
fi
-@@ -17367,20 +14006,10 @@
+@@ -17379,20 +13966,10 @@
ac_cv_c_bigendian=unknown
fi
fi
@@ -13810,7 +13528,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
$ac_includes_default
int
-@@ -17400,79 +14029,41 @@
+@@ -17412,79 +13989,41 @@
return 0;
}
_ACEOF
@@ -13882,8 +13600,8 @@ Index: pam.debian/configure
-$as_echo "$as_me: error: unknown endianness
- presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
- { (exit 1); exit 1; }; } ;;
-+ as_fn_error "unknown endianness
-+ presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
++ as_fn_error $? "unknown endianness
++ presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
esac
-{ $as_echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
@@ -13902,7 +13620,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
int
-@@ -17532,60 +14123,33 @@
+@@ -17544,60 +14083,33 @@
return 0;
}
_ACEOF
@@ -13971,7 +13689,7 @@ Index: pam.debian/configure
ac_cv_type_uid_t=yes
else
ac_cv_type_uid_t=no
-@@ -17593,117 +14157,20 @@
+@@ -17605,117 +14117,20 @@
rm -f conftest*
fi
@@ -13984,12 +13702,12 @@ Index: pam.debian/configure
-#define uid_t int
-_ACEOF
-
-+$as_echo "#define uid_t int" >>confdefs.h
-
+-
-cat >>confdefs.h <<\_ACEOF
-#define gid_t int
-_ACEOF
--
++$as_echo "#define uid_t int" >>confdefs.h
+
-fi
-{ $as_echo "$as_me:$LINENO: checking for off_t" >&5
@@ -14094,7 +13812,7 @@ Index: pam.debian/configure
else
cat >>confdefs.h <<_ACEOF
-@@ -17712,102 +14179,9 @@
+@@ -17724,102 +14139,9 @@
fi
@@ -14185,11 +13903,11 @@ Index: pam.debian/configure
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
--
--fi
+ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default"
+if test "x$ac_cv_type_pid_t" = x""yes; then :
+-fi
+-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5
@@ -14199,7 +13917,7 @@ Index: pam.debian/configure
else
cat >>confdefs.h <<_ACEOF
-@@ -17816,102 +14190,9 @@
+@@ -17828,102 +14150,9 @@
fi
@@ -14290,11 +14008,11 @@ Index: pam.debian/configure
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+-
+-fi
+ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
+if test "x$ac_cv_type_size_t" = x""yes; then :
--fi
--
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
@@ -14304,7 +14022,7 @@ Index: pam.debian/configure
else
cat >>confdefs.h <<_ACEOF
-@@ -17920,16 +14201,12 @@
+@@ -17932,16 +14161,12 @@
fi
@@ -14324,7 +14042,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/time.h>
-@@ -17944,54 +14221,27 @@
+@@ -17956,54 +14181,27 @@
return 0;
}
_ACEOF
@@ -14386,7 +14104,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
#include <sys/types.h>
#include <time.h>
-@@ -18006,58 +14256,31 @@
+@@ -18018,58 +14216,31 @@
return 0;
}
_ACEOF
@@ -14453,7 +14171,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
/* Thanks to Mike Rendell for this test. */
$ac_includes_default
-@@ -18083,54 +14306,23 @@
+@@ -18095,925 +14266,167 @@
return n > 0 && gidset[n] != val.gval;
}
_ACEOF
@@ -14479,49 +14197,44 @@ Index: pam.debian/configure
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-+if ac_fn_c_try_run "$LINENO"; then :
- ac_cv_type_getgroups=gid_t
- else
+- ac_cv_type_getgroups=gid_t
+-else
- $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_type_getgroups=int
-+ ac_cv_type_getgroups=int
- fi
+-fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+ conftest.$ac_objext conftest.beam conftest.$ac_ext
- fi
-
+-fi
+-
-
- if test $ac_cv_type_getgroups = cross; then
+-if test $ac_cv_type_getgroups = cross; then
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
- #include <unistd.h>
-
- _ACEOF
- if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+-/* end confdefs.h. */
+-#include <unistd.h>
+-
+-_ACEOF
+-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "getgroups.*int.*gid_t" >/dev/null 2>&1; then
-+ $EGREP "getgroups.*int.*gid_t" >/dev/null 2>&1; then :
++if ac_fn_c_try_run "$LINENO"; then :
ac_cv_type_getgroups=gid_t
else
- ac_cv_type_getgroups=int
-@@ -18139,869 +14331,156 @@
-
- fi
- fi
+- ac_cv_type_getgroups=int
+-fi
+-rm -f conftest*
+-
+-fi
+-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_getgroups" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_getgroups" >&5
- $as_echo "$ac_cv_type_getgroups" >&6; }
-
+-$as_echo "$ac_cv_type_getgroups" >&6; }
+-
-cat >>confdefs.h <<_ACEOF
-#define GETGROUPS_T $ac_cv_type_getgroups
-_ACEOF
@@ -15184,12 +14897,134 @@ Index: pam.debian/configure
-done
-
-
+-
+-
+-for ac_func in getgrouplist getline getdelim
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+- $as_echo_n "(cached) " >&6
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+- For example, HP-UX 11i <limits.h> declares gettimeofday. */
+-#define $ac_func innocuous_$ac_func
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+- which can conflict with char $ac_func (); below.
+- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+- <limits.h> exists even on freestanding compilers. */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef $ac_func
+-
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char $ac_func ();
+-/* The GNU C library defines this for functions which it implements
+- to always fail with ENOSYS. Some functions are actually named
+- something starting with __ and the normal name is an alias. */
+-#if defined __stub_$ac_func || defined __stub___$ac_func
+-choke me
+-#endif
+-
+-int
+-main ()
+-{
+-return $ac_func ();
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
+- eval "$as_ac_var=yes"
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- eval "$as_ac_var=no"
++ ac_cv_type_getgroups=int
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++ conftest.$ac_objext conftest.beam conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
+- cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+-_ACEOF
+
++if test $ac_cv_type_getgroups = cross; then
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#include <unistd.h>
++
++_ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++ $EGREP "getgroups.*int.*gid_t" >/dev/null 2>&1; then :
++ ac_cv_type_getgroups=gid_t
++else
++ ac_cv_type_getgroups=int
+ fi
+-done
++rm -f conftest*
+
++fi
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_getgroups" >&5
++$as_echo "$ac_cv_type_getgroups" >&6; }
+
+cat >>confdefs.h <<_ACEOF
+#define GETGROUPS_T $ac_cv_type_getgroups
+_ACEOF
--for ac_func in getgrouplist getline getdelim
+-for ac_func in inet_ntop inet_pton ruserok_af
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -15340,32 +15175,13 @@ Index: pam.debian/configure
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
-- eval "$as_ac_var=no"
+ ac_cv_func_memcmp_working=no
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
++fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
- fi
--ac_res=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--as_val=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- if test "x$as_val" = x""yes; then
-- cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
--_ACEOF
-
- fi
--done
--
--
++fi
++
++fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_memcmp_working" >&5
+$as_echo "$ac_cv_func_memcmp_working" >&6; }
+test $ac_cv_func_memcmp_working = no && case " $LIBOBJS " in
@@ -15373,116 +15189,28 @@ Index: pam.debian/configure
+ *) LIBOBJS="$LIBOBJS memcmp.$ac_objext"
+ ;;
+esac
-
-
--for ac_func in inet_ntop inet_pton ruserok_af
--do
--as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
--$as_echo_n "checking for $ac_func... " >&6; }
--if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
--else
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
++
++
+for ac_func in vprintf
+do :
+ ac_fn_c_check_func "$LINENO" "vprintf" "ac_cv_func_vprintf"
+if test "x$ac_cv_func_vprintf" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_VPRINTF 1
- _ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-- For example, HP-UX 11i <limits.h> declares gettimeofday. */
--#define $ac_func innocuous_$ac_func
-
--/* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char $ac_func (); below.
-- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-- <limits.h> exists even on freestanding compilers. */
++_ACEOF
++
+ac_fn_c_check_func "$LINENO" "_doprnt" "ac_cv_func__doprnt"
+if test "x$ac_cv_func__doprnt" = x""yes; then :
-
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
-+$as_echo "#define HAVE_DOPRNT 1" >>confdefs.h
-
--#undef $ac_func
-+fi
-
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
--#ifdef __cplusplus
--extern "C"
--#endif
--char $ac_func ();
--/* The GNU C library defines this for functions which it implements
-- to always fail with ENOSYS. Some functions are actually named
-- something starting with __ and the normal name is an alias. */
--#if defined __stub_$ac_func || defined __stub___$ac_func
--choke me
--#endif
-+fi
-+done
-
--int
--main ()
--{
--return $ac_func ();
-- ;
-- return 0;
--}
+
-+for ac_func in fseeko gethostname gettimeofday lckpwdf mkdir select
-+do :
-+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+ if test "x$as_val" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-- eval "$as_ac_var=yes"
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
++$as_echo "#define HAVE_DOPRNT 1" >>confdefs.h
- eval "$as_ac_var=no"
fi
-+done
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
--fi
+ fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
@@ -15490,21 +15218,33 @@ Index: pam.debian/configure
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-+for ac_func in strcspn strdup strspn strstr strtol uname
++done
++
++
++for ac_func in fseeko gethostname gettimeofday lckpwdf mkdir select
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+ if test "x$as_val" = x""yes; then :
++if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-@@ -19009,103 +14488,52 @@
+@@ -19021,103 +14434,61 @@
fi
done
--
--
++for ac_func in strcspn strdup strspn strstr strtol uname
++do :
++ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
++if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
+
++fi
++done
+
-for ac_func in unshare
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -15519,8 +15259,7 @@ Index: pam.debian/configure
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+ if test "x$as_val" = x""yes; then :
++if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
@@ -15549,8 +15288,7 @@ Index: pam.debian/configure
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+ if test "x$as_val" = x""yes; then :
++if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
@@ -15582,8 +15320,7 @@ Index: pam.debian/configure
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+ if test "x$as_val" = x""yes; then :
++if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
@@ -15639,7 +15376,7 @@ Index: pam.debian/configure
_ACEOF
UNSHARE=yes
else
-@@ -19123,7 +14551,7 @@
+@@ -19135,7 +14506,7 @@
# Check whether --enable-regenerate-docu was given.
@@ -15648,7 +15385,7 @@ Index: pam.debian/configure
enableval=$enable_regenerate_docu; enable_docu=$enableval
else
enable_docu=yes
-@@ -19131,9 +14559,9 @@
+@@ -19143,9 +14514,9 @@
# Extract the first word of "xsltproc", so it can be a program name with args.
set dummy xsltproc; ac_word=$2
@@ -15660,7 +15397,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
case $XSLTPROC in
-@@ -19146,14 +14574,14 @@
+@@ -19158,14 +14529,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -15678,7 +15415,7 @@ Index: pam.debian/configure
IFS=$as_save_IFS
;;
-@@ -19161,10 +14589,10 @@
+@@ -19173,10 +14544,10 @@
fi
XSLTPROC=$ac_cv_path_XSLTPROC
if test -n "$XSLTPROC"; then
@@ -15691,7 +15428,7 @@ Index: pam.debian/configure
$as_echo "no" >&6; }
fi
-@@ -19174,9 +14602,9 @@
+@@ -19186,9 +14557,9 @@
fi
# Extract the first word of "xmllint", so it can be a program name with args.
set dummy xmllint; ac_word=$2
@@ -15703,7 +15440,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
case $XMLLINT in
-@@ -19189,14 +14617,14 @@
+@@ -19201,14 +14572,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -15721,7 +15458,7 @@ Index: pam.debian/configure
IFS=$as_save_IFS
test -z "$ac_cv_path_XMLLINT" && ac_cv_path_XMLLINT="/bin/true"
-@@ -19205,10 +14633,10 @@
+@@ -19217,10 +14588,10 @@
fi
XMLLINT=$ac_cv_path_XMLLINT
if test -n "$XMLLINT"; then
@@ -15734,7 +15471,7 @@ Index: pam.debian/configure
$as_echo "no" >&6; }
fi
-@@ -19217,7 +14645,7 @@
+@@ -19229,7 +14600,7 @@
# check for the presence of the XML catalog
# Check whether --with-xml-catalog was given.
@@ -15743,7 +15480,7 @@ Index: pam.debian/configure
withval=$with_xml_catalog;
else
with_xml_catalog=/etc/xml/catalog
-@@ -19226,23 +14654,23 @@
+@@ -19238,23 +14609,23 @@
jh_found_xmlcatalog=true
XML_CATALOG_FILE="$with_xml_catalog"
@@ -15772,7 +15509,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
case $XMLCATALOG in
-@@ -19255,14 +14683,14 @@
+@@ -19267,14 +14638,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -15790,7 +15527,7 @@ Index: pam.debian/configure
IFS=$as_save_IFS
test -z "$ac_cv_path_XMLCATALOG" && ac_cv_path_XMLCATALOG="no"
-@@ -19271,10 +14699,10 @@
+@@ -19283,10 +14654,10 @@
fi
XMLCATALOG=$ac_cv_path_XMLCATALOG
if test -n "$XMLCATALOG"; then
@@ -15803,7 +15540,7 @@ Index: pam.debian/configure
$as_echo "no" >&6; }
fi
-@@ -19290,35 +14718,35 @@
+@@ -19302,35 +14673,35 @@
fi
@@ -15851,7 +15588,7 @@ Index: pam.debian/configure
$as_echo "not found" >&6; }
enable_docu=no
fi
-@@ -19326,9 +14754,9 @@
+@@ -19338,9 +14709,9 @@
# Extract the first word of "w3m", so it can be a program name with args.
set dummy w3m; ac_word=$2
@@ -15863,7 +15600,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
case $BROWSER in
-@@ -19341,14 +14769,14 @@
+@@ -19353,14 +14724,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -15881,7 +15618,7 @@ Index: pam.debian/configure
IFS=$as_save_IFS
;;
-@@ -19356,10 +14784,10 @@
+@@ -19368,10 +14739,10 @@
fi
BROWSER=$ac_cv_path_BROWSER
if test -n "$BROWSER"; then
@@ -15894,7 +15631,7 @@ Index: pam.debian/configure
$as_echo "no" >&6; }
fi
-@@ -19372,9 +14800,9 @@
+@@ -19384,9 +14755,9 @@
# Extract the first word of "fop", so it can be a program name with args.
set dummy fop; ac_word=$2
@@ -15906,7 +15643,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
case $FO2PDF in
-@@ -19387,14 +14815,14 @@
+@@ -19399,14 +14770,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -15924,7 +15661,7 @@ Index: pam.debian/configure
IFS=$as_save_IFS
;;
-@@ -19402,10 +14830,10 @@
+@@ -19414,10 +14785,10 @@
fi
FO2PDF=$ac_cv_path_FO2PDF
if test -n "$FO2PDF"; then
@@ -15937,7 +15674,7 @@ Index: pam.debian/configure
$as_echo "no" >&6; }
fi
-@@ -19431,16 +14859,16 @@
+@@ -19443,16 +14814,16 @@
@@ -15957,7 +15694,7 @@ Index: pam.debian/configure
$as_echo "$USE_NLS" >&6; }
-@@ -19481,9 +14909,9 @@
+@@ -19493,9 +14864,9 @@
# Extract the first word of "msgfmt", so it can be a program name with args.
set dummy msgfmt; ac_word=$2
@@ -15969,7 +15706,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
case "$MSGFMT" in
-@@ -19513,18 +14941,18 @@
+@@ -19525,18 +14896,18 @@
fi
MSGFMT="$ac_cv_path_MSGFMT"
if test "$MSGFMT" != ":"; then
@@ -15992,7 +15729,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
case $GMSGFMT in
-@@ -19537,14 +14965,14 @@
+@@ -19549,14 +14920,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -16010,7 +15747,7 @@ Index: pam.debian/configure
IFS=$as_save_IFS
test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-@@ -19553,10 +14981,10 @@
+@@ -19565,10 +14936,10 @@
fi
GMSGFMT=$ac_cv_path_GMSGFMT
if test -n "$GMSGFMT"; then
@@ -16023,7 +15760,7 @@ Index: pam.debian/configure
$as_echo "no" >&6; }
fi
-@@ -19604,9 +15032,9 @@
+@@ -19616,9 +14987,9 @@
# Extract the first word of "xgettext", so it can be a program name with args.
set dummy xgettext; ac_word=$2
@@ -16035,7 +15772,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
case "$XGETTEXT" in
-@@ -19636,10 +15064,10 @@
+@@ -19648,10 +15019,10 @@
fi
XGETTEXT="$ac_cv_path_XGETTEXT"
if test "$XGETTEXT" != ":"; then
@@ -16048,7 +15785,7 @@ Index: pam.debian/configure
$as_echo "no" >&6; }
fi
-@@ -19682,9 +15110,9 @@
+@@ -19694,9 +15065,9 @@
# Extract the first word of "msgmerge", so it can be a program name with args.
set dummy msgmerge; ac_word=$2
@@ -16060,7 +15797,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
case "$MSGMERGE" in
-@@ -19713,10 +15141,10 @@
+@@ -19725,10 +15096,10 @@
fi
MSGMERGE="$ac_cv_path_MSGMERGE"
if test "$MSGMERGE" != ":"; then
@@ -16073,7 +15810,7 @@ Index: pam.debian/configure
$as_echo "no" >&6; }
fi
-@@ -19748,7 +15176,7 @@
+@@ -19760,7 +15131,7 @@
# Check whether --with-gnu-ld was given.
@@ -16082,7 +15819,7 @@ Index: pam.debian/configure
withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
else
with_gnu_ld=no
-@@ -19770,7 +15198,7 @@
+@@ -19782,7 +15153,7 @@
ac_prog=ld
if test "$GCC" = yes; then
# Check if gcc -print-prog-name=ld gives a path.
@@ -16091,7 +15828,7 @@ Index: pam.debian/configure
$as_echo_n "checking for ld used by GCC... " >&6; }
case $host in
*-*-mingw*)
-@@ -19800,13 +15228,13 @@
+@@ -19812,13 +15183,13 @@
;;
esac
elif test "$with_gnu_ld" = yes; then
@@ -16108,7 +15845,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
if test -z "$LD"; then
-@@ -19834,18 +15262,16 @@
+@@ -19846,18 +15217,16 @@
LD="$acl_cv_path_LD"
if test -n "$LD"; then
@@ -16124,7 +15861,7 @@ Index: pam.debian/configure
-$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
- { (exit 1); exit 1; }; }
-{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
-+test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
++test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
-if test "${acl_cv_prog_gnu_ld+set}" = set; then
@@ -16132,7 +15869,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
# I'd rather use --version here, but apparently some GNU ld's only accept -v.
-@@ -19856,16 +15282,16 @@
+@@ -19868,16 +15237,16 @@
acl_cv_prog_gnu_ld=no ;;
esac
fi
@@ -16152,7 +15889,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
-@@ -19876,7 +15302,7 @@
+@@ -19888,7 +15257,7 @@
acl_cv_rpath=done
fi
@@ -16161,7 +15898,7 @@ Index: pam.debian/configure
$as_echo "$acl_cv_rpath" >&6; }
wl="$acl_cv_wl"
acl_libext="$acl_cv_libext"
-@@ -19888,7 +15314,7 @@
+@@ -19900,7 +15269,7 @@
acl_hardcode_direct="$acl_cv_hardcode_direct"
acl_hardcode_minus_L="$acl_cv_hardcode_minus_L"
# Check whether --enable-rpath was given.
@@ -16170,7 +15907,7 @@ Index: pam.debian/configure
enableval=$enable_rpath; :
else
enable_rpath=yes
-@@ -19937,7 +15363,7 @@
+@@ -19949,7 +15318,7 @@
# Check whether --with-libiconv-prefix was given.
@@ -16179,7 +15916,7 @@ Index: pam.debian/configure
withval=$with_libiconv_prefix;
if test "X$withval" = "Xno"; then
use_additional=no
-@@ -20377,18 +15803,14 @@
+@@ -20389,83 +15758,48 @@
@@ -16197,14 +15934,16 @@ Index: pam.debian/configure
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
- #include <CoreFoundation/CFPreferences.h>
- int
-@@ -20399,61 +15821,30 @@
- return 0;
- }
- _ACEOF
+-/* end confdefs.h. */
+-#include <CoreFoundation/CFPreferences.h>
+-int
+-main ()
+-{
+-CFPreferencesCopyAppValue(NULL, NULL)
+- ;
+- return 0;
+-}
+-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -16226,6 +15965,17 @@ Index: pam.debian/configure
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#include <CoreFoundation/CFPreferences.h>
++int
++main ()
++{
++CFPreferencesCopyAppValue(NULL, NULL)
++ ;
++ return 0;
++}
++_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
gt_cv_func_CFPreferencesCopyAppValue=yes
else
@@ -16272,7 +16022,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
#include <CoreFoundation/CFLocale.h>
int
-@@ -20464,47 +15855,20 @@
+@@ -20476,47 +15810,20 @@
return 0;
}
_ACEOF
@@ -16326,7 +16076,7 @@ Index: pam.debian/configure
fi
INTL_MACOSX_LIBS=
-@@ -20549,16 +15913,12 @@
+@@ -20561,16 +15868,12 @@
gt_expression_test_code=
fi
@@ -16334,7 +16084,7 @@ Index: pam.debian/configure
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libc" >&5
$as_echo_n "checking for GNU gettext in libc... " >&6; }
-if { as_var=$gt_func_gnugettext_libc; eval "test \"\${$as_var+set}\" = set"; }; then
-+if { as_var=$gt_func_gnugettext_libc; eval "test \"\${$as_var+set}\" = set"; }; then :
++if eval "test \"\${$gt_func_gnugettext_libc+set}\"" = set; then :
$as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
@@ -16346,7 +16096,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
#include <libintl.h>
$gt_revision_test_code
-@@ -20573,42 +15933,16 @@
+@@ -20585,42 +15888,16 @@
return 0;
}
_ACEOF
@@ -16395,7 +16145,7 @@ Index: pam.debian/configure
$as_echo "$ac_res" >&6; }
if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
-@@ -20642,19 +15976,15 @@
+@@ -20654,19 +15931,15 @@
done
@@ -16418,7 +16168,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
#include <stdlib.h>
#include <iconv.h>
-@@ -20668,46 +15998,15 @@
+@@ -20680,46 +15953,15 @@
return 0;
}
_ACEOF
@@ -16469,7 +16219,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
#include <stdlib.h>
#include <iconv.h>
-@@ -20721,49 +16020,22 @@
+@@ -20733,49 +15975,22 @@
return 0;
}
_ACEOF
@@ -16525,7 +16275,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
-@@ -20771,17 +16043,13 @@
+@@ -20783,17 +15998,13 @@
if test $am_cv_lib_iconv = yes; then
LIBS="$LIBS $LIBICONV"
fi
@@ -16545,7 +16295,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
#include <iconv.h>
-@@ -20841,46 +16109,19 @@
+@@ -20853,46 +16064,19 @@
return 0;
}
_ACEOF
@@ -16597,7 +16347,7 @@ Index: pam.debian/configure
$as_echo "$am_cv_func_iconv_works" >&6; }
case "$am_cv_func_iconv_works" in
*no) am_func_iconv=no am_cv_lib_iconv=no ;;
-@@ -20891,15 +16132,13 @@
+@@ -20903,15 +16087,13 @@
fi
if test "$am_func_iconv" = yes; then
@@ -16616,7 +16366,7 @@ Index: pam.debian/configure
$as_echo "$LIBICONV" >&6; }
else
CPPFLAGS="$am_save_CPPFLAGS"
-@@ -20929,7 +16168,7 @@
+@@ -20941,7 +16123,7 @@
# Check whether --with-libintl-prefix was given.
@@ -16625,7 +16375,7 @@ Index: pam.debian/configure
withval=$with_libintl_prefix;
if test "X$withval" = "Xno"; then
use_additional=no
-@@ -21345,20 +16584,16 @@
+@@ -21357,20 +16539,16 @@
done
fi
@@ -16633,7 +16383,7 @@ Index: pam.debian/configure
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libintl" >&5
$as_echo_n "checking for GNU gettext in libintl... " >&6; }
-if { as_var=$gt_func_gnugettext_libintl; eval "test \"\${$as_var+set}\" = set"; }; then
-+if { as_var=$gt_func_gnugettext_libintl; eval "test \"\${$as_var+set}\" = set"; }; then :
++if eval "test \"\${$gt_func_gnugettext_libintl+set}\"" = set; then :
$as_echo_n "(cached) " >&6
else
gt_save_CPPFLAGS="$CPPFLAGS"
@@ -16649,7 +16399,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
#include <libintl.h>
$gt_revision_test_code
-@@ -21377,45 +16612,16 @@
+@@ -21389,45 +16567,16 @@
return 0;
}
_ACEOF
@@ -16700,7 +16450,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
#include <libintl.h>
$gt_revision_test_code
-@@ -21434,48 +16640,20 @@
+@@ -21446,48 +16595,20 @@
return 0;
}
_ACEOF
@@ -16754,7 +16504,7 @@ Index: pam.debian/configure
$as_echo "$ac_res" >&6; }
fi
-@@ -21503,21 +16681,19 @@
+@@ -21515,21 +16636,19 @@
if test "$gt_use_preinstalled_gnugettext" = "yes" \
|| test "$nls_cv_use_gnu_gettext" = "yes"; then
@@ -16780,7 +16530,7 @@ Index: pam.debian/configure
$as_echo_n "checking where the gettext function comes from... " >&6; }
if test "$gt_use_preinstalled_gnugettext" = "yes"; then
if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
-@@ -21528,7 +16704,7 @@
+@@ -21540,7 +16659,7 @@
else
gt_source="included intl directory"
fi
@@ -16789,7 +16539,7 @@ Index: pam.debian/configure
$as_echo "$gt_source" >&6; }
fi
-@@ -21536,9 +16712,9 @@
+@@ -21548,9 +16667,9 @@
if test "$gt_use_preinstalled_gnugettext" = "yes"; then
if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
@@ -16801,7 +16551,7 @@ Index: pam.debian/configure
$as_echo "$LIBINTL" >&6; }
for element in $INCINTL; do
-@@ -21566,14 +16742,10 @@
+@@ -21578,14 +16697,10 @@
fi
@@ -16818,11 +16568,14 @@ Index: pam.debian/configure
fi
-@@ -21589,226 +16761,31 @@
+@@ -21598,229 +16713,34 @@
-
+-
+-
+-
-for ac_func in dngettext
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -17010,6 +16763,9 @@ Index: pam.debian/configure
- ;
- return 0;
-}
++
++
++
+for ac_func in dngettext
+do :
+ ac_fn_c_check_func "$LINENO" "dngettext" "ac_cv_func_dngettext"
@@ -17065,7 +16821,7 @@ Index: pam.debian/configure
have_key_errors=1
else
have_key_errors=0
-@@ -21823,9 +16800,7 @@
+@@ -21835,9 +16755,7 @@
if test $HAVE_KEY_MANAGEMENT = 1; then
@@ -17076,7 +16832,7 @@ Index: pam.debian/configure
fi
HAVE_KEY_MANAGEMENT=$HAVE_KEY_MANAGEMENT
-@@ -21869,13 +16844,13 @@
+@@ -21881,13 +16799,13 @@
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
@@ -17092,7 +16848,7 @@ Index: pam.debian/configure
esac ;;
esac
done
-@@ -21883,8 +16858,8 @@
+@@ -21895,8 +16813,8 @@
(set) 2>&1 |
case $as_nl`(ac_space=' '; set) 2>&1` in #(
*${as_nl}ac_space=\ *)
@@ -17103,7 +16859,7 @@ Index: pam.debian/configure
sed -n \
"s/'/'\\\\''/g;
s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-@@ -21907,11 +16882,11 @@
+@@ -21919,11 +16837,11 @@
if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
if test -w "$cache_file"; then
test "x$cache_file" != "x/dev/null" &&
@@ -17117,7 +16873,14 @@ Index: pam.debian/configure
$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
fi
fi
-@@ -21931,114 +16906,84 @@
+@@ -21937,14 +16855,15 @@
+
+ ac_libobjs=
+ ac_ltlibobjs=
++U=
+ for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
+ # 1. Remove the extension, and $U if already installed.
+ ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
# 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
# will be set to the directory where LIBOBJS objects are built.
@@ -17128,24 +16891,16 @@ Index: pam.debian/configure
done
LIBOBJS=$ac_libobjs
- LTLIBOBJS=$ac_ltlibobjs
+@@ -21952,105 +16871,67 @@
-+ if test -n "$EXEEXT"; then
-+ am__EXEEXT_TRUE=
-+ am__EXEEXT_FALSE='#'
-+else
-+ am__EXEEXT_TRUE='#'
-+ am__EXEEXT_FALSE=
-+fi
-+
if test -z "${STATIC_MODULES_TRUE}" && test -z "${STATIC_MODULES_FALSE}"; then
- { { $as_echo "$as_me:$LINENO: error: conditional \"STATIC_MODULES\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"STATIC_MODULES\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
-+ as_fn_error "conditional \"STATIC_MODULES\" was never defined.
++ as_fn_error $? "conditional \"STATIC_MODULES\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
@@ -17154,7 +16909,7 @@ Index: pam.debian/configure
-$as_echo "$as_me: error: conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
-+ as_fn_error "conditional \"AMDEP\" was never defined.
++ as_fn_error $? "conditional \"AMDEP\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
@@ -17163,7 +16918,7 @@ Index: pam.debian/configure
-$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
-+ as_fn_error "conditional \"am__fastdepCC\" was never defined.
++ as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
@@ -17172,7 +16927,7 @@ Index: pam.debian/configure
-$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
-+ as_fn_error "conditional \"am__fastdepCC\" was never defined.
++ as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${HAVE_VERSIONING_TRUE}" && test -z "${HAVE_VERSIONING_FALSE}"; then
@@ -17181,7 +16936,7 @@ Index: pam.debian/configure
-$as_echo "$as_me: error: conditional \"HAVE_VERSIONING\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
-+ as_fn_error "conditional \"HAVE_VERSIONING\" was never defined.
++ as_fn_error $? "conditional \"HAVE_VERSIONING\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${HAVE_LIBCRACK_TRUE}" && test -z "${HAVE_LIBCRACK_FALSE}"; then
@@ -17190,7 +16945,7 @@ Index: pam.debian/configure
-$as_echo "$as_me: error: conditional \"HAVE_LIBCRACK\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
-+ as_fn_error "conditional \"HAVE_LIBCRACK\" was never defined.
++ as_fn_error $? "conditional \"HAVE_LIBCRACK\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${HAVE_AUDIT_TTY_STATUS_TRUE}" && test -z "${HAVE_AUDIT_TTY_STATUS_FALSE}"; then
@@ -17199,7 +16954,7 @@ Index: pam.debian/configure
-$as_echo "$as_me: error: conditional \"HAVE_AUDIT_TTY_STATUS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
-+ as_fn_error "conditional \"HAVE_AUDIT_TTY_STATUS\" was never defined.
++ as_fn_error $? "conditional \"HAVE_AUDIT_TTY_STATUS\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${HAVE_LIBDB_TRUE}" && test -z "${HAVE_LIBDB_FALSE}"; then
@@ -17208,7 +16963,7 @@ Index: pam.debian/configure
-$as_echo "$as_me: error: conditional \"HAVE_LIBDB\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
-+ as_fn_error "conditional \"HAVE_LIBDB\" was never defined.
++ as_fn_error $? "conditional \"HAVE_LIBDB\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${HAVE_LIBSELINUX_TRUE}" && test -z "${HAVE_LIBSELINUX_FALSE}"; then
@@ -17217,7 +16972,7 @@ Index: pam.debian/configure
-$as_echo "$as_me: error: conditional \"HAVE_LIBSELINUX\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
-+ as_fn_error "conditional \"HAVE_LIBSELINUX\" was never defined.
++ as_fn_error $? "conditional \"HAVE_LIBSELINUX\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
@@ -17227,7 +16982,7 @@ Index: pam.debian/configure
-$as_echo "$as_me: error: conditional \"HAVE_UNSHARE\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
-+ as_fn_error "conditional \"HAVE_UNSHARE\" was never defined.
++ as_fn_error $? "conditional \"HAVE_UNSHARE\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${ENABLE_REGENERATE_MAN_TRUE}" && test -z "${ENABLE_REGENERATE_MAN_FALSE}"; then
@@ -17236,7 +16991,7 @@ Index: pam.debian/configure
-$as_echo "$as_me: error: conditional \"ENABLE_REGENERATE_MAN\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
-+ as_fn_error "conditional \"ENABLE_REGENERATE_MAN\" was never defined.
++ as_fn_error $? "conditional \"ENABLE_REGENERATE_MAN\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${ENABLE_GENERATE_PDF_TRUE}" && test -z "${ENABLE_GENERATE_PDF_FALSE}"; then
@@ -17245,7 +17000,7 @@ Index: pam.debian/configure
-$as_echo "$as_me: error: conditional \"ENABLE_GENERATE_PDF\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
-+ as_fn_error "conditional \"ENABLE_GENERATE_PDF\" was never defined.
++ as_fn_error $? "conditional \"ENABLE_GENERATE_PDF\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${HAVE_KEY_MANAGEMENT_TRUE}" && test -z "${HAVE_KEY_MANAGEMENT_FALSE}"; then
@@ -17254,7 +17009,7 @@ Index: pam.debian/configure
-$as_echo "$as_me: error: conditional \"HAVE_KEY_MANAGEMENT\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
-+ as_fn_error "conditional \"HAVE_KEY_MANAGEMENT\" was never defined.
++ as_fn_error $? "conditional \"HAVE_KEY_MANAGEMENT\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
@@ -17271,7 +17026,7 @@ Index: pam.debian/configure
#! $SHELL
# Generated by $as_me.
# Run this file to recreate the current configuration.
-@@ -22048,17 +16993,18 @@
+@@ -22060,17 +16941,18 @@
debug=false
ac_cs_recheck=false
ac_cs_silent=false
@@ -17297,7 +17052,7 @@ Index: pam.debian/configure
emulate sh
NULLCMD=:
# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-@@ -22066,23 +17012,15 @@
+@@ -22078,23 +16960,15 @@
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
@@ -17326,7 +17081,7 @@ Index: pam.debian/configure
as_nl='
'
export as_nl
-@@ -22090,7 +17028,13 @@
+@@ -22102,7 +16976,13 @@
as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
@@ -17341,7 +17096,7 @@ Index: pam.debian/configure
as_echo='printf %s\n'
as_echo_n='printf %s'
else
-@@ -22101,7 +17045,7 @@
+@@ -22113,7 +16993,7 @@
as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
as_echo_n_body='eval
arg=$1;
@@ -17350,7 +17105,7 @@ Index: pam.debian/configure
*"$as_nl"*)
expr "X$arg" : "X\\(.*\\)$as_nl";
arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-@@ -22124,13 +17068,6 @@
+@@ -22136,13 +17016,6 @@
}
fi
@@ -17364,7 +17119,7 @@ Index: pam.debian/configure
# IFS
# We need space, tab and new line, in precisely that order. Quoting is
-@@ -22140,15 +17077,15 @@
+@@ -22152,15 +17025,15 @@
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
@@ -17383,7 +17138,7 @@ Index: pam.debian/configure
IFS=$as_save_IFS
;;
-@@ -22160,12 +17097,16 @@
+@@ -22172,12 +17045,16 @@
fi
if test ! -f "$as_myself"; then
$as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
@@ -17404,7 +17159,7 @@ Index: pam.debian/configure
done
PS1='$ '
PS2='> '
-@@ -22177,7 +17118,89 @@
+@@ -22189,7 +17066,89 @@
LANGUAGE=C
export LANGUAGE
@@ -17413,19 +17168,19 @@ Index: pam.debian/configure
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+
-+# as_fn_error ERROR [LINENO LOG_FD]
-+# ---------------------------------
++# as_fn_error STATUS ERROR [LINENO LOG_FD]
++# ----------------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-+# script with status $?, using 1 if that was 0.
++# script with STATUS, using 1 if that was 0.
+as_fn_error ()
+{
-+ as_status=$?; test $as_status -eq 0 && as_status=1
-+ if test "$3"; then
-+ as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
++ as_status=$1; test $as_status -eq 0 && as_status=1
++ if test "$4"; then
++ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
++ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+ fi
-+ $as_echo "$as_me: error: $1" >&2
++ $as_echo "$as_me: error: $2" >&2
+ as_fn_exit $as_status
+} # as_fn_error
+
@@ -17495,7 +17250,7 @@ Index: pam.debian/configure
if expr a : '\(a\)' >/dev/null 2>&1 &&
test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
-@@ -22191,8 +17214,12 @@
+@@ -22203,8 +17162,12 @@
as_basename=false
fi
@@ -17509,7 +17264,7 @@ Index: pam.debian/configure
as_me=`$as_basename -- "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
-@@ -22212,76 +17239,25 @@
+@@ -22224,76 +17187,25 @@
}
s/.*/./; q'`
@@ -17597,7 +17352,7 @@ Index: pam.debian/configure
rm -f conf$$ conf$$.exe conf$$.file
if test -d conf$$.dir; then
-@@ -22310,8 +17286,56 @@
+@@ -22322,8 +17234,56 @@
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
@@ -17645,7 +17400,7 @@ Index: pam.debian/configure
+ test -d "$as_dir" && break
+ done
+ test -z "$as_dirs" || eval "mkdir $as_dirs"
-+ } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
++ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+
+
+} # as_fn_mkdir_p
@@ -17655,7 +17410,7 @@ Index: pam.debian/configure
else
test -d ./-p && rmdir ./-p
as_mkdir_p=false
-@@ -22330,10 +17354,10 @@
+@@ -22342,10 +17302,10 @@
if test -d "$1"; then
test -d "$1/.";
else
@@ -17668,7 +17423,7 @@ Index: pam.debian/configure
???[sx]*):;;*)false;;esac;fi
'\'' sh
'
-@@ -22348,13 +17372,19 @@
+@@ -22360,13 +17320,19 @@
exec 6>&1
@@ -17686,11 +17441,11 @@ Index: pam.debian/configure
ac_log="
This file was extended by $as_me, which was
-generated by GNU Autoconf 2.63. Invocation command line was
-+generated by GNU Autoconf 2.65. Invocation command line was
++generated by GNU Autoconf 2.67. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -22386,13 +17416,15 @@
+@@ -22398,13 +17364,15 @@
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
ac_cs_usage="\
@@ -17709,7 +17464,7 @@ Index: pam.debian/configure
-q, --quiet, --silent
do not print progress messages
-d, --debug don't remove temporary files
-@@ -22411,16 +17443,17 @@
+@@ -22423,16 +17391,17 @@
Configuration commands:
$config_commands
@@ -17723,15 +17478,33 @@ Index: pam.debian/configure
config.status
-configured by $0, generated by GNU Autoconf 2.63,
- with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
-+configured by $0, generated by GNU Autoconf 2.65,
++configured by $0, generated by GNU Autoconf 2.67,
+ with options \\"\$ac_cs_config\\"
-Copyright (C) 2008 Free Software Foundation, Inc.
-+Copyright (C) 2009 Free Software Foundation, Inc.
++Copyright (C) 2010 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
-@@ -22456,6 +17489,8 @@
+@@ -22450,11 +17419,16 @@
+ while test $# != 0
+ do
+ case $1 in
+- --*=*)
++ --*=?*)
+ ac_option=`expr "X$1" : 'X\([^=]*\)='`
+ ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
+ ac_shift=:
+ ;;
++ --*=)
++ ac_option=`expr "X$1" : 'X\([^=]*\)='`
++ ac_optarg=
++ ac_shift=:
++ ;;
+ *)
+ ac_option=$1
+ ac_optarg=$2
+@@ -22468,27 +17442,29 @@
ac_cs_recheck=: ;;
--version | --versio | --versi | --vers | --ver | --ve | --v | -V )
$as_echo "$ac_cs_version"; exit ;;
@@ -17740,9 +17513,10 @@ Index: pam.debian/configure
--debug | --debu | --deb | --de | --d | -d )
debug=: ;;
--file | --fil | --fi | --f )
-@@ -22463,20 +17498,19 @@
+ $ac_shift
case $ac_optarg in
*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
++ '') as_fn_error $? "missing file argument" ;;
esac
- CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
+ as_fn_append CONFIG_FILES " '$ac_optarg'"
@@ -17760,19 +17534,19 @@ Index: pam.debian/configure
- { $as_echo "$as_me: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&2
- { (exit 1); exit 1; }; };;
-+ as_fn_error "ambiguous option: \`$1'
++ as_fn_error $? "ambiguous option: \`$1'
+Try \`$0 --help' for more information.";;
--help | --hel | -h )
$as_echo "$ac_cs_usage"; exit ;;
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
-@@ -22484,11 +17518,10 @@
+@@ -22496,11 +17472,10 @@
ac_cs_silent=: ;;
# This is an error.
- -*) { $as_echo "$as_me: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&2
- { (exit 1); exit 1; }; } ;;
-+ -*) as_fn_error "unrecognized option: \`$1'
++ -*) as_fn_error $? "unrecognized option: \`$1'
+Try \`$0 --help' for more information." ;;
- *) ac_config_targets="$ac_config_targets $1"
@@ -17780,18 +17554,18 @@ Index: pam.debian/configure
ac_need_defaults=false ;;
esac
-@@ -22869,9 +17902,7 @@
+@@ -22881,9 +17856,7 @@
"tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
"xtests/Makefile") CONFIG_FILES="$CONFIG_FILES xtests/Makefile" ;;
- *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
- { (exit 1); exit 1; }; };;
-+ *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
++ *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
esac
done
-@@ -22898,7 +17929,7 @@
+@@ -22910,7 +17883,7 @@
trap 'exit_status=$?
{ test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
' 0
@@ -17800,7 +17574,7 @@ Index: pam.debian/configure
}
# Create a (secure) tmp directory for tmp files.
-@@ -22909,11 +17940,7 @@
+@@ -22921,11 +17894,7 @@
{
tmp=./conf$$-$RANDOM
(umask 077 && mkdir "$tmp")
@@ -17809,11 +17583,11 @@ Index: pam.debian/configure
- $as_echo "$as_me: cannot create a temporary directory in ." >&2
- { (exit 1); exit 1; }
-}
-+} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
++} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
# Set up the scripts for CONFIG_FILES section.
# No need to generate them if there are no CONFIG_FILES.
-@@ -22921,10 +17948,16 @@
+@@ -22933,7 +17902,13 @@
if test -n "$CONFIG_FILES"; then
@@ -17827,27 +17601,24 @@ Index: pam.debian/configure
+fi
ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
-- ac_cs_awk_cr='\\r'
-+ ac_cs_awk_cr='\r'
- else
- ac_cs_awk_cr=$ac_cr
- fi
-@@ -22938,24 +17971,18 @@
+ ac_cs_awk_cr='\\r'
+@@ -22950,24 +17925,18 @@
echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
echo "_ACEOF"
} >conf$$subs.sh ||
- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
- { (exit 1); exit 1; }; }
-+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
- ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
+-ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
++ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
++ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
. ./conf$$subs.sh ||
- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
- { (exit 1); exit 1; }; }
-+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
++ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
if test $ac_delim_n = $ac_delim_num; then
@@ -17856,11 +17627,11 @@ Index: pam.debian/configure
- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
- { (exit 1); exit 1; }; }
-+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
++ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-@@ -22977,7 +18004,7 @@
+@@ -22989,7 +17958,7 @@
t delim
:nl
h
@@ -17869,7 +17640,7 @@ Index: pam.debian/configure
t more1
s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
p
-@@ -22991,7 +18018,7 @@
+@@ -23003,7 +17972,7 @@
t nl
:delim
h
@@ -17878,58 +17649,86 @@ Index: pam.debian/configure
t more2
s/["\\]/\\&/g; s/^/"/; s/$/"/
p
-@@ -23044,9 +18071,7 @@
+@@ -23056,22 +18025,28 @@
else
cat
fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
- || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
-$as_echo "$as_me: error: could not setup config files machinery" >&2;}
- { (exit 1); exit 1; }; }
-+ || as_fn_error "could not setup config files machinery" "$LINENO" 5
++ || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
_ACEOF
- # VPATH may cause trouble with some makes, so we remove $(srcdir),
-@@ -23087,9 +18112,7 @@
+-# VPATH may cause trouble with some makes, so we remove $(srcdir),
+-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
++# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
++# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
+ # trailing colons and then remove the whole line if VPATH becomes empty
+ # (actually we leave an empty line to preserve line numbers).
+ if test "x$srcdir" = x.; then
+- ac_vpsub='/^[ ]*VPATH[ ]*=/{
+-s/:*\$(srcdir):*/:/
+-s/:*\${srcdir}:*/:/
+-s/:*@srcdir@:*/:/
+-s/^\([^=]*=[ ]*\):*/\1/
++ ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{
++h
++s///
++s/^/:/
++s/[ ]*$/:/
++s/:\$(srcdir):/:/g
++s/:\${srcdir}:/:/g
++s/:@srcdir@:/:/g
++s/^:*//
+ s/:*$//
++x
++s/\(=[ ]*\).*/\1/
++G
++s/\n//
+ s/^[^=]*=[ ]*$//
+ }'
+ fi
+@@ -23099,9 +18074,7 @@
if test -z "$ac_t"; then
break
elif $ac_last_try; then
- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;}
- { (exit 1); exit 1; }; }
-+ as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
++ as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-@@ -23174,9 +18197,7 @@
+@@ -23186,9 +18159,7 @@
_ACAWK
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
- { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5
-$as_echo "$as_me: error: could not setup config headers machinery" >&2;}
- { (exit 1); exit 1; }; }
-+ as_fn_error "could not setup config headers machinery" "$LINENO" 5
++ as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
fi # test -n "$CONFIG_HEADERS"
-@@ -23189,9 +18210,7 @@
+@@ -23201,9 +18172,7 @@
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
- :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5
-$as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
- { (exit 1); exit 1; }; };;
-+ :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
++ :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
esac
-@@ -23219,12 +18238,10 @@
+@@ -23231,12 +18200,10 @@
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
- { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
-$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
- { (exit 1); exit 1; }; };;
-+ as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
++ as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;
esac
case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
- ac_file_inputs="$ac_file_inputs '$ac_f'"
@@ -17937,7 +17736,7 @@ Index: pam.debian/configure
done
# Let's still pretend it is `configure' which instantiates (i.e., don't
-@@ -23235,7 +18252,7 @@
+@@ -23247,7 +18214,7 @@
`' by configure.'
if test x"$ac_file" != x-; then
configure_input="$ac_file. $configure_input"
@@ -17946,18 +17745,18 @@ Index: pam.debian/configure
$as_echo "$as_me: creating $ac_file" >&6;}
fi
# Neutralize special characters interpreted by sed in replacement strings.
-@@ -23248,9 +18265,7 @@
+@@ -23260,9 +18227,7 @@
case $ac_tag in
*:-:* | *:-) cat >"$tmp/stdin" \
- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
- { (exit 1); exit 1; }; } ;;
-+ || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
esac
;;
esac
-@@ -23278,47 +18293,7 @@
+@@ -23290,47 +18255,7 @@
q
}
s/.*/./; q'`
@@ -18006,7 +17805,7 @@ Index: pam.debian/configure
ac_builddir=.
case "$ac_dir" in
-@@ -23375,7 +18350,6 @@
+@@ -23387,7 +18312,6 @@
# If the template does not know about datarootdir, expand it.
# FIXME: This hack should be removed a few years after 2.60.
ac_datarootdir_hack=; ac_datarootdir_seen=
@@ -18014,7 +17813,7 @@ Index: pam.debian/configure
ac_sed_dataroot='
/datarootdir/ {
p
-@@ -23385,12 +18359,11 @@
+@@ -23397,12 +18321,11 @@
/@docdir@/p
/@infodir@/p
/@localedir@/p
@@ -18029,7 +17828,7 @@ Index: pam.debian/configure
$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-@@ -23400,7 +18373,7 @@
+@@ -23412,7 +18335,7 @@
s&@infodir@&$infodir&g
s&@localedir@&$localedir&g
s&@mandir@&$mandir&g
@@ -18038,42 +17837,46 @@ Index: pam.debian/configure
esac
_ACEOF
-@@ -23429,14 +18402,12 @@
+@@ -23441,26 +18364,22 @@
$ac_datarootdir_hack
"
eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
- { (exit 1); exit 1; }; }
-+ || as_fn_error "could not create $ac_file" "$LINENO" 5
++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
{ ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
{ ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
- { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+-which seems to be undefined. Please make sure it is defined." >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
- which seems to be undefined. Please make sure it is defined." >&5
++which seems to be undefined. Please make sure it is defined" >&5
$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
- which seems to be undefined. Please make sure it is defined." >&2;}
-@@ -23446,9 +18417,7 @@
+-which seems to be undefined. Please make sure it is defined." >&2;}
++which seems to be undefined. Please make sure it is defined" >&2;}
+
+ rm -f "$tmp/stdin"
+ case $ac_file in
-) cat "$tmp/out" && rm -f "$tmp/out";;
*) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
esac \
- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
- { (exit 1); exit 1; }; }
-+ || as_fn_error "could not create $ac_file" "$LINENO" 5
++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
;;
:H)
#
-@@ -23459,25 +18428,19 @@
+@@ -23471,25 +18390,19 @@
$as_echo "/* $configure_input */" \
&& eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
} >"$tmp/config.h" \
- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
- { (exit 1); exit 1; }; }
-+ || as_fn_error "could not create $ac_file" "$LINENO" 5
++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
- { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
@@ -18084,7 +17887,7 @@ Index: pam.debian/configure
- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
- { (exit 1); exit 1; }; }
-+ || as_fn_error "could not create $ac_file" "$LINENO" 5
++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5
fi
else
$as_echo "/* $configure_input */" \
@@ -18092,11 +17895,11 @@ Index: pam.debian/configure
- || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5
-$as_echo "$as_me: error: could not create -" >&2;}
- { (exit 1); exit 1; }; }
-+ || as_fn_error "could not create -" "$LINENO" 5
++ || as_fn_error $? "could not create -" "$LINENO" 5
fi
# Compute "$ac_file"'s index in $config_headers.
_am_arg="$ac_file"
-@@ -23515,25 +18478,35 @@
+@@ -23527,25 +18440,35 @@
s/.*/./; q'`/stamp-h$_am_stamp_count
;;
@@ -18145,7 +17948,7 @@ Index: pam.debian/configure
$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$mf" : 'X\(//\)[^/]' \| \
X"$mf" : 'X\(//\)$' \| \
-@@ -23556,28 +18529,28 @@
+@@ -23568,28 +18491,28 @@
q
}
s/.*/./; q'`
@@ -18196,7 +17999,7 @@ Index: pam.debian/configure
$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$file" : 'X\(//\)[^/]' \| \
X"$file" : 'X\(//\)$' \| \
-@@ -23600,51 +18573,12 @@
+@@ -23612,51 +18535,12 @@
q
}
s/.*/./; q'`
@@ -18252,7 +18055,7 @@ Index: pam.debian/configure
;;
"libtool":C)
-@@ -24399,15 +19333,12 @@
+@@ -24411,15 +19295,12 @@
done # for ac_tag
@@ -18266,16 +18069,16 @@ Index: pam.debian/configure
- { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
- { (exit 1); exit 1; }; }
-+ as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
++ as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
# configure is writing to config.log, and then calls config.status.
-@@ -24428,10 +19359,10 @@
+@@ -24440,10 +19321,10 @@
exec 5>>config.log
# Use ||, not &&, to avoid exiting from the if with $? = 1, which
# would make configure fail if this is the last instruction.
- $ac_cs_success || { (exit 1); exit 1; }
-+ $ac_cs_success || as_fn_exit $?
++ $ac_cs_success || as_fn_exit 1
fi
if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
- { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
@@ -18283,13 +18086,13 @@ Index: pam.debian/configure
$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
fi
-Index: pam.debian/Makefile.in
+Index: pam.deb/Makefile.in
===================================================================
---- pam.debian.orig/Makefile.in
-+++ pam.debian/Makefile.in
+--- pam.deb.orig/Makefile.in
++++ pam.deb/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -18299,18 +18102,7 @@ Index: pam.debian/Makefile.in
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -19,8 +20,9 @@
- #
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
--pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkglibexecdir = $(libexecdir)/@PACKAGE@
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
-@@ -39,7 +41,7 @@
+@@ -39,7 +40,7 @@
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
$(top_srcdir)/configure ABOUT-NLS AUTHORS COPYING ChangeLog \
@@ -18319,63 +18111,7 @@ Index: pam.debian/Makefile.in
depcomp install-sh ltmain.sh missing mkinstalldirs ylwrap
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
-@@ -61,6 +63,7 @@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = config.h
- CONFIG_CLEAN_FILES =
-+CONFIG_CLEAN_VPATH_FILES =
- SOURCES =
- DIST_SOURCES =
- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-@@ -72,6 +75,9 @@
- ps-recursive uninstall-recursive
- RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
- distclean-recursive maintainer-clean-recursive
-+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-+ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
-+ distdir dist dist-all distcheck
- ETAGS = etags
- CTAGS = ctags
- DIST_SUBDIRS = libpam tests libpamc libpam_misc modules po conf doc \
-@@ -80,9 +86,34 @@
- distdir = $(PACKAGE)-$(VERSION)
- top_distdir = $(distdir)
- am__remove_distdir = \
-- { test ! -d $(distdir) \
-- || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
-- && rm -fr $(distdir); }; }
-+ { test ! -d "$(distdir)" \
-+ || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
-+ && rm -fr "$(distdir)"; }; }
-+am__relativize = \
-+ dir0=`pwd`; \
-+ sed_first='s,^\([^/]*\)/.*$$,\1,'; \
-+ sed_rest='s,^[^/]*/*,,'; \
-+ sed_last='s,^.*/\([^/]*\)$$,\1,'; \
-+ sed_butlast='s,/*[^/]*$$,,'; \
-+ while test -n "$$dir1"; do \
-+ first=`echo "$$dir1" | sed -e "$$sed_first"`; \
-+ if test "$$first" != "."; then \
-+ if test "$$first" = ".."; then \
-+ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
-+ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
-+ else \
-+ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
-+ if test "$$first2" = "$$first"; then \
-+ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
-+ else \
-+ dir2="../$$dir2"; \
-+ fi; \
-+ dir0="$$dir0"/"$$first"; \
-+ fi; \
-+ fi; \
-+ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
-+ done; \
-+ reldir="$$dir2"
- DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
- GZIP_ENV = --best
- distuninstallcheck_listfiles = find . -type f -print
-@@ -170,6 +201,7 @@
+@@ -172,6 +173,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -18383,50 +18119,7 @@ Index: pam.debian/Makefile.in
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PIE_CFLAGS = @PIE_CFLAGS@
-@@ -272,15 +304,15 @@
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
-- cd $(srcdir) && $(AUTOMAKE) --gnu \
-+ echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \
-+ $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \
- && exit 0; \
- exit 1;; \
- esac; \
- done; \
-- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu Makefile
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
-+ $(am__cd) $(top_srcdir) && \
-+ $(AUTOMAKE) --gnu Makefile
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
-@@ -296,9 +328,10 @@
- $(SHELL) ./config.status --recheck
-
- $(top_srcdir)/configure: $(am__configure_deps)
-- cd $(srcdir) && $(AUTOCONF)
-+ $(am__cd) $(srcdir) && $(AUTOCONF)
- $(ACLOCAL_M4): $(am__aclocal_m4_deps)
-- cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-+ $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-+$(am__aclocal_m4_deps):
-
- config.h: stamp-h1
- @if test ! -f $@; then \
-@@ -310,7 +343,7 @@
- @rm -f stamp-h1
- cd $(top_builddir) && $(SHELL) ./config.status config.h
- $(srcdir)/config.h.in: $(am__configure_deps)
-- cd $(top_srcdir) && $(AUTOHEADER)
-+ ($(am__cd) $(top_srcdir) && $(AUTOHEADER))
- rm -f stamp-h1
- touch $@
-
-@@ -324,7 +357,7 @@
+@@ -329,7 +331,7 @@
-rm -rf .libs _libs
distclean-libtool:
@@ -18435,7 +18128,7 @@ Index: pam.debian/Makefile.in
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
-@@ -333,7 +366,7 @@
+@@ -338,7 +340,7 @@
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
@@ -18444,16 +18137,7 @@ Index: pam.debian/Makefile.in
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
-@@ -350,7 +383,7 @@
- else \
- local_target="$$target"; \
- fi; \
-- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
-@@ -358,7 +391,7 @@
+@@ -363,7 +365,7 @@
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
@@ -18462,27 +18146,7 @@ Index: pam.debian/Makefile.in
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
-@@ -384,16 +417,16 @@
- else \
- local_target="$$target"; \
- fi; \
-- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
- done
- ctags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- done
-
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-@@ -401,14 +434,14 @@
+@@ -406,7 +408,7 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -18491,216 +18155,17 @@ Index: pam.debian/Makefile.in
END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
-
- TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
-+ set x; \
- here=`pwd`; \
- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
- include_option=--etags-include; \
-@@ -420,7 +453,7 @@
- list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- test ! -f $$subdir/TAGS || \
-- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
-+ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
- fi; \
- done; \
- list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
-@@ -429,29 +462,34 @@
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ shift; \
-+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
-- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique; \
-+ if test $$# -gt 0; then \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ "$$@" $$unique; \
-+ else \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$unique; \
-+ fi; \
- fi
- ctags: CTAGS
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
- 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; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+ test -z "$(CTAGS_ARGS)$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-- $$tags $$unique
-+ $$unique
-
- GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
-- && cd $(top_srcdir) \
-- && gtags -i $(GTAGS_ARGS) $$here
-+ && $(am__cd) $(top_srcdir) \
-+ && gtags -i $(GTAGS_ARGS) "$$here"
-
- distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-@@ -464,7 +502,7 @@
- exit 1;; \
- esac
- $(am__remove_distdir)
-- test -d $(distdir) || mkdir $(distdir)
-+ test -d "$(distdir)" || mkdir "$(distdir)"
- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- list='$(DISTFILES)'; \
-@@ -480,38 +518,55 @@
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-+ if test -d "$(distdir)/$$file"; then \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+ fi; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
-- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
- else \
-- test -f $(distdir)/$$file \
-- || cp -p $$d/$$file $(distdir)/$$file \
-+ test -f "$(distdir)/$$file" \
-+ || cp -p $$d/$$file "$(distdir)/$$file" \
- || exit 1; \
- fi; \
- done
-- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
- || $(MKDIR_P) "$(distdir)/$$subdir" \
- || exit 1; \
-- distdir=`$(am__cd) $(distdir) && pwd`; \
-- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-- (cd $$subdir && \
-+ fi; \
-+ done
-+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-+ if test "$$subdir" = .; then :; else \
-+ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
-+ $(am__relativize); \
-+ new_distdir=$$reldir; \
-+ dir1=$$subdir; dir2="$(top_distdir)"; \
-+ $(am__relativize); \
-+ new_top_distdir=$$reldir; \
-+ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
-+ echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
-+ ($(am__cd) $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
-- top_distdir="$$top_distdir" \
-- distdir="$$distdir/$$subdir" \
-+ top_distdir="$$new_top_distdir" \
-+ distdir="$$new_distdir" \
- am__remove_distdir=: \
- am__skip_length_check=: \
-+ am__skip_mode_fix=: \
- distdir) \
+@@ -512,7 +514,8 @@
|| exit 1; \
fi; \
done
- -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
-+ -test -n "$(am__skip_mode_fix)" \
-+ || find "$(distdir)" -type d ! -perm -755 \
++ -find "$(distdir)" -type d ! -perm -755 \
+ -exec chmod u+rwx,go+rx {} \; -o \
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
-- || chmod -R a+r $(distdir)
-+ || chmod -R a+r "$(distdir)"
- dist-gzip: distdir
- tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
- $(am__remove_distdir)
-@@ -523,6 +578,10 @@
- tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
- $(am__remove_distdir)
-
-+dist-xz: distdir
-+ tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
-+ $(am__remove_distdir)
-+
- dist-tarZ: distdir
- tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
- $(am__remove_distdir)
-@@ -547,15 +606,17 @@
- distcheck: dist
- case '$(DIST_ARCHIVES)' in \
- *.tar.gz*) \
-- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
-+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
- *.tar.bz2*) \
-- bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
-+ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
- *.tar.lzma*) \
-- unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
-+ lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
-+ *.tar.xz*) \
-+ xz -dc $(distdir).tar.xz | $(am__untar) ;;\
- *.tar.Z*) \
- uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
- *.shar.gz*) \
-- GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
-+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
- *.zip*) \
- unzip $(distdir).zip ;;\
- esac
-@@ -563,9 +624,11 @@
- mkdir $(distdir)/_build
- mkdir $(distdir)/_inst
- chmod a-w $(distdir)
-+ test -d $(distdir)/_build || exit 0; \
- dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
- && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
-- && cd $(distdir)/_build \
-+ && am__cwd=`pwd` \
-+ && $(am__cd) $(distdir)/_build \
- && ../configure --srcdir=.. --prefix="$$dc_install_base" \
- $(DISTCHECK_CONFIGURE_FLAGS) \
- && $(MAKE) $(AM_MAKEFLAGS) \
-@@ -587,13 +650,15 @@
- && rm -rf "$$dc_destdir" \
- && $(MAKE) $(AM_MAKEFLAGS) dist \
- && rm -rf $(DIST_ARCHIVES) \
-- && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
-+ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
-+ && cd "$$am__cwd" \
-+ || exit 1
- $(am__remove_distdir)
- @(echo "$(distdir) archives ready for distribution: "; \
- list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
- sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
- distuninstallcheck:
-- @cd $(distuninstallcheck_dir) \
-+ @$(am__cd) '$(distuninstallcheck_dir)' \
- && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
- || { echo "ERROR: files left after uninstall:" ; \
- if test -n "$(DESTDIR)"; then \
-@@ -636,6 +701,7 @@
-
- distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -656,6 +722,8 @@
+@@ -661,6 +664,8 @@
html: html-recursive
@@ -18709,7 +18174,7 @@ Index: pam.debian/Makefile.in
info: info-recursive
info-am:
-@@ -664,18 +732,28 @@
+@@ -669,18 +674,28 @@
install-dvi: install-dvi-recursive
@@ -18738,60 +18203,13 @@ Index: pam.debian/Makefile.in
installcheck-am:
maintainer-clean: maintainer-clean-recursive
-@@ -698,24 +776,24 @@
-
- uninstall-am:
-
--.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
-- install-strip
-+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \
-+ ctags-recursive install-am install-strip tags-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-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 \
-- 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
-+ dist-gzip dist-lzma dist-shar dist-tarZ dist-xz 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
-
-
- release: dist releasedocs
-@@ -736,6 +814,7 @@
- make -C xtests xtests
-
- .PHONY: xtests
-+
- # 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.
- .NOEXPORT:
-Index: pam.debian/modules/pam_namespace/Makefile.in
+Index: pam.deb/modules/pam_namespace/Makefile.in
===================================================================
---- pam.debian.orig/modules/pam_namespace/Makefile.in
-+++ pam.debian/modules/pam_namespace/Makefile.in
+--- pam.deb.orig/modules/pam_namespace/Makefile.in
++++ pam.deb/modules/pam_namespace/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -18801,81 +18219,7 @@ Index: pam.debian/modules/pam_namespace/Makefile.in
# 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.
-@@ -24,8 +25,9 @@
-
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
--pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkglibexecdir = $(libexecdir)/@PACKAGE@
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
-@@ -62,17 +64,32 @@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
-+CONFIG_CLEAN_VPATH_FILES =
- am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
- am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-+am__install_max = 40
-+am__nobase_strip_setup = \
-+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-+am__nobase_strip = \
-+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-+am__nobase_list = $(am__nobase_strip_setup); \
-+ for p in $$list; do echo "$$p $$p"; done | \
-+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-+ if (++n[$$2] == $(am__install_max)) \
-+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-+ END { for (dir in files) print dir, files[dir] }'
-+am__base_list = \
-+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
- am__installdirs = "$(DESTDIR)$(securelibdir)" \
- "$(DESTDIR)$(secureconfdir)" "$(DESTDIR)$(man5dir)" \
- "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(namespaceddir)" \
- "$(DESTDIR)$(secureconfdir)"
--securelibLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(securelib_LTLIBRARIES)
- pam_namespace_la_DEPENDENCIES =
- am__pam_namespace_la_SOURCES_DIST = pam_namespace.c md5.c argv_parse.c
-@@ -80,11 +97,11 @@
- @HAVE_UNSHARE_TRUE@ md5.lo argv_parse.lo
- pam_namespace_la_OBJECTS = $(am_pam_namespace_la_OBJECTS)
- @HAVE_UNSHARE_TRUE@am_pam_namespace_la_rpath = -rpath $(securelibdir)
--secureconfSCRIPT_INSTALL = $(INSTALL_SCRIPT)
- SCRIPTS = $(secureconf_SCRIPTS)
- DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
-+am__mv = mv -f
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-@@ -100,12 +117,12 @@
- man8dir = $(mandir)/man8
- NROFF = nroff
- MANS = $(man_MANS)
--namespacedDATA_INSTALL = $(INSTALL_DATA)
--secureconfDATA_INSTALL = $(INSTALL_DATA)
- DATA = $(namespaced_DATA) $(noinst_DATA) $(secureconf_DATA)
- HEADERS = $(noinst_HEADERS)
- ETAGS = etags
- CTAGS = ctags
-+am__tty_colors = \
-+red=; grn=; lgn=; blu=; std=
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- AMTAR = @AMTAR@
-@@ -190,6 +207,7 @@
+@@ -192,6 +193,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -18883,7 +18227,7 @@ Index: pam.debian/modules/pam_namespace/Makefile.in
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PIE_CFLAGS = @PIE_CFLAGS@
-@@ -299,14 +317,14 @@
+@@ -303,8 +305,8 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -18894,349 +18238,29 @@ Index: pam.debian/modules/pam_namespace/Makefile.in
exit 1;; \
esac; \
done; \
-- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/pam_namespace/Makefile'; \
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu modules/pam_namespace/Makefile
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/pam_namespace/Makefile'; \
-+ $(am__cd) $(top_srcdir) && \
-+ $(AUTOMAKE) --gnu modules/pam_namespace/Makefile
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
-@@ -324,23 +342,28 @@
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- $(ACLOCAL_M4): $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(am__aclocal_m4_deps):
- install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
- @$(NORMAL_INSTALL)
- test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
-- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-+ @list='$(securelib_LTLIBRARIES)'; test -n "$(securelibdir)" || list=; \
-+ list2=; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-- 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"; \
-+ list2="$$list2 $$p"; \
- else :; fi; \
-- done
-+ done; \
-+ test -z "$$list2" || { \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(securelibdir)'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(securelibdir)"; \
-+ }
-
- uninstall-securelibLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-+ @list='$(securelib_LTLIBRARIES)'; test -n "$(securelibdir)" || list=; \
-+ for p in $$list; do \
-+ $(am__strip_dir) \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$f'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$f"; \
- done
-
- clean-securelibLTLIBRARIES:
-@@ -356,22 +379,37 @@
- install-secureconfSCRIPTS: $(secureconf_SCRIPTS)
- @$(NORMAL_INSTALL)
- test -z "$(secureconfdir)" || $(MKDIR_P) "$(DESTDIR)$(secureconfdir)"
-- @list='$(secureconf_SCRIPTS)'; for p in $$list; do \
-+ @list='$(secureconf_SCRIPTS)'; test -n "$(secureconfdir)" || list=; \
-+ for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- if test -f $$d$$p; then \
-- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-- echo " $(secureconfSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(secureconfdir)/$$f'"; \
-- $(secureconfSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(secureconfdir)/$$f"; \
-- else :; fi; \
-- done
-+ if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
-+ done | \
-+ sed -e 'p;s,.*/,,;n' \
-+ -e 'h;s|.*|.|' \
-+ -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
-+ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \
-+ { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
-+ if ($$2 == $$4) { files[d] = files[d] " " $$1; \
-+ if (++n[d] == $(am__install_max)) { \
-+ print "f", d, files[d]; n[d] = 0; files[d] = "" } } \
-+ else { print "f", d "/" $$4, $$1 } } \
-+ END { for (d in files) print "f", d, files[d] }' | \
-+ while read type dir files; do \
-+ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
-+ test -z "$$files" || { \
-+ echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(secureconfdir)$$dir'"; \
-+ $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(secureconfdir)$$dir" || exit $$?; \
-+ } \
-+ ; done
-
- uninstall-secureconfSCRIPTS:
- @$(NORMAL_UNINSTALL)
-- @list='$(secureconf_SCRIPTS)'; for p in $$list; do \
-- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-- echo " rm -f '$(DESTDIR)$(secureconfdir)/$$f'"; \
-- rm -f "$(DESTDIR)$(secureconfdir)/$$f"; \
-- done
-+ @list='$(secureconf_SCRIPTS)'; test -n "$(secureconfdir)" || exit 0; \
-+ files=`for p in $$list; do echo "$$p"; done | \
-+ sed -e 's,.*/,,;$(transform)'`; \
-+ test -n "$$list" || exit 0; \
-+ echo " ( cd '$(DESTDIR)$(secureconfdir)' && rm -f" $$files ")"; \
-+ cd "$(DESTDIR)$(secureconfdir)" && rm -f $$files
-
- mostlyclean-compile:
- -rm -f *.$(OBJEXT)
-@@ -385,21 +423,21 @@
-
- .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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @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 $@ $<
-@@ -409,144 +447,136 @@
-
- clean-libtool:
- -rm -rf .libs _libs
--install-man5: $(man5_MANS) $(man_MANS)
-+install-man5: $(man_MANS)
- @$(NORMAL_INSTALL)
- 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 \
-- case "$$i" in \
-- *.5*) list="$$list $$i" ;; \
-- esac; \
-+ @list=''; test -n "$(man5dir)" || exit 0; \
-+ { for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.5[a-z]*$$/p'; \
-+ } | while read p; do \
-+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-+ echo "$$d$$p"; echo "$$p"; \
-+ done | \
-+ sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^5][0-9a-z]*$$,5,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
-+ sed 'N;N;s,\n, ,g' | { \
-+ list=; while read file base inst; do \
-+ if test "$$base" = "$$inst"; then list="$$list $$file"; else \
-+ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man5dir)/$$inst'"; \
-+ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man5dir)/$$inst" || exit $$?; \
-+ fi; \
+@@ -424,8 +426,8 @@
+ esac; \
done; \
-- for i in $$list; do \
+ for i in $$list; do \
- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
- else file=$$i; fi; \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 5*) ;; \
-- *) ext='5' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man5dir)/$$inst'"; \
-- $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man5dir)/$$inst"; \
-- done
-+ for i in $$list; do echo "$$i"; done | $(am__base_list) | \
-+ while read files; do \
-+ test -z "$$files" || { \
-+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man5dir)'"; \
-+ $(INSTALL_DATA) $$files "$(DESTDIR)$(man5dir)" || exit $$?; }; \
-+ done; }
-+
- uninstall-man5:
- @$(NORMAL_UNINSTALL)
-- @list='$(man5_MANS) $(dist_man5_MANS) $(nodist_man5_MANS)'; \
-- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-- for i in $$l2; do \
-- case "$$i" in \
-- *.5*) list="$$list $$i" ;; \
-- esac; \
-- done; \
-- for i in $$list; do \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 5*) ;; \
-- *) ext='5' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " rm -f '$(DESTDIR)$(man5dir)/$$inst'"; \
-- rm -f "$(DESTDIR)$(man5dir)/$$inst"; \
-- done
--install-man8: $(man8_MANS) $(man_MANS)
-+ @list=''; test -n "$(man5dir)" || exit 0; \
-+ files=`{ for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.5[a-z]*$$/p'; \
-+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^5][0-9a-z]*$$,5,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-+ test -z "$$files" || { \
-+ echo " ( cd '$(DESTDIR)$(man5dir)' && rm -f" $$files ")"; \
-+ cd "$(DESTDIR)$(man5dir)" && rm -f $$files; }
-+install-man8: $(man_MANS)
- @$(NORMAL_INSTALL)
- 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 \
-- case "$$i" in \
-- *.8*) list="$$list $$i" ;; \
-- esac; \
-+ @list=''; test -n "$(man8dir)" || exit 0; \
-+ { for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.8[a-z]*$$/p'; \
-+ } | while read p; do \
-+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-+ echo "$$d$$p"; echo "$$p"; \
-+ done | \
-+ sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
-+ sed 'N;N;s,\n, ,g' | { \
-+ list=; while read file base inst; do \
-+ if test "$$base" = "$$inst"; then list="$$list $$file"; else \
-+ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-+ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst" || exit $$?; \
-+ fi; \
++ if test -f $$i; then file=$$i; \
++ else file=$(srcdir)/$$i; fi; \
+ ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+ case "$$ext" in \
+ 5*) ;; \
+@@ -469,8 +471,8 @@
+ esac; \
done; \
-- for i in $$list; do \
+ for i in $$list; do \
- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
- else file=$$i; fi; \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 8*) ;; \
-- *) ext='8' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-- $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \
-- done
-+ for i in $$list; do echo "$$i"; done | $(am__base_list) | \
-+ while read files; do \
-+ test -z "$$files" || { \
-+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man8dir)'"; \
-+ $(INSTALL_DATA) $$files "$(DESTDIR)$(man8dir)" || exit $$?; }; \
-+ done; }
-+
- uninstall-man8:
- @$(NORMAL_UNINSTALL)
-- @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
-- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-- for i in $$l2; do \
-- case "$$i" in \
-- *.8*) list="$$list $$i" ;; \
-- esac; \
-- done; \
-- for i in $$list; do \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 8*) ;; \
-- *) ext='8' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \
-- rm -f "$(DESTDIR)$(man8dir)/$$inst"; \
-- done
-+ @list=''; test -n "$(man8dir)" || exit 0; \
-+ files=`{ for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.8[a-z]*$$/p'; \
-+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-+ test -z "$$files" || { \
-+ echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \
-+ cd "$(DESTDIR)$(man8dir)" && rm -f $$files; }
- install-namespacedDATA: $(namespaced_DATA)
- @$(NORMAL_INSTALL)
- test -z "$(namespaceddir)" || $(MKDIR_P) "$(DESTDIR)$(namespaceddir)"
-- @list='$(namespaced_DATA)'; for p in $$list; do \
-+ @list='$(namespaced_DATA)'; test -n "$(namespaceddir)" || list=; \
-+ for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-- echo " $(namespacedDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(namespaceddir)/$$f'"; \
-- $(namespacedDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(namespaceddir)/$$f"; \
-+ echo "$$d$$p"; \
-+ done | $(am__base_list) | \
-+ while read files; do \
-+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(namespaceddir)'"; \
-+ $(INSTALL_DATA) $$files "$(DESTDIR)$(namespaceddir)" || exit $$?; \
- done
-
- uninstall-namespacedDATA:
- @$(NORMAL_UNINSTALL)
-- @list='$(namespaced_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-- echo " rm -f '$(DESTDIR)$(namespaceddir)/$$f'"; \
-- rm -f "$(DESTDIR)$(namespaceddir)/$$f"; \
-- done
-+ @list='$(namespaced_DATA)'; test -n "$(namespaceddir)" || list=; \
-+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-+ test -n "$$files" || exit 0; \
-+ echo " ( cd '$(DESTDIR)$(namespaceddir)' && rm -f" $$files ")"; \
-+ cd "$(DESTDIR)$(namespaceddir)" && rm -f $$files
- install-secureconfDATA: $(secureconf_DATA)
- @$(NORMAL_INSTALL)
- test -z "$(secureconfdir)" || $(MKDIR_P) "$(DESTDIR)$(secureconfdir)"
-- @list='$(secureconf_DATA)'; for p in $$list; do \
-+ @list='$(secureconf_DATA)'; test -n "$(secureconfdir)" || list=; \
-+ for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-- echo " $(secureconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(secureconfdir)/$$f'"; \
-- $(secureconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(secureconfdir)/$$f"; \
-+ echo "$$d$$p"; \
-+ done | $(am__base_list) | \
-+ while read files; do \
-+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(secureconfdir)'"; \
-+ $(INSTALL_DATA) $$files "$(DESTDIR)$(secureconfdir)" || exit $$?; \
- done
-
- uninstall-secureconfDATA:
- @$(NORMAL_UNINSTALL)
-- @list='$(secureconf_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-- echo " rm -f '$(DESTDIR)$(secureconfdir)/$$f'"; \
-- rm -f "$(DESTDIR)$(secureconfdir)/$$f"; \
-- done
-+ @list='$(secureconf_DATA)'; test -n "$(secureconfdir)" || list=; \
-+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-+ test -n "$$files" || exit 0; \
-+ echo " ( cd '$(DESTDIR)$(secureconfdir)' && rm -f" $$files ")"; \
-+ cd "$(DESTDIR)$(secureconfdir)" && rm -f $$files
-
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
++ if test -f $$i; then file=$$i; \
++ else file=$(srcdir)/$$i; fi; \
+ ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+ case "$$ext" in \
+ 8*) ;; \
+@@ -543,7 +545,7 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -19245,56 +18269,7 @@ Index: pam.debian/modules/pam_namespace/Makefile.in
END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
-+ set x; \
- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -554,37 +584,43 @@
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ shift; \
-+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
-- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique; \
-+ if test $$# -gt 0; then \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ "$$@" $$unique; \
-+ else \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$unique; \
-+ fi; \
- fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
- 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; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+ test -z "$(CTAGS_ARGS)$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-- $$tags $$unique
-+ $$unique
-
- GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
-- && cd $(top_srcdir) \
-- && gtags -i $(GTAGS_ARGS) $$here
-+ && $(am__cd) $(top_srcdir) \
-+ && gtags -i $(GTAGS_ARGS) "$$here"
-
- distclean-tags:
+@@ -586,7 +588,7 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
check-TESTS: $(TESTS)
@@ -19302,11 +18277,8 @@ Index: pam.debian/modules/pam_namespace/Makefile.in
+ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
srcdir=$(srcdir); export srcdir; \
list=' $(TESTS) '; \
-+ $(am__tty_colors); \
if test -n "$$list"; then \
- for tst in $$list; do \
- if test -f ./$$tst; then dir=./; \
-@@ -593,49 +629,63 @@
+@@ -597,7 +599,7 @@
if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
@@ -19314,35 +18286,19 @@ Index: pam.debian/modules/pam_namespace/Makefile.in
+ *[\ \ ]$$tst[\ \ ]*) \
xpass=`expr $$xpass + 1`; \
failed=`expr $$failed + 1`; \
-- echo "XPASS: $$tst"; \
-+ col=$$red; res=XPASS; \
- ;; \
- *) \
-- echo "PASS: $$tst"; \
-+ col=$$grn; res=PASS; \
- ;; \
- esac; \
+ echo "XPASS: $$tst"; \
+@@ -609,7 +611,7 @@
elif test $$? -ne 77; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
- *$$ws$$tst$$ws*) \
+ *[\ \ ]$$tst[\ \ ]*) \
xfail=`expr $$xfail + 1`; \
-- echo "XFAIL: $$tst"; \
-+ col=$$lgn; res=XFAIL; \
+ echo "XFAIL: $$tst"; \
;; \
- *) \
- failed=`expr $$failed + 1`; \
-- echo "FAIL: $$tst"; \
-+ col=$$red; res=FAIL; \
- ;; \
- esac; \
- else \
- skip=`expr $$skip + 1`; \
-- echo "SKIP: $$tst"; \
-+ col=$$blu; res=SKIP; \
+@@ -623,23 +625,36 @@
+ echo "SKIP: $$tst"; \
fi; \
-+ echo "$${col}$$res$${std}: $$tst"; \
done; \
+ if test "$$all" -eq 1; then \
+ tests="test"; \
@@ -19382,22 +18338,7 @@ Index: pam.debian/modules/pam_namespace/Makefile.in
test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
dashes="$$skipped"; \
fi; \
-@@ -646,15 +696,32 @@
- dashes="$$report"; \
- fi; \
- dashes=`echo "$$dashes" | sed s/./=/g`; \
-- echo "$$dashes"; \
-+ if test "$$failed" -eq 0; then \
-+ echo "$$grn$$dashes"; \
-+ else \
-+ echo "$$red$$dashes"; \
-+ fi; \
- echo "$$banner"; \
- test -z "$$skipped" || echo "$$skipped"; \
- test -z "$$report" || echo "$$report"; \
-- echo "$$dashes"; \
-+ echo "$$dashes$$std"; \
- test "$$failed" -eq 0; \
+@@ -659,6 +674,19 @@
else :; fi
distdir: $(DISTFILES)
@@ -19417,37 +18358,7 @@ Index: pam.debian/modules/pam_namespace/Makefile.in
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
-@@ -670,13 +737,17 @@
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-+ if test -d "$(distdir)/$$file"; then \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+ fi; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
-- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
- else \
-- test -f $(distdir)/$$file \
-- || cp -p $$d/$$file $(distdir)/$$file \
-+ test -f "$(distdir)/$$file" \
-+ || cp -p $$d/$$file "$(distdir)/$$file" \
- || exit 1; \
- fi; \
- done
-@@ -709,6 +780,7 @@
-
- distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -731,6 +803,8 @@
+@@ -735,6 +763,8 @@
html: html-am
@@ -19456,7 +18367,7 @@ Index: pam.debian/modules/pam_namespace/Makefile.in
info: info-am
info-am:
-@@ -741,18 +815,28 @@
+@@ -745,18 +775,28 @@
install-dvi: install-dvi-am
@@ -19485,30 +18396,13 @@ Index: pam.debian/modules/pam_namespace/Makefile.in
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -779,7 +863,7 @@
-
- uninstall-man: uninstall-man5 uninstall-man8
-
--.MAKE: install-am install-strip
-+.MAKE: check-am install-am install-strip
-
- .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
- clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
-@@ -802,6 +886,7 @@
-
- @ENABLE_REGENERATE_MAN_TRUE@README: pam_namespace.8.xml namespace.conf.5.xml
- @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
-+
- # 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.
- .NOEXPORT:
-Index: pam.debian/modules/pam_securetty/Makefile.in
+Index: pam.deb/modules/pam_securetty/Makefile.in
===================================================================
---- pam.debian.orig/modules/pam_securetty/Makefile.in
-+++ pam.debian/modules/pam_securetty/Makefile.in
+--- pam.deb.orig/modules/pam_securetty/Makefile.in
++++ pam.deb/modules/pam_securetty/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -19518,46 +18412,8 @@ Index: pam.debian/modules/pam_securetty/Makefile.in
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -21,8 +22,9 @@
-
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
--pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkglibexecdir = $(libexecdir)/@PACKAGE@
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
-@@ -58,21 +60,37 @@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
-+CONFIG_CLEAN_VPATH_FILES =
- am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
- am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-+am__install_max = 40
-+am__nobase_strip_setup = \
-+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-+am__nobase_strip = \
-+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-+am__nobase_list = $(am__nobase_strip_setup); \
-+ for p in $$list; do echo "$$p $$p"; done | \
-+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-+ if (++n[$$2] == $(am__install_max)) \
-+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-+ END { for (dir in files) print dir, files[dir] }'
-+am__base_list = \
-+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
- am__installdirs = "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man8dir)"
--securelibLTLIBRARIES_INSTALL = $(INSTALL)
+@@ -68,8 +69,8 @@
+ securelibLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(securelib_LTLIBRARIES)
pam_securetty_la_DEPENDENCIES =
-pam_securetty_la_SOURCES = pam_securetty.c
@@ -19567,11 +18423,7 @@ Index: pam.debian/modules/pam_securetty/Makefile.in
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
-+am__mv = mv -f
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-@@ -82,14 +100,16 @@
+@@ -82,8 +83,8 @@
LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
$(LDFLAGS) -o $@
@@ -19582,15 +18434,7 @@ Index: pam.debian/modules/pam_securetty/Makefile.in
man8dir = $(mandir)/man8
NROFF = nroff
MANS = $(man_MANS)
- DATA = $(noinst_DATA)
- ETAGS = etags
- CTAGS = ctags
-+am__tty_colors = \
-+red=; grn=; lgn=; blu=; std=
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- AMTAR = @AMTAR@
-@@ -174,6 +194,7 @@
+@@ -176,6 +177,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19598,7 +18442,7 @@ Index: pam.debian/modules/pam_securetty/Makefile.in
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PIE_CFLAGS = @PIE_CFLAGS@
-@@ -264,6 +285,10 @@
+@@ -268,6 +270,10 @@
AM_LDFLAGS = -no-undefined -avoid-version -module $(am__append_1)
securelib_LTLIBRARIES = pam_securetty.la
pam_securetty_la_LIBADD = -L$(top_builddir)/libpam -lpam
@@ -19609,7 +18453,7 @@ Index: pam.debian/modules/pam_securetty/Makefile.in
@ENABLE_REGENERATE_MAN_TRUE@noinst_DATA = README
all: all-am
-@@ -273,14 +298,14 @@
+@@ -277,8 +283,8 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -19620,54 +18464,7 @@ Index: pam.debian/modules/pam_securetty/Makefile.in
exit 1;; \
esac; \
done; \
-- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/pam_securetty/Makefile'; \
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu modules/pam_securetty/Makefile
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/pam_securetty/Makefile'; \
-+ $(am__cd) $(top_srcdir) && \
-+ $(AUTOMAKE) --gnu modules/pam_securetty/Makefile
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
-@@ -298,23 +323,28 @@
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- $(ACLOCAL_M4): $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(am__aclocal_m4_deps):
- install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
- @$(NORMAL_INSTALL)
- test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
-- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-+ @list='$(securelib_LTLIBRARIES)'; test -n "$(securelibdir)" || list=; \
-+ list2=; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-- 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"; \
-+ list2="$$list2 $$p"; \
- else :; fi; \
-- done
-+ done; \
-+ test -z "$$list2" || { \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(securelibdir)'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(securelibdir)"; \
-+ }
-
- uninstall-securelibLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-+ @list='$(securelib_LTLIBRARIES)'; test -n "$(securelibdir)" || list=; \
-+ for p in $$list; do \
-+ $(am__strip_dir) \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$f'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$f"; \
- done
-
- clean-securelibLTLIBRARIES:
-@@ -335,24 +365,25 @@
+@@ -339,6 +345,7 @@
-rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_securetty.Plo@am__quote@
@@ -19675,112 +18472,18 @@ Index: pam.debian/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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @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,65 +393,58 @@
-
- clean-libtool:
- -rm -rf .libs _libs
--install-man8: $(man8_MANS) $(man_MANS)
-+install-man8: $(man_MANS)
- @$(NORMAL_INSTALL)
- 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 \
-- case "$$i" in \
-- *.8*) list="$$list $$i" ;; \
-- esac; \
-+ @list=''; test -n "$(man8dir)" || exit 0; \
-+ { for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.8[a-z]*$$/p'; \
-+ } | while read p; do \
-+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-+ echo "$$d$$p"; echo "$$p"; \
-+ done | \
-+ sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
-+ sed 'N;N;s,\n, ,g' | { \
-+ list=; while read file base inst; do \
-+ if test "$$base" = "$$inst"; then list="$$list $$file"; else \
-+ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-+ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst" || exit $$?; \
-+ fi; \
+@@ -377,8 +384,8 @@
+ esac; \
done; \
-- for i in $$list; do \
+ for i in $$list; do \
- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
- else file=$$i; fi; \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 8*) ;; \
-- *) ext='8' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-- $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \
-- done
-+ for i in $$list; do echo "$$i"; done | $(am__base_list) | \
-+ while read files; do \
-+ test -z "$$files" || { \
-+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man8dir)'"; \
-+ $(INSTALL_DATA) $$files "$(DESTDIR)$(man8dir)" || exit $$?; }; \
-+ done; }
-+
- uninstall-man8:
- @$(NORMAL_UNINSTALL)
-- @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
-- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-- for i in $$l2; do \
-- case "$$i" in \
-- *.8*) list="$$list $$i" ;; \
-- esac; \
-- done; \
-- for i in $$list; do \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 8*) ;; \
-- *) ext='8' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \
-- rm -f "$(DESTDIR)$(man8dir)/$$inst"; \
-- done
-+ @list=''; test -n "$(man8dir)" || exit 0; \
-+ files=`{ for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.8[a-z]*$$/p'; \
-+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-+ test -z "$$files" || { \
-+ echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \
-+ cd "$(DESTDIR)$(man8dir)" && rm -f $$files; }
-
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
++ if test -f $$i; then file=$$i; \
++ else file=$(srcdir)/$$i; fi; \
+ ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+ case "$$ext" in \
+ 8*) ;; \
+@@ -417,7 +424,7 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -19789,56 +18492,7 @@ Index: pam.debian/modules/pam_securetty/Makefile.in
END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
-+ set x; \
- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -428,37 +452,43 @@
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ shift; \
-+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
-- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique; \
-+ if test $$# -gt 0; then \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ "$$@" $$unique; \
-+ else \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$unique; \
-+ fi; \
- fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
- 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; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+ test -z "$(CTAGS_ARGS)$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-- $$tags $$unique
-+ $$unique
-
- GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
-- && cd $(top_srcdir) \
-- && gtags -i $(GTAGS_ARGS) $$here
-+ && $(am__cd) $(top_srcdir) \
-+ && gtags -i $(GTAGS_ARGS) "$$here"
-
- distclean-tags:
+@@ -460,7 +467,7 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
check-TESTS: $(TESTS)
@@ -19846,11 +18500,8 @@ Index: pam.debian/modules/pam_securetty/Makefile.in
+ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
srcdir=$(srcdir); export srcdir; \
list=' $(TESTS) '; \
-+ $(am__tty_colors); \
if test -n "$$list"; then \
- for tst in $$list; do \
- if test -f ./$$tst; then dir=./; \
-@@ -467,49 +497,63 @@
+@@ -471,7 +478,7 @@
if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
@@ -19858,35 +18509,19 @@ Index: pam.debian/modules/pam_securetty/Makefile.in
+ *[\ \ ]$$tst[\ \ ]*) \
xpass=`expr $$xpass + 1`; \
failed=`expr $$failed + 1`; \
-- echo "XPASS: $$tst"; \
-+ col=$$red; res=XPASS; \
- ;; \
- *) \
-- echo "PASS: $$tst"; \
-+ col=$$grn; res=PASS; \
- ;; \
- esac; \
+ echo "XPASS: $$tst"; \
+@@ -483,7 +490,7 @@
elif test $$? -ne 77; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
- *$$ws$$tst$$ws*) \
+ *[\ \ ]$$tst[\ \ ]*) \
xfail=`expr $$xfail + 1`; \
-- echo "XFAIL: $$tst"; \
-+ col=$$lgn; res=XFAIL; \
+ echo "XFAIL: $$tst"; \
;; \
- *) \
- failed=`expr $$failed + 1`; \
-- echo "FAIL: $$tst"; \
-+ col=$$red; res=FAIL; \
- ;; \
- esac; \
- else \
- skip=`expr $$skip + 1`; \
-- echo "SKIP: $$tst"; \
-+ col=$$blu; res=SKIP; \
+@@ -497,23 +504,36 @@
+ echo "SKIP: $$tst"; \
fi; \
-+ echo "$${col}$$res$${std}: $$tst"; \
done; \
+ if test "$$all" -eq 1; then \
+ tests="test"; \
@@ -19926,22 +18561,7 @@ Index: pam.debian/modules/pam_securetty/Makefile.in
test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
dashes="$$skipped"; \
fi; \
-@@ -520,15 +564,32 @@
- dashes="$$report"; \
- fi; \
- dashes=`echo "$$dashes" | sed s/./=/g`; \
-- echo "$$dashes"; \
-+ if test "$$failed" -eq 0; then \
-+ echo "$$grn$$dashes"; \
-+ else \
-+ echo "$$red$$dashes"; \
-+ fi; \
- echo "$$banner"; \
- test -z "$$skipped" || echo "$$skipped"; \
- test -z "$$report" || echo "$$report"; \
-- echo "$$dashes"; \
-+ echo "$$dashes$$std"; \
- test "$$failed" -eq 0; \
+@@ -533,6 +553,19 @@
else :; fi
distdir: $(DISTFILES)
@@ -19961,37 +18581,7 @@ Index: pam.debian/modules/pam_securetty/Makefile.in
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
-@@ -544,13 +605,17 @@
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-+ if test -d "$(distdir)/$$file"; then \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+ fi; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
-- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
- else \
-- test -f $(distdir)/$$file \
-- || cp -p $$d/$$file $(distdir)/$$file \
-+ test -f "$(distdir)/$$file" \
-+ || cp -p $$d/$$file "$(distdir)/$$file" \
- || exit 1; \
- fi; \
- done
-@@ -583,6 +648,7 @@
-
- distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -605,6 +671,8 @@
+@@ -609,6 +642,8 @@
html: html-am
@@ -20000,7 +18590,7 @@ Index: pam.debian/modules/pam_securetty/Makefile.in
info: info-am
info-am:
-@@ -613,18 +681,28 @@
+@@ -617,18 +652,28 @@
install-dvi: install-dvi-am
@@ -20029,30 +18619,13 @@ Index: pam.debian/modules/pam_securetty/Makefile.in
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -649,7 +727,7 @@
-
- uninstall-man: uninstall-man8
-
--.MAKE: install-am install-strip
-+.MAKE: check-am install-am install-strip
-
- .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
- clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
-@@ -669,6 +747,7 @@
-
- @ENABLE_REGENERATE_MAN_TRUE@README: pam_securetty.8.xml
- @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
-+
- # 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.
- .NOEXPORT:
-Index: pam.debian/modules/pam_unix/Makefile.in
+Index: pam.deb/modules/pam_unix/Makefile.in
===================================================================
---- pam.debian.orig/modules/pam_unix/Makefile.in
-+++ pam.debian/modules/pam_unix/Makefile.in
+--- pam.deb.orig/modules/pam_unix/Makefile.in
++++ pam.deb/modules/pam_unix/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -20062,47 +18635,9 @@ Index: pam.debian/modules/pam_unix/Makefile.in
# 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.
-@@ -23,8 +24,9 @@
-
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
--pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkglibexecdir = $(libexecdir)/@PACKAGE@
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
-@@ -64,25 +66,39 @@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
-+CONFIG_CLEAN_VPATH_FILES =
- am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
- am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-+am__install_max = 40
-+am__nobase_strip_setup = \
-+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-+am__nobase_strip = \
-+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-+am__nobase_list = $(am__nobase_strip_setup); \
-+ for p in $$list; do echo "$$p $$p"; done | \
-+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-+ if (++n[$$2] == $(am__install_max)) \
-+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-+ END { for (dir in files) print dir, files[dir] }'
-+am__base_list = \
-+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
- am__installdirs = "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(sbindir)" \
+@@ -74,10 +75,10 @@
"$(DESTDIR)$(man8dir)"
--securelibLTLIBRARIES_INSTALL = $(INSTALL)
+ securelibLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(securelib_LTLIBRARIES)
-pam_unix_la_DEPENDENCIES =
+pam_unix_la_DEPENDENCIES = ../pam_securetty/tty_secure.lo
@@ -20113,29 +18648,7 @@ Index: pam.debian/modules/pam_unix/Makefile.in
pam_unix_la_OBJECTS = $(am_pam_unix_la_OBJECTS)
pam_unix_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(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)
-@@ -114,6 +130,7 @@
- DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
-+am__mv = mv -f
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-@@ -134,6 +151,8 @@
- HEADERS = $(noinst_HEADERS)
- ETAGS = etags
- CTAGS = ctags
-+am__tty_colors = \
-+red=; grn=; lgn=; blu=; std=
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- AMTAR = @AMTAR@
-@@ -218,6 +237,7 @@
+@@ -220,6 +221,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -20143,7 +18656,7 @@ Index: pam.debian/modules/pam_unix/Makefile.in
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PIE_CFLAGS = @PIE_CFLAGS@
-@@ -313,13 +333,14 @@
+@@ -317,13 +319,14 @@
pam_unix_la_LDFLAGS = -no-undefined -avoid-version -module \
$(am__append_2)
pam_unix_la_LIBADD = @LIBNSL@ -L$(top_builddir)/libpam -lpam \
@@ -20160,7 +18673,7 @@ Index: pam.debian/modules/pam_unix/Makefile.in
bigcrypt_SOURCES = bigcrypt.c bigcrypt_main.c
bigcrypt_CFLAGS = $(AM_CFLAGS)
-@@ -345,14 +366,14 @@
+@@ -349,8 +352,8 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -20171,136 +18684,7 @@ Index: pam.debian/modules/pam_unix/Makefile.in
exit 1;; \
esac; \
done; \
-- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/pam_unix/Makefile'; \
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu modules/pam_unix/Makefile
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/pam_unix/Makefile'; \
-+ $(am__cd) $(top_srcdir) && \
-+ $(AUTOMAKE) --gnu modules/pam_unix/Makefile
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
-@@ -370,23 +391,28 @@
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- $(ACLOCAL_M4): $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(am__aclocal_m4_deps):
- install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
- @$(NORMAL_INSTALL)
- test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
-- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-+ @list='$(securelib_LTLIBRARIES)'; test -n "$(securelibdir)" || list=; \
-+ list2=; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-- 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"; \
-+ list2="$$list2 $$p"; \
- else :; fi; \
-- done
-+ done; \
-+ test -z "$$list2" || { \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(securelibdir)'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(securelibdir)"; \
-+ }
-
- uninstall-securelibLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-+ @list='$(securelib_LTLIBRARIES)'; test -n "$(securelibdir)" || list=; \
-+ for p in $$list; do \
-+ $(am__strip_dir) \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$f'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$f"; \
- done
-
- clean-securelibLTLIBRARIES:
-@@ -401,39 +427,56 @@
- $(pam_unix_la_LINK) -rpath $(securelibdir) $(pam_unix_la_OBJECTS) $(pam_unix_la_LIBADD) $(LIBS)
-
- clean-noinstPROGRAMS:
-- @list='$(noinst_PROGRAMS)'; for p in $$list; do \
-- f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-- echo " rm -f $$p $$f"; \
-- rm -f $$p $$f ; \
-- done
-+ @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
-+ echo " rm -f" $$list; \
-+ rm -f $$list || exit $$?; \
-+ test -n "$(EXEEXT)" || exit 0; \
-+ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
-+ echo " rm -f" $$list; \
-+ rm -f $$list
- install-sbinPROGRAMS: $(sbin_PROGRAMS)
- @$(NORMAL_INSTALL)
- 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 \
-- || test -f $$p1 \
-- ; then \
-- f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(sbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(sbindir)/$$f'"; \
-- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(sbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(sbindir)/$$f" || exit 1; \
-- else :; fi; \
-- done
-+ @list='$(sbin_PROGRAMS)'; test -n "$(sbindir)" || list=; \
-+ for p in $$list; do echo "$$p $$p"; done | \
-+ sed 's/$(EXEEXT)$$//' | \
-+ while read p p1; do if test -f $$p || test -f $$p1; \
-+ then echo "$$p"; echo "$$p"; else :; fi; \
-+ done | \
-+ sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
-+ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
-+ sed 'N;N;N;s,\n, ,g' | \
-+ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
-+ { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
-+ if ($$2 == $$4) files[d] = files[d] " " $$1; \
-+ else { print "f", $$3 "/" $$4, $$1; } } \
-+ END { for (d in files) print "f", d, files[d] }' | \
-+ while read type dir files; do \
-+ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
-+ test -z "$$files" || { \
-+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(sbindir)$$dir'"; \
-+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(sbindir)$$dir" || exit $$?; \
-+ } \
-+ ; done
-
- uninstall-sbinPROGRAMS:
- @$(NORMAL_UNINSTALL)
-- @list='$(sbin_PROGRAMS)'; for p in $$list; do \
-- f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-- echo " rm -f '$(DESTDIR)$(sbindir)/$$f'"; \
-- rm -f "$(DESTDIR)$(sbindir)/$$f"; \
-- done
-+ @list='$(sbin_PROGRAMS)'; test -n "$(sbindir)" || list=; \
-+ files=`for p in $$list; do echo "$$p"; done | \
-+ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-+ -e 's/$$/$(EXEEXT)/' `; \
-+ test -n "$$list" || exit 0; \
-+ echo " ( cd '$(DESTDIR)$(sbindir)' && rm -f" $$files ")"; \
-+ cd "$(DESTDIR)$(sbindir)" && rm -f $$files
-
- clean-sbinPROGRAMS:
-- @list='$(sbin_PROGRAMS)'; for p in $$list; do \
-- f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-- echo " rm -f $$p $$f"; \
-- rm -f $$p $$f ; \
-- done
-+ @list='$(sbin_PROGRAMS)'; test -n "$$list" || exit 0; \
-+ echo " rm -f" $$list; \
-+ rm -f $$list || exit $$?; \
-+ test -n "$(EXEEXT)" || exit 0; \
-+ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
-+ echo " rm -f" $$list; \
-+ rm -f $$list
- bigcrypt$(EXEEXT): $(bigcrypt_OBJECTS) $(bigcrypt_DEPENDENCIES)
- @rm -f bigcrypt$(EXEEXT)
- $(bigcrypt_LINK) $(bigcrypt_OBJECTS) $(bigcrypt_LDADD) $(LIBS)
-@@ -455,6 +498,7 @@
+@@ -459,6 +462,7 @@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bigcrypt.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/md5_broken.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/md5_good.Plo@am__quote@
@@ -20308,308 +18692,18 @@ Index: pam.debian/modules/pam_unix/Makefile.in
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_unix_acct.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_unix_auth.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_unix_passwd.Plo@am__quote@
-@@ -475,189 +519,189 @@
-
- .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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @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@ $(am__mv) $(DEPDIR)/bigcrypt-bigcrypt.Tpo $(DEPDIR)/bigcrypt-bigcrypt.Po
- @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@ $(am__mv) $(DEPDIR)/bigcrypt-bigcrypt.Tpo $(DEPDIR)/bigcrypt-bigcrypt.Po
- @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@ $(am__mv) $(DEPDIR)/bigcrypt-bigcrypt_main.Tpo $(DEPDIR)/bigcrypt-bigcrypt_main.Po
- @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@ $(am__mv) $(DEPDIR)/bigcrypt-bigcrypt_main.Tpo $(DEPDIR)/bigcrypt-bigcrypt_main.Po
- @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@ $(am__mv) $(DEPDIR)/unix_chkpwd-unix_chkpwd.Tpo $(DEPDIR)/unix_chkpwd-unix_chkpwd.Po
- @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@ $(am__mv) $(DEPDIR)/unix_chkpwd-unix_chkpwd.Tpo $(DEPDIR)/unix_chkpwd-unix_chkpwd.Po
- @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@ $(am__mv) $(DEPDIR)/unix_chkpwd-md5_good.Tpo $(DEPDIR)/unix_chkpwd-md5_good.Po
- @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@ $(am__mv) $(DEPDIR)/unix_chkpwd-md5_good.Tpo $(DEPDIR)/unix_chkpwd-md5_good.Po
- @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@ $(am__mv) $(DEPDIR)/unix_chkpwd-md5_broken.Tpo $(DEPDIR)/unix_chkpwd-md5_broken.Po
- @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@ $(am__mv) $(DEPDIR)/unix_chkpwd-md5_broken.Tpo $(DEPDIR)/unix_chkpwd-md5_broken.Po
- @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@ $(am__mv) $(DEPDIR)/unix_chkpwd-bigcrypt.Tpo $(DEPDIR)/unix_chkpwd-bigcrypt.Po
- @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@ $(am__mv) $(DEPDIR)/unix_chkpwd-bigcrypt.Tpo $(DEPDIR)/unix_chkpwd-bigcrypt.Po
- @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`
-
- unix_chkpwd-passverify.o: passverify.c
- @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unix_chkpwd_CFLAGS) $(CFLAGS) -MT unix_chkpwd-passverify.o -MD -MP -MF $(DEPDIR)/unix_chkpwd-passverify.Tpo -c -o unix_chkpwd-passverify.o `test -f 'passverify.c' || echo '$(srcdir)/'`passverify.c
--@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/unix_chkpwd-passverify.Tpo $(DEPDIR)/unix_chkpwd-passverify.Po
-+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/unix_chkpwd-passverify.Tpo $(DEPDIR)/unix_chkpwd-passverify.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='passverify.c' object='unix_chkpwd-passverify.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-passverify.o `test -f 'passverify.c' || echo '$(srcdir)/'`passverify.c
-
- unix_chkpwd-passverify.obj: passverify.c
- @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unix_chkpwd_CFLAGS) $(CFLAGS) -MT unix_chkpwd-passverify.obj -MD -MP -MF $(DEPDIR)/unix_chkpwd-passverify.Tpo -c -o unix_chkpwd-passverify.obj `if test -f 'passverify.c'; then $(CYGPATH_W) 'passverify.c'; else $(CYGPATH_W) '$(srcdir)/passverify.c'; fi`
--@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/unix_chkpwd-passverify.Tpo $(DEPDIR)/unix_chkpwd-passverify.Po
-+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/unix_chkpwd-passverify.Tpo $(DEPDIR)/unix_chkpwd-passverify.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='passverify.c' object='unix_chkpwd-passverify.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-passverify.obj `if test -f 'passverify.c'; then $(CYGPATH_W) 'passverify.c'; else $(CYGPATH_W) '$(srcdir)/passverify.c'; fi`
-
- unix_update-unix_update.o: unix_update.c
- @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unix_update_CFLAGS) $(CFLAGS) -MT unix_update-unix_update.o -MD -MP -MF $(DEPDIR)/unix_update-unix_update.Tpo -c -o unix_update-unix_update.o `test -f 'unix_update.c' || echo '$(srcdir)/'`unix_update.c
--@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/unix_update-unix_update.Tpo $(DEPDIR)/unix_update-unix_update.Po
-+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/unix_update-unix_update.Tpo $(DEPDIR)/unix_update-unix_update.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='unix_update.c' object='unix_update-unix_update.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_update_CFLAGS) $(CFLAGS) -c -o unix_update-unix_update.o `test -f 'unix_update.c' || echo '$(srcdir)/'`unix_update.c
-
- unix_update-unix_update.obj: unix_update.c
- @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unix_update_CFLAGS) $(CFLAGS) -MT unix_update-unix_update.obj -MD -MP -MF $(DEPDIR)/unix_update-unix_update.Tpo -c -o unix_update-unix_update.obj `if test -f 'unix_update.c'; then $(CYGPATH_W) 'unix_update.c'; else $(CYGPATH_W) '$(srcdir)/unix_update.c'; fi`
--@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/unix_update-unix_update.Tpo $(DEPDIR)/unix_update-unix_update.Po
-+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/unix_update-unix_update.Tpo $(DEPDIR)/unix_update-unix_update.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='unix_update.c' object='unix_update-unix_update.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_update_CFLAGS) $(CFLAGS) -c -o unix_update-unix_update.obj `if test -f 'unix_update.c'; then $(CYGPATH_W) 'unix_update.c'; else $(CYGPATH_W) '$(srcdir)/unix_update.c'; fi`
-
- unix_update-md5_good.o: md5_good.c
- @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unix_update_CFLAGS) $(CFLAGS) -MT unix_update-md5_good.o -MD -MP -MF $(DEPDIR)/unix_update-md5_good.Tpo -c -o unix_update-md5_good.o `test -f 'md5_good.c' || echo '$(srcdir)/'`md5_good.c
--@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/unix_update-md5_good.Tpo $(DEPDIR)/unix_update-md5_good.Po
-+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/unix_update-md5_good.Tpo $(DEPDIR)/unix_update-md5_good.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='md5_good.c' object='unix_update-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_update_CFLAGS) $(CFLAGS) -c -o unix_update-md5_good.o `test -f 'md5_good.c' || echo '$(srcdir)/'`md5_good.c
-
- unix_update-md5_good.obj: md5_good.c
- @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unix_update_CFLAGS) $(CFLAGS) -MT unix_update-md5_good.obj -MD -MP -MF $(DEPDIR)/unix_update-md5_good.Tpo -c -o unix_update-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_update-md5_good.Tpo $(DEPDIR)/unix_update-md5_good.Po
-+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/unix_update-md5_good.Tpo $(DEPDIR)/unix_update-md5_good.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='md5_good.c' object='unix_update-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_update_CFLAGS) $(CFLAGS) -c -o unix_update-md5_good.obj `if test -f 'md5_good.c'; then $(CYGPATH_W) 'md5_good.c'; else $(CYGPATH_W) '$(srcdir)/md5_good.c'; fi`
-
- unix_update-md5_broken.o: md5_broken.c
- @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unix_update_CFLAGS) $(CFLAGS) -MT unix_update-md5_broken.o -MD -MP -MF $(DEPDIR)/unix_update-md5_broken.Tpo -c -o unix_update-md5_broken.o `test -f 'md5_broken.c' || echo '$(srcdir)/'`md5_broken.c
--@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/unix_update-md5_broken.Tpo $(DEPDIR)/unix_update-md5_broken.Po
-+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/unix_update-md5_broken.Tpo $(DEPDIR)/unix_update-md5_broken.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='md5_broken.c' object='unix_update-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_update_CFLAGS) $(CFLAGS) -c -o unix_update-md5_broken.o `test -f 'md5_broken.c' || echo '$(srcdir)/'`md5_broken.c
-
- unix_update-md5_broken.obj: md5_broken.c
- @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unix_update_CFLAGS) $(CFLAGS) -MT unix_update-md5_broken.obj -MD -MP -MF $(DEPDIR)/unix_update-md5_broken.Tpo -c -o unix_update-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_update-md5_broken.Tpo $(DEPDIR)/unix_update-md5_broken.Po
-+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/unix_update-md5_broken.Tpo $(DEPDIR)/unix_update-md5_broken.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='md5_broken.c' object='unix_update-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_update_CFLAGS) $(CFLAGS) -c -o unix_update-md5_broken.obj `if test -f 'md5_broken.c'; then $(CYGPATH_W) 'md5_broken.c'; else $(CYGPATH_W) '$(srcdir)/md5_broken.c'; fi`
-
- unix_update-bigcrypt.o: bigcrypt.c
- @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unix_update_CFLAGS) $(CFLAGS) -MT unix_update-bigcrypt.o -MD -MP -MF $(DEPDIR)/unix_update-bigcrypt.Tpo -c -o unix_update-bigcrypt.o `test -f 'bigcrypt.c' || echo '$(srcdir)/'`bigcrypt.c
--@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/unix_update-bigcrypt.Tpo $(DEPDIR)/unix_update-bigcrypt.Po
-+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/unix_update-bigcrypt.Tpo $(DEPDIR)/unix_update-bigcrypt.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='bigcrypt.c' object='unix_update-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_update_CFLAGS) $(CFLAGS) -c -o unix_update-bigcrypt.o `test -f 'bigcrypt.c' || echo '$(srcdir)/'`bigcrypt.c
-
- unix_update-bigcrypt.obj: bigcrypt.c
- @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unix_update_CFLAGS) $(CFLAGS) -MT unix_update-bigcrypt.obj -MD -MP -MF $(DEPDIR)/unix_update-bigcrypt.Tpo -c -o unix_update-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_update-bigcrypt.Tpo $(DEPDIR)/unix_update-bigcrypt.Po
-+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/unix_update-bigcrypt.Tpo $(DEPDIR)/unix_update-bigcrypt.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='bigcrypt.c' object='unix_update-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_update_CFLAGS) $(CFLAGS) -c -o unix_update-bigcrypt.obj `if test -f 'bigcrypt.c'; then $(CYGPATH_W) 'bigcrypt.c'; else $(CYGPATH_W) '$(srcdir)/bigcrypt.c'; fi`
-
- unix_update-passverify.o: passverify.c
- @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unix_update_CFLAGS) $(CFLAGS) -MT unix_update-passverify.o -MD -MP -MF $(DEPDIR)/unix_update-passverify.Tpo -c -o unix_update-passverify.o `test -f 'passverify.c' || echo '$(srcdir)/'`passverify.c
--@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/unix_update-passverify.Tpo $(DEPDIR)/unix_update-passverify.Po
-+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/unix_update-passverify.Tpo $(DEPDIR)/unix_update-passverify.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='passverify.c' object='unix_update-passverify.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_update_CFLAGS) $(CFLAGS) -c -o unix_update-passverify.o `test -f 'passverify.c' || echo '$(srcdir)/'`passverify.c
-
- unix_update-passverify.obj: passverify.c
- @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unix_update_CFLAGS) $(CFLAGS) -MT unix_update-passverify.obj -MD -MP -MF $(DEPDIR)/unix_update-passverify.Tpo -c -o unix_update-passverify.obj `if test -f 'passverify.c'; then $(CYGPATH_W) 'passverify.c'; else $(CYGPATH_W) '$(srcdir)/passverify.c'; fi`
--@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/unix_update-passverify.Tpo $(DEPDIR)/unix_update-passverify.Po
-+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/unix_update-passverify.Tpo $(DEPDIR)/unix_update-passverify.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='passverify.c' object='unix_update-passverify.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_update_CFLAGS) $(CFLAGS) -c -o unix_update-passverify.obj `if test -f 'passverify.c'; then $(CYGPATH_W) 'passverify.c'; else $(CYGPATH_W) '$(srcdir)/passverify.c'; fi`
-@@ -667,65 +711,58 @@
-
- clean-libtool:
- -rm -rf .libs _libs
--install-man8: $(man8_MANS) $(man_MANS)
-+install-man8: $(man_MANS)
- @$(NORMAL_INSTALL)
- 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 \
-- case "$$i" in \
-- *.8*) list="$$list $$i" ;; \
-- esac; \
-+ @list=''; test -n "$(man8dir)" || exit 0; \
-+ { for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.8[a-z]*$$/p'; \
-+ } | while read p; do \
-+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-+ echo "$$d$$p"; echo "$$p"; \
-+ done | \
-+ sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
-+ sed 'N;N;s,\n, ,g' | { \
-+ list=; while read file base inst; do \
-+ if test "$$base" = "$$inst"; then list="$$list $$file"; else \
-+ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-+ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst" || exit $$?; \
-+ fi; \
+@@ -682,8 +686,8 @@
+ esac; \
done; \
-- for i in $$list; do \
+ for i in $$list; do \
- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
- else file=$$i; fi; \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 8*) ;; \
-- *) ext='8' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-- $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \
-- done
-+ for i in $$list; do echo "$$i"; done | $(am__base_list) | \
-+ while read files; do \
-+ test -z "$$files" || { \
-+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man8dir)'"; \
-+ $(INSTALL_DATA) $$files "$(DESTDIR)$(man8dir)" || exit $$?; }; \
-+ done; }
-+
- uninstall-man8:
- @$(NORMAL_UNINSTALL)
-- @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
-- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-- for i in $$l2; do \
-- case "$$i" in \
-- *.8*) list="$$list $$i" ;; \
-- esac; \
-- done; \
-- for i in $$list; do \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 8*) ;; \
-- *) ext='8' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \
-- rm -f "$(DESTDIR)$(man8dir)/$$inst"; \
-- done
-+ @list=''; test -n "$(man8dir)" || exit 0; \
-+ files=`{ for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.8[a-z]*$$/p'; \
-+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-+ test -z "$$files" || { \
-+ echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \
-+ cd "$(DESTDIR)$(man8dir)" && rm -f $$files; }
-
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
++ if test -f $$i; then file=$$i; \
++ else file=$(srcdir)/$$i; fi; \
+ ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+ case "$$ext" in \
+ 8*) ;; \
+@@ -722,7 +726,7 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -20618,56 +18712,7 @@ Index: pam.debian/modules/pam_unix/Makefile.in
END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
-+ set x; \
- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -733,37 +770,43 @@
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ shift; \
-+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
-- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique; \
-+ if test $$# -gt 0; then \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ "$$@" $$unique; \
-+ else \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$unique; \
-+ fi; \
- fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
- 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; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+ test -z "$(CTAGS_ARGS)$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-- $$tags $$unique
-+ $$unique
-
- GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
-- && cd $(top_srcdir) \
-- && gtags -i $(GTAGS_ARGS) $$here
-+ && $(am__cd) $(top_srcdir) \
-+ && gtags -i $(GTAGS_ARGS) "$$here"
-
- distclean-tags:
+@@ -765,7 +769,7 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
check-TESTS: $(TESTS)
@@ -20675,11 +18720,8 @@ Index: pam.debian/modules/pam_unix/Makefile.in
+ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
srcdir=$(srcdir); export srcdir; \
list=' $(TESTS) '; \
-+ $(am__tty_colors); \
if test -n "$$list"; then \
- for tst in $$list; do \
- if test -f ./$$tst; then dir=./; \
-@@ -772,49 +815,63 @@
+@@ -776,7 +780,7 @@
if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
@@ -20687,35 +18729,19 @@ Index: pam.debian/modules/pam_unix/Makefile.in
+ *[\ \ ]$$tst[\ \ ]*) \
xpass=`expr $$xpass + 1`; \
failed=`expr $$failed + 1`; \
-- echo "XPASS: $$tst"; \
-+ col=$$red; res=XPASS; \
- ;; \
- *) \
-- echo "PASS: $$tst"; \
-+ col=$$grn; res=PASS; \
- ;; \
- esac; \
+ echo "XPASS: $$tst"; \
+@@ -788,7 +792,7 @@
elif test $$? -ne 77; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
- *$$ws$$tst$$ws*) \
+ *[\ \ ]$$tst[\ \ ]*) \
xfail=`expr $$xfail + 1`; \
-- echo "XFAIL: $$tst"; \
-+ col=$$lgn; res=XFAIL; \
- ;; \
- *) \
- failed=`expr $$failed + 1`; \
-- echo "FAIL: $$tst"; \
-+ col=$$red; res=FAIL; \
+ echo "XFAIL: $$tst"; \
;; \
- esac; \
- else \
- skip=`expr $$skip + 1`; \
-- echo "SKIP: $$tst"; \
-+ col=$$blu; res=SKIP; \
+@@ -802,23 +806,36 @@
+ echo "SKIP: $$tst"; \
fi; \
-+ echo "$${col}$$res$${std}: $$tst"; \
done; \
+ if test "$$all" -eq 1; then \
+ tests="test"; \
@@ -20755,22 +18781,7 @@ Index: pam.debian/modules/pam_unix/Makefile.in
test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
dashes="$$skipped"; \
fi; \
-@@ -825,15 +882,32 @@
- dashes="$$report"; \
- fi; \
- dashes=`echo "$$dashes" | sed s/./=/g`; \
-- echo "$$dashes"; \
-+ if test "$$failed" -eq 0; then \
-+ echo "$$grn$$dashes"; \
-+ else \
-+ echo "$$red$$dashes"; \
-+ fi; \
- echo "$$banner"; \
- test -z "$$skipped" || echo "$$skipped"; \
- test -z "$$report" || echo "$$report"; \
-- echo "$$dashes"; \
-+ echo "$$dashes$$std"; \
- test "$$failed" -eq 0; \
+@@ -838,6 +855,19 @@
else :; fi
distdir: $(DISTFILES)
@@ -20790,37 +18801,7 @@ Index: pam.debian/modules/pam_unix/Makefile.in
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
-@@ -849,13 +923,17 @@
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-+ if test -d "$(distdir)/$$file"; then \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+ fi; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
-- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
- else \
-- test -f $(distdir)/$$file \
-- || cp -p $$d/$$file $(distdir)/$$file \
-+ test -f "$(distdir)/$$file" \
-+ || cp -p $$d/$$file "$(distdir)/$$file" \
- || exit 1; \
- fi; \
- done
-@@ -888,6 +966,7 @@
-
- distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -910,6 +989,8 @@
+@@ -914,6 +944,8 @@
html: html-am
@@ -20829,7 +18810,7 @@ Index: pam.debian/modules/pam_unix/Makefile.in
info: info-am
info-am:
-@@ -918,18 +999,28 @@
+@@ -922,18 +954,28 @@
install-dvi: install-dvi-am
@@ -20858,30 +18839,13 @@ Index: pam.debian/modules/pam_unix/Makefile.in
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -955,7 +1046,7 @@
-
- uninstall-man: uninstall-man8
-
--.MAKE: install-am install-strip
-+.MAKE: check-am install-am install-strip
-
- .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
- clean-generic clean-libtool clean-noinstPROGRAMS \
-@@ -976,6 +1067,7 @@
-
- @ENABLE_REGENERATE_MAN_TRUE@README: pam_unix.8.xml
- @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
-+
- # 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.
- .NOEXPORT:
-Index: pam.debian/modules/pam_tty_audit/Makefile.in
+Index: pam.deb/modules/pam_tty_audit/Makefile.in
===================================================================
---- pam.debian.orig/modules/pam_tty_audit/Makefile.in
-+++ pam.debian/modules/pam_tty_audit/Makefile.in
+--- pam.deb.orig/modules/pam_tty_audit/Makefile.in
++++ pam.deb/modules/pam_tty_audit/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -20891,67 +18855,7 @@ Index: pam.debian/modules/pam_tty_audit/Makefile.in
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -21,8 +22,9 @@
-
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
--pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkglibexecdir = $(libexecdir)/@PACKAGE@
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
-@@ -58,14 +60,29 @@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
-+CONFIG_CLEAN_VPATH_FILES =
- am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
- am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-+am__install_max = 40
-+am__nobase_strip_setup = \
-+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-+am__nobase_strip = \
-+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-+am__nobase_list = $(am__nobase_strip_setup); \
-+ for p in $$list; do echo "$$p $$p"; done | \
-+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-+ if (++n[$$2] == $(am__install_max)) \
-+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-+ END { for (dir in files) print dir, files[dir] }'
-+am__base_list = \
-+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
- am__installdirs = "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man8dir)"
--securelibLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(securelib_LTLIBRARIES)
- pam_tty_audit_la_DEPENDENCIES =
- pam_tty_audit_la_SOURCES = pam_tty_audit.c
-@@ -75,6 +92,7 @@
- DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
-+am__mv = mv -f
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-@@ -92,6 +110,8 @@
- DATA = $(noinst_DATA)
- ETAGS = etags
- CTAGS = ctags
-+am__tty_colors = \
-+red=; grn=; lgn=; blu=; std=
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- AMTAR = @AMTAR@
-@@ -176,6 +196,7 @@
+@@ -178,6 +179,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -20959,7 +18863,7 @@ Index: pam.debian/modules/pam_tty_audit/Makefile.in
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PIE_CFLAGS = @PIE_CFLAGS@
-@@ -274,14 +295,14 @@
+@@ -278,8 +280,8 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -20970,163 +18874,18 @@ Index: pam.debian/modules/pam_tty_audit/Makefile.in
exit 1;; \
esac; \
done; \
-- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/pam_tty_audit/Makefile'; \
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu modules/pam_tty_audit/Makefile
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/pam_tty_audit/Makefile'; \
-+ $(am__cd) $(top_srcdir) && \
-+ $(AUTOMAKE) --gnu modules/pam_tty_audit/Makefile
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
-@@ -299,23 +320,28 @@
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- $(ACLOCAL_M4): $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(am__aclocal_m4_deps):
- install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
- @$(NORMAL_INSTALL)
- test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
-- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-+ @list='$(securelib_LTLIBRARIES)'; test -n "$(securelibdir)" || list=; \
-+ list2=; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-- 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"; \
-+ list2="$$list2 $$p"; \
- else :; fi; \
-- done
-+ done; \
-+ test -z "$$list2" || { \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(securelibdir)'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(securelibdir)"; \
-+ }
-
- uninstall-securelibLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-+ @list='$(securelib_LTLIBRARIES)'; test -n "$(securelibdir)" || list=; \
-+ for p in $$list; do \
-+ $(am__strip_dir) \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$f'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$f"; \
- done
-
- clean-securelibLTLIBRARIES:
-@@ -339,21 +365,21 @@
-
- .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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @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,65 +389,58 @@
-
- clean-libtool:
- -rm -rf .libs _libs
--install-man8: $(man8_MANS) $(man_MANS)
-+install-man8: $(man_MANS)
- @$(NORMAL_INSTALL)
- 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 \
-- case "$$i" in \
-- *.8*) list="$$list $$i" ;; \
-- esac; \
-+ @list=''; test -n "$(man8dir)" || exit 0; \
-+ { for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.8[a-z]*$$/p'; \
-+ } | while read p; do \
-+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-+ echo "$$d$$p"; echo "$$p"; \
-+ done | \
-+ sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
-+ sed 'N;N;s,\n, ,g' | { \
-+ list=; while read file base inst; do \
-+ if test "$$base" = "$$inst"; then list="$$list $$file"; else \
-+ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-+ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst" || exit $$?; \
-+ fi; \
+@@ -378,8 +380,8 @@
+ esac; \
done; \
-- for i in $$list; do \
+ for i in $$list; do \
- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
- else file=$$i; fi; \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 8*) ;; \
-- *) ext='8' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-- $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \
-- done
-+ for i in $$list; do echo "$$i"; done | $(am__base_list) | \
-+ while read files; do \
-+ test -z "$$files" || { \
-+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man8dir)'"; \
-+ $(INSTALL_DATA) $$files "$(DESTDIR)$(man8dir)" || exit $$?; }; \
-+ done; }
-+
- uninstall-man8:
- @$(NORMAL_UNINSTALL)
-- @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
-- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-- for i in $$l2; do \
-- case "$$i" in \
-- *.8*) list="$$list $$i" ;; \
-- esac; \
-- done; \
-- for i in $$list; do \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 8*) ;; \
-- *) ext='8' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \
-- rm -f "$(DESTDIR)$(man8dir)/$$inst"; \
-- done
-+ @list=''; test -n "$(man8dir)" || exit 0; \
-+ files=`{ for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.8[a-z]*$$/p'; \
-+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-+ test -z "$$files" || { \
-+ echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \
-+ cd "$(DESTDIR)$(man8dir)" && rm -f $$files; }
-
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
++ if test -f $$i; then file=$$i; \
++ else file=$(srcdir)/$$i; fi; \
+ ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+ case "$$ext" in \
+ 8*) ;; \
+@@ -418,7 +420,7 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -21135,56 +18894,7 @@ Index: pam.debian/modules/pam_tty_audit/Makefile.in
END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
-+ set x; \
- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -429,37 +448,43 @@
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ shift; \
-+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
-- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique; \
-+ if test $$# -gt 0; then \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ "$$@" $$unique; \
-+ else \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$unique; \
-+ fi; \
- fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
- 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; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+ test -z "$(CTAGS_ARGS)$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-- $$tags $$unique
-+ $$unique
-
- GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
-- && cd $(top_srcdir) \
-- && gtags -i $(GTAGS_ARGS) $$here
-+ && $(am__cd) $(top_srcdir) \
-+ && gtags -i $(GTAGS_ARGS) "$$here"
-
- distclean-tags:
+@@ -461,7 +463,7 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
check-TESTS: $(TESTS)
@@ -21192,11 +18902,8 @@ Index: pam.debian/modules/pam_tty_audit/Makefile.in
+ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
srcdir=$(srcdir); export srcdir; \
list=' $(TESTS) '; \
-+ $(am__tty_colors); \
if test -n "$$list"; then \
- for tst in $$list; do \
- if test -f ./$$tst; then dir=./; \
-@@ -468,49 +493,63 @@
+@@ -472,7 +474,7 @@
if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
@@ -21204,35 +18911,19 @@ Index: pam.debian/modules/pam_tty_audit/Makefile.in
+ *[\ \ ]$$tst[\ \ ]*) \
xpass=`expr $$xpass + 1`; \
failed=`expr $$failed + 1`; \
-- echo "XPASS: $$tst"; \
-+ col=$$red; res=XPASS; \
- ;; \
- *) \
-- echo "PASS: $$tst"; \
-+ col=$$grn; res=PASS; \
- ;; \
- esac; \
+ echo "XPASS: $$tst"; \
+@@ -484,7 +486,7 @@
elif test $$? -ne 77; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
- *$$ws$$tst$$ws*) \
+ *[\ \ ]$$tst[\ \ ]*) \
xfail=`expr $$xfail + 1`; \
-- echo "XFAIL: $$tst"; \
-+ col=$$lgn; res=XFAIL; \
- ;; \
- *) \
- failed=`expr $$failed + 1`; \
-- echo "FAIL: $$tst"; \
-+ col=$$red; res=FAIL; \
+ echo "XFAIL: $$tst"; \
;; \
- esac; \
- else \
- skip=`expr $$skip + 1`; \
-- echo "SKIP: $$tst"; \
-+ col=$$blu; res=SKIP; \
+@@ -498,23 +500,36 @@
+ echo "SKIP: $$tst"; \
fi; \
-+ echo "$${col}$$res$${std}: $$tst"; \
done; \
+ if test "$$all" -eq 1; then \
+ tests="test"; \
@@ -21272,22 +18963,7 @@ Index: pam.debian/modules/pam_tty_audit/Makefile.in
test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
dashes="$$skipped"; \
fi; \
-@@ -521,15 +560,32 @@
- dashes="$$report"; \
- fi; \
- dashes=`echo "$$dashes" | sed s/./=/g`; \
-- echo "$$dashes"; \
-+ if test "$$failed" -eq 0; then \
-+ echo "$$grn$$dashes"; \
-+ else \
-+ echo "$$red$$dashes"; \
-+ fi; \
- echo "$$banner"; \
- test -z "$$skipped" || echo "$$skipped"; \
- test -z "$$report" || echo "$$report"; \
-- echo "$$dashes"; \
-+ echo "$$dashes$$std"; \
- test "$$failed" -eq 0; \
+@@ -534,6 +549,19 @@
else :; fi
distdir: $(DISTFILES)
@@ -21307,37 +18983,7 @@ Index: pam.debian/modules/pam_tty_audit/Makefile.in
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
-@@ -545,13 +601,17 @@
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-+ if test -d "$(distdir)/$$file"; then \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+ fi; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
-- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
- else \
-- test -f $(distdir)/$$file \
-- || cp -p $$d/$$file $(distdir)/$$file \
-+ test -f "$(distdir)/$$file" \
-+ || cp -p $$d/$$file "$(distdir)/$$file" \
- || exit 1; \
- fi; \
- done
-@@ -584,6 +644,7 @@
-
- distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -606,6 +667,8 @@
+@@ -610,6 +638,8 @@
html: html-am
@@ -21346,7 +18992,7 @@ Index: pam.debian/modules/pam_tty_audit/Makefile.in
info: info-am
info-am:
-@@ -614,18 +677,28 @@
+@@ -618,18 +648,28 @@
install-dvi: install-dvi-am
@@ -21375,30 +19021,13 @@ Index: pam.debian/modules/pam_tty_audit/Makefile.in
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -650,7 +723,7 @@
-
- uninstall-man: uninstall-man8
-
--.MAKE: install-am install-strip
-+.MAKE: check-am install-am install-strip
-
- .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
- clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
-@@ -670,6 +743,7 @@
-
- @ENABLE_REGENERATE_MAN_TRUE@README: pam_tty_audit.8.xml
- @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
-+
- # 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.
- .NOEXPORT:
-Index: pam.debian/conf/Makefile.in
+Index: pam.deb/conf/Makefile.in
===================================================================
---- pam.debian.orig/conf/Makefile.in
-+++ pam.debian/conf/Makefile.in
+--- pam.deb.orig/conf/Makefile.in
++++ pam.deb/conf/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -21408,65 +19037,7 @@ Index: pam.debian/conf/Makefile.in
# 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.
-@@ -15,8 +16,9 @@
- @SET_MAKE@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
--pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkglibexecdir = $(libexecdir)/@PACKAGE@
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
-@@ -51,6 +53,7 @@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
-+CONFIG_CLEAN_VPATH_FILES =
- SOURCES =
- DIST_SOURCES =
- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-@@ -62,10 +65,38 @@
- ps-recursive uninstall-recursive
- RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
- distclean-recursive maintainer-clean-recursive
-+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-+ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
-+ distdir
- ETAGS = etags
- CTAGS = ctags
- DIST_SUBDIRS = $(SUBDIRS)
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+am__relativize = \
-+ dir0=`pwd`; \
-+ sed_first='s,^\([^/]*\)/.*$$,\1,'; \
-+ sed_rest='s,^[^/]*/*,,'; \
-+ sed_last='s,^.*/\([^/]*\)$$,\1,'; \
-+ sed_butlast='s,/*[^/]*$$,,'; \
-+ while test -n "$$dir1"; do \
-+ first=`echo "$$dir1" | sed -e "$$sed_first"`; \
-+ if test "$$first" != "."; then \
-+ if test "$$first" = ".."; then \
-+ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
-+ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
-+ else \
-+ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
-+ if test "$$first2" = "$$first"; then \
-+ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
-+ else \
-+ dir2="../$$dir2"; \
-+ fi; \
-+ dir0="$$dir0"/"$$first"; \
-+ fi; \
-+ fi; \
-+ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
-+ done; \
-+ reldir="$$dir2"
- ACLOCAL = @ACLOCAL@
- AMTAR = @AMTAR@
- AR = @AR@
-@@ -149,6 +180,7 @@
+@@ -151,6 +152,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -21474,7 +19045,7 @@ Index: pam.debian/conf/Makefile.in
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PIE_CFLAGS = @PIE_CFLAGS@
-@@ -237,14 +269,14 @@
+@@ -241,8 +243,8 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -21485,24 +19056,7 @@ Index: pam.debian/conf/Makefile.in
exit 1;; \
esac; \
done; \
-- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu conf/Makefile'; \
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu conf/Makefile
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu conf/Makefile'; \
-+ $(am__cd) $(top_srcdir) && \
-+ $(AUTOMAKE) --gnu conf/Makefile
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
-@@ -262,6 +294,7 @@
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- $(ACLOCAL_M4): $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(am__aclocal_m4_deps):
-
- mostlyclean-libtool:
- -rm -f *.lo
-@@ -276,7 +309,7 @@
+@@ -280,7 +282,7 @@
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
@@ -21511,16 +19065,7 @@ Index: pam.debian/conf/Makefile.in
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
-@@ -293,7 +326,7 @@
- else \
- local_target="$$target"; \
- fi; \
-- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
-@@ -301,7 +334,7 @@
+@@ -305,7 +307,7 @@
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
@@ -21529,27 +19074,7 @@ Index: pam.debian/conf/Makefile.in
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
-@@ -327,16 +360,16 @@
- else \
- local_target="$$target"; \
- fi; \
-- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
- done
- ctags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- done
-
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-@@ -344,14 +377,14 @@
+@@ -348,7 +350,7 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -21558,130 +19083,7 @@ Index: pam.debian/conf/Makefile.in
END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
-
- TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
-+ set x; \
- here=`pwd`; \
- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
- include_option=--etags-include; \
-@@ -363,7 +396,7 @@
- list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- test ! -f $$subdir/TAGS || \
-- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
-+ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
- fi; \
- done; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-@@ -372,29 +405,34 @@
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ shift; \
-+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
-- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique; \
-+ if test $$# -gt 0; then \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ "$$@" $$unique; \
-+ else \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$unique; \
-+ fi; \
- fi
- ctags: CTAGS
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
- 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; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+ test -z "$(CTAGS_ARGS)$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-- $$tags $$unique
-+ $$unique
-
- GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
-- && cd $(top_srcdir) \
-- && gtags -i $(GTAGS_ARGS) $$here
-+ && $(am__cd) $(top_srcdir) \
-+ && gtags -i $(GTAGS_ARGS) "$$here"
-
- distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-@@ -415,29 +453,44 @@
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-+ if test -d "$(distdir)/$$file"; then \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+ fi; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
-- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
- else \
-- test -f $(distdir)/$$file \
-- || cp -p $$d/$$file $(distdir)/$$file \
-+ test -f "$(distdir)/$$file" \
-+ || cp -p $$d/$$file "$(distdir)/$$file" \
- || exit 1; \
- fi; \
- done
-- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
- || $(MKDIR_P) "$(distdir)/$$subdir" \
- || exit 1; \
-- distdir=`$(am__cd) $(distdir) && pwd`; \
-- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-- (cd $$subdir && \
-+ fi; \
-+ done
-+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-+ if test "$$subdir" = .; then :; else \
-+ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
-+ $(am__relativize); \
-+ new_distdir=$$reldir; \
-+ dir1=$$subdir; dir2="$(top_distdir)"; \
-+ $(am__relativize); \
-+ new_top_distdir=$$reldir; \
-+ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
-+ echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
-+ ($(am__cd) $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
-- top_distdir="$$top_distdir" \
-- distdir="$$distdir/$$subdir" \
-+ top_distdir="$$new_top_distdir" \
-+ distdir="$$new_distdir" \
- am__remove_distdir=: \
- am__skip_length_check=: \
-+ am__skip_mode_fix=: \
- distdir) \
- || exit 1; \
- fi; \
-@@ -468,6 +521,7 @@
-
- distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -486,6 +540,8 @@
+@@ -490,6 +492,8 @@
html: html-recursive
@@ -21690,7 +19092,7 @@ Index: pam.debian/conf/Makefile.in
info: info-recursive
info-am:
-@@ -494,18 +550,28 @@
+@@ -498,18 +502,28 @@
install-dvi: install-dvi-recursive
@@ -21719,32 +19121,13 @@ Index: pam.debian/conf/Makefile.in
installcheck-am:
maintainer-clean: maintainer-clean-recursive
-@@ -526,8 +592,8 @@
-
- uninstall-am:
-
--.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
-- install-strip
-+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
-+ install-am install-strip tags-recursive
-
- .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
- all all-am check check-am clean clean-generic clean-libtool \
-@@ -543,6 +609,7 @@
- mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
- uninstall uninstall-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.
- .NOEXPORT:
-Index: pam.debian/conf/pam_conv1/Makefile.in
+Index: pam.deb/conf/pam_conv1/Makefile.in
===================================================================
---- pam.debian.orig/conf/pam_conv1/Makefile.in
-+++ pam.debian/conf/pam_conv1/Makefile.in
+--- pam.deb.orig/conf/pam_conv1/Makefile.in
++++ pam.deb/conf/pam_conv1/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -21754,34 +19137,7 @@ Index: pam.debian/conf/pam_conv1/Makefile.in
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -20,8 +21,9 @@
-
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
--pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkglibexecdir = $(libexecdir)/@PACKAGE@
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
-@@ -58,6 +60,7 @@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
-+CONFIG_CLEAN_VPATH_FILES =
- PROGRAMS = $(noinst_PROGRAMS)
- am_pam_conv1_OBJECTS = pam_conv_l.$(OBJEXT) pam_conv_y.$(OBJEXT)
- pam_conv1_OBJECTS = $(am_pam_conv1_OBJECTS)
-@@ -65,6 +68,7 @@
- DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
-+am__mv = mv -f
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-@@ -169,6 +173,7 @@
+@@ -171,6 +172,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -21789,7 +19145,7 @@ Index: pam.debian/conf/pam_conv1/Makefile.in
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PIE_CFLAGS = @PIE_CFLAGS@
-@@ -262,14 +267,14 @@
+@@ -266,8 +268,8 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -21800,63 +19156,7 @@ Index: pam.debian/conf/pam_conv1/Makefile.in
exit 1;; \
esac; \
done; \
-- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu conf/pam_conv1/Makefile'; \
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu conf/pam_conv1/Makefile
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu conf/pam_conv1/Makefile'; \
-+ $(am__cd) $(top_srcdir) && \
-+ $(AUTOMAKE) --gnu conf/pam_conv1/Makefile
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
-@@ -287,13 +292,16 @@
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- $(ACLOCAL_M4): $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(am__aclocal_m4_deps):
-
- clean-noinstPROGRAMS:
-- @list='$(noinst_PROGRAMS)'; for p in $$list; do \
-- f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-- echo " rm -f $$p $$f"; \
-- rm -f $$p $$f ; \
-- done
-+ @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
-+ echo " rm -f" $$list; \
-+ rm -f $$list || exit $$?; \
-+ test -n "$(EXEEXT)" || exit 0; \
-+ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
-+ echo " rm -f" $$list; \
-+ rm -f $$list
- pam_conv_y.h: pam_conv_y.c
- @if test ! -f $@; then \
- rm -f pam_conv_y.c; \
-@@ -314,21 +322,21 @@
-
- .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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @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 $@ $<
-@@ -350,14 +358,14 @@
+@@ -354,7 +356,7 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -21865,88 +19165,7 @@ Index: pam.debian/conf/pam_conv1/Makefile.in
END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
-+ set x; \
- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -365,29 +373,34 @@
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ shift; \
-+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
-- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique; \
-+ if test $$# -gt 0; then \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ "$$@" $$unique; \
-+ else \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$unique; \
-+ fi; \
- fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
- 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; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+ test -z "$(CTAGS_ARGS)$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-- $$tags $$unique
-+ $$unique
-
- GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
-- && cd $(top_srcdir) \
-- && gtags -i $(GTAGS_ARGS) $$here
-+ && $(am__cd) $(top_srcdir) \
-+ && gtags -i $(GTAGS_ARGS) "$$here"
-
- distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-@@ -408,13 +421,17 @@
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-+ if test -d "$(distdir)/$$file"; then \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+ fi; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
-- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
- else \
-- test -f $(distdir)/$$file \
-- || cp -p $$d/$$file $(distdir)/$$file \
-+ test -f "$(distdir)/$$file" \
-+ || cp -p $$d/$$file "$(distdir)/$$file" \
- || exit 1; \
- fi; \
- done
-@@ -445,6 +462,7 @@
-
- distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -470,6 +488,8 @@
+@@ -474,6 +476,8 @@
html: html-am
@@ -21955,7 +19174,7 @@ Index: pam.debian/conf/pam_conv1/Makefile.in
info: info-am
info-am:
-@@ -478,18 +498,28 @@
+@@ -482,18 +486,28 @@
install-dvi: install-dvi-am
@@ -21984,30 +19203,13 @@ Index: pam.debian/conf/pam_conv1/Makefile.in
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -512,7 +542,7 @@
-
- uninstall-am:
-
--.MAKE: install-am install-strip
-+.MAKE: all check install install-am install-strip
-
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-libtool clean-noinstPROGRAMS ctags distclean \
-@@ -527,6 +557,7 @@
- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
- pdf pdf-am ps ps-am tags uninstall uninstall-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.
- .NOEXPORT:
-Index: pam.debian/doc/Makefile.in
+Index: pam.deb/doc/Makefile.in
===================================================================
---- pam.debian.orig/doc/Makefile.in
-+++ pam.debian/doc/Makefile.in
+--- pam.deb.orig/doc/Makefile.in
++++ pam.deb/doc/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -22017,87 +19219,7 @@ Index: pam.debian/doc/Makefile.in
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -20,8 +21,9 @@
-
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
--pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkglibexecdir = $(libexecdir)/@PACKAGE@
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
-@@ -57,6 +59,7 @@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
-+CONFIG_CLEAN_VPATH_FILES =
- SOURCES =
- DIST_SOURCES =
- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-@@ -71,16 +74,58 @@
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-+am__install_max = 40
-+am__nobase_strip_setup = \
-+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-+am__nobase_strip = \
-+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-+am__nobase_list = $(am__nobase_strip_setup); \
-+ for p in $$list; do echo "$$p $$p"; done | \
-+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-+ if (++n[$$2] == $(am__install_max)) \
-+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-+ END { for (dir in files) print dir, files[dir] }'
-+am__base_list = \
-+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
- 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
-+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-+ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
-+ distdir
- ETAGS = etags
- CTAGS = ctags
- DIST_SUBDIRS = $(SUBDIRS)
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+am__relativize = \
-+ dir0=`pwd`; \
-+ sed_first='s,^\([^/]*\)/.*$$,\1,'; \
-+ sed_rest='s,^[^/]*/*,,'; \
-+ sed_last='s,^.*/\([^/]*\)$$,\1,'; \
-+ sed_butlast='s,/*[^/]*$$,,'; \
-+ while test -n "$$dir1"; do \
-+ first=`echo "$$dir1" | sed -e "$$sed_first"`; \
-+ if test "$$first" != "."; then \
-+ if test "$$first" = ".."; then \
-+ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
-+ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
-+ else \
-+ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
-+ if test "$$first2" = "$$first"; then \
-+ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
-+ else \
-+ dir2="../$$dir2"; \
-+ fi; \
-+ dir0="$$dir0"/"$$first"; \
-+ fi; \
-+ fi; \
-+ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
-+ done; \
-+ reldir="$$dir2"
- ACLOCAL = @ACLOCAL@
- AMTAR = @AMTAR@
- AR = @AR@
-@@ -164,6 +209,7 @@
+@@ -166,6 +167,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -22105,7 +19227,7 @@ Index: pam.debian/doc/Makefile.in
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PIE_CFLAGS = @PIE_CFLAGS@
-@@ -252,14 +298,14 @@
+@@ -256,8 +258,8 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -22116,57 +19238,7 @@ Index: pam.debian/doc/Makefile.in
exit 1;; \
esac; \
done; \
-- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu doc/Makefile
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \
-+ $(am__cd) $(top_srcdir) && \
-+ $(AUTOMAKE) --gnu doc/Makefile
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
-@@ -277,6 +323,7 @@
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- $(ACLOCAL_M4): $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(am__aclocal_m4_deps):
-
- mostlyclean-libtool:
- -rm -f *.lo
-@@ -286,20 +333,23 @@
- install-dist_htmlDATA: $(dist_html_DATA)
- @$(NORMAL_INSTALL)
- test -z "$(htmldir)" || $(MKDIR_P) "$(DESTDIR)$(htmldir)"
-- @list='$(dist_html_DATA)'; for p in $$list; do \
-+ @list='$(dist_html_DATA)'; test -n "$(htmldir)" || list=; \
-+ for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-- echo " $(dist_htmlDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(htmldir)/$$f'"; \
-- $(dist_htmlDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(htmldir)/$$f"; \
-+ echo "$$d$$p"; \
-+ done | $(am__base_list) | \
-+ while read files; do \
-+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(htmldir)'"; \
-+ $(INSTALL_DATA) $$files "$(DESTDIR)$(htmldir)" || exit $$?; \
- done
-
- uninstall-dist_htmlDATA:
- @$(NORMAL_UNINSTALL)
-- @list='$(dist_html_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-- echo " rm -f '$(DESTDIR)$(htmldir)/$$f'"; \
-- rm -f "$(DESTDIR)$(htmldir)/$$f"; \
-- done
-+ @list='$(dist_html_DATA)'; test -n "$(htmldir)" || list=; \
-+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-+ test -n "$$files" || exit 0; \
-+ echo " ( cd '$(DESTDIR)$(htmldir)' && rm -f" $$files ")"; \
-+ cd "$(DESTDIR)$(htmldir)" && rm -f $$files
-
- # This directory's subdirectories are mostly independent; you can cd
- # into them and run `make' without going through this Makefile.
-@@ -308,7 +358,7 @@
+@@ -312,7 +314,7 @@
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
@@ -22175,16 +19247,7 @@ Index: pam.debian/doc/Makefile.in
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
-@@ -325,7 +375,7 @@
- else \
- local_target="$$target"; \
- fi; \
-- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
-@@ -333,7 +383,7 @@
+@@ -337,7 +339,7 @@
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
@@ -22193,27 +19256,7 @@ Index: pam.debian/doc/Makefile.in
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
-@@ -359,16 +409,16 @@
- else \
- local_target="$$target"; \
- fi; \
-- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
- done
- ctags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- done
-
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-@@ -376,14 +426,14 @@
+@@ -380,7 +382,7 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -22222,130 +19265,7 @@ Index: pam.debian/doc/Makefile.in
END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
-
- TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
-+ set x; \
- here=`pwd`; \
- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
- include_option=--etags-include; \
-@@ -395,7 +445,7 @@
- list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- test ! -f $$subdir/TAGS || \
-- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
-+ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
- fi; \
- done; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-@@ -404,29 +454,34 @@
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ shift; \
-+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
-- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique; \
-+ if test $$# -gt 0; then \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ "$$@" $$unique; \
-+ else \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$unique; \
-+ fi; \
- fi
- ctags: CTAGS
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
- 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; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+ test -z "$(CTAGS_ARGS)$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-- $$tags $$unique
-+ $$unique
-
- GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
-- && cd $(top_srcdir) \
-- && gtags -i $(GTAGS_ARGS) $$here
-+ && $(am__cd) $(top_srcdir) \
-+ && gtags -i $(GTAGS_ARGS) "$$here"
-
- distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-@@ -447,29 +502,44 @@
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-+ if test -d "$(distdir)/$$file"; then \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+ fi; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
-- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
- else \
-- test -f $(distdir)/$$file \
-- || cp -p $$d/$$file $(distdir)/$$file \
-+ test -f "$(distdir)/$$file" \
-+ || cp -p $$d/$$file "$(distdir)/$$file" \
- || exit 1; \
- fi; \
- done
-- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
- || $(MKDIR_P) "$(distdir)/$$subdir" \
- || exit 1; \
-- distdir=`$(am__cd) $(distdir) && pwd`; \
-- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-- (cd $$subdir && \
-+ fi; \
-+ done
-+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-+ if test "$$subdir" = .; then :; else \
-+ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
-+ $(am__relativize); \
-+ new_distdir=$$reldir; \
-+ dir1=$$subdir; dir2="$(top_distdir)"; \
-+ $(am__relativize); \
-+ new_top_distdir=$$reldir; \
-+ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
-+ echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
-+ ($(am__cd) $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
-- top_distdir="$$top_distdir" \
-- distdir="$$distdir/$$subdir" \
-+ top_distdir="$$new_top_distdir" \
-+ distdir="$$new_distdir" \
- am__remove_distdir=: \
- am__skip_length_check=: \
-+ am__skip_mode_fix=: \
- distdir) \
- || exit 1; \
- fi; \
-@@ -503,6 +573,7 @@
-
- distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -521,6 +592,8 @@
+@@ -525,6 +527,8 @@
html: html-recursive
@@ -22354,7 +19274,7 @@ Index: pam.debian/doc/Makefile.in
info: info-recursive
info-am:
-@@ -529,18 +602,28 @@
+@@ -533,18 +537,28 @@
install-dvi: install-dvi-recursive
@@ -22383,32 +19303,13 @@ Index: pam.debian/doc/Makefile.in
installcheck-am:
maintainer-clean: maintainer-clean-recursive
-@@ -561,8 +644,8 @@
-
- uninstall-am: uninstall-dist_htmlDATA
-
--.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
-- install-strip
-+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
-+ install-am install-strip tags-recursive
-
- .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
- all all-am check check-am clean clean-generic clean-libtool \
-@@ -591,6 +674,7 @@
- make -C sag releasedocs
- make -C adg releasedocs
- make -C mwg releasedocs
-+
- # 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.
- .NOEXPORT:
-Index: pam.debian/doc/adg/Makefile.in
+Index: pam.deb/doc/adg/Makefile.in
===================================================================
---- pam.debian.orig/doc/adg/Makefile.in
-+++ pam.debian/doc/adg/Makefile.in
+--- pam.deb.orig/doc/adg/Makefile.in
++++ pam.deb/doc/adg/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -22418,26 +19319,7 @@ Index: pam.debian/doc/adg/Makefile.in
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -19,8 +20,9 @@
- #
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
--pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkglibexecdir = $(libexecdir)/@PACKAGE@
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
-@@ -55,6 +57,7 @@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
-+CONFIG_CLEAN_VPATH_FILES =
- SOURCES =
- DIST_SOURCES =
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-@@ -141,6 +144,7 @@
+@@ -143,6 +144,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -22445,7 +19327,7 @@ Index: pam.debian/doc/adg/Makefile.in
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PIE_CFLAGS = @PIE_CFLAGS@
-@@ -231,14 +235,14 @@
+@@ -235,8 +237,8 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -22456,54 +19338,7 @@ Index: pam.debian/doc/adg/Makefile.in
exit 1;; \
esac; \
done; \
-- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/adg/Makefile'; \
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu doc/adg/Makefile
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/adg/Makefile'; \
-+ $(am__cd) $(top_srcdir) && \
-+ $(AUTOMAKE) --gnu doc/adg/Makefile
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
-@@ -256,6 +260,7 @@
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- $(ACLOCAL_M4): $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(am__aclocal_m4_deps):
-
- mostlyclean-libtool:
- -rm -f *.lo
-@@ -285,13 +290,17 @@
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-+ if test -d "$(distdir)/$$file"; then \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+ fi; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
-- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
- else \
-- test -f $(distdir)/$$file \
-- || cp -p $$d/$$file $(distdir)/$$file \
-+ test -f "$(distdir)/$$file" \
-+ || cp -p $$d/$$file "$(distdir)/$$file" \
- || exit 1; \
- fi; \
- done
-@@ -320,6 +329,7 @@
-
- distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -340,6 +350,8 @@
+@@ -344,6 +346,8 @@
html: html-am
@@ -22512,7 +19347,7 @@ Index: pam.debian/doc/adg/Makefile.in
info: info-am
info-am:
-@@ -348,18 +360,28 @@
+@@ -352,18 +356,28 @@
install-dvi: install-dvi-am
@@ -22541,21 +19376,13 @@ Index: pam.debian/doc/adg/Makefile.in
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -473,6 +495,7 @@
- $(top_builddir)/Linux-PAM-$(VERSION)/doc/adg/ || \
- cp -p $(srcdir)/Linux-PAM_ADG.pdf \
- $(top_builddir)/Linux-PAM-$(VERSION)/doc/adg/
-+
- # 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.
- .NOEXPORT:
-Index: pam.debian/doc/man/Makefile.in
+Index: pam.deb/doc/man/Makefile.in
===================================================================
---- pam.debian.orig/doc/man/Makefile.in
-+++ pam.debian/doc/man/Makefile.in
+--- pam.deb.orig/doc/man/Makefile.in
++++ pam.deb/doc/man/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -22565,49 +19392,7 @@ Index: pam.debian/doc/man/Makefile.in
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -19,8 +20,9 @@
- #
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
--pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkglibexecdir = $(libexecdir)/@PACKAGE@
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
-@@ -55,8 +57,30 @@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
-+CONFIG_CLEAN_VPATH_FILES =
- SOURCES =
- DIST_SOURCES =
-+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-+am__vpath_adj = case $$p in \
-+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-+ *) f=$$p;; \
-+ esac;
-+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-+am__install_max = 40
-+am__nobase_strip_setup = \
-+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-+am__nobase_strip = \
-+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-+am__nobase_list = $(am__nobase_strip_setup); \
-+ for p in $$list; do echo "$$p $$p"; done | \
-+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-+ if (++n[$$2] == $(am__install_max)) \
-+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-+ END { for (dir in files) print dir, files[dir] }'
-+am__base_list = \
-+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
- man3dir = $(mandir)/man3
- am__installdirs = "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(man5dir)" \
- "$(DESTDIR)$(man8dir)"
-@@ -148,6 +172,7 @@
+@@ -150,6 +151,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -22615,7 +19400,7 @@ Index: pam.debian/doc/man/Makefile.in
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PIE_CFLAGS = @PIE_CFLAGS@
-@@ -275,14 +300,14 @@
+@@ -279,8 +281,8 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -22626,264 +19411,40 @@ Index: pam.debian/doc/man/Makefile.in
exit 1;; \
esac; \
done; \
-- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/man/Makefile'; \
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu doc/man/Makefile
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/man/Makefile'; \
-+ $(am__cd) $(top_srcdir) && \
-+ $(AUTOMAKE) --gnu doc/man/Makefile
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
-@@ -300,147 +325,127 @@
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- $(ACLOCAL_M4): $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(am__aclocal_m4_deps):
-
- mostlyclean-libtool:
- -rm -f *.lo
-
- clean-libtool:
- -rm -rf .libs _libs
--install-man3: $(man3_MANS) $(man_MANS)
-+install-man3: $(man_MANS)
- @$(NORMAL_INSTALL)
- 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 \
-- case "$$i" in \
-- *.3*) list="$$list $$i" ;; \
-- esac; \
-+ @list=''; test -n "$(man3dir)" || exit 0; \
-+ { for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.3[a-z]*$$/p'; \
-+ } | while read p; do \
-+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-+ echo "$$d$$p"; echo "$$p"; \
-+ done | \
-+ sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^3][0-9a-z]*$$,3,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
-+ sed 'N;N;s,\n, ,g' | { \
-+ list=; while read file base inst; do \
-+ if test "$$base" = "$$inst"; then list="$$list $$file"; else \
-+ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man3dir)/$$inst'"; \
-+ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man3dir)/$$inst" || exit $$?; \
-+ fi; \
+@@ -321,8 +323,8 @@
+ esac; \
done; \
-- for i in $$list; do \
+ for i in $$list; do \
- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
- else file=$$i; fi; \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 3*) ;; \
-- *) ext='3' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man3dir)/$$inst'"; \
-- $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man3dir)/$$inst"; \
-- done
-+ for i in $$list; do echo "$$i"; done | $(am__base_list) | \
-+ while read files; do \
-+ test -z "$$files" || { \
-+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man3dir)'"; \
-+ $(INSTALL_DATA) $$files "$(DESTDIR)$(man3dir)" || exit $$?; }; \
-+ done; }
-+
- uninstall-man3:
- @$(NORMAL_UNINSTALL)
-- @list='$(man3_MANS) $(dist_man3_MANS) $(nodist_man3_MANS)'; \
-- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-- for i in $$l2; do \
-- case "$$i" in \
-- *.3*) list="$$list $$i" ;; \
-- esac; \
-- done; \
-- for i in $$list; do \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 3*) ;; \
-- *) ext='3' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " rm -f '$(DESTDIR)$(man3dir)/$$inst'"; \
-- rm -f "$(DESTDIR)$(man3dir)/$$inst"; \
-- done
--install-man5: $(man5_MANS) $(man_MANS)
-+ @list=''; test -n "$(man3dir)" || exit 0; \
-+ files=`{ for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.3[a-z]*$$/p'; \
-+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^3][0-9a-z]*$$,3,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-+ test -z "$$files" || { \
-+ echo " ( cd '$(DESTDIR)$(man3dir)' && rm -f" $$files ")"; \
-+ cd "$(DESTDIR)$(man3dir)" && rm -f $$files; }
-+install-man5: $(man_MANS)
- @$(NORMAL_INSTALL)
- 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 \
-- case "$$i" in \
-- *.5*) list="$$list $$i" ;; \
-- esac; \
-+ @list=''; test -n "$(man5dir)" || exit 0; \
-+ { for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.5[a-z]*$$/p'; \
-+ } | while read p; do \
-+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-+ echo "$$d$$p"; echo "$$p"; \
-+ done | \
-+ sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^5][0-9a-z]*$$,5,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
-+ sed 'N;N;s,\n, ,g' | { \
-+ list=; while read file base inst; do \
-+ if test "$$base" = "$$inst"; then list="$$list $$file"; else \
-+ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man5dir)/$$inst'"; \
-+ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man5dir)/$$inst" || exit $$?; \
-+ fi; \
++ if test -f $$i; then file=$$i; \
++ else file=$(srcdir)/$$i; fi; \
+ ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+ case "$$ext" in \
+ 3*) ;; \
+@@ -366,8 +368,8 @@
+ esac; \
done; \
-- for i in $$list; do \
+ for i in $$list; do \
- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
- else file=$$i; fi; \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 5*) ;; \
-- *) ext='5' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man5dir)/$$inst'"; \
-- $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man5dir)/$$inst"; \
-- done
-+ for i in $$list; do echo "$$i"; done | $(am__base_list) | \
-+ while read files; do \
-+ test -z "$$files" || { \
-+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man5dir)'"; \
-+ $(INSTALL_DATA) $$files "$(DESTDIR)$(man5dir)" || exit $$?; }; \
-+ done; }
-+
- uninstall-man5:
- @$(NORMAL_UNINSTALL)
-- @list='$(man5_MANS) $(dist_man5_MANS) $(nodist_man5_MANS)'; \
-- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-- for i in $$l2; do \
-- case "$$i" in \
-- *.5*) list="$$list $$i" ;; \
-- esac; \
-- done; \
-- for i in $$list; do \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 5*) ;; \
-- *) ext='5' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " rm -f '$(DESTDIR)$(man5dir)/$$inst'"; \
-- rm -f "$(DESTDIR)$(man5dir)/$$inst"; \
-- done
--install-man8: $(man8_MANS) $(man_MANS)
-+ @list=''; test -n "$(man5dir)" || exit 0; \
-+ files=`{ for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.5[a-z]*$$/p'; \
-+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^5][0-9a-z]*$$,5,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-+ test -z "$$files" || { \
-+ echo " ( cd '$(DESTDIR)$(man5dir)' && rm -f" $$files ")"; \
-+ cd "$(DESTDIR)$(man5dir)" && rm -f $$files; }
-+install-man8: $(man_MANS)
- @$(NORMAL_INSTALL)
- 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 \
-- case "$$i" in \
-- *.8*) list="$$list $$i" ;; \
-- esac; \
-+ @list=''; test -n "$(man8dir)" || exit 0; \
-+ { for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.8[a-z]*$$/p'; \
-+ } | while read p; do \
-+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-+ echo "$$d$$p"; echo "$$p"; \
-+ done | \
-+ sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
-+ sed 'N;N;s,\n, ,g' | { \
-+ list=; while read file base inst; do \
-+ if test "$$base" = "$$inst"; then list="$$list $$file"; else \
-+ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-+ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst" || exit $$?; \
-+ fi; \
++ if test -f $$i; then file=$$i; \
++ else file=$(srcdir)/$$i; fi; \
+ ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+ case "$$ext" in \
+ 5*) ;; \
+@@ -411,8 +413,8 @@
+ esac; \
done; \
-- for i in $$list; do \
+ for i in $$list; do \
- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
- else file=$$i; fi; \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 8*) ;; \
-- *) ext='8' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-- $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \
-- done
-+ for i in $$list; do echo "$$i"; done | $(am__base_list) | \
-+ while read files; do \
-+ test -z "$$files" || { \
-+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man8dir)'"; \
-+ $(INSTALL_DATA) $$files "$(DESTDIR)$(man8dir)" || exit $$?; }; \
-+ done; }
-+
- uninstall-man8:
- @$(NORMAL_UNINSTALL)
-- @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
-- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-- for i in $$l2; do \
-- case "$$i" in \
-- *.8*) list="$$list $$i" ;; \
-- esac; \
-- done; \
-- for i in $$list; do \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 8*) ;; \
-- *) ext='8' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \
-- rm -f "$(DESTDIR)$(man8dir)/$$inst"; \
-- done
-+ @list=''; test -n "$(man8dir)" || exit 0; \
-+ files=`{ for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.8[a-z]*$$/p'; \
-+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-+ test -z "$$files" || { \
-+ echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \
-+ cd "$(DESTDIR)$(man8dir)" && rm -f $$files; }
- tags: TAGS
- TAGS:
-
-@@ -449,6 +454,19 @@
++ if test -f $$i; then file=$$i; \
++ else file=$(srcdir)/$$i; fi; \
+ ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+ case "$$ext" in \
+ 8*) ;; \
+@@ -453,6 +455,19 @@
distdir: $(DISTFILES)
@@ -22903,37 +19464,7 @@ Index: pam.debian/doc/man/Makefile.in
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
-@@ -464,13 +482,17 @@
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-+ if test -d "$(distdir)/$$file"; then \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+ fi; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
-- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
- else \
-- test -f $(distdir)/$$file \
-- || cp -p $$d/$$file $(distdir)/$$file \
-+ test -f "$(distdir)/$$file" \
-+ || cp -p $$d/$$file "$(distdir)/$$file" \
- || exit 1; \
- fi; \
- done
-@@ -502,6 +524,7 @@
-
- distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -521,6 +544,8 @@
+@@ -525,6 +540,8 @@
html: html-am
@@ -22942,7 +19473,7 @@ Index: pam.debian/doc/man/Makefile.in
info: info-am
info-am:
-@@ -529,18 +554,28 @@
+@@ -533,18 +550,28 @@
install-dvi: install-dvi-am
@@ -22971,21 +19502,13 @@ Index: pam.debian/doc/man/Makefile.in
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -587,6 +622,7 @@
- @ENABLE_REGENERATE_MAN_TRUE@pam_set_data.3: pam_item_types_std.inc.xml pam_item_types_ext.inc.xml
- @ENABLE_REGENERATE_MAN_TRUE@pam.conf.5: pam.conf-desc.xml pam.conf-dir.xml pam.conf-syntax.xml
- @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
-+
- # 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.
- .NOEXPORT:
-Index: pam.debian/doc/mwg/Makefile.in
+Index: pam.deb/doc/mwg/Makefile.in
===================================================================
---- pam.debian.orig/doc/mwg/Makefile.in
-+++ pam.debian/doc/mwg/Makefile.in
+--- pam.deb.orig/doc/mwg/Makefile.in
++++ pam.deb/doc/mwg/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -22995,26 +19518,7 @@ Index: pam.debian/doc/mwg/Makefile.in
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -19,8 +20,9 @@
- #
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
--pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkglibexecdir = $(libexecdir)/@PACKAGE@
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
-@@ -55,6 +57,7 @@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
-+CONFIG_CLEAN_VPATH_FILES =
- SOURCES =
- DIST_SOURCES =
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-@@ -141,6 +144,7 @@
+@@ -143,6 +144,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -23022,7 +19526,7 @@ Index: pam.debian/doc/mwg/Makefile.in
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PIE_CFLAGS = @PIE_CFLAGS@
-@@ -231,14 +235,14 @@
+@@ -235,8 +237,8 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -23033,54 +19537,7 @@ Index: pam.debian/doc/mwg/Makefile.in
exit 1;; \
esac; \
done; \
-- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/mwg/Makefile'; \
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu doc/mwg/Makefile
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/mwg/Makefile'; \
-+ $(am__cd) $(top_srcdir) && \
-+ $(AUTOMAKE) --gnu doc/mwg/Makefile
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
-@@ -256,6 +260,7 @@
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- $(ACLOCAL_M4): $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(am__aclocal_m4_deps):
-
- mostlyclean-libtool:
- -rm -f *.lo
-@@ -285,13 +290,17 @@
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-+ if test -d "$(distdir)/$$file"; then \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+ fi; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
-- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
- else \
-- test -f $(distdir)/$$file \
-- || cp -p $$d/$$file $(distdir)/$$file \
-+ test -f "$(distdir)/$$file" \
-+ || cp -p $$d/$$file "$(distdir)/$$file" \
- || exit 1; \
- fi; \
- done
-@@ -320,6 +329,7 @@
-
- distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -340,6 +350,8 @@
+@@ -344,6 +346,8 @@
html: html-am
@@ -23089,7 +19546,7 @@ Index: pam.debian/doc/mwg/Makefile.in
info: info-am
info-am:
-@@ -348,18 +360,28 @@
+@@ -352,18 +356,28 @@
install-dvi: install-dvi-am
@@ -23118,21 +19575,13 @@ Index: pam.debian/doc/mwg/Makefile.in
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -473,6 +495,7 @@
- $(top_builddir)/Linux-PAM-$(VERSION)/doc/mwg/ || \
- cp -p $(srcdir)/Linux-PAM_MWG.pdf \
- $(top_builddir)/Linux-PAM-$(VERSION)/doc/mwg/
-+
- # 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.
- .NOEXPORT:
-Index: pam.debian/doc/sag/Makefile.in
+Index: pam.deb/doc/sag/Makefile.in
===================================================================
---- pam.debian.orig/doc/sag/Makefile.in
-+++ pam.debian/doc/sag/Makefile.in
+--- pam.deb.orig/doc/sag/Makefile.in
++++ pam.deb/doc/sag/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -23142,26 +19591,7 @@ Index: pam.debian/doc/sag/Makefile.in
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -19,8 +20,9 @@
- #
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
--pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkglibexecdir = $(libexecdir)/@PACKAGE@
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
-@@ -55,6 +57,7 @@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
-+CONFIG_CLEAN_VPATH_FILES =
- SOURCES =
- DIST_SOURCES =
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-@@ -141,6 +144,7 @@
+@@ -143,6 +144,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -23169,7 +19599,7 @@ Index: pam.debian/doc/sag/Makefile.in
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PIE_CFLAGS = @PIE_CFLAGS@
-@@ -231,14 +235,14 @@
+@@ -235,8 +237,8 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -23180,54 +19610,7 @@ Index: pam.debian/doc/sag/Makefile.in
exit 1;; \
esac; \
done; \
-- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/sag/Makefile'; \
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu doc/sag/Makefile
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/sag/Makefile'; \
-+ $(am__cd) $(top_srcdir) && \
-+ $(AUTOMAKE) --gnu doc/sag/Makefile
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
-@@ -256,6 +260,7 @@
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- $(ACLOCAL_M4): $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(am__aclocal_m4_deps):
-
- mostlyclean-libtool:
- -rm -f *.lo
-@@ -285,13 +290,17 @@
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-+ if test -d "$(distdir)/$$file"; then \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+ fi; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
-- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
- else \
-- test -f $(distdir)/$$file \
-- || cp -p $$d/$$file $(distdir)/$$file \
-+ test -f "$(distdir)/$$file" \
-+ || cp -p $$d/$$file "$(distdir)/$$file" \
- || exit 1; \
- fi; \
- done
-@@ -320,6 +329,7 @@
-
- distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -340,6 +350,8 @@
+@@ -344,6 +346,8 @@
html: html-am
@@ -23236,7 +19619,7 @@ Index: pam.debian/doc/sag/Makefile.in
info: info-am
info-am:
-@@ -348,18 +360,28 @@
+@@ -352,18 +356,28 @@
install-dvi: install-dvi-am
@@ -23265,21 +19648,13 @@ Index: pam.debian/doc/sag/Makefile.in
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -473,6 +495,7 @@
- $(top_builddir)/Linux-PAM-$(VERSION)/doc/sag/ || \
- cp -p $(srcdir)/Linux-PAM_SAG.pdf \
- $(top_builddir)/Linux-PAM-$(VERSION)/doc/sag/
-+
- # 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.
- .NOEXPORT:
-Index: pam.debian/doc/specs/Makefile.in
+Index: pam.deb/doc/specs/Makefile.in
===================================================================
---- pam.debian.orig/doc/specs/Makefile.in
-+++ pam.debian/doc/specs/Makefile.in
+--- pam.deb.orig/doc/specs/Makefile.in
++++ pam.deb/doc/specs/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -23289,60 +19664,7 @@ Index: pam.debian/doc/specs/Makefile.in
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -21,8 +22,9 @@
-
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
--pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkglibexecdir = $(libexecdir)/@PACKAGE@
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
-@@ -59,6 +61,7 @@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
-+CONFIG_CLEAN_VPATH_FILES =
- PROGRAMS = $(noinst_PROGRAMS)
- am_padout_OBJECTS = parse_l.$(OBJEXT) parse_y.$(OBJEXT)
- padout_OBJECTS = $(am_padout_OBJECTS)
-@@ -66,6 +69,7 @@
- DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
-+am__mv = mv -f
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-@@ -89,9 +93,23 @@
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-+am__install_max = 40
-+am__nobase_strip_setup = \
-+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-+am__nobase_strip = \
-+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-+am__nobase_list = $(am__nobase_strip_setup); \
-+ for p in $$list; do echo "$$p $$p"; done | \
-+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-+ if (++n[$$2] == $(am__install_max)) \
-+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-+ END { for (dir in files) print dir, files[dir] }'
-+am__base_list = \
-+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
- am__installdirs = "$(DESTDIR)$(docdir)"
--docDATA_INSTALL = $(INSTALL_DATA)
- DATA = $(doc_DATA)
- ETAGS = etags
- CTAGS = ctags
-@@ -179,6 +197,7 @@
+@@ -181,6 +182,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -23350,7 +19672,7 @@ Index: pam.debian/doc/specs/Makefile.in
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PIE_CFLAGS = @PIE_CFLAGS@
-@@ -273,14 +292,14 @@
+@@ -277,8 +279,8 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -23361,95 +19683,7 @@ Index: pam.debian/doc/specs/Makefile.in
exit 1;; \
esac; \
done; \
-- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/specs/Makefile'; \
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu doc/specs/Makefile
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/specs/Makefile'; \
-+ $(am__cd) $(top_srcdir) && \
-+ $(AUTOMAKE) --gnu doc/specs/Makefile
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
-@@ -298,13 +317,16 @@
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- $(ACLOCAL_M4): $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(am__aclocal_m4_deps):
-
- clean-noinstPROGRAMS:
-- @list='$(noinst_PROGRAMS)'; for p in $$list; do \
-- f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-- echo " rm -f $$p $$f"; \
-- rm -f $$p $$f ; \
-- done
-+ @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
-+ echo " rm -f" $$list; \
-+ rm -f $$list || exit $$?; \
-+ test -n "$(EXEEXT)" || exit 0; \
-+ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
-+ echo " rm -f" $$list; \
-+ rm -f $$list
- parse_y.h: parse_y.c
- @if test ! -f $@; then \
- rm -f parse_y.c; \
-@@ -325,21 +347,21 @@
-
- .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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @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 $@ $<
-@@ -358,34 +380,37 @@
- install-docDATA: $(doc_DATA)
- @$(NORMAL_INSTALL)
- test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)"
-- @list='$(doc_DATA)'; for p in $$list; do \
-+ @list='$(doc_DATA)'; test -n "$(docdir)" || list=; \
-+ for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-- echo " $(docDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(docdir)/$$f'"; \
-- $(docDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(docdir)/$$f"; \
-+ echo "$$d$$p"; \
-+ done | $(am__base_list) | \
-+ while read files; do \
-+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(docdir)'"; \
-+ $(INSTALL_DATA) $$files "$(DESTDIR)$(docdir)" || exit $$?; \
- done
-
- uninstall-docDATA:
- @$(NORMAL_UNINSTALL)
-- @list='$(doc_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-- echo " rm -f '$(DESTDIR)$(docdir)/$$f'"; \
-- rm -f "$(DESTDIR)$(docdir)/$$f"; \
-- done
-+ @list='$(doc_DATA)'; test -n "$(docdir)" || list=; \
-+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-+ test -n "$$files" || exit 0; \
-+ echo " ( cd '$(DESTDIR)$(docdir)' && rm -f" $$files ")"; \
-+ cd "$(DESTDIR)$(docdir)" && rm -f $$files
-
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+@@ -382,7 +384,7 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -23458,88 +19692,7 @@ Index: pam.debian/doc/specs/Makefile.in
END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
-+ set x; \
- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -393,29 +418,34 @@
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ shift; \
-+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
-- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique; \
-+ if test $$# -gt 0; then \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ "$$@" $$unique; \
-+ else \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$unique; \
-+ fi; \
- fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
- 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; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+ test -z "$(CTAGS_ARGS)$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-- $$tags $$unique
-+ $$unique
-
- GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
-- && cd $(top_srcdir) \
-- && gtags -i $(GTAGS_ARGS) $$here
-+ && $(am__cd) $(top_srcdir) \
-+ && gtags -i $(GTAGS_ARGS) "$$here"
-
- distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-@@ -436,13 +466,17 @@
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-+ if test -d "$(distdir)/$$file"; then \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+ fi; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
-- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
- else \
-- test -f $(distdir)/$$file \
-- || cp -p $$d/$$file $(distdir)/$$file \
-+ test -f "$(distdir)/$$file" \
-+ || cp -p $$d/$$file "$(distdir)/$$file" \
- || exit 1; \
- fi; \
- done
-@@ -476,6 +510,7 @@
-
- distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -501,6 +536,8 @@
+@@ -505,6 +507,8 @@
html: html-am
@@ -23548,7 +19701,7 @@ Index: pam.debian/doc/specs/Makefile.in
info: info-am
info-am:
-@@ -509,18 +546,28 @@
+@@ -513,18 +517,28 @@
install-dvi: install-dvi-am
@@ -23577,30 +19730,13 @@ Index: pam.debian/doc/specs/Makefile.in
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -543,7 +590,7 @@
-
- uninstall-am: uninstall-docDATA
-
--.MAKE: install-am install-strip
-+.MAKE: all check install install-am install-strip
-
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-libtool clean-noinstPROGRAMS ctags distclean \
-@@ -562,6 +609,7 @@
-
- draft-morgan-pam-current.txt: padout draft-morgan-pam.raw
- ./padout < $(srcdir)/draft-morgan-pam.raw > draft-morgan-pam-current.txt
-+
- # 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.
- .NOEXPORT:
-Index: pam.debian/examples/Makefile.in
+Index: pam.deb/examples/Makefile.in
===================================================================
---- pam.debian.orig/examples/Makefile.in
-+++ pam.debian/examples/Makefile.in
+--- pam.deb.orig/examples/Makefile.in
++++ pam.deb/examples/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -23610,34 +19746,7 @@ Index: pam.debian/examples/Makefile.in
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -20,8 +21,9 @@
-
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
--pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkglibexecdir = $(libexecdir)/@PACKAGE@
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
-@@ -58,6 +60,7 @@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
-+CONFIG_CLEAN_VPATH_FILES =
- PROGRAMS = $(noinst_PROGRAMS)
- blank_SOURCES = blank.c
- blank_OBJECTS = blank.$(OBJEXT)
-@@ -78,6 +81,7 @@
- DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
-+am__mv = mv -f
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-@@ -175,6 +179,7 @@
+@@ -177,6 +178,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -23645,7 +19754,7 @@ Index: pam.debian/examples/Makefile.in
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PIE_CFLAGS = @PIE_CFLAGS@
-@@ -269,14 +274,14 @@
+@@ -273,8 +275,8 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -23656,63 +19765,7 @@ Index: pam.debian/examples/Makefile.in
exit 1;; \
esac; \
done; \
-- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu examples/Makefile'; \
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu examples/Makefile
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu examples/Makefile'; \
-+ $(am__cd) $(top_srcdir) && \
-+ $(AUTOMAKE) --gnu examples/Makefile
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
-@@ -294,13 +299,16 @@
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- $(ACLOCAL_M4): $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(am__aclocal_m4_deps):
-
- clean-noinstPROGRAMS:
-- @list='$(noinst_PROGRAMS)'; for p in $$list; do \
-- f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-- echo " rm -f $$p $$f"; \
-- rm -f $$p $$f ; \
-- done
-+ @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
-+ echo " rm -f" $$list; \
-+ rm -f $$list || exit $$?; \
-+ test -n "$(EXEEXT)" || exit 0; \
-+ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
-+ echo " rm -f" $$list; \
-+ rm -f $$list
- blank$(EXEEXT): $(blank_OBJECTS) $(blank_DEPENDENCIES)
- @rm -f blank$(EXEEXT)
- $(LINK) $(blank_OBJECTS) $(blank_LDADD) $(LIBS)
-@@ -327,21 +335,21 @@
-
- .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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @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,14 +365,14 @@
+@@ -361,7 +363,7 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -23721,88 +19774,7 @@ Index: pam.debian/examples/Makefile.in
END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
-+ set x; \
- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -372,29 +380,34 @@
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ shift; \
-+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
-- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique; \
-+ if test $$# -gt 0; then \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ "$$@" $$unique; \
-+ else \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$unique; \
-+ fi; \
- fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
- 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; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+ test -z "$(CTAGS_ARGS)$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-- $$tags $$unique
-+ $$unique
-
- GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
-- && cd $(top_srcdir) \
-- && gtags -i $(GTAGS_ARGS) $$here
-+ && $(am__cd) $(top_srcdir) \
-+ && gtags -i $(GTAGS_ARGS) "$$here"
-
- distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-@@ -415,13 +428,17 @@
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-+ if test -d "$(distdir)/$$file"; then \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+ fi; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
-- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
- else \
-- test -f $(distdir)/$$file \
-- || cp -p $$d/$$file $(distdir)/$$file \
-+ test -f "$(distdir)/$$file" \
-+ || cp -p $$d/$$file "$(distdir)/$$file" \
- || exit 1; \
- fi; \
- done
-@@ -450,6 +467,7 @@
-
- distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -471,6 +489,8 @@
+@@ -475,6 +477,8 @@
html: html-am
@@ -23811,7 +19783,7 @@ Index: pam.debian/examples/Makefile.in
info: info-am
info-am:
-@@ -479,18 +499,28 @@
+@@ -483,18 +487,28 @@
install-dvi: install-dvi-am
@@ -23840,21 +19812,13 @@ Index: pam.debian/examples/Makefile.in
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -528,6 +558,7 @@
- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
- pdf pdf-am ps ps-am tags uninstall uninstall-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.
- .NOEXPORT:
-Index: pam.debian/libpam/Makefile.in
+Index: pam.deb/libpam/Makefile.in
===================================================================
---- pam.debian.orig/libpam/Makefile.in
-+++ pam.debian/libpam/Makefile.in
+--- pam.deb.orig/libpam/Makefile.in
++++ pam.deb/libpam/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -23864,66 +19828,7 @@ Index: pam.debian/libpam/Makefile.in
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -21,8 +22,9 @@
-
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
--pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkglibexecdir = $(libexecdir)/@PACKAGE@
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
-@@ -63,14 +65,29 @@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
-+CONFIG_CLEAN_VPATH_FILES =
- am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
- am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-+am__install_max = 40
-+am__nobase_strip_setup = \
-+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-+am__nobase_strip = \
-+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-+am__nobase_list = $(am__nobase_strip_setup); \
-+ for p in $$list; do echo "$$p $$p"; done | \
-+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-+ if (++n[$$2] == $(am__install_max)) \
-+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-+ END { for (dir in files) print dir, files[dir] }'
-+am__base_list = \
-+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
- am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"
--libLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(lib_LTLIBRARIES)
- am__DEPENDENCIES_1 =
- @STATIC_MODULES_TRUE@am__DEPENDENCIES_2 = $(shell ls \
-@@ -93,6 +110,7 @@
- DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
-+am__mv = mv -f
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-@@ -104,7 +122,6 @@
- $(LDFLAGS) -o $@
- SOURCES = $(libpam_la_SOURCES)
- DIST_SOURCES = $(libpam_la_SOURCES)
--includeHEADERS_INSTALL = $(INSTALL_HEADER)
- HEADERS = $(include_HEADERS) $(noinst_HEADERS)
- ETAGS = etags
- CTAGS = ctags
-@@ -192,6 +209,7 @@
+@@ -195,6 +196,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -23931,7 +19836,7 @@ Index: pam.debian/libpam/Makefile.in
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PIE_CFLAGS = @PIE_CFLAGS@
-@@ -306,14 +324,14 @@
+@@ -312,8 +314,8 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -23942,111 +19847,7 @@ Index: pam.debian/libpam/Makefile.in
exit 1;; \
esac; \
done; \
-- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libpam/Makefile'; \
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu libpam/Makefile
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libpam/Makefile'; \
-+ $(am__cd) $(top_srcdir) && \
-+ $(AUTOMAKE) --gnu libpam/Makefile
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
-@@ -331,23 +349,28 @@
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- $(ACLOCAL_M4): $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(am__aclocal_m4_deps):
- install-libLTLIBRARIES: $(lib_LTLIBRARIES)
- @$(NORMAL_INSTALL)
- test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
-- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-+ @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
-+ list2=; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-- 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"; \
-+ list2="$$list2 $$p"; \
- else :; fi; \
-- done
-+ done; \
-+ test -z "$$list2" || { \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
-+ }
-
- uninstall-libLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
-- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
-+ @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
-+ for p in $$list; do \
-+ $(am__strip_dir) \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
- done
-
- clean-libLTLIBRARIES:
-@@ -400,21 +423,21 @@
-
- .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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @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 $@ $<
-@@ -427,34 +450,37 @@
- install-includeHEADERS: $(include_HEADERS)
- @$(NORMAL_INSTALL)
- test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
-- @list='$(include_HEADERS)'; for p in $$list; do \
-+ @list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \
-+ for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-- echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
-- $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
-+ echo "$$d$$p"; \
-+ done | $(am__base_list) | \
-+ while read files; do \
-+ echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(includedir)'"; \
-+ $(INSTALL_HEADER) $$files "$(DESTDIR)$(includedir)" || exit $$?; \
- done
-
- uninstall-includeHEADERS:
- @$(NORMAL_UNINSTALL)
-- @list='$(include_HEADERS)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-- echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
-- rm -f "$(DESTDIR)$(includedir)/$$f"; \
-- done
-+ @list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \
-+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-+ test -n "$$files" || exit 0; \
-+ echo " ( cd '$(DESTDIR)$(includedir)' && rm -f" $$files ")"; \
-+ cd "$(DESTDIR)$(includedir)" && rm -f $$files
-
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+@@ -454,7 +456,7 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -24055,88 +19856,7 @@ Index: pam.debian/libpam/Makefile.in
END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
-+ set x; \
- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -462,29 +488,34 @@
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ shift; \
-+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
-- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique; \
-+ if test $$# -gt 0; then \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ "$$@" $$unique; \
-+ else \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$unique; \
-+ fi; \
- fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
- 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; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+ test -z "$(CTAGS_ARGS)$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-- $$tags $$unique
-+ $$unique
-
- GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
-- && cd $(top_srcdir) \
-- && gtags -i $(GTAGS_ARGS) $$here
-+ && $(am__cd) $(top_srcdir) \
-+ && gtags -i $(GTAGS_ARGS) "$$here"
-
- distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-@@ -505,13 +536,17 @@
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-+ if test -d "$(distdir)/$$file"; then \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+ fi; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
-- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
- else \
-- test -f $(distdir)/$$file \
-- || cp -p $$d/$$file $(distdir)/$$file \
-+ test -f "$(distdir)/$$file" \
-+ || cp -p $$d/$$file "$(distdir)/$$file" \
- || exit 1; \
- fi; \
- done
-@@ -543,6 +578,7 @@
-
- distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -564,6 +600,8 @@
+@@ -571,6 +573,8 @@
html: html-am
@@ -24145,7 +19865,7 @@ Index: pam.debian/libpam/Makefile.in
info: info-am
info-am:
-@@ -572,18 +610,28 @@
+@@ -579,18 +583,28 @@
install-dvi: install-dvi-am
@@ -24174,21 +19894,13 @@ Index: pam.debian/libpam/Makefile.in
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -623,6 +671,7 @@
- tags uninstall uninstall-am uninstall-includeHEADERS \
- 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.
- .NOEXPORT:
-Index: pam.debian/libpam_misc/Makefile.in
+Index: pam.deb/libpam_misc/Makefile.in
===================================================================
---- pam.debian.orig/libpam_misc/Makefile.in
-+++ pam.debian/libpam_misc/Makefile.in
+--- pam.deb.orig/libpam_misc/Makefile.in
++++ pam.deb/libpam_misc/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -24198,66 +19910,7 @@ Index: pam.debian/libpam_misc/Makefile.in
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -21,8 +22,9 @@
-
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
--pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkglibexecdir = $(libexecdir)/@PACKAGE@
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
-@@ -59,14 +61,29 @@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
-+CONFIG_CLEAN_VPATH_FILES =
- am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
- am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-+am__install_max = 40
-+am__nobase_strip_setup = \
-+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-+am__nobase_strip = \
-+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-+am__nobase_list = $(am__nobase_strip_setup); \
-+ for p in $$list; do echo "$$p $$p"; done | \
-+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-+ if (++n[$$2] == $(am__install_max)) \
-+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-+ END { for (dir in files) print dir, files[dir] }'
-+am__base_list = \
-+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
- am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"
--libLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(lib_LTLIBRARIES)
- libpam_misc_la_DEPENDENCIES = $(top_builddir)/libpam/libpam.la
- am_libpam_misc_la_OBJECTS = help_env.lo misc_conv.lo
-@@ -77,6 +94,7 @@
- DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
-+am__mv = mv -f
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-@@ -88,7 +106,6 @@
- $(LDFLAGS) -o $@
- SOURCES = $(libpam_misc_la_SOURCES)
- DIST_SOURCES = $(libpam_misc_la_SOURCES)
--includeHEADERS_INSTALL = $(INSTALL_HEADER)
- HEADERS = $(include_HEADERS)
- ETAGS = etags
- CTAGS = ctags
-@@ -176,6 +193,7 @@
+@@ -178,6 +179,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -24265,7 +19918,7 @@ Index: pam.debian/libpam_misc/Makefile.in
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PIE_CFLAGS = @PIE_CFLAGS@
-@@ -273,14 +291,14 @@
+@@ -277,8 +279,8 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -24276,111 +19929,7 @@ Index: pam.debian/libpam_misc/Makefile.in
exit 1;; \
esac; \
done; \
-- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libpam_misc/Makefile'; \
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu libpam_misc/Makefile
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libpam_misc/Makefile'; \
-+ $(am__cd) $(top_srcdir) && \
-+ $(AUTOMAKE) --gnu libpam_misc/Makefile
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
-@@ -298,23 +316,28 @@
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- $(ACLOCAL_M4): $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(am__aclocal_m4_deps):
- install-libLTLIBRARIES: $(lib_LTLIBRARIES)
- @$(NORMAL_INSTALL)
- test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
-- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-+ @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
-+ list2=; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-- 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"; \
-+ list2="$$list2 $$p"; \
- else :; fi; \
-- done
-+ done; \
-+ test -z "$$list2" || { \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
-+ }
-
- uninstall-libLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
-- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
-+ @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
-+ for p in $$list; do \
-+ $(am__strip_dir) \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
- done
-
- clean-libLTLIBRARIES:
-@@ -339,21 +362,21 @@
-
- .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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @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,34 +389,37 @@
- install-includeHEADERS: $(include_HEADERS)
- @$(NORMAL_INSTALL)
- test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
-- @list='$(include_HEADERS)'; for p in $$list; do \
-+ @list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \
-+ for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-- echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
-- $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
-+ echo "$$d$$p"; \
-+ done | $(am__base_list) | \
-+ while read files; do \
-+ echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(includedir)'"; \
-+ $(INSTALL_HEADER) $$files "$(DESTDIR)$(includedir)" || exit $$?; \
- done
-
- uninstall-includeHEADERS:
- @$(NORMAL_UNINSTALL)
-- @list='$(include_HEADERS)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-- echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
-- rm -f "$(DESTDIR)$(includedir)/$$f"; \
-- done
-+ @list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \
-+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-+ test -n "$$files" || exit 0; \
-+ echo " ( cd '$(DESTDIR)$(includedir)' && rm -f" $$files ")"; \
-+ cd "$(DESTDIR)$(includedir)" && rm -f $$files
-
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+@@ -390,7 +392,7 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -24389,88 +19938,7 @@ Index: pam.debian/libpam_misc/Makefile.in
END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
-+ set x; \
- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -401,29 +427,34 @@
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ shift; \
-+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
-- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique; \
-+ if test $$# -gt 0; then \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ "$$@" $$unique; \
-+ else \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$unique; \
-+ fi; \
- fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
- 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; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+ test -z "$(CTAGS_ARGS)$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-- $$tags $$unique
-+ $$unique
-
- GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
-- && cd $(top_srcdir) \
-- && gtags -i $(GTAGS_ARGS) $$here
-+ && $(am__cd) $(top_srcdir) \
-+ && gtags -i $(GTAGS_ARGS) "$$here"
-
- distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-@@ -444,13 +475,17 @@
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-+ if test -d "$(distdir)/$$file"; then \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+ fi; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
-- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
- else \
-- test -f $(distdir)/$$file \
-- || cp -p $$d/$$file $(distdir)/$$file \
-+ test -f "$(distdir)/$$file" \
-+ || cp -p $$d/$$file "$(distdir)/$$file" \
- || exit 1; \
- fi; \
- done
-@@ -482,6 +517,7 @@
-
- distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -503,6 +539,8 @@
+@@ -507,6 +509,8 @@
html: html-am
@@ -24479,7 +19947,7 @@ Index: pam.debian/libpam_misc/Makefile.in
info: info-am
info-am:
-@@ -511,18 +549,28 @@
+@@ -515,18 +519,28 @@
install-dvi: install-dvi-am
@@ -24508,21 +19976,13 @@ Index: pam.debian/libpam_misc/Makefile.in
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -562,6 +610,7 @@
- tags uninstall uninstall-am uninstall-includeHEADERS \
- 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.
- .NOEXPORT:
-Index: pam.debian/libpamc/Makefile.in
+Index: pam.deb/libpamc/Makefile.in
===================================================================
---- pam.debian.orig/libpamc/Makefile.in
-+++ pam.debian/libpamc/Makefile.in
+--- pam.deb.orig/libpamc/Makefile.in
++++ pam.deb/libpamc/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -24532,101 +19992,7 @@ Index: pam.debian/libpamc/Makefile.in
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -21,8 +22,9 @@
-
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
--pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkglibexecdir = $(libexecdir)/@PACKAGE@
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
-@@ -59,14 +61,29 @@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
-+CONFIG_CLEAN_VPATH_FILES =
- am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
- am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-+am__install_max = 40
-+am__nobase_strip_setup = \
-+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-+am__nobase_strip = \
-+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-+am__nobase_list = $(am__nobase_strip_setup); \
-+ for p in $$list; do echo "$$p $$p"; done | \
-+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-+ if (++n[$$2] == $(am__install_max)) \
-+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-+ END { for (dir in files) print dir, files[dir] }'
-+am__base_list = \
-+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
- am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"
--libLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(lib_LTLIBRARIES)
- libpamc_la_LIBADD =
- am_libpamc_la_OBJECTS = pamc_client.lo pamc_converse.lo pamc_load.lo
-@@ -77,6 +94,7 @@
- DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
-+am__mv = mv -f
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-@@ -95,14 +113,41 @@
- install-pdf-recursive install-ps-recursive install-recursive \
- installcheck-recursive installdirs-recursive pdf-recursive \
- ps-recursive uninstall-recursive
--includeHEADERS_INSTALL = $(INSTALL_HEADER)
- HEADERS = $(include_HEADERS) $(noinst_HEADERS)
- RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
- distclean-recursive maintainer-clean-recursive
-+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-+ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
-+ distdir
- ETAGS = etags
- CTAGS = ctags
- DIST_SUBDIRS = $(SUBDIRS)
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+am__relativize = \
-+ dir0=`pwd`; \
-+ sed_first='s,^\([^/]*\)/.*$$,\1,'; \
-+ sed_rest='s,^[^/]*/*,,'; \
-+ sed_last='s,^.*/\([^/]*\)$$,\1,'; \
-+ sed_butlast='s,/*[^/]*$$,,'; \
-+ while test -n "$$dir1"; do \
-+ first=`echo "$$dir1" | sed -e "$$sed_first"`; \
-+ if test "$$first" != "."; then \
-+ if test "$$first" = ".."; then \
-+ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
-+ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
-+ else \
-+ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
-+ if test "$$first2" = "$$first"; then \
-+ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
-+ else \
-+ dir2="../$$dir2"; \
-+ fi; \
-+ dir0="$$dir0"/"$$first"; \
-+ fi; \
-+ fi; \
-+ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
-+ done; \
-+ reldir="$$dir2"
- ACLOCAL = @ACLOCAL@
- AMTAR = @AMTAR@
- AR = @AR@
-@@ -186,6 +231,7 @@
+@@ -188,6 +189,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -24634,7 +20000,7 @@ Index: pam.debian/libpamc/Makefile.in
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PIE_CFLAGS = @PIE_CFLAGS@
-@@ -282,14 +328,14 @@
+@@ -286,8 +288,8 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -24645,112 +20011,7 @@ Index: pam.debian/libpamc/Makefile.in
exit 1;; \
esac; \
done; \
-- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libpamc/Makefile'; \
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu libpamc/Makefile
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libpamc/Makefile'; \
-+ $(am__cd) $(top_srcdir) && \
-+ $(AUTOMAKE) --gnu libpamc/Makefile
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
-@@ -307,23 +353,28 @@
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- $(ACLOCAL_M4): $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(am__aclocal_m4_deps):
- install-libLTLIBRARIES: $(lib_LTLIBRARIES)
- @$(NORMAL_INSTALL)
- test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
-- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-+ @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
-+ list2=; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-- 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"; \
-+ list2="$$list2 $$p"; \
- else :; fi; \
-- done
-+ done; \
-+ test -z "$$list2" || { \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
-+ }
-
- uninstall-libLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
-- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
-+ @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
-+ for p in $$list; do \
-+ $(am__strip_dir) \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
- done
-
- clean-libLTLIBRARIES:
-@@ -349,21 +400,21 @@
-
- .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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @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 $@ $<
-@@ -376,20 +427,23 @@
- install-includeHEADERS: $(include_HEADERS)
- @$(NORMAL_INSTALL)
- test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
-- @list='$(include_HEADERS)'; for p in $$list; do \
-+ @list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \
-+ for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-- echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
-- $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
-+ echo "$$d$$p"; \
-+ done | $(am__base_list) | \
-+ while read files; do \
-+ echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(includedir)'"; \
-+ $(INSTALL_HEADER) $$files "$(DESTDIR)$(includedir)" || exit $$?; \
- done
-
- uninstall-includeHEADERS:
- @$(NORMAL_UNINSTALL)
-- @list='$(include_HEADERS)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-- echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
-- rm -f "$(DESTDIR)$(includedir)/$$f"; \
-- done
-+ @list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \
-+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-+ test -n "$$files" || exit 0; \
-+ echo " ( cd '$(DESTDIR)$(includedir)' && rm -f" $$files ")"; \
-+ cd "$(DESTDIR)$(includedir)" && rm -f $$files
-
- # This directory's subdirectories are mostly independent; you can cd
- # into them and run `make' without going through this Makefile.
-@@ -398,7 +452,7 @@
+@@ -402,7 +404,7 @@
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
@@ -24759,16 +20020,7 @@ Index: pam.debian/libpamc/Makefile.in
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
-@@ -415,7 +469,7 @@
- else \
- local_target="$$target"; \
- fi; \
-- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
-@@ -423,7 +477,7 @@
+@@ -427,7 +429,7 @@
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
@@ -24777,27 +20029,7 @@ Index: pam.debian/libpamc/Makefile.in
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
-@@ -449,16 +503,16 @@
- else \
- local_target="$$target"; \
- fi; \
-- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
- done
- ctags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- done
-
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-@@ -466,14 +520,14 @@
+@@ -470,7 +472,7 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -24806,130 +20038,7 @@ Index: pam.debian/libpamc/Makefile.in
END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
-
- TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
-+ set x; \
- here=`pwd`; \
- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
- include_option=--etags-include; \
-@@ -485,7 +539,7 @@
- list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- test ! -f $$subdir/TAGS || \
-- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
-+ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
- fi; \
- done; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-@@ -494,29 +548,34 @@
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ shift; \
-+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
-- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique; \
-+ if test $$# -gt 0; then \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ "$$@" $$unique; \
-+ else \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$unique; \
-+ fi; \
- fi
- ctags: CTAGS
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
- 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; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+ test -z "$(CTAGS_ARGS)$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-- $$tags $$unique
-+ $$unique
-
- GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
-- && cd $(top_srcdir) \
-- && gtags -i $(GTAGS_ARGS) $$here
-+ && $(am__cd) $(top_srcdir) \
-+ && gtags -i $(GTAGS_ARGS) "$$here"
-
- distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-@@ -537,29 +596,44 @@
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-+ if test -d "$(distdir)/$$file"; then \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+ fi; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
-- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
- else \
-- test -f $(distdir)/$$file \
-- || cp -p $$d/$$file $(distdir)/$$file \
-+ test -f "$(distdir)/$$file" \
-+ || cp -p $$d/$$file "$(distdir)/$$file" \
- || exit 1; \
- fi; \
- done
-- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
- || $(MKDIR_P) "$(distdir)/$$subdir" \
- || exit 1; \
-- distdir=`$(am__cd) $(distdir) && pwd`; \
-- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-- (cd $$subdir && \
-+ fi; \
-+ done
-+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-+ if test "$$subdir" = .; then :; else \
-+ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
-+ $(am__relativize); \
-+ new_distdir=$$reldir; \
-+ dir1=$$subdir; dir2="$(top_distdir)"; \
-+ $(am__relativize); \
-+ new_top_distdir=$$reldir; \
-+ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
-+ echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
-+ ($(am__cd) $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
-- top_distdir="$$top_distdir" \
-- distdir="$$distdir/$$subdir" \
-+ top_distdir="$$new_top_distdir" \
-+ distdir="$$new_distdir" \
- am__remove_distdir=: \
- am__skip_length_check=: \
-+ am__skip_mode_fix=: \
- distdir) \
- || exit 1; \
- fi; \
-@@ -593,6 +667,7 @@
-
- distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -614,6 +689,8 @@
+@@ -618,6 +620,8 @@
html: html-recursive
@@ -24938,7 +20047,7 @@ Index: pam.debian/libpamc/Makefile.in
info: info-recursive
info-am:
-@@ -622,18 +699,28 @@
+@@ -626,18 +630,28 @@
install-dvi: install-dvi-recursive
@@ -24967,32 +20076,13 @@ Index: pam.debian/libpamc/Makefile.in
installcheck-am:
maintainer-clean: maintainer-clean-recursive
-@@ -656,8 +743,8 @@
-
- uninstall-am: uninstall-includeHEADERS uninstall-libLTLIBRARIES
-
--.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
-- install-strip
-+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
-+ install-am install-strip tags-recursive
-
- .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
- all all-am check check-am clean clean-generic \
-@@ -676,6 +763,7 @@
- tags tags-recursive uninstall uninstall-am \
- uninstall-includeHEADERS 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.
- .NOEXPORT:
-Index: pam.debian/libpamc/test/Makefile.in
+Index: pam.deb/libpamc/test/Makefile.in
===================================================================
---- pam.debian.orig/libpamc/test/Makefile.in
-+++ pam.debian/libpamc/test/Makefile.in
+--- pam.deb.orig/libpamc/test/Makefile.in
++++ pam.deb/libpamc/test/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -25002,26 +20092,7 @@ Index: pam.debian/libpamc/test/Makefile.in
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -19,8 +20,9 @@
- #
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
--pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkglibexecdir = $(libexecdir)/@PACKAGE@
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
-@@ -55,6 +57,7 @@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
-+CONFIG_CLEAN_VPATH_FILES =
- SOURCES =
- DIST_SOURCES =
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-@@ -141,6 +144,7 @@
+@@ -143,6 +144,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -25029,7 +20100,7 @@ Index: pam.debian/libpamc/test/Makefile.in
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PIE_CFLAGS = @PIE_CFLAGS@
-@@ -232,14 +236,14 @@
+@@ -236,8 +238,8 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -25040,54 +20111,7 @@ Index: pam.debian/libpamc/test/Makefile.in
exit 1;; \
esac; \
done; \
-- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnits libpamc/test/Makefile'; \
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnits libpamc/test/Makefile
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnits libpamc/test/Makefile'; \
-+ $(am__cd) $(top_srcdir) && \
-+ $(AUTOMAKE) --gnits libpamc/test/Makefile
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
-@@ -257,6 +261,7 @@
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- $(ACLOCAL_M4): $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(am__aclocal_m4_deps):
-
- mostlyclean-libtool:
- -rm -f *.lo
-@@ -286,13 +291,17 @@
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-+ if test -d "$(distdir)/$$file"; then \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+ fi; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
-- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
- else \
-- test -f $(distdir)/$$file \
-- || cp -p $$d/$$file $(distdir)/$$file \
-+ test -f "$(distdir)/$$file" \
-+ || cp -p $$d/$$file "$(distdir)/$$file" \
- || exit 1; \
- fi; \
- done
-@@ -321,6 +330,7 @@
-
- distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -339,6 +349,8 @@
+@@ -343,6 +345,8 @@
html: html-am
@@ -25096,7 +20120,7 @@ Index: pam.debian/libpamc/test/Makefile.in
info: info-am
info-am:
-@@ -347,18 +359,28 @@
+@@ -351,18 +355,28 @@
install-dvi: install-dvi-am
@@ -25125,21 +20149,13 @@ Index: pam.debian/libpamc/test/Makefile.in
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -392,6 +414,7 @@
- maintainer-clean-generic mostlyclean mostlyclean-generic \
- mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-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.
- .NOEXPORT:
-Index: pam.debian/modules/Makefile.in
+Index: pam.deb/modules/Makefile.in
===================================================================
---- pam.debian.orig/modules/Makefile.in
-+++ pam.debian/modules/Makefile.in
+--- pam.deb.orig/modules/Makefile.in
++++ pam.deb/modules/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -25149,65 +20165,7 @@ Index: pam.debian/modules/Makefile.in
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -19,8 +20,9 @@
- #
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
--pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkglibexecdir = $(libexecdir)/@PACKAGE@
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
-@@ -55,6 +57,7 @@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
-+CONFIG_CLEAN_VPATH_FILES =
- SOURCES =
- DIST_SOURCES =
- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-@@ -66,10 +69,38 @@
- ps-recursive uninstall-recursive
- RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
- distclean-recursive maintainer-clean-recursive
-+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-+ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
-+ distdir
- ETAGS = etags
- CTAGS = ctags
- DIST_SUBDIRS = $(SUBDIRS)
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+am__relativize = \
-+ dir0=`pwd`; \
-+ sed_first='s,^\([^/]*\)/.*$$,\1,'; \
-+ sed_rest='s,^[^/]*/*,,'; \
-+ sed_last='s,^.*/\([^/]*\)$$,\1,'; \
-+ sed_butlast='s,/*[^/]*$$,,'; \
-+ while test -n "$$dir1"; do \
-+ first=`echo "$$dir1" | sed -e "$$sed_first"`; \
-+ if test "$$first" != "."; then \
-+ if test "$$first" = ".."; then \
-+ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
-+ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
-+ else \
-+ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
-+ if test "$$first2" = "$$first"; then \
-+ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
-+ else \
-+ dir2="../$$dir2"; \
-+ fi; \
-+ dir0="$$dir0"/"$$first"; \
-+ fi; \
-+ fi; \
-+ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
-+ done; \
-+ reldir="$$dir2"
- ACLOCAL = @ACLOCAL@
- AMTAR = @AMTAR@
- AR = @AR@
-@@ -153,6 +184,7 @@
+@@ -155,6 +156,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -25215,7 +20173,7 @@ Index: pam.debian/modules/Makefile.in
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PIE_CFLAGS = @PIE_CFLAGS@
-@@ -251,14 +283,14 @@
+@@ -255,8 +257,8 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -25226,24 +20184,7 @@ Index: pam.debian/modules/Makefile.in
exit 1;; \
esac; \
done; \
-- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/Makefile'; \
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu modules/Makefile
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/Makefile'; \
-+ $(am__cd) $(top_srcdir) && \
-+ $(AUTOMAKE) --gnu modules/Makefile
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
-@@ -276,6 +308,7 @@
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- $(ACLOCAL_M4): $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(am__aclocal_m4_deps):
-
- mostlyclean-libtool:
- -rm -f *.lo
-@@ -290,7 +323,7 @@
+@@ -294,7 +296,7 @@
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
@@ -25252,16 +20193,7 @@ Index: pam.debian/modules/Makefile.in
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
-@@ -307,7 +340,7 @@
- else \
- local_target="$$target"; \
- fi; \
-- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
-@@ -315,7 +348,7 @@
+@@ -319,7 +321,7 @@
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
@@ -25270,27 +20202,7 @@ Index: pam.debian/modules/Makefile.in
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
-@@ -341,16 +374,16 @@
- else \
- local_target="$$target"; \
- fi; \
-- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
- done
- ctags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- done
-
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-@@ -358,14 +391,14 @@
+@@ -362,7 +364,7 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -25299,130 +20211,7 @@ Index: pam.debian/modules/Makefile.in
END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
-
- TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
-+ set x; \
- here=`pwd`; \
- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
- include_option=--etags-include; \
-@@ -377,7 +410,7 @@
- list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- test ! -f $$subdir/TAGS || \
-- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
-+ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
- fi; \
- done; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-@@ -386,29 +419,34 @@
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ shift; \
-+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
-- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique; \
-+ if test $$# -gt 0; then \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ "$$@" $$unique; \
-+ else \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$unique; \
-+ fi; \
- fi
- ctags: CTAGS
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
- 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; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+ test -z "$(CTAGS_ARGS)$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-- $$tags $$unique
-+ $$unique
-
- GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
-- && cd $(top_srcdir) \
-- && gtags -i $(GTAGS_ARGS) $$here
-+ && $(am__cd) $(top_srcdir) \
-+ && gtags -i $(GTAGS_ARGS) "$$here"
-
- distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-@@ -429,29 +467,44 @@
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-+ if test -d "$(distdir)/$$file"; then \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+ fi; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
-- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
- else \
-- test -f $(distdir)/$$file \
-- || cp -p $$d/$$file $(distdir)/$$file \
-+ test -f "$(distdir)/$$file" \
-+ || cp -p $$d/$$file "$(distdir)/$$file" \
- || exit 1; \
- fi; \
- done
-- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
- || $(MKDIR_P) "$(distdir)/$$subdir" \
- || exit 1; \
-- distdir=`$(am__cd) $(distdir) && pwd`; \
-- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-- (cd $$subdir && \
-+ fi; \
-+ done
-+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-+ if test "$$subdir" = .; then :; else \
-+ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
-+ $(am__relativize); \
-+ new_distdir=$$reldir; \
-+ dir1=$$subdir; dir2="$(top_distdir)"; \
-+ $(am__relativize); \
-+ new_top_distdir=$$reldir; \
-+ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
-+ echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
-+ ($(am__cd) $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
-- top_distdir="$$top_distdir" \
-- distdir="$$distdir/$$subdir" \
-+ top_distdir="$$new_top_distdir" \
-+ distdir="$$new_distdir" \
- am__remove_distdir=: \
- am__skip_length_check=: \
-+ am__skip_mode_fix=: \
- distdir) \
- || exit 1; \
- fi; \
-@@ -482,6 +535,7 @@
-
- distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -500,6 +554,8 @@
+@@ -504,6 +506,8 @@
html: html-recursive
@@ -25431,7 +20220,7 @@ Index: pam.debian/modules/Makefile.in
info: info-recursive
info-am:
-@@ -508,18 +564,28 @@
+@@ -512,18 +516,28 @@
install-dvi: install-dvi-recursive
@@ -25460,32 +20249,13 @@ Index: pam.debian/modules/Makefile.in
installcheck-am:
maintainer-clean: maintainer-clean-recursive
-@@ -540,8 +606,8 @@
-
- uninstall-am:
-
--.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
-- install-strip
-+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
-+ install-am install-strip tags-recursive
-
- .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
- all all-am check check-am clean clean-generic clean-libtool \
-@@ -557,6 +623,7 @@
- mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
- uninstall uninstall-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.
- .NOEXPORT:
-Index: pam.debian/modules/pam_access/Makefile.in
+Index: pam.deb/modules/pam_access/Makefile.in
===================================================================
---- pam.debian.orig/modules/pam_access/Makefile.in
-+++ pam.debian/modules/pam_access/Makefile.in
+--- pam.deb.orig/modules/pam_access/Makefile.in
++++ pam.deb/modules/pam_access/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -25495,72 +20265,7 @@ Index: pam.debian/modules/pam_access/Makefile.in
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -21,8 +22,9 @@
-
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
--pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkglibexecdir = $(libexecdir)/@PACKAGE@
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
-@@ -58,15 +60,30 @@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
-+CONFIG_CLEAN_VPATH_FILES =
- am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
- am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-+am__install_max = 40
-+am__nobase_strip_setup = \
-+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-+am__nobase_strip = \
-+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-+am__nobase_list = $(am__nobase_strip_setup); \
-+ for p in $$list; do echo "$$p $$p"; done | \
-+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-+ if (++n[$$2] == $(am__install_max)) \
-+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-+ END { for (dir in files) print dir, files[dir] }'
-+am__base_list = \
-+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
- am__installdirs = "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man5dir)" \
- "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(secureconfdir)"
--securelibLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(securelib_LTLIBRARIES)
- pam_access_la_DEPENDENCIES =
- pam_access_la_SOURCES = pam_access.c
-@@ -74,6 +91,7 @@
- DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
-+am__mv = mv -f
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-@@ -89,10 +107,11 @@
- man8dir = $(mandir)/man8
- NROFF = nroff
- MANS = $(man_MANS)
--secureconfDATA_INSTALL = $(INSTALL_DATA)
- DATA = $(noinst_DATA) $(secureconf_DATA)
- ETAGS = etags
- CTAGS = ctags
-+am__tty_colors = \
-+red=; grn=; lgn=; blu=; std=
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- AMTAR = @AMTAR@
-@@ -177,6 +196,7 @@
+@@ -179,6 +180,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -25568,7 +20273,7 @@ Index: pam.debian/modules/pam_access/Makefile.in
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PIE_CFLAGS = @PIE_CFLAGS@
-@@ -279,14 +299,14 @@
+@@ -283,8 +285,8 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -25579,270 +20284,29 @@ Index: pam.debian/modules/pam_access/Makefile.in
exit 1;; \
esac; \
done; \
-- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/pam_access/Makefile'; \
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu modules/pam_access/Makefile
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/pam_access/Makefile'; \
-+ $(am__cd) $(top_srcdir) && \
-+ $(AUTOMAKE) --gnu modules/pam_access/Makefile
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
-@@ -304,23 +324,28 @@
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- $(ACLOCAL_M4): $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(am__aclocal_m4_deps):
- install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
- @$(NORMAL_INSTALL)
- test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
-- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-+ @list='$(securelib_LTLIBRARIES)'; test -n "$(securelibdir)" || list=; \
-+ list2=; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-- 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"; \
-+ list2="$$list2 $$p"; \
- else :; fi; \
-- done
-+ done; \
-+ test -z "$$list2" || { \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(securelibdir)'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(securelibdir)"; \
-+ }
-
- uninstall-securelibLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-+ @list='$(securelib_LTLIBRARIES)'; test -n "$(securelibdir)" || list=; \
-+ for p in $$list; do \
-+ $(am__strip_dir) \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$f'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$f"; \
- done
-
- clean-securelibLTLIBRARIES:
-@@ -344,21 +369,21 @@
-
- .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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @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 $@ $<
-@@ -368,127 +393,116 @@
-
- clean-libtool:
- -rm -rf .libs _libs
--install-man5: $(man5_MANS) $(man_MANS)
-+install-man5: $(man_MANS)
- @$(NORMAL_INSTALL)
- 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 \
-- case "$$i" in \
-- *.5*) list="$$list $$i" ;; \
-- esac; \
-+ @list=''; test -n "$(man5dir)" || exit 0; \
-+ { for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.5[a-z]*$$/p'; \
-+ } | while read p; do \
-+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-+ echo "$$d$$p"; echo "$$p"; \
-+ done | \
-+ sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^5][0-9a-z]*$$,5,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
-+ sed 'N;N;s,\n, ,g' | { \
-+ list=; while read file base inst; do \
-+ if test "$$base" = "$$inst"; then list="$$list $$file"; else \
-+ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man5dir)/$$inst'"; \
-+ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man5dir)/$$inst" || exit $$?; \
-+ fi; \
+@@ -383,8 +385,8 @@
+ esac; \
done; \
-- for i in $$list; do \
+ for i in $$list; do \
- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
- else file=$$i; fi; \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 5*) ;; \
-- *) ext='5' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man5dir)/$$inst'"; \
-- $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man5dir)/$$inst"; \
-- done
-+ for i in $$list; do echo "$$i"; done | $(am__base_list) | \
-+ while read files; do \
-+ test -z "$$files" || { \
-+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man5dir)'"; \
-+ $(INSTALL_DATA) $$files "$(DESTDIR)$(man5dir)" || exit $$?; }; \
-+ done; }
-+
- uninstall-man5:
- @$(NORMAL_UNINSTALL)
-- @list='$(man5_MANS) $(dist_man5_MANS) $(nodist_man5_MANS)'; \
-- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-- for i in $$l2; do \
-- case "$$i" in \
-- *.5*) list="$$list $$i" ;; \
-- esac; \
-- done; \
-- for i in $$list; do \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 5*) ;; \
-- *) ext='5' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " rm -f '$(DESTDIR)$(man5dir)/$$inst'"; \
-- rm -f "$(DESTDIR)$(man5dir)/$$inst"; \
-- done
--install-man8: $(man8_MANS) $(man_MANS)
-+ @list=''; test -n "$(man5dir)" || exit 0; \
-+ files=`{ for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.5[a-z]*$$/p'; \
-+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^5][0-9a-z]*$$,5,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-+ test -z "$$files" || { \
-+ echo " ( cd '$(DESTDIR)$(man5dir)' && rm -f" $$files ")"; \
-+ cd "$(DESTDIR)$(man5dir)" && rm -f $$files; }
-+install-man8: $(man_MANS)
- @$(NORMAL_INSTALL)
- 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 \
-- case "$$i" in \
-- *.8*) list="$$list $$i" ;; \
-- esac; \
-+ @list=''; test -n "$(man8dir)" || exit 0; \
-+ { for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.8[a-z]*$$/p'; \
-+ } | while read p; do \
-+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-+ echo "$$d$$p"; echo "$$p"; \
-+ done | \
-+ sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
-+ sed 'N;N;s,\n, ,g' | { \
-+ list=; while read file base inst; do \
-+ if test "$$base" = "$$inst"; then list="$$list $$file"; else \
-+ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-+ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst" || exit $$?; \
-+ fi; \
++ if test -f $$i; then file=$$i; \
++ else file=$(srcdir)/$$i; fi; \
+ ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+ case "$$ext" in \
+ 5*) ;; \
+@@ -428,8 +430,8 @@
+ esac; \
done; \
-- for i in $$list; do \
+ for i in $$list; do \
- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
- else file=$$i; fi; \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 8*) ;; \
-- *) ext='8' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-- $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \
-- done
-+ for i in $$list; do echo "$$i"; done | $(am__base_list) | \
-+ while read files; do \
-+ test -z "$$files" || { \
-+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man8dir)'"; \
-+ $(INSTALL_DATA) $$files "$(DESTDIR)$(man8dir)" || exit $$?; }; \
-+ done; }
-+
- uninstall-man8:
- @$(NORMAL_UNINSTALL)
-- @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
-- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-- for i in $$l2; do \
-- case "$$i" in \
-- *.8*) list="$$list $$i" ;; \
-- esac; \
-- done; \
-- for i in $$list; do \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 8*) ;; \
-- *) ext='8' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \
-- rm -f "$(DESTDIR)$(man8dir)/$$inst"; \
-- done
-+ @list=''; test -n "$(man8dir)" || exit 0; \
-+ files=`{ for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.8[a-z]*$$/p'; \
-+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-+ test -z "$$files" || { \
-+ echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \
-+ cd "$(DESTDIR)$(man8dir)" && rm -f $$files; }
- install-secureconfDATA: $(secureconf_DATA)
- @$(NORMAL_INSTALL)
- test -z "$(secureconfdir)" || $(MKDIR_P) "$(DESTDIR)$(secureconfdir)"
-- @list='$(secureconf_DATA)'; for p in $$list; do \
-+ @list='$(secureconf_DATA)'; test -n "$(secureconfdir)" || list=; \
-+ for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-- echo " $(secureconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(secureconfdir)/$$f'"; \
-- $(secureconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(secureconfdir)/$$f"; \
-+ echo "$$d$$p"; \
-+ done | $(am__base_list) | \
-+ while read files; do \
-+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(secureconfdir)'"; \
-+ $(INSTALL_DATA) $$files "$(DESTDIR)$(secureconfdir)" || exit $$?; \
- done
-
- uninstall-secureconfDATA:
- @$(NORMAL_UNINSTALL)
-- @list='$(secureconf_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-- echo " rm -f '$(DESTDIR)$(secureconfdir)/$$f'"; \
-- rm -f "$(DESTDIR)$(secureconfdir)/$$f"; \
-- done
-+ @list='$(secureconf_DATA)'; test -n "$(secureconfdir)" || list=; \
-+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-+ test -n "$$files" || exit 0; \
-+ echo " ( cd '$(DESTDIR)$(secureconfdir)' && rm -f" $$files ")"; \
-+ cd "$(DESTDIR)$(secureconfdir)" && rm -f $$files
-
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
++ if test -f $$i; then file=$$i; \
++ else file=$(srcdir)/$$i; fi; \
+ ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+ case "$$ext" in \
+ 8*) ;; \
+@@ -485,7 +487,7 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -25851,56 +20315,7 @@ Index: pam.debian/modules/pam_access/Makefile.in
END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
-+ set x; \
- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -496,37 +510,43 @@
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ shift; \
-+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
-- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique; \
-+ if test $$# -gt 0; then \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ "$$@" $$unique; \
-+ else \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$unique; \
-+ fi; \
- fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
- 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; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+ test -z "$(CTAGS_ARGS)$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-- $$tags $$unique
-+ $$unique
-
- GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
-- && cd $(top_srcdir) \
-- && gtags -i $(GTAGS_ARGS) $$here
-+ && $(am__cd) $(top_srcdir) \
-+ && gtags -i $(GTAGS_ARGS) "$$here"
-
- distclean-tags:
+@@ -528,7 +530,7 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
check-TESTS: $(TESTS)
@@ -25908,11 +20323,8 @@ Index: pam.debian/modules/pam_access/Makefile.in
+ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
srcdir=$(srcdir); export srcdir; \
list=' $(TESTS) '; \
-+ $(am__tty_colors); \
if test -n "$$list"; then \
- for tst in $$list; do \
- if test -f ./$$tst; then dir=./; \
-@@ -535,49 +555,63 @@
+@@ -539,7 +541,7 @@
if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
@@ -25920,35 +20332,19 @@ Index: pam.debian/modules/pam_access/Makefile.in
+ *[\ \ ]$$tst[\ \ ]*) \
xpass=`expr $$xpass + 1`; \
failed=`expr $$failed + 1`; \
-- echo "XPASS: $$tst"; \
-+ col=$$red; res=XPASS; \
- ;; \
- *) \
-- echo "PASS: $$tst"; \
-+ col=$$grn; res=PASS; \
- ;; \
- esac; \
+ echo "XPASS: $$tst"; \
+@@ -551,7 +553,7 @@
elif test $$? -ne 77; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
- *$$ws$$tst$$ws*) \
+ *[\ \ ]$$tst[\ \ ]*) \
xfail=`expr $$xfail + 1`; \
-- echo "XFAIL: $$tst"; \
-+ col=$$lgn; res=XFAIL; \
+ echo "XFAIL: $$tst"; \
;; \
- *) \
- failed=`expr $$failed + 1`; \
-- echo "FAIL: $$tst"; \
-+ col=$$red; res=FAIL; \
- ;; \
- esac; \
- else \
- skip=`expr $$skip + 1`; \
-- echo "SKIP: $$tst"; \
-+ col=$$blu; res=SKIP; \
+@@ -565,23 +567,36 @@
+ echo "SKIP: $$tst"; \
fi; \
-+ echo "$${col}$$res$${std}: $$tst"; \
done; \
+ if test "$$all" -eq 1; then \
+ tests="test"; \
@@ -25988,22 +20384,7 @@ Index: pam.debian/modules/pam_access/Makefile.in
test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
dashes="$$skipped"; \
fi; \
-@@ -588,15 +622,32 @@
- dashes="$$report"; \
- fi; \
- dashes=`echo "$$dashes" | sed s/./=/g`; \
-- echo "$$dashes"; \
-+ if test "$$failed" -eq 0; then \
-+ echo "$$grn$$dashes"; \
-+ else \
-+ echo "$$red$$dashes"; \
-+ fi; \
- echo "$$banner"; \
- test -z "$$skipped" || echo "$$skipped"; \
- test -z "$$report" || echo "$$report"; \
-- echo "$$dashes"; \
-+ echo "$$dashes$$std"; \
- test "$$failed" -eq 0; \
+@@ -601,6 +616,19 @@
else :; fi
distdir: $(DISTFILES)
@@ -26023,37 +20404,7 @@ Index: pam.debian/modules/pam_access/Makefile.in
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
-@@ -612,13 +663,17 @@
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-+ if test -d "$(distdir)/$$file"; then \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+ fi; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
-- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
- else \
-- test -f $(distdir)/$$file \
-- || cp -p $$d/$$file $(distdir)/$$file \
-+ test -f "$(distdir)/$$file" \
-+ || cp -p $$d/$$file "$(distdir)/$$file" \
- || exit 1; \
- fi; \
- done
-@@ -651,6 +706,7 @@
-
- distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -673,6 +729,8 @@
+@@ -677,6 +705,8 @@
html: html-am
@@ -26062,7 +20413,7 @@ Index: pam.debian/modules/pam_access/Makefile.in
info: info-am
info-am:
-@@ -682,18 +740,28 @@
+@@ -686,18 +716,28 @@
install-dvi: install-dvi-am
@@ -26091,30 +20442,13 @@ Index: pam.debian/modules/pam_access/Makefile.in
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -719,7 +787,7 @@
-
- uninstall-man: uninstall-man5 uninstall-man8
-
--.MAKE: install-am install-strip
-+.MAKE: check-am install-am install-strip
-
- .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
- clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
-@@ -742,6 +810,7 @@
- @ENABLE_REGENERATE_MAN_TRUE@README: pam_access.8.xml access.conf.5.xml
-
- @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
-+
- # 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.
- .NOEXPORT:
-Index: pam.debian/modules/pam_cracklib/Makefile.in
+Index: pam.deb/modules/pam_cracklib/Makefile.in
===================================================================
---- pam.debian.orig/modules/pam_cracklib/Makefile.in
-+++ pam.debian/modules/pam_cracklib/Makefile.in
+--- pam.deb.orig/modules/pam_cracklib/Makefile.in
++++ pam.deb/modules/pam_cracklib/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -26124,67 +20458,7 @@ Index: pam.debian/modules/pam_cracklib/Makefile.in
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -21,8 +22,9 @@
-
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
--pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkglibexecdir = $(libexecdir)/@PACKAGE@
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
-@@ -58,14 +60,29 @@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
-+CONFIG_CLEAN_VPATH_FILES =
- am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
- am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-+am__install_max = 40
-+am__nobase_strip_setup = \
-+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-+am__nobase_strip = \
-+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-+am__nobase_list = $(am__nobase_strip_setup); \
-+ for p in $$list; do echo "$$p $$p"; done | \
-+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-+ if (++n[$$2] == $(am__install_max)) \
-+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-+ END { for (dir in files) print dir, files[dir] }'
-+am__base_list = \
-+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
- am__installdirs = "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man8dir)"
--securelibLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(securelib_LTLIBRARIES)
- pam_cracklib_la_DEPENDENCIES =
- pam_cracklib_la_SOURCES = pam_cracklib.c
-@@ -74,6 +91,7 @@
- DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
-+am__mv = mv -f
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-@@ -91,6 +109,8 @@
- DATA = $(noinst_DATA)
- ETAGS = etags
- CTAGS = ctags
-+am__tty_colors = \
-+red=; grn=; lgn=; blu=; std=
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- AMTAR = @AMTAR@
-@@ -175,6 +195,7 @@
+@@ -177,6 +178,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -26192,7 +20466,7 @@ Index: pam.debian/modules/pam_cracklib/Makefile.in
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PIE_CFLAGS = @PIE_CFLAGS@
-@@ -276,14 +297,14 @@
+@@ -280,8 +282,8 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -26203,163 +20477,18 @@ Index: pam.debian/modules/pam_cracklib/Makefile.in
exit 1;; \
esac; \
done; \
-- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/pam_cracklib/Makefile'; \
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu modules/pam_cracklib/Makefile
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/pam_cracklib/Makefile'; \
-+ $(am__cd) $(top_srcdir) && \
-+ $(AUTOMAKE) --gnu modules/pam_cracklib/Makefile
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
-@@ -301,23 +322,28 @@
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- $(ACLOCAL_M4): $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(am__aclocal_m4_deps):
- install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
- @$(NORMAL_INSTALL)
- test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
-- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-+ @list='$(securelib_LTLIBRARIES)'; test -n "$(securelibdir)" || list=; \
-+ list2=; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-- 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"; \
-+ list2="$$list2 $$p"; \
- else :; fi; \
-- done
-+ done; \
-+ test -z "$$list2" || { \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(securelibdir)'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(securelibdir)"; \
-+ }
-
- uninstall-securelibLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-+ @list='$(securelib_LTLIBRARIES)'; test -n "$(securelibdir)" || list=; \
-+ for p in $$list; do \
-+ $(am__strip_dir) \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$f'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$f"; \
- done
-
- clean-securelibLTLIBRARIES:
-@@ -341,21 +367,21 @@
-
- .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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @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 $@ $<
-@@ -365,65 +391,58 @@
-
- clean-libtool:
- -rm -rf .libs _libs
--install-man8: $(man8_MANS) $(man_MANS)
-+install-man8: $(man_MANS)
- @$(NORMAL_INSTALL)
- 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 \
-- case "$$i" in \
-- *.8*) list="$$list $$i" ;; \
-- esac; \
-+ @list=''; test -n "$(man8dir)" || exit 0; \
-+ { for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.8[a-z]*$$/p'; \
-+ } | while read p; do \
-+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-+ echo "$$d$$p"; echo "$$p"; \
-+ done | \
-+ sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
-+ sed 'N;N;s,\n, ,g' | { \
-+ list=; while read file base inst; do \
-+ if test "$$base" = "$$inst"; then list="$$list $$file"; else \
-+ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-+ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst" || exit $$?; \
-+ fi; \
+@@ -380,8 +382,8 @@
+ esac; \
done; \
-- for i in $$list; do \
+ for i in $$list; do \
- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
- else file=$$i; fi; \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 8*) ;; \
-- *) ext='8' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-- $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \
-- done
-+ for i in $$list; do echo "$$i"; done | $(am__base_list) | \
-+ while read files; do \
-+ test -z "$$files" || { \
-+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man8dir)'"; \
-+ $(INSTALL_DATA) $$files "$(DESTDIR)$(man8dir)" || exit $$?; }; \
-+ done; }
-+
- uninstall-man8:
- @$(NORMAL_UNINSTALL)
-- @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
-- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-- for i in $$l2; do \
-- case "$$i" in \
-- *.8*) list="$$list $$i" ;; \
-- esac; \
-- done; \
-- for i in $$list; do \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 8*) ;; \
-- *) ext='8' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \
-- rm -f "$(DESTDIR)$(man8dir)/$$inst"; \
-- done
-+ @list=''; test -n "$(man8dir)" || exit 0; \
-+ files=`{ for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.8[a-z]*$$/p'; \
-+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-+ test -z "$$files" || { \
-+ echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \
-+ cd "$(DESTDIR)$(man8dir)" && rm -f $$files; }
-
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
++ if test -f $$i; then file=$$i; \
++ else file=$(srcdir)/$$i; fi; \
+ ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+ case "$$ext" in \
+ 8*) ;; \
+@@ -420,7 +422,7 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -26368,56 +20497,7 @@ Index: pam.debian/modules/pam_cracklib/Makefile.in
END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
-+ set x; \
- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -431,37 +450,43 @@
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ shift; \
-+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
-- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique; \
-+ if test $$# -gt 0; then \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ "$$@" $$unique; \
-+ else \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$unique; \
-+ fi; \
- fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
- 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; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+ test -z "$(CTAGS_ARGS)$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-- $$tags $$unique
-+ $$unique
-
- GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
-- && cd $(top_srcdir) \
-- && gtags -i $(GTAGS_ARGS) $$here
-+ && $(am__cd) $(top_srcdir) \
-+ && gtags -i $(GTAGS_ARGS) "$$here"
-
- distclean-tags:
+@@ -463,7 +465,7 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
check-TESTS: $(TESTS)
@@ -26425,11 +20505,8 @@ Index: pam.debian/modules/pam_cracklib/Makefile.in
+ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
srcdir=$(srcdir); export srcdir; \
list=' $(TESTS) '; \
-+ $(am__tty_colors); \
if test -n "$$list"; then \
- for tst in $$list; do \
- if test -f ./$$tst; then dir=./; \
-@@ -470,49 +495,63 @@
+@@ -474,7 +476,7 @@
if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
@@ -26437,35 +20514,19 @@ Index: pam.debian/modules/pam_cracklib/Makefile.in
+ *[\ \ ]$$tst[\ \ ]*) \
xpass=`expr $$xpass + 1`; \
failed=`expr $$failed + 1`; \
-- echo "XPASS: $$tst"; \
-+ col=$$red; res=XPASS; \
- ;; \
- *) \
-- echo "PASS: $$tst"; \
-+ col=$$grn; res=PASS; \
- ;; \
- esac; \
+ echo "XPASS: $$tst"; \
+@@ -486,7 +488,7 @@
elif test $$? -ne 77; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
- *$$ws$$tst$$ws*) \
+ *[\ \ ]$$tst[\ \ ]*) \
xfail=`expr $$xfail + 1`; \
-- echo "XFAIL: $$tst"; \
-+ col=$$lgn; res=XFAIL; \
- ;; \
- *) \
- failed=`expr $$failed + 1`; \
-- echo "FAIL: $$tst"; \
-+ col=$$red; res=FAIL; \
+ echo "XFAIL: $$tst"; \
;; \
- esac; \
- else \
- skip=`expr $$skip + 1`; \
-- echo "SKIP: $$tst"; \
-+ col=$$blu; res=SKIP; \
+@@ -500,23 +502,36 @@
+ echo "SKIP: $$tst"; \
fi; \
-+ echo "$${col}$$res$${std}: $$tst"; \
done; \
+ if test "$$all" -eq 1; then \
+ tests="test"; \
@@ -26505,22 +20566,7 @@ Index: pam.debian/modules/pam_cracklib/Makefile.in
test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
dashes="$$skipped"; \
fi; \
-@@ -523,15 +562,32 @@
- dashes="$$report"; \
- fi; \
- dashes=`echo "$$dashes" | sed s/./=/g`; \
-- echo "$$dashes"; \
-+ if test "$$failed" -eq 0; then \
-+ echo "$$grn$$dashes"; \
-+ else \
-+ echo "$$red$$dashes"; \
-+ fi; \
- echo "$$banner"; \
- test -z "$$skipped" || echo "$$skipped"; \
- test -z "$$report" || echo "$$report"; \
-- echo "$$dashes"; \
-+ echo "$$dashes$$std"; \
- test "$$failed" -eq 0; \
+@@ -536,6 +551,19 @@
else :; fi
distdir: $(DISTFILES)
@@ -26540,37 +20586,7 @@ Index: pam.debian/modules/pam_cracklib/Makefile.in
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
-@@ -547,13 +603,17 @@
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-+ if test -d "$(distdir)/$$file"; then \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+ fi; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
-- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
- else \
-- test -f $(distdir)/$$file \
-- || cp -p $$d/$$file $(distdir)/$$file \
-+ test -f "$(distdir)/$$file" \
-+ || cp -p $$d/$$file "$(distdir)/$$file" \
- || exit 1; \
- fi; \
- done
-@@ -586,6 +646,7 @@
-
- distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -608,6 +669,8 @@
+@@ -612,6 +640,8 @@
html: html-am
@@ -26579,7 +20595,7 @@ Index: pam.debian/modules/pam_cracklib/Makefile.in
info: info-am
info-am:
-@@ -616,18 +679,28 @@
+@@ -620,18 +650,28 @@
install-dvi: install-dvi-am
@@ -26608,30 +20624,13 @@ Index: pam.debian/modules/pam_cracklib/Makefile.in
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -652,7 +725,7 @@
-
- uninstall-man: uninstall-man8
-
--.MAKE: install-am install-strip
-+.MAKE: check-am install-am install-strip
-
- .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
- clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
-@@ -672,6 +745,7 @@
-
- @ENABLE_REGENERATE_MAN_TRUE@README: pam_cracklib.8.xml
- @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
-+
- # 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.
- .NOEXPORT:
-Index: pam.debian/modules/pam_debug/Makefile.in
+Index: pam.deb/modules/pam_debug/Makefile.in
===================================================================
---- pam.debian.orig/modules/pam_debug/Makefile.in
-+++ pam.debian/modules/pam_debug/Makefile.in
+--- pam.deb.orig/modules/pam_debug/Makefile.in
++++ pam.deb/modules/pam_debug/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -26641,67 +20640,7 @@ Index: pam.debian/modules/pam_debug/Makefile.in
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -21,8 +22,9 @@
-
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
--pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkglibexecdir = $(libexecdir)/@PACKAGE@
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
-@@ -58,14 +60,29 @@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
-+CONFIG_CLEAN_VPATH_FILES =
- am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
- am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-+am__install_max = 40
-+am__nobase_strip_setup = \
-+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-+am__nobase_strip = \
-+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-+am__nobase_list = $(am__nobase_strip_setup); \
-+ for p in $$list; do echo "$$p $$p"; done | \
-+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-+ if (++n[$$2] == $(am__install_max)) \
-+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-+ END { for (dir in files) print dir, files[dir] }'
-+am__base_list = \
-+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
- am__installdirs = "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man8dir)"
--securelibLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(securelib_LTLIBRARIES)
- pam_debug_la_DEPENDENCIES =
- pam_debug_la_SOURCES = pam_debug.c
-@@ -73,6 +90,7 @@
- DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
-+am__mv = mv -f
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-@@ -90,6 +108,8 @@
- DATA = $(noinst_DATA)
- ETAGS = etags
- CTAGS = ctags
-+am__tty_colors = \
-+red=; grn=; lgn=; blu=; std=
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- AMTAR = @AMTAR@
-@@ -174,6 +194,7 @@
+@@ -176,6 +177,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -26709,7 +20648,7 @@ Index: pam.debian/modules/pam_debug/Makefile.in
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PIE_CFLAGS = @PIE_CFLAGS@
-@@ -273,14 +294,14 @@
+@@ -277,8 +279,8 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -26720,163 +20659,18 @@ Index: pam.debian/modules/pam_debug/Makefile.in
exit 1;; \
esac; \
done; \
-- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/pam_debug/Makefile'; \
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu modules/pam_debug/Makefile
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/pam_debug/Makefile'; \
-+ $(am__cd) $(top_srcdir) && \
-+ $(AUTOMAKE) --gnu modules/pam_debug/Makefile
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
-@@ -298,23 +319,28 @@
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- $(ACLOCAL_M4): $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(am__aclocal_m4_deps):
- install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
- @$(NORMAL_INSTALL)
- test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
-- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-+ @list='$(securelib_LTLIBRARIES)'; test -n "$(securelibdir)" || list=; \
-+ list2=; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-- 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"; \
-+ list2="$$list2 $$p"; \
- else :; fi; \
-- done
-+ done; \
-+ test -z "$$list2" || { \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(securelibdir)'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(securelibdir)"; \
-+ }
-
- uninstall-securelibLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-+ @list='$(securelib_LTLIBRARIES)'; test -n "$(securelibdir)" || list=; \
-+ for p in $$list; do \
-+ $(am__strip_dir) \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$f'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$f"; \
- done
-
- clean-securelibLTLIBRARIES:
-@@ -338,21 +364,21 @@
-
- .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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @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,65 +388,58 @@
-
- clean-libtool:
- -rm -rf .libs _libs
--install-man8: $(man8_MANS) $(man_MANS)
-+install-man8: $(man_MANS)
- @$(NORMAL_INSTALL)
- 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 \
-- case "$$i" in \
-- *.8*) list="$$list $$i" ;; \
-- esac; \
-+ @list=''; test -n "$(man8dir)" || exit 0; \
-+ { for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.8[a-z]*$$/p'; \
-+ } | while read p; do \
-+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-+ echo "$$d$$p"; echo "$$p"; \
-+ done | \
-+ sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
-+ sed 'N;N;s,\n, ,g' | { \
-+ list=; while read file base inst; do \
-+ if test "$$base" = "$$inst"; then list="$$list $$file"; else \
-+ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-+ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst" || exit $$?; \
-+ fi; \
+@@ -377,8 +379,8 @@
+ esac; \
done; \
-- for i in $$list; do \
+ for i in $$list; do \
- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
- else file=$$i; fi; \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 8*) ;; \
-- *) ext='8' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-- $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \
-- done
-+ for i in $$list; do echo "$$i"; done | $(am__base_list) | \
-+ while read files; do \
-+ test -z "$$files" || { \
-+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man8dir)'"; \
-+ $(INSTALL_DATA) $$files "$(DESTDIR)$(man8dir)" || exit $$?; }; \
-+ done; }
-+
- uninstall-man8:
- @$(NORMAL_UNINSTALL)
-- @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
-- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-- for i in $$l2; do \
-- case "$$i" in \
-- *.8*) list="$$list $$i" ;; \
-- esac; \
-- done; \
-- for i in $$list; do \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 8*) ;; \
-- *) ext='8' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \
-- rm -f "$(DESTDIR)$(man8dir)/$$inst"; \
-- done
-+ @list=''; test -n "$(man8dir)" || exit 0; \
-+ files=`{ for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.8[a-z]*$$/p'; \
-+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-+ test -z "$$files" || { \
-+ echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \
-+ cd "$(DESTDIR)$(man8dir)" && rm -f $$files; }
-
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
++ if test -f $$i; then file=$$i; \
++ else file=$(srcdir)/$$i; fi; \
+ ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+ case "$$ext" in \
+ 8*) ;; \
+@@ -417,7 +419,7 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -26885,56 +20679,7 @@ Index: pam.debian/modules/pam_debug/Makefile.in
END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
-+ set x; \
- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -428,37 +447,43 @@
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ shift; \
-+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
-- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique; \
-+ if test $$# -gt 0; then \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ "$$@" $$unique; \
-+ else \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$unique; \
-+ fi; \
- fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
- 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; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+ test -z "$(CTAGS_ARGS)$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-- $$tags $$unique
-+ $$unique
-
- GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
-- && cd $(top_srcdir) \
-- && gtags -i $(GTAGS_ARGS) $$here
-+ && $(am__cd) $(top_srcdir) \
-+ && gtags -i $(GTAGS_ARGS) "$$here"
-
- distclean-tags:
+@@ -460,7 +462,7 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
check-TESTS: $(TESTS)
@@ -26942,11 +20687,8 @@ Index: pam.debian/modules/pam_debug/Makefile.in
+ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
srcdir=$(srcdir); export srcdir; \
list=' $(TESTS) '; \
-+ $(am__tty_colors); \
if test -n "$$list"; then \
- for tst in $$list; do \
- if test -f ./$$tst; then dir=./; \
-@@ -467,49 +492,63 @@
+@@ -471,7 +473,7 @@
if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
@@ -26954,35 +20696,19 @@ Index: pam.debian/modules/pam_debug/Makefile.in
+ *[\ \ ]$$tst[\ \ ]*) \
xpass=`expr $$xpass + 1`; \
failed=`expr $$failed + 1`; \
-- echo "XPASS: $$tst"; \
-+ col=$$red; res=XPASS; \
- ;; \
- *) \
-- echo "PASS: $$tst"; \
-+ col=$$grn; res=PASS; \
- ;; \
- esac; \
+ echo "XPASS: $$tst"; \
+@@ -483,7 +485,7 @@
elif test $$? -ne 77; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
- *$$ws$$tst$$ws*) \
+ *[\ \ ]$$tst[\ \ ]*) \
xfail=`expr $$xfail + 1`; \
-- echo "XFAIL: $$tst"; \
-+ col=$$lgn; res=XFAIL; \
- ;; \
- *) \
- failed=`expr $$failed + 1`; \
-- echo "FAIL: $$tst"; \
-+ col=$$red; res=FAIL; \
+ echo "XFAIL: $$tst"; \
;; \
- esac; \
- else \
- skip=`expr $$skip + 1`; \
-- echo "SKIP: $$tst"; \
-+ col=$$blu; res=SKIP; \
+@@ -497,23 +499,36 @@
+ echo "SKIP: $$tst"; \
fi; \
-+ echo "$${col}$$res$${std}: $$tst"; \
done; \
+ if test "$$all" -eq 1; then \
+ tests="test"; \
@@ -27022,22 +20748,7 @@ Index: pam.debian/modules/pam_debug/Makefile.in
test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
dashes="$$skipped"; \
fi; \
-@@ -520,15 +559,32 @@
- dashes="$$report"; \
- fi; \
- dashes=`echo "$$dashes" | sed s/./=/g`; \
-- echo "$$dashes"; \
-+ if test "$$failed" -eq 0; then \
-+ echo "$$grn$$dashes"; \
-+ else \
-+ echo "$$red$$dashes"; \
-+ fi; \
- echo "$$banner"; \
- test -z "$$skipped" || echo "$$skipped"; \
- test -z "$$report" || echo "$$report"; \
-- echo "$$dashes"; \
-+ echo "$$dashes$$std"; \
- test "$$failed" -eq 0; \
+@@ -533,6 +548,19 @@
else :; fi
distdir: $(DISTFILES)
@@ -27057,37 +20768,7 @@ Index: pam.debian/modules/pam_debug/Makefile.in
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
-@@ -544,13 +600,17 @@
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-+ if test -d "$(distdir)/$$file"; then \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+ fi; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
-- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
- else \
-- test -f $(distdir)/$$file \
-- || cp -p $$d/$$file $(distdir)/$$file \
-+ test -f "$(distdir)/$$file" \
-+ || cp -p $$d/$$file "$(distdir)/$$file" \
- || exit 1; \
- fi; \
- done
-@@ -583,6 +643,7 @@
-
- distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -605,6 +666,8 @@
+@@ -609,6 +637,8 @@
html: html-am
@@ -27096,7 +20777,7 @@ Index: pam.debian/modules/pam_debug/Makefile.in
info: info-am
info-am:
-@@ -613,18 +676,28 @@
+@@ -617,18 +647,28 @@
install-dvi: install-dvi-am
@@ -27125,30 +20806,13 @@ Index: pam.debian/modules/pam_debug/Makefile.in
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -649,7 +722,7 @@
-
- uninstall-man: uninstall-man8
-
--.MAKE: install-am install-strip
-+.MAKE: check-am install-am install-strip
-
- .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
- clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
-@@ -669,6 +742,7 @@
-
- @ENABLE_REGENERATE_MAN_TRUE@README: pam_debug.8.xml
- @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
-+
- # 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.
- .NOEXPORT:
-Index: pam.debian/modules/pam_deny/Makefile.in
+Index: pam.deb/modules/pam_deny/Makefile.in
===================================================================
---- pam.debian.orig/modules/pam_deny/Makefile.in
-+++ pam.debian/modules/pam_deny/Makefile.in
+--- pam.deb.orig/modules/pam_deny/Makefile.in
++++ pam.deb/modules/pam_deny/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -27158,67 +20822,7 @@ Index: pam.debian/modules/pam_deny/Makefile.in
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -21,8 +22,9 @@
-
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
--pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkglibexecdir = $(libexecdir)/@PACKAGE@
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
-@@ -58,14 +60,29 @@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
-+CONFIG_CLEAN_VPATH_FILES =
- am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
- am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-+am__install_max = 40
-+am__nobase_strip_setup = \
-+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-+am__nobase_strip = \
-+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-+am__nobase_list = $(am__nobase_strip_setup); \
-+ for p in $$list; do echo "$$p $$p"; done | \
-+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-+ if (++n[$$2] == $(am__install_max)) \
-+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-+ END { for (dir in files) print dir, files[dir] }'
-+am__base_list = \
-+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
- am__installdirs = "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man8dir)"
--securelibLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(securelib_LTLIBRARIES)
- pam_deny_la_DEPENDENCIES =
- pam_deny_la_SOURCES = pam_deny.c
-@@ -73,6 +90,7 @@
- DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
-+am__mv = mv -f
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-@@ -90,6 +108,8 @@
- DATA = $(noinst_DATA)
- ETAGS = etags
- CTAGS = ctags
-+am__tty_colors = \
-+red=; grn=; lgn=; blu=; std=
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- AMTAR = @AMTAR@
-@@ -174,6 +194,7 @@
+@@ -176,6 +177,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -27226,7 +20830,7 @@ Index: pam.debian/modules/pam_deny/Makefile.in
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PIE_CFLAGS = @PIE_CFLAGS@
-@@ -273,14 +294,14 @@
+@@ -277,8 +279,8 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -27237,163 +20841,18 @@ Index: pam.debian/modules/pam_deny/Makefile.in
exit 1;; \
esac; \
done; \
-- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/pam_deny/Makefile'; \
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu modules/pam_deny/Makefile
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/pam_deny/Makefile'; \
-+ $(am__cd) $(top_srcdir) && \
-+ $(AUTOMAKE) --gnu modules/pam_deny/Makefile
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
-@@ -298,23 +319,28 @@
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- $(ACLOCAL_M4): $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(am__aclocal_m4_deps):
- install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
- @$(NORMAL_INSTALL)
- test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
-- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-+ @list='$(securelib_LTLIBRARIES)'; test -n "$(securelibdir)" || list=; \
-+ list2=; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-- 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"; \
-+ list2="$$list2 $$p"; \
- else :; fi; \
-- done
-+ done; \
-+ test -z "$$list2" || { \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(securelibdir)'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(securelibdir)"; \
-+ }
-
- uninstall-securelibLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-+ @list='$(securelib_LTLIBRARIES)'; test -n "$(securelibdir)" || list=; \
-+ for p in $$list; do \
-+ $(am__strip_dir) \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$f'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$f"; \
- done
-
- clean-securelibLTLIBRARIES:
-@@ -338,21 +364,21 @@
-
- .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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @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,65 +388,58 @@
-
- clean-libtool:
- -rm -rf .libs _libs
--install-man8: $(man8_MANS) $(man_MANS)
-+install-man8: $(man_MANS)
- @$(NORMAL_INSTALL)
- 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 \
-- case "$$i" in \
-- *.8*) list="$$list $$i" ;; \
-- esac; \
-+ @list=''; test -n "$(man8dir)" || exit 0; \
-+ { for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.8[a-z]*$$/p'; \
-+ } | while read p; do \
-+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-+ echo "$$d$$p"; echo "$$p"; \
-+ done | \
-+ sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
-+ sed 'N;N;s,\n, ,g' | { \
-+ list=; while read file base inst; do \
-+ if test "$$base" = "$$inst"; then list="$$list $$file"; else \
-+ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-+ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst" || exit $$?; \
-+ fi; \
+@@ -377,8 +379,8 @@
+ esac; \
done; \
-- for i in $$list; do \
+ for i in $$list; do \
- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
- else file=$$i; fi; \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 8*) ;; \
-- *) ext='8' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-- $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \
-- done
-+ for i in $$list; do echo "$$i"; done | $(am__base_list) | \
-+ while read files; do \
-+ test -z "$$files" || { \
-+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man8dir)'"; \
-+ $(INSTALL_DATA) $$files "$(DESTDIR)$(man8dir)" || exit $$?; }; \
-+ done; }
-+
- uninstall-man8:
- @$(NORMAL_UNINSTALL)
-- @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
-- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-- for i in $$l2; do \
-- case "$$i" in \
-- *.8*) list="$$list $$i" ;; \
-- esac; \
-- done; \
-- for i in $$list; do \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 8*) ;; \
-- *) ext='8' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \
-- rm -f "$(DESTDIR)$(man8dir)/$$inst"; \
-- done
-+ @list=''; test -n "$(man8dir)" || exit 0; \
-+ files=`{ for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.8[a-z]*$$/p'; \
-+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-+ test -z "$$files" || { \
-+ echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \
-+ cd "$(DESTDIR)$(man8dir)" && rm -f $$files; }
-
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
++ if test -f $$i; then file=$$i; \
++ else file=$(srcdir)/$$i; fi; \
+ ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+ case "$$ext" in \
+ 8*) ;; \
+@@ -417,7 +419,7 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -27402,56 +20861,7 @@ Index: pam.debian/modules/pam_deny/Makefile.in
END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
-+ set x; \
- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -428,37 +447,43 @@
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ shift; \
-+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
-- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique; \
-+ if test $$# -gt 0; then \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ "$$@" $$unique; \
-+ else \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$unique; \
-+ fi; \
- fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
- 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; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+ test -z "$(CTAGS_ARGS)$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-- $$tags $$unique
-+ $$unique
-
- GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
-- && cd $(top_srcdir) \
-- && gtags -i $(GTAGS_ARGS) $$here
-+ && $(am__cd) $(top_srcdir) \
-+ && gtags -i $(GTAGS_ARGS) "$$here"
-
- distclean-tags:
+@@ -460,7 +462,7 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
check-TESTS: $(TESTS)
@@ -27459,11 +20869,8 @@ Index: pam.debian/modules/pam_deny/Makefile.in
+ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
srcdir=$(srcdir); export srcdir; \
list=' $(TESTS) '; \
-+ $(am__tty_colors); \
if test -n "$$list"; then \
- for tst in $$list; do \
- if test -f ./$$tst; then dir=./; \
-@@ -467,49 +492,63 @@
+@@ -471,7 +473,7 @@
if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
@@ -27471,35 +20878,19 @@ Index: pam.debian/modules/pam_deny/Makefile.in
+ *[\ \ ]$$tst[\ \ ]*) \
xpass=`expr $$xpass + 1`; \
failed=`expr $$failed + 1`; \
-- echo "XPASS: $$tst"; \
-+ col=$$red; res=XPASS; \
- ;; \
- *) \
-- echo "PASS: $$tst"; \
-+ col=$$grn; res=PASS; \
- ;; \
- esac; \
+ echo "XPASS: $$tst"; \
+@@ -483,7 +485,7 @@
elif test $$? -ne 77; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
- *$$ws$$tst$$ws*) \
+ *[\ \ ]$$tst[\ \ ]*) \
xfail=`expr $$xfail + 1`; \
-- echo "XFAIL: $$tst"; \
-+ col=$$lgn; res=XFAIL; \
- ;; \
- *) \
- failed=`expr $$failed + 1`; \
-- echo "FAIL: $$tst"; \
-+ col=$$red; res=FAIL; \
+ echo "XFAIL: $$tst"; \
;; \
- esac; \
- else \
- skip=`expr $$skip + 1`; \
-- echo "SKIP: $$tst"; \
-+ col=$$blu; res=SKIP; \
+@@ -497,23 +499,36 @@
+ echo "SKIP: $$tst"; \
fi; \
-+ echo "$${col}$$res$${std}: $$tst"; \
done; \
+ if test "$$all" -eq 1; then \
+ tests="test"; \
@@ -27539,22 +20930,7 @@ Index: pam.debian/modules/pam_deny/Makefile.in
test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
dashes="$$skipped"; \
fi; \
-@@ -520,15 +559,32 @@
- dashes="$$report"; \
- fi; \
- dashes=`echo "$$dashes" | sed s/./=/g`; \
-- echo "$$dashes"; \
-+ if test "$$failed" -eq 0; then \
-+ echo "$$grn$$dashes"; \
-+ else \
-+ echo "$$red$$dashes"; \
-+ fi; \
- echo "$$banner"; \
- test -z "$$skipped" || echo "$$skipped"; \
- test -z "$$report" || echo "$$report"; \
-- echo "$$dashes"; \
-+ echo "$$dashes$$std"; \
- test "$$failed" -eq 0; \
+@@ -533,6 +548,19 @@
else :; fi
distdir: $(DISTFILES)
@@ -27574,37 +20950,7 @@ Index: pam.debian/modules/pam_deny/Makefile.in
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
-@@ -544,13 +600,17 @@
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-+ if test -d "$(distdir)/$$file"; then \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+ fi; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
-- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
- else \
-- test -f $(distdir)/$$file \
-- || cp -p $$d/$$file $(distdir)/$$file \
-+ test -f "$(distdir)/$$file" \
-+ || cp -p $$d/$$file "$(distdir)/$$file" \
- || exit 1; \
- fi; \
- done
-@@ -583,6 +643,7 @@
-
- distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -605,6 +666,8 @@
+@@ -609,6 +637,8 @@
html: html-am
@@ -27613,7 +20959,7 @@ Index: pam.debian/modules/pam_deny/Makefile.in
info: info-am
info-am:
-@@ -613,18 +676,28 @@
+@@ -617,18 +647,28 @@
install-dvi: install-dvi-am
@@ -27642,30 +20988,13 @@ Index: pam.debian/modules/pam_deny/Makefile.in
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -649,7 +722,7 @@
-
- uninstall-man: uninstall-man8
-
--.MAKE: install-am install-strip
-+.MAKE: check-am install-am install-strip
-
- .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
- clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
-@@ -671,6 +744,7 @@
- @ENABLE_REGENERATE_MAN_TRUE@README: pam_deny.8.xml
-
- @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
-+
- # 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.
- .NOEXPORT:
-Index: pam.debian/modules/pam_echo/Makefile.in
+Index: pam.deb/modules/pam_echo/Makefile.in
===================================================================
---- pam.debian.orig/modules/pam_echo/Makefile.in
-+++ pam.debian/modules/pam_echo/Makefile.in
+--- pam.deb.orig/modules/pam_echo/Makefile.in
++++ pam.deb/modules/pam_echo/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -27675,67 +21004,7 @@ Index: pam.debian/modules/pam_echo/Makefile.in
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -21,8 +22,9 @@
-
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
--pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkglibexecdir = $(libexecdir)/@PACKAGE@
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
-@@ -58,14 +60,29 @@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
-+CONFIG_CLEAN_VPATH_FILES =
- am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
- am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-+am__install_max = 40
-+am__nobase_strip_setup = \
-+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-+am__nobase_strip = \
-+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-+am__nobase_list = $(am__nobase_strip_setup); \
-+ for p in $$list; do echo "$$p $$p"; done | \
-+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-+ if (++n[$$2] == $(am__install_max)) \
-+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-+ END { for (dir in files) print dir, files[dir] }'
-+am__base_list = \
-+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
- am__installdirs = "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man8dir)"
--securelibLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(securelib_LTLIBRARIES)
- pam_echo_la_DEPENDENCIES =
- pam_echo_la_SOURCES = pam_echo.c
-@@ -73,6 +90,7 @@
- DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
-+am__mv = mv -f
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-@@ -90,6 +108,8 @@
- DATA = $(noinst_DATA)
- ETAGS = etags
- CTAGS = ctags
-+am__tty_colors = \
-+red=; grn=; lgn=; blu=; std=
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- AMTAR = @AMTAR@
-@@ -174,6 +194,7 @@
+@@ -176,6 +177,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -27743,7 +21012,7 @@ Index: pam.debian/modules/pam_echo/Makefile.in
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PIE_CFLAGS = @PIE_CFLAGS@
-@@ -273,14 +294,14 @@
+@@ -277,8 +279,8 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -27754,163 +21023,18 @@ Index: pam.debian/modules/pam_echo/Makefile.in
exit 1;; \
esac; \
done; \
-- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/pam_echo/Makefile'; \
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu modules/pam_echo/Makefile
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/pam_echo/Makefile'; \
-+ $(am__cd) $(top_srcdir) && \
-+ $(AUTOMAKE) --gnu modules/pam_echo/Makefile
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
-@@ -298,23 +319,28 @@
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- $(ACLOCAL_M4): $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(am__aclocal_m4_deps):
- install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
- @$(NORMAL_INSTALL)
- test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
-- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-+ @list='$(securelib_LTLIBRARIES)'; test -n "$(securelibdir)" || list=; \
-+ list2=; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-- 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"; \
-+ list2="$$list2 $$p"; \
- else :; fi; \
-- done
-+ done; \
-+ test -z "$$list2" || { \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(securelibdir)'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(securelibdir)"; \
-+ }
-
- uninstall-securelibLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-+ @list='$(securelib_LTLIBRARIES)'; test -n "$(securelibdir)" || list=; \
-+ for p in $$list; do \
-+ $(am__strip_dir) \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$f'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$f"; \
- done
-
- clean-securelibLTLIBRARIES:
-@@ -338,21 +364,21 @@
-
- .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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @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,65 +388,58 @@
-
- clean-libtool:
- -rm -rf .libs _libs
--install-man8: $(man8_MANS) $(man_MANS)
-+install-man8: $(man_MANS)
- @$(NORMAL_INSTALL)
- 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 \
-- case "$$i" in \
-- *.8*) list="$$list $$i" ;; \
-- esac; \
-+ @list=''; test -n "$(man8dir)" || exit 0; \
-+ { for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.8[a-z]*$$/p'; \
-+ } | while read p; do \
-+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-+ echo "$$d$$p"; echo "$$p"; \
-+ done | \
-+ sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
-+ sed 'N;N;s,\n, ,g' | { \
-+ list=; while read file base inst; do \
-+ if test "$$base" = "$$inst"; then list="$$list $$file"; else \
-+ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-+ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst" || exit $$?; \
-+ fi; \
+@@ -377,8 +379,8 @@
+ esac; \
done; \
-- for i in $$list; do \
+ for i in $$list; do \
- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
- else file=$$i; fi; \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 8*) ;; \
-- *) ext='8' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-- $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \
-- done
-+ for i in $$list; do echo "$$i"; done | $(am__base_list) | \
-+ while read files; do \
-+ test -z "$$files" || { \
-+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man8dir)'"; \
-+ $(INSTALL_DATA) $$files "$(DESTDIR)$(man8dir)" || exit $$?; }; \
-+ done; }
-+
- uninstall-man8:
- @$(NORMAL_UNINSTALL)
-- @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
-- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-- for i in $$l2; do \
-- case "$$i" in \
-- *.8*) list="$$list $$i" ;; \
-- esac; \
-- done; \
-- for i in $$list; do \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 8*) ;; \
-- *) ext='8' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \
-- rm -f "$(DESTDIR)$(man8dir)/$$inst"; \
-- done
-+ @list=''; test -n "$(man8dir)" || exit 0; \
-+ files=`{ for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.8[a-z]*$$/p'; \
-+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-+ test -z "$$files" || { \
-+ echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \
-+ cd "$(DESTDIR)$(man8dir)" && rm -f $$files; }
-
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
++ if test -f $$i; then file=$$i; \
++ else file=$(srcdir)/$$i; fi; \
+ ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+ case "$$ext" in \
+ 8*) ;; \
+@@ -417,7 +419,7 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -27919,56 +21043,7 @@ Index: pam.debian/modules/pam_echo/Makefile.in
END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
-+ set x; \
- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -428,37 +447,43 @@
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ shift; \
-+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
-- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique; \
-+ if test $$# -gt 0; then \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ "$$@" $$unique; \
-+ else \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$unique; \
-+ fi; \
- fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
- 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; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+ test -z "$(CTAGS_ARGS)$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-- $$tags $$unique
-+ $$unique
-
- GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
-- && cd $(top_srcdir) \
-- && gtags -i $(GTAGS_ARGS) $$here
-+ && $(am__cd) $(top_srcdir) \
-+ && gtags -i $(GTAGS_ARGS) "$$here"
-
- distclean-tags:
+@@ -460,7 +462,7 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
check-TESTS: $(TESTS)
@@ -27976,11 +21051,8 @@ Index: pam.debian/modules/pam_echo/Makefile.in
+ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
srcdir=$(srcdir); export srcdir; \
list=' $(TESTS) '; \
-+ $(am__tty_colors); \
if test -n "$$list"; then \
- for tst in $$list; do \
- if test -f ./$$tst; then dir=./; \
-@@ -467,49 +492,63 @@
+@@ -471,7 +473,7 @@
if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
@@ -27988,35 +21060,19 @@ Index: pam.debian/modules/pam_echo/Makefile.in
+ *[\ \ ]$$tst[\ \ ]*) \
xpass=`expr $$xpass + 1`; \
failed=`expr $$failed + 1`; \
-- echo "XPASS: $$tst"; \
-+ col=$$red; res=XPASS; \
- ;; \
- *) \
-- echo "PASS: $$tst"; \
-+ col=$$grn; res=PASS; \
- ;; \
- esac; \
+ echo "XPASS: $$tst"; \
+@@ -483,7 +485,7 @@
elif test $$? -ne 77; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
- *$$ws$$tst$$ws*) \
+ *[\ \ ]$$tst[\ \ ]*) \
xfail=`expr $$xfail + 1`; \
-- echo "XFAIL: $$tst"; \
-+ col=$$lgn; res=XFAIL; \
- ;; \
- *) \
- failed=`expr $$failed + 1`; \
-- echo "FAIL: $$tst"; \
-+ col=$$red; res=FAIL; \
+ echo "XFAIL: $$tst"; \
;; \
- esac; \
- else \
- skip=`expr $$skip + 1`; \
-- echo "SKIP: $$tst"; \
-+ col=$$blu; res=SKIP; \
+@@ -497,23 +499,36 @@
+ echo "SKIP: $$tst"; \
fi; \
-+ echo "$${col}$$res$${std}: $$tst"; \
done; \
+ if test "$$all" -eq 1; then \
+ tests="test"; \
@@ -28056,22 +21112,7 @@ Index: pam.debian/modules/pam_echo/Makefile.in
test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
dashes="$$skipped"; \
fi; \
-@@ -520,15 +559,32 @@
- dashes="$$report"; \
- fi; \
- dashes=`echo "$$dashes" | sed s/./=/g`; \
-- echo "$$dashes"; \
-+ if test "$$failed" -eq 0; then \
-+ echo "$$grn$$dashes"; \
-+ else \
-+ echo "$$red$$dashes"; \
-+ fi; \
- echo "$$banner"; \
- test -z "$$skipped" || echo "$$skipped"; \
- test -z "$$report" || echo "$$report"; \
-- echo "$$dashes"; \
-+ echo "$$dashes$$std"; \
- test "$$failed" -eq 0; \
+@@ -533,6 +548,19 @@
else :; fi
distdir: $(DISTFILES)
@@ -28091,37 +21132,7 @@ Index: pam.debian/modules/pam_echo/Makefile.in
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
-@@ -544,13 +600,17 @@
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-+ if test -d "$(distdir)/$$file"; then \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+ fi; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
-- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
- else \
-- test -f $(distdir)/$$file \
-- || cp -p $$d/$$file $(distdir)/$$file \
-+ test -f "$(distdir)/$$file" \
-+ || cp -p $$d/$$file "$(distdir)/$$file" \
- || exit 1; \
- fi; \
- done
-@@ -583,6 +643,7 @@
-
- distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -605,6 +666,8 @@
+@@ -609,6 +637,8 @@
html: html-am
@@ -28130,7 +21141,7 @@ Index: pam.debian/modules/pam_echo/Makefile.in
info: info-am
info-am:
-@@ -613,18 +676,28 @@
+@@ -617,18 +647,28 @@
install-dvi: install-dvi-am
@@ -28159,30 +21170,13 @@ Index: pam.debian/modules/pam_echo/Makefile.in
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -649,7 +722,7 @@
-
- uninstall-man: uninstall-man8
-
--.MAKE: install-am install-strip
-+.MAKE: check-am install-am install-strip
-
- .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
- clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
-@@ -669,6 +742,7 @@
-
- @ENABLE_REGENERATE_MAN_TRUE@README: pam_echo.8.xml
- @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
-+
- # 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.
- .NOEXPORT:
-Index: pam.debian/modules/pam_env/Makefile.in
+Index: pam.deb/modules/pam_env/Makefile.in
===================================================================
---- pam.debian.orig/modules/pam_env/Makefile.in
-+++ pam.debian/modules/pam_env/Makefile.in
+--- pam.deb.orig/modules/pam_env/Makefile.in
++++ pam.deb/modules/pam_env/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -28192,74 +21186,7 @@ Index: pam.debian/modules/pam_env/Makefile.in
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -21,8 +22,9 @@
-
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
--pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkglibexecdir = $(libexecdir)/@PACKAGE@
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
-@@ -58,16 +60,31 @@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
-+CONFIG_CLEAN_VPATH_FILES =
- am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
- am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-+am__install_max = 40
-+am__nobase_strip_setup = \
-+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-+am__nobase_strip = \
-+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-+am__nobase_list = $(am__nobase_strip_setup); \
-+ for p in $$list; do echo "$$p $$p"; done | \
-+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-+ if (++n[$$2] == $(am__install_max)) \
-+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-+ END { for (dir in files) print dir, files[dir] }'
-+am__base_list = \
-+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
- am__installdirs = "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man5dir)" \
- "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(secureconfdir)" \
- "$(DESTDIR)$(sysconfdir)"
--securelibLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(securelib_LTLIBRARIES)
- pam_env_la_DEPENDENCIES =
- pam_env_la_SOURCES = pam_env.c
-@@ -75,6 +92,7 @@
- DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
-+am__mv = mv -f
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-@@ -90,11 +108,11 @@
- man8dir = $(mandir)/man8
- NROFF = nroff
- MANS = $(man_MANS)
--secureconfDATA_INSTALL = $(INSTALL_DATA)
--sysconfDATA_INSTALL = $(INSTALL_DATA)
- DATA = $(noinst_DATA) $(secureconf_DATA) $(sysconf_DATA)
- ETAGS = etags
- CTAGS = ctags
-+am__tty_colors = \
-+red=; grn=; lgn=; blu=; std=
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- AMTAR = @AMTAR@
-@@ -179,6 +197,7 @@
+@@ -181,6 +182,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -28267,7 +21194,7 @@ Index: pam.debian/modules/pam_env/Makefile.in
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PIE_CFLAGS = @PIE_CFLAGS@
-@@ -282,14 +301,14 @@
+@@ -286,8 +288,8 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -28278,299 +21205,29 @@ Index: pam.debian/modules/pam_env/Makefile.in
exit 1;; \
esac; \
done; \
-- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/pam_env/Makefile'; \
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu modules/pam_env/Makefile
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/pam_env/Makefile'; \
-+ $(am__cd) $(top_srcdir) && \
-+ $(AUTOMAKE) --gnu modules/pam_env/Makefile
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
-@@ -307,23 +326,28 @@
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- $(ACLOCAL_M4): $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(am__aclocal_m4_deps):
- install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
- @$(NORMAL_INSTALL)
- test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
-- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-+ @list='$(securelib_LTLIBRARIES)'; test -n "$(securelibdir)" || list=; \
-+ list2=; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-- 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"; \
-+ list2="$$list2 $$p"; \
- else :; fi; \
-- done
-+ done; \
-+ test -z "$$list2" || { \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(securelibdir)'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(securelibdir)"; \
-+ }
-
- uninstall-securelibLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-+ @list='$(securelib_LTLIBRARIES)'; test -n "$(securelibdir)" || list=; \
-+ for p in $$list; do \
-+ $(am__strip_dir) \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$f'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$f"; \
- done
-
- clean-securelibLTLIBRARIES:
-@@ -347,21 +371,21 @@
-
- .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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @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,144 +395,136 @@
-
- clean-libtool:
- -rm -rf .libs _libs
--install-man5: $(man5_MANS) $(man_MANS)
-+install-man5: $(man_MANS)
- @$(NORMAL_INSTALL)
- 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 \
-- case "$$i" in \
-- *.5*) list="$$list $$i" ;; \
-- esac; \
-+ @list=''; test -n "$(man5dir)" || exit 0; \
-+ { for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.5[a-z]*$$/p'; \
-+ } | while read p; do \
-+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-+ echo "$$d$$p"; echo "$$p"; \
-+ done | \
-+ sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^5][0-9a-z]*$$,5,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
-+ sed 'N;N;s,\n, ,g' | { \
-+ list=; while read file base inst; do \
-+ if test "$$base" = "$$inst"; then list="$$list $$file"; else \
-+ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man5dir)/$$inst'"; \
-+ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man5dir)/$$inst" || exit $$?; \
-+ fi; \
+@@ -386,8 +388,8 @@
+ esac; \
done; \
-- for i in $$list; do \
+ for i in $$list; do \
- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
- else file=$$i; fi; \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 5*) ;; \
-- *) ext='5' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man5dir)/$$inst'"; \
-- $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man5dir)/$$inst"; \
-- done
-+ for i in $$list; do echo "$$i"; done | $(am__base_list) | \
-+ while read files; do \
-+ test -z "$$files" || { \
-+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man5dir)'"; \
-+ $(INSTALL_DATA) $$files "$(DESTDIR)$(man5dir)" || exit $$?; }; \
-+ done; }
-+
- uninstall-man5:
- @$(NORMAL_UNINSTALL)
-- @list='$(man5_MANS) $(dist_man5_MANS) $(nodist_man5_MANS)'; \
-- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-- for i in $$l2; do \
-- case "$$i" in \
-- *.5*) list="$$list $$i" ;; \
-- esac; \
-- done; \
-- for i in $$list; do \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 5*) ;; \
-- *) ext='5' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " rm -f '$(DESTDIR)$(man5dir)/$$inst'"; \
-- rm -f "$(DESTDIR)$(man5dir)/$$inst"; \
-- done
--install-man8: $(man8_MANS) $(man_MANS)
-+ @list=''; test -n "$(man5dir)" || exit 0; \
-+ files=`{ for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.5[a-z]*$$/p'; \
-+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^5][0-9a-z]*$$,5,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-+ test -z "$$files" || { \
-+ echo " ( cd '$(DESTDIR)$(man5dir)' && rm -f" $$files ")"; \
-+ cd "$(DESTDIR)$(man5dir)" && rm -f $$files; }
-+install-man8: $(man_MANS)
- @$(NORMAL_INSTALL)
- 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 \
-- case "$$i" in \
-- *.8*) list="$$list $$i" ;; \
-- esac; \
-+ @list=''; test -n "$(man8dir)" || exit 0; \
-+ { for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.8[a-z]*$$/p'; \
-+ } | while read p; do \
-+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-+ echo "$$d$$p"; echo "$$p"; \
-+ done | \
-+ sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
-+ sed 'N;N;s,\n, ,g' | { \
-+ list=; while read file base inst; do \
-+ if test "$$base" = "$$inst"; then list="$$list $$file"; else \
-+ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-+ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst" || exit $$?; \
-+ fi; \
++ if test -f $$i; then file=$$i; \
++ else file=$(srcdir)/$$i; fi; \
+ ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+ case "$$ext" in \
+ 5*) ;; \
+@@ -431,8 +433,8 @@
+ esac; \
done; \
-- for i in $$list; do \
+ for i in $$list; do \
- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
- else file=$$i; fi; \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 8*) ;; \
-- *) ext='8' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-- $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \
-- done
-+ for i in $$list; do echo "$$i"; done | $(am__base_list) | \
-+ while read files; do \
-+ test -z "$$files" || { \
-+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man8dir)'"; \
-+ $(INSTALL_DATA) $$files "$(DESTDIR)$(man8dir)" || exit $$?; }; \
-+ done; }
-+
- uninstall-man8:
- @$(NORMAL_UNINSTALL)
-- @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
-- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-- for i in $$l2; do \
-- case "$$i" in \
-- *.8*) list="$$list $$i" ;; \
-- esac; \
-- done; \
-- for i in $$list; do \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 8*) ;; \
-- *) ext='8' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \
-- rm -f "$(DESTDIR)$(man8dir)/$$inst"; \
-- done
-+ @list=''; test -n "$(man8dir)" || exit 0; \
-+ files=`{ for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.8[a-z]*$$/p'; \
-+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-+ test -z "$$files" || { \
-+ echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \
-+ cd "$(DESTDIR)$(man8dir)" && rm -f $$files; }
- install-secureconfDATA: $(secureconf_DATA)
- @$(NORMAL_INSTALL)
- test -z "$(secureconfdir)" || $(MKDIR_P) "$(DESTDIR)$(secureconfdir)"
-- @list='$(secureconf_DATA)'; for p in $$list; do \
-+ @list='$(secureconf_DATA)'; test -n "$(secureconfdir)" || list=; \
-+ for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-- echo " $(secureconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(secureconfdir)/$$f'"; \
-- $(secureconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(secureconfdir)/$$f"; \
-+ echo "$$d$$p"; \
-+ done | $(am__base_list) | \
-+ while read files; do \
-+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(secureconfdir)'"; \
-+ $(INSTALL_DATA) $$files "$(DESTDIR)$(secureconfdir)" || exit $$?; \
- done
-
- uninstall-secureconfDATA:
- @$(NORMAL_UNINSTALL)
-- @list='$(secureconf_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-- echo " rm -f '$(DESTDIR)$(secureconfdir)/$$f'"; \
-- rm -f "$(DESTDIR)$(secureconfdir)/$$f"; \
-- done
-+ @list='$(secureconf_DATA)'; test -n "$(secureconfdir)" || list=; \
-+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-+ test -n "$$files" || exit 0; \
-+ echo " ( cd '$(DESTDIR)$(secureconfdir)' && rm -f" $$files ")"; \
-+ cd "$(DESTDIR)$(secureconfdir)" && rm -f $$files
- install-sysconfDATA: $(sysconf_DATA)
- @$(NORMAL_INSTALL)
- test -z "$(sysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)"
-- @list='$(sysconf_DATA)'; for p in $$list; do \
-+ @list='$(sysconf_DATA)'; test -n "$(sysconfdir)" || list=; \
-+ for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-- echo " $(sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f'"; \
-- $(sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f"; \
-+ echo "$$d$$p"; \
-+ done | $(am__base_list) | \
-+ while read files; do \
-+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(sysconfdir)'"; \
-+ $(INSTALL_DATA) $$files "$(DESTDIR)$(sysconfdir)" || exit $$?; \
- done
-
- uninstall-sysconfDATA:
- @$(NORMAL_UNINSTALL)
-- @list='$(sysconf_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-- echo " rm -f '$(DESTDIR)$(sysconfdir)/$$f'"; \
-- rm -f "$(DESTDIR)$(sysconfdir)/$$f"; \
-- done
-+ @list='$(sysconf_DATA)'; test -n "$(sysconfdir)" || list=; \
-+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-+ test -n "$$files" || exit 0; \
-+ echo " ( cd '$(DESTDIR)$(sysconfdir)' && rm -f" $$files ")"; \
-+ cd "$(DESTDIR)$(sysconfdir)" && rm -f $$files
-
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
++ if test -f $$i; then file=$$i; \
++ else file=$(srcdir)/$$i; fi; \
+ ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+ case "$$ext" in \
+ 8*) ;; \
+@@ -505,7 +507,7 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -28579,56 +21236,7 @@ Index: pam.debian/modules/pam_env/Makefile.in
END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
-+ set x; \
- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -516,37 +532,43 @@
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ shift; \
-+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
-- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique; \
-+ if test $$# -gt 0; then \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ "$$@" $$unique; \
-+ else \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$unique; \
-+ fi; \
- fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
- 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; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+ test -z "$(CTAGS_ARGS)$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-- $$tags $$unique
-+ $$unique
-
- GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
-- && cd $(top_srcdir) \
-- && gtags -i $(GTAGS_ARGS) $$here
-+ && $(am__cd) $(top_srcdir) \
-+ && gtags -i $(GTAGS_ARGS) "$$here"
-
- distclean-tags:
+@@ -548,7 +550,7 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
check-TESTS: $(TESTS)
@@ -28636,11 +21244,8 @@ Index: pam.debian/modules/pam_env/Makefile.in
+ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
srcdir=$(srcdir); export srcdir; \
list=' $(TESTS) '; \
-+ $(am__tty_colors); \
if test -n "$$list"; then \
- for tst in $$list; do \
- if test -f ./$$tst; then dir=./; \
-@@ -555,49 +577,63 @@
+@@ -559,7 +561,7 @@
if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
@@ -28648,35 +21253,19 @@ Index: pam.debian/modules/pam_env/Makefile.in
+ *[\ \ ]$$tst[\ \ ]*) \
xpass=`expr $$xpass + 1`; \
failed=`expr $$failed + 1`; \
-- echo "XPASS: $$tst"; \
-+ col=$$red; res=XPASS; \
- ;; \
- *) \
-- echo "PASS: $$tst"; \
-+ col=$$grn; res=PASS; \
- ;; \
- esac; \
+ echo "XPASS: $$tst"; \
+@@ -571,7 +573,7 @@
elif test $$? -ne 77; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
- *$$ws$$tst$$ws*) \
+ *[\ \ ]$$tst[\ \ ]*) \
xfail=`expr $$xfail + 1`; \
-- echo "XFAIL: $$tst"; \
-+ col=$$lgn; res=XFAIL; \
- ;; \
- *) \
- failed=`expr $$failed + 1`; \
-- echo "FAIL: $$tst"; \
-+ col=$$red; res=FAIL; \
+ echo "XFAIL: $$tst"; \
;; \
- esac; \
- else \
- skip=`expr $$skip + 1`; \
-- echo "SKIP: $$tst"; \
-+ col=$$blu; res=SKIP; \
+@@ -585,23 +587,36 @@
+ echo "SKIP: $$tst"; \
fi; \
-+ echo "$${col}$$res$${std}: $$tst"; \
done; \
+ if test "$$all" -eq 1; then \
+ tests="test"; \
@@ -28716,22 +21305,7 @@ Index: pam.debian/modules/pam_env/Makefile.in
test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
dashes="$$skipped"; \
fi; \
-@@ -608,15 +644,32 @@
- dashes="$$report"; \
- fi; \
- dashes=`echo "$$dashes" | sed s/./=/g`; \
-- echo "$$dashes"; \
-+ if test "$$failed" -eq 0; then \
-+ echo "$$grn$$dashes"; \
-+ else \
-+ echo "$$red$$dashes"; \
-+ fi; \
- echo "$$banner"; \
- test -z "$$skipped" || echo "$$skipped"; \
- test -z "$$report" || echo "$$report"; \
-- echo "$$dashes"; \
-+ echo "$$dashes$$std"; \
- test "$$failed" -eq 0; \
+@@ -621,6 +636,19 @@
else :; fi
distdir: $(DISTFILES)
@@ -28751,37 +21325,7 @@ Index: pam.debian/modules/pam_env/Makefile.in
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
-@@ -632,13 +685,17 @@
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-+ if test -d "$(distdir)/$$file"; then \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+ fi; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
-- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
- else \
-- test -f $(distdir)/$$file \
-- || cp -p $$d/$$file $(distdir)/$$file \
-+ test -f "$(distdir)/$$file" \
-+ || cp -p $$d/$$file "$(distdir)/$$file" \
- || exit 1; \
- fi; \
- done
-@@ -671,6 +728,7 @@
-
- distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -693,6 +751,8 @@
+@@ -697,6 +725,8 @@
html: html-am
@@ -28790,7 +21334,7 @@ Index: pam.debian/modules/pam_env/Makefile.in
info: info-am
info-am:
-@@ -702,18 +762,28 @@
+@@ -706,18 +736,28 @@
install-dvi: install-dvi-am
@@ -28819,30 +21363,13 @@ Index: pam.debian/modules/pam_env/Makefile.in
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -739,7 +809,7 @@
-
- uninstall-man: uninstall-man5 uninstall-man8
-
--.MAKE: install-am install-strip
-+.MAKE: check-am install-am install-strip
-
- .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
- clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
-@@ -761,6 +831,7 @@
-
- @ENABLE_REGENERATE_MAN_TRUE@README: pam_env.8.xml pam_env.conf.5.xml
- @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
-+
- # 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.
- .NOEXPORT:
-Index: pam.debian/modules/pam_exec/Makefile.in
+Index: pam.deb/modules/pam_exec/Makefile.in
===================================================================
---- pam.debian.orig/modules/pam_exec/Makefile.in
-+++ pam.debian/modules/pam_exec/Makefile.in
+--- pam.deb.orig/modules/pam_exec/Makefile.in
++++ pam.deb/modules/pam_exec/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -28852,67 +21379,7 @@ Index: pam.debian/modules/pam_exec/Makefile.in
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -21,8 +22,9 @@
-
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
--pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkglibexecdir = $(libexecdir)/@PACKAGE@
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
-@@ -58,14 +60,29 @@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
-+CONFIG_CLEAN_VPATH_FILES =
- am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
- am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-+am__install_max = 40
-+am__nobase_strip_setup = \
-+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-+am__nobase_strip = \
-+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-+am__nobase_list = $(am__nobase_strip_setup); \
-+ for p in $$list; do echo "$$p $$p"; done | \
-+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-+ if (++n[$$2] == $(am__install_max)) \
-+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-+ END { for (dir in files) print dir, files[dir] }'
-+am__base_list = \
-+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
- am__installdirs = "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man8dir)"
--securelibLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(securelib_LTLIBRARIES)
- pam_exec_la_DEPENDENCIES =
- pam_exec_la_SOURCES = pam_exec.c
-@@ -73,6 +90,7 @@
- DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
-+am__mv = mv -f
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-@@ -90,6 +108,8 @@
- DATA = $(noinst_DATA)
- ETAGS = etags
- CTAGS = ctags
-+am__tty_colors = \
-+red=; grn=; lgn=; blu=; std=
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- AMTAR = @AMTAR@
-@@ -174,6 +194,7 @@
+@@ -176,6 +177,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -28920,7 +21387,7 @@ Index: pam.debian/modules/pam_exec/Makefile.in
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PIE_CFLAGS = @PIE_CFLAGS@
-@@ -273,14 +294,14 @@
+@@ -277,8 +279,8 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -28931,163 +21398,18 @@ Index: pam.debian/modules/pam_exec/Makefile.in
exit 1;; \
esac; \
done; \
-- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/pam_exec/Makefile'; \
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu modules/pam_exec/Makefile
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/pam_exec/Makefile'; \
-+ $(am__cd) $(top_srcdir) && \
-+ $(AUTOMAKE) --gnu modules/pam_exec/Makefile
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
-@@ -298,23 +319,28 @@
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- $(ACLOCAL_M4): $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(am__aclocal_m4_deps):
- install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
- @$(NORMAL_INSTALL)
- test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
-- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-+ @list='$(securelib_LTLIBRARIES)'; test -n "$(securelibdir)" || list=; \
-+ list2=; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-- 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"; \
-+ list2="$$list2 $$p"; \
- else :; fi; \
-- done
-+ done; \
-+ test -z "$$list2" || { \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(securelibdir)'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(securelibdir)"; \
-+ }
-
- uninstall-securelibLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-+ @list='$(securelib_LTLIBRARIES)'; test -n "$(securelibdir)" || list=; \
-+ for p in $$list; do \
-+ $(am__strip_dir) \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$f'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$f"; \
- done
-
- clean-securelibLTLIBRARIES:
-@@ -338,21 +364,21 @@
-
- .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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @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,65 +388,58 @@
-
- clean-libtool:
- -rm -rf .libs _libs
--install-man8: $(man8_MANS) $(man_MANS)
-+install-man8: $(man_MANS)
- @$(NORMAL_INSTALL)
- 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 \
-- case "$$i" in \
-- *.8*) list="$$list $$i" ;; \
-- esac; \
-+ @list=''; test -n "$(man8dir)" || exit 0; \
-+ { for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.8[a-z]*$$/p'; \
-+ } | while read p; do \
-+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-+ echo "$$d$$p"; echo "$$p"; \
-+ done | \
-+ sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
-+ sed 'N;N;s,\n, ,g' | { \
-+ list=; while read file base inst; do \
-+ if test "$$base" = "$$inst"; then list="$$list $$file"; else \
-+ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-+ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst" || exit $$?; \
-+ fi; \
+@@ -377,8 +379,8 @@
+ esac; \
done; \
-- for i in $$list; do \
+ for i in $$list; do \
- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
- else file=$$i; fi; \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 8*) ;; \
-- *) ext='8' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-- $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \
-- done
-+ for i in $$list; do echo "$$i"; done | $(am__base_list) | \
-+ while read files; do \
-+ test -z "$$files" || { \
-+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man8dir)'"; \
-+ $(INSTALL_DATA) $$files "$(DESTDIR)$(man8dir)" || exit $$?; }; \
-+ done; }
-+
- uninstall-man8:
- @$(NORMAL_UNINSTALL)
-- @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
-- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-- for i in $$l2; do \
-- case "$$i" in \
-- *.8*) list="$$list $$i" ;; \
-- esac; \
-- done; \
-- for i in $$list; do \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 8*) ;; \
-- *) ext='8' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \
-- rm -f "$(DESTDIR)$(man8dir)/$$inst"; \
-- done
-+ @list=''; test -n "$(man8dir)" || exit 0; \
-+ files=`{ for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.8[a-z]*$$/p'; \
-+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-+ test -z "$$files" || { \
-+ echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \
-+ cd "$(DESTDIR)$(man8dir)" && rm -f $$files; }
-
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
++ if test -f $$i; then file=$$i; \
++ else file=$(srcdir)/$$i; fi; \
+ ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+ case "$$ext" in \
+ 8*) ;; \
+@@ -417,7 +419,7 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -29096,56 +21418,7 @@ Index: pam.debian/modules/pam_exec/Makefile.in
END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
-+ set x; \
- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -428,37 +447,43 @@
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ shift; \
-+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
-- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique; \
-+ if test $$# -gt 0; then \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ "$$@" $$unique; \
-+ else \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$unique; \
-+ fi; \
- fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
- 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; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+ test -z "$(CTAGS_ARGS)$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-- $$tags $$unique
-+ $$unique
-
- GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
-- && cd $(top_srcdir) \
-- && gtags -i $(GTAGS_ARGS) $$here
-+ && $(am__cd) $(top_srcdir) \
-+ && gtags -i $(GTAGS_ARGS) "$$here"
-
- distclean-tags:
+@@ -460,7 +462,7 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
check-TESTS: $(TESTS)
@@ -29153,11 +21426,8 @@ Index: pam.debian/modules/pam_exec/Makefile.in
+ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
srcdir=$(srcdir); export srcdir; \
list=' $(TESTS) '; \
-+ $(am__tty_colors); \
if test -n "$$list"; then \
- for tst in $$list; do \
- if test -f ./$$tst; then dir=./; \
-@@ -467,49 +492,63 @@
+@@ -471,7 +473,7 @@
if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
@@ -29165,35 +21435,19 @@ Index: pam.debian/modules/pam_exec/Makefile.in
+ *[\ \ ]$$tst[\ \ ]*) \
xpass=`expr $$xpass + 1`; \
failed=`expr $$failed + 1`; \
-- echo "XPASS: $$tst"; \
-+ col=$$red; res=XPASS; \
- ;; \
- *) \
-- echo "PASS: $$tst"; \
-+ col=$$grn; res=PASS; \
- ;; \
- esac; \
+ echo "XPASS: $$tst"; \
+@@ -483,7 +485,7 @@
elif test $$? -ne 77; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
- *$$ws$$tst$$ws*) \
+ *[\ \ ]$$tst[\ \ ]*) \
xfail=`expr $$xfail + 1`; \
-- echo "XFAIL: $$tst"; \
-+ col=$$lgn; res=XFAIL; \
- ;; \
- *) \
- failed=`expr $$failed + 1`; \
-- echo "FAIL: $$tst"; \
-+ col=$$red; res=FAIL; \
+ echo "XFAIL: $$tst"; \
;; \
- esac; \
- else \
- skip=`expr $$skip + 1`; \
-- echo "SKIP: $$tst"; \
-+ col=$$blu; res=SKIP; \
+@@ -497,23 +499,36 @@
+ echo "SKIP: $$tst"; \
fi; \
-+ echo "$${col}$$res$${std}: $$tst"; \
done; \
+ if test "$$all" -eq 1; then \
+ tests="test"; \
@@ -29233,22 +21487,7 @@ Index: pam.debian/modules/pam_exec/Makefile.in
test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
dashes="$$skipped"; \
fi; \
-@@ -520,15 +559,32 @@
- dashes="$$report"; \
- fi; \
- dashes=`echo "$$dashes" | sed s/./=/g`; \
-- echo "$$dashes"; \
-+ if test "$$failed" -eq 0; then \
-+ echo "$$grn$$dashes"; \
-+ else \
-+ echo "$$red$$dashes"; \
-+ fi; \
- echo "$$banner"; \
- test -z "$$skipped" || echo "$$skipped"; \
- test -z "$$report" || echo "$$report"; \
-- echo "$$dashes"; \
-+ echo "$$dashes$$std"; \
- test "$$failed" -eq 0; \
+@@ -533,6 +548,19 @@
else :; fi
distdir: $(DISTFILES)
@@ -29268,37 +21507,7 @@ Index: pam.debian/modules/pam_exec/Makefile.in
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
-@@ -544,13 +600,17 @@
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-+ if test -d "$(distdir)/$$file"; then \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+ fi; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
-- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
- else \
-- test -f $(distdir)/$$file \
-- || cp -p $$d/$$file $(distdir)/$$file \
-+ test -f "$(distdir)/$$file" \
-+ || cp -p $$d/$$file "$(distdir)/$$file" \
- || exit 1; \
- fi; \
- done
-@@ -583,6 +643,7 @@
-
- distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -605,6 +666,8 @@
+@@ -609,6 +637,8 @@
html: html-am
@@ -29307,7 +21516,7 @@ Index: pam.debian/modules/pam_exec/Makefile.in
info: info-am
info-am:
-@@ -613,18 +676,28 @@
+@@ -617,18 +647,28 @@
install-dvi: install-dvi-am
@@ -29336,30 +21545,13 @@ Index: pam.debian/modules/pam_exec/Makefile.in
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -649,7 +722,7 @@
-
- uninstall-man: uninstall-man8
-
--.MAKE: install-am install-strip
-+.MAKE: check-am install-am install-strip
-
- .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
- clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
-@@ -671,6 +744,7 @@
- @ENABLE_REGENERATE_MAN_TRUE@README: pam_exec.8.xml
-
- @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
-+
- # 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.
- .NOEXPORT:
-Index: pam.debian/modules/pam_faildelay/Makefile.in
+Index: pam.deb/modules/pam_faildelay/Makefile.in
===================================================================
---- pam.debian.orig/modules/pam_faildelay/Makefile.in
-+++ pam.debian/modules/pam_faildelay/Makefile.in
+--- pam.deb.orig/modules/pam_faildelay/Makefile.in
++++ pam.deb/modules/pam_faildelay/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -29369,67 +21561,7 @@ Index: pam.debian/modules/pam_faildelay/Makefile.in
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -21,8 +22,9 @@
-
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
--pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkglibexecdir = $(libexecdir)/@PACKAGE@
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
-@@ -58,14 +60,29 @@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
-+CONFIG_CLEAN_VPATH_FILES =
- am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
- am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-+am__install_max = 40
-+am__nobase_strip_setup = \
-+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-+am__nobase_strip = \
-+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-+am__nobase_list = $(am__nobase_strip_setup); \
-+ for p in $$list; do echo "$$p $$p"; done | \
-+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-+ if (++n[$$2] == $(am__install_max)) \
-+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-+ END { for (dir in files) print dir, files[dir] }'
-+am__base_list = \
-+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
- am__installdirs = "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man8dir)"
--securelibLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(securelib_LTLIBRARIES)
- pam_faildelay_la_DEPENDENCIES =
- pam_faildelay_la_SOURCES = pam_faildelay.c
-@@ -73,6 +90,7 @@
- DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
-+am__mv = mv -f
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-@@ -90,6 +108,8 @@
- DATA = $(noinst_DATA)
- ETAGS = etags
- CTAGS = ctags
-+am__tty_colors = \
-+red=; grn=; lgn=; blu=; std=
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- AMTAR = @AMTAR@
-@@ -174,6 +194,7 @@
+@@ -176,6 +177,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -29437,7 +21569,7 @@ Index: pam.debian/modules/pam_faildelay/Makefile.in
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PIE_CFLAGS = @PIE_CFLAGS@
-@@ -273,14 +294,14 @@
+@@ -277,8 +279,8 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -29448,163 +21580,18 @@ Index: pam.debian/modules/pam_faildelay/Makefile.in
exit 1;; \
esac; \
done; \
-- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/pam_faildelay/Makefile'; \
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu modules/pam_faildelay/Makefile
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/pam_faildelay/Makefile'; \
-+ $(am__cd) $(top_srcdir) && \
-+ $(AUTOMAKE) --gnu modules/pam_faildelay/Makefile
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
-@@ -298,23 +319,28 @@
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- $(ACLOCAL_M4): $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(am__aclocal_m4_deps):
- install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
- @$(NORMAL_INSTALL)
- test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
-- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-+ @list='$(securelib_LTLIBRARIES)'; test -n "$(securelibdir)" || list=; \
-+ list2=; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-- 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"; \
-+ list2="$$list2 $$p"; \
- else :; fi; \
-- done
-+ done; \
-+ test -z "$$list2" || { \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(securelibdir)'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(securelibdir)"; \
-+ }
-
- uninstall-securelibLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-+ @list='$(securelib_LTLIBRARIES)'; test -n "$(securelibdir)" || list=; \
-+ for p in $$list; do \
-+ $(am__strip_dir) \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$f'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$f"; \
- done
-
- clean-securelibLTLIBRARIES:
-@@ -338,21 +364,21 @@
-
- .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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @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,65 +388,58 @@
-
- clean-libtool:
- -rm -rf .libs _libs
--install-man8: $(man8_MANS) $(man_MANS)
-+install-man8: $(man_MANS)
- @$(NORMAL_INSTALL)
- 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 \
-- case "$$i" in \
-- *.8*) list="$$list $$i" ;; \
-- esac; \
-+ @list=''; test -n "$(man8dir)" || exit 0; \
-+ { for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.8[a-z]*$$/p'; \
-+ } | while read p; do \
-+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-+ echo "$$d$$p"; echo "$$p"; \
-+ done | \
-+ sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
-+ sed 'N;N;s,\n, ,g' | { \
-+ list=; while read file base inst; do \
-+ if test "$$base" = "$$inst"; then list="$$list $$file"; else \
-+ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-+ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst" || exit $$?; \
-+ fi; \
+@@ -377,8 +379,8 @@
+ esac; \
done; \
-- for i in $$list; do \
+ for i in $$list; do \
- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
- else file=$$i; fi; \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 8*) ;; \
-- *) ext='8' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-- $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \
-- done
-+ for i in $$list; do echo "$$i"; done | $(am__base_list) | \
-+ while read files; do \
-+ test -z "$$files" || { \
-+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man8dir)'"; \
-+ $(INSTALL_DATA) $$files "$(DESTDIR)$(man8dir)" || exit $$?; }; \
-+ done; }
-+
- uninstall-man8:
- @$(NORMAL_UNINSTALL)
-- @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
-- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-- for i in $$l2; do \
-- case "$$i" in \
-- *.8*) list="$$list $$i" ;; \
-- esac; \
-- done; \
-- for i in $$list; do \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 8*) ;; \
-- *) ext='8' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \
-- rm -f "$(DESTDIR)$(man8dir)/$$inst"; \
-- done
-+ @list=''; test -n "$(man8dir)" || exit 0; \
-+ files=`{ for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.8[a-z]*$$/p'; \
-+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-+ test -z "$$files" || { \
-+ echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \
-+ cd "$(DESTDIR)$(man8dir)" && rm -f $$files; }
-
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
++ if test -f $$i; then file=$$i; \
++ else file=$(srcdir)/$$i; fi; \
+ ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+ case "$$ext" in \
+ 8*) ;; \
+@@ -417,7 +419,7 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -29613,56 +21600,7 @@ Index: pam.debian/modules/pam_faildelay/Makefile.in
END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
-+ set x; \
- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -428,37 +447,43 @@
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ shift; \
-+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
-- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique; \
-+ if test $$# -gt 0; then \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ "$$@" $$unique; \
-+ else \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$unique; \
-+ fi; \
- fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
- 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; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+ test -z "$(CTAGS_ARGS)$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-- $$tags $$unique
-+ $$unique
-
- GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
-- && cd $(top_srcdir) \
-- && gtags -i $(GTAGS_ARGS) $$here
-+ && $(am__cd) $(top_srcdir) \
-+ && gtags -i $(GTAGS_ARGS) "$$here"
-
- distclean-tags:
+@@ -460,7 +462,7 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
check-TESTS: $(TESTS)
@@ -29670,11 +21608,8 @@ Index: pam.debian/modules/pam_faildelay/Makefile.in
+ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
srcdir=$(srcdir); export srcdir; \
list=' $(TESTS) '; \
-+ $(am__tty_colors); \
if test -n "$$list"; then \
- for tst in $$list; do \
- if test -f ./$$tst; then dir=./; \
-@@ -467,49 +492,63 @@
+@@ -471,7 +473,7 @@
if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
@@ -29682,35 +21617,19 @@ Index: pam.debian/modules/pam_faildelay/Makefile.in
+ *[\ \ ]$$tst[\ \ ]*) \
xpass=`expr $$xpass + 1`; \
failed=`expr $$failed + 1`; \
-- echo "XPASS: $$tst"; \
-+ col=$$red; res=XPASS; \
- ;; \
- *) \
-- echo "PASS: $$tst"; \
-+ col=$$grn; res=PASS; \
- ;; \
- esac; \
+ echo "XPASS: $$tst"; \
+@@ -483,7 +485,7 @@
elif test $$? -ne 77; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
- *$$ws$$tst$$ws*) \
+ *[\ \ ]$$tst[\ \ ]*) \
xfail=`expr $$xfail + 1`; \
-- echo "XFAIL: $$tst"; \
-+ col=$$lgn; res=XFAIL; \
- ;; \
- *) \
- failed=`expr $$failed + 1`; \
-- echo "FAIL: $$tst"; \
-+ col=$$red; res=FAIL; \
+ echo "XFAIL: $$tst"; \
;; \
- esac; \
- else \
- skip=`expr $$skip + 1`; \
-- echo "SKIP: $$tst"; \
-+ col=$$blu; res=SKIP; \
+@@ -497,23 +499,36 @@
+ echo "SKIP: $$tst"; \
fi; \
-+ echo "$${col}$$res$${std}: $$tst"; \
done; \
+ if test "$$all" -eq 1; then \
+ tests="test"; \
@@ -29750,22 +21669,7 @@ Index: pam.debian/modules/pam_faildelay/Makefile.in
test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
dashes="$$skipped"; \
fi; \
-@@ -520,15 +559,32 @@
- dashes="$$report"; \
- fi; \
- dashes=`echo "$$dashes" | sed s/./=/g`; \
-- echo "$$dashes"; \
-+ if test "$$failed" -eq 0; then \
-+ echo "$$grn$$dashes"; \
-+ else \
-+ echo "$$red$$dashes"; \
-+ fi; \
- echo "$$banner"; \
- test -z "$$skipped" || echo "$$skipped"; \
- test -z "$$report" || echo "$$report"; \
-- echo "$$dashes"; \
-+ echo "$$dashes$$std"; \
- test "$$failed" -eq 0; \
+@@ -533,6 +548,19 @@
else :; fi
distdir: $(DISTFILES)
@@ -29785,37 +21689,7 @@ Index: pam.debian/modules/pam_faildelay/Makefile.in
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
-@@ -544,13 +600,17 @@
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-+ if test -d "$(distdir)/$$file"; then \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+ fi; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
-- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
- else \
-- test -f $(distdir)/$$file \
-- || cp -p $$d/$$file $(distdir)/$$file \
-+ test -f "$(distdir)/$$file" \
-+ || cp -p $$d/$$file "$(distdir)/$$file" \
- || exit 1; \
- fi; \
- done
-@@ -583,6 +643,7 @@
-
- distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -605,6 +666,8 @@
+@@ -609,6 +637,8 @@
html: html-am
@@ -29824,7 +21698,7 @@ Index: pam.debian/modules/pam_faildelay/Makefile.in
info: info-am
info-am:
-@@ -613,18 +676,28 @@
+@@ -617,18 +647,28 @@
install-dvi: install-dvi-am
@@ -29853,30 +21727,13 @@ Index: pam.debian/modules/pam_faildelay/Makefile.in
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -649,7 +722,7 @@
-
- uninstall-man: uninstall-man8
-
--.MAKE: install-am install-strip
-+.MAKE: check-am install-am install-strip
-
- .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
- clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
-@@ -669,6 +742,7 @@
-
- @ENABLE_REGENERATE_MAN_TRUE@README: pam_faildelay.8.xml
- @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
-+
- # 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.
- .NOEXPORT:
-Index: pam.debian/modules/pam_filter/Makefile.in
+Index: pam.deb/modules/pam_filter/Makefile.in
===================================================================
---- pam.debian.orig/modules/pam_filter/Makefile.in
-+++ pam.debian/modules/pam_filter/Makefile.in
+--- pam.deb.orig/modules/pam_filter/Makefile.in
++++ pam.deb/modules/pam_filter/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -29886,104 +21743,7 @@ Index: pam.debian/modules/pam_filter/Makefile.in
# 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.
-@@ -22,8 +23,9 @@
-
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
--pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkglibexecdir = $(libexecdir)/@PACKAGE@
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
-@@ -60,15 +62,30 @@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
-+CONFIG_CLEAN_VPATH_FILES =
- am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
- am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-+am__install_max = 40
-+am__nobase_strip_setup = \
-+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-+am__nobase_strip = \
-+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-+am__nobase_list = $(am__nobase_strip_setup); \
-+ for p in $$list; do echo "$$p $$p"; done | \
-+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-+ if (++n[$$2] == $(am__install_max)) \
-+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-+ END { for (dir in files) print dir, files[dir] }'
-+am__base_list = \
-+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
- am__installdirs = "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man8dir)" \
- "$(DESTDIR)$(includedir)"
--securelibLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(securelib_LTLIBRARIES)
- pam_filter_la_DEPENDENCIES =
- pam_filter_la_SOURCES = pam_filter.c
-@@ -76,6 +93,7 @@
- DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
-+am__mv = mv -f
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-@@ -98,14 +116,43 @@
- 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
-+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-+ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
-+ distdir
- ETAGS = etags
- CTAGS = ctags
-+am__tty_colors = \
-+red=; grn=; lgn=; blu=; std=
- DIST_SUBDIRS = $(SUBDIRS)
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+am__relativize = \
-+ dir0=`pwd`; \
-+ sed_first='s,^\([^/]*\)/.*$$,\1,'; \
-+ sed_rest='s,^[^/]*/*,,'; \
-+ sed_last='s,^.*/\([^/]*\)$$,\1,'; \
-+ sed_butlast='s,/*[^/]*$$,,'; \
-+ while test -n "$$dir1"; do \
-+ first=`echo "$$dir1" | sed -e "$$sed_first"`; \
-+ if test "$$first" != "."; then \
-+ if test "$$first" = ".."; then \
-+ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
-+ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
-+ else \
-+ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
-+ if test "$$first2" = "$$first"; then \
-+ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
-+ else \
-+ dir2="../$$dir2"; \
-+ fi; \
-+ dir0="$$dir0"/"$$first"; \
-+ fi; \
-+ fi; \
-+ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
-+ done; \
-+ reldir="$$dir2"
- ACLOCAL = @ACLOCAL@
- AMTAR = @AMTAR@
- AR = @AR@
-@@ -189,6 +236,7 @@
+@@ -191,6 +192,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -29991,7 +21751,7 @@ Index: pam.debian/modules/pam_filter/Makefile.in
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PIE_CFLAGS = @PIE_CFLAGS@
-@@ -290,14 +338,14 @@
+@@ -294,8 +296,8 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -30002,193 +21762,18 @@ Index: pam.debian/modules/pam_filter/Makefile.in
exit 1;; \
esac; \
done; \
-- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/pam_filter/Makefile'; \
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu modules/pam_filter/Makefile
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/pam_filter/Makefile'; \
-+ $(am__cd) $(top_srcdir) && \
-+ $(AUTOMAKE) --gnu modules/pam_filter/Makefile
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
-@@ -315,23 +363,28 @@
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- $(ACLOCAL_M4): $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(am__aclocal_m4_deps):
- install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
- @$(NORMAL_INSTALL)
- test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
-- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-+ @list='$(securelib_LTLIBRARIES)'; test -n "$(securelibdir)" || list=; \
-+ list2=; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-- 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"; \
-+ list2="$$list2 $$p"; \
- else :; fi; \
-- done
-+ done; \
-+ test -z "$$list2" || { \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(securelibdir)'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(securelibdir)"; \
-+ }
-
- uninstall-securelibLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-+ @list='$(securelib_LTLIBRARIES)'; test -n "$(securelibdir)" || list=; \
-+ for p in $$list; do \
-+ $(am__strip_dir) \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$f'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$f"; \
- done
-
- clean-securelibLTLIBRARIES:
-@@ -355,21 +408,21 @@
-
- .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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @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 $@ $<
-@@ -379,68 +432,64 @@
-
- clean-libtool:
- -rm -rf .libs _libs
--install-man8: $(man8_MANS) $(man_MANS)
-+install-man8: $(man_MANS)
- @$(NORMAL_INSTALL)
- 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 \
-- case "$$i" in \
-- *.8*) list="$$list $$i" ;; \
-- esac; \
-+ @list=''; test -n "$(man8dir)" || exit 0; \
-+ { for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.8[a-z]*$$/p'; \
-+ } | while read p; do \
-+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-+ echo "$$d$$p"; echo "$$p"; \
-+ done | \
-+ sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
-+ sed 'N;N;s,\n, ,g' | { \
-+ list=; while read file base inst; do \
-+ if test "$$base" = "$$inst"; then list="$$list $$file"; else \
-+ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-+ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst" || exit $$?; \
-+ fi; \
+@@ -394,8 +396,8 @@
+ esac; \
done; \
-- for i in $$list; do \
+ for i in $$list; do \
- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
- else file=$$i; fi; \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 8*) ;; \
-- *) ext='8' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-- $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \
-- done
-+ for i in $$list; do echo "$$i"; done | $(am__base_list) | \
-+ while read files; do \
-+ test -z "$$files" || { \
-+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man8dir)'"; \
-+ $(INSTALL_DATA) $$files "$(DESTDIR)$(man8dir)" || exit $$?; }; \
-+ done; }
-+
- uninstall-man8:
- @$(NORMAL_UNINSTALL)
-- @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
-- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-- for i in $$l2; do \
-- case "$$i" in \
-- *.8*) list="$$list $$i" ;; \
-- esac; \
-- done; \
-- for i in $$list; do \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 8*) ;; \
-- *) ext='8' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \
-- rm -f "$(DESTDIR)$(man8dir)/$$inst"; \
-- done
-+ @list=''; test -n "$(man8dir)" || exit 0; \
-+ files=`{ for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.8[a-z]*$$/p'; \
-+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-+ test -z "$$files" || { \
-+ echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \
-+ cd "$(DESTDIR)$(man8dir)" && rm -f $$files; }
- install-includeHEADERS: $(include_HEADERS)
- @$(NORMAL_INSTALL)
- test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
-- @list='$(include_HEADERS)'; for p in $$list; do \
-+ @list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \
-+ for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-- echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
-- $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
-+ echo "$$d$$p"; \
-+ done | $(am__base_list) | \
-+ while read files; do \
-+ echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(includedir)'"; \
-+ $(INSTALL_HEADER) $$files "$(DESTDIR)$(includedir)" || exit $$?; \
- done
-
- uninstall-includeHEADERS:
- @$(NORMAL_UNINSTALL)
-- @list='$(include_HEADERS)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-- echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
-- rm -f "$(DESTDIR)$(includedir)/$$f"; \
-- done
-+ @list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \
-+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-+ test -n "$$files" || exit 0; \
-+ echo " ( cd '$(DESTDIR)$(includedir)' && rm -f" $$files ")"; \
-+ cd "$(DESTDIR)$(includedir)" && rm -f $$files
-
- # This directory's subdirectories are mostly independent; you can cd
- # into them and run `make' without going through this Makefile.
-@@ -449,7 +498,7 @@
++ if test -f $$i; then file=$$i; \
++ else file=$(srcdir)/$$i; fi; \
+ ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+ case "$$ext" in \
+ 8*) ;; \
+@@ -453,7 +455,7 @@
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
@@ -30197,16 +21782,7 @@ Index: pam.debian/modules/pam_filter/Makefile.in
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
-@@ -466,7 +515,7 @@
- else \
- local_target="$$target"; \
- fi; \
-- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
-@@ -474,7 +523,7 @@
+@@ -478,7 +480,7 @@
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
@@ -30215,27 +21791,7 @@ Index: pam.debian/modules/pam_filter/Makefile.in
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
-@@ -500,16 +549,16 @@
- else \
- local_target="$$target"; \
- fi; \
-- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
- done
- ctags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- done
-
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-@@ -517,14 +566,14 @@
+@@ -521,7 +523,7 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -30244,65 +21800,7 @@ Index: pam.debian/modules/pam_filter/Makefile.in
END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
-
- TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
-+ set x; \
- here=`pwd`; \
- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
- include_option=--etags-include; \
-@@ -536,7 +585,7 @@
- list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- test ! -f $$subdir/TAGS || \
-- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
-+ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
- fi; \
- done; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-@@ -545,37 +594,43 @@
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ shift; \
-+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
-- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique; \
-+ if test $$# -gt 0; then \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ "$$@" $$unique; \
-+ else \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$unique; \
-+ fi; \
- fi
- ctags: CTAGS
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
- 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; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+ test -z "$(CTAGS_ARGS)$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-- $$tags $$unique
-+ $$unique
-
- GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
-- && cd $(top_srcdir) \
-- && gtags -i $(GTAGS_ARGS) $$here
-+ && $(am__cd) $(top_srcdir) \
-+ && gtags -i $(GTAGS_ARGS) "$$here"
-
- distclean-tags:
+@@ -577,7 +579,7 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
check-TESTS: $(TESTS)
@@ -30310,11 +21808,8 @@ Index: pam.debian/modules/pam_filter/Makefile.in
+ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
srcdir=$(srcdir); export srcdir; \
list=' $(TESTS) '; \
-+ $(am__tty_colors); \
if test -n "$$list"; then \
- for tst in $$list; do \
- if test -f ./$$tst; then dir=./; \
-@@ -584,49 +639,63 @@
+@@ -588,7 +590,7 @@
if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
@@ -30322,35 +21817,19 @@ Index: pam.debian/modules/pam_filter/Makefile.in
+ *[\ \ ]$$tst[\ \ ]*) \
xpass=`expr $$xpass + 1`; \
failed=`expr $$failed + 1`; \
-- echo "XPASS: $$tst"; \
-+ col=$$red; res=XPASS; \
- ;; \
- *) \
-- echo "PASS: $$tst"; \
-+ col=$$grn; res=PASS; \
- ;; \
- esac; \
+ echo "XPASS: $$tst"; \
+@@ -600,7 +602,7 @@
elif test $$? -ne 77; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
- *$$ws$$tst$$ws*) \
+ *[\ \ ]$$tst[\ \ ]*) \
xfail=`expr $$xfail + 1`; \
-- echo "XFAIL: $$tst"; \
-+ col=$$lgn; res=XFAIL; \
- ;; \
- *) \
- failed=`expr $$failed + 1`; \
-- echo "FAIL: $$tst"; \
-+ col=$$red; res=FAIL; \
+ echo "XFAIL: $$tst"; \
;; \
- esac; \
- else \
- skip=`expr $$skip + 1`; \
-- echo "SKIP: $$tst"; \
-+ col=$$blu; res=SKIP; \
+@@ -614,23 +616,36 @@
+ echo "SKIP: $$tst"; \
fi; \
-+ echo "$${col}$$res$${std}: $$tst"; \
done; \
+ if test "$$all" -eq 1; then \
+ tests="test"; \
@@ -30390,22 +21869,7 @@ Index: pam.debian/modules/pam_filter/Makefile.in
test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
dashes="$$skipped"; \
fi; \
-@@ -637,15 +706,32 @@
- dashes="$$report"; \
- fi; \
- dashes=`echo "$$dashes" | sed s/./=/g`; \
-- echo "$$dashes"; \
-+ if test "$$failed" -eq 0; then \
-+ echo "$$grn$$dashes"; \
-+ else \
-+ echo "$$red$$dashes"; \
-+ fi; \
- echo "$$banner"; \
- test -z "$$skipped" || echo "$$skipped"; \
- test -z "$$report" || echo "$$report"; \
-- echo "$$dashes"; \
-+ echo "$$dashes$$std"; \
- test "$$failed" -eq 0; \
+@@ -650,6 +665,19 @@
else :; fi
distdir: $(DISTFILES)
@@ -30425,70 +21889,7 @@ Index: pam.debian/modules/pam_filter/Makefile.in
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
-@@ -661,29 +747,44 @@
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-+ if test -d "$(distdir)/$$file"; then \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+ fi; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
-- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
- else \
-- test -f $(distdir)/$$file \
-- || cp -p $$d/$$file $(distdir)/$$file \
-+ test -f "$(distdir)/$$file" \
-+ || cp -p $$d/$$file "$(distdir)/$$file" \
- || exit 1; \
- fi; \
- done
-- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
- || $(MKDIR_P) "$(distdir)/$$subdir" \
- || exit 1; \
-- distdir=`$(am__cd) $(distdir) && pwd`; \
-- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-- (cd $$subdir && \
-+ fi; \
-+ done
-+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-+ if test "$$subdir" = .; then :; else \
-+ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
-+ $(am__relativize); \
-+ new_distdir=$$reldir; \
-+ dir1=$$subdir; dir2="$(top_distdir)"; \
-+ $(am__relativize); \
-+ new_top_distdir=$$reldir; \
-+ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
-+ echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
-+ ($(am__cd) $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
-- top_distdir="$$top_distdir" \
-- distdir="$$distdir/$$subdir" \
-+ top_distdir="$$new_top_distdir" \
-+ distdir="$$new_distdir" \
- am__remove_distdir=: \
- am__skip_length_check=: \
-+ am__skip_mode_fix=: \
- distdir) \
- || exit 1; \
- fi; \
-@@ -718,6 +819,7 @@
-
- distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -740,6 +842,8 @@
+@@ -744,6 +772,8 @@
html: html-recursive
@@ -30497,7 +21898,7 @@ Index: pam.debian/modules/pam_filter/Makefile.in
info: info-recursive
info-am:
-@@ -749,18 +853,28 @@
+@@ -753,18 +783,28 @@
install-dvi: install-dvi-recursive
@@ -30526,32 +21927,13 @@ Index: pam.debian/modules/pam_filter/Makefile.in
installcheck-am:
maintainer-clean: maintainer-clean-recursive
-@@ -786,8 +900,8 @@
-
- uninstall-man: uninstall-man8
-
--.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
-- install-strip
-+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) check-am \
-+ ctags-recursive install-am install-strip tags-recursive
-
- .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
- all all-am check check-TESTS check-am clean clean-generic \
-@@ -809,6 +923,7 @@
-
- @ENABLE_REGENERATE_MAN_TRUE@README: pam_filter.8.xml
- @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
-+
- # 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.
- .NOEXPORT:
-Index: pam.debian/modules/pam_filter/upperLOWER/Makefile.in
+Index: pam.deb/modules/pam_filter/upperLOWER/Makefile.in
===================================================================
---- pam.debian.orig/modules/pam_filter/upperLOWER/Makefile.in
-+++ pam.debian/modules/pam_filter/upperLOWER/Makefile.in
+--- pam.deb.orig/modules/pam_filter/upperLOWER/Makefile.in
++++ pam.deb/modules/pam_filter/upperLOWER/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -30561,36 +21943,7 @@ Index: pam.debian/modules/pam_filter/upperLOWER/Makefile.in
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -20,8 +21,9 @@
-
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
--pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkglibexecdir = $(libexecdir)/@PACKAGE@
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
-@@ -57,8 +59,8 @@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
-+CONFIG_CLEAN_VPATH_FILES =
- am__installdirs = "$(DESTDIR)$(securelibfilterdir)"
--securelibfilterPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
- PROGRAMS = $(securelibfilter_PROGRAMS)
- upperLOWER_SOURCES = upperLOWER.c
- upperLOWER_OBJECTS = upperLOWER.$(OBJEXT)
-@@ -67,6 +69,7 @@
- DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
-+am__mv = mv -f
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-@@ -164,6 +167,7 @@
+@@ -166,6 +167,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -30598,7 +21951,7 @@ Index: pam.debian/modules/pam_filter/upperLOWER/Makefile.in
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PIE_CFLAGS = @PIE_CFLAGS@
-@@ -257,14 +261,14 @@
+@@ -261,8 +263,8 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -30609,112 +21962,7 @@ Index: pam.debian/modules/pam_filter/upperLOWER/Makefile.in
exit 1;; \
esac; \
done; \
-- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/pam_filter/upperLOWER/Makefile'; \
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu modules/pam_filter/upperLOWER/Makefile
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/pam_filter/upperLOWER/Makefile'; \
-+ $(am__cd) $(top_srcdir) && \
-+ $(AUTOMAKE) --gnu modules/pam_filter/upperLOWER/Makefile
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
-@@ -282,34 +286,50 @@
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- $(ACLOCAL_M4): $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(am__aclocal_m4_deps):
- install-securelibfilterPROGRAMS: $(securelibfilter_PROGRAMS)
- @$(NORMAL_INSTALL)
- 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 \
-- || test -f $$p1 \
-- ; then \
-- f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibfilterPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(securelibfilterdir)/$$f'"; \
-- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibfilterPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(securelibfilterdir)/$$f" || exit 1; \
-- else :; fi; \
-- done
-+ @list='$(securelibfilter_PROGRAMS)'; test -n "$(securelibfilterdir)" || list=; \
-+ for p in $$list; do echo "$$p $$p"; done | \
-+ sed 's/$(EXEEXT)$$//' | \
-+ while read p p1; do if test -f $$p || test -f $$p1; \
-+ then echo "$$p"; echo "$$p"; else :; fi; \
-+ done | \
-+ sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
-+ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
-+ sed 'N;N;N;s,\n, ,g' | \
-+ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
-+ { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
-+ if ($$2 == $$4) files[d] = files[d] " " $$1; \
-+ else { print "f", $$3 "/" $$4, $$1; } } \
-+ END { for (d in files) print "f", d, files[d] }' | \
-+ while read type dir files; do \
-+ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
-+ test -z "$$files" || { \
-+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(securelibfilterdir)$$dir'"; \
-+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(securelibfilterdir)$$dir" || exit $$?; \
-+ } \
-+ ; done
-
- uninstall-securelibfilterPROGRAMS:
- @$(NORMAL_UNINSTALL)
-- @list='$(securelibfilter_PROGRAMS)'; for p in $$list; do \
-- f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-- echo " rm -f '$(DESTDIR)$(securelibfilterdir)/$$f'"; \
-- rm -f "$(DESTDIR)$(securelibfilterdir)/$$f"; \
-- done
-+ @list='$(securelibfilter_PROGRAMS)'; test -n "$(securelibfilterdir)" || list=; \
-+ files=`for p in $$list; do echo "$$p"; done | \
-+ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-+ -e 's/$$/$(EXEEXT)/' `; \
-+ test -n "$$list" || exit 0; \
-+ echo " ( cd '$(DESTDIR)$(securelibfilterdir)' && rm -f" $$files ")"; \
-+ cd "$(DESTDIR)$(securelibfilterdir)" && rm -f $$files
-
- clean-securelibfilterPROGRAMS:
-- @list='$(securelibfilter_PROGRAMS)'; for p in $$list; do \
-- f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-- echo " rm -f $$p $$f"; \
-- rm -f $$p $$f ; \
-- done
-+ @list='$(securelibfilter_PROGRAMS)'; test -n "$$list" || exit 0; \
-+ echo " rm -f" $$list; \
-+ rm -f $$list || exit $$?; \
-+ test -n "$(EXEEXT)" || exit 0; \
-+ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
-+ echo " rm -f" $$list; \
-+ rm -f $$list
- upperLOWER$(EXEEXT): $(upperLOWER_OBJECTS) $(upperLOWER_DEPENDENCIES)
- @rm -f upperLOWER$(EXEEXT)
- $(LINK) $(upperLOWER_OBJECTS) $(upperLOWER_LDADD) $(LIBS)
-@@ -324,21 +344,21 @@
-
- .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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @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,14 +374,14 @@
+@@ -358,7 +360,7 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -30723,88 +21971,7 @@ Index: pam.debian/modules/pam_filter/upperLOWER/Makefile.in
END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
-+ set x; \
- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -369,29 +389,34 @@
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ shift; \
-+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
-- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique; \
-+ if test $$# -gt 0; then \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ "$$@" $$unique; \
-+ else \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$unique; \
-+ fi; \
- fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
- 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; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+ test -z "$(CTAGS_ARGS)$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-- $$tags $$unique
-+ $$unique
-
- GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
-- && cd $(top_srcdir) \
-- && gtags -i $(GTAGS_ARGS) $$here
-+ && $(am__cd) $(top_srcdir) \
-+ && gtags -i $(GTAGS_ARGS) "$$here"
-
- distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-@@ -412,13 +437,17 @@
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-+ if test -d "$(distdir)/$$file"; then \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+ fi; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
-- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
- else \
-- test -f $(distdir)/$$file \
-- || cp -p $$d/$$file $(distdir)/$$file \
-+ test -f "$(distdir)/$$file" \
-+ || cp -p $$d/$$file "$(distdir)/$$file" \
- || exit 1; \
- fi; \
- done
-@@ -450,6 +479,7 @@
-
- distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -471,6 +501,8 @@
+@@ -475,6 +477,8 @@
html: html-am
@@ -30813,7 +21980,7 @@ Index: pam.debian/modules/pam_filter/upperLOWER/Makefile.in
info: info-am
info-am:
-@@ -479,18 +511,28 @@
+@@ -483,18 +487,28 @@
install-dvi: install-dvi-am
@@ -30842,21 +22009,13 @@ Index: pam.debian/modules/pam_filter/upperLOWER/Makefile.in
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -529,6 +571,7 @@
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-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.
- .NOEXPORT:
-Index: pam.debian/modules/pam_ftp/Makefile.in
+Index: pam.deb/modules/pam_ftp/Makefile.in
===================================================================
---- pam.debian.orig/modules/pam_ftp/Makefile.in
-+++ pam.debian/modules/pam_ftp/Makefile.in
+--- pam.deb.orig/modules/pam_ftp/Makefile.in
++++ pam.deb/modules/pam_ftp/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -30866,67 +22025,7 @@ Index: pam.debian/modules/pam_ftp/Makefile.in
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -21,8 +22,9 @@
-
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
--pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkglibexecdir = $(libexecdir)/@PACKAGE@
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
-@@ -58,14 +60,29 @@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
-+CONFIG_CLEAN_VPATH_FILES =
- am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
- am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-+am__install_max = 40
-+am__nobase_strip_setup = \
-+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-+am__nobase_strip = \
-+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-+am__nobase_list = $(am__nobase_strip_setup); \
-+ for p in $$list; do echo "$$p $$p"; done | \
-+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-+ if (++n[$$2] == $(am__install_max)) \
-+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-+ END { for (dir in files) print dir, files[dir] }'
-+am__base_list = \
-+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
- am__installdirs = "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man8dir)"
--securelibLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(securelib_LTLIBRARIES)
- pam_ftp_la_DEPENDENCIES =
- pam_ftp_la_SOURCES = pam_ftp.c
-@@ -73,6 +90,7 @@
- DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
-+am__mv = mv -f
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-@@ -90,6 +108,8 @@
- DATA = $(noinst_DATA)
- ETAGS = etags
- CTAGS = ctags
-+am__tty_colors = \
-+red=; grn=; lgn=; blu=; std=
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- AMTAR = @AMTAR@
-@@ -174,6 +194,7 @@
+@@ -176,6 +177,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -30934,7 +22033,7 @@ Index: pam.debian/modules/pam_ftp/Makefile.in
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PIE_CFLAGS = @PIE_CFLAGS@
-@@ -273,14 +294,14 @@
+@@ -277,8 +279,8 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -30945,163 +22044,18 @@ Index: pam.debian/modules/pam_ftp/Makefile.in
exit 1;; \
esac; \
done; \
-- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/pam_ftp/Makefile'; \
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu modules/pam_ftp/Makefile
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/pam_ftp/Makefile'; \
-+ $(am__cd) $(top_srcdir) && \
-+ $(AUTOMAKE) --gnu modules/pam_ftp/Makefile
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
-@@ -298,23 +319,28 @@
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- $(ACLOCAL_M4): $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(am__aclocal_m4_deps):
- install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
- @$(NORMAL_INSTALL)
- test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
-- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-+ @list='$(securelib_LTLIBRARIES)'; test -n "$(securelibdir)" || list=; \
-+ list2=; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-- 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"; \
-+ list2="$$list2 $$p"; \
- else :; fi; \
-- done
-+ done; \
-+ test -z "$$list2" || { \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(securelibdir)'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(securelibdir)"; \
-+ }
-
- uninstall-securelibLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-+ @list='$(securelib_LTLIBRARIES)'; test -n "$(securelibdir)" || list=; \
-+ for p in $$list; do \
-+ $(am__strip_dir) \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$f'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$f"; \
- done
-
- clean-securelibLTLIBRARIES:
-@@ -338,21 +364,21 @@
-
- .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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @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,65 +388,58 @@
-
- clean-libtool:
- -rm -rf .libs _libs
--install-man8: $(man8_MANS) $(man_MANS)
-+install-man8: $(man_MANS)
- @$(NORMAL_INSTALL)
- 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 \
-- case "$$i" in \
-- *.8*) list="$$list $$i" ;; \
-- esac; \
-+ @list=''; test -n "$(man8dir)" || exit 0; \
-+ { for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.8[a-z]*$$/p'; \
-+ } | while read p; do \
-+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-+ echo "$$d$$p"; echo "$$p"; \
-+ done | \
-+ sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
-+ sed 'N;N;s,\n, ,g' | { \
-+ list=; while read file base inst; do \
-+ if test "$$base" = "$$inst"; then list="$$list $$file"; else \
-+ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-+ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst" || exit $$?; \
-+ fi; \
+@@ -377,8 +379,8 @@
+ esac; \
done; \
-- for i in $$list; do \
+ for i in $$list; do \
- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
- else file=$$i; fi; \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 8*) ;; \
-- *) ext='8' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-- $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \
-- done
-+ for i in $$list; do echo "$$i"; done | $(am__base_list) | \
-+ while read files; do \
-+ test -z "$$files" || { \
-+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man8dir)'"; \
-+ $(INSTALL_DATA) $$files "$(DESTDIR)$(man8dir)" || exit $$?; }; \
-+ done; }
-+
- uninstall-man8:
- @$(NORMAL_UNINSTALL)
-- @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
-- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-- for i in $$l2; do \
-- case "$$i" in \
-- *.8*) list="$$list $$i" ;; \
-- esac; \
-- done; \
-- for i in $$list; do \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 8*) ;; \
-- *) ext='8' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \
-- rm -f "$(DESTDIR)$(man8dir)/$$inst"; \
-- done
-+ @list=''; test -n "$(man8dir)" || exit 0; \
-+ files=`{ for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.8[a-z]*$$/p'; \
-+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-+ test -z "$$files" || { \
-+ echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \
-+ cd "$(DESTDIR)$(man8dir)" && rm -f $$files; }
-
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
++ if test -f $$i; then file=$$i; \
++ else file=$(srcdir)/$$i; fi; \
+ ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+ case "$$ext" in \
+ 8*) ;; \
+@@ -417,7 +419,7 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -31110,56 +22064,7 @@ Index: pam.debian/modules/pam_ftp/Makefile.in
END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
-+ set x; \
- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -428,37 +447,43 @@
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ shift; \
-+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
-- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique; \
-+ if test $$# -gt 0; then \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ "$$@" $$unique; \
-+ else \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$unique; \
-+ fi; \
- fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
- 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; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+ test -z "$(CTAGS_ARGS)$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-- $$tags $$unique
-+ $$unique
-
- GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
-- && cd $(top_srcdir) \
-- && gtags -i $(GTAGS_ARGS) $$here
-+ && $(am__cd) $(top_srcdir) \
-+ && gtags -i $(GTAGS_ARGS) "$$here"
-
- distclean-tags:
+@@ -460,7 +462,7 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
check-TESTS: $(TESTS)
@@ -31167,11 +22072,8 @@ Index: pam.debian/modules/pam_ftp/Makefile.in
+ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
srcdir=$(srcdir); export srcdir; \
list=' $(TESTS) '; \
-+ $(am__tty_colors); \
if test -n "$$list"; then \
- for tst in $$list; do \
- if test -f ./$$tst; then dir=./; \
-@@ -467,49 +492,63 @@
+@@ -471,7 +473,7 @@
if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
@@ -31179,35 +22081,19 @@ Index: pam.debian/modules/pam_ftp/Makefile.in
+ *[\ \ ]$$tst[\ \ ]*) \
xpass=`expr $$xpass + 1`; \
failed=`expr $$failed + 1`; \
-- echo "XPASS: $$tst"; \
-+ col=$$red; res=XPASS; \
- ;; \
- *) \
-- echo "PASS: $$tst"; \
-+ col=$$grn; res=PASS; \
- ;; \
- esac; \
+ echo "XPASS: $$tst"; \
+@@ -483,7 +485,7 @@
elif test $$? -ne 77; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
- *$$ws$$tst$$ws*) \
+ *[\ \ ]$$tst[\ \ ]*) \
xfail=`expr $$xfail + 1`; \
-- echo "XFAIL: $$tst"; \
-+ col=$$lgn; res=XFAIL; \
+ echo "XFAIL: $$tst"; \
;; \
- *) \
- failed=`expr $$failed + 1`; \
-- echo "FAIL: $$tst"; \
-+ col=$$red; res=FAIL; \
- ;; \
- esac; \
- else \
- skip=`expr $$skip + 1`; \
-- echo "SKIP: $$tst"; \
-+ col=$$blu; res=SKIP; \
+@@ -497,23 +499,36 @@
+ echo "SKIP: $$tst"; \
fi; \
-+ echo "$${col}$$res$${std}: $$tst"; \
done; \
+ if test "$$all" -eq 1; then \
+ tests="test"; \
@@ -31247,22 +22133,7 @@ Index: pam.debian/modules/pam_ftp/Makefile.in
test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
dashes="$$skipped"; \
fi; \
-@@ -520,15 +559,32 @@
- dashes="$$report"; \
- fi; \
- dashes=`echo "$$dashes" | sed s/./=/g`; \
-- echo "$$dashes"; \
-+ if test "$$failed" -eq 0; then \
-+ echo "$$grn$$dashes"; \
-+ else \
-+ echo "$$red$$dashes"; \
-+ fi; \
- echo "$$banner"; \
- test -z "$$skipped" || echo "$$skipped"; \
- test -z "$$report" || echo "$$report"; \
-- echo "$$dashes"; \
-+ echo "$$dashes$$std"; \
- test "$$failed" -eq 0; \
+@@ -533,6 +548,19 @@
else :; fi
distdir: $(DISTFILES)
@@ -31282,37 +22153,7 @@ Index: pam.debian/modules/pam_ftp/Makefile.in
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
-@@ -544,13 +600,17 @@
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-+ if test -d "$(distdir)/$$file"; then \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+ fi; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
-- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
- else \
-- test -f $(distdir)/$$file \
-- || cp -p $$d/$$file $(distdir)/$$file \
-+ test -f "$(distdir)/$$file" \
-+ || cp -p $$d/$$file "$(distdir)/$$file" \
- || exit 1; \
- fi; \
- done
-@@ -583,6 +643,7 @@
-
- distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -605,6 +666,8 @@
+@@ -609,6 +637,8 @@
html: html-am
@@ -31321,7 +22162,7 @@ Index: pam.debian/modules/pam_ftp/Makefile.in
info: info-am
info-am:
-@@ -613,18 +676,28 @@
+@@ -617,18 +647,28 @@
install-dvi: install-dvi-am
@@ -31350,30 +22191,13 @@ Index: pam.debian/modules/pam_ftp/Makefile.in
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -649,7 +722,7 @@
-
- uninstall-man: uninstall-man8
-
--.MAKE: install-am install-strip
-+.MAKE: check-am install-am install-strip
-
- .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
- clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
-@@ -669,6 +742,7 @@
-
- @ENABLE_REGENERATE_MAN_TRUE@README: pam_ftp.8.xml
- @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
-+
- # 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.
- .NOEXPORT:
-Index: pam.debian/modules/pam_group/Makefile.in
+Index: pam.deb/modules/pam_group/Makefile.in
===================================================================
---- pam.debian.orig/modules/pam_group/Makefile.in
-+++ pam.debian/modules/pam_group/Makefile.in
+--- pam.deb.orig/modules/pam_group/Makefile.in
++++ pam.deb/modules/pam_group/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -31383,72 +22207,7 @@ Index: pam.debian/modules/pam_group/Makefile.in
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -21,8 +22,9 @@
-
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
--pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkglibexecdir = $(libexecdir)/@PACKAGE@
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
-@@ -58,15 +60,30 @@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
-+CONFIG_CLEAN_VPATH_FILES =
- am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
- am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-+am__install_max = 40
-+am__nobase_strip_setup = \
-+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-+am__nobase_strip = \
-+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-+am__nobase_list = $(am__nobase_strip_setup); \
-+ for p in $$list; do echo "$$p $$p"; done | \
-+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-+ if (++n[$$2] == $(am__install_max)) \
-+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-+ END { for (dir in files) print dir, files[dir] }'
-+am__base_list = \
-+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
- am__installdirs = "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man5dir)" \
- "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(secureconfdir)"
--securelibLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(securelib_LTLIBRARIES)
- pam_group_la_DEPENDENCIES =
- pam_group_la_SOURCES = pam_group.c
-@@ -74,6 +91,7 @@
- DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
-+am__mv = mv -f
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-@@ -89,10 +107,11 @@
- man8dir = $(mandir)/man8
- NROFF = nroff
- MANS = $(man_MANS)
--secureconfDATA_INSTALL = $(INSTALL_DATA)
- DATA = $(noinst_DATA) $(secureconf_DATA)
- ETAGS = etags
- CTAGS = ctags
-+am__tty_colors = \
-+red=; grn=; lgn=; blu=; std=
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- AMTAR = @AMTAR@
-@@ -177,6 +196,7 @@
+@@ -179,6 +180,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -31456,7 +22215,7 @@ Index: pam.debian/modules/pam_group/Makefile.in
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PIE_CFLAGS = @PIE_CFLAGS@
-@@ -279,14 +299,14 @@
+@@ -283,8 +285,8 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -31467,270 +22226,29 @@ Index: pam.debian/modules/pam_group/Makefile.in
exit 1;; \
esac; \
done; \
-- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/pam_group/Makefile'; \
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu modules/pam_group/Makefile
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/pam_group/Makefile'; \
-+ $(am__cd) $(top_srcdir) && \
-+ $(AUTOMAKE) --gnu modules/pam_group/Makefile
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
-@@ -304,23 +324,28 @@
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- $(ACLOCAL_M4): $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(am__aclocal_m4_deps):
- install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
- @$(NORMAL_INSTALL)
- test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
-- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-+ @list='$(securelib_LTLIBRARIES)'; test -n "$(securelibdir)" || list=; \
-+ list2=; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-- 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"; \
-+ list2="$$list2 $$p"; \
- else :; fi; \
-- done
-+ done; \
-+ test -z "$$list2" || { \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(securelibdir)'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(securelibdir)"; \
-+ }
-
- uninstall-securelibLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-+ @list='$(securelib_LTLIBRARIES)'; test -n "$(securelibdir)" || list=; \
-+ for p in $$list; do \
-+ $(am__strip_dir) \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$f'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$f"; \
- done
-
- clean-securelibLTLIBRARIES:
-@@ -344,21 +369,21 @@
-
- .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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @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 $@ $<
-@@ -368,127 +393,116 @@
-
- clean-libtool:
- -rm -rf .libs _libs
--install-man5: $(man5_MANS) $(man_MANS)
-+install-man5: $(man_MANS)
- @$(NORMAL_INSTALL)
- 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 \
-- case "$$i" in \
-- *.5*) list="$$list $$i" ;; \
-- esac; \
-+ @list=''; test -n "$(man5dir)" || exit 0; \
-+ { for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.5[a-z]*$$/p'; \
-+ } | while read p; do \
-+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-+ echo "$$d$$p"; echo "$$p"; \
-+ done | \
-+ sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^5][0-9a-z]*$$,5,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
-+ sed 'N;N;s,\n, ,g' | { \
-+ list=; while read file base inst; do \
-+ if test "$$base" = "$$inst"; then list="$$list $$file"; else \
-+ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man5dir)/$$inst'"; \
-+ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man5dir)/$$inst" || exit $$?; \
-+ fi; \
+@@ -383,8 +385,8 @@
+ esac; \
done; \
-- for i in $$list; do \
+ for i in $$list; do \
- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
- else file=$$i; fi; \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 5*) ;; \
-- *) ext='5' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man5dir)/$$inst'"; \
-- $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man5dir)/$$inst"; \
-- done
-+ for i in $$list; do echo "$$i"; done | $(am__base_list) | \
-+ while read files; do \
-+ test -z "$$files" || { \
-+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man5dir)'"; \
-+ $(INSTALL_DATA) $$files "$(DESTDIR)$(man5dir)" || exit $$?; }; \
-+ done; }
-+
- uninstall-man5:
- @$(NORMAL_UNINSTALL)
-- @list='$(man5_MANS) $(dist_man5_MANS) $(nodist_man5_MANS)'; \
-- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-- for i in $$l2; do \
-- case "$$i" in \
-- *.5*) list="$$list $$i" ;; \
-- esac; \
-- done; \
-- for i in $$list; do \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 5*) ;; \
-- *) ext='5' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " rm -f '$(DESTDIR)$(man5dir)/$$inst'"; \
-- rm -f "$(DESTDIR)$(man5dir)/$$inst"; \
-- done
--install-man8: $(man8_MANS) $(man_MANS)
-+ @list=''; test -n "$(man5dir)" || exit 0; \
-+ files=`{ for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.5[a-z]*$$/p'; \
-+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^5][0-9a-z]*$$,5,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-+ test -z "$$files" || { \
-+ echo " ( cd '$(DESTDIR)$(man5dir)' && rm -f" $$files ")"; \
-+ cd "$(DESTDIR)$(man5dir)" && rm -f $$files; }
-+install-man8: $(man_MANS)
- @$(NORMAL_INSTALL)
- 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 \
-- case "$$i" in \
-- *.8*) list="$$list $$i" ;; \
-- esac; \
-+ @list=''; test -n "$(man8dir)" || exit 0; \
-+ { for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.8[a-z]*$$/p'; \
-+ } | while read p; do \
-+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-+ echo "$$d$$p"; echo "$$p"; \
-+ done | \
-+ sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
-+ sed 'N;N;s,\n, ,g' | { \
-+ list=; while read file base inst; do \
-+ if test "$$base" = "$$inst"; then list="$$list $$file"; else \
-+ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-+ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst" || exit $$?; \
-+ fi; \
++ if test -f $$i; then file=$$i; \
++ else file=$(srcdir)/$$i; fi; \
+ ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+ case "$$ext" in \
+ 5*) ;; \
+@@ -428,8 +430,8 @@
+ esac; \
done; \
-- for i in $$list; do \
+ for i in $$list; do \
- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
- else file=$$i; fi; \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 8*) ;; \
-- *) ext='8' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-- $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \
-- done
-+ for i in $$list; do echo "$$i"; done | $(am__base_list) | \
-+ while read files; do \
-+ test -z "$$files" || { \
-+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man8dir)'"; \
-+ $(INSTALL_DATA) $$files "$(DESTDIR)$(man8dir)" || exit $$?; }; \
-+ done; }
-+
- uninstall-man8:
- @$(NORMAL_UNINSTALL)
-- @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
-- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-- for i in $$l2; do \
-- case "$$i" in \
-- *.8*) list="$$list $$i" ;; \
-- esac; \
-- done; \
-- for i in $$list; do \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 8*) ;; \
-- *) ext='8' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \
-- rm -f "$(DESTDIR)$(man8dir)/$$inst"; \
-- done
-+ @list=''; test -n "$(man8dir)" || exit 0; \
-+ files=`{ for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.8[a-z]*$$/p'; \
-+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-+ test -z "$$files" || { \
-+ echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \
-+ cd "$(DESTDIR)$(man8dir)" && rm -f $$files; }
- install-secureconfDATA: $(secureconf_DATA)
- @$(NORMAL_INSTALL)
- test -z "$(secureconfdir)" || $(MKDIR_P) "$(DESTDIR)$(secureconfdir)"
-- @list='$(secureconf_DATA)'; for p in $$list; do \
-+ @list='$(secureconf_DATA)'; test -n "$(secureconfdir)" || list=; \
-+ for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-- echo " $(secureconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(secureconfdir)/$$f'"; \
-- $(secureconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(secureconfdir)/$$f"; \
-+ echo "$$d$$p"; \
-+ done | $(am__base_list) | \
-+ while read files; do \
-+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(secureconfdir)'"; \
-+ $(INSTALL_DATA) $$files "$(DESTDIR)$(secureconfdir)" || exit $$?; \
- done
-
- uninstall-secureconfDATA:
- @$(NORMAL_UNINSTALL)
-- @list='$(secureconf_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-- echo " rm -f '$(DESTDIR)$(secureconfdir)/$$f'"; \
-- rm -f "$(DESTDIR)$(secureconfdir)/$$f"; \
-- done
-+ @list='$(secureconf_DATA)'; test -n "$(secureconfdir)" || list=; \
-+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-+ test -n "$$files" || exit 0; \
-+ echo " ( cd '$(DESTDIR)$(secureconfdir)' && rm -f" $$files ")"; \
-+ cd "$(DESTDIR)$(secureconfdir)" && rm -f $$files
-
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
++ if test -f $$i; then file=$$i; \
++ else file=$(srcdir)/$$i; fi; \
+ ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+ case "$$ext" in \
+ 8*) ;; \
+@@ -485,7 +487,7 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -31739,56 +22257,7 @@ Index: pam.debian/modules/pam_group/Makefile.in
END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
-+ set x; \
- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -496,37 +510,43 @@
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ shift; \
-+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
-- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique; \
-+ if test $$# -gt 0; then \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ "$$@" $$unique; \
-+ else \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$unique; \
-+ fi; \
- fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
- 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; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+ test -z "$(CTAGS_ARGS)$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-- $$tags $$unique
-+ $$unique
-
- GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
-- && cd $(top_srcdir) \
-- && gtags -i $(GTAGS_ARGS) $$here
-+ && $(am__cd) $(top_srcdir) \
-+ && gtags -i $(GTAGS_ARGS) "$$here"
-
- distclean-tags:
+@@ -528,7 +530,7 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
check-TESTS: $(TESTS)
@@ -31796,11 +22265,8 @@ Index: pam.debian/modules/pam_group/Makefile.in
+ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
srcdir=$(srcdir); export srcdir; \
list=' $(TESTS) '; \
-+ $(am__tty_colors); \
if test -n "$$list"; then \
- for tst in $$list; do \
- if test -f ./$$tst; then dir=./; \
-@@ -535,49 +555,63 @@
+@@ -539,7 +541,7 @@
if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
@@ -31808,35 +22274,19 @@ Index: pam.debian/modules/pam_group/Makefile.in
+ *[\ \ ]$$tst[\ \ ]*) \
xpass=`expr $$xpass + 1`; \
failed=`expr $$failed + 1`; \
-- echo "XPASS: $$tst"; \
-+ col=$$red; res=XPASS; \
- ;; \
- *) \
-- echo "PASS: $$tst"; \
-+ col=$$grn; res=PASS; \
- ;; \
- esac; \
+ echo "XPASS: $$tst"; \
+@@ -551,7 +553,7 @@
elif test $$? -ne 77; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
- *$$ws$$tst$$ws*) \
+ *[\ \ ]$$tst[\ \ ]*) \
xfail=`expr $$xfail + 1`; \
-- echo "XFAIL: $$tst"; \
-+ col=$$lgn; res=XFAIL; \
+ echo "XFAIL: $$tst"; \
;; \
- *) \
- failed=`expr $$failed + 1`; \
-- echo "FAIL: $$tst"; \
-+ col=$$red; res=FAIL; \
- ;; \
- esac; \
- else \
- skip=`expr $$skip + 1`; \
-- echo "SKIP: $$tst"; \
-+ col=$$blu; res=SKIP; \
+@@ -565,23 +567,36 @@
+ echo "SKIP: $$tst"; \
fi; \
-+ echo "$${col}$$res$${std}: $$tst"; \
done; \
+ if test "$$all" -eq 1; then \
+ tests="test"; \
@@ -31876,22 +22326,7 @@ Index: pam.debian/modules/pam_group/Makefile.in
test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
dashes="$$skipped"; \
fi; \
-@@ -588,15 +622,32 @@
- dashes="$$report"; \
- fi; \
- dashes=`echo "$$dashes" | sed s/./=/g`; \
-- echo "$$dashes"; \
-+ if test "$$failed" -eq 0; then \
-+ echo "$$grn$$dashes"; \
-+ else \
-+ echo "$$red$$dashes"; \
-+ fi; \
- echo "$$banner"; \
- test -z "$$skipped" || echo "$$skipped"; \
- test -z "$$report" || echo "$$report"; \
-- echo "$$dashes"; \
-+ echo "$$dashes$$std"; \
- test "$$failed" -eq 0; \
+@@ -601,6 +616,19 @@
else :; fi
distdir: $(DISTFILES)
@@ -31911,37 +22346,7 @@ Index: pam.debian/modules/pam_group/Makefile.in
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
-@@ -612,13 +663,17 @@
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-+ if test -d "$(distdir)/$$file"; then \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+ fi; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
-- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
- else \
-- test -f $(distdir)/$$file \
-- || cp -p $$d/$$file $(distdir)/$$file \
-+ test -f "$(distdir)/$$file" \
-+ || cp -p $$d/$$file "$(distdir)/$$file" \
- || exit 1; \
- fi; \
- done
-@@ -651,6 +706,7 @@
-
- distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -673,6 +729,8 @@
+@@ -677,6 +705,8 @@
html: html-am
@@ -31950,7 +22355,7 @@ Index: pam.debian/modules/pam_group/Makefile.in
info: info-am
info-am:
-@@ -682,18 +740,28 @@
+@@ -686,18 +716,28 @@
install-dvi: install-dvi-am
@@ -31979,30 +22384,13 @@ Index: pam.debian/modules/pam_group/Makefile.in
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -719,7 +787,7 @@
-
- uninstall-man: uninstall-man5 uninstall-man8
-
--.MAKE: install-am install-strip
-+.MAKE: check-am install-am install-strip
-
- .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
- clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
-@@ -740,6 +808,7 @@
-
- @ENABLE_REGENERATE_MAN_TRUE@README: pam_group.8.xml group.conf.5.xml
- @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
-+
- # 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.
- .NOEXPORT:
-Index: pam.debian/modules/pam_issue/Makefile.in
+Index: pam.deb/modules/pam_issue/Makefile.in
===================================================================
---- pam.debian.orig/modules/pam_issue/Makefile.in
-+++ pam.debian/modules/pam_issue/Makefile.in
+--- pam.deb.orig/modules/pam_issue/Makefile.in
++++ pam.deb/modules/pam_issue/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -32012,67 +22400,7 @@ Index: pam.debian/modules/pam_issue/Makefile.in
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -21,8 +22,9 @@
-
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
--pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkglibexecdir = $(libexecdir)/@PACKAGE@
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
-@@ -58,14 +60,29 @@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
-+CONFIG_CLEAN_VPATH_FILES =
- am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
- am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-+am__install_max = 40
-+am__nobase_strip_setup = \
-+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-+am__nobase_strip = \
-+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-+am__nobase_list = $(am__nobase_strip_setup); \
-+ for p in $$list; do echo "$$p $$p"; done | \
-+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-+ if (++n[$$2] == $(am__install_max)) \
-+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-+ END { for (dir in files) print dir, files[dir] }'
-+am__base_list = \
-+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
- am__installdirs = "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man8dir)"
--securelibLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(securelib_LTLIBRARIES)
- pam_issue_la_DEPENDENCIES =
- pam_issue_la_SOURCES = pam_issue.c
-@@ -73,6 +90,7 @@
- DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
-+am__mv = mv -f
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-@@ -90,6 +108,8 @@
- DATA = $(noinst_DATA)
- ETAGS = etags
- CTAGS = ctags
-+am__tty_colors = \
-+red=; grn=; lgn=; blu=; std=
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- AMTAR = @AMTAR@
-@@ -174,6 +194,7 @@
+@@ -176,6 +177,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -32080,7 +22408,7 @@ Index: pam.debian/modules/pam_issue/Makefile.in
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PIE_CFLAGS = @PIE_CFLAGS@
-@@ -273,14 +294,14 @@
+@@ -277,8 +279,8 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -32091,163 +22419,18 @@ Index: pam.debian/modules/pam_issue/Makefile.in
exit 1;; \
esac; \
done; \
-- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/pam_issue/Makefile'; \
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu modules/pam_issue/Makefile
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/pam_issue/Makefile'; \
-+ $(am__cd) $(top_srcdir) && \
-+ $(AUTOMAKE) --gnu modules/pam_issue/Makefile
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
-@@ -298,23 +319,28 @@
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- $(ACLOCAL_M4): $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(am__aclocal_m4_deps):
- install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
- @$(NORMAL_INSTALL)
- test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
-- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-+ @list='$(securelib_LTLIBRARIES)'; test -n "$(securelibdir)" || list=; \
-+ list2=; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-- 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"; \
-+ list2="$$list2 $$p"; \
- else :; fi; \
-- done
-+ done; \
-+ test -z "$$list2" || { \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(securelibdir)'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(securelibdir)"; \
-+ }
-
- uninstall-securelibLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-+ @list='$(securelib_LTLIBRARIES)'; test -n "$(securelibdir)" || list=; \
-+ for p in $$list; do \
-+ $(am__strip_dir) \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$f'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$f"; \
- done
-
- clean-securelibLTLIBRARIES:
-@@ -338,21 +364,21 @@
-
- .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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @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,65 +388,58 @@
-
- clean-libtool:
- -rm -rf .libs _libs
--install-man8: $(man8_MANS) $(man_MANS)
-+install-man8: $(man_MANS)
- @$(NORMAL_INSTALL)
- 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 \
-- case "$$i" in \
-- *.8*) list="$$list $$i" ;; \
-- esac; \
-+ @list=''; test -n "$(man8dir)" || exit 0; \
-+ { for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.8[a-z]*$$/p'; \
-+ } | while read p; do \
-+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-+ echo "$$d$$p"; echo "$$p"; \
-+ done | \
-+ sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
-+ sed 'N;N;s,\n, ,g' | { \
-+ list=; while read file base inst; do \
-+ if test "$$base" = "$$inst"; then list="$$list $$file"; else \
-+ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-+ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst" || exit $$?; \
-+ fi; \
+@@ -377,8 +379,8 @@
+ esac; \
done; \
-- for i in $$list; do \
+ for i in $$list; do \
- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
- else file=$$i; fi; \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 8*) ;; \
-- *) ext='8' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-- $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \
-- done
-+ for i in $$list; do echo "$$i"; done | $(am__base_list) | \
-+ while read files; do \
-+ test -z "$$files" || { \
-+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man8dir)'"; \
-+ $(INSTALL_DATA) $$files "$(DESTDIR)$(man8dir)" || exit $$?; }; \
-+ done; }
-+
- uninstall-man8:
- @$(NORMAL_UNINSTALL)
-- @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
-- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-- for i in $$l2; do \
-- case "$$i" in \
-- *.8*) list="$$list $$i" ;; \
-- esac; \
-- done; \
-- for i in $$list; do \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 8*) ;; \
-- *) ext='8' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \
-- rm -f "$(DESTDIR)$(man8dir)/$$inst"; \
-- done
-+ @list=''; test -n "$(man8dir)" || exit 0; \
-+ files=`{ for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.8[a-z]*$$/p'; \
-+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-+ test -z "$$files" || { \
-+ echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \
-+ cd "$(DESTDIR)$(man8dir)" && rm -f $$files; }
-
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
++ if test -f $$i; then file=$$i; \
++ else file=$(srcdir)/$$i; fi; \
+ ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+ case "$$ext" in \
+ 8*) ;; \
+@@ -417,7 +419,7 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -32256,56 +22439,7 @@ Index: pam.debian/modules/pam_issue/Makefile.in
END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
-+ set x; \
- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -428,37 +447,43 @@
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ shift; \
-+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
-- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique; \
-+ if test $$# -gt 0; then \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ "$$@" $$unique; \
-+ else \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$unique; \
-+ fi; \
- fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
- 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; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+ test -z "$(CTAGS_ARGS)$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-- $$tags $$unique
-+ $$unique
-
- GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
-- && cd $(top_srcdir) \
-- && gtags -i $(GTAGS_ARGS) $$here
-+ && $(am__cd) $(top_srcdir) \
-+ && gtags -i $(GTAGS_ARGS) "$$here"
-
- distclean-tags:
+@@ -460,7 +462,7 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
check-TESTS: $(TESTS)
@@ -32313,11 +22447,8 @@ Index: pam.debian/modules/pam_issue/Makefile.in
+ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
srcdir=$(srcdir); export srcdir; \
list=' $(TESTS) '; \
-+ $(am__tty_colors); \
if test -n "$$list"; then \
- for tst in $$list; do \
- if test -f ./$$tst; then dir=./; \
-@@ -467,49 +492,63 @@
+@@ -471,7 +473,7 @@
if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
@@ -32325,35 +22456,19 @@ Index: pam.debian/modules/pam_issue/Makefile.in
+ *[\ \ ]$$tst[\ \ ]*) \
xpass=`expr $$xpass + 1`; \
failed=`expr $$failed + 1`; \
-- echo "XPASS: $$tst"; \
-+ col=$$red; res=XPASS; \
- ;; \
- *) \
-- echo "PASS: $$tst"; \
-+ col=$$grn; res=PASS; \
- ;; \
- esac; \
+ echo "XPASS: $$tst"; \
+@@ -483,7 +485,7 @@
elif test $$? -ne 77; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
- *$$ws$$tst$$ws*) \
+ *[\ \ ]$$tst[\ \ ]*) \
xfail=`expr $$xfail + 1`; \
-- echo "XFAIL: $$tst"; \
-+ col=$$lgn; res=XFAIL; \
- ;; \
- *) \
- failed=`expr $$failed + 1`; \
-- echo "FAIL: $$tst"; \
-+ col=$$red; res=FAIL; \
+ echo "XFAIL: $$tst"; \
;; \
- esac; \
- else \
- skip=`expr $$skip + 1`; \
-- echo "SKIP: $$tst"; \
-+ col=$$blu; res=SKIP; \
+@@ -497,23 +499,36 @@
+ echo "SKIP: $$tst"; \
fi; \
-+ echo "$${col}$$res$${std}: $$tst"; \
done; \
+ if test "$$all" -eq 1; then \
+ tests="test"; \
@@ -32393,22 +22508,7 @@ Index: pam.debian/modules/pam_issue/Makefile.in
test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
dashes="$$skipped"; \
fi; \
-@@ -520,15 +559,32 @@
- dashes="$$report"; \
- fi; \
- dashes=`echo "$$dashes" | sed s/./=/g`; \
-- echo "$$dashes"; \
-+ if test "$$failed" -eq 0; then \
-+ echo "$$grn$$dashes"; \
-+ else \
-+ echo "$$red$$dashes"; \
-+ fi; \
- echo "$$banner"; \
- test -z "$$skipped" || echo "$$skipped"; \
- test -z "$$report" || echo "$$report"; \
-- echo "$$dashes"; \
-+ echo "$$dashes$$std"; \
- test "$$failed" -eq 0; \
+@@ -533,6 +548,19 @@
else :; fi
distdir: $(DISTFILES)
@@ -32428,37 +22528,7 @@ Index: pam.debian/modules/pam_issue/Makefile.in
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
-@@ -544,13 +600,17 @@
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-+ if test -d "$(distdir)/$$file"; then \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+ fi; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
-- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
- else \
-- test -f $(distdir)/$$file \
-- || cp -p $$d/$$file $(distdir)/$$file \
-+ test -f "$(distdir)/$$file" \
-+ || cp -p $$d/$$file "$(distdir)/$$file" \
- || exit 1; \
- fi; \
- done
-@@ -583,6 +643,7 @@
-
- distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -605,6 +666,8 @@
+@@ -609,6 +637,8 @@
html: html-am
@@ -32467,7 +22537,7 @@ Index: pam.debian/modules/pam_issue/Makefile.in
info: info-am
info-am:
-@@ -613,18 +676,28 @@
+@@ -617,18 +647,28 @@
install-dvi: install-dvi-am
@@ -32496,30 +22566,13 @@ Index: pam.debian/modules/pam_issue/Makefile.in
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -649,7 +722,7 @@
-
- uninstall-man: uninstall-man8
-
--.MAKE: install-am install-strip
-+.MAKE: check-am install-am install-strip
-
- .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
- clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
-@@ -669,6 +742,7 @@
-
- @ENABLE_REGENERATE_MAN_TRUE@README: pam_issue.8.xml
- @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
-+
- # 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.
- .NOEXPORT:
-Index: pam.debian/modules/pam_keyinit/Makefile.in
+Index: pam.deb/modules/pam_keyinit/Makefile.in
===================================================================
---- pam.debian.orig/modules/pam_keyinit/Makefile.in
-+++ pam.debian/modules/pam_keyinit/Makefile.in
+--- pam.deb.orig/modules/pam_keyinit/Makefile.in
++++ pam.deb/modules/pam_keyinit/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -32529,67 +22582,7 @@ Index: pam.debian/modules/pam_keyinit/Makefile.in
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -21,8 +22,9 @@
-
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
--pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkglibexecdir = $(libexecdir)/@PACKAGE@
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
-@@ -58,14 +60,29 @@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
-+CONFIG_CLEAN_VPATH_FILES =
- am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
- am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-+am__install_max = 40
-+am__nobase_strip_setup = \
-+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-+am__nobase_strip = \
-+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-+am__nobase_list = $(am__nobase_strip_setup); \
-+ for p in $$list; do echo "$$p $$p"; done | \
-+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-+ if (++n[$$2] == $(am__install_max)) \
-+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-+ END { for (dir in files) print dir, files[dir] }'
-+am__base_list = \
-+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
- am__installdirs = "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man8dir)"
--securelibLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(securelib_LTLIBRARIES)
- pam_keyinit_la_DEPENDENCIES =
- pam_keyinit_la_SOURCES = pam_keyinit.c
-@@ -75,6 +92,7 @@
- DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
-+am__mv = mv -f
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-@@ -92,6 +110,8 @@
- DATA = $(noinst_DATA)
- ETAGS = etags
- CTAGS = ctags
-+am__tty_colors = \
-+red=; grn=; lgn=; blu=; std=
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- AMTAR = @AMTAR@
-@@ -176,6 +196,7 @@
+@@ -178,6 +179,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -32597,7 +22590,7 @@ Index: pam.debian/modules/pam_keyinit/Makefile.in
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PIE_CFLAGS = @PIE_CFLAGS@
-@@ -275,14 +296,14 @@
+@@ -279,8 +281,8 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -32608,163 +22601,18 @@ Index: pam.debian/modules/pam_keyinit/Makefile.in
exit 1;; \
esac; \
done; \
-- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/pam_keyinit/Makefile'; \
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu modules/pam_keyinit/Makefile
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/pam_keyinit/Makefile'; \
-+ $(am__cd) $(top_srcdir) && \
-+ $(AUTOMAKE) --gnu modules/pam_keyinit/Makefile
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
-@@ -300,23 +321,28 @@
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- $(ACLOCAL_M4): $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(am__aclocal_m4_deps):
- install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
- @$(NORMAL_INSTALL)
- test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
-- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-+ @list='$(securelib_LTLIBRARIES)'; test -n "$(securelibdir)" || list=; \
-+ list2=; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-- 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"; \
-+ list2="$$list2 $$p"; \
- else :; fi; \
-- done
-+ done; \
-+ test -z "$$list2" || { \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(securelibdir)'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(securelibdir)"; \
-+ }
-
- uninstall-securelibLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-+ @list='$(securelib_LTLIBRARIES)'; test -n "$(securelibdir)" || list=; \
-+ for p in $$list; do \
-+ $(am__strip_dir) \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$f'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$f"; \
- done
-
- clean-securelibLTLIBRARIES:
-@@ -340,21 +366,21 @@
-
- .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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @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 $@ $<
-@@ -364,65 +390,58 @@
-
- clean-libtool:
- -rm -rf .libs _libs
--install-man8: $(man8_MANS) $(man_MANS)
-+install-man8: $(man_MANS)
- @$(NORMAL_INSTALL)
- 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 \
-- case "$$i" in \
-- *.8*) list="$$list $$i" ;; \
-- esac; \
-+ @list=''; test -n "$(man8dir)" || exit 0; \
-+ { for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.8[a-z]*$$/p'; \
-+ } | while read p; do \
-+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-+ echo "$$d$$p"; echo "$$p"; \
-+ done | \
-+ sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
-+ sed 'N;N;s,\n, ,g' | { \
-+ list=; while read file base inst; do \
-+ if test "$$base" = "$$inst"; then list="$$list $$file"; else \
-+ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-+ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst" || exit $$?; \
-+ fi; \
+@@ -379,8 +381,8 @@
+ esac; \
done; \
-- for i in $$list; do \
+ for i in $$list; do \
- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
- else file=$$i; fi; \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 8*) ;; \
-- *) ext='8' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-- $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \
-- done
-+ for i in $$list; do echo "$$i"; done | $(am__base_list) | \
-+ while read files; do \
-+ test -z "$$files" || { \
-+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man8dir)'"; \
-+ $(INSTALL_DATA) $$files "$(DESTDIR)$(man8dir)" || exit $$?; }; \
-+ done; }
-+
- uninstall-man8:
- @$(NORMAL_UNINSTALL)
-- @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
-- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-- for i in $$l2; do \
-- case "$$i" in \
-- *.8*) list="$$list $$i" ;; \
-- esac; \
-- done; \
-- for i in $$list; do \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 8*) ;; \
-- *) ext='8' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \
-- rm -f "$(DESTDIR)$(man8dir)/$$inst"; \
-- done
-+ @list=''; test -n "$(man8dir)" || exit 0; \
-+ files=`{ for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.8[a-z]*$$/p'; \
-+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-+ test -z "$$files" || { \
-+ echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \
-+ cd "$(DESTDIR)$(man8dir)" && rm -f $$files; }
-
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
++ if test -f $$i; then file=$$i; \
++ else file=$(srcdir)/$$i; fi; \
+ ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+ case "$$ext" in \
+ 8*) ;; \
+@@ -419,7 +421,7 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -32773,56 +22621,7 @@ Index: pam.debian/modules/pam_keyinit/Makefile.in
END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
-+ set x; \
- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -430,37 +449,43 @@
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ shift; \
-+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
-- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique; \
-+ if test $$# -gt 0; then \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ "$$@" $$unique; \
-+ else \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$unique; \
-+ fi; \
- fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
- 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; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+ test -z "$(CTAGS_ARGS)$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-- $$tags $$unique
-+ $$unique
-
- GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
-- && cd $(top_srcdir) \
-- && gtags -i $(GTAGS_ARGS) $$here
-+ && $(am__cd) $(top_srcdir) \
-+ && gtags -i $(GTAGS_ARGS) "$$here"
-
- distclean-tags:
+@@ -462,7 +464,7 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
check-TESTS: $(TESTS)
@@ -32830,11 +22629,8 @@ Index: pam.debian/modules/pam_keyinit/Makefile.in
+ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
srcdir=$(srcdir); export srcdir; \
list=' $(TESTS) '; \
-+ $(am__tty_colors); \
if test -n "$$list"; then \
- for tst in $$list; do \
- if test -f ./$$tst; then dir=./; \
-@@ -469,49 +494,63 @@
+@@ -473,7 +475,7 @@
if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
@@ -32842,35 +22638,19 @@ Index: pam.debian/modules/pam_keyinit/Makefile.in
+ *[\ \ ]$$tst[\ \ ]*) \
xpass=`expr $$xpass + 1`; \
failed=`expr $$failed + 1`; \
-- echo "XPASS: $$tst"; \
-+ col=$$red; res=XPASS; \
- ;; \
- *) \
-- echo "PASS: $$tst"; \
-+ col=$$grn; res=PASS; \
- ;; \
- esac; \
+ echo "XPASS: $$tst"; \
+@@ -485,7 +487,7 @@
elif test $$? -ne 77; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
- *$$ws$$tst$$ws*) \
+ *[\ \ ]$$tst[\ \ ]*) \
xfail=`expr $$xfail + 1`; \
-- echo "XFAIL: $$tst"; \
-+ col=$$lgn; res=XFAIL; \
- ;; \
- *) \
- failed=`expr $$failed + 1`; \
-- echo "FAIL: $$tst"; \
-+ col=$$red; res=FAIL; \
+ echo "XFAIL: $$tst"; \
;; \
- esac; \
- else \
- skip=`expr $$skip + 1`; \
-- echo "SKIP: $$tst"; \
-+ col=$$blu; res=SKIP; \
+@@ -499,23 +501,36 @@
+ echo "SKIP: $$tst"; \
fi; \
-+ echo "$${col}$$res$${std}: $$tst"; \
done; \
+ if test "$$all" -eq 1; then \
+ tests="test"; \
@@ -32910,22 +22690,7 @@ Index: pam.debian/modules/pam_keyinit/Makefile.in
test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
dashes="$$skipped"; \
fi; \
-@@ -522,15 +561,32 @@
- dashes="$$report"; \
- fi; \
- dashes=`echo "$$dashes" | sed s/./=/g`; \
-- echo "$$dashes"; \
-+ if test "$$failed" -eq 0; then \
-+ echo "$$grn$$dashes"; \
-+ else \
-+ echo "$$red$$dashes"; \
-+ fi; \
- echo "$$banner"; \
- test -z "$$skipped" || echo "$$skipped"; \
- test -z "$$report" || echo "$$report"; \
-- echo "$$dashes"; \
-+ echo "$$dashes$$std"; \
- test "$$failed" -eq 0; \
+@@ -535,6 +550,19 @@
else :; fi
distdir: $(DISTFILES)
@@ -32945,37 +22710,7 @@ Index: pam.debian/modules/pam_keyinit/Makefile.in
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
-@@ -546,13 +602,17 @@
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-+ if test -d "$(distdir)/$$file"; then \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+ fi; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
-- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
- else \
-- test -f $(distdir)/$$file \
-- || cp -p $$d/$$file $(distdir)/$$file \
-+ test -f "$(distdir)/$$file" \
-+ || cp -p $$d/$$file "$(distdir)/$$file" \
- || exit 1; \
- fi; \
- done
-@@ -585,6 +645,7 @@
-
- distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -607,6 +668,8 @@
+@@ -611,6 +639,8 @@
html: html-am
@@ -32984,7 +22719,7 @@ Index: pam.debian/modules/pam_keyinit/Makefile.in
info: info-am
info-am:
-@@ -615,18 +678,28 @@
+@@ -619,18 +649,28 @@
install-dvi: install-dvi-am
@@ -33013,30 +22748,13 @@ Index: pam.debian/modules/pam_keyinit/Makefile.in
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -651,7 +724,7 @@
-
- uninstall-man: uninstall-man8
-
--.MAKE: install-am install-strip
-+.MAKE: check-am install-am install-strip
-
- .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
- clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
-@@ -671,6 +744,7 @@
-
- @ENABLE_REGENERATE_MAN_TRUE@README: pam_keyinit.8.xml
- @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
-+
- # 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.
- .NOEXPORT:
-Index: pam.debian/modules/pam_lastlog/Makefile.in
+Index: pam.deb/modules/pam_lastlog/Makefile.in
===================================================================
---- pam.debian.orig/modules/pam_lastlog/Makefile.in
-+++ pam.debian/modules/pam_lastlog/Makefile.in
+--- pam.deb.orig/modules/pam_lastlog/Makefile.in
++++ pam.deb/modules/pam_lastlog/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -33046,67 +22764,7 @@ Index: pam.debian/modules/pam_lastlog/Makefile.in
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -21,8 +22,9 @@
-
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
--pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkglibexecdir = $(libexecdir)/@PACKAGE@
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
-@@ -58,14 +60,29 @@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
-+CONFIG_CLEAN_VPATH_FILES =
- am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
- am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-+am__install_max = 40
-+am__nobase_strip_setup = \
-+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-+am__nobase_strip = \
-+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-+am__nobase_list = $(am__nobase_strip_setup); \
-+ for p in $$list; do echo "$$p $$p"; done | \
-+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-+ if (++n[$$2] == $(am__install_max)) \
-+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-+ END { for (dir in files) print dir, files[dir] }'
-+am__base_list = \
-+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
- am__installdirs = "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man8dir)"
--securelibLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(securelib_LTLIBRARIES)
- pam_lastlog_la_DEPENDENCIES =
- pam_lastlog_la_SOURCES = pam_lastlog.c
-@@ -73,6 +90,7 @@
- DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
-+am__mv = mv -f
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-@@ -90,6 +108,8 @@
- DATA = $(noinst_DATA)
- ETAGS = etags
- CTAGS = ctags
-+am__tty_colors = \
-+red=; grn=; lgn=; blu=; std=
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- AMTAR = @AMTAR@
-@@ -174,6 +194,7 @@
+@@ -176,6 +177,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -33114,7 +22772,7 @@ Index: pam.debian/modules/pam_lastlog/Makefile.in
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PIE_CFLAGS = @PIE_CFLAGS@
-@@ -273,14 +294,14 @@
+@@ -277,8 +279,8 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -33125,163 +22783,18 @@ Index: pam.debian/modules/pam_lastlog/Makefile.in
exit 1;; \
esac; \
done; \
-- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/pam_lastlog/Makefile'; \
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu modules/pam_lastlog/Makefile
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/pam_lastlog/Makefile'; \
-+ $(am__cd) $(top_srcdir) && \
-+ $(AUTOMAKE) --gnu modules/pam_lastlog/Makefile
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
-@@ -298,23 +319,28 @@
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- $(ACLOCAL_M4): $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(am__aclocal_m4_deps):
- install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
- @$(NORMAL_INSTALL)
- test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
-- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-+ @list='$(securelib_LTLIBRARIES)'; test -n "$(securelibdir)" || list=; \
-+ list2=; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-- 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"; \
-+ list2="$$list2 $$p"; \
- else :; fi; \
-- done
-+ done; \
-+ test -z "$$list2" || { \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(securelibdir)'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(securelibdir)"; \
-+ }
-
- uninstall-securelibLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-+ @list='$(securelib_LTLIBRARIES)'; test -n "$(securelibdir)" || list=; \
-+ for p in $$list; do \
-+ $(am__strip_dir) \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$f'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$f"; \
- done
-
- clean-securelibLTLIBRARIES:
-@@ -338,21 +364,21 @@
-
- .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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @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,65 +388,58 @@
-
- clean-libtool:
- -rm -rf .libs _libs
--install-man8: $(man8_MANS) $(man_MANS)
-+install-man8: $(man_MANS)
- @$(NORMAL_INSTALL)
- 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 \
-- case "$$i" in \
-- *.8*) list="$$list $$i" ;; \
-- esac; \
-+ @list=''; test -n "$(man8dir)" || exit 0; \
-+ { for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.8[a-z]*$$/p'; \
-+ } | while read p; do \
-+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-+ echo "$$d$$p"; echo "$$p"; \
-+ done | \
-+ sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
-+ sed 'N;N;s,\n, ,g' | { \
-+ list=; while read file base inst; do \
-+ if test "$$base" = "$$inst"; then list="$$list $$file"; else \
-+ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-+ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst" || exit $$?; \
-+ fi; \
+@@ -377,8 +379,8 @@
+ esac; \
done; \
-- for i in $$list; do \
+ for i in $$list; do \
- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
- else file=$$i; fi; \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 8*) ;; \
-- *) ext='8' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-- $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \
-- done
-+ for i in $$list; do echo "$$i"; done | $(am__base_list) | \
-+ while read files; do \
-+ test -z "$$files" || { \
-+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man8dir)'"; \
-+ $(INSTALL_DATA) $$files "$(DESTDIR)$(man8dir)" || exit $$?; }; \
-+ done; }
-+
- uninstall-man8:
- @$(NORMAL_UNINSTALL)
-- @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
-- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-- for i in $$l2; do \
-- case "$$i" in \
-- *.8*) list="$$list $$i" ;; \
-- esac; \
-- done; \
-- for i in $$list; do \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 8*) ;; \
-- *) ext='8' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \
-- rm -f "$(DESTDIR)$(man8dir)/$$inst"; \
-- done
-+ @list=''; test -n "$(man8dir)" || exit 0; \
-+ files=`{ for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.8[a-z]*$$/p'; \
-+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-+ test -z "$$files" || { \
-+ echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \
-+ cd "$(DESTDIR)$(man8dir)" && rm -f $$files; }
-
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
++ if test -f $$i; then file=$$i; \
++ else file=$(srcdir)/$$i; fi; \
+ ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+ case "$$ext" in \
+ 8*) ;; \
+@@ -417,7 +419,7 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -33290,56 +22803,7 @@ Index: pam.debian/modules/pam_lastlog/Makefile.in
END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
-+ set x; \
- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -428,37 +447,43 @@
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ shift; \
-+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
-- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique; \
-+ if test $$# -gt 0; then \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ "$$@" $$unique; \
-+ else \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$unique; \
-+ fi; \
- fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
- 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; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+ test -z "$(CTAGS_ARGS)$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-- $$tags $$unique
-+ $$unique
-
- GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
-- && cd $(top_srcdir) \
-- && gtags -i $(GTAGS_ARGS) $$here
-+ && $(am__cd) $(top_srcdir) \
-+ && gtags -i $(GTAGS_ARGS) "$$here"
-
- distclean-tags:
+@@ -460,7 +462,7 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
check-TESTS: $(TESTS)
@@ -33347,11 +22811,8 @@ Index: pam.debian/modules/pam_lastlog/Makefile.in
+ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
srcdir=$(srcdir); export srcdir; \
list=' $(TESTS) '; \
-+ $(am__tty_colors); \
if test -n "$$list"; then \
- for tst in $$list; do \
- if test -f ./$$tst; then dir=./; \
-@@ -467,49 +492,63 @@
+@@ -471,7 +473,7 @@
if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
@@ -33359,35 +22820,19 @@ Index: pam.debian/modules/pam_lastlog/Makefile.in
+ *[\ \ ]$$tst[\ \ ]*) \
xpass=`expr $$xpass + 1`; \
failed=`expr $$failed + 1`; \
-- echo "XPASS: $$tst"; \
-+ col=$$red; res=XPASS; \
- ;; \
- *) \
-- echo "PASS: $$tst"; \
-+ col=$$grn; res=PASS; \
- ;; \
- esac; \
+ echo "XPASS: $$tst"; \
+@@ -483,7 +485,7 @@
elif test $$? -ne 77; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
- *$$ws$$tst$$ws*) \
+ *[\ \ ]$$tst[\ \ ]*) \
xfail=`expr $$xfail + 1`; \
-- echo "XFAIL: $$tst"; \
-+ col=$$lgn; res=XFAIL; \
- ;; \
- *) \
- failed=`expr $$failed + 1`; \
-- echo "FAIL: $$tst"; \
-+ col=$$red; res=FAIL; \
+ echo "XFAIL: $$tst"; \
;; \
- esac; \
- else \
- skip=`expr $$skip + 1`; \
-- echo "SKIP: $$tst"; \
-+ col=$$blu; res=SKIP; \
+@@ -497,23 +499,36 @@
+ echo "SKIP: $$tst"; \
fi; \
-+ echo "$${col}$$res$${std}: $$tst"; \
done; \
+ if test "$$all" -eq 1; then \
+ tests="test"; \
@@ -33427,22 +22872,7 @@ Index: pam.debian/modules/pam_lastlog/Makefile.in
test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
dashes="$$skipped"; \
fi; \
-@@ -520,15 +559,32 @@
- dashes="$$report"; \
- fi; \
- dashes=`echo "$$dashes" | sed s/./=/g`; \
-- echo "$$dashes"; \
-+ if test "$$failed" -eq 0; then \
-+ echo "$$grn$$dashes"; \
-+ else \
-+ echo "$$red$$dashes"; \
-+ fi; \
- echo "$$banner"; \
- test -z "$$skipped" || echo "$$skipped"; \
- test -z "$$report" || echo "$$report"; \
-- echo "$$dashes"; \
-+ echo "$$dashes$$std"; \
- test "$$failed" -eq 0; \
+@@ -533,6 +548,19 @@
else :; fi
distdir: $(DISTFILES)
@@ -33462,37 +22892,7 @@ Index: pam.debian/modules/pam_lastlog/Makefile.in
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
-@@ -544,13 +600,17 @@
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-+ if test -d "$(distdir)/$$file"; then \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+ fi; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
-- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
- else \
-- test -f $(distdir)/$$file \
-- || cp -p $$d/$$file $(distdir)/$$file \
-+ test -f "$(distdir)/$$file" \
-+ || cp -p $$d/$$file "$(distdir)/$$file" \
- || exit 1; \
- fi; \
- done
-@@ -583,6 +643,7 @@
-
- distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -605,6 +666,8 @@
+@@ -609,6 +637,8 @@
html: html-am
@@ -33501,7 +22901,7 @@ Index: pam.debian/modules/pam_lastlog/Makefile.in
info: info-am
info-am:
-@@ -613,18 +676,28 @@
+@@ -617,18 +647,28 @@
install-dvi: install-dvi-am
@@ -33530,30 +22930,13 @@ Index: pam.debian/modules/pam_lastlog/Makefile.in
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -649,7 +722,7 @@
-
- uninstall-man: uninstall-man8
-
--.MAKE: install-am install-strip
-+.MAKE: check-am install-am install-strip
-
- .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
- clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
-@@ -669,6 +742,7 @@
-
- @ENABLE_REGENERATE_MAN_TRUE@README: pam_lastlog.8.xml
- @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
-+
- # 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.
- .NOEXPORT:
-Index: pam.debian/modules/pam_limits/Makefile.in
+Index: pam.deb/modules/pam_limits/Makefile.in
===================================================================
---- pam.debian.orig/modules/pam_limits/Makefile.in
-+++ pam.debian/modules/pam_limits/Makefile.in
+--- pam.deb.orig/modules/pam_limits/Makefile.in
++++ pam.deb/modules/pam_limits/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -33563,72 +22946,7 @@ Index: pam.debian/modules/pam_limits/Makefile.in
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -21,8 +22,9 @@
-
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
--pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkglibexecdir = $(libexecdir)/@PACKAGE@
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
-@@ -58,15 +60,30 @@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
-+CONFIG_CLEAN_VPATH_FILES =
- am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
- am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-+am__install_max = 40
-+am__nobase_strip_setup = \
-+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-+am__nobase_strip = \
-+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-+am__nobase_list = $(am__nobase_strip_setup); \
-+ for p in $$list; do echo "$$p $$p"; done | \
-+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-+ if (++n[$$2] == $(am__install_max)) \
-+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-+ END { for (dir in files) print dir, files[dir] }'
-+am__base_list = \
-+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
- am__installdirs = "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man5dir)" \
- "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(secureconfdir)"
--securelibLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(securelib_LTLIBRARIES)
- pam_limits_la_DEPENDENCIES =
- pam_limits_la_SOURCES = pam_limits.c
-@@ -74,6 +91,7 @@
- DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
-+am__mv = mv -f
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-@@ -89,10 +107,11 @@
- man8dir = $(mandir)/man8
- NROFF = nroff
- MANS = $(man_MANS)
--secureconfDATA_INSTALL = $(INSTALL_DATA)
- DATA = $(noinst_DATA) $(secureconf_DATA)
- ETAGS = etags
- CTAGS = ctags
-+am__tty_colors = \
-+red=; grn=; lgn=; blu=; std=
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- AMTAR = @AMTAR@
-@@ -177,6 +196,7 @@
+@@ -179,6 +180,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -33636,7 +22954,7 @@ Index: pam.debian/modules/pam_limits/Makefile.in
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PIE_CFLAGS = @PIE_CFLAGS@
-@@ -281,14 +301,14 @@
+@@ -285,8 +287,8 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -33647,270 +22965,29 @@ Index: pam.debian/modules/pam_limits/Makefile.in
exit 1;; \
esac; \
done; \
-- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/pam_limits/Makefile'; \
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu modules/pam_limits/Makefile
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/pam_limits/Makefile'; \
-+ $(am__cd) $(top_srcdir) && \
-+ $(AUTOMAKE) --gnu modules/pam_limits/Makefile
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
-@@ -306,23 +326,28 @@
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- $(ACLOCAL_M4): $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(am__aclocal_m4_deps):
- install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
- @$(NORMAL_INSTALL)
- test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
-- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-+ @list='$(securelib_LTLIBRARIES)'; test -n "$(securelibdir)" || list=; \
-+ list2=; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-- 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"; \
-+ list2="$$list2 $$p"; \
- else :; fi; \
-- done
-+ done; \
-+ test -z "$$list2" || { \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(securelibdir)'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(securelibdir)"; \
-+ }
-
- uninstall-securelibLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-+ @list='$(securelib_LTLIBRARIES)'; test -n "$(securelibdir)" || list=; \
-+ for p in $$list; do \
-+ $(am__strip_dir) \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$f'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$f"; \
- done
-
- clean-securelibLTLIBRARIES:
-@@ -346,21 +371,21 @@
-
- .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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @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 $@ $<
-@@ -370,127 +395,116 @@
-
- clean-libtool:
- -rm -rf .libs _libs
--install-man5: $(man5_MANS) $(man_MANS)
-+install-man5: $(man_MANS)
- @$(NORMAL_INSTALL)
- 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 \
-- case "$$i" in \
-- *.5*) list="$$list $$i" ;; \
-- esac; \
-+ @list=''; test -n "$(man5dir)" || exit 0; \
-+ { for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.5[a-z]*$$/p'; \
-+ } | while read p; do \
-+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-+ echo "$$d$$p"; echo "$$p"; \
-+ done | \
-+ sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^5][0-9a-z]*$$,5,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
-+ sed 'N;N;s,\n, ,g' | { \
-+ list=; while read file base inst; do \
-+ if test "$$base" = "$$inst"; then list="$$list $$file"; else \
-+ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man5dir)/$$inst'"; \
-+ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man5dir)/$$inst" || exit $$?; \
-+ fi; \
+@@ -385,8 +387,8 @@
+ esac; \
done; \
-- for i in $$list; do \
+ for i in $$list; do \
- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
- else file=$$i; fi; \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 5*) ;; \
-- *) ext='5' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man5dir)/$$inst'"; \
-- $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man5dir)/$$inst"; \
-- done
-+ for i in $$list; do echo "$$i"; done | $(am__base_list) | \
-+ while read files; do \
-+ test -z "$$files" || { \
-+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man5dir)'"; \
-+ $(INSTALL_DATA) $$files "$(DESTDIR)$(man5dir)" || exit $$?; }; \
-+ done; }
-+
- uninstall-man5:
- @$(NORMAL_UNINSTALL)
-- @list='$(man5_MANS) $(dist_man5_MANS) $(nodist_man5_MANS)'; \
-- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-- for i in $$l2; do \
-- case "$$i" in \
-- *.5*) list="$$list $$i" ;; \
-- esac; \
-- done; \
-- for i in $$list; do \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 5*) ;; \
-- *) ext='5' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " rm -f '$(DESTDIR)$(man5dir)/$$inst'"; \
-- rm -f "$(DESTDIR)$(man5dir)/$$inst"; \
-- done
--install-man8: $(man8_MANS) $(man_MANS)
-+ @list=''; test -n "$(man5dir)" || exit 0; \
-+ files=`{ for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.5[a-z]*$$/p'; \
-+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^5][0-9a-z]*$$,5,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-+ test -z "$$files" || { \
-+ echo " ( cd '$(DESTDIR)$(man5dir)' && rm -f" $$files ")"; \
-+ cd "$(DESTDIR)$(man5dir)" && rm -f $$files; }
-+install-man8: $(man_MANS)
- @$(NORMAL_INSTALL)
- 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 \
-- case "$$i" in \
-- *.8*) list="$$list $$i" ;; \
-- esac; \
-+ @list=''; test -n "$(man8dir)" || exit 0; \
-+ { for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.8[a-z]*$$/p'; \
-+ } | while read p; do \
-+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-+ echo "$$d$$p"; echo "$$p"; \
-+ done | \
-+ sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
-+ sed 'N;N;s,\n, ,g' | { \
-+ list=; while read file base inst; do \
-+ if test "$$base" = "$$inst"; then list="$$list $$file"; else \
-+ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-+ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst" || exit $$?; \
-+ fi; \
++ if test -f $$i; then file=$$i; \
++ else file=$(srcdir)/$$i; fi; \
+ ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+ case "$$ext" in \
+ 5*) ;; \
+@@ -430,8 +432,8 @@
+ esac; \
done; \
-- for i in $$list; do \
+ for i in $$list; do \
- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
- else file=$$i; fi; \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 8*) ;; \
-- *) ext='8' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-- $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \
-- done
-+ for i in $$list; do echo "$$i"; done | $(am__base_list) | \
-+ while read files; do \
-+ test -z "$$files" || { \
-+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man8dir)'"; \
-+ $(INSTALL_DATA) $$files "$(DESTDIR)$(man8dir)" || exit $$?; }; \
-+ done; }
-+
- uninstall-man8:
- @$(NORMAL_UNINSTALL)
-- @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
-- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-- for i in $$l2; do \
-- case "$$i" in \
-- *.8*) list="$$list $$i" ;; \
-- esac; \
-- done; \
-- for i in $$list; do \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 8*) ;; \
-- *) ext='8' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \
-- rm -f "$(DESTDIR)$(man8dir)/$$inst"; \
-- done
-+ @list=''; test -n "$(man8dir)" || exit 0; \
-+ files=`{ for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.8[a-z]*$$/p'; \
-+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-+ test -z "$$files" || { \
-+ echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \
-+ cd "$(DESTDIR)$(man8dir)" && rm -f $$files; }
- install-secureconfDATA: $(secureconf_DATA)
- @$(NORMAL_INSTALL)
- test -z "$(secureconfdir)" || $(MKDIR_P) "$(DESTDIR)$(secureconfdir)"
-- @list='$(secureconf_DATA)'; for p in $$list; do \
-+ @list='$(secureconf_DATA)'; test -n "$(secureconfdir)" || list=; \
-+ for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-- echo " $(secureconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(secureconfdir)/$$f'"; \
-- $(secureconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(secureconfdir)/$$f"; \
-+ echo "$$d$$p"; \
-+ done | $(am__base_list) | \
-+ while read files; do \
-+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(secureconfdir)'"; \
-+ $(INSTALL_DATA) $$files "$(DESTDIR)$(secureconfdir)" || exit $$?; \
- done
-
- uninstall-secureconfDATA:
- @$(NORMAL_UNINSTALL)
-- @list='$(secureconf_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-- echo " rm -f '$(DESTDIR)$(secureconfdir)/$$f'"; \
-- rm -f "$(DESTDIR)$(secureconfdir)/$$f"; \
-- done
-+ @list='$(secureconf_DATA)'; test -n "$(secureconfdir)" || list=; \
-+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-+ test -n "$$files" || exit 0; \
-+ echo " ( cd '$(DESTDIR)$(secureconfdir)' && rm -f" $$files ")"; \
-+ cd "$(DESTDIR)$(secureconfdir)" && rm -f $$files
-
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
++ if test -f $$i; then file=$$i; \
++ else file=$(srcdir)/$$i; fi; \
+ ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+ case "$$ext" in \
+ 8*) ;; \
+@@ -487,7 +489,7 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -33919,56 +22996,7 @@ Index: pam.debian/modules/pam_limits/Makefile.in
END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
-+ set x; \
- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -498,37 +512,43 @@
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ shift; \
-+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
-- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique; \
-+ if test $$# -gt 0; then \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ "$$@" $$unique; \
-+ else \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$unique; \
-+ fi; \
- fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
- 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; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+ test -z "$(CTAGS_ARGS)$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-- $$tags $$unique
-+ $$unique
-
- GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
-- && cd $(top_srcdir) \
-- && gtags -i $(GTAGS_ARGS) $$here
-+ && $(am__cd) $(top_srcdir) \
-+ && gtags -i $(GTAGS_ARGS) "$$here"
-
- distclean-tags:
+@@ -530,7 +532,7 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
check-TESTS: $(TESTS)
@@ -33976,11 +23004,8 @@ Index: pam.debian/modules/pam_limits/Makefile.in
+ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
srcdir=$(srcdir); export srcdir; \
list=' $(TESTS) '; \
-+ $(am__tty_colors); \
if test -n "$$list"; then \
- for tst in $$list; do \
- if test -f ./$$tst; then dir=./; \
-@@ -537,49 +557,63 @@
+@@ -541,7 +543,7 @@
if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
@@ -33988,35 +23013,19 @@ Index: pam.debian/modules/pam_limits/Makefile.in
+ *[\ \ ]$$tst[\ \ ]*) \
xpass=`expr $$xpass + 1`; \
failed=`expr $$failed + 1`; \
-- echo "XPASS: $$tst"; \
-+ col=$$red; res=XPASS; \
- ;; \
- *) \
-- echo "PASS: $$tst"; \
-+ col=$$grn; res=PASS; \
- ;; \
- esac; \
+ echo "XPASS: $$tst"; \
+@@ -553,7 +555,7 @@
elif test $$? -ne 77; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
- *$$ws$$tst$$ws*) \
+ *[\ \ ]$$tst[\ \ ]*) \
xfail=`expr $$xfail + 1`; \
-- echo "XFAIL: $$tst"; \
-+ col=$$lgn; res=XFAIL; \
- ;; \
- *) \
- failed=`expr $$failed + 1`; \
-- echo "FAIL: $$tst"; \
-+ col=$$red; res=FAIL; \
+ echo "XFAIL: $$tst"; \
;; \
- esac; \
- else \
- skip=`expr $$skip + 1`; \
-- echo "SKIP: $$tst"; \
-+ col=$$blu; res=SKIP; \
+@@ -567,23 +569,36 @@
+ echo "SKIP: $$tst"; \
fi; \
-+ echo "$${col}$$res$${std}: $$tst"; \
done; \
+ if test "$$all" -eq 1; then \
+ tests="test"; \
@@ -34056,22 +23065,7 @@ Index: pam.debian/modules/pam_limits/Makefile.in
test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
dashes="$$skipped"; \
fi; \
-@@ -590,15 +624,32 @@
- dashes="$$report"; \
- fi; \
- dashes=`echo "$$dashes" | sed s/./=/g`; \
-- echo "$$dashes"; \
-+ if test "$$failed" -eq 0; then \
-+ echo "$$grn$$dashes"; \
-+ else \
-+ echo "$$red$$dashes"; \
-+ fi; \
- echo "$$banner"; \
- test -z "$$skipped" || echo "$$skipped"; \
- test -z "$$report" || echo "$$report"; \
-- echo "$$dashes"; \
-+ echo "$$dashes$$std"; \
- test "$$failed" -eq 0; \
+@@ -603,6 +618,19 @@
else :; fi
distdir: $(DISTFILES)
@@ -34091,37 +23085,7 @@ Index: pam.debian/modules/pam_limits/Makefile.in
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
-@@ -614,13 +665,17 @@
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-+ if test -d "$(distdir)/$$file"; then \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+ fi; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
-- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
- else \
-- test -f $(distdir)/$$file \
-- || cp -p $$d/$$file $(distdir)/$$file \
-+ test -f "$(distdir)/$$file" \
-+ || cp -p $$d/$$file "$(distdir)/$$file" \
- || exit 1; \
- fi; \
- done
-@@ -653,6 +708,7 @@
-
- distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -675,6 +731,8 @@
+@@ -679,6 +707,8 @@
html: html-am
@@ -34130,7 +23094,7 @@ Index: pam.debian/modules/pam_limits/Makefile.in
info: info-am
info-am:
-@@ -684,18 +742,28 @@
+@@ -688,18 +718,28 @@
install-dvi: install-dvi-am
@@ -34159,30 +23123,13 @@ Index: pam.debian/modules/pam_limits/Makefile.in
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -721,7 +789,7 @@
-
- uninstall-man: uninstall-man5 uninstall-man8
-
--.MAKE: install-am install-strip
-+.MAKE: check-am install-am install-strip
-
- .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
- clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
-@@ -746,6 +814,7 @@
-
- install-data-local:
- mkdir -p $(DESTDIR)$(limits_conf_dir)
-+
- # 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.
- .NOEXPORT:
-Index: pam.debian/modules/pam_listfile/Makefile.in
+Index: pam.deb/modules/pam_listfile/Makefile.in
===================================================================
---- pam.debian.orig/modules/pam_listfile/Makefile.in
-+++ pam.debian/modules/pam_listfile/Makefile.in
+--- pam.deb.orig/modules/pam_listfile/Makefile.in
++++ pam.deb/modules/pam_listfile/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -34192,67 +23139,7 @@ Index: pam.debian/modules/pam_listfile/Makefile.in
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -21,8 +22,9 @@
-
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
--pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkglibexecdir = $(libexecdir)/@PACKAGE@
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
-@@ -58,14 +60,29 @@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
-+CONFIG_CLEAN_VPATH_FILES =
- am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
- am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-+am__install_max = 40
-+am__nobase_strip_setup = \
-+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-+am__nobase_strip = \
-+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-+am__nobase_list = $(am__nobase_strip_setup); \
-+ for p in $$list; do echo "$$p $$p"; done | \
-+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-+ if (++n[$$2] == $(am__install_max)) \
-+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-+ END { for (dir in files) print dir, files[dir] }'
-+am__base_list = \
-+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
- am__installdirs = "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man8dir)"
--securelibLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(securelib_LTLIBRARIES)
- pam_listfile_la_DEPENDENCIES =
- pam_listfile_la_SOURCES = pam_listfile.c
-@@ -73,6 +90,7 @@
- DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
-+am__mv = mv -f
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-@@ -90,6 +108,8 @@
- DATA = $(noinst_DATA)
- ETAGS = etags
- CTAGS = ctags
-+am__tty_colors = \
-+red=; grn=; lgn=; blu=; std=
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- AMTAR = @AMTAR@
-@@ -174,6 +194,7 @@
+@@ -176,6 +177,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -34260,7 +23147,7 @@ Index: pam.debian/modules/pam_listfile/Makefile.in
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PIE_CFLAGS = @PIE_CFLAGS@
-@@ -273,14 +294,14 @@
+@@ -277,8 +279,8 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -34271,163 +23158,18 @@ Index: pam.debian/modules/pam_listfile/Makefile.in
exit 1;; \
esac; \
done; \
-- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/pam_listfile/Makefile'; \
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu modules/pam_listfile/Makefile
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/pam_listfile/Makefile'; \
-+ $(am__cd) $(top_srcdir) && \
-+ $(AUTOMAKE) --gnu modules/pam_listfile/Makefile
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
-@@ -298,23 +319,28 @@
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- $(ACLOCAL_M4): $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(am__aclocal_m4_deps):
- install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
- @$(NORMAL_INSTALL)
- test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
-- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-+ @list='$(securelib_LTLIBRARIES)'; test -n "$(securelibdir)" || list=; \
-+ list2=; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-- 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"; \
-+ list2="$$list2 $$p"; \
- else :; fi; \
-- done
-+ done; \
-+ test -z "$$list2" || { \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(securelibdir)'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(securelibdir)"; \
-+ }
-
- uninstall-securelibLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-+ @list='$(securelib_LTLIBRARIES)'; test -n "$(securelibdir)" || list=; \
-+ for p in $$list; do \
-+ $(am__strip_dir) \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$f'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$f"; \
- done
-
- clean-securelibLTLIBRARIES:
-@@ -338,21 +364,21 @@
-
- .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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @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,65 +388,58 @@
-
- clean-libtool:
- -rm -rf .libs _libs
--install-man8: $(man8_MANS) $(man_MANS)
-+install-man8: $(man_MANS)
- @$(NORMAL_INSTALL)
- 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 \
-- case "$$i" in \
-- *.8*) list="$$list $$i" ;; \
-- esac; \
-+ @list=''; test -n "$(man8dir)" || exit 0; \
-+ { for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.8[a-z]*$$/p'; \
-+ } | while read p; do \
-+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-+ echo "$$d$$p"; echo "$$p"; \
-+ done | \
-+ sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
-+ sed 'N;N;s,\n, ,g' | { \
-+ list=; while read file base inst; do \
-+ if test "$$base" = "$$inst"; then list="$$list $$file"; else \
-+ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-+ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst" || exit $$?; \
-+ fi; \
+@@ -377,8 +379,8 @@
+ esac; \
done; \
-- for i in $$list; do \
+ for i in $$list; do \
- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
- else file=$$i; fi; \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 8*) ;; \
-- *) ext='8' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-- $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \
-- done
-+ for i in $$list; do echo "$$i"; done | $(am__base_list) | \
-+ while read files; do \
-+ test -z "$$files" || { \
-+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man8dir)'"; \
-+ $(INSTALL_DATA) $$files "$(DESTDIR)$(man8dir)" || exit $$?; }; \
-+ done; }
-+
- uninstall-man8:
- @$(NORMAL_UNINSTALL)
-- @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
-- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-- for i in $$l2; do \
-- case "$$i" in \
-- *.8*) list="$$list $$i" ;; \
-- esac; \
-- done; \
-- for i in $$list; do \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 8*) ;; \
-- *) ext='8' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \
-- rm -f "$(DESTDIR)$(man8dir)/$$inst"; \
-- done
-+ @list=''; test -n "$(man8dir)" || exit 0; \
-+ files=`{ for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.8[a-z]*$$/p'; \
-+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-+ test -z "$$files" || { \
-+ echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \
-+ cd "$(DESTDIR)$(man8dir)" && rm -f $$files; }
-
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
++ if test -f $$i; then file=$$i; \
++ else file=$(srcdir)/$$i; fi; \
+ ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+ case "$$ext" in \
+ 8*) ;; \
+@@ -417,7 +419,7 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -34436,56 +23178,7 @@ Index: pam.debian/modules/pam_listfile/Makefile.in
END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
-+ set x; \
- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -428,37 +447,43 @@
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ shift; \
-+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
-- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique; \
-+ if test $$# -gt 0; then \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ "$$@" $$unique; \
-+ else \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$unique; \
-+ fi; \
- fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
- 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; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+ test -z "$(CTAGS_ARGS)$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-- $$tags $$unique
-+ $$unique
-
- GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
-- && cd $(top_srcdir) \
-- && gtags -i $(GTAGS_ARGS) $$here
-+ && $(am__cd) $(top_srcdir) \
-+ && gtags -i $(GTAGS_ARGS) "$$here"
-
- distclean-tags:
+@@ -460,7 +462,7 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
check-TESTS: $(TESTS)
@@ -34493,11 +23186,8 @@ Index: pam.debian/modules/pam_listfile/Makefile.in
+ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
srcdir=$(srcdir); export srcdir; \
list=' $(TESTS) '; \
-+ $(am__tty_colors); \
if test -n "$$list"; then \
- for tst in $$list; do \
- if test -f ./$$tst; then dir=./; \
-@@ -467,49 +492,63 @@
+@@ -471,7 +473,7 @@
if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
@@ -34505,35 +23195,19 @@ Index: pam.debian/modules/pam_listfile/Makefile.in
+ *[\ \ ]$$tst[\ \ ]*) \
xpass=`expr $$xpass + 1`; \
failed=`expr $$failed + 1`; \
-- echo "XPASS: $$tst"; \
-+ col=$$red; res=XPASS; \
- ;; \
- *) \
-- echo "PASS: $$tst"; \
-+ col=$$grn; res=PASS; \
- ;; \
- esac; \
+ echo "XPASS: $$tst"; \
+@@ -483,7 +485,7 @@
elif test $$? -ne 77; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
- *$$ws$$tst$$ws*) \
+ *[\ \ ]$$tst[\ \ ]*) \
xfail=`expr $$xfail + 1`; \
-- echo "XFAIL: $$tst"; \
-+ col=$$lgn; res=XFAIL; \
- ;; \
- *) \
- failed=`expr $$failed + 1`; \
-- echo "FAIL: $$tst"; \
-+ col=$$red; res=FAIL; \
+ echo "XFAIL: $$tst"; \
;; \
- esac; \
- else \
- skip=`expr $$skip + 1`; \
-- echo "SKIP: $$tst"; \
-+ col=$$blu; res=SKIP; \
+@@ -497,23 +499,36 @@
+ echo "SKIP: $$tst"; \
fi; \
-+ echo "$${col}$$res$${std}: $$tst"; \
done; \
+ if test "$$all" -eq 1; then \
+ tests="test"; \
@@ -34573,22 +23247,7 @@ Index: pam.debian/modules/pam_listfile/Makefile.in
test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
dashes="$$skipped"; \
fi; \
-@@ -520,15 +559,32 @@
- dashes="$$report"; \
- fi; \
- dashes=`echo "$$dashes" | sed s/./=/g`; \
-- echo "$$dashes"; \
-+ if test "$$failed" -eq 0; then \
-+ echo "$$grn$$dashes"; \
-+ else \
-+ echo "$$red$$dashes"; \
-+ fi; \
- echo "$$banner"; \
- test -z "$$skipped" || echo "$$skipped"; \
- test -z "$$report" || echo "$$report"; \
-- echo "$$dashes"; \
-+ echo "$$dashes$$std"; \
- test "$$failed" -eq 0; \
+@@ -533,6 +548,19 @@
else :; fi
distdir: $(DISTFILES)
@@ -34608,37 +23267,7 @@ Index: pam.debian/modules/pam_listfile/Makefile.in
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
-@@ -544,13 +600,17 @@
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-+ if test -d "$(distdir)/$$file"; then \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+ fi; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
-- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
- else \
-- test -f $(distdir)/$$file \
-- || cp -p $$d/$$file $(distdir)/$$file \
-+ test -f "$(distdir)/$$file" \
-+ || cp -p $$d/$$file "$(distdir)/$$file" \
- || exit 1; \
- fi; \
- done
-@@ -583,6 +643,7 @@
-
- distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -605,6 +666,8 @@
+@@ -609,6 +637,8 @@
html: html-am
@@ -34647,7 +23276,7 @@ Index: pam.debian/modules/pam_listfile/Makefile.in
info: info-am
info-am:
-@@ -613,18 +676,28 @@
+@@ -617,18 +647,28 @@
install-dvi: install-dvi-am
@@ -34676,30 +23305,13 @@ Index: pam.debian/modules/pam_listfile/Makefile.in
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -649,7 +722,7 @@
-
- uninstall-man: uninstall-man8
-
--.MAKE: install-am install-strip
-+.MAKE: check-am install-am install-strip
-
- .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
- clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
-@@ -669,6 +742,7 @@
-
- @ENABLE_REGENERATE_MAN_TRUE@README: pam_listfile.8.xml
- @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
-+
- # 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.
- .NOEXPORT:
-Index: pam.debian/modules/pam_localuser/Makefile.in
+Index: pam.deb/modules/pam_localuser/Makefile.in
===================================================================
---- pam.debian.orig/modules/pam_localuser/Makefile.in
-+++ pam.debian/modules/pam_localuser/Makefile.in
+--- pam.deb.orig/modules/pam_localuser/Makefile.in
++++ pam.deb/modules/pam_localuser/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -34709,67 +23321,7 @@ Index: pam.debian/modules/pam_localuser/Makefile.in
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -21,8 +22,9 @@
-
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
--pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkglibexecdir = $(libexecdir)/@PACKAGE@
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
-@@ -58,14 +60,29 @@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
-+CONFIG_CLEAN_VPATH_FILES =
- am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
- am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-+am__install_max = 40
-+am__nobase_strip_setup = \
-+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-+am__nobase_strip = \
-+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-+am__nobase_list = $(am__nobase_strip_setup); \
-+ for p in $$list; do echo "$$p $$p"; done | \
-+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-+ if (++n[$$2] == $(am__install_max)) \
-+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-+ END { for (dir in files) print dir, files[dir] }'
-+am__base_list = \
-+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
- am__installdirs = "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man8dir)"
--securelibLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(securelib_LTLIBRARIES)
- pam_localuser_la_DEPENDENCIES =
- pam_localuser_la_SOURCES = pam_localuser.c
-@@ -73,6 +90,7 @@
- DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
-+am__mv = mv -f
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-@@ -90,6 +108,8 @@
- DATA = $(noinst_DATA)
- ETAGS = etags
- CTAGS = ctags
-+am__tty_colors = \
-+red=; grn=; lgn=; blu=; std=
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- AMTAR = @AMTAR@
-@@ -174,6 +194,7 @@
+@@ -176,6 +177,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -34777,7 +23329,7 @@ Index: pam.debian/modules/pam_localuser/Makefile.in
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PIE_CFLAGS = @PIE_CFLAGS@
-@@ -273,14 +294,14 @@
+@@ -277,8 +279,8 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -34788,163 +23340,18 @@ Index: pam.debian/modules/pam_localuser/Makefile.in
exit 1;; \
esac; \
done; \
-- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/pam_localuser/Makefile'; \
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu modules/pam_localuser/Makefile
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/pam_localuser/Makefile'; \
-+ $(am__cd) $(top_srcdir) && \
-+ $(AUTOMAKE) --gnu modules/pam_localuser/Makefile
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
-@@ -298,23 +319,28 @@
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- $(ACLOCAL_M4): $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(am__aclocal_m4_deps):
- install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
- @$(NORMAL_INSTALL)
- test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
-- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-+ @list='$(securelib_LTLIBRARIES)'; test -n "$(securelibdir)" || list=; \
-+ list2=; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-- 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"; \
-+ list2="$$list2 $$p"; \
- else :; fi; \
-- done
-+ done; \
-+ test -z "$$list2" || { \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(securelibdir)'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(securelibdir)"; \
-+ }
-
- uninstall-securelibLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-+ @list='$(securelib_LTLIBRARIES)'; test -n "$(securelibdir)" || list=; \
-+ for p in $$list; do \
-+ $(am__strip_dir) \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$f'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$f"; \
- done
-
- clean-securelibLTLIBRARIES:
-@@ -338,21 +364,21 @@
-
- .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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @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,65 +388,58 @@
-
- clean-libtool:
- -rm -rf .libs _libs
--install-man8: $(man8_MANS) $(man_MANS)
-+install-man8: $(man_MANS)
- @$(NORMAL_INSTALL)
- 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 \
-- case "$$i" in \
-- *.8*) list="$$list $$i" ;; \
-- esac; \
-+ @list=''; test -n "$(man8dir)" || exit 0; \
-+ { for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.8[a-z]*$$/p'; \
-+ } | while read p; do \
-+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-+ echo "$$d$$p"; echo "$$p"; \
-+ done | \
-+ sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
-+ sed 'N;N;s,\n, ,g' | { \
-+ list=; while read file base inst; do \
-+ if test "$$base" = "$$inst"; then list="$$list $$file"; else \
-+ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-+ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst" || exit $$?; \
-+ fi; \
+@@ -377,8 +379,8 @@
+ esac; \
done; \
-- for i in $$list; do \
+ for i in $$list; do \
- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
- else file=$$i; fi; \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 8*) ;; \
-- *) ext='8' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-- $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \
-- done
-+ for i in $$list; do echo "$$i"; done | $(am__base_list) | \
-+ while read files; do \
-+ test -z "$$files" || { \
-+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man8dir)'"; \
-+ $(INSTALL_DATA) $$files "$(DESTDIR)$(man8dir)" || exit $$?; }; \
-+ done; }
-+
- uninstall-man8:
- @$(NORMAL_UNINSTALL)
-- @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
-- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-- for i in $$l2; do \
-- case "$$i" in \
-- *.8*) list="$$list $$i" ;; \
-- esac; \
-- done; \
-- for i in $$list; do \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 8*) ;; \
-- *) ext='8' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \
-- rm -f "$(DESTDIR)$(man8dir)/$$inst"; \
-- done
-+ @list=''; test -n "$(man8dir)" || exit 0; \
-+ files=`{ for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.8[a-z]*$$/p'; \
-+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-+ test -z "$$files" || { \
-+ echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \
-+ cd "$(DESTDIR)$(man8dir)" && rm -f $$files; }
-
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
++ if test -f $$i; then file=$$i; \
++ else file=$(srcdir)/$$i; fi; \
+ ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+ case "$$ext" in \
+ 8*) ;; \
+@@ -417,7 +419,7 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -34953,56 +23360,7 @@ Index: pam.debian/modules/pam_localuser/Makefile.in
END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
-+ set x; \
- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -428,37 +447,43 @@
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ shift; \
-+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
-- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique; \
-+ if test $$# -gt 0; then \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ "$$@" $$unique; \
-+ else \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$unique; \
-+ fi; \
- fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
- 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; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+ test -z "$(CTAGS_ARGS)$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-- $$tags $$unique
-+ $$unique
-
- GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
-- && cd $(top_srcdir) \
-- && gtags -i $(GTAGS_ARGS) $$here
-+ && $(am__cd) $(top_srcdir) \
-+ && gtags -i $(GTAGS_ARGS) "$$here"
-
- distclean-tags:
+@@ -460,7 +462,7 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
check-TESTS: $(TESTS)
@@ -35010,11 +23368,8 @@ Index: pam.debian/modules/pam_localuser/Makefile.in
+ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
srcdir=$(srcdir); export srcdir; \
list=' $(TESTS) '; \
-+ $(am__tty_colors); \
if test -n "$$list"; then \
- for tst in $$list; do \
- if test -f ./$$tst; then dir=./; \
-@@ -467,49 +492,63 @@
+@@ -471,7 +473,7 @@
if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
@@ -35022,35 +23377,19 @@ Index: pam.debian/modules/pam_localuser/Makefile.in
+ *[\ \ ]$$tst[\ \ ]*) \
xpass=`expr $$xpass + 1`; \
failed=`expr $$failed + 1`; \
-- echo "XPASS: $$tst"; \
-+ col=$$red; res=XPASS; \
- ;; \
- *) \
-- echo "PASS: $$tst"; \
-+ col=$$grn; res=PASS; \
- ;; \
- esac; \
+ echo "XPASS: $$tst"; \
+@@ -483,7 +485,7 @@
elif test $$? -ne 77; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
- *$$ws$$tst$$ws*) \
+ *[\ \ ]$$tst[\ \ ]*) \
xfail=`expr $$xfail + 1`; \
-- echo "XFAIL: $$tst"; \
-+ col=$$lgn; res=XFAIL; \
+ echo "XFAIL: $$tst"; \
;; \
- *) \
- failed=`expr $$failed + 1`; \
-- echo "FAIL: $$tst"; \
-+ col=$$red; res=FAIL; \
- ;; \
- esac; \
- else \
- skip=`expr $$skip + 1`; \
-- echo "SKIP: $$tst"; \
-+ col=$$blu; res=SKIP; \
+@@ -497,23 +499,36 @@
+ echo "SKIP: $$tst"; \
fi; \
-+ echo "$${col}$$res$${std}: $$tst"; \
done; \
+ if test "$$all" -eq 1; then \
+ tests="test"; \
@@ -35090,22 +23429,7 @@ Index: pam.debian/modules/pam_localuser/Makefile.in
test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
dashes="$$skipped"; \
fi; \
-@@ -520,15 +559,32 @@
- dashes="$$report"; \
- fi; \
- dashes=`echo "$$dashes" | sed s/./=/g`; \
-- echo "$$dashes"; \
-+ if test "$$failed" -eq 0; then \
-+ echo "$$grn$$dashes"; \
-+ else \
-+ echo "$$red$$dashes"; \
-+ fi; \
- echo "$$banner"; \
- test -z "$$skipped" || echo "$$skipped"; \
- test -z "$$report" || echo "$$report"; \
-- echo "$$dashes"; \
-+ echo "$$dashes$$std"; \
- test "$$failed" -eq 0; \
+@@ -533,6 +548,19 @@
else :; fi
distdir: $(DISTFILES)
@@ -35125,37 +23449,7 @@ Index: pam.debian/modules/pam_localuser/Makefile.in
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
-@@ -544,13 +600,17 @@
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-+ if test -d "$(distdir)/$$file"; then \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+ fi; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
-- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
- else \
-- test -f $(distdir)/$$file \
-- || cp -p $$d/$$file $(distdir)/$$file \
-+ test -f "$(distdir)/$$file" \
-+ || cp -p $$d/$$file "$(distdir)/$$file" \
- || exit 1; \
- fi; \
- done
-@@ -583,6 +643,7 @@
-
- distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -605,6 +666,8 @@
+@@ -609,6 +637,8 @@
html: html-am
@@ -35164,7 +23458,7 @@ Index: pam.debian/modules/pam_localuser/Makefile.in
info: info-am
info-am:
-@@ -613,18 +676,28 @@
+@@ -617,18 +647,28 @@
install-dvi: install-dvi-am
@@ -35193,30 +23487,13 @@ Index: pam.debian/modules/pam_localuser/Makefile.in
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -649,7 +722,7 @@
-
- uninstall-man: uninstall-man8
-
--.MAKE: install-am install-strip
-+.MAKE: check-am install-am install-strip
-
- .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
- clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
-@@ -669,6 +742,7 @@
-
- @ENABLE_REGENERATE_MAN_TRUE@README: pam_localuser.8.xml
- @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
-+
- # 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.
- .NOEXPORT:
-Index: pam.debian/modules/pam_loginuid/Makefile.in
+Index: pam.deb/modules/pam_loginuid/Makefile.in
===================================================================
---- pam.debian.orig/modules/pam_loginuid/Makefile.in
-+++ pam.debian/modules/pam_loginuid/Makefile.in
+--- pam.deb.orig/modules/pam_loginuid/Makefile.in
++++ pam.deb/modules/pam_loginuid/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -35226,67 +23503,7 @@ Index: pam.debian/modules/pam_loginuid/Makefile.in
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -21,8 +22,9 @@
-
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
--pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkglibexecdir = $(libexecdir)/@PACKAGE@
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
-@@ -58,14 +60,29 @@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
-+CONFIG_CLEAN_VPATH_FILES =
- am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
- am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-+am__install_max = 40
-+am__nobase_strip_setup = \
-+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-+am__nobase_strip = \
-+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-+am__nobase_list = $(am__nobase_strip_setup); \
-+ for p in $$list; do echo "$$p $$p"; done | \
-+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-+ if (++n[$$2] == $(am__install_max)) \
-+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-+ END { for (dir in files) print dir, files[dir] }'
-+am__base_list = \
-+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
- am__installdirs = "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man8dir)"
--securelibLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(securelib_LTLIBRARIES)
- pam_loginuid_la_DEPENDENCIES =
- pam_loginuid_la_SOURCES = pam_loginuid.c
-@@ -73,6 +90,7 @@
- DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
-+am__mv = mv -f
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-@@ -90,6 +108,8 @@
- DATA = $(noinst_DATA)
- ETAGS = etags
- CTAGS = ctags
-+am__tty_colors = \
-+red=; grn=; lgn=; blu=; std=
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- AMTAR = @AMTAR@
-@@ -174,6 +194,7 @@
+@@ -176,6 +177,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -35294,7 +23511,7 @@ Index: pam.debian/modules/pam_loginuid/Makefile.in
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PIE_CFLAGS = @PIE_CFLAGS@
-@@ -273,14 +294,14 @@
+@@ -277,8 +279,8 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -35305,163 +23522,18 @@ Index: pam.debian/modules/pam_loginuid/Makefile.in
exit 1;; \
esac; \
done; \
-- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/pam_loginuid/Makefile'; \
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu modules/pam_loginuid/Makefile
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/pam_loginuid/Makefile'; \
-+ $(am__cd) $(top_srcdir) && \
-+ $(AUTOMAKE) --gnu modules/pam_loginuid/Makefile
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
-@@ -298,23 +319,28 @@
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- $(ACLOCAL_M4): $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(am__aclocal_m4_deps):
- install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
- @$(NORMAL_INSTALL)
- test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
-- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-+ @list='$(securelib_LTLIBRARIES)'; test -n "$(securelibdir)" || list=; \
-+ list2=; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-- 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"; \
-+ list2="$$list2 $$p"; \
- else :; fi; \
-- done
-+ done; \
-+ test -z "$$list2" || { \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(securelibdir)'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(securelibdir)"; \
-+ }
-
- uninstall-securelibLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-+ @list='$(securelib_LTLIBRARIES)'; test -n "$(securelibdir)" || list=; \
-+ for p in $$list; do \
-+ $(am__strip_dir) \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$f'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$f"; \
- done
-
- clean-securelibLTLIBRARIES:
-@@ -338,21 +364,21 @@
-
- .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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @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,65 +388,58 @@
-
- clean-libtool:
- -rm -rf .libs _libs
--install-man8: $(man8_MANS) $(man_MANS)
-+install-man8: $(man_MANS)
- @$(NORMAL_INSTALL)
- 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 \
-- case "$$i" in \
-- *.8*) list="$$list $$i" ;; \
-- esac; \
-+ @list=''; test -n "$(man8dir)" || exit 0; \
-+ { for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.8[a-z]*$$/p'; \
-+ } | while read p; do \
-+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-+ echo "$$d$$p"; echo "$$p"; \
-+ done | \
-+ sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
-+ sed 'N;N;s,\n, ,g' | { \
-+ list=; while read file base inst; do \
-+ if test "$$base" = "$$inst"; then list="$$list $$file"; else \
-+ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-+ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst" || exit $$?; \
-+ fi; \
+@@ -377,8 +379,8 @@
+ esac; \
done; \
-- for i in $$list; do \
+ for i in $$list; do \
- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
- else file=$$i; fi; \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 8*) ;; \
-- *) ext='8' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-- $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \
-- done
-+ for i in $$list; do echo "$$i"; done | $(am__base_list) | \
-+ while read files; do \
-+ test -z "$$files" || { \
-+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man8dir)'"; \
-+ $(INSTALL_DATA) $$files "$(DESTDIR)$(man8dir)" || exit $$?; }; \
-+ done; }
-+
- uninstall-man8:
- @$(NORMAL_UNINSTALL)
-- @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
-- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-- for i in $$l2; do \
-- case "$$i" in \
-- *.8*) list="$$list $$i" ;; \
-- esac; \
-- done; \
-- for i in $$list; do \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 8*) ;; \
-- *) ext='8' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \
-- rm -f "$(DESTDIR)$(man8dir)/$$inst"; \
-- done
-+ @list=''; test -n "$(man8dir)" || exit 0; \
-+ files=`{ for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.8[a-z]*$$/p'; \
-+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-+ test -z "$$files" || { \
-+ echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \
-+ cd "$(DESTDIR)$(man8dir)" && rm -f $$files; }
-
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
++ if test -f $$i; then file=$$i; \
++ else file=$(srcdir)/$$i; fi; \
+ ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+ case "$$ext" in \
+ 8*) ;; \
+@@ -417,7 +419,7 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -35470,56 +23542,7 @@ Index: pam.debian/modules/pam_loginuid/Makefile.in
END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
-+ set x; \
- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -428,37 +447,43 @@
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ shift; \
-+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
-- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique; \
-+ if test $$# -gt 0; then \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ "$$@" $$unique; \
-+ else \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$unique; \
-+ fi; \
- fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
- 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; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+ test -z "$(CTAGS_ARGS)$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-- $$tags $$unique
-+ $$unique
-
- GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
-- && cd $(top_srcdir) \
-- && gtags -i $(GTAGS_ARGS) $$here
-+ && $(am__cd) $(top_srcdir) \
-+ && gtags -i $(GTAGS_ARGS) "$$here"
-
- distclean-tags:
+@@ -460,7 +462,7 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
check-TESTS: $(TESTS)
@@ -35527,11 +23550,8 @@ Index: pam.debian/modules/pam_loginuid/Makefile.in
+ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
srcdir=$(srcdir); export srcdir; \
list=' $(TESTS) '; \
-+ $(am__tty_colors); \
if test -n "$$list"; then \
- for tst in $$list; do \
- if test -f ./$$tst; then dir=./; \
-@@ -467,49 +492,63 @@
+@@ -471,7 +473,7 @@
if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
@@ -35539,35 +23559,19 @@ Index: pam.debian/modules/pam_loginuid/Makefile.in
+ *[\ \ ]$$tst[\ \ ]*) \
xpass=`expr $$xpass + 1`; \
failed=`expr $$failed + 1`; \
-- echo "XPASS: $$tst"; \
-+ col=$$red; res=XPASS; \
- ;; \
- *) \
-- echo "PASS: $$tst"; \
-+ col=$$grn; res=PASS; \
- ;; \
- esac; \
+ echo "XPASS: $$tst"; \
+@@ -483,7 +485,7 @@
elif test $$? -ne 77; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
- *$$ws$$tst$$ws*) \
+ *[\ \ ]$$tst[\ \ ]*) \
xfail=`expr $$xfail + 1`; \
-- echo "XFAIL: $$tst"; \
-+ col=$$lgn; res=XFAIL; \
+ echo "XFAIL: $$tst"; \
;; \
- *) \
- failed=`expr $$failed + 1`; \
-- echo "FAIL: $$tst"; \
-+ col=$$red; res=FAIL; \
- ;; \
- esac; \
- else \
- skip=`expr $$skip + 1`; \
-- echo "SKIP: $$tst"; \
-+ col=$$blu; res=SKIP; \
+@@ -497,23 +499,36 @@
+ echo "SKIP: $$tst"; \
fi; \
-+ echo "$${col}$$res$${std}: $$tst"; \
done; \
+ if test "$$all" -eq 1; then \
+ tests="test"; \
@@ -35607,22 +23611,7 @@ Index: pam.debian/modules/pam_loginuid/Makefile.in
test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
dashes="$$skipped"; \
fi; \
-@@ -520,15 +559,32 @@
- dashes="$$report"; \
- fi; \
- dashes=`echo "$$dashes" | sed s/./=/g`; \
-- echo "$$dashes"; \
-+ if test "$$failed" -eq 0; then \
-+ echo "$$grn$$dashes"; \
-+ else \
-+ echo "$$red$$dashes"; \
-+ fi; \
- echo "$$banner"; \
- test -z "$$skipped" || echo "$$skipped"; \
- test -z "$$report" || echo "$$report"; \
-- echo "$$dashes"; \
-+ echo "$$dashes$$std"; \
- test "$$failed" -eq 0; \
+@@ -533,6 +548,19 @@
else :; fi
distdir: $(DISTFILES)
@@ -35642,37 +23631,7 @@ Index: pam.debian/modules/pam_loginuid/Makefile.in
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
-@@ -544,13 +600,17 @@
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-+ if test -d "$(distdir)/$$file"; then \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+ fi; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
-- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
- else \
-- test -f $(distdir)/$$file \
-- || cp -p $$d/$$file $(distdir)/$$file \
-+ test -f "$(distdir)/$$file" \
-+ || cp -p $$d/$$file "$(distdir)/$$file" \
- || exit 1; \
- fi; \
- done
-@@ -583,6 +643,7 @@
-
- distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -605,6 +666,8 @@
+@@ -609,6 +637,8 @@
html: html-am
@@ -35681,7 +23640,7 @@ Index: pam.debian/modules/pam_loginuid/Makefile.in
info: info-am
info-am:
-@@ -613,18 +676,28 @@
+@@ -617,18 +647,28 @@
install-dvi: install-dvi-am
@@ -35710,30 +23669,13 @@ Index: pam.debian/modules/pam_loginuid/Makefile.in
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -649,7 +722,7 @@
-
- uninstall-man: uninstall-man8
-
--.MAKE: install-am install-strip
-+.MAKE: check-am install-am install-strip
-
- .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
- clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
-@@ -671,6 +744,7 @@
- @ENABLE_REGENERATE_MAN_TRUE@README: pam_loginuid.8.xml
-
- @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
-+
- # 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.
- .NOEXPORT:
-Index: pam.debian/modules/pam_mail/Makefile.in
+Index: pam.deb/modules/pam_mail/Makefile.in
===================================================================
---- pam.debian.orig/modules/pam_mail/Makefile.in
-+++ pam.debian/modules/pam_mail/Makefile.in
+--- pam.deb.orig/modules/pam_mail/Makefile.in
++++ pam.deb/modules/pam_mail/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -35743,67 +23685,7 @@ Index: pam.debian/modules/pam_mail/Makefile.in
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -21,8 +22,9 @@
-
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
--pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkglibexecdir = $(libexecdir)/@PACKAGE@
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
-@@ -58,14 +60,29 @@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
-+CONFIG_CLEAN_VPATH_FILES =
- am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
- am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-+am__install_max = 40
-+am__nobase_strip_setup = \
-+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-+am__nobase_strip = \
-+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-+am__nobase_list = $(am__nobase_strip_setup); \
-+ for p in $$list; do echo "$$p $$p"; done | \
-+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-+ if (++n[$$2] == $(am__install_max)) \
-+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-+ END { for (dir in files) print dir, files[dir] }'
-+am__base_list = \
-+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
- am__installdirs = "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man8dir)"
--securelibLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(securelib_LTLIBRARIES)
- pam_mail_la_DEPENDENCIES =
- pam_mail_la_SOURCES = pam_mail.c
-@@ -73,6 +90,7 @@
- DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
-+am__mv = mv -f
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-@@ -90,6 +108,8 @@
- DATA = $(noinst_DATA)
- ETAGS = etags
- CTAGS = ctags
-+am__tty_colors = \
-+red=; grn=; lgn=; blu=; std=
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- AMTAR = @AMTAR@
-@@ -174,6 +194,7 @@
+@@ -176,6 +177,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -35811,7 +23693,7 @@ Index: pam.debian/modules/pam_mail/Makefile.in
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PIE_CFLAGS = @PIE_CFLAGS@
-@@ -273,14 +294,14 @@
+@@ -277,8 +279,8 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -35822,163 +23704,18 @@ Index: pam.debian/modules/pam_mail/Makefile.in
exit 1;; \
esac; \
done; \
-- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/pam_mail/Makefile'; \
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu modules/pam_mail/Makefile
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/pam_mail/Makefile'; \
-+ $(am__cd) $(top_srcdir) && \
-+ $(AUTOMAKE) --gnu modules/pam_mail/Makefile
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
-@@ -298,23 +319,28 @@
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- $(ACLOCAL_M4): $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(am__aclocal_m4_deps):
- install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
- @$(NORMAL_INSTALL)
- test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
-- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-+ @list='$(securelib_LTLIBRARIES)'; test -n "$(securelibdir)" || list=; \
-+ list2=; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-- 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"; \
-+ list2="$$list2 $$p"; \
- else :; fi; \
-- done
-+ done; \
-+ test -z "$$list2" || { \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(securelibdir)'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(securelibdir)"; \
-+ }
-
- uninstall-securelibLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-+ @list='$(securelib_LTLIBRARIES)'; test -n "$(securelibdir)" || list=; \
-+ for p in $$list; do \
-+ $(am__strip_dir) \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$f'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$f"; \
- done
-
- clean-securelibLTLIBRARIES:
-@@ -338,21 +364,21 @@
-
- .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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @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,65 +388,58 @@
-
- clean-libtool:
- -rm -rf .libs _libs
--install-man8: $(man8_MANS) $(man_MANS)
-+install-man8: $(man_MANS)
- @$(NORMAL_INSTALL)
- 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 \
-- case "$$i" in \
-- *.8*) list="$$list $$i" ;; \
-- esac; \
-+ @list=''; test -n "$(man8dir)" || exit 0; \
-+ { for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.8[a-z]*$$/p'; \
-+ } | while read p; do \
-+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-+ echo "$$d$$p"; echo "$$p"; \
-+ done | \
-+ sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
-+ sed 'N;N;s,\n, ,g' | { \
-+ list=; while read file base inst; do \
-+ if test "$$base" = "$$inst"; then list="$$list $$file"; else \
-+ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-+ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst" || exit $$?; \
-+ fi; \
+@@ -377,8 +379,8 @@
+ esac; \
done; \
-- for i in $$list; do \
+ for i in $$list; do \
- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
- else file=$$i; fi; \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 8*) ;; \
-- *) ext='8' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-- $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \
-- done
-+ for i in $$list; do echo "$$i"; done | $(am__base_list) | \
-+ while read files; do \
-+ test -z "$$files" || { \
-+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man8dir)'"; \
-+ $(INSTALL_DATA) $$files "$(DESTDIR)$(man8dir)" || exit $$?; }; \
-+ done; }
-+
- uninstall-man8:
- @$(NORMAL_UNINSTALL)
-- @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
-- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-- for i in $$l2; do \
-- case "$$i" in \
-- *.8*) list="$$list $$i" ;; \
-- esac; \
-- done; \
-- for i in $$list; do \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 8*) ;; \
-- *) ext='8' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \
-- rm -f "$(DESTDIR)$(man8dir)/$$inst"; \
-- done
-+ @list=''; test -n "$(man8dir)" || exit 0; \
-+ files=`{ for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.8[a-z]*$$/p'; \
-+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-+ test -z "$$files" || { \
-+ echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \
-+ cd "$(DESTDIR)$(man8dir)" && rm -f $$files; }
-
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
++ if test -f $$i; then file=$$i; \
++ else file=$(srcdir)/$$i; fi; \
+ ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+ case "$$ext" in \
+ 8*) ;; \
+@@ -417,7 +419,7 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -35987,56 +23724,7 @@ Index: pam.debian/modules/pam_mail/Makefile.in
END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
-+ set x; \
- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -428,37 +447,43 @@
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ shift; \
-+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
-- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique; \
-+ if test $$# -gt 0; then \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ "$$@" $$unique; \
-+ else \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$unique; \
-+ fi; \
- fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
- 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; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+ test -z "$(CTAGS_ARGS)$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-- $$tags $$unique
-+ $$unique
-
- GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
-- && cd $(top_srcdir) \
-- && gtags -i $(GTAGS_ARGS) $$here
-+ && $(am__cd) $(top_srcdir) \
-+ && gtags -i $(GTAGS_ARGS) "$$here"
-
- distclean-tags:
+@@ -460,7 +462,7 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
check-TESTS: $(TESTS)
@@ -36044,11 +23732,8 @@ Index: pam.debian/modules/pam_mail/Makefile.in
+ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
srcdir=$(srcdir); export srcdir; \
list=' $(TESTS) '; \
-+ $(am__tty_colors); \
if test -n "$$list"; then \
- for tst in $$list; do \
- if test -f ./$$tst; then dir=./; \
-@@ -467,49 +492,63 @@
+@@ -471,7 +473,7 @@
if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
@@ -36056,35 +23741,19 @@ Index: pam.debian/modules/pam_mail/Makefile.in
+ *[\ \ ]$$tst[\ \ ]*) \
xpass=`expr $$xpass + 1`; \
failed=`expr $$failed + 1`; \
-- echo "XPASS: $$tst"; \
-+ col=$$red; res=XPASS; \
- ;; \
- *) \
-- echo "PASS: $$tst"; \
-+ col=$$grn; res=PASS; \
- ;; \
- esac; \
+ echo "XPASS: $$tst"; \
+@@ -483,7 +485,7 @@
elif test $$? -ne 77; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
- *$$ws$$tst$$ws*) \
+ *[\ \ ]$$tst[\ \ ]*) \
xfail=`expr $$xfail + 1`; \
-- echo "XFAIL: $$tst"; \
-+ col=$$lgn; res=XFAIL; \
+ echo "XFAIL: $$tst"; \
;; \
- *) \
- failed=`expr $$failed + 1`; \
-- echo "FAIL: $$tst"; \
-+ col=$$red; res=FAIL; \
- ;; \
- esac; \
- else \
- skip=`expr $$skip + 1`; \
-- echo "SKIP: $$tst"; \
-+ col=$$blu; res=SKIP; \
+@@ -497,23 +499,36 @@
+ echo "SKIP: $$tst"; \
fi; \
-+ echo "$${col}$$res$${std}: $$tst"; \
done; \
+ if test "$$all" -eq 1; then \
+ tests="test"; \
@@ -36124,22 +23793,7 @@ Index: pam.debian/modules/pam_mail/Makefile.in
test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
dashes="$$skipped"; \
fi; \
-@@ -520,15 +559,32 @@
- dashes="$$report"; \
- fi; \
- dashes=`echo "$$dashes" | sed s/./=/g`; \
-- echo "$$dashes"; \
-+ if test "$$failed" -eq 0; then \
-+ echo "$$grn$$dashes"; \
-+ else \
-+ echo "$$red$$dashes"; \
-+ fi; \
- echo "$$banner"; \
- test -z "$$skipped" || echo "$$skipped"; \
- test -z "$$report" || echo "$$report"; \
-- echo "$$dashes"; \
-+ echo "$$dashes$$std"; \
- test "$$failed" -eq 0; \
+@@ -533,6 +548,19 @@
else :; fi
distdir: $(DISTFILES)
@@ -36159,37 +23813,7 @@ Index: pam.debian/modules/pam_mail/Makefile.in
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
-@@ -544,13 +600,17 @@
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-+ if test -d "$(distdir)/$$file"; then \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+ fi; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
-- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
- else \
-- test -f $(distdir)/$$file \
-- || cp -p $$d/$$file $(distdir)/$$file \
-+ test -f "$(distdir)/$$file" \
-+ || cp -p $$d/$$file "$(distdir)/$$file" \
- || exit 1; \
- fi; \
- done
-@@ -583,6 +643,7 @@
-
- distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -605,6 +666,8 @@
+@@ -609,6 +637,8 @@
html: html-am
@@ -36198,7 +23822,7 @@ Index: pam.debian/modules/pam_mail/Makefile.in
info: info-am
info-am:
-@@ -613,18 +676,28 @@
+@@ -617,18 +647,28 @@
install-dvi: install-dvi-am
@@ -36227,30 +23851,13 @@ Index: pam.debian/modules/pam_mail/Makefile.in
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -649,7 +722,7 @@
-
- uninstall-man: uninstall-man8
-
--.MAKE: install-am install-strip
-+.MAKE: check-am install-am install-strip
-
- .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
- clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
-@@ -669,6 +742,7 @@
-
- @ENABLE_REGENERATE_MAN_TRUE@README: pam_mail.8.xml
- @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
-+
- # 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.
- .NOEXPORT:
-Index: pam.debian/modules/pam_mkhomedir/Makefile.in
+Index: pam.deb/modules/pam_mkhomedir/Makefile.in
===================================================================
---- pam.debian.orig/modules/pam_mkhomedir/Makefile.in
-+++ pam.debian/modules/pam_mkhomedir/Makefile.in
+--- pam.deb.orig/modules/pam_mkhomedir/Makefile.in
++++ pam.deb/modules/pam_mkhomedir/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -36260,76 +23867,7 @@ Index: pam.debian/modules/pam_mkhomedir/Makefile.in
# 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.
-@@ -23,8 +24,9 @@
-
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
--pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkglibexecdir = $(libexecdir)/@PACKAGE@
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
-@@ -61,15 +63,30 @@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
-+CONFIG_CLEAN_VPATH_FILES =
- am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
- am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-+am__install_max = 40
-+am__nobase_strip_setup = \
-+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-+am__nobase_strip = \
-+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-+am__nobase_list = $(am__nobase_strip_setup); \
-+ for p in $$list; do echo "$$p $$p"; done | \
-+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-+ if (++n[$$2] == $(am__install_max)) \
-+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-+ END { for (dir in files) print dir, files[dir] }'
-+am__base_list = \
-+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
- am__installdirs = "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(sbindir)" \
- "$(DESTDIR)$(man8dir)"
--securelibLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(securelib_LTLIBRARIES)
- pam_mkhomedir_la_DEPENDENCIES =
- am_pam_mkhomedir_la_OBJECTS = pam_mkhomedir.lo
-@@ -77,7 +94,6 @@
- pam_mkhomedir_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(pam_mkhomedir_la_LDFLAGS) $(LDFLAGS) -o $@
--sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
- PROGRAMS = $(sbin_PROGRAMS)
- am_mkhomedir_helper_OBJECTS = mkhomedir_helper.$(OBJEXT)
- mkhomedir_helper_OBJECTS = $(am_mkhomedir_helper_OBJECTS)
-@@ -85,6 +101,7 @@
- DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
-+am__mv = mv -f
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-@@ -102,6 +119,8 @@
- DATA = $(noinst_DATA)
- ETAGS = etags
- CTAGS = ctags
-+am__tty_colors = \
-+red=; grn=; lgn=; blu=; std=
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- AMTAR = @AMTAR@
-@@ -186,6 +205,7 @@
+@@ -188,6 +189,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -36337,7 +23875,7 @@ Index: pam.debian/modules/pam_mkhomedir/Makefile.in
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PIE_CFLAGS = @PIE_CFLAGS@
-@@ -291,14 +311,14 @@
+@@ -295,8 +297,8 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -36348,230 +23886,18 @@ Index: pam.debian/modules/pam_mkhomedir/Makefile.in
exit 1;; \
esac; \
done; \
-- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/pam_mkhomedir/Makefile'; \
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu modules/pam_mkhomedir/Makefile
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/pam_mkhomedir/Makefile'; \
-+ $(am__cd) $(top_srcdir) && \
-+ $(AUTOMAKE) --gnu modules/pam_mkhomedir/Makefile
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
-@@ -316,23 +336,28 @@
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- $(ACLOCAL_M4): $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(am__aclocal_m4_deps):
- install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
- @$(NORMAL_INSTALL)
- test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
-- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-+ @list='$(securelib_LTLIBRARIES)'; test -n "$(securelibdir)" || list=; \
-+ list2=; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-- 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"; \
-+ list2="$$list2 $$p"; \
- else :; fi; \
-- done
-+ done; \
-+ test -z "$$list2" || { \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(securelibdir)'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(securelibdir)"; \
-+ }
-
- uninstall-securelibLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-+ @list='$(securelib_LTLIBRARIES)'; test -n "$(securelibdir)" || list=; \
-+ for p in $$list; do \
-+ $(am__strip_dir) \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$f'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$f"; \
- done
-
- clean-securelibLTLIBRARIES:
-@@ -348,31 +373,46 @@
- install-sbinPROGRAMS: $(sbin_PROGRAMS)
- @$(NORMAL_INSTALL)
- 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 \
-- || test -f $$p1 \
-- ; then \
-- f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(sbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(sbindir)/$$f'"; \
-- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(sbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(sbindir)/$$f" || exit 1; \
-- else :; fi; \
-- done
-+ @list='$(sbin_PROGRAMS)'; test -n "$(sbindir)" || list=; \
-+ for p in $$list; do echo "$$p $$p"; done | \
-+ sed 's/$(EXEEXT)$$//' | \
-+ while read p p1; do if test -f $$p || test -f $$p1; \
-+ then echo "$$p"; echo "$$p"; else :; fi; \
-+ done | \
-+ sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
-+ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
-+ sed 'N;N;N;s,\n, ,g' | \
-+ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
-+ { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
-+ if ($$2 == $$4) files[d] = files[d] " " $$1; \
-+ else { print "f", $$3 "/" $$4, $$1; } } \
-+ END { for (d in files) print "f", d, files[d] }' | \
-+ while read type dir files; do \
-+ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
-+ test -z "$$files" || { \
-+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(sbindir)$$dir'"; \
-+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(sbindir)$$dir" || exit $$?; \
-+ } \
-+ ; done
-
- uninstall-sbinPROGRAMS:
- @$(NORMAL_UNINSTALL)
-- @list='$(sbin_PROGRAMS)'; for p in $$list; do \
-- f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-- echo " rm -f '$(DESTDIR)$(sbindir)/$$f'"; \
-- rm -f "$(DESTDIR)$(sbindir)/$$f"; \
-- done
-+ @list='$(sbin_PROGRAMS)'; test -n "$(sbindir)" || list=; \
-+ files=`for p in $$list; do echo "$$p"; done | \
-+ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-+ -e 's/$$/$(EXEEXT)/' `; \
-+ test -n "$$list" || exit 0; \
-+ echo " ( cd '$(DESTDIR)$(sbindir)' && rm -f" $$files ")"; \
-+ cd "$(DESTDIR)$(sbindir)" && rm -f $$files
-
- clean-sbinPROGRAMS:
-- @list='$(sbin_PROGRAMS)'; for p in $$list; do \
-- f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-- echo " rm -f $$p $$f"; \
-- rm -f $$p $$f ; \
-- done
-+ @list='$(sbin_PROGRAMS)'; test -n "$$list" || exit 0; \
-+ echo " rm -f" $$list; \
-+ rm -f $$list || exit $$?; \
-+ test -n "$(EXEEXT)" || exit 0; \
-+ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
-+ echo " rm -f" $$list; \
-+ rm -f $$list
- mkhomedir_helper$(EXEEXT): $(mkhomedir_helper_OBJECTS) $(mkhomedir_helper_DEPENDENCIES)
- @rm -f mkhomedir_helper$(EXEEXT)
- $(LINK) $(mkhomedir_helper_OBJECTS) $(mkhomedir_helper_LDADD) $(LIBS)
-@@ -388,21 +428,21 @@
-
- .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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @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 $@ $<
-@@ -412,65 +452,58 @@
-
- clean-libtool:
- -rm -rf .libs _libs
--install-man8: $(man8_MANS) $(man_MANS)
-+install-man8: $(man_MANS)
- @$(NORMAL_INSTALL)
- 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 \
-- case "$$i" in \
-- *.8*) list="$$list $$i" ;; \
-- esac; \
-+ @list=''; test -n "$(man8dir)" || exit 0; \
-+ { for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.8[a-z]*$$/p'; \
-+ } | while read p; do \
-+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-+ echo "$$d$$p"; echo "$$p"; \
-+ done | \
-+ sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
-+ sed 'N;N;s,\n, ,g' | { \
-+ list=; while read file base inst; do \
-+ if test "$$base" = "$$inst"; then list="$$list $$file"; else \
-+ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-+ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst" || exit $$?; \
-+ fi; \
+@@ -427,8 +429,8 @@
+ esac; \
done; \
-- for i in $$list; do \
+ for i in $$list; do \
- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
- else file=$$i; fi; \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 8*) ;; \
-- *) ext='8' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-- $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \
-- done
-+ for i in $$list; do echo "$$i"; done | $(am__base_list) | \
-+ while read files; do \
-+ test -z "$$files" || { \
-+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man8dir)'"; \
-+ $(INSTALL_DATA) $$files "$(DESTDIR)$(man8dir)" || exit $$?; }; \
-+ done; }
-+
- uninstall-man8:
- @$(NORMAL_UNINSTALL)
-- @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
-- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-- for i in $$l2; do \
-- case "$$i" in \
-- *.8*) list="$$list $$i" ;; \
-- esac; \
-- done; \
-- for i in $$list; do \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 8*) ;; \
-- *) ext='8' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \
-- rm -f "$(DESTDIR)$(man8dir)/$$inst"; \
-- done
-+ @list=''; test -n "$(man8dir)" || exit 0; \
-+ files=`{ for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.8[a-z]*$$/p'; \
-+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-+ test -z "$$files" || { \
-+ echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \
-+ cd "$(DESTDIR)$(man8dir)" && rm -f $$files; }
-
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
++ if test -f $$i; then file=$$i; \
++ else file=$(srcdir)/$$i; fi; \
+ ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+ case "$$ext" in \
+ 8*) ;; \
+@@ -467,7 +469,7 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -36580,56 +23906,7 @@ Index: pam.debian/modules/pam_mkhomedir/Makefile.in
END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
-+ set x; \
- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -478,37 +511,43 @@
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ shift; \
-+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
-- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique; \
-+ if test $$# -gt 0; then \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ "$$@" $$unique; \
-+ else \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$unique; \
-+ fi; \
- fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
- 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; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+ test -z "$(CTAGS_ARGS)$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-- $$tags $$unique
-+ $$unique
-
- GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
-- && cd $(top_srcdir) \
-- && gtags -i $(GTAGS_ARGS) $$here
-+ && $(am__cd) $(top_srcdir) \
-+ && gtags -i $(GTAGS_ARGS) "$$here"
-
- distclean-tags:
+@@ -510,7 +512,7 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
check-TESTS: $(TESTS)
@@ -36637,11 +23914,8 @@ Index: pam.debian/modules/pam_mkhomedir/Makefile.in
+ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
srcdir=$(srcdir); export srcdir; \
list=' $(TESTS) '; \
-+ $(am__tty_colors); \
if test -n "$$list"; then \
- for tst in $$list; do \
- if test -f ./$$tst; then dir=./; \
-@@ -517,49 +556,63 @@
+@@ -521,7 +523,7 @@
if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
@@ -36649,35 +23923,19 @@ Index: pam.debian/modules/pam_mkhomedir/Makefile.in
+ *[\ \ ]$$tst[\ \ ]*) \
xpass=`expr $$xpass + 1`; \
failed=`expr $$failed + 1`; \
-- echo "XPASS: $$tst"; \
-+ col=$$red; res=XPASS; \
- ;; \
- *) \
-- echo "PASS: $$tst"; \
-+ col=$$grn; res=PASS; \
- ;; \
- esac; \
+ echo "XPASS: $$tst"; \
+@@ -533,7 +535,7 @@
elif test $$? -ne 77; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
- *$$ws$$tst$$ws*) \
+ *[\ \ ]$$tst[\ \ ]*) \
xfail=`expr $$xfail + 1`; \
-- echo "XFAIL: $$tst"; \
-+ col=$$lgn; res=XFAIL; \
- ;; \
- *) \
- failed=`expr $$failed + 1`; \
-- echo "FAIL: $$tst"; \
-+ col=$$red; res=FAIL; \
+ echo "XFAIL: $$tst"; \
;; \
- esac; \
- else \
- skip=`expr $$skip + 1`; \
-- echo "SKIP: $$tst"; \
-+ col=$$blu; res=SKIP; \
+@@ -547,23 +549,36 @@
+ echo "SKIP: $$tst"; \
fi; \
-+ echo "$${col}$$res$${std}: $$tst"; \
done; \
+ if test "$$all" -eq 1; then \
+ tests="test"; \
@@ -36717,22 +23975,7 @@ Index: pam.debian/modules/pam_mkhomedir/Makefile.in
test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
dashes="$$skipped"; \
fi; \
-@@ -570,15 +623,32 @@
- dashes="$$report"; \
- fi; \
- dashes=`echo "$$dashes" | sed s/./=/g`; \
-- echo "$$dashes"; \
-+ if test "$$failed" -eq 0; then \
-+ echo "$$grn$$dashes"; \
-+ else \
-+ echo "$$red$$dashes"; \
-+ fi; \
- echo "$$banner"; \
- test -z "$$skipped" || echo "$$skipped"; \
- test -z "$$report" || echo "$$report"; \
-- echo "$$dashes"; \
-+ echo "$$dashes$$std"; \
- test "$$failed" -eq 0; \
+@@ -583,6 +598,19 @@
else :; fi
distdir: $(DISTFILES)
@@ -36752,37 +23995,7 @@ Index: pam.debian/modules/pam_mkhomedir/Makefile.in
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
-@@ -594,13 +664,17 @@
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-+ if test -d "$(distdir)/$$file"; then \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+ fi; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
-- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
- else \
-- test -f $(distdir)/$$file \
-- || cp -p $$d/$$file $(distdir)/$$file \
-+ test -f "$(distdir)/$$file" \
-+ || cp -p $$d/$$file "$(distdir)/$$file" \
- || exit 1; \
- fi; \
- done
-@@ -633,6 +707,7 @@
-
- distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -655,6 +730,8 @@
+@@ -659,6 +687,8 @@
html: html-am
@@ -36791,7 +24004,7 @@ Index: pam.debian/modules/pam_mkhomedir/Makefile.in
info: info-am
info-am:
-@@ -663,18 +740,28 @@
+@@ -667,18 +697,28 @@
install-dvi: install-dvi-am
@@ -36820,30 +24033,13 @@ Index: pam.debian/modules/pam_mkhomedir/Makefile.in
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -700,7 +787,7 @@
-
- uninstall-man: uninstall-man8
-
--.MAKE: install-am install-strip
-+.MAKE: check-am install-am install-strip
-
- .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
- clean-generic clean-libtool clean-sbinPROGRAMS \
-@@ -721,6 +808,7 @@
-
- @ENABLE_REGENERATE_MAN_TRUE@README: pam_mkhomedir.8.xml
- @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
-+
- # 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.
- .NOEXPORT:
-Index: pam.debian/modules/pam_motd/Makefile.in
+Index: pam.deb/modules/pam_motd/Makefile.in
===================================================================
---- pam.debian.orig/modules/pam_motd/Makefile.in
-+++ pam.debian/modules/pam_motd/Makefile.in
+--- pam.deb.orig/modules/pam_motd/Makefile.in
++++ pam.deb/modules/pam_motd/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -36853,67 +24049,7 @@ Index: pam.debian/modules/pam_motd/Makefile.in
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -21,8 +22,9 @@
-
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
--pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkglibexecdir = $(libexecdir)/@PACKAGE@
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
-@@ -58,14 +60,29 @@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
-+CONFIG_CLEAN_VPATH_FILES =
- am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
- am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-+am__install_max = 40
-+am__nobase_strip_setup = \
-+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-+am__nobase_strip = \
-+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-+am__nobase_list = $(am__nobase_strip_setup); \
-+ for p in $$list; do echo "$$p $$p"; done | \
-+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-+ if (++n[$$2] == $(am__install_max)) \
-+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-+ END { for (dir in files) print dir, files[dir] }'
-+am__base_list = \
-+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
- am__installdirs = "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man8dir)"
--securelibLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(securelib_LTLIBRARIES)
- pam_motd_la_DEPENDENCIES =
- pam_motd_la_SOURCES = pam_motd.c
-@@ -73,6 +90,7 @@
- DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
-+am__mv = mv -f
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-@@ -90,6 +108,8 @@
- DATA = $(noinst_DATA)
- ETAGS = etags
- CTAGS = ctags
-+am__tty_colors = \
-+red=; grn=; lgn=; blu=; std=
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- AMTAR = @AMTAR@
-@@ -174,6 +194,7 @@
+@@ -176,6 +177,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -36921,7 +24057,7 @@ Index: pam.debian/modules/pam_motd/Makefile.in
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PIE_CFLAGS = @PIE_CFLAGS@
-@@ -273,14 +294,14 @@
+@@ -277,8 +279,8 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -36932,163 +24068,18 @@ Index: pam.debian/modules/pam_motd/Makefile.in
exit 1;; \
esac; \
done; \
-- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/pam_motd/Makefile'; \
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu modules/pam_motd/Makefile
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/pam_motd/Makefile'; \
-+ $(am__cd) $(top_srcdir) && \
-+ $(AUTOMAKE) --gnu modules/pam_motd/Makefile
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
-@@ -298,23 +319,28 @@
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- $(ACLOCAL_M4): $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(am__aclocal_m4_deps):
- install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
- @$(NORMAL_INSTALL)
- test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
-- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-+ @list='$(securelib_LTLIBRARIES)'; test -n "$(securelibdir)" || list=; \
-+ list2=; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-- 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"; \
-+ list2="$$list2 $$p"; \
- else :; fi; \
-- done
-+ done; \
-+ test -z "$$list2" || { \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(securelibdir)'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(securelibdir)"; \
-+ }
-
- uninstall-securelibLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-+ @list='$(securelib_LTLIBRARIES)'; test -n "$(securelibdir)" || list=; \
-+ for p in $$list; do \
-+ $(am__strip_dir) \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$f'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$f"; \
- done
-
- clean-securelibLTLIBRARIES:
-@@ -338,21 +364,21 @@
-
- .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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @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,65 +388,58 @@
-
- clean-libtool:
- -rm -rf .libs _libs
--install-man8: $(man8_MANS) $(man_MANS)
-+install-man8: $(man_MANS)
- @$(NORMAL_INSTALL)
- 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 \
-- case "$$i" in \
-- *.8*) list="$$list $$i" ;; \
-- esac; \
-+ @list=''; test -n "$(man8dir)" || exit 0; \
-+ { for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.8[a-z]*$$/p'; \
-+ } | while read p; do \
-+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-+ echo "$$d$$p"; echo "$$p"; \
-+ done | \
-+ sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
-+ sed 'N;N;s,\n, ,g' | { \
-+ list=; while read file base inst; do \
-+ if test "$$base" = "$$inst"; then list="$$list $$file"; else \
-+ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-+ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst" || exit $$?; \
-+ fi; \
+@@ -377,8 +379,8 @@
+ esac; \
done; \
-- for i in $$list; do \
+ for i in $$list; do \
- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
- else file=$$i; fi; \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 8*) ;; \
-- *) ext='8' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-- $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \
-- done
-+ for i in $$list; do echo "$$i"; done | $(am__base_list) | \
-+ while read files; do \
-+ test -z "$$files" || { \
-+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man8dir)'"; \
-+ $(INSTALL_DATA) $$files "$(DESTDIR)$(man8dir)" || exit $$?; }; \
-+ done; }
-+
- uninstall-man8:
- @$(NORMAL_UNINSTALL)
-- @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
-- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-- for i in $$l2; do \
-- case "$$i" in \
-- *.8*) list="$$list $$i" ;; \
-- esac; \
-- done; \
-- for i in $$list; do \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 8*) ;; \
-- *) ext='8' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \
-- rm -f "$(DESTDIR)$(man8dir)/$$inst"; \
-- done
-+ @list=''; test -n "$(man8dir)" || exit 0; \
-+ files=`{ for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.8[a-z]*$$/p'; \
-+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-+ test -z "$$files" || { \
-+ echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \
-+ cd "$(DESTDIR)$(man8dir)" && rm -f $$files; }
-
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
++ if test -f $$i; then file=$$i; \
++ else file=$(srcdir)/$$i; fi; \
+ ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+ case "$$ext" in \
+ 8*) ;; \
+@@ -417,7 +419,7 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -37097,56 +24088,7 @@ Index: pam.debian/modules/pam_motd/Makefile.in
END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
-+ set x; \
- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -428,37 +447,43 @@
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ shift; \
-+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
-- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique; \
-+ if test $$# -gt 0; then \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ "$$@" $$unique; \
-+ else \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$unique; \
-+ fi; \
- fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
- 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; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+ test -z "$(CTAGS_ARGS)$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-- $$tags $$unique
-+ $$unique
-
- GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
-- && cd $(top_srcdir) \
-- && gtags -i $(GTAGS_ARGS) $$here
-+ && $(am__cd) $(top_srcdir) \
-+ && gtags -i $(GTAGS_ARGS) "$$here"
-
- distclean-tags:
+@@ -460,7 +462,7 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
check-TESTS: $(TESTS)
@@ -37154,11 +24096,8 @@ Index: pam.debian/modules/pam_motd/Makefile.in
+ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
srcdir=$(srcdir); export srcdir; \
list=' $(TESTS) '; \
-+ $(am__tty_colors); \
if test -n "$$list"; then \
- for tst in $$list; do \
- if test -f ./$$tst; then dir=./; \
-@@ -467,49 +492,63 @@
+@@ -471,7 +473,7 @@
if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
@@ -37166,35 +24105,19 @@ Index: pam.debian/modules/pam_motd/Makefile.in
+ *[\ \ ]$$tst[\ \ ]*) \
xpass=`expr $$xpass + 1`; \
failed=`expr $$failed + 1`; \
-- echo "XPASS: $$tst"; \
-+ col=$$red; res=XPASS; \
- ;; \
- *) \
-- echo "PASS: $$tst"; \
-+ col=$$grn; res=PASS; \
- ;; \
- esac; \
+ echo "XPASS: $$tst"; \
+@@ -483,7 +485,7 @@
elif test $$? -ne 77; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
- *$$ws$$tst$$ws*) \
+ *[\ \ ]$$tst[\ \ ]*) \
xfail=`expr $$xfail + 1`; \
-- echo "XFAIL: $$tst"; \
-+ col=$$lgn; res=XFAIL; \
+ echo "XFAIL: $$tst"; \
;; \
- *) \
- failed=`expr $$failed + 1`; \
-- echo "FAIL: $$tst"; \
-+ col=$$red; res=FAIL; \
- ;; \
- esac; \
- else \
- skip=`expr $$skip + 1`; \
-- echo "SKIP: $$tst"; \
-+ col=$$blu; res=SKIP; \
+@@ -497,23 +499,36 @@
+ echo "SKIP: $$tst"; \
fi; \
-+ echo "$${col}$$res$${std}: $$tst"; \
done; \
+ if test "$$all" -eq 1; then \
+ tests="test"; \
@@ -37234,22 +24157,7 @@ Index: pam.debian/modules/pam_motd/Makefile.in
test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
dashes="$$skipped"; \
fi; \
-@@ -520,15 +559,32 @@
- dashes="$$report"; \
- fi; \
- dashes=`echo "$$dashes" | sed s/./=/g`; \
-- echo "$$dashes"; \
-+ if test "$$failed" -eq 0; then \
-+ echo "$$grn$$dashes"; \
-+ else \
-+ echo "$$red$$dashes"; \
-+ fi; \
- echo "$$banner"; \
- test -z "$$skipped" || echo "$$skipped"; \
- test -z "$$report" || echo "$$report"; \
-- echo "$$dashes"; \
-+ echo "$$dashes$$std"; \
- test "$$failed" -eq 0; \
+@@ -533,6 +548,19 @@
else :; fi
distdir: $(DISTFILES)
@@ -37269,37 +24177,7 @@ Index: pam.debian/modules/pam_motd/Makefile.in
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
-@@ -544,13 +600,17 @@
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-+ if test -d "$(distdir)/$$file"; then \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+ fi; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
-- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
- else \
-- test -f $(distdir)/$$file \
-- || cp -p $$d/$$file $(distdir)/$$file \
-+ test -f "$(distdir)/$$file" \
-+ || cp -p $$d/$$file "$(distdir)/$$file" \
- || exit 1; \
- fi; \
- done
-@@ -583,6 +643,7 @@
-
- distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -605,6 +666,8 @@
+@@ -609,6 +637,8 @@
html: html-am
@@ -37308,7 +24186,7 @@ Index: pam.debian/modules/pam_motd/Makefile.in
info: info-am
info-am:
-@@ -613,18 +676,28 @@
+@@ -617,18 +647,28 @@
install-dvi: install-dvi-am
@@ -37337,30 +24215,13 @@ Index: pam.debian/modules/pam_motd/Makefile.in
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -649,7 +722,7 @@
-
- uninstall-man: uninstall-man8
-
--.MAKE: install-am install-strip
-+.MAKE: check-am install-am install-strip
-
- .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
- clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
-@@ -669,6 +742,7 @@
-
- @ENABLE_REGENERATE_MAN_TRUE@README: pam_motd.8.xml
- @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
-+
- # 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.
- .NOEXPORT:
-Index: pam.debian/modules/pam_nologin/Makefile.in
+Index: pam.deb/modules/pam_nologin/Makefile.in
===================================================================
---- pam.debian.orig/modules/pam_nologin/Makefile.in
-+++ pam.debian/modules/pam_nologin/Makefile.in
+--- pam.deb.orig/modules/pam_nologin/Makefile.in
++++ pam.deb/modules/pam_nologin/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -37370,67 +24231,7 @@ Index: pam.debian/modules/pam_nologin/Makefile.in
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -21,8 +22,9 @@
-
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
--pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkglibexecdir = $(libexecdir)/@PACKAGE@
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
-@@ -58,14 +60,29 @@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
-+CONFIG_CLEAN_VPATH_FILES =
- am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
- am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-+am__install_max = 40
-+am__nobase_strip_setup = \
-+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-+am__nobase_strip = \
-+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-+am__nobase_list = $(am__nobase_strip_setup); \
-+ for p in $$list; do echo "$$p $$p"; done | \
-+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-+ if (++n[$$2] == $(am__install_max)) \
-+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-+ END { for (dir in files) print dir, files[dir] }'
-+am__base_list = \
-+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
- am__installdirs = "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man8dir)"
--securelibLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(securelib_LTLIBRARIES)
- pam_nologin_la_DEPENDENCIES =
- pam_nologin_la_SOURCES = pam_nologin.c
-@@ -73,6 +90,7 @@
- DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
-+am__mv = mv -f
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-@@ -90,6 +108,8 @@
- DATA = $(noinst_DATA)
- ETAGS = etags
- CTAGS = ctags
-+am__tty_colors = \
-+red=; grn=; lgn=; blu=; std=
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- AMTAR = @AMTAR@
-@@ -174,6 +194,7 @@
+@@ -176,6 +177,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -37438,7 +24239,7 @@ Index: pam.debian/modules/pam_nologin/Makefile.in
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PIE_CFLAGS = @PIE_CFLAGS@
-@@ -273,14 +294,14 @@
+@@ -277,8 +279,8 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -37449,163 +24250,18 @@ Index: pam.debian/modules/pam_nologin/Makefile.in
exit 1;; \
esac; \
done; \
-- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/pam_nologin/Makefile'; \
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu modules/pam_nologin/Makefile
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/pam_nologin/Makefile'; \
-+ $(am__cd) $(top_srcdir) && \
-+ $(AUTOMAKE) --gnu modules/pam_nologin/Makefile
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
-@@ -298,23 +319,28 @@
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- $(ACLOCAL_M4): $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(am__aclocal_m4_deps):
- install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
- @$(NORMAL_INSTALL)
- test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
-- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-+ @list='$(securelib_LTLIBRARIES)'; test -n "$(securelibdir)" || list=; \
-+ list2=; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-- 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"; \
-+ list2="$$list2 $$p"; \
- else :; fi; \
-- done
-+ done; \
-+ test -z "$$list2" || { \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(securelibdir)'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(securelibdir)"; \
-+ }
-
- uninstall-securelibLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-+ @list='$(securelib_LTLIBRARIES)'; test -n "$(securelibdir)" || list=; \
-+ for p in $$list; do \
-+ $(am__strip_dir) \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$f'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$f"; \
- done
-
- clean-securelibLTLIBRARIES:
-@@ -338,21 +364,21 @@
-
- .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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @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,65 +388,58 @@
-
- clean-libtool:
- -rm -rf .libs _libs
--install-man8: $(man8_MANS) $(man_MANS)
-+install-man8: $(man_MANS)
- @$(NORMAL_INSTALL)
- 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 \
-- case "$$i" in \
-- *.8*) list="$$list $$i" ;; \
-- esac; \
-+ @list=''; test -n "$(man8dir)" || exit 0; \
-+ { for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.8[a-z]*$$/p'; \
-+ } | while read p; do \
-+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-+ echo "$$d$$p"; echo "$$p"; \
-+ done | \
-+ sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
-+ sed 'N;N;s,\n, ,g' | { \
-+ list=; while read file base inst; do \
-+ if test "$$base" = "$$inst"; then list="$$list $$file"; else \
-+ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-+ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst" || exit $$?; \
-+ fi; \
+@@ -377,8 +379,8 @@
+ esac; \
done; \
-- for i in $$list; do \
+ for i in $$list; do \
- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
- else file=$$i; fi; \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 8*) ;; \
-- *) ext='8' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-- $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \
-- done
-+ for i in $$list; do echo "$$i"; done | $(am__base_list) | \
-+ while read files; do \
-+ test -z "$$files" || { \
-+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man8dir)'"; \
-+ $(INSTALL_DATA) $$files "$(DESTDIR)$(man8dir)" || exit $$?; }; \
-+ done; }
-+
- uninstall-man8:
- @$(NORMAL_UNINSTALL)
-- @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
-- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-- for i in $$l2; do \
-- case "$$i" in \
-- *.8*) list="$$list $$i" ;; \
-- esac; \
-- done; \
-- for i in $$list; do \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 8*) ;; \
-- *) ext='8' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \
-- rm -f "$(DESTDIR)$(man8dir)/$$inst"; \
-- done
-+ @list=''; test -n "$(man8dir)" || exit 0; \
-+ files=`{ for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.8[a-z]*$$/p'; \
-+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-+ test -z "$$files" || { \
-+ echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \
-+ cd "$(DESTDIR)$(man8dir)" && rm -f $$files; }
-
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
++ if test -f $$i; then file=$$i; \
++ else file=$(srcdir)/$$i; fi; \
+ ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+ case "$$ext" in \
+ 8*) ;; \
+@@ -417,7 +419,7 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -37614,56 +24270,7 @@ Index: pam.debian/modules/pam_nologin/Makefile.in
END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
-+ set x; \
- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -428,37 +447,43 @@
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ shift; \
-+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
-- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique; \
-+ if test $$# -gt 0; then \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ "$$@" $$unique; \
-+ else \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$unique; \
-+ fi; \
- fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
- 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; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+ test -z "$(CTAGS_ARGS)$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-- $$tags $$unique
-+ $$unique
-
- GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
-- && cd $(top_srcdir) \
-- && gtags -i $(GTAGS_ARGS) $$here
-+ && $(am__cd) $(top_srcdir) \
-+ && gtags -i $(GTAGS_ARGS) "$$here"
-
- distclean-tags:
+@@ -460,7 +462,7 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
check-TESTS: $(TESTS)
@@ -37671,11 +24278,8 @@ Index: pam.debian/modules/pam_nologin/Makefile.in
+ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
srcdir=$(srcdir); export srcdir; \
list=' $(TESTS) '; \
-+ $(am__tty_colors); \
if test -n "$$list"; then \
- for tst in $$list; do \
- if test -f ./$$tst; then dir=./; \
-@@ -467,49 +492,63 @@
+@@ -471,7 +473,7 @@
if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
@@ -37683,35 +24287,19 @@ Index: pam.debian/modules/pam_nologin/Makefile.in
+ *[\ \ ]$$tst[\ \ ]*) \
xpass=`expr $$xpass + 1`; \
failed=`expr $$failed + 1`; \
-- echo "XPASS: $$tst"; \
-+ col=$$red; res=XPASS; \
- ;; \
- *) \
-- echo "PASS: $$tst"; \
-+ col=$$grn; res=PASS; \
- ;; \
- esac; \
+ echo "XPASS: $$tst"; \
+@@ -483,7 +485,7 @@
elif test $$? -ne 77; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
- *$$ws$$tst$$ws*) \
+ *[\ \ ]$$tst[\ \ ]*) \
xfail=`expr $$xfail + 1`; \
-- echo "XFAIL: $$tst"; \
-+ col=$$lgn; res=XFAIL; \
+ echo "XFAIL: $$tst"; \
;; \
- *) \
- failed=`expr $$failed + 1`; \
-- echo "FAIL: $$tst"; \
-+ col=$$red; res=FAIL; \
- ;; \
- esac; \
- else \
- skip=`expr $$skip + 1`; \
-- echo "SKIP: $$tst"; \
-+ col=$$blu; res=SKIP; \
+@@ -497,23 +499,36 @@
+ echo "SKIP: $$tst"; \
fi; \
-+ echo "$${col}$$res$${std}: $$tst"; \
done; \
+ if test "$$all" -eq 1; then \
+ tests="test"; \
@@ -37751,22 +24339,7 @@ Index: pam.debian/modules/pam_nologin/Makefile.in
test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
dashes="$$skipped"; \
fi; \
-@@ -520,15 +559,32 @@
- dashes="$$report"; \
- fi; \
- dashes=`echo "$$dashes" | sed s/./=/g`; \
-- echo "$$dashes"; \
-+ if test "$$failed" -eq 0; then \
-+ echo "$$grn$$dashes"; \
-+ else \
-+ echo "$$red$$dashes"; \
-+ fi; \
- echo "$$banner"; \
- test -z "$$skipped" || echo "$$skipped"; \
- test -z "$$report" || echo "$$report"; \
-- echo "$$dashes"; \
-+ echo "$$dashes$$std"; \
- test "$$failed" -eq 0; \
+@@ -533,6 +548,19 @@
else :; fi
distdir: $(DISTFILES)
@@ -37786,37 +24359,7 @@ Index: pam.debian/modules/pam_nologin/Makefile.in
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
-@@ -544,13 +600,17 @@
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-+ if test -d "$(distdir)/$$file"; then \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+ fi; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
-- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
- else \
-- test -f $(distdir)/$$file \
-- || cp -p $$d/$$file $(distdir)/$$file \
-+ test -f "$(distdir)/$$file" \
-+ || cp -p $$d/$$file "$(distdir)/$$file" \
- || exit 1; \
- fi; \
- done
-@@ -583,6 +643,7 @@
-
- distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -605,6 +666,8 @@
+@@ -609,6 +637,8 @@
html: html-am
@@ -37825,7 +24368,7 @@ Index: pam.debian/modules/pam_nologin/Makefile.in
info: info-am
info-am:
-@@ -613,18 +676,28 @@
+@@ -617,18 +647,28 @@
install-dvi: install-dvi-am
@@ -37854,30 +24397,13 @@ Index: pam.debian/modules/pam_nologin/Makefile.in
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -649,7 +722,7 @@
-
- uninstall-man: uninstall-man8
-
--.MAKE: install-am install-strip
-+.MAKE: check-am install-am install-strip
-
- .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
- clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
-@@ -669,6 +742,7 @@
-
- @ENABLE_REGENERATE_MAN_TRUE@README: pam_nologin.8.xml
- @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
-+
- # 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.
- .NOEXPORT:
-Index: pam.debian/modules/pam_permit/Makefile.in
+Index: pam.deb/modules/pam_permit/Makefile.in
===================================================================
---- pam.debian.orig/modules/pam_permit/Makefile.in
-+++ pam.debian/modules/pam_permit/Makefile.in
+--- pam.deb.orig/modules/pam_permit/Makefile.in
++++ pam.deb/modules/pam_permit/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -37887,67 +24413,7 @@ Index: pam.debian/modules/pam_permit/Makefile.in
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -21,8 +22,9 @@
-
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
--pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkglibexecdir = $(libexecdir)/@PACKAGE@
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
-@@ -58,14 +60,29 @@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
-+CONFIG_CLEAN_VPATH_FILES =
- am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
- am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-+am__install_max = 40
-+am__nobase_strip_setup = \
-+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-+am__nobase_strip = \
-+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-+am__nobase_list = $(am__nobase_strip_setup); \
-+ for p in $$list; do echo "$$p $$p"; done | \
-+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-+ if (++n[$$2] == $(am__install_max)) \
-+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-+ END { for (dir in files) print dir, files[dir] }'
-+am__base_list = \
-+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
- am__installdirs = "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man8dir)"
--securelibLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(securelib_LTLIBRARIES)
- pam_permit_la_DEPENDENCIES =
- pam_permit_la_SOURCES = pam_permit.c
-@@ -73,6 +90,7 @@
- DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
-+am__mv = mv -f
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-@@ -90,6 +108,8 @@
- DATA = $(noinst_DATA)
- ETAGS = etags
- CTAGS = ctags
-+am__tty_colors = \
-+red=; grn=; lgn=; blu=; std=
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- AMTAR = @AMTAR@
-@@ -174,6 +194,7 @@
+@@ -176,6 +177,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -37955,7 +24421,7 @@ Index: pam.debian/modules/pam_permit/Makefile.in
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PIE_CFLAGS = @PIE_CFLAGS@
-@@ -273,14 +294,14 @@
+@@ -277,8 +279,8 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -37966,163 +24432,18 @@ Index: pam.debian/modules/pam_permit/Makefile.in
exit 1;; \
esac; \
done; \
-- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/pam_permit/Makefile'; \
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu modules/pam_permit/Makefile
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/pam_permit/Makefile'; \
-+ $(am__cd) $(top_srcdir) && \
-+ $(AUTOMAKE) --gnu modules/pam_permit/Makefile
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
-@@ -298,23 +319,28 @@
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- $(ACLOCAL_M4): $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(am__aclocal_m4_deps):
- install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
- @$(NORMAL_INSTALL)
- test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
-- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-+ @list='$(securelib_LTLIBRARIES)'; test -n "$(securelibdir)" || list=; \
-+ list2=; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-- 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"; \
-+ list2="$$list2 $$p"; \
- else :; fi; \
-- done
-+ done; \
-+ test -z "$$list2" || { \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(securelibdir)'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(securelibdir)"; \
-+ }
-
- uninstall-securelibLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-+ @list='$(securelib_LTLIBRARIES)'; test -n "$(securelibdir)" || list=; \
-+ for p in $$list; do \
-+ $(am__strip_dir) \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$f'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$f"; \
- done
-
- clean-securelibLTLIBRARIES:
-@@ -338,21 +364,21 @@
-
- .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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @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,65 +388,58 @@
-
- clean-libtool:
- -rm -rf .libs _libs
--install-man8: $(man8_MANS) $(man_MANS)
-+install-man8: $(man_MANS)
- @$(NORMAL_INSTALL)
- 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 \
-- case "$$i" in \
-- *.8*) list="$$list $$i" ;; \
-- esac; \
-+ @list=''; test -n "$(man8dir)" || exit 0; \
-+ { for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.8[a-z]*$$/p'; \
-+ } | while read p; do \
-+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-+ echo "$$d$$p"; echo "$$p"; \
-+ done | \
-+ sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
-+ sed 'N;N;s,\n, ,g' | { \
-+ list=; while read file base inst; do \
-+ if test "$$base" = "$$inst"; then list="$$list $$file"; else \
-+ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-+ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst" || exit $$?; \
-+ fi; \
+@@ -377,8 +379,8 @@
+ esac; \
done; \
-- for i in $$list; do \
+ for i in $$list; do \
- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
- else file=$$i; fi; \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 8*) ;; \
-- *) ext='8' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-- $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \
-- done
-+ for i in $$list; do echo "$$i"; done | $(am__base_list) | \
-+ while read files; do \
-+ test -z "$$files" || { \
-+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man8dir)'"; \
-+ $(INSTALL_DATA) $$files "$(DESTDIR)$(man8dir)" || exit $$?; }; \
-+ done; }
-+
- uninstall-man8:
- @$(NORMAL_UNINSTALL)
-- @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
-- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-- for i in $$l2; do \
-- case "$$i" in \
-- *.8*) list="$$list $$i" ;; \
-- esac; \
-- done; \
-- for i in $$list; do \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 8*) ;; \
-- *) ext='8' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \
-- rm -f "$(DESTDIR)$(man8dir)/$$inst"; \
-- done
-+ @list=''; test -n "$(man8dir)" || exit 0; \
-+ files=`{ for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.8[a-z]*$$/p'; \
-+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-+ test -z "$$files" || { \
-+ echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \
-+ cd "$(DESTDIR)$(man8dir)" && rm -f $$files; }
-
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
++ if test -f $$i; then file=$$i; \
++ else file=$(srcdir)/$$i; fi; \
+ ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+ case "$$ext" in \
+ 8*) ;; \
+@@ -417,7 +419,7 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -38131,56 +24452,7 @@ Index: pam.debian/modules/pam_permit/Makefile.in
END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
-+ set x; \
- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -428,37 +447,43 @@
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ shift; \
-+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
-- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique; \
-+ if test $$# -gt 0; then \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ "$$@" $$unique; \
-+ else \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$unique; \
-+ fi; \
- fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
- 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; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+ test -z "$(CTAGS_ARGS)$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-- $$tags $$unique
-+ $$unique
-
- GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
-- && cd $(top_srcdir) \
-- && gtags -i $(GTAGS_ARGS) $$here
-+ && $(am__cd) $(top_srcdir) \
-+ && gtags -i $(GTAGS_ARGS) "$$here"
-
- distclean-tags:
+@@ -460,7 +462,7 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
check-TESTS: $(TESTS)
@@ -38188,11 +24460,8 @@ Index: pam.debian/modules/pam_permit/Makefile.in
+ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
srcdir=$(srcdir); export srcdir; \
list=' $(TESTS) '; \
-+ $(am__tty_colors); \
if test -n "$$list"; then \
- for tst in $$list; do \
- if test -f ./$$tst; then dir=./; \
-@@ -467,49 +492,63 @@
+@@ -471,7 +473,7 @@
if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
@@ -38200,35 +24469,19 @@ Index: pam.debian/modules/pam_permit/Makefile.in
+ *[\ \ ]$$tst[\ \ ]*) \
xpass=`expr $$xpass + 1`; \
failed=`expr $$failed + 1`; \
-- echo "XPASS: $$tst"; \
-+ col=$$red; res=XPASS; \
- ;; \
- *) \
-- echo "PASS: $$tst"; \
-+ col=$$grn; res=PASS; \
- ;; \
- esac; \
+ echo "XPASS: $$tst"; \
+@@ -483,7 +485,7 @@
elif test $$? -ne 77; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
- *$$ws$$tst$$ws*) \
+ *[\ \ ]$$tst[\ \ ]*) \
xfail=`expr $$xfail + 1`; \
-- echo "XFAIL: $$tst"; \
-+ col=$$lgn; res=XFAIL; \
+ echo "XFAIL: $$tst"; \
;; \
- *) \
- failed=`expr $$failed + 1`; \
-- echo "FAIL: $$tst"; \
-+ col=$$red; res=FAIL; \
- ;; \
- esac; \
- else \
- skip=`expr $$skip + 1`; \
-- echo "SKIP: $$tst"; \
-+ col=$$blu; res=SKIP; \
+@@ -497,23 +499,36 @@
+ echo "SKIP: $$tst"; \
fi; \
-+ echo "$${col}$$res$${std}: $$tst"; \
done; \
+ if test "$$all" -eq 1; then \
+ tests="test"; \
@@ -38268,22 +24521,7 @@ Index: pam.debian/modules/pam_permit/Makefile.in
test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
dashes="$$skipped"; \
fi; \
-@@ -520,15 +559,32 @@
- dashes="$$report"; \
- fi; \
- dashes=`echo "$$dashes" | sed s/./=/g`; \
-- echo "$$dashes"; \
-+ if test "$$failed" -eq 0; then \
-+ echo "$$grn$$dashes"; \
-+ else \
-+ echo "$$red$$dashes"; \
-+ fi; \
- echo "$$banner"; \
- test -z "$$skipped" || echo "$$skipped"; \
- test -z "$$report" || echo "$$report"; \
-- echo "$$dashes"; \
-+ echo "$$dashes$$std"; \
- test "$$failed" -eq 0; \
+@@ -533,6 +548,19 @@
else :; fi
distdir: $(DISTFILES)
@@ -38303,37 +24541,7 @@ Index: pam.debian/modules/pam_permit/Makefile.in
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
-@@ -544,13 +600,17 @@
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-+ if test -d "$(distdir)/$$file"; then \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+ fi; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
-- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
- else \
-- test -f $(distdir)/$$file \
-- || cp -p $$d/$$file $(distdir)/$$file \
-+ test -f "$(distdir)/$$file" \
-+ || cp -p $$d/$$file "$(distdir)/$$file" \
- || exit 1; \
- fi; \
- done
-@@ -583,6 +643,7 @@
-
- distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -605,6 +666,8 @@
+@@ -609,6 +637,8 @@
html: html-am
@@ -38342,7 +24550,7 @@ Index: pam.debian/modules/pam_permit/Makefile.in
info: info-am
info-am:
-@@ -613,18 +676,28 @@
+@@ -617,18 +647,28 @@
install-dvi: install-dvi-am
@@ -38371,30 +24579,13 @@ Index: pam.debian/modules/pam_permit/Makefile.in
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -649,7 +722,7 @@
-
- uninstall-man: uninstall-man8
-
--.MAKE: install-am install-strip
-+.MAKE: check-am install-am install-strip
-
- .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
- clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
-@@ -669,6 +742,7 @@
-
- @ENABLE_REGENERATE_MAN_TRUE@README: pam_permit.8.xml
- @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
-+
- # 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.
- .NOEXPORT:
-Index: pam.debian/modules/pam_pwhistory/Makefile.in
+Index: pam.deb/modules/pam_pwhistory/Makefile.in
===================================================================
---- pam.debian.orig/modules/pam_pwhistory/Makefile.in
-+++ pam.debian/modules/pam_pwhistory/Makefile.in
+--- pam.deb.orig/modules/pam_pwhistory/Makefile.in
++++ pam.deb/modules/pam_pwhistory/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -38404,67 +24595,7 @@ Index: pam.debian/modules/pam_pwhistory/Makefile.in
# 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.
-@@ -22,8 +23,9 @@
-
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
--pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkglibexecdir = $(libexecdir)/@PACKAGE@
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
-@@ -60,14 +62,29 @@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
-+CONFIG_CLEAN_VPATH_FILES =
- am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
- am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-+am__install_max = 40
-+am__nobase_strip_setup = \
-+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-+am__nobase_strip = \
-+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-+am__nobase_list = $(am__nobase_strip_setup); \
-+ for p in $$list; do echo "$$p $$p"; done | \
-+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-+ if (++n[$$2] == $(am__install_max)) \
-+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-+ END { for (dir in files) print dir, files[dir] }'
-+am__base_list = \
-+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
- am__installdirs = "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man8dir)"
--securelibLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(securelib_LTLIBRARIES)
- pam_pwhistory_la_DEPENDENCIES =
- am_pam_pwhistory_la_OBJECTS = pam_pwhistory.lo opasswd.lo
-@@ -75,6 +92,7 @@
- DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
-+am__mv = mv -f
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-@@ -93,6 +111,8 @@
- HEADERS = $(noinst_HEADERS)
- ETAGS = etags
- CTAGS = ctags
-+am__tty_colors = \
-+red=; grn=; lgn=; blu=; std=
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- AMTAR = @AMTAR@
-@@ -177,6 +197,7 @@
+@@ -179,6 +180,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -38472,7 +24603,7 @@ Index: pam.debian/modules/pam_pwhistory/Makefile.in
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PIE_CFLAGS = @PIE_CFLAGS@
-@@ -278,14 +299,14 @@
+@@ -282,8 +284,8 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -38483,163 +24614,18 @@ Index: pam.debian/modules/pam_pwhistory/Makefile.in
exit 1;; \
esac; \
done; \
-- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/pam_pwhistory/Makefile'; \
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu modules/pam_pwhistory/Makefile
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/pam_pwhistory/Makefile'; \
-+ $(am__cd) $(top_srcdir) && \
-+ $(AUTOMAKE) --gnu modules/pam_pwhistory/Makefile
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
-@@ -303,23 +324,28 @@
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- $(ACLOCAL_M4): $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(am__aclocal_m4_deps):
- install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
- @$(NORMAL_INSTALL)
- test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
-- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-+ @list='$(securelib_LTLIBRARIES)'; test -n "$(securelibdir)" || list=; \
-+ list2=; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-- 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"; \
-+ list2="$$list2 $$p"; \
- else :; fi; \
-- done
-+ done; \
-+ test -z "$$list2" || { \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(securelibdir)'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(securelibdir)"; \
-+ }
-
- uninstall-securelibLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-+ @list='$(securelib_LTLIBRARIES)'; test -n "$(securelibdir)" || list=; \
-+ for p in $$list; do \
-+ $(am__strip_dir) \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$f'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$f"; \
- done
-
- clean-securelibLTLIBRARIES:
-@@ -344,21 +370,21 @@
-
- .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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @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 $@ $<
-@@ -368,65 +394,58 @@
-
- clean-libtool:
- -rm -rf .libs _libs
--install-man8: $(man8_MANS) $(man_MANS)
-+install-man8: $(man_MANS)
- @$(NORMAL_INSTALL)
- 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 \
-- case "$$i" in \
-- *.8*) list="$$list $$i" ;; \
-- esac; \
-+ @list=''; test -n "$(man8dir)" || exit 0; \
-+ { for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.8[a-z]*$$/p'; \
-+ } | while read p; do \
-+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-+ echo "$$d$$p"; echo "$$p"; \
-+ done | \
-+ sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
-+ sed 'N;N;s,\n, ,g' | { \
-+ list=; while read file base inst; do \
-+ if test "$$base" = "$$inst"; then list="$$list $$file"; else \
-+ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-+ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst" || exit $$?; \
-+ fi; \
+@@ -383,8 +385,8 @@
+ esac; \
done; \
-- for i in $$list; do \
+ for i in $$list; do \
- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
- else file=$$i; fi; \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 8*) ;; \
-- *) ext='8' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-- $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \
-- done
-+ for i in $$list; do echo "$$i"; done | $(am__base_list) | \
-+ while read files; do \
-+ test -z "$$files" || { \
-+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man8dir)'"; \
-+ $(INSTALL_DATA) $$files "$(DESTDIR)$(man8dir)" || exit $$?; }; \
-+ done; }
-+
- uninstall-man8:
- @$(NORMAL_UNINSTALL)
-- @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
-- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-- for i in $$l2; do \
-- case "$$i" in \
-- *.8*) list="$$list $$i" ;; \
-- esac; \
-- done; \
-- for i in $$list; do \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 8*) ;; \
-- *) ext='8' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \
-- rm -f "$(DESTDIR)$(man8dir)/$$inst"; \
-- done
-+ @list=''; test -n "$(man8dir)" || exit 0; \
-+ files=`{ for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.8[a-z]*$$/p'; \
-+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-+ test -z "$$files" || { \
-+ echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \
-+ cd "$(DESTDIR)$(man8dir)" && rm -f $$files; }
-
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
++ if test -f $$i; then file=$$i; \
++ else file=$(srcdir)/$$i; fi; \
+ ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+ case "$$ext" in \
+ 8*) ;; \
+@@ -423,7 +425,7 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -38648,56 +24634,7 @@ Index: pam.debian/modules/pam_pwhistory/Makefile.in
END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
-+ set x; \
- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -434,37 +453,43 @@
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ shift; \
-+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
-- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique; \
-+ if test $$# -gt 0; then \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ "$$@" $$unique; \
-+ else \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$unique; \
-+ fi; \
- fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
- 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; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+ test -z "$(CTAGS_ARGS)$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-- $$tags $$unique
-+ $$unique
-
- GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
-- && cd $(top_srcdir) \
-- && gtags -i $(GTAGS_ARGS) $$here
-+ && $(am__cd) $(top_srcdir) \
-+ && gtags -i $(GTAGS_ARGS) "$$here"
-
- distclean-tags:
+@@ -466,7 +468,7 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
check-TESTS: $(TESTS)
@@ -38705,11 +24642,8 @@ Index: pam.debian/modules/pam_pwhistory/Makefile.in
+ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
srcdir=$(srcdir); export srcdir; \
list=' $(TESTS) '; \
-+ $(am__tty_colors); \
if test -n "$$list"; then \
- for tst in $$list; do \
- if test -f ./$$tst; then dir=./; \
-@@ -473,49 +498,63 @@
+@@ -477,7 +479,7 @@
if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
@@ -38717,35 +24651,19 @@ Index: pam.debian/modules/pam_pwhistory/Makefile.in
+ *[\ \ ]$$tst[\ \ ]*) \
xpass=`expr $$xpass + 1`; \
failed=`expr $$failed + 1`; \
-- echo "XPASS: $$tst"; \
-+ col=$$red; res=XPASS; \
- ;; \
- *) \
-- echo "PASS: $$tst"; \
-+ col=$$grn; res=PASS; \
- ;; \
- esac; \
+ echo "XPASS: $$tst"; \
+@@ -489,7 +491,7 @@
elif test $$? -ne 77; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
- *$$ws$$tst$$ws*) \
+ *[\ \ ]$$tst[\ \ ]*) \
xfail=`expr $$xfail + 1`; \
-- echo "XFAIL: $$tst"; \
-+ col=$$lgn; res=XFAIL; \
+ echo "XFAIL: $$tst"; \
;; \
- *) \
- failed=`expr $$failed + 1`; \
-- echo "FAIL: $$tst"; \
-+ col=$$red; res=FAIL; \
- ;; \
- esac; \
- else \
- skip=`expr $$skip + 1`; \
-- echo "SKIP: $$tst"; \
-+ col=$$blu; res=SKIP; \
+@@ -503,23 +505,36 @@
+ echo "SKIP: $$tst"; \
fi; \
-+ echo "$${col}$$res$${std}: $$tst"; \
done; \
+ if test "$$all" -eq 1; then \
+ tests="test"; \
@@ -38785,22 +24703,7 @@ Index: pam.debian/modules/pam_pwhistory/Makefile.in
test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
dashes="$$skipped"; \
fi; \
-@@ -526,15 +565,32 @@
- dashes="$$report"; \
- fi; \
- dashes=`echo "$$dashes" | sed s/./=/g`; \
-- echo "$$dashes"; \
-+ if test "$$failed" -eq 0; then \
-+ echo "$$grn$$dashes"; \
-+ else \
-+ echo "$$red$$dashes"; \
-+ fi; \
- echo "$$banner"; \
- test -z "$$skipped" || echo "$$skipped"; \
- test -z "$$report" || echo "$$report"; \
-- echo "$$dashes"; \
-+ echo "$$dashes$$std"; \
- test "$$failed" -eq 0; \
+@@ -539,6 +554,19 @@
else :; fi
distdir: $(DISTFILES)
@@ -38820,37 +24723,7 @@ Index: pam.debian/modules/pam_pwhistory/Makefile.in
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
-@@ -550,13 +606,17 @@
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-+ if test -d "$(distdir)/$$file"; then \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+ fi; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
-- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
- else \
-- test -f $(distdir)/$$file \
-- || cp -p $$d/$$file $(distdir)/$$file \
-+ test -f "$(distdir)/$$file" \
-+ || cp -p $$d/$$file "$(distdir)/$$file" \
- || exit 1; \
- fi; \
- done
-@@ -589,6 +649,7 @@
-
- distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -611,6 +672,8 @@
+@@ -615,6 +643,8 @@
html: html-am
@@ -38859,7 +24732,7 @@ Index: pam.debian/modules/pam_pwhistory/Makefile.in
info: info-am
info-am:
-@@ -619,18 +682,28 @@
+@@ -623,18 +653,28 @@
install-dvi: install-dvi-am
@@ -38888,30 +24761,13 @@ Index: pam.debian/modules/pam_pwhistory/Makefile.in
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -655,7 +728,7 @@
-
- uninstall-man: uninstall-man8
-
--.MAKE: install-am install-strip
-+.MAKE: check-am install-am install-strip
-
- .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
- clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
-@@ -675,6 +748,7 @@
-
- @ENABLE_REGENERATE_MAN_TRUE@README: pam_pwhistory.8.xml
- @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
-+
- # 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.
- .NOEXPORT:
-Index: pam.debian/modules/pam_rhosts/Makefile.in
+Index: pam.deb/modules/pam_rhosts/Makefile.in
===================================================================
---- pam.debian.orig/modules/pam_rhosts/Makefile.in
-+++ pam.debian/modules/pam_rhosts/Makefile.in
+--- pam.deb.orig/modules/pam_rhosts/Makefile.in
++++ pam.deb/modules/pam_rhosts/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -38921,67 +24777,7 @@ Index: pam.debian/modules/pam_rhosts/Makefile.in
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -21,8 +22,9 @@
-
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
--pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkglibexecdir = $(libexecdir)/@PACKAGE@
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
-@@ -58,14 +60,29 @@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
-+CONFIG_CLEAN_VPATH_FILES =
- am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
- am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-+am__install_max = 40
-+am__nobase_strip_setup = \
-+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-+am__nobase_strip = \
-+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-+am__nobase_list = $(am__nobase_strip_setup); \
-+ for p in $$list; do echo "$$p $$p"; done | \
-+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-+ if (++n[$$2] == $(am__install_max)) \
-+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-+ END { for (dir in files) print dir, files[dir] }'
-+am__base_list = \
-+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
- am__installdirs = "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man8dir)"
--securelibLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(securelib_LTLIBRARIES)
- pam_rhosts_la_DEPENDENCIES =
- pam_rhosts_la_SOURCES = pam_rhosts.c
-@@ -73,6 +90,7 @@
- DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
-+am__mv = mv -f
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-@@ -90,6 +108,8 @@
- DATA = $(noinst_DATA)
- ETAGS = etags
- CTAGS = ctags
-+am__tty_colors = \
-+red=; grn=; lgn=; blu=; std=
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- AMTAR = @AMTAR@
-@@ -174,6 +194,7 @@
+@@ -176,6 +177,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -38989,7 +24785,7 @@ Index: pam.debian/modules/pam_rhosts/Makefile.in
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PIE_CFLAGS = @PIE_CFLAGS@
-@@ -273,14 +294,14 @@
+@@ -277,8 +279,8 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -39000,163 +24796,18 @@ Index: pam.debian/modules/pam_rhosts/Makefile.in
exit 1;; \
esac; \
done; \
-- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/pam_rhosts/Makefile'; \
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu modules/pam_rhosts/Makefile
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/pam_rhosts/Makefile'; \
-+ $(am__cd) $(top_srcdir) && \
-+ $(AUTOMAKE) --gnu modules/pam_rhosts/Makefile
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
-@@ -298,23 +319,28 @@
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- $(ACLOCAL_M4): $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(am__aclocal_m4_deps):
- install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
- @$(NORMAL_INSTALL)
- test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
-- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-+ @list='$(securelib_LTLIBRARIES)'; test -n "$(securelibdir)" || list=; \
-+ list2=; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-- 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"; \
-+ list2="$$list2 $$p"; \
- else :; fi; \
-- done
-+ done; \
-+ test -z "$$list2" || { \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(securelibdir)'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(securelibdir)"; \
-+ }
-
- uninstall-securelibLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-+ @list='$(securelib_LTLIBRARIES)'; test -n "$(securelibdir)" || list=; \
-+ for p in $$list; do \
-+ $(am__strip_dir) \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$f'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$f"; \
- done
-
- clean-securelibLTLIBRARIES:
-@@ -338,21 +364,21 @@
-
- .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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @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,65 +388,58 @@
-
- clean-libtool:
- -rm -rf .libs _libs
--install-man8: $(man8_MANS) $(man_MANS)
-+install-man8: $(man_MANS)
- @$(NORMAL_INSTALL)
- 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 \
-- case "$$i" in \
-- *.8*) list="$$list $$i" ;; \
-- esac; \
-+ @list=''; test -n "$(man8dir)" || exit 0; \
-+ { for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.8[a-z]*$$/p'; \
-+ } | while read p; do \
-+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-+ echo "$$d$$p"; echo "$$p"; \
-+ done | \
-+ sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
-+ sed 'N;N;s,\n, ,g' | { \
-+ list=; while read file base inst; do \
-+ if test "$$base" = "$$inst"; then list="$$list $$file"; else \
-+ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-+ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst" || exit $$?; \
-+ fi; \
+@@ -377,8 +379,8 @@
+ esac; \
done; \
-- for i in $$list; do \
+ for i in $$list; do \
- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
- else file=$$i; fi; \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 8*) ;; \
-- *) ext='8' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-- $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \
-- done
-+ for i in $$list; do echo "$$i"; done | $(am__base_list) | \
-+ while read files; do \
-+ test -z "$$files" || { \
-+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man8dir)'"; \
-+ $(INSTALL_DATA) $$files "$(DESTDIR)$(man8dir)" || exit $$?; }; \
-+ done; }
-+
- uninstall-man8:
- @$(NORMAL_UNINSTALL)
-- @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
-- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-- for i in $$l2; do \
-- case "$$i" in \
-- *.8*) list="$$list $$i" ;; \
-- esac; \
-- done; \
-- for i in $$list; do \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 8*) ;; \
-- *) ext='8' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \
-- rm -f "$(DESTDIR)$(man8dir)/$$inst"; \
-- done
-+ @list=''; test -n "$(man8dir)" || exit 0; \
-+ files=`{ for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.8[a-z]*$$/p'; \
-+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-+ test -z "$$files" || { \
-+ echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \
-+ cd "$(DESTDIR)$(man8dir)" && rm -f $$files; }
-
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
++ if test -f $$i; then file=$$i; \
++ else file=$(srcdir)/$$i; fi; \
+ ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+ case "$$ext" in \
+ 8*) ;; \
+@@ -417,7 +419,7 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -39165,56 +24816,7 @@ Index: pam.debian/modules/pam_rhosts/Makefile.in
END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
-+ set x; \
- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -428,37 +447,43 @@
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ shift; \
-+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
-- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique; \
-+ if test $$# -gt 0; then \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ "$$@" $$unique; \
-+ else \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$unique; \
-+ fi; \
- fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
- 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; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+ test -z "$(CTAGS_ARGS)$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-- $$tags $$unique
-+ $$unique
-
- GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
-- && cd $(top_srcdir) \
-- && gtags -i $(GTAGS_ARGS) $$here
-+ && $(am__cd) $(top_srcdir) \
-+ && gtags -i $(GTAGS_ARGS) "$$here"
-
- distclean-tags:
+@@ -460,7 +462,7 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
check-TESTS: $(TESTS)
@@ -39222,11 +24824,8 @@ Index: pam.debian/modules/pam_rhosts/Makefile.in
+ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
srcdir=$(srcdir); export srcdir; \
list=' $(TESTS) '; \
-+ $(am__tty_colors); \
if test -n "$$list"; then \
- for tst in $$list; do \
- if test -f ./$$tst; then dir=./; \
-@@ -467,49 +492,63 @@
+@@ -471,7 +473,7 @@
if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
@@ -39234,35 +24833,19 @@ Index: pam.debian/modules/pam_rhosts/Makefile.in
+ *[\ \ ]$$tst[\ \ ]*) \
xpass=`expr $$xpass + 1`; \
failed=`expr $$failed + 1`; \
-- echo "XPASS: $$tst"; \
-+ col=$$red; res=XPASS; \
- ;; \
- *) \
-- echo "PASS: $$tst"; \
-+ col=$$grn; res=PASS; \
- ;; \
- esac; \
+ echo "XPASS: $$tst"; \
+@@ -483,7 +485,7 @@
elif test $$? -ne 77; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
- *$$ws$$tst$$ws*) \
+ *[\ \ ]$$tst[\ \ ]*) \
xfail=`expr $$xfail + 1`; \
-- echo "XFAIL: $$tst"; \
-+ col=$$lgn; res=XFAIL; \
+ echo "XFAIL: $$tst"; \
;; \
- *) \
- failed=`expr $$failed + 1`; \
-- echo "FAIL: $$tst"; \
-+ col=$$red; res=FAIL; \
- ;; \
- esac; \
- else \
- skip=`expr $$skip + 1`; \
-- echo "SKIP: $$tst"; \
-+ col=$$blu; res=SKIP; \
+@@ -497,23 +499,36 @@
+ echo "SKIP: $$tst"; \
fi; \
-+ echo "$${col}$$res$${std}: $$tst"; \
done; \
+ if test "$$all" -eq 1; then \
+ tests="test"; \
@@ -39302,22 +24885,7 @@ Index: pam.debian/modules/pam_rhosts/Makefile.in
test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
dashes="$$skipped"; \
fi; \
-@@ -520,15 +559,32 @@
- dashes="$$report"; \
- fi; \
- dashes=`echo "$$dashes" | sed s/./=/g`; \
-- echo "$$dashes"; \
-+ if test "$$failed" -eq 0; then \
-+ echo "$$grn$$dashes"; \
-+ else \
-+ echo "$$red$$dashes"; \
-+ fi; \
- echo "$$banner"; \
- test -z "$$skipped" || echo "$$skipped"; \
- test -z "$$report" || echo "$$report"; \
-- echo "$$dashes"; \
-+ echo "$$dashes$$std"; \
- test "$$failed" -eq 0; \
+@@ -533,6 +548,19 @@
else :; fi
distdir: $(DISTFILES)
@@ -39337,37 +24905,7 @@ Index: pam.debian/modules/pam_rhosts/Makefile.in
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
-@@ -544,13 +600,17 @@
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-+ if test -d "$(distdir)/$$file"; then \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+ fi; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
-- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
- else \
-- test -f $(distdir)/$$file \
-- || cp -p $$d/$$file $(distdir)/$$file \
-+ test -f "$(distdir)/$$file" \
-+ || cp -p $$d/$$file "$(distdir)/$$file" \
- || exit 1; \
- fi; \
- done
-@@ -583,6 +643,7 @@
-
- distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -605,6 +666,8 @@
+@@ -609,6 +637,8 @@
html: html-am
@@ -39376,7 +24914,7 @@ Index: pam.debian/modules/pam_rhosts/Makefile.in
info: info-am
info-am:
-@@ -613,18 +676,28 @@
+@@ -617,18 +647,28 @@
install-dvi: install-dvi-am
@@ -39405,30 +24943,13 @@ Index: pam.debian/modules/pam_rhosts/Makefile.in
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -649,7 +722,7 @@
-
- uninstall-man: uninstall-man8
-
--.MAKE: install-am install-strip
-+.MAKE: check-am install-am install-strip
-
- .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
- clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
-@@ -669,6 +742,7 @@
-
- @ENABLE_REGENERATE_MAN_TRUE@README: pam_rhosts.8.xml
- @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
-+
- # 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.
- .NOEXPORT:
-Index: pam.debian/modules/pam_rootok/Makefile.in
+Index: pam.deb/modules/pam_rootok/Makefile.in
===================================================================
---- pam.debian.orig/modules/pam_rootok/Makefile.in
-+++ pam.debian/modules/pam_rootok/Makefile.in
+--- pam.deb.orig/modules/pam_rootok/Makefile.in
++++ pam.deb/modules/pam_rootok/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -39438,67 +24959,7 @@ Index: pam.debian/modules/pam_rootok/Makefile.in
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -21,8 +22,9 @@
-
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
--pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkglibexecdir = $(libexecdir)/@PACKAGE@
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
-@@ -59,14 +61,29 @@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
-+CONFIG_CLEAN_VPATH_FILES =
- am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
- am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-+am__install_max = 40
-+am__nobase_strip_setup = \
-+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-+am__nobase_strip = \
-+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-+am__nobase_list = $(am__nobase_strip_setup); \
-+ for p in $$list; do echo "$$p $$p"; done | \
-+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-+ if (++n[$$2] == $(am__install_max)) \
-+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-+ END { for (dir in files) print dir, files[dir] }'
-+am__base_list = \
-+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
- am__installdirs = "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man8dir)"
--securelibLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(securelib_LTLIBRARIES)
- pam_rootok_la_DEPENDENCIES =
- pam_rootok_la_SOURCES = pam_rootok.c
-@@ -74,6 +91,7 @@
- DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
-+am__mv = mv -f
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-@@ -91,6 +109,8 @@
- DATA = $(noinst_DATA)
- ETAGS = etags
- CTAGS = ctags
-+am__tty_colors = \
-+red=; grn=; lgn=; blu=; std=
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- AMTAR = @AMTAR@
-@@ -175,6 +195,7 @@
+@@ -177,6 +178,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -39506,7 +24967,7 @@ Index: pam.debian/modules/pam_rootok/Makefile.in
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PIE_CFLAGS = @PIE_CFLAGS@
-@@ -275,14 +296,14 @@
+@@ -279,8 +281,8 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -39517,163 +24978,18 @@ Index: pam.debian/modules/pam_rootok/Makefile.in
exit 1;; \
esac; \
done; \
-- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/pam_rootok/Makefile'; \
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu modules/pam_rootok/Makefile
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/pam_rootok/Makefile'; \
-+ $(am__cd) $(top_srcdir) && \
-+ $(AUTOMAKE) --gnu modules/pam_rootok/Makefile
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
-@@ -300,23 +321,28 @@
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- $(ACLOCAL_M4): $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(am__aclocal_m4_deps):
- install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
- @$(NORMAL_INSTALL)
- test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
-- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-+ @list='$(securelib_LTLIBRARIES)'; test -n "$(securelibdir)" || list=; \
-+ list2=; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-- 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"; \
-+ list2="$$list2 $$p"; \
- else :; fi; \
-- done
-+ done; \
-+ test -z "$$list2" || { \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(securelibdir)'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(securelibdir)"; \
-+ }
-
- uninstall-securelibLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-+ @list='$(securelib_LTLIBRARIES)'; test -n "$(securelibdir)" || list=; \
-+ for p in $$list; do \
-+ $(am__strip_dir) \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$f'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$f"; \
- done
-
- clean-securelibLTLIBRARIES:
-@@ -340,21 +366,21 @@
-
- .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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @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 $@ $<
-@@ -364,65 +390,58 @@
-
- clean-libtool:
- -rm -rf .libs _libs
--install-man8: $(man8_MANS) $(man_MANS)
-+install-man8: $(man_MANS)
- @$(NORMAL_INSTALL)
- 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 \
-- case "$$i" in \
-- *.8*) list="$$list $$i" ;; \
-- esac; \
-+ @list=''; test -n "$(man8dir)" || exit 0; \
-+ { for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.8[a-z]*$$/p'; \
-+ } | while read p; do \
-+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-+ echo "$$d$$p"; echo "$$p"; \
-+ done | \
-+ sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
-+ sed 'N;N;s,\n, ,g' | { \
-+ list=; while read file base inst; do \
-+ if test "$$base" = "$$inst"; then list="$$list $$file"; else \
-+ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-+ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst" || exit $$?; \
-+ fi; \
+@@ -379,8 +381,8 @@
+ esac; \
done; \
-- for i in $$list; do \
+ for i in $$list; do \
- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
- else file=$$i; fi; \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 8*) ;; \
-- *) ext='8' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-- $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \
-- done
-+ for i in $$list; do echo "$$i"; done | $(am__base_list) | \
-+ while read files; do \
-+ test -z "$$files" || { \
-+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man8dir)'"; \
-+ $(INSTALL_DATA) $$files "$(DESTDIR)$(man8dir)" || exit $$?; }; \
-+ done; }
-+
- uninstall-man8:
- @$(NORMAL_UNINSTALL)
-- @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
-- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-- for i in $$l2; do \
-- case "$$i" in \
-- *.8*) list="$$list $$i" ;; \
-- esac; \
-- done; \
-- for i in $$list; do \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 8*) ;; \
-- *) ext='8' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \
-- rm -f "$(DESTDIR)$(man8dir)/$$inst"; \
-- done
-+ @list=''; test -n "$(man8dir)" || exit 0; \
-+ files=`{ for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.8[a-z]*$$/p'; \
-+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-+ test -z "$$files" || { \
-+ echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \
-+ cd "$(DESTDIR)$(man8dir)" && rm -f $$files; }
-
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
++ if test -f $$i; then file=$$i; \
++ else file=$(srcdir)/$$i; fi; \
+ ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+ case "$$ext" in \
+ 8*) ;; \
+@@ -419,7 +421,7 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -39682,56 +24998,7 @@ Index: pam.debian/modules/pam_rootok/Makefile.in
END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
-+ set x; \
- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -430,37 +449,43 @@
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ shift; \
-+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
-- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique; \
-+ if test $$# -gt 0; then \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ "$$@" $$unique; \
-+ else \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$unique; \
-+ fi; \
- fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
- 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; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+ test -z "$(CTAGS_ARGS)$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-- $$tags $$unique
-+ $$unique
-
- GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
-- && cd $(top_srcdir) \
-- && gtags -i $(GTAGS_ARGS) $$here
-+ && $(am__cd) $(top_srcdir) \
-+ && gtags -i $(GTAGS_ARGS) "$$here"
-
- distclean-tags:
+@@ -462,7 +464,7 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
check-TESTS: $(TESTS)
@@ -39739,11 +25006,8 @@ Index: pam.debian/modules/pam_rootok/Makefile.in
+ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
srcdir=$(srcdir); export srcdir; \
list=' $(TESTS) '; \
-+ $(am__tty_colors); \
if test -n "$$list"; then \
- for tst in $$list; do \
- if test -f ./$$tst; then dir=./; \
-@@ -469,49 +494,63 @@
+@@ -473,7 +475,7 @@
if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
@@ -39751,35 +25015,19 @@ Index: pam.debian/modules/pam_rootok/Makefile.in
+ *[\ \ ]$$tst[\ \ ]*) \
xpass=`expr $$xpass + 1`; \
failed=`expr $$failed + 1`; \
-- echo "XPASS: $$tst"; \
-+ col=$$red; res=XPASS; \
- ;; \
- *) \
-- echo "PASS: $$tst"; \
-+ col=$$grn; res=PASS; \
- ;; \
- esac; \
+ echo "XPASS: $$tst"; \
+@@ -485,7 +487,7 @@
elif test $$? -ne 77; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
- *$$ws$$tst$$ws*) \
+ *[\ \ ]$$tst[\ \ ]*) \
xfail=`expr $$xfail + 1`; \
-- echo "XFAIL: $$tst"; \
-+ col=$$lgn; res=XFAIL; \
- ;; \
- *) \
- failed=`expr $$failed + 1`; \
-- echo "FAIL: $$tst"; \
-+ col=$$red; res=FAIL; \
+ echo "XFAIL: $$tst"; \
;; \
- esac; \
- else \
- skip=`expr $$skip + 1`; \
-- echo "SKIP: $$tst"; \
-+ col=$$blu; res=SKIP; \
+@@ -499,23 +501,36 @@
+ echo "SKIP: $$tst"; \
fi; \
-+ echo "$${col}$$res$${std}: $$tst"; \
done; \
+ if test "$$all" -eq 1; then \
+ tests="test"; \
@@ -39819,22 +25067,7 @@ Index: pam.debian/modules/pam_rootok/Makefile.in
test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
dashes="$$skipped"; \
fi; \
-@@ -522,15 +561,32 @@
- dashes="$$report"; \
- fi; \
- dashes=`echo "$$dashes" | sed s/./=/g`; \
-- echo "$$dashes"; \
-+ if test "$$failed" -eq 0; then \
-+ echo "$$grn$$dashes"; \
-+ else \
-+ echo "$$red$$dashes"; \
-+ fi; \
- echo "$$banner"; \
- test -z "$$skipped" || echo "$$skipped"; \
- test -z "$$report" || echo "$$report"; \
-- echo "$$dashes"; \
-+ echo "$$dashes$$std"; \
- test "$$failed" -eq 0; \
+@@ -535,6 +550,19 @@
else :; fi
distdir: $(DISTFILES)
@@ -39854,37 +25087,7 @@ Index: pam.debian/modules/pam_rootok/Makefile.in
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
-@@ -546,13 +602,17 @@
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-+ if test -d "$(distdir)/$$file"; then \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+ fi; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
-- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
- else \
-- test -f $(distdir)/$$file \
-- || cp -p $$d/$$file $(distdir)/$$file \
-+ test -f "$(distdir)/$$file" \
-+ || cp -p $$d/$$file "$(distdir)/$$file" \
- || exit 1; \
- fi; \
- done
-@@ -585,6 +645,7 @@
-
- distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -607,6 +668,8 @@
+@@ -611,6 +639,8 @@
html: html-am
@@ -39893,7 +25096,7 @@ Index: pam.debian/modules/pam_rootok/Makefile.in
info: info-am
info-am:
-@@ -615,18 +678,28 @@
+@@ -619,18 +649,28 @@
install-dvi: install-dvi-am
@@ -39922,30 +25125,13 @@ Index: pam.debian/modules/pam_rootok/Makefile.in
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -651,7 +724,7 @@
-
- uninstall-man: uninstall-man8
-
--.MAKE: install-am install-strip
-+.MAKE: check-am install-am install-strip
-
- .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
- clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
-@@ -671,6 +744,7 @@
-
- @ENABLE_REGENERATE_MAN_TRUE@README: pam_rootok.8.xml
- @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
-+
- # 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.
- .NOEXPORT:
-Index: pam.debian/modules/pam_selinux/Makefile.in
+Index: pam.deb/modules/pam_selinux/Makefile.in
===================================================================
---- pam.debian.orig/modules/pam_selinux/Makefile.in
-+++ pam.debian/modules/pam_selinux/Makefile.in
+--- pam.deb.orig/modules/pam_selinux/Makefile.in
++++ pam.deb/modules/pam_selinux/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -39955,67 +25141,7 @@ Index: pam.debian/modules/pam_selinux/Makefile.in
# 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.
-@@ -22,8 +23,9 @@
-
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
--pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkglibexecdir = $(libexecdir)/@PACKAGE@
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
-@@ -60,14 +62,29 @@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
-+CONFIG_CLEAN_VPATH_FILES =
- am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
- am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-+am__install_max = 40
-+am__nobase_strip_setup = \
-+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-+am__nobase_strip = \
-+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-+am__nobase_list = $(am__nobase_strip_setup); \
-+ for p in $$list; do echo "$$p $$p"; done | \
-+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-+ if (++n[$$2] == $(am__install_max)) \
-+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-+ END { for (dir in files) print dir, files[dir] }'
-+am__base_list = \
-+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
- am__installdirs = "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man8dir)"
--securelibLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(securelib_LTLIBRARIES)
- pam_selinux_la_DEPENDENCIES =
- pam_selinux_la_SOURCES = pam_selinux.c
-@@ -86,6 +103,7 @@
- DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
-+am__mv = mv -f
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-@@ -103,6 +121,8 @@
- DATA = $(noinst_DATA)
- ETAGS = etags
- CTAGS = ctags
-+am__tty_colors = \
-+red=; grn=; lgn=; blu=; std=
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- AMTAR = @AMTAR@
-@@ -187,6 +207,7 @@
+@@ -189,6 +190,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -40023,7 +25149,7 @@ Index: pam.debian/modules/pam_selinux/Makefile.in
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PIE_CFLAGS = @PIE_CFLAGS@
-@@ -295,14 +316,14 @@
+@@ -299,8 +301,8 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -40034,182 +25160,18 @@ Index: pam.debian/modules/pam_selinux/Makefile.in
exit 1;; \
esac; \
done; \
-- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/pam_selinux/Makefile'; \
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu modules/pam_selinux/Makefile
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/pam_selinux/Makefile'; \
-+ $(am__cd) $(top_srcdir) && \
-+ $(AUTOMAKE) --gnu modules/pam_selinux/Makefile
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
-@@ -320,23 +341,28 @@
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- $(ACLOCAL_M4): $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(am__aclocal_m4_deps):
- install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
- @$(NORMAL_INSTALL)
- test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
-- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-+ @list='$(securelib_LTLIBRARIES)'; test -n "$(securelibdir)" || list=; \
-+ list2=; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-- 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"; \
-+ list2="$$list2 $$p"; \
- else :; fi; \
-- done
-+ done; \
-+ test -z "$$list2" || { \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(securelibdir)'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(securelibdir)"; \
-+ }
-
- uninstall-securelibLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-+ @list='$(securelib_LTLIBRARIES)'; test -n "$(securelibdir)" || list=; \
-+ for p in $$list; do \
-+ $(am__strip_dir) \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$f'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$f"; \
- done
-
- clean-securelibLTLIBRARIES:
-@@ -351,11 +377,13 @@
- $(pam_selinux_la_LINK) $(am_pam_selinux_la_rpath) $(pam_selinux_la_OBJECTS) $(pam_selinux_la_LIBADD) $(LIBS)
-
- clean-noinstPROGRAMS:
-- @list='$(noinst_PROGRAMS)'; for p in $$list; do \
-- f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-- echo " rm -f $$p $$f"; \
-- rm -f $$p $$f ; \
-- done
-+ @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
-+ echo " rm -f" $$list; \
-+ rm -f $$list || exit $$?; \
-+ test -n "$(EXEEXT)" || exit 0; \
-+ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
-+ echo " rm -f" $$list; \
-+ rm -f $$list
- 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)
-@@ -371,21 +399,21 @@
-
- .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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @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 $@ $<
-@@ -395,65 +423,58 @@
-
- clean-libtool:
- -rm -rf .libs _libs
--install-man8: $(man8_MANS) $(man_MANS)
-+install-man8: $(man_MANS)
- @$(NORMAL_INSTALL)
- 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 \
-- case "$$i" in \
-- *.8*) list="$$list $$i" ;; \
-- esac; \
-+ @list=''; test -n "$(man8dir)" || exit 0; \
-+ { for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.8[a-z]*$$/p'; \
-+ } | while read p; do \
-+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-+ echo "$$d$$p"; echo "$$p"; \
-+ done | \
-+ sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
-+ sed 'N;N;s,\n, ,g' | { \
-+ list=; while read file base inst; do \
-+ if test "$$base" = "$$inst"; then list="$$list $$file"; else \
-+ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-+ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst" || exit $$?; \
-+ fi; \
+@@ -410,8 +412,8 @@
+ esac; \
done; \
-- for i in $$list; do \
+ for i in $$list; do \
- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
- else file=$$i; fi; \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 8*) ;; \
-- *) ext='8' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-- $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \
-- done
-+ for i in $$list; do echo "$$i"; done | $(am__base_list) | \
-+ while read files; do \
-+ test -z "$$files" || { \
-+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man8dir)'"; \
-+ $(INSTALL_DATA) $$files "$(DESTDIR)$(man8dir)" || exit $$?; }; \
-+ done; }
-+
- uninstall-man8:
- @$(NORMAL_UNINSTALL)
-- @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
-- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-- for i in $$l2; do \
-- case "$$i" in \
-- *.8*) list="$$list $$i" ;; \
-- esac; \
-- done; \
-- for i in $$list; do \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 8*) ;; \
-- *) ext='8' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \
-- rm -f "$(DESTDIR)$(man8dir)/$$inst"; \
-- done
-+ @list=''; test -n "$(man8dir)" || exit 0; \
-+ files=`{ for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.8[a-z]*$$/p'; \
-+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-+ test -z "$$files" || { \
-+ echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \
-+ cd "$(DESTDIR)$(man8dir)" && rm -f $$files; }
-
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
++ if test -f $$i; then file=$$i; \
++ else file=$(srcdir)/$$i; fi; \
+ ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+ case "$$ext" in \
+ 8*) ;; \
+@@ -450,7 +452,7 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -40218,56 +25180,7 @@ Index: pam.debian/modules/pam_selinux/Makefile.in
END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
-+ set x; \
- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -461,37 +482,43 @@
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ shift; \
-+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
-- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique; \
-+ if test $$# -gt 0; then \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ "$$@" $$unique; \
-+ else \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$unique; \
-+ fi; \
- fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
- 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; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+ test -z "$(CTAGS_ARGS)$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-- $$tags $$unique
-+ $$unique
-
- GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
-- && cd $(top_srcdir) \
-- && gtags -i $(GTAGS_ARGS) $$here
-+ && $(am__cd) $(top_srcdir) \
-+ && gtags -i $(GTAGS_ARGS) "$$here"
-
- distclean-tags:
+@@ -493,7 +495,7 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
check-TESTS: $(TESTS)
@@ -40275,11 +25188,8 @@ Index: pam.debian/modules/pam_selinux/Makefile.in
+ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
srcdir=$(srcdir); export srcdir; \
list=' $(TESTS) '; \
-+ $(am__tty_colors); \
if test -n "$$list"; then \
- for tst in $$list; do \
- if test -f ./$$tst; then dir=./; \
-@@ -500,49 +527,63 @@
+@@ -504,7 +506,7 @@
if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
@@ -40287,35 +25197,19 @@ Index: pam.debian/modules/pam_selinux/Makefile.in
+ *[\ \ ]$$tst[\ \ ]*) \
xpass=`expr $$xpass + 1`; \
failed=`expr $$failed + 1`; \
-- echo "XPASS: $$tst"; \
-+ col=$$red; res=XPASS; \
- ;; \
- *) \
-- echo "PASS: $$tst"; \
-+ col=$$grn; res=PASS; \
- ;; \
- esac; \
+ echo "XPASS: $$tst"; \
+@@ -516,7 +518,7 @@
elif test $$? -ne 77; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
- *$$ws$$tst$$ws*) \
+ *[\ \ ]$$tst[\ \ ]*) \
xfail=`expr $$xfail + 1`; \
-- echo "XFAIL: $$tst"; \
-+ col=$$lgn; res=XFAIL; \
+ echo "XFAIL: $$tst"; \
;; \
- *) \
- failed=`expr $$failed + 1`; \
-- echo "FAIL: $$tst"; \
-+ col=$$red; res=FAIL; \
- ;; \
- esac; \
- else \
- skip=`expr $$skip + 1`; \
-- echo "SKIP: $$tst"; \
-+ col=$$blu; res=SKIP; \
+@@ -530,23 +532,36 @@
+ echo "SKIP: $$tst"; \
fi; \
-+ echo "$${col}$$res$${std}: $$tst"; \
done; \
+ if test "$$all" -eq 1; then \
+ tests="test"; \
@@ -40355,22 +25249,7 @@ Index: pam.debian/modules/pam_selinux/Makefile.in
test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
dashes="$$skipped"; \
fi; \
-@@ -553,15 +594,32 @@
- dashes="$$report"; \
- fi; \
- dashes=`echo "$$dashes" | sed s/./=/g`; \
-- echo "$$dashes"; \
-+ if test "$$failed" -eq 0; then \
-+ echo "$$grn$$dashes"; \
-+ else \
-+ echo "$$red$$dashes"; \
-+ fi; \
- echo "$$banner"; \
- test -z "$$skipped" || echo "$$skipped"; \
- test -z "$$report" || echo "$$report"; \
-- echo "$$dashes"; \
-+ echo "$$dashes$$std"; \
- test "$$failed" -eq 0; \
+@@ -566,6 +581,19 @@
else :; fi
distdir: $(DISTFILES)
@@ -40390,37 +25269,7 @@ Index: pam.debian/modules/pam_selinux/Makefile.in
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
-@@ -577,13 +635,17 @@
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-+ if test -d "$(distdir)/$$file"; then \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+ fi; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
-- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
- else \
-- test -f $(distdir)/$$file \
-- || cp -p $$d/$$file $(distdir)/$$file \
-+ test -f "$(distdir)/$$file" \
-+ || cp -p $$d/$$file "$(distdir)/$$file" \
- || exit 1; \
- fi; \
- done
-@@ -616,6 +678,7 @@
-
- distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -638,6 +701,8 @@
+@@ -642,6 +670,8 @@
html: html-am
@@ -40429,7 +25278,7 @@ Index: pam.debian/modules/pam_selinux/Makefile.in
info: info-am
info-am:
-@@ -646,18 +711,28 @@
+@@ -650,18 +680,28 @@
install-dvi: install-dvi-am
@@ -40458,30 +25307,13 @@ Index: pam.debian/modules/pam_selinux/Makefile.in
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -682,7 +757,7 @@
-
- uninstall-man: uninstall-man8
-
--.MAKE: install-am install-strip
-+.MAKE: check-am install-am install-strip
-
- .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
- clean-generic clean-libtool clean-noinstPROGRAMS \
-@@ -702,6 +777,7 @@
-
- @ENABLE_REGENERATE_MAN_TRUE@README: pam_selinux.8.xml
- @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
-+
- # 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.
- .NOEXPORT:
-Index: pam.debian/modules/pam_sepermit/Makefile.in
+Index: pam.deb/modules/pam_sepermit/Makefile.in
===================================================================
---- pam.debian.orig/modules/pam_sepermit/Makefile.in
-+++ pam.debian/modules/pam_sepermit/Makefile.in
+--- pam.deb.orig/modules/pam_sepermit/Makefile.in
++++ pam.deb/modules/pam_sepermit/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -40491,74 +25323,7 @@ Index: pam.debian/modules/pam_sepermit/Makefile.in
# 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.
-@@ -22,8 +23,9 @@
-
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
--pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkglibexecdir = $(libexecdir)/@PACKAGE@
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
-@@ -59,16 +61,31 @@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
-+CONFIG_CLEAN_VPATH_FILES =
- am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
- am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-+am__install_max = 40
-+am__nobase_strip_setup = \
-+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-+am__nobase_strip = \
-+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-+am__nobase_list = $(am__nobase_strip_setup); \
-+ for p in $$list; do echo "$$p $$p"; done | \
-+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-+ if (++n[$$2] == $(am__install_max)) \
-+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-+ END { for (dir in files) print dir, files[dir] }'
-+am__base_list = \
-+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
- am__installdirs = "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man5dir)" \
- "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(secureconfdir)" \
- "$(DESTDIR)$(sepermitlockdir)"
--securelibLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(securelib_LTLIBRARIES)
- pam_sepermit_la_DEPENDENCIES =
- pam_sepermit_la_SOURCES = pam_sepermit.c
-@@ -81,6 +98,7 @@
- DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
-+am__mv = mv -f
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-@@ -96,11 +114,11 @@
- man8dir = $(mandir)/man8
- NROFF = nroff
- MANS = $(man_MANS)
--secureconfDATA_INSTALL = $(INSTALL_DATA)
--sepermitlockDATA_INSTALL = $(INSTALL_DATA)
- DATA = $(noinst_DATA) $(secureconf_DATA) $(sepermitlock_DATA)
- ETAGS = etags
- CTAGS = ctags
-+am__tty_colors = \
-+red=; grn=; lgn=; blu=; std=
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- AMTAR = @AMTAR@
-@@ -185,6 +203,7 @@
+@@ -187,6 +188,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -40566,7 +25331,7 @@ Index: pam.debian/modules/pam_sepermit/Makefile.in
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PIE_CFLAGS = @PIE_CFLAGS@
-@@ -292,14 +311,14 @@
+@@ -296,8 +298,8 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -40577,299 +25342,29 @@ Index: pam.debian/modules/pam_sepermit/Makefile.in
exit 1;; \
esac; \
done; \
-- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/pam_sepermit/Makefile'; \
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu modules/pam_sepermit/Makefile
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/pam_sepermit/Makefile'; \
-+ $(am__cd) $(top_srcdir) && \
-+ $(AUTOMAKE) --gnu modules/pam_sepermit/Makefile
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
-@@ -317,23 +336,28 @@
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- $(ACLOCAL_M4): $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(am__aclocal_m4_deps):
- install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
- @$(NORMAL_INSTALL)
- test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
-- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-+ @list='$(securelib_LTLIBRARIES)'; test -n "$(securelibdir)" || list=; \
-+ list2=; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-- 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"; \
-+ list2="$$list2 $$p"; \
- else :; fi; \
-- done
-+ done; \
-+ test -z "$$list2" || { \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(securelibdir)'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(securelibdir)"; \
-+ }
-
- uninstall-securelibLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-+ @list='$(securelib_LTLIBRARIES)'; test -n "$(securelibdir)" || list=; \
-+ for p in $$list; do \
-+ $(am__strip_dir) \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$f'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$f"; \
- done
-
- clean-securelibLTLIBRARIES:
-@@ -357,21 +381,21 @@
-
- .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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @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 $@ $<
-@@ -381,144 +405,136 @@
-
- clean-libtool:
- -rm -rf .libs _libs
--install-man5: $(man5_MANS) $(man_MANS)
-+install-man5: $(man_MANS)
- @$(NORMAL_INSTALL)
- 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 \
-- case "$$i" in \
-- *.5*) list="$$list $$i" ;; \
-- esac; \
-+ @list=''; test -n "$(man5dir)" || exit 0; \
-+ { for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.5[a-z]*$$/p'; \
-+ } | while read p; do \
-+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-+ echo "$$d$$p"; echo "$$p"; \
-+ done | \
-+ sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^5][0-9a-z]*$$,5,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
-+ sed 'N;N;s,\n, ,g' | { \
-+ list=; while read file base inst; do \
-+ if test "$$base" = "$$inst"; then list="$$list $$file"; else \
-+ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man5dir)/$$inst'"; \
-+ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man5dir)/$$inst" || exit $$?; \
-+ fi; \
+@@ -396,8 +398,8 @@
+ esac; \
done; \
-- for i in $$list; do \
+ for i in $$list; do \
- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
- else file=$$i; fi; \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 5*) ;; \
-- *) ext='5' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man5dir)/$$inst'"; \
-- $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man5dir)/$$inst"; \
-- done
-+ for i in $$list; do echo "$$i"; done | $(am__base_list) | \
-+ while read files; do \
-+ test -z "$$files" || { \
-+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man5dir)'"; \
-+ $(INSTALL_DATA) $$files "$(DESTDIR)$(man5dir)" || exit $$?; }; \
-+ done; }
-+
- uninstall-man5:
- @$(NORMAL_UNINSTALL)
-- @list='$(man5_MANS) $(dist_man5_MANS) $(nodist_man5_MANS)'; \
-- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-- for i in $$l2; do \
-- case "$$i" in \
-- *.5*) list="$$list $$i" ;; \
-- esac; \
-- done; \
-- for i in $$list; do \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 5*) ;; \
-- *) ext='5' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " rm -f '$(DESTDIR)$(man5dir)/$$inst'"; \
-- rm -f "$(DESTDIR)$(man5dir)/$$inst"; \
-- done
--install-man8: $(man8_MANS) $(man_MANS)
-+ @list=''; test -n "$(man5dir)" || exit 0; \
-+ files=`{ for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.5[a-z]*$$/p'; \
-+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^5][0-9a-z]*$$,5,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-+ test -z "$$files" || { \
-+ echo " ( cd '$(DESTDIR)$(man5dir)' && rm -f" $$files ")"; \
-+ cd "$(DESTDIR)$(man5dir)" && rm -f $$files; }
-+install-man8: $(man_MANS)
- @$(NORMAL_INSTALL)
- 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 \
-- case "$$i" in \
-- *.8*) list="$$list $$i" ;; \
-- esac; \
-+ @list=''; test -n "$(man8dir)" || exit 0; \
-+ { for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.8[a-z]*$$/p'; \
-+ } | while read p; do \
-+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-+ echo "$$d$$p"; echo "$$p"; \
-+ done | \
-+ sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
-+ sed 'N;N;s,\n, ,g' | { \
-+ list=; while read file base inst; do \
-+ if test "$$base" = "$$inst"; then list="$$list $$file"; else \
-+ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-+ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst" || exit $$?; \
-+ fi; \
++ if test -f $$i; then file=$$i; \
++ else file=$(srcdir)/$$i; fi; \
+ ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+ case "$$ext" in \
+ 5*) ;; \
+@@ -441,8 +443,8 @@
+ esac; \
done; \
-- for i in $$list; do \
+ for i in $$list; do \
- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
- else file=$$i; fi; \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 8*) ;; \
-- *) ext='8' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-- $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \
-- done
-+ for i in $$list; do echo "$$i"; done | $(am__base_list) | \
-+ while read files; do \
-+ test -z "$$files" || { \
-+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man8dir)'"; \
-+ $(INSTALL_DATA) $$files "$(DESTDIR)$(man8dir)" || exit $$?; }; \
-+ done; }
-+
- uninstall-man8:
- @$(NORMAL_UNINSTALL)
-- @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
-- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-- for i in $$l2; do \
-- case "$$i" in \
-- *.8*) list="$$list $$i" ;; \
-- esac; \
-- done; \
-- for i in $$list; do \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 8*) ;; \
-- *) ext='8' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \
-- rm -f "$(DESTDIR)$(man8dir)/$$inst"; \
-- done
-+ @list=''; test -n "$(man8dir)" || exit 0; \
-+ files=`{ for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.8[a-z]*$$/p'; \
-+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-+ test -z "$$files" || { \
-+ echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \
-+ cd "$(DESTDIR)$(man8dir)" && rm -f $$files; }
- install-secureconfDATA: $(secureconf_DATA)
- @$(NORMAL_INSTALL)
- test -z "$(secureconfdir)" || $(MKDIR_P) "$(DESTDIR)$(secureconfdir)"
-- @list='$(secureconf_DATA)'; for p in $$list; do \
-+ @list='$(secureconf_DATA)'; test -n "$(secureconfdir)" || list=; \
-+ for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-- echo " $(secureconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(secureconfdir)/$$f'"; \
-- $(secureconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(secureconfdir)/$$f"; \
-+ echo "$$d$$p"; \
-+ done | $(am__base_list) | \
-+ while read files; do \
-+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(secureconfdir)'"; \
-+ $(INSTALL_DATA) $$files "$(DESTDIR)$(secureconfdir)" || exit $$?; \
- done
-
- uninstall-secureconfDATA:
- @$(NORMAL_UNINSTALL)
-- @list='$(secureconf_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-- echo " rm -f '$(DESTDIR)$(secureconfdir)/$$f'"; \
-- rm -f "$(DESTDIR)$(secureconfdir)/$$f"; \
-- done
-+ @list='$(secureconf_DATA)'; test -n "$(secureconfdir)" || list=; \
-+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-+ test -n "$$files" || exit 0; \
-+ echo " ( cd '$(DESTDIR)$(secureconfdir)' && rm -f" $$files ")"; \
-+ cd "$(DESTDIR)$(secureconfdir)" && rm -f $$files
- install-sepermitlockDATA: $(sepermitlock_DATA)
- @$(NORMAL_INSTALL)
- test -z "$(sepermitlockdir)" || $(MKDIR_P) "$(DESTDIR)$(sepermitlockdir)"
-- @list='$(sepermitlock_DATA)'; for p in $$list; do \
-+ @list='$(sepermitlock_DATA)'; test -n "$(sepermitlockdir)" || list=; \
-+ for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-- echo " $(sepermitlockDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sepermitlockdir)/$$f'"; \
-- $(sepermitlockDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sepermitlockdir)/$$f"; \
-+ echo "$$d$$p"; \
-+ done | $(am__base_list) | \
-+ while read files; do \
-+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(sepermitlockdir)'"; \
-+ $(INSTALL_DATA) $$files "$(DESTDIR)$(sepermitlockdir)" || exit $$?; \
- done
-
- uninstall-sepermitlockDATA:
- @$(NORMAL_UNINSTALL)
-- @list='$(sepermitlock_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-- echo " rm -f '$(DESTDIR)$(sepermitlockdir)/$$f'"; \
-- rm -f "$(DESTDIR)$(sepermitlockdir)/$$f"; \
-- done
-+ @list='$(sepermitlock_DATA)'; test -n "$(sepermitlockdir)" || list=; \
-+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-+ test -n "$$files" || exit 0; \
-+ echo " ( cd '$(DESTDIR)$(sepermitlockdir)' && rm -f" $$files ")"; \
-+ cd "$(DESTDIR)$(sepermitlockdir)" && rm -f $$files
-
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
++ if test -f $$i; then file=$$i; \
++ else file=$(srcdir)/$$i; fi; \
+ ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+ case "$$ext" in \
+ 8*) ;; \
+@@ -515,7 +517,7 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -40878,56 +25373,7 @@ Index: pam.debian/modules/pam_sepermit/Makefile.in
END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
-+ set x; \
- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -526,37 +542,43 @@
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ shift; \
-+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
-- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique; \
-+ if test $$# -gt 0; then \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ "$$@" $$unique; \
-+ else \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$unique; \
-+ fi; \
- fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
- 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; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+ test -z "$(CTAGS_ARGS)$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-- $$tags $$unique
-+ $$unique
-
- GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
-- && cd $(top_srcdir) \
-- && gtags -i $(GTAGS_ARGS) $$here
-+ && $(am__cd) $(top_srcdir) \
-+ && gtags -i $(GTAGS_ARGS) "$$here"
-
- distclean-tags:
+@@ -558,7 +560,7 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
check-TESTS: $(TESTS)
@@ -40935,11 +25381,8 @@ Index: pam.debian/modules/pam_sepermit/Makefile.in
+ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
srcdir=$(srcdir); export srcdir; \
list=' $(TESTS) '; \
-+ $(am__tty_colors); \
if test -n "$$list"; then \
- for tst in $$list; do \
- if test -f ./$$tst; then dir=./; \
-@@ -565,49 +587,63 @@
+@@ -569,7 +571,7 @@
if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
@@ -40947,35 +25390,19 @@ Index: pam.debian/modules/pam_sepermit/Makefile.in
+ *[\ \ ]$$tst[\ \ ]*) \
xpass=`expr $$xpass + 1`; \
failed=`expr $$failed + 1`; \
-- echo "XPASS: $$tst"; \
-+ col=$$red; res=XPASS; \
- ;; \
- *) \
-- echo "PASS: $$tst"; \
-+ col=$$grn; res=PASS; \
- ;; \
- esac; \
+ echo "XPASS: $$tst"; \
+@@ -581,7 +583,7 @@
elif test $$? -ne 77; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
- *$$ws$$tst$$ws*) \
+ *[\ \ ]$$tst[\ \ ]*) \
xfail=`expr $$xfail + 1`; \
-- echo "XFAIL: $$tst"; \
-+ col=$$lgn; res=XFAIL; \
+ echo "XFAIL: $$tst"; \
;; \
- *) \
- failed=`expr $$failed + 1`; \
-- echo "FAIL: $$tst"; \
-+ col=$$red; res=FAIL; \
- ;; \
- esac; \
- else \
- skip=`expr $$skip + 1`; \
-- echo "SKIP: $$tst"; \
-+ col=$$blu; res=SKIP; \
+@@ -595,23 +597,36 @@
+ echo "SKIP: $$tst"; \
fi; \
-+ echo "$${col}$$res$${std}: $$tst"; \
done; \
+ if test "$$all" -eq 1; then \
+ tests="test"; \
@@ -41015,22 +25442,7 @@ Index: pam.debian/modules/pam_sepermit/Makefile.in
test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
dashes="$$skipped"; \
fi; \
-@@ -618,15 +654,32 @@
- dashes="$$report"; \
- fi; \
- dashes=`echo "$$dashes" | sed s/./=/g`; \
-- echo "$$dashes"; \
-+ if test "$$failed" -eq 0; then \
-+ echo "$$grn$$dashes"; \
-+ else \
-+ echo "$$red$$dashes"; \
-+ fi; \
- echo "$$banner"; \
- test -z "$$skipped" || echo "$$skipped"; \
- test -z "$$report" || echo "$$report"; \
-- echo "$$dashes"; \
-+ echo "$$dashes$$std"; \
- test "$$failed" -eq 0; \
+@@ -631,6 +646,19 @@
else :; fi
distdir: $(DISTFILES)
@@ -41050,37 +25462,7 @@ Index: pam.debian/modules/pam_sepermit/Makefile.in
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
-@@ -642,13 +695,17 @@
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-+ if test -d "$(distdir)/$$file"; then \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+ fi; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
-- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
- else \
-- test -f $(distdir)/$$file \
-- || cp -p $$d/$$file $(distdir)/$$file \
-+ test -f "$(distdir)/$$file" \
-+ || cp -p $$d/$$file "$(distdir)/$$file" \
- || exit 1; \
- fi; \
- done
-@@ -681,6 +738,7 @@
-
- distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -703,6 +761,8 @@
+@@ -707,6 +735,8 @@
html: html-am
@@ -41089,7 +25471,7 @@ Index: pam.debian/modules/pam_sepermit/Makefile.in
info: info-am
info-am:
-@@ -712,18 +772,28 @@
+@@ -716,18 +746,28 @@
install-dvi: install-dvi-am
@@ -41118,30 +25500,13 @@ Index: pam.debian/modules/pam_sepermit/Makefile.in
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -749,7 +819,7 @@
-
- uninstall-man: uninstall-man5 uninstall-man8
-
--.MAKE: install-am install-strip
-+.MAKE: check-am install-am install-strip
-
- .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
- clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
-@@ -771,6 +841,7 @@
-
- @ENABLE_REGENERATE_MAN_TRUE@README: pam_sepermit.8.xml
- @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
-+
- # 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.
- .NOEXPORT:
-Index: pam.debian/modules/pam_shells/Makefile.in
+Index: pam.deb/modules/pam_shells/Makefile.in
===================================================================
---- pam.debian.orig/modules/pam_shells/Makefile.in
-+++ pam.debian/modules/pam_shells/Makefile.in
+--- pam.deb.orig/modules/pam_shells/Makefile.in
++++ pam.deb/modules/pam_shells/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -41151,67 +25516,7 @@ Index: pam.debian/modules/pam_shells/Makefile.in
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -21,8 +22,9 @@
-
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
--pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkglibexecdir = $(libexecdir)/@PACKAGE@
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
-@@ -58,14 +60,29 @@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
-+CONFIG_CLEAN_VPATH_FILES =
- am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
- am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-+am__install_max = 40
-+am__nobase_strip_setup = \
-+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-+am__nobase_strip = \
-+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-+am__nobase_list = $(am__nobase_strip_setup); \
-+ for p in $$list; do echo "$$p $$p"; done | \
-+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-+ if (++n[$$2] == $(am__install_max)) \
-+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-+ END { for (dir in files) print dir, files[dir] }'
-+am__base_list = \
-+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
- am__installdirs = "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man8dir)"
--securelibLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(securelib_LTLIBRARIES)
- pam_shells_la_DEPENDENCIES =
- pam_shells_la_SOURCES = pam_shells.c
-@@ -73,6 +90,7 @@
- DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
-+am__mv = mv -f
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-@@ -90,6 +108,8 @@
- DATA = $(noinst_DATA)
- ETAGS = etags
- CTAGS = ctags
-+am__tty_colors = \
-+red=; grn=; lgn=; blu=; std=
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- AMTAR = @AMTAR@
-@@ -174,6 +194,7 @@
+@@ -176,6 +177,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -41219,7 +25524,7 @@ Index: pam.debian/modules/pam_shells/Makefile.in
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PIE_CFLAGS = @PIE_CFLAGS@
-@@ -273,14 +294,14 @@
+@@ -277,8 +279,8 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -41230,163 +25535,18 @@ Index: pam.debian/modules/pam_shells/Makefile.in
exit 1;; \
esac; \
done; \
-- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/pam_shells/Makefile'; \
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu modules/pam_shells/Makefile
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/pam_shells/Makefile'; \
-+ $(am__cd) $(top_srcdir) && \
-+ $(AUTOMAKE) --gnu modules/pam_shells/Makefile
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
-@@ -298,23 +319,28 @@
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- $(ACLOCAL_M4): $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(am__aclocal_m4_deps):
- install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
- @$(NORMAL_INSTALL)
- test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
-- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-+ @list='$(securelib_LTLIBRARIES)'; test -n "$(securelibdir)" || list=; \
-+ list2=; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-- 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"; \
-+ list2="$$list2 $$p"; \
- else :; fi; \
-- done
-+ done; \
-+ test -z "$$list2" || { \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(securelibdir)'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(securelibdir)"; \
-+ }
-
- uninstall-securelibLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-+ @list='$(securelib_LTLIBRARIES)'; test -n "$(securelibdir)" || list=; \
-+ for p in $$list; do \
-+ $(am__strip_dir) \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$f'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$f"; \
- done
-
- clean-securelibLTLIBRARIES:
-@@ -338,21 +364,21 @@
-
- .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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @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,65 +388,58 @@
-
- clean-libtool:
- -rm -rf .libs _libs
--install-man8: $(man8_MANS) $(man_MANS)
-+install-man8: $(man_MANS)
- @$(NORMAL_INSTALL)
- 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 \
-- case "$$i" in \
-- *.8*) list="$$list $$i" ;; \
-- esac; \
-+ @list=''; test -n "$(man8dir)" || exit 0; \
-+ { for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.8[a-z]*$$/p'; \
-+ } | while read p; do \
-+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-+ echo "$$d$$p"; echo "$$p"; \
-+ done | \
-+ sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
-+ sed 'N;N;s,\n, ,g' | { \
-+ list=; while read file base inst; do \
-+ if test "$$base" = "$$inst"; then list="$$list $$file"; else \
-+ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-+ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst" || exit $$?; \
-+ fi; \
+@@ -377,8 +379,8 @@
+ esac; \
done; \
-- for i in $$list; do \
+ for i in $$list; do \
- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
- else file=$$i; fi; \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 8*) ;; \
-- *) ext='8' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-- $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \
-- done
-+ for i in $$list; do echo "$$i"; done | $(am__base_list) | \
-+ while read files; do \
-+ test -z "$$files" || { \
-+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man8dir)'"; \
-+ $(INSTALL_DATA) $$files "$(DESTDIR)$(man8dir)" || exit $$?; }; \
-+ done; }
-+
- uninstall-man8:
- @$(NORMAL_UNINSTALL)
-- @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
-- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-- for i in $$l2; do \
-- case "$$i" in \
-- *.8*) list="$$list $$i" ;; \
-- esac; \
-- done; \
-- for i in $$list; do \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 8*) ;; \
-- *) ext='8' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \
-- rm -f "$(DESTDIR)$(man8dir)/$$inst"; \
-- done
-+ @list=''; test -n "$(man8dir)" || exit 0; \
-+ files=`{ for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.8[a-z]*$$/p'; \
-+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-+ test -z "$$files" || { \
-+ echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \
-+ cd "$(DESTDIR)$(man8dir)" && rm -f $$files; }
-
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
++ if test -f $$i; then file=$$i; \
++ else file=$(srcdir)/$$i; fi; \
+ ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+ case "$$ext" in \
+ 8*) ;; \
+@@ -417,7 +419,7 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -41395,56 +25555,7 @@ Index: pam.debian/modules/pam_shells/Makefile.in
END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
-+ set x; \
- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -428,37 +447,43 @@
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ shift; \
-+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
-- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique; \
-+ if test $$# -gt 0; then \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ "$$@" $$unique; \
-+ else \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$unique; \
-+ fi; \
- fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
- 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; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+ test -z "$(CTAGS_ARGS)$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-- $$tags $$unique
-+ $$unique
-
- GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
-- && cd $(top_srcdir) \
-- && gtags -i $(GTAGS_ARGS) $$here
-+ && $(am__cd) $(top_srcdir) \
-+ && gtags -i $(GTAGS_ARGS) "$$here"
-
- distclean-tags:
+@@ -460,7 +462,7 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
check-TESTS: $(TESTS)
@@ -41452,11 +25563,8 @@ Index: pam.debian/modules/pam_shells/Makefile.in
+ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
srcdir=$(srcdir); export srcdir; \
list=' $(TESTS) '; \
-+ $(am__tty_colors); \
if test -n "$$list"; then \
- for tst in $$list; do \
- if test -f ./$$tst; then dir=./; \
-@@ -467,49 +492,63 @@
+@@ -471,7 +473,7 @@
if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
@@ -41464,35 +25572,19 @@ Index: pam.debian/modules/pam_shells/Makefile.in
+ *[\ \ ]$$tst[\ \ ]*) \
xpass=`expr $$xpass + 1`; \
failed=`expr $$failed + 1`; \
-- echo "XPASS: $$tst"; \
-+ col=$$red; res=XPASS; \
- ;; \
- *) \
-- echo "PASS: $$tst"; \
-+ col=$$grn; res=PASS; \
- ;; \
- esac; \
+ echo "XPASS: $$tst"; \
+@@ -483,7 +485,7 @@
elif test $$? -ne 77; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
- *$$ws$$tst$$ws*) \
+ *[\ \ ]$$tst[\ \ ]*) \
xfail=`expr $$xfail + 1`; \
-- echo "XFAIL: $$tst"; \
-+ col=$$lgn; res=XFAIL; \
+ echo "XFAIL: $$tst"; \
;; \
- *) \
- failed=`expr $$failed + 1`; \
-- echo "FAIL: $$tst"; \
-+ col=$$red; res=FAIL; \
- ;; \
- esac; \
- else \
- skip=`expr $$skip + 1`; \
-- echo "SKIP: $$tst"; \
-+ col=$$blu; res=SKIP; \
+@@ -497,23 +499,36 @@
+ echo "SKIP: $$tst"; \
fi; \
-+ echo "$${col}$$res$${std}: $$tst"; \
done; \
+ if test "$$all" -eq 1; then \
+ tests="test"; \
@@ -41532,22 +25624,7 @@ Index: pam.debian/modules/pam_shells/Makefile.in
test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
dashes="$$skipped"; \
fi; \
-@@ -520,15 +559,32 @@
- dashes="$$report"; \
- fi; \
- dashes=`echo "$$dashes" | sed s/./=/g`; \
-- echo "$$dashes"; \
-+ if test "$$failed" -eq 0; then \
-+ echo "$$grn$$dashes"; \
-+ else \
-+ echo "$$red$$dashes"; \
-+ fi; \
- echo "$$banner"; \
- test -z "$$skipped" || echo "$$skipped"; \
- test -z "$$report" || echo "$$report"; \
-- echo "$$dashes"; \
-+ echo "$$dashes$$std"; \
- test "$$failed" -eq 0; \
+@@ -533,6 +548,19 @@
else :; fi
distdir: $(DISTFILES)
@@ -41567,37 +25644,7 @@ Index: pam.debian/modules/pam_shells/Makefile.in
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
-@@ -544,13 +600,17 @@
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-+ if test -d "$(distdir)/$$file"; then \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+ fi; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
-- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
- else \
-- test -f $(distdir)/$$file \
-- || cp -p $$d/$$file $(distdir)/$$file \
-+ test -f "$(distdir)/$$file" \
-+ || cp -p $$d/$$file "$(distdir)/$$file" \
- || exit 1; \
- fi; \
- done
-@@ -583,6 +643,7 @@
-
- distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -605,6 +666,8 @@
+@@ -609,6 +637,8 @@
html: html-am
@@ -41606,7 +25653,7 @@ Index: pam.debian/modules/pam_shells/Makefile.in
info: info-am
info-am:
-@@ -613,18 +676,28 @@
+@@ -617,18 +647,28 @@
install-dvi: install-dvi-am
@@ -41635,30 +25682,13 @@ Index: pam.debian/modules/pam_shells/Makefile.in
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -649,7 +722,7 @@
-
- uninstall-man: uninstall-man8
-
--.MAKE: install-am install-strip
-+.MAKE: check-am install-am install-strip
-
- .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
- clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
-@@ -669,6 +742,7 @@
-
- @ENABLE_REGENERATE_MAN_TRUE@README: pam_shells.8.xml
- @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
-+
- # 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.
- .NOEXPORT:
-Index: pam.debian/modules/pam_stress/Makefile.in
+Index: pam.deb/modules/pam_stress/Makefile.in
===================================================================
---- pam.debian.orig/modules/pam_stress/Makefile.in
-+++ pam.debian/modules/pam_stress/Makefile.in
+--- pam.deb.orig/modules/pam_stress/Makefile.in
++++ pam.deb/modules/pam_stress/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -41668,67 +25698,7 @@ Index: pam.debian/modules/pam_stress/Makefile.in
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -20,8 +21,9 @@
-
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
--pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkglibexecdir = $(libexecdir)/@PACKAGE@
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
-@@ -57,14 +59,29 @@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
-+CONFIG_CLEAN_VPATH_FILES =
- am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
- am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-+am__install_max = 40
-+am__nobase_strip_setup = \
-+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-+am__nobase_strip = \
-+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-+am__nobase_list = $(am__nobase_strip_setup); \
-+ for p in $$list; do echo "$$p $$p"; done | \
-+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-+ if (++n[$$2] == $(am__install_max)) \
-+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-+ END { for (dir in files) print dir, files[dir] }'
-+am__base_list = \
-+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
- am__installdirs = "$(DESTDIR)$(securelibdir)"
--securelibLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(securelib_LTLIBRARIES)
- pam_stress_la_DEPENDENCIES =
- pam_stress_la_SOURCES = pam_stress.c
-@@ -72,6 +89,7 @@
- DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
-+am__mv = mv -f
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-@@ -85,6 +103,8 @@
- DIST_SOURCES = pam_stress.c
- ETAGS = etags
- CTAGS = ctags
-+am__tty_colors = \
-+red=; grn=; lgn=; blu=; std=
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- AMTAR = @AMTAR@
-@@ -169,6 +189,7 @@
+@@ -171,6 +172,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -41736,7 +25706,7 @@ Index: pam.debian/modules/pam_stress/Makefile.in
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PIE_CFLAGS = @PIE_CFLAGS@
-@@ -264,14 +285,14 @@
+@@ -268,8 +270,8 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -41747,79 +25717,7 @@ Index: pam.debian/modules/pam_stress/Makefile.in
exit 1;; \
esac; \
done; \
-- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/pam_stress/Makefile'; \
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu modules/pam_stress/Makefile
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/pam_stress/Makefile'; \
-+ $(am__cd) $(top_srcdir) && \
-+ $(AUTOMAKE) --gnu modules/pam_stress/Makefile
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
-@@ -289,23 +310,28 @@
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- $(ACLOCAL_M4): $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(am__aclocal_m4_deps):
- install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
- @$(NORMAL_INSTALL)
- test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
-- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-+ @list='$(securelib_LTLIBRARIES)'; test -n "$(securelibdir)" || list=; \
-+ list2=; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-- 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"; \
-+ list2="$$list2 $$p"; \
- else :; fi; \
-- done
-+ done; \
-+ test -z "$$list2" || { \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(securelibdir)'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(securelibdir)"; \
-+ }
-
- uninstall-securelibLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-+ @list='$(securelib_LTLIBRARIES)'; test -n "$(securelibdir)" || list=; \
-+ for p in $$list; do \
-+ $(am__strip_dir) \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$f'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$f"; \
- done
-
- clean-securelibLTLIBRARIES:
-@@ -329,21 +355,21 @@
-
- .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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @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 $@ $<
-@@ -359,14 +385,14 @@
+@@ -363,7 +365,7 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -41828,56 +25726,7 @@ Index: pam.debian/modules/pam_stress/Makefile.in
END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
-+ set x; \
- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -374,37 +400,43 @@
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ shift; \
-+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
-- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique; \
-+ if test $$# -gt 0; then \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ "$$@" $$unique; \
-+ else \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$unique; \
-+ fi; \
- fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
- 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; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+ test -z "$(CTAGS_ARGS)$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-- $$tags $$unique
-+ $$unique
-
- GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
-- && cd $(top_srcdir) \
-- && gtags -i $(GTAGS_ARGS) $$here
-+ && $(am__cd) $(top_srcdir) \
-+ && gtags -i $(GTAGS_ARGS) "$$here"
-
- distclean-tags:
+@@ -406,7 +408,7 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
check-TESTS: $(TESTS)
@@ -41885,11 +25734,8 @@ Index: pam.debian/modules/pam_stress/Makefile.in
+ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
srcdir=$(srcdir); export srcdir; \
list=' $(TESTS) '; \
-+ $(am__tty_colors); \
if test -n "$$list"; then \
- for tst in $$list; do \
- if test -f ./$$tst; then dir=./; \
-@@ -413,49 +445,63 @@
+@@ -417,7 +419,7 @@
if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
@@ -41897,35 +25743,19 @@ Index: pam.debian/modules/pam_stress/Makefile.in
+ *[\ \ ]$$tst[\ \ ]*) \
xpass=`expr $$xpass + 1`; \
failed=`expr $$failed + 1`; \
-- echo "XPASS: $$tst"; \
-+ col=$$red; res=XPASS; \
- ;; \
- *) \
-- echo "PASS: $$tst"; \
-+ col=$$grn; res=PASS; \
- ;; \
- esac; \
+ echo "XPASS: $$tst"; \
+@@ -429,7 +431,7 @@
elif test $$? -ne 77; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
- *$$ws$$tst$$ws*) \
+ *[\ \ ]$$tst[\ \ ]*) \
xfail=`expr $$xfail + 1`; \
-- echo "XFAIL: $$tst"; \
-+ col=$$lgn; res=XFAIL; \
- ;; \
- *) \
- failed=`expr $$failed + 1`; \
-- echo "FAIL: $$tst"; \
-+ col=$$red; res=FAIL; \
+ echo "XFAIL: $$tst"; \
;; \
- esac; \
- else \
- skip=`expr $$skip + 1`; \
-- echo "SKIP: $$tst"; \
-+ col=$$blu; res=SKIP; \
+@@ -443,23 +445,36 @@
+ echo "SKIP: $$tst"; \
fi; \
-+ echo "$${col}$$res$${std}: $$tst"; \
done; \
+ if test "$$all" -eq 1; then \
+ tests="test"; \
@@ -41965,55 +25795,7 @@ Index: pam.debian/modules/pam_stress/Makefile.in
test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
dashes="$$skipped"; \
fi; \
-@@ -466,11 +512,15 @@
- dashes="$$report"; \
- fi; \
- dashes=`echo "$$dashes" | sed s/./=/g`; \
-- echo "$$dashes"; \
-+ if test "$$failed" -eq 0; then \
-+ echo "$$grn$$dashes"; \
-+ else \
-+ echo "$$red$$dashes"; \
-+ fi; \
- echo "$$banner"; \
- test -z "$$skipped" || echo "$$skipped"; \
- test -z "$$report" || echo "$$report"; \
-- echo "$$dashes"; \
-+ echo "$$dashes$$std"; \
- test "$$failed" -eq 0; \
- else :; fi
-
-@@ -490,13 +540,17 @@
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-+ if test -d "$(distdir)/$$file"; then \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+ fi; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
-- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
- else \
-- test -f $(distdir)/$$file \
-- || cp -p $$d/$$file $(distdir)/$$file \
-+ test -f "$(distdir)/$$file" \
-+ || cp -p $$d/$$file "$(distdir)/$$file" \
- || exit 1; \
- fi; \
- done
-@@ -529,6 +583,7 @@
-
- distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -550,6 +605,8 @@
+@@ -554,6 +569,8 @@
html: html-am
@@ -42022,7 +25804,7 @@ Index: pam.debian/modules/pam_stress/Makefile.in
info: info-am
info-am:
-@@ -558,18 +615,28 @@
+@@ -562,18 +579,28 @@
install-dvi: install-dvi-am
@@ -42051,30 +25833,13 @@ Index: pam.debian/modules/pam_stress/Makefile.in
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -592,7 +659,7 @@
-
- uninstall-am: uninstall-securelibLTLIBRARIES
-
--.MAKE: install-am install-strip
-+.MAKE: check-am install-am install-strip
-
- .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
- clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
-@@ -609,6 +676,7 @@
- pdf pdf-am ps ps-am tags uninstall uninstall-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.
- .NOEXPORT:
-Index: pam.debian/modules/pam_succeed_if/Makefile.in
+Index: pam.deb/modules/pam_succeed_if/Makefile.in
===================================================================
---- pam.debian.orig/modules/pam_succeed_if/Makefile.in
-+++ pam.debian/modules/pam_succeed_if/Makefile.in
+--- pam.deb.orig/modules/pam_succeed_if/Makefile.in
++++ pam.deb/modules/pam_succeed_if/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -42084,67 +25849,7 @@ Index: pam.debian/modules/pam_succeed_if/Makefile.in
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -21,8 +22,9 @@
-
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
--pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkglibexecdir = $(libexecdir)/@PACKAGE@
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
-@@ -58,14 +60,29 @@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
-+CONFIG_CLEAN_VPATH_FILES =
- am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
- am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-+am__install_max = 40
-+am__nobase_strip_setup = \
-+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-+am__nobase_strip = \
-+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-+am__nobase_list = $(am__nobase_strip_setup); \
-+ for p in $$list; do echo "$$p $$p"; done | \
-+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-+ if (++n[$$2] == $(am__install_max)) \
-+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-+ END { for (dir in files) print dir, files[dir] }'
-+am__base_list = \
-+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
- am__installdirs = "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man8dir)"
--securelibLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(securelib_LTLIBRARIES)
- pam_succeed_if_la_DEPENDENCIES =
- pam_succeed_if_la_SOURCES = pam_succeed_if.c
-@@ -73,6 +90,7 @@
- DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
-+am__mv = mv -f
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-@@ -90,6 +108,8 @@
- DATA = $(noinst_DATA)
- ETAGS = etags
- CTAGS = ctags
-+am__tty_colors = \
-+red=; grn=; lgn=; blu=; std=
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- AMTAR = @AMTAR@
-@@ -174,6 +194,7 @@
+@@ -176,6 +177,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -42152,7 +25857,7 @@ Index: pam.debian/modules/pam_succeed_if/Makefile.in
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PIE_CFLAGS = @PIE_CFLAGS@
-@@ -273,14 +294,14 @@
+@@ -277,8 +279,8 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -42163,163 +25868,18 @@ Index: pam.debian/modules/pam_succeed_if/Makefile.in
exit 1;; \
esac; \
done; \
-- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/pam_succeed_if/Makefile'; \
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu modules/pam_succeed_if/Makefile
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/pam_succeed_if/Makefile'; \
-+ $(am__cd) $(top_srcdir) && \
-+ $(AUTOMAKE) --gnu modules/pam_succeed_if/Makefile
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
-@@ -298,23 +319,28 @@
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- $(ACLOCAL_M4): $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(am__aclocal_m4_deps):
- install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
- @$(NORMAL_INSTALL)
- test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
-- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-+ @list='$(securelib_LTLIBRARIES)'; test -n "$(securelibdir)" || list=; \
-+ list2=; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-- 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"; \
-+ list2="$$list2 $$p"; \
- else :; fi; \
-- done
-+ done; \
-+ test -z "$$list2" || { \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(securelibdir)'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(securelibdir)"; \
-+ }
-
- uninstall-securelibLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-+ @list='$(securelib_LTLIBRARIES)'; test -n "$(securelibdir)" || list=; \
-+ for p in $$list; do \
-+ $(am__strip_dir) \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$f'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$f"; \
- done
-
- clean-securelibLTLIBRARIES:
-@@ -338,21 +364,21 @@
-
- .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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @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,65 +388,58 @@
-
- clean-libtool:
- -rm -rf .libs _libs
--install-man8: $(man8_MANS) $(man_MANS)
-+install-man8: $(man_MANS)
- @$(NORMAL_INSTALL)
- 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 \
-- case "$$i" in \
-- *.8*) list="$$list $$i" ;; \
-- esac; \
-+ @list=''; test -n "$(man8dir)" || exit 0; \
-+ { for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.8[a-z]*$$/p'; \
-+ } | while read p; do \
-+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-+ echo "$$d$$p"; echo "$$p"; \
-+ done | \
-+ sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
-+ sed 'N;N;s,\n, ,g' | { \
-+ list=; while read file base inst; do \
-+ if test "$$base" = "$$inst"; then list="$$list $$file"; else \
-+ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-+ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst" || exit $$?; \
-+ fi; \
+@@ -377,8 +379,8 @@
+ esac; \
done; \
-- for i in $$list; do \
+ for i in $$list; do \
- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
- else file=$$i; fi; \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 8*) ;; \
-- *) ext='8' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-- $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \
-- done
-+ for i in $$list; do echo "$$i"; done | $(am__base_list) | \
-+ while read files; do \
-+ test -z "$$files" || { \
-+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man8dir)'"; \
-+ $(INSTALL_DATA) $$files "$(DESTDIR)$(man8dir)" || exit $$?; }; \
-+ done; }
-+
- uninstall-man8:
- @$(NORMAL_UNINSTALL)
-- @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
-- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-- for i in $$l2; do \
-- case "$$i" in \
-- *.8*) list="$$list $$i" ;; \
-- esac; \
-- done; \
-- for i in $$list; do \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 8*) ;; \
-- *) ext='8' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \
-- rm -f "$(DESTDIR)$(man8dir)/$$inst"; \
-- done
-+ @list=''; test -n "$(man8dir)" || exit 0; \
-+ files=`{ for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.8[a-z]*$$/p'; \
-+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-+ test -z "$$files" || { \
-+ echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \
-+ cd "$(DESTDIR)$(man8dir)" && rm -f $$files; }
-
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
++ if test -f $$i; then file=$$i; \
++ else file=$(srcdir)/$$i; fi; \
+ ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+ case "$$ext" in \
+ 8*) ;; \
+@@ -417,7 +419,7 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -42328,56 +25888,7 @@ Index: pam.debian/modules/pam_succeed_if/Makefile.in
END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
-+ set x; \
- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -428,37 +447,43 @@
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ shift; \
-+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
-- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique; \
-+ if test $$# -gt 0; then \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ "$$@" $$unique; \
-+ else \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$unique; \
-+ fi; \
- fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
- 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; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+ test -z "$(CTAGS_ARGS)$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-- $$tags $$unique
-+ $$unique
-
- GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
-- && cd $(top_srcdir) \
-- && gtags -i $(GTAGS_ARGS) $$here
-+ && $(am__cd) $(top_srcdir) \
-+ && gtags -i $(GTAGS_ARGS) "$$here"
-
- distclean-tags:
+@@ -460,7 +462,7 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
check-TESTS: $(TESTS)
@@ -42385,11 +25896,8 @@ Index: pam.debian/modules/pam_succeed_if/Makefile.in
+ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
srcdir=$(srcdir); export srcdir; \
list=' $(TESTS) '; \
-+ $(am__tty_colors); \
if test -n "$$list"; then \
- for tst in $$list; do \
- if test -f ./$$tst; then dir=./; \
-@@ -467,49 +492,63 @@
+@@ -471,7 +473,7 @@
if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
@@ -42397,35 +25905,19 @@ Index: pam.debian/modules/pam_succeed_if/Makefile.in
+ *[\ \ ]$$tst[\ \ ]*) \
xpass=`expr $$xpass + 1`; \
failed=`expr $$failed + 1`; \
-- echo "XPASS: $$tst"; \
-+ col=$$red; res=XPASS; \
- ;; \
- *) \
-- echo "PASS: $$tst"; \
-+ col=$$grn; res=PASS; \
- ;; \
- esac; \
+ echo "XPASS: $$tst"; \
+@@ -483,7 +485,7 @@
elif test $$? -ne 77; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
- *$$ws$$tst$$ws*) \
+ *[\ \ ]$$tst[\ \ ]*) \
xfail=`expr $$xfail + 1`; \
-- echo "XFAIL: $$tst"; \
-+ col=$$lgn; res=XFAIL; \
- ;; \
- *) \
- failed=`expr $$failed + 1`; \
-- echo "FAIL: $$tst"; \
-+ col=$$red; res=FAIL; \
+ echo "XFAIL: $$tst"; \
;; \
- esac; \
- else \
- skip=`expr $$skip + 1`; \
-- echo "SKIP: $$tst"; \
-+ col=$$blu; res=SKIP; \
+@@ -497,23 +499,36 @@
+ echo "SKIP: $$tst"; \
fi; \
-+ echo "$${col}$$res$${std}: $$tst"; \
done; \
+ if test "$$all" -eq 1; then \
+ tests="test"; \
@@ -42465,22 +25957,7 @@ Index: pam.debian/modules/pam_succeed_if/Makefile.in
test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
dashes="$$skipped"; \
fi; \
-@@ -520,15 +559,32 @@
- dashes="$$report"; \
- fi; \
- dashes=`echo "$$dashes" | sed s/./=/g`; \
-- echo "$$dashes"; \
-+ if test "$$failed" -eq 0; then \
-+ echo "$$grn$$dashes"; \
-+ else \
-+ echo "$$red$$dashes"; \
-+ fi; \
- echo "$$banner"; \
- test -z "$$skipped" || echo "$$skipped"; \
- test -z "$$report" || echo "$$report"; \
-- echo "$$dashes"; \
-+ echo "$$dashes$$std"; \
- test "$$failed" -eq 0; \
+@@ -533,6 +548,19 @@
else :; fi
distdir: $(DISTFILES)
@@ -42500,37 +25977,7 @@ Index: pam.debian/modules/pam_succeed_if/Makefile.in
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
-@@ -544,13 +600,17 @@
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-+ if test -d "$(distdir)/$$file"; then \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+ fi; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
-- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
- else \
-- test -f $(distdir)/$$file \
-- || cp -p $$d/$$file $(distdir)/$$file \
-+ test -f "$(distdir)/$$file" \
-+ || cp -p $$d/$$file "$(distdir)/$$file" \
- || exit 1; \
- fi; \
- done
-@@ -583,6 +643,7 @@
-
- distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -605,6 +666,8 @@
+@@ -609,6 +637,8 @@
html: html-am
@@ -42539,7 +25986,7 @@ Index: pam.debian/modules/pam_succeed_if/Makefile.in
info: info-am
info-am:
-@@ -613,18 +676,28 @@
+@@ -617,18 +647,28 @@
install-dvi: install-dvi-am
@@ -42568,30 +26015,13 @@ Index: pam.debian/modules/pam_succeed_if/Makefile.in
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -649,7 +722,7 @@
-
- uninstall-man: uninstall-man8
-
--.MAKE: install-am install-strip
-+.MAKE: check-am install-am install-strip
-
- .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
- clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
-@@ -669,6 +742,7 @@
-
- @ENABLE_REGENERATE_MAN_TRUE@README: pam_succeed_if.8.xml
- @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
-+
- # 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.
- .NOEXPORT:
-Index: pam.debian/modules/pam_tally/Makefile.in
+Index: pam.deb/modules/pam_tally/Makefile.in
===================================================================
---- pam.debian.orig/modules/pam_tally/Makefile.in
-+++ pam.debian/modules/pam_tally/Makefile.in
+--- pam.deb.orig/modules/pam_tally/Makefile.in
++++ pam.deb/modules/pam_tally/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -42601,76 +26031,7 @@ Index: pam.debian/modules/pam_tally/Makefile.in
# 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.
-@@ -23,8 +24,9 @@
-
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
--pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkglibexecdir = $(libexecdir)/@PACKAGE@
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
-@@ -62,15 +64,30 @@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
-+CONFIG_CLEAN_VPATH_FILES =
- am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
- am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-+am__install_max = 40
-+am__nobase_strip_setup = \
-+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-+am__nobase_strip = \
-+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-+am__nobase_list = $(am__nobase_strip_setup); \
-+ for p in $$list; do echo "$$p $$p"; done | \
-+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-+ if (++n[$$2] == $(am__install_max)) \
-+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-+ END { for (dir in files) print dir, files[dir] }'
-+am__base_list = \
-+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
- am__installdirs = "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(sbindir)" \
- "$(DESTDIR)$(man8dir)"
--securelibLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(securelib_LTLIBRARIES)
- pam_tally_la_DEPENDENCIES =
- pam_tally_la_SOURCES = pam_tally.c
-@@ -78,7 +95,6 @@
- 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)
-@@ -86,6 +102,7 @@
- DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
-+am__mv = mv -f
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-@@ -104,6 +121,8 @@
- HEADERS = $(noinst_HEADERS)
- ETAGS = etags
- CTAGS = ctags
-+am__tty_colors = \
-+red=; grn=; lgn=; blu=; std=
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- AMTAR = @AMTAR@
-@@ -188,6 +207,7 @@
+@@ -190,6 +191,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -42678,7 +26039,7 @@ Index: pam.debian/modules/pam_tally/Makefile.in
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PIE_CFLAGS = @PIE_CFLAGS@
-@@ -290,14 +310,14 @@
+@@ -294,8 +296,8 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -42689,230 +26050,18 @@ Index: pam.debian/modules/pam_tally/Makefile.in
exit 1;; \
esac; \
done; \
-- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/pam_tally/Makefile'; \
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu modules/pam_tally/Makefile
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/pam_tally/Makefile'; \
-+ $(am__cd) $(top_srcdir) && \
-+ $(AUTOMAKE) --gnu modules/pam_tally/Makefile
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
-@@ -315,23 +335,28 @@
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- $(ACLOCAL_M4): $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(am__aclocal_m4_deps):
- install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
- @$(NORMAL_INSTALL)
- test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
-- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-+ @list='$(securelib_LTLIBRARIES)'; test -n "$(securelibdir)" || list=; \
-+ list2=; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-- 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"; \
-+ list2="$$list2 $$p"; \
- else :; fi; \
-- done
-+ done; \
-+ test -z "$$list2" || { \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(securelibdir)'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(securelibdir)"; \
-+ }
-
- uninstall-securelibLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-+ @list='$(securelib_LTLIBRARIES)'; test -n "$(securelibdir)" || list=; \
-+ for p in $$list; do \
-+ $(am__strip_dir) \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$f'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$f"; \
- done
-
- clean-securelibLTLIBRARIES:
-@@ -347,31 +372,46 @@
- install-sbinPROGRAMS: $(sbin_PROGRAMS)
- @$(NORMAL_INSTALL)
- 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 \
-- || test -f $$p1 \
-- ; then \
-- f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(sbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(sbindir)/$$f'"; \
-- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(sbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(sbindir)/$$f" || exit 1; \
-- else :; fi; \
-- done
-+ @list='$(sbin_PROGRAMS)'; test -n "$(sbindir)" || list=; \
-+ for p in $$list; do echo "$$p $$p"; done | \
-+ sed 's/$(EXEEXT)$$//' | \
-+ while read p p1; do if test -f $$p || test -f $$p1; \
-+ then echo "$$p"; echo "$$p"; else :; fi; \
-+ done | \
-+ sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
-+ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
-+ sed 'N;N;N;s,\n, ,g' | \
-+ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
-+ { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
-+ if ($$2 == $$4) files[d] = files[d] " " $$1; \
-+ else { print "f", $$3 "/" $$4, $$1; } } \
-+ END { for (d in files) print "f", d, files[d] }' | \
-+ while read type dir files; do \
-+ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
-+ test -z "$$files" || { \
-+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(sbindir)$$dir'"; \
-+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(sbindir)$$dir" || exit $$?; \
-+ } \
-+ ; done
-
- uninstall-sbinPROGRAMS:
- @$(NORMAL_UNINSTALL)
-- @list='$(sbin_PROGRAMS)'; for p in $$list; do \
-- f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-- echo " rm -f '$(DESTDIR)$(sbindir)/$$f'"; \
-- rm -f "$(DESTDIR)$(sbindir)/$$f"; \
-- done
-+ @list='$(sbin_PROGRAMS)'; test -n "$(sbindir)" || list=; \
-+ files=`for p in $$list; do echo "$$p"; done | \
-+ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-+ -e 's/$$/$(EXEEXT)/' `; \
-+ test -n "$$list" || exit 0; \
-+ echo " ( cd '$(DESTDIR)$(sbindir)' && rm -f" $$files ")"; \
-+ cd "$(DESTDIR)$(sbindir)" && rm -f $$files
-
- clean-sbinPROGRAMS:
-- @list='$(sbin_PROGRAMS)'; for p in $$list; do \
-- f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-- echo " rm -f $$p $$f"; \
-- rm -f $$p $$f ; \
-- done
-+ @list='$(sbin_PROGRAMS)'; test -n "$$list" || exit 0; \
-+ echo " rm -f" $$list; \
-+ rm -f $$list || exit $$?; \
-+ test -n "$(EXEEXT)" || exit 0; \
-+ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
-+ echo " rm -f" $$list; \
-+ rm -f $$list
- pam_tally$(EXEEXT): $(pam_tally_OBJECTS) $(pam_tally_DEPENDENCIES)
- @rm -f pam_tally$(EXEEXT)
- $(LINK) $(pam_tally_OBJECTS) $(pam_tally_LDADD) $(LIBS)
-@@ -387,21 +427,21 @@
-
- .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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @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 $@ $<
-@@ -411,65 +451,58 @@
-
- clean-libtool:
- -rm -rf .libs _libs
--install-man8: $(man8_MANS) $(man_MANS)
-+install-man8: $(man_MANS)
- @$(NORMAL_INSTALL)
- 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 \
-- case "$$i" in \
-- *.8*) list="$$list $$i" ;; \
-- esac; \
-+ @list=''; test -n "$(man8dir)" || exit 0; \
-+ { for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.8[a-z]*$$/p'; \
-+ } | while read p; do \
-+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-+ echo "$$d$$p"; echo "$$p"; \
-+ done | \
-+ sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
-+ sed 'N;N;s,\n, ,g' | { \
-+ list=; while read file base inst; do \
-+ if test "$$base" = "$$inst"; then list="$$list $$file"; else \
-+ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-+ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst" || exit $$?; \
-+ fi; \
+@@ -426,8 +428,8 @@
+ esac; \
done; \
-- for i in $$list; do \
+ for i in $$list; do \
- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
- else file=$$i; fi; \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 8*) ;; \
-- *) ext='8' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-- $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \
-- done
-+ for i in $$list; do echo "$$i"; done | $(am__base_list) | \
-+ while read files; do \
-+ test -z "$$files" || { \
-+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man8dir)'"; \
-+ $(INSTALL_DATA) $$files "$(DESTDIR)$(man8dir)" || exit $$?; }; \
-+ done; }
-+
- uninstall-man8:
- @$(NORMAL_UNINSTALL)
-- @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
-- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-- for i in $$l2; do \
-- case "$$i" in \
-- *.8*) list="$$list $$i" ;; \
-- esac; \
-- done; \
-- for i in $$list; do \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 8*) ;; \
-- *) ext='8' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \
-- rm -f "$(DESTDIR)$(man8dir)/$$inst"; \
-- done
-+ @list=''; test -n "$(man8dir)" || exit 0; \
-+ files=`{ for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.8[a-z]*$$/p'; \
-+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-+ test -z "$$files" || { \
-+ echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \
-+ cd "$(DESTDIR)$(man8dir)" && rm -f $$files; }
-
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
++ if test -f $$i; then file=$$i; \
++ else file=$(srcdir)/$$i; fi; \
+ ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+ case "$$ext" in \
+ 8*) ;; \
+@@ -466,7 +468,7 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -42921,56 +26070,7 @@ Index: pam.debian/modules/pam_tally/Makefile.in
END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
-+ set x; \
- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -477,37 +510,43 @@
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ shift; \
-+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
-- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique; \
-+ if test $$# -gt 0; then \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ "$$@" $$unique; \
-+ else \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$unique; \
-+ fi; \
- fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
- 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; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+ test -z "$(CTAGS_ARGS)$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-- $$tags $$unique
-+ $$unique
-
- GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
-- && cd $(top_srcdir) \
-- && gtags -i $(GTAGS_ARGS) $$here
-+ && $(am__cd) $(top_srcdir) \
-+ && gtags -i $(GTAGS_ARGS) "$$here"
-
- distclean-tags:
+@@ -509,7 +511,7 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
check-TESTS: $(TESTS)
@@ -42978,11 +26078,8 @@ Index: pam.debian/modules/pam_tally/Makefile.in
+ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
srcdir=$(srcdir); export srcdir; \
list=' $(TESTS) '; \
-+ $(am__tty_colors); \
if test -n "$$list"; then \
- for tst in $$list; do \
- if test -f ./$$tst; then dir=./; \
-@@ -516,49 +555,63 @@
+@@ -520,7 +522,7 @@
if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
@@ -42990,35 +26087,19 @@ Index: pam.debian/modules/pam_tally/Makefile.in
+ *[\ \ ]$$tst[\ \ ]*) \
xpass=`expr $$xpass + 1`; \
failed=`expr $$failed + 1`; \
-- echo "XPASS: $$tst"; \
-+ col=$$red; res=XPASS; \
- ;; \
- *) \
-- echo "PASS: $$tst"; \
-+ col=$$grn; res=PASS; \
- ;; \
- esac; \
+ echo "XPASS: $$tst"; \
+@@ -532,7 +534,7 @@
elif test $$? -ne 77; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
- *$$ws$$tst$$ws*) \
+ *[\ \ ]$$tst[\ \ ]*) \
xfail=`expr $$xfail + 1`; \
-- echo "XFAIL: $$tst"; \
-+ col=$$lgn; res=XFAIL; \
+ echo "XFAIL: $$tst"; \
;; \
- *) \
- failed=`expr $$failed + 1`; \
-- echo "FAIL: $$tst"; \
-+ col=$$red; res=FAIL; \
- ;; \
- esac; \
- else \
- skip=`expr $$skip + 1`; \
-- echo "SKIP: $$tst"; \
-+ col=$$blu; res=SKIP; \
+@@ -546,23 +548,36 @@
+ echo "SKIP: $$tst"; \
fi; \
-+ echo "$${col}$$res$${std}: $$tst"; \
done; \
+ if test "$$all" -eq 1; then \
+ tests="test"; \
@@ -43058,22 +26139,7 @@ Index: pam.debian/modules/pam_tally/Makefile.in
test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
dashes="$$skipped"; \
fi; \
-@@ -569,15 +622,32 @@
- dashes="$$report"; \
- fi; \
- dashes=`echo "$$dashes" | sed s/./=/g`; \
-- echo "$$dashes"; \
-+ if test "$$failed" -eq 0; then \
-+ echo "$$grn$$dashes"; \
-+ else \
-+ echo "$$red$$dashes"; \
-+ fi; \
- echo "$$banner"; \
- test -z "$$skipped" || echo "$$skipped"; \
- test -z "$$report" || echo "$$report"; \
-- echo "$$dashes"; \
-+ echo "$$dashes$$std"; \
- test "$$failed" -eq 0; \
+@@ -582,6 +597,19 @@
else :; fi
distdir: $(DISTFILES)
@@ -43093,37 +26159,7 @@ Index: pam.debian/modules/pam_tally/Makefile.in
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
-@@ -593,13 +663,17 @@
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-+ if test -d "$(distdir)/$$file"; then \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+ fi; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
-- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
- else \
-- test -f $(distdir)/$$file \
-- || cp -p $$d/$$file $(distdir)/$$file \
-+ test -f "$(distdir)/$$file" \
-+ || cp -p $$d/$$file "$(distdir)/$$file" \
- || exit 1; \
- fi; \
- done
-@@ -632,6 +706,7 @@
-
- distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -654,6 +729,8 @@
+@@ -658,6 +686,8 @@
html: html-am
@@ -43132,7 +26168,7 @@ Index: pam.debian/modules/pam_tally/Makefile.in
info: info-am
info-am:
-@@ -662,18 +739,28 @@
+@@ -666,18 +696,28 @@
install-dvi: install-dvi-am
@@ -43161,30 +26197,13 @@ Index: pam.debian/modules/pam_tally/Makefile.in
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -699,7 +786,7 @@
-
- uninstall-man: uninstall-man8
-
--.MAKE: install-am install-strip
-+.MAKE: check-am install-am install-strip
-
- .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
- clean-generic clean-libtool clean-sbinPROGRAMS \
-@@ -720,6 +807,7 @@
-
- @ENABLE_REGENERATE_MAN_TRUE@README: pam_tally.8.xml
- @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
-+
- # 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.
- .NOEXPORT:
-Index: pam.debian/modules/pam_tally2/Makefile.in
+Index: pam.deb/modules/pam_tally2/Makefile.in
===================================================================
---- pam.debian.orig/modules/pam_tally2/Makefile.in
-+++ pam.debian/modules/pam_tally2/Makefile.in
+--- pam.deb.orig/modules/pam_tally2/Makefile.in
++++ pam.deb/modules/pam_tally2/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -43194,76 +26213,7 @@ Index: pam.debian/modules/pam_tally2/Makefile.in
# 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.
-@@ -24,8 +25,9 @@
-
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
--pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkglibexecdir = $(libexecdir)/@PACKAGE@
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
-@@ -63,15 +65,30 @@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
-+CONFIG_CLEAN_VPATH_FILES =
- am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
- am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-+am__install_max = 40
-+am__nobase_strip_setup = \
-+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-+am__nobase_strip = \
-+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-+am__nobase_list = $(am__nobase_strip_setup); \
-+ for p in $$list; do echo "$$p $$p"; done | \
-+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-+ if (++n[$$2] == $(am__install_max)) \
-+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-+ END { for (dir in files) print dir, files[dir] }'
-+am__base_list = \
-+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
- am__installdirs = "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(sbindir)" \
- "$(DESTDIR)$(man8dir)"
--securelibLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(securelib_LTLIBRARIES)
- am__DEPENDENCIES_1 =
- pam_tally2_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
-@@ -80,7 +97,6 @@
- pam_tally2_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(pam_tally2_la_LDFLAGS) $(LDFLAGS) -o $@
--sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
- PROGRAMS = $(sbin_PROGRAMS)
- am_pam_tally2_OBJECTS = pam_tally2_app.$(OBJEXT)
- pam_tally2_OBJECTS = $(am_pam_tally2_OBJECTS)
-@@ -88,6 +104,7 @@
- DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
-+am__mv = mv -f
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-@@ -106,6 +123,8 @@
- HEADERS = $(noinst_HEADERS)
- ETAGS = etags
- CTAGS = ctags
-+am__tty_colors = \
-+red=; grn=; lgn=; blu=; std=
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- AMTAR = @AMTAR@
-@@ -190,6 +209,7 @@
+@@ -192,6 +193,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -43271,7 +26221,7 @@ Index: pam.debian/modules/pam_tally2/Makefile.in
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PIE_CFLAGS = @PIE_CFLAGS@
-@@ -294,14 +314,14 @@
+@@ -298,8 +300,8 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -43282,230 +26232,18 @@ Index: pam.debian/modules/pam_tally2/Makefile.in
exit 1;; \
esac; \
done; \
-- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/pam_tally2/Makefile'; \
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu modules/pam_tally2/Makefile
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/pam_tally2/Makefile'; \
-+ $(am__cd) $(top_srcdir) && \
-+ $(AUTOMAKE) --gnu modules/pam_tally2/Makefile
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
-@@ -319,23 +339,28 @@
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- $(ACLOCAL_M4): $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(am__aclocal_m4_deps):
- install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
- @$(NORMAL_INSTALL)
- test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
-- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-+ @list='$(securelib_LTLIBRARIES)'; test -n "$(securelibdir)" || list=; \
-+ list2=; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-- 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"; \
-+ list2="$$list2 $$p"; \
- else :; fi; \
-- done
-+ done; \
-+ test -z "$$list2" || { \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(securelibdir)'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(securelibdir)"; \
-+ }
-
- uninstall-securelibLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-+ @list='$(securelib_LTLIBRARIES)'; test -n "$(securelibdir)" || list=; \
-+ for p in $$list; do \
-+ $(am__strip_dir) \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$f'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$f"; \
- done
-
- clean-securelibLTLIBRARIES:
-@@ -351,31 +376,46 @@
- install-sbinPROGRAMS: $(sbin_PROGRAMS)
- @$(NORMAL_INSTALL)
- 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 \
-- || test -f $$p1 \
-- ; then \
-- f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(sbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(sbindir)/$$f'"; \
-- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(sbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(sbindir)/$$f" || exit 1; \
-- else :; fi; \
-- done
-+ @list='$(sbin_PROGRAMS)'; test -n "$(sbindir)" || list=; \
-+ for p in $$list; do echo "$$p $$p"; done | \
-+ sed 's/$(EXEEXT)$$//' | \
-+ while read p p1; do if test -f $$p || test -f $$p1; \
-+ then echo "$$p"; echo "$$p"; else :; fi; \
-+ done | \
-+ sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
-+ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
-+ sed 'N;N;N;s,\n, ,g' | \
-+ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
-+ { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
-+ if ($$2 == $$4) files[d] = files[d] " " $$1; \
-+ else { print "f", $$3 "/" $$4, $$1; } } \
-+ END { for (d in files) print "f", d, files[d] }' | \
-+ while read type dir files; do \
-+ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
-+ test -z "$$files" || { \
-+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(sbindir)$$dir'"; \
-+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(sbindir)$$dir" || exit $$?; \
-+ } \
-+ ; done
-
- uninstall-sbinPROGRAMS:
- @$(NORMAL_UNINSTALL)
-- @list='$(sbin_PROGRAMS)'; for p in $$list; do \
-- f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-- echo " rm -f '$(DESTDIR)$(sbindir)/$$f'"; \
-- rm -f "$(DESTDIR)$(sbindir)/$$f"; \
-- done
-+ @list='$(sbin_PROGRAMS)'; test -n "$(sbindir)" || list=; \
-+ files=`for p in $$list; do echo "$$p"; done | \
-+ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-+ -e 's/$$/$(EXEEXT)/' `; \
-+ test -n "$$list" || exit 0; \
-+ echo " ( cd '$(DESTDIR)$(sbindir)' && rm -f" $$files ")"; \
-+ cd "$(DESTDIR)$(sbindir)" && rm -f $$files
-
- clean-sbinPROGRAMS:
-- @list='$(sbin_PROGRAMS)'; for p in $$list; do \
-- f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-- echo " rm -f $$p $$f"; \
-- rm -f $$p $$f ; \
-- done
-+ @list='$(sbin_PROGRAMS)'; test -n "$$list" || exit 0; \
-+ echo " rm -f" $$list; \
-+ rm -f $$list || exit $$?; \
-+ test -n "$(EXEEXT)" || exit 0; \
-+ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
-+ echo " rm -f" $$list; \
-+ rm -f $$list
- pam_tally2$(EXEEXT): $(pam_tally2_OBJECTS) $(pam_tally2_DEPENDENCIES)
- @rm -f pam_tally2$(EXEEXT)
- $(LINK) $(pam_tally2_OBJECTS) $(pam_tally2_LDADD) $(LIBS)
-@@ -391,21 +431,21 @@
-
- .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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @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 $@ $<
-@@ -415,65 +455,58 @@
-
- clean-libtool:
- -rm -rf .libs _libs
--install-man8: $(man8_MANS) $(man_MANS)
-+install-man8: $(man_MANS)
- @$(NORMAL_INSTALL)
- 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 \
-- case "$$i" in \
-- *.8*) list="$$list $$i" ;; \
-- esac; \
-+ @list=''; test -n "$(man8dir)" || exit 0; \
-+ { for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.8[a-z]*$$/p'; \
-+ } | while read p; do \
-+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-+ echo "$$d$$p"; echo "$$p"; \
-+ done | \
-+ sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
-+ sed 'N;N;s,\n, ,g' | { \
-+ list=; while read file base inst; do \
-+ if test "$$base" = "$$inst"; then list="$$list $$file"; else \
-+ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-+ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst" || exit $$?; \
-+ fi; \
+@@ -430,8 +432,8 @@
+ esac; \
done; \
-- for i in $$list; do \
+ for i in $$list; do \
- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
- else file=$$i; fi; \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 8*) ;; \
-- *) ext='8' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-- $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \
-- done
-+ for i in $$list; do echo "$$i"; done | $(am__base_list) | \
-+ while read files; do \
-+ test -z "$$files" || { \
-+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man8dir)'"; \
-+ $(INSTALL_DATA) $$files "$(DESTDIR)$(man8dir)" || exit $$?; }; \
-+ done; }
-+
- uninstall-man8:
- @$(NORMAL_UNINSTALL)
-- @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
-- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-- for i in $$l2; do \
-- case "$$i" in \
-- *.8*) list="$$list $$i" ;; \
-- esac; \
-- done; \
-- for i in $$list; do \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 8*) ;; \
-- *) ext='8' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \
-- rm -f "$(DESTDIR)$(man8dir)/$$inst"; \
-- done
-+ @list=''; test -n "$(man8dir)" || exit 0; \
-+ files=`{ for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.8[a-z]*$$/p'; \
-+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-+ test -z "$$files" || { \
-+ echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \
-+ cd "$(DESTDIR)$(man8dir)" && rm -f $$files; }
-
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
++ if test -f $$i; then file=$$i; \
++ else file=$(srcdir)/$$i; fi; \
+ ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+ case "$$ext" in \
+ 8*) ;; \
+@@ -470,7 +472,7 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -43514,56 +26252,7 @@ Index: pam.debian/modules/pam_tally2/Makefile.in
END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
-+ set x; \
- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -481,37 +514,43 @@
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ shift; \
-+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
-- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique; \
-+ if test $$# -gt 0; then \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ "$$@" $$unique; \
-+ else \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$unique; \
-+ fi; \
- fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
- 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; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+ test -z "$(CTAGS_ARGS)$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-- $$tags $$unique
-+ $$unique
-
- GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
-- && cd $(top_srcdir) \
-- && gtags -i $(GTAGS_ARGS) $$here
-+ && $(am__cd) $(top_srcdir) \
-+ && gtags -i $(GTAGS_ARGS) "$$here"
-
- distclean-tags:
+@@ -513,7 +515,7 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
check-TESTS: $(TESTS)
@@ -43571,11 +26260,8 @@ Index: pam.debian/modules/pam_tally2/Makefile.in
+ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
srcdir=$(srcdir); export srcdir; \
list=' $(TESTS) '; \
-+ $(am__tty_colors); \
if test -n "$$list"; then \
- for tst in $$list; do \
- if test -f ./$$tst; then dir=./; \
-@@ -520,49 +559,63 @@
+@@ -524,7 +526,7 @@
if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
@@ -43583,35 +26269,19 @@ Index: pam.debian/modules/pam_tally2/Makefile.in
+ *[\ \ ]$$tst[\ \ ]*) \
xpass=`expr $$xpass + 1`; \
failed=`expr $$failed + 1`; \
-- echo "XPASS: $$tst"; \
-+ col=$$red; res=XPASS; \
- ;; \
- *) \
-- echo "PASS: $$tst"; \
-+ col=$$grn; res=PASS; \
- ;; \
- esac; \
+ echo "XPASS: $$tst"; \
+@@ -536,7 +538,7 @@
elif test $$? -ne 77; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
- *$$ws$$tst$$ws*) \
+ *[\ \ ]$$tst[\ \ ]*) \
xfail=`expr $$xfail + 1`; \
-- echo "XFAIL: $$tst"; \
-+ col=$$lgn; res=XFAIL; \
- ;; \
- *) \
- failed=`expr $$failed + 1`; \
-- echo "FAIL: $$tst"; \
-+ col=$$red; res=FAIL; \
+ echo "XFAIL: $$tst"; \
;; \
- esac; \
- else \
- skip=`expr $$skip + 1`; \
-- echo "SKIP: $$tst"; \
-+ col=$$blu; res=SKIP; \
+@@ -550,23 +552,36 @@
+ echo "SKIP: $$tst"; \
fi; \
-+ echo "$${col}$$res$${std}: $$tst"; \
done; \
+ if test "$$all" -eq 1; then \
+ tests="test"; \
@@ -43651,22 +26321,7 @@ Index: pam.debian/modules/pam_tally2/Makefile.in
test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
dashes="$$skipped"; \
fi; \
-@@ -573,15 +626,32 @@
- dashes="$$report"; \
- fi; \
- dashes=`echo "$$dashes" | sed s/./=/g`; \
-- echo "$$dashes"; \
-+ if test "$$failed" -eq 0; then \
-+ echo "$$grn$$dashes"; \
-+ else \
-+ echo "$$red$$dashes"; \
-+ fi; \
- echo "$$banner"; \
- test -z "$$skipped" || echo "$$skipped"; \
- test -z "$$report" || echo "$$report"; \
-- echo "$$dashes"; \
-+ echo "$$dashes$$std"; \
- test "$$failed" -eq 0; \
+@@ -586,6 +601,19 @@
else :; fi
distdir: $(DISTFILES)
@@ -43686,37 +26341,7 @@ Index: pam.debian/modules/pam_tally2/Makefile.in
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
-@@ -597,13 +667,17 @@
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-+ if test -d "$(distdir)/$$file"; then \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+ fi; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
-- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
- else \
-- test -f $(distdir)/$$file \
-- || cp -p $$d/$$file $(distdir)/$$file \
-+ test -f "$(distdir)/$$file" \
-+ || cp -p $$d/$$file "$(distdir)/$$file" \
- || exit 1; \
- fi; \
- done
-@@ -636,6 +710,7 @@
-
- distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -658,6 +733,8 @@
+@@ -662,6 +690,8 @@
html: html-am
@@ -43725,7 +26350,7 @@ Index: pam.debian/modules/pam_tally2/Makefile.in
info: info-am
info-am:
-@@ -666,18 +743,28 @@
+@@ -670,18 +700,28 @@
install-dvi: install-dvi-am
@@ -43754,30 +26379,13 @@ Index: pam.debian/modules/pam_tally2/Makefile.in
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -703,7 +790,7 @@
-
- uninstall-man: uninstall-man8
-
--.MAKE: install-am install-strip
-+.MAKE: check-am install-am install-strip
-
- .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
- clean-generic clean-libtool clean-sbinPROGRAMS \
-@@ -724,6 +811,7 @@
-
- @ENABLE_REGENERATE_MAN_TRUE@README: pam_tally2.8.xml
- @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
-+
- # 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.
- .NOEXPORT:
-Index: pam.debian/modules/pam_time/Makefile.in
+Index: pam.deb/modules/pam_time/Makefile.in
===================================================================
---- pam.debian.orig/modules/pam_time/Makefile.in
-+++ pam.debian/modules/pam_time/Makefile.in
+--- pam.deb.orig/modules/pam_time/Makefile.in
++++ pam.deb/modules/pam_time/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -43787,72 +26395,7 @@ Index: pam.debian/modules/pam_time/Makefile.in
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -21,8 +22,9 @@
-
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
--pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkglibexecdir = $(libexecdir)/@PACKAGE@
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
-@@ -58,15 +60,30 @@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
-+CONFIG_CLEAN_VPATH_FILES =
- am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
- am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-+am__install_max = 40
-+am__nobase_strip_setup = \
-+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-+am__nobase_strip = \
-+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-+am__nobase_list = $(am__nobase_strip_setup); \
-+ for p in $$list; do echo "$$p $$p"; done | \
-+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-+ if (++n[$$2] == $(am__install_max)) \
-+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-+ END { for (dir in files) print dir, files[dir] }'
-+am__base_list = \
-+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
- am__installdirs = "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man5dir)" \
- "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(secureconfdir)"
--securelibLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(securelib_LTLIBRARIES)
- pam_time_la_DEPENDENCIES =
- pam_time_la_SOURCES = pam_time.c
-@@ -74,6 +91,7 @@
- DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
-+am__mv = mv -f
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-@@ -89,10 +107,11 @@
- man8dir = $(mandir)/man8
- NROFF = nroff
- MANS = $(man_MANS)
--secureconfDATA_INSTALL = $(INSTALL_DATA)
- DATA = $(noinst_DATA) $(secureconf_DATA)
- ETAGS = etags
- CTAGS = ctags
-+am__tty_colors = \
-+red=; grn=; lgn=; blu=; std=
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- AMTAR = @AMTAR@
-@@ -177,6 +196,7 @@
+@@ -179,6 +180,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -43860,7 +26403,7 @@ Index: pam.debian/modules/pam_time/Makefile.in
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PIE_CFLAGS = @PIE_CFLAGS@
-@@ -279,14 +299,14 @@
+@@ -283,8 +285,8 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -43871,270 +26414,29 @@ Index: pam.debian/modules/pam_time/Makefile.in
exit 1;; \
esac; \
done; \
-- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/pam_time/Makefile'; \
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu modules/pam_time/Makefile
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/pam_time/Makefile'; \
-+ $(am__cd) $(top_srcdir) && \
-+ $(AUTOMAKE) --gnu modules/pam_time/Makefile
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
-@@ -304,23 +324,28 @@
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- $(ACLOCAL_M4): $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(am__aclocal_m4_deps):
- install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
- @$(NORMAL_INSTALL)
- test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
-- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-+ @list='$(securelib_LTLIBRARIES)'; test -n "$(securelibdir)" || list=; \
-+ list2=; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-- 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"; \
-+ list2="$$list2 $$p"; \
- else :; fi; \
-- done
-+ done; \
-+ test -z "$$list2" || { \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(securelibdir)'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(securelibdir)"; \
-+ }
-
- uninstall-securelibLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-+ @list='$(securelib_LTLIBRARIES)'; test -n "$(securelibdir)" || list=; \
-+ for p in $$list; do \
-+ $(am__strip_dir) \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$f'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$f"; \
- done
-
- clean-securelibLTLIBRARIES:
-@@ -344,21 +369,21 @@
-
- .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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @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 $@ $<
-@@ -368,127 +393,116 @@
-
- clean-libtool:
- -rm -rf .libs _libs
--install-man5: $(man5_MANS) $(man_MANS)
-+install-man5: $(man_MANS)
- @$(NORMAL_INSTALL)
- 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 \
-- case "$$i" in \
-- *.5*) list="$$list $$i" ;; \
-- esac; \
-+ @list=''; test -n "$(man5dir)" || exit 0; \
-+ { for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.5[a-z]*$$/p'; \
-+ } | while read p; do \
-+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-+ echo "$$d$$p"; echo "$$p"; \
-+ done | \
-+ sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^5][0-9a-z]*$$,5,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
-+ sed 'N;N;s,\n, ,g' | { \
-+ list=; while read file base inst; do \
-+ if test "$$base" = "$$inst"; then list="$$list $$file"; else \
-+ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man5dir)/$$inst'"; \
-+ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man5dir)/$$inst" || exit $$?; \
-+ fi; \
+@@ -383,8 +385,8 @@
+ esac; \
done; \
-- for i in $$list; do \
+ for i in $$list; do \
- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
- else file=$$i; fi; \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 5*) ;; \
-- *) ext='5' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man5dir)/$$inst'"; \
-- $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man5dir)/$$inst"; \
-- done
-+ for i in $$list; do echo "$$i"; done | $(am__base_list) | \
-+ while read files; do \
-+ test -z "$$files" || { \
-+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man5dir)'"; \
-+ $(INSTALL_DATA) $$files "$(DESTDIR)$(man5dir)" || exit $$?; }; \
-+ done; }
-+
- uninstall-man5:
- @$(NORMAL_UNINSTALL)
-- @list='$(man5_MANS) $(dist_man5_MANS) $(nodist_man5_MANS)'; \
-- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-- for i in $$l2; do \
-- case "$$i" in \
-- *.5*) list="$$list $$i" ;; \
-- esac; \
-- done; \
-- for i in $$list; do \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 5*) ;; \
-- *) ext='5' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " rm -f '$(DESTDIR)$(man5dir)/$$inst'"; \
-- rm -f "$(DESTDIR)$(man5dir)/$$inst"; \
-- done
--install-man8: $(man8_MANS) $(man_MANS)
-+ @list=''; test -n "$(man5dir)" || exit 0; \
-+ files=`{ for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.5[a-z]*$$/p'; \
-+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^5][0-9a-z]*$$,5,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-+ test -z "$$files" || { \
-+ echo " ( cd '$(DESTDIR)$(man5dir)' && rm -f" $$files ")"; \
-+ cd "$(DESTDIR)$(man5dir)" && rm -f $$files; }
-+install-man8: $(man_MANS)
- @$(NORMAL_INSTALL)
- 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 \
-- case "$$i" in \
-- *.8*) list="$$list $$i" ;; \
-- esac; \
-+ @list=''; test -n "$(man8dir)" || exit 0; \
-+ { for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.8[a-z]*$$/p'; \
-+ } | while read p; do \
-+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-+ echo "$$d$$p"; echo "$$p"; \
-+ done | \
-+ sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
-+ sed 'N;N;s,\n, ,g' | { \
-+ list=; while read file base inst; do \
-+ if test "$$base" = "$$inst"; then list="$$list $$file"; else \
-+ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-+ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst" || exit $$?; \
-+ fi; \
++ if test -f $$i; then file=$$i; \
++ else file=$(srcdir)/$$i; fi; \
+ ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+ case "$$ext" in \
+ 5*) ;; \
+@@ -428,8 +430,8 @@
+ esac; \
done; \
-- for i in $$list; do \
+ for i in $$list; do \
- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
- else file=$$i; fi; \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 8*) ;; \
-- *) ext='8' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-- $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \
-- done
-+ for i in $$list; do echo "$$i"; done | $(am__base_list) | \
-+ while read files; do \
-+ test -z "$$files" || { \
-+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man8dir)'"; \
-+ $(INSTALL_DATA) $$files "$(DESTDIR)$(man8dir)" || exit $$?; }; \
-+ done; }
-+
- uninstall-man8:
- @$(NORMAL_UNINSTALL)
-- @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
-- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-- for i in $$l2; do \
-- case "$$i" in \
-- *.8*) list="$$list $$i" ;; \
-- esac; \
-- done; \
-- for i in $$list; do \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 8*) ;; \
-- *) ext='8' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \
-- rm -f "$(DESTDIR)$(man8dir)/$$inst"; \
-- done
-+ @list=''; test -n "$(man8dir)" || exit 0; \
-+ files=`{ for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.8[a-z]*$$/p'; \
-+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-+ test -z "$$files" || { \
-+ echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \
-+ cd "$(DESTDIR)$(man8dir)" && rm -f $$files; }
- install-secureconfDATA: $(secureconf_DATA)
- @$(NORMAL_INSTALL)
- test -z "$(secureconfdir)" || $(MKDIR_P) "$(DESTDIR)$(secureconfdir)"
-- @list='$(secureconf_DATA)'; for p in $$list; do \
-+ @list='$(secureconf_DATA)'; test -n "$(secureconfdir)" || list=; \
-+ for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-- echo " $(secureconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(secureconfdir)/$$f'"; \
-- $(secureconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(secureconfdir)/$$f"; \
-+ echo "$$d$$p"; \
-+ done | $(am__base_list) | \
-+ while read files; do \
-+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(secureconfdir)'"; \
-+ $(INSTALL_DATA) $$files "$(DESTDIR)$(secureconfdir)" || exit $$?; \
- done
-
- uninstall-secureconfDATA:
- @$(NORMAL_UNINSTALL)
-- @list='$(secureconf_DATA)'; for p in $$list; do \
-- f=$(am__strip_dir) \
-- echo " rm -f '$(DESTDIR)$(secureconfdir)/$$f'"; \
-- rm -f "$(DESTDIR)$(secureconfdir)/$$f"; \
-- done
-+ @list='$(secureconf_DATA)'; test -n "$(secureconfdir)" || list=; \
-+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-+ test -n "$$files" || exit 0; \
-+ echo " ( cd '$(DESTDIR)$(secureconfdir)' && rm -f" $$files ")"; \
-+ cd "$(DESTDIR)$(secureconfdir)" && rm -f $$files
-
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
++ if test -f $$i; then file=$$i; \
++ else file=$(srcdir)/$$i; fi; \
+ ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+ case "$$ext" in \
+ 8*) ;; \
+@@ -485,7 +487,7 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -44143,56 +26445,7 @@ Index: pam.debian/modules/pam_time/Makefile.in
END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
-+ set x; \
- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -496,37 +510,43 @@
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ shift; \
-+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
-- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique; \
-+ if test $$# -gt 0; then \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ "$$@" $$unique; \
-+ else \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$unique; \
-+ fi; \
- fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
- 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; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+ test -z "$(CTAGS_ARGS)$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-- $$tags $$unique
-+ $$unique
-
- GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
-- && cd $(top_srcdir) \
-- && gtags -i $(GTAGS_ARGS) $$here
-+ && $(am__cd) $(top_srcdir) \
-+ && gtags -i $(GTAGS_ARGS) "$$here"
-
- distclean-tags:
+@@ -528,7 +530,7 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
check-TESTS: $(TESTS)
@@ -44200,11 +26453,8 @@ Index: pam.debian/modules/pam_time/Makefile.in
+ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
srcdir=$(srcdir); export srcdir; \
list=' $(TESTS) '; \
-+ $(am__tty_colors); \
if test -n "$$list"; then \
- for tst in $$list; do \
- if test -f ./$$tst; then dir=./; \
-@@ -535,49 +555,63 @@
+@@ -539,7 +541,7 @@
if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
@@ -44212,35 +26462,19 @@ Index: pam.debian/modules/pam_time/Makefile.in
+ *[\ \ ]$$tst[\ \ ]*) \
xpass=`expr $$xpass + 1`; \
failed=`expr $$failed + 1`; \
-- echo "XPASS: $$tst"; \
-+ col=$$red; res=XPASS; \
- ;; \
- *) \
-- echo "PASS: $$tst"; \
-+ col=$$grn; res=PASS; \
- ;; \
- esac; \
+ echo "XPASS: $$tst"; \
+@@ -551,7 +553,7 @@
elif test $$? -ne 77; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
- *$$ws$$tst$$ws*) \
+ *[\ \ ]$$tst[\ \ ]*) \
xfail=`expr $$xfail + 1`; \
-- echo "XFAIL: $$tst"; \
-+ col=$$lgn; res=XFAIL; \
- ;; \
- *) \
- failed=`expr $$failed + 1`; \
-- echo "FAIL: $$tst"; \
-+ col=$$red; res=FAIL; \
+ echo "XFAIL: $$tst"; \
;; \
- esac; \
- else \
- skip=`expr $$skip + 1`; \
-- echo "SKIP: $$tst"; \
-+ col=$$blu; res=SKIP; \
+@@ -565,23 +567,36 @@
+ echo "SKIP: $$tst"; \
fi; \
-+ echo "$${col}$$res$${std}: $$tst"; \
done; \
+ if test "$$all" -eq 1; then \
+ tests="test"; \
@@ -44280,22 +26514,7 @@ Index: pam.debian/modules/pam_time/Makefile.in
test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
dashes="$$skipped"; \
fi; \
-@@ -588,15 +622,32 @@
- dashes="$$report"; \
- fi; \
- dashes=`echo "$$dashes" | sed s/./=/g`; \
-- echo "$$dashes"; \
-+ if test "$$failed" -eq 0; then \
-+ echo "$$grn$$dashes"; \
-+ else \
-+ echo "$$red$$dashes"; \
-+ fi; \
- echo "$$banner"; \
- test -z "$$skipped" || echo "$$skipped"; \
- test -z "$$report" || echo "$$report"; \
-- echo "$$dashes"; \
-+ echo "$$dashes$$std"; \
- test "$$failed" -eq 0; \
+@@ -601,6 +616,19 @@
else :; fi
distdir: $(DISTFILES)
@@ -44315,37 +26534,7 @@ Index: pam.debian/modules/pam_time/Makefile.in
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
-@@ -612,13 +663,17 @@
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-+ if test -d "$(distdir)/$$file"; then \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+ fi; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
-- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
- else \
-- test -f $(distdir)/$$file \
-- || cp -p $$d/$$file $(distdir)/$$file \
-+ test -f "$(distdir)/$$file" \
-+ || cp -p $$d/$$file "$(distdir)/$$file" \
- || exit 1; \
- fi; \
- done
-@@ -651,6 +706,7 @@
-
- distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -673,6 +729,8 @@
+@@ -677,6 +705,8 @@
html: html-am
@@ -44354,7 +26543,7 @@ Index: pam.debian/modules/pam_time/Makefile.in
info: info-am
info-am:
-@@ -682,18 +740,28 @@
+@@ -686,18 +716,28 @@
install-dvi: install-dvi-am
@@ -44383,30 +26572,13 @@ Index: pam.debian/modules/pam_time/Makefile.in
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -719,7 +787,7 @@
-
- uninstall-man: uninstall-man5 uninstall-man8
-
--.MAKE: install-am install-strip
-+.MAKE: check-am install-am install-strip
-
- .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
- clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
-@@ -740,6 +808,7 @@
-
- @ENABLE_REGENERATE_MAN_TRUE@README: pam_time.8.xml time.conf.5.xml
- @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
-+
- # 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.
- .NOEXPORT:
-Index: pam.debian/modules/pam_timestamp/Makefile.in
+Index: pam.deb/modules/pam_timestamp/Makefile.in
===================================================================
---- pam.debian.orig/modules/pam_timestamp/Makefile.in
-+++ pam.debian/modules/pam_timestamp/Makefile.in
+--- pam.deb.orig/modules/pam_timestamp/Makefile.in
++++ pam.deb/modules/pam_timestamp/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -44416,76 +26588,7 @@ Index: pam.debian/modules/pam_timestamp/Makefile.in
# 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.
-@@ -24,8 +25,9 @@
-
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
--pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkglibexecdir = $(libexecdir)/@PACKAGE@
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
-@@ -65,15 +67,30 @@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
-+CONFIG_CLEAN_VPATH_FILES =
- am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
- am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-+am__install_max = 40
-+am__nobase_strip_setup = \
-+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-+am__nobase_strip = \
-+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-+am__nobase_list = $(am__nobase_strip_setup); \
-+ for p in $$list; do echo "$$p $$p"; done | \
-+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-+ if (++n[$$2] == $(am__install_max)) \
-+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-+ END { for (dir in files) print dir, files[dir] }'
-+am__base_list = \
-+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
- am__installdirs = "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(sbindir)" \
- "$(DESTDIR)$(man8dir)"
--securelibLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(securelib_LTLIBRARIES)
- pam_timestamp_la_DEPENDENCIES =
- am_pam_timestamp_la_OBJECTS = pam_timestamp_la-pam_timestamp.lo \
-@@ -82,7 +99,6 @@
- pam_timestamp_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(pam_timestamp_la_CFLAGS) \
- $(CFLAGS) $(pam_timestamp_la_LDFLAGS) $(LDFLAGS) -o $@
--sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
- PROGRAMS = $(noinst_PROGRAMS) $(sbin_PROGRAMS)
- am_hmacfile_OBJECTS = hmacfile.$(OBJEXT) hmacsha1.$(OBJEXT) \
- sha1.$(OBJEXT)
-@@ -99,6 +115,7 @@
- DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
-+am__mv = mv -f
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-@@ -119,6 +136,8 @@
- HEADERS = $(noinst_HEADERS)
- ETAGS = etags
- CTAGS = ctags
-+am__tty_colors = \
-+red=; grn=; lgn=; blu=; std=
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- AMTAR = @AMTAR@
-@@ -203,6 +222,7 @@
+@@ -205,6 +206,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -44493,7 +26596,7 @@ Index: pam.debian/modules/pam_timestamp/Makefile.in
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PIE_CFLAGS = @PIE_CFLAGS@
-@@ -311,14 +331,14 @@
+@@ -315,8 +317,8 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -44504,291 +26607,18 @@ Index: pam.debian/modules/pam_timestamp/Makefile.in
exit 1;; \
esac; \
done; \
-- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/pam_timestamp/Makefile'; \
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu modules/pam_timestamp/Makefile
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/pam_timestamp/Makefile'; \
-+ $(am__cd) $(top_srcdir) && \
-+ $(AUTOMAKE) --gnu modules/pam_timestamp/Makefile
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
-@@ -336,23 +356,28 @@
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- $(ACLOCAL_M4): $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(am__aclocal_m4_deps):
- install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
- @$(NORMAL_INSTALL)
- test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
-- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-+ @list='$(securelib_LTLIBRARIES)'; test -n "$(securelibdir)" || list=; \
-+ list2=; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-- 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"; \
-+ list2="$$list2 $$p"; \
- else :; fi; \
-- done
-+ done; \
-+ test -z "$$list2" || { \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(securelibdir)'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(securelibdir)"; \
-+ }
-
- uninstall-securelibLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-+ @list='$(securelib_LTLIBRARIES)'; test -n "$(securelibdir)" || list=; \
-+ for p in $$list; do \
-+ $(am__strip_dir) \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$f'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$f"; \
- done
-
- clean-securelibLTLIBRARIES:
-@@ -367,39 +392,56 @@
- $(pam_timestamp_la_LINK) -rpath $(securelibdir) $(pam_timestamp_la_OBJECTS) $(pam_timestamp_la_LIBADD) $(LIBS)
-
- clean-noinstPROGRAMS:
-- @list='$(noinst_PROGRAMS)'; for p in $$list; do \
-- f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-- echo " rm -f $$p $$f"; \
-- rm -f $$p $$f ; \
-- done
-+ @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
-+ echo " rm -f" $$list; \
-+ rm -f $$list || exit $$?; \
-+ test -n "$(EXEEXT)" || exit 0; \
-+ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
-+ echo " rm -f" $$list; \
-+ rm -f $$list
- install-sbinPROGRAMS: $(sbin_PROGRAMS)
- @$(NORMAL_INSTALL)
- 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 \
-- || test -f $$p1 \
-- ; then \
-- f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(sbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(sbindir)/$$f'"; \
-- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(sbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(sbindir)/$$f" || exit 1; \
-- else :; fi; \
-- done
-+ @list='$(sbin_PROGRAMS)'; test -n "$(sbindir)" || list=; \
-+ for p in $$list; do echo "$$p $$p"; done | \
-+ sed 's/$(EXEEXT)$$//' | \
-+ while read p p1; do if test -f $$p || test -f $$p1; \
-+ then echo "$$p"; echo "$$p"; else :; fi; \
-+ done | \
-+ sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
-+ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
-+ sed 'N;N;N;s,\n, ,g' | \
-+ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
-+ { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
-+ if ($$2 == $$4) files[d] = files[d] " " $$1; \
-+ else { print "f", $$3 "/" $$4, $$1; } } \
-+ END { for (d in files) print "f", d, files[d] }' | \
-+ while read type dir files; do \
-+ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
-+ test -z "$$files" || { \
-+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(sbindir)$$dir'"; \
-+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(sbindir)$$dir" || exit $$?; \
-+ } \
-+ ; done
-
- uninstall-sbinPROGRAMS:
- @$(NORMAL_UNINSTALL)
-- @list='$(sbin_PROGRAMS)'; for p in $$list; do \
-- f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-- echo " rm -f '$(DESTDIR)$(sbindir)/$$f'"; \
-- rm -f "$(DESTDIR)$(sbindir)/$$f"; \
-- done
-+ @list='$(sbin_PROGRAMS)'; test -n "$(sbindir)" || list=; \
-+ files=`for p in $$list; do echo "$$p"; done | \
-+ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-+ -e 's/$$/$(EXEEXT)/' `; \
-+ test -n "$$list" || exit 0; \
-+ echo " ( cd '$(DESTDIR)$(sbindir)' && rm -f" $$files ")"; \
-+ cd "$(DESTDIR)$(sbindir)" && rm -f $$files
-
- clean-sbinPROGRAMS:
-- @list='$(sbin_PROGRAMS)'; for p in $$list; do \
-- f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-- echo " rm -f $$p $$f"; \
-- rm -f $$p $$f ; \
-- done
-+ @list='$(sbin_PROGRAMS)'; test -n "$$list" || exit 0; \
-+ echo " rm -f" $$list; \
-+ rm -f $$list || exit $$?; \
-+ test -n "$(EXEEXT)" || exit 0; \
-+ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
-+ echo " rm -f" $$list; \
-+ rm -f $$list
- hmacfile$(EXEEXT): $(hmacfile_OBJECTS) $(hmacfile_DEPENDENCIES)
- @rm -f hmacfile$(EXEEXT)
- $(LINK) $(hmacfile_OBJECTS) $(hmacfile_LDADD) $(LIBS)
-@@ -423,56 +465,56 @@
-
- .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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @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 $@ $<
-
- pam_timestamp_la-pam_timestamp.lo: pam_timestamp.c
--@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pam_timestamp_la_CFLAGS) $(CFLAGS) -MT pam_timestamp_la-pam_timestamp.lo -MD -MP -MF $(DEPDIR)/pam_timestamp_la-pam_timestamp.Tpo -c -o pam_timestamp_la-pam_timestamp.lo `test -f 'pam_timestamp.c' || echo '$(srcdir)/'`pam_timestamp.c
--@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/pam_timestamp_la-pam_timestamp.Tpo $(DEPDIR)/pam_timestamp_la-pam_timestamp.Plo
-+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pam_timestamp_la_CFLAGS) $(CFLAGS) -MT pam_timestamp_la-pam_timestamp.lo -MD -MP -MF $(DEPDIR)/pam_timestamp_la-pam_timestamp.Tpo -c -o pam_timestamp_la-pam_timestamp.lo `test -f 'pam_timestamp.c' || echo '$(srcdir)/'`pam_timestamp.c
-+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/pam_timestamp_la-pam_timestamp.Tpo $(DEPDIR)/pam_timestamp_la-pam_timestamp.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pam_timestamp.c' object='pam_timestamp_la-pam_timestamp.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pam_timestamp_la_CFLAGS) $(CFLAGS) -c -o pam_timestamp_la-pam_timestamp.lo `test -f 'pam_timestamp.c' || echo '$(srcdir)/'`pam_timestamp.c
-+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pam_timestamp_la_CFLAGS) $(CFLAGS) -c -o pam_timestamp_la-pam_timestamp.lo `test -f 'pam_timestamp.c' || echo '$(srcdir)/'`pam_timestamp.c
-
- pam_timestamp_la-hmacsha1.lo: hmacsha1.c
--@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pam_timestamp_la_CFLAGS) $(CFLAGS) -MT pam_timestamp_la-hmacsha1.lo -MD -MP -MF $(DEPDIR)/pam_timestamp_la-hmacsha1.Tpo -c -o pam_timestamp_la-hmacsha1.lo `test -f 'hmacsha1.c' || echo '$(srcdir)/'`hmacsha1.c
--@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/pam_timestamp_la-hmacsha1.Tpo $(DEPDIR)/pam_timestamp_la-hmacsha1.Plo
-+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pam_timestamp_la_CFLAGS) $(CFLAGS) -MT pam_timestamp_la-hmacsha1.lo -MD -MP -MF $(DEPDIR)/pam_timestamp_la-hmacsha1.Tpo -c -o pam_timestamp_la-hmacsha1.lo `test -f 'hmacsha1.c' || echo '$(srcdir)/'`hmacsha1.c
-+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/pam_timestamp_la-hmacsha1.Tpo $(DEPDIR)/pam_timestamp_la-hmacsha1.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='hmacsha1.c' object='pam_timestamp_la-hmacsha1.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pam_timestamp_la_CFLAGS) $(CFLAGS) -c -o pam_timestamp_la-hmacsha1.lo `test -f 'hmacsha1.c' || echo '$(srcdir)/'`hmacsha1.c
-+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pam_timestamp_la_CFLAGS) $(CFLAGS) -c -o pam_timestamp_la-hmacsha1.lo `test -f 'hmacsha1.c' || echo '$(srcdir)/'`hmacsha1.c
-
- pam_timestamp_la-sha1.lo: sha1.c
--@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pam_timestamp_la_CFLAGS) $(CFLAGS) -MT pam_timestamp_la-sha1.lo -MD -MP -MF $(DEPDIR)/pam_timestamp_la-sha1.Tpo -c -o pam_timestamp_la-sha1.lo `test -f 'sha1.c' || echo '$(srcdir)/'`sha1.c
--@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/pam_timestamp_la-sha1.Tpo $(DEPDIR)/pam_timestamp_la-sha1.Plo
-+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pam_timestamp_la_CFLAGS) $(CFLAGS) -MT pam_timestamp_la-sha1.lo -MD -MP -MF $(DEPDIR)/pam_timestamp_la-sha1.Tpo -c -o pam_timestamp_la-sha1.lo `test -f 'sha1.c' || echo '$(srcdir)/'`sha1.c
-+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/pam_timestamp_la-sha1.Tpo $(DEPDIR)/pam_timestamp_la-sha1.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sha1.c' object='pam_timestamp_la-sha1.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pam_timestamp_la_CFLAGS) $(CFLAGS) -c -o pam_timestamp_la-sha1.lo `test -f 'sha1.c' || echo '$(srcdir)/'`sha1.c
-+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pam_timestamp_la_CFLAGS) $(CFLAGS) -c -o pam_timestamp_la-sha1.lo `test -f 'sha1.c' || echo '$(srcdir)/'`sha1.c
-
- pam_timestamp_check-pam_timestamp_check.o: pam_timestamp_check.c
- @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pam_timestamp_check_CFLAGS) $(CFLAGS) -MT pam_timestamp_check-pam_timestamp_check.o -MD -MP -MF $(DEPDIR)/pam_timestamp_check-pam_timestamp_check.Tpo -c -o pam_timestamp_check-pam_timestamp_check.o `test -f 'pam_timestamp_check.c' || echo '$(srcdir)/'`pam_timestamp_check.c
--@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/pam_timestamp_check-pam_timestamp_check.Tpo $(DEPDIR)/pam_timestamp_check-pam_timestamp_check.Po
-+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/pam_timestamp_check-pam_timestamp_check.Tpo $(DEPDIR)/pam_timestamp_check-pam_timestamp_check.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pam_timestamp_check.c' object='pam_timestamp_check-pam_timestamp_check.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) $(pam_timestamp_check_CFLAGS) $(CFLAGS) -c -o pam_timestamp_check-pam_timestamp_check.o `test -f 'pam_timestamp_check.c' || echo '$(srcdir)/'`pam_timestamp_check.c
-
- pam_timestamp_check-pam_timestamp_check.obj: pam_timestamp_check.c
- @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pam_timestamp_check_CFLAGS) $(CFLAGS) -MT pam_timestamp_check-pam_timestamp_check.obj -MD -MP -MF $(DEPDIR)/pam_timestamp_check-pam_timestamp_check.Tpo -c -o pam_timestamp_check-pam_timestamp_check.obj `if test -f 'pam_timestamp_check.c'; then $(CYGPATH_W) 'pam_timestamp_check.c'; else $(CYGPATH_W) '$(srcdir)/pam_timestamp_check.c'; fi`
--@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/pam_timestamp_check-pam_timestamp_check.Tpo $(DEPDIR)/pam_timestamp_check-pam_timestamp_check.Po
-+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/pam_timestamp_check-pam_timestamp_check.Tpo $(DEPDIR)/pam_timestamp_check-pam_timestamp_check.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pam_timestamp_check.c' object='pam_timestamp_check-pam_timestamp_check.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) $(pam_timestamp_check_CFLAGS) $(CFLAGS) -c -o pam_timestamp_check-pam_timestamp_check.obj `if test -f 'pam_timestamp_check.c'; then $(CYGPATH_W) 'pam_timestamp_check.c'; else $(CYGPATH_W) '$(srcdir)/pam_timestamp_check.c'; fi`
-@@ -482,65 +524,58 @@
-
- clean-libtool:
- -rm -rf .libs _libs
--install-man8: $(man8_MANS) $(man_MANS)
-+install-man8: $(man_MANS)
- @$(NORMAL_INSTALL)
- 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 \
-- case "$$i" in \
-- *.8*) list="$$list $$i" ;; \
-- esac; \
-+ @list=''; test -n "$(man8dir)" || exit 0; \
-+ { for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.8[a-z]*$$/p'; \
-+ } | while read p; do \
-+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-+ echo "$$d$$p"; echo "$$p"; \
-+ done | \
-+ sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
-+ sed 'N;N;s,\n, ,g' | { \
-+ list=; while read file base inst; do \
-+ if test "$$base" = "$$inst"; then list="$$list $$file"; else \
-+ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-+ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst" || exit $$?; \
-+ fi; \
+@@ -497,8 +499,8 @@
+ esac; \
done; \
-- for i in $$list; do \
+ for i in $$list; do \
- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
- else file=$$i; fi; \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 8*) ;; \
-- *) ext='8' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-- $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \
-- done
-+ for i in $$list; do echo "$$i"; done | $(am__base_list) | \
-+ while read files; do \
-+ test -z "$$files" || { \
-+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man8dir)'"; \
-+ $(INSTALL_DATA) $$files "$(DESTDIR)$(man8dir)" || exit $$?; }; \
-+ done; }
-+
- uninstall-man8:
- @$(NORMAL_UNINSTALL)
-- @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
-- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-- for i in $$l2; do \
-- case "$$i" in \
-- *.8*) list="$$list $$i" ;; \
-- esac; \
-- done; \
-- for i in $$list; do \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 8*) ;; \
-- *) ext='8' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \
-- rm -f "$(DESTDIR)$(man8dir)/$$inst"; \
-- done
-+ @list=''; test -n "$(man8dir)" || exit 0; \
-+ files=`{ for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.8[a-z]*$$/p'; \
-+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-+ test -z "$$files" || { \
-+ echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \
-+ cd "$(DESTDIR)$(man8dir)" && rm -f $$files; }
-
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
++ if test -f $$i; then file=$$i; \
++ else file=$(srcdir)/$$i; fi; \
+ ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+ case "$$ext" in \
+ 8*) ;; \
+@@ -537,7 +539,7 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -44797,56 +26627,7 @@ Index: pam.debian/modules/pam_timestamp/Makefile.in
END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
-+ set x; \
- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -548,37 +583,43 @@
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ shift; \
-+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
-- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique; \
-+ if test $$# -gt 0; then \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ "$$@" $$unique; \
-+ else \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$unique; \
-+ fi; \
- fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
- 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; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+ test -z "$(CTAGS_ARGS)$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-- $$tags $$unique
-+ $$unique
-
- GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
-- && cd $(top_srcdir) \
-- && gtags -i $(GTAGS_ARGS) $$here
-+ && $(am__cd) $(top_srcdir) \
-+ && gtags -i $(GTAGS_ARGS) "$$here"
-
- distclean-tags:
+@@ -580,7 +582,7 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
check-TESTS: $(TESTS)
@@ -44854,11 +26635,8 @@ Index: pam.debian/modules/pam_timestamp/Makefile.in
+ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
srcdir=$(srcdir); export srcdir; \
list=' $(TESTS) '; \
-+ $(am__tty_colors); \
if test -n "$$list"; then \
- for tst in $$list; do \
- if test -f ./$$tst; then dir=./; \
-@@ -587,49 +628,63 @@
+@@ -591,7 +593,7 @@
if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
@@ -44866,35 +26644,19 @@ Index: pam.debian/modules/pam_timestamp/Makefile.in
+ *[\ \ ]$$tst[\ \ ]*) \
xpass=`expr $$xpass + 1`; \
failed=`expr $$failed + 1`; \
-- echo "XPASS: $$tst"; \
-+ col=$$red; res=XPASS; \
- ;; \
- *) \
-- echo "PASS: $$tst"; \
-+ col=$$grn; res=PASS; \
- ;; \
- esac; \
+ echo "XPASS: $$tst"; \
+@@ -603,7 +605,7 @@
elif test $$? -ne 77; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
- *$$ws$$tst$$ws*) \
+ *[\ \ ]$$tst[\ \ ]*) \
xfail=`expr $$xfail + 1`; \
-- echo "XFAIL: $$tst"; \
-+ col=$$lgn; res=XFAIL; \
- ;; \
- *) \
- failed=`expr $$failed + 1`; \
-- echo "FAIL: $$tst"; \
-+ col=$$red; res=FAIL; \
+ echo "XFAIL: $$tst"; \
;; \
- esac; \
- else \
- skip=`expr $$skip + 1`; \
-- echo "SKIP: $$tst"; \
-+ col=$$blu; res=SKIP; \
+@@ -617,23 +619,36 @@
+ echo "SKIP: $$tst"; \
fi; \
-+ echo "$${col}$$res$${std}: $$tst"; \
done; \
+ if test "$$all" -eq 1; then \
+ tests="test"; \
@@ -44934,22 +26696,7 @@ Index: pam.debian/modules/pam_timestamp/Makefile.in
test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
dashes="$$skipped"; \
fi; \
-@@ -640,15 +695,32 @@
- dashes="$$report"; \
- fi; \
- dashes=`echo "$$dashes" | sed s/./=/g`; \
-- echo "$$dashes"; \
-+ if test "$$failed" -eq 0; then \
-+ echo "$$grn$$dashes"; \
-+ else \
-+ echo "$$red$$dashes"; \
-+ fi; \
- echo "$$banner"; \
- test -z "$$skipped" || echo "$$skipped"; \
- test -z "$$report" || echo "$$report"; \
-- echo "$$dashes"; \
-+ echo "$$dashes$$std"; \
- test "$$failed" -eq 0; \
+@@ -653,6 +668,19 @@
else :; fi
distdir: $(DISTFILES)
@@ -44969,37 +26716,7 @@ Index: pam.debian/modules/pam_timestamp/Makefile.in
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
-@@ -664,13 +736,17 @@
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-+ if test -d "$(distdir)/$$file"; then \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+ fi; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
-- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
- else \
-- test -f $(distdir)/$$file \
-- || cp -p $$d/$$file $(distdir)/$$file \
-+ test -f "$(distdir)/$$file" \
-+ || cp -p $$d/$$file "$(distdir)/$$file" \
- || exit 1; \
- fi; \
- done
-@@ -703,6 +779,7 @@
-
- distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -725,6 +802,8 @@
+@@ -729,6 +757,8 @@
html: html-am
@@ -45008,7 +26725,7 @@ Index: pam.debian/modules/pam_timestamp/Makefile.in
info: info-am
info-am:
-@@ -733,18 +812,28 @@
+@@ -737,18 +767,28 @@
install-dvi: install-dvi-am
@@ -45037,30 +26754,13 @@ Index: pam.debian/modules/pam_timestamp/Makefile.in
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -770,7 +859,7 @@
-
- uninstall-man: uninstall-man8
-
--.MAKE: install-am install-strip
-+.MAKE: check-am install-am install-strip
-
- .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
- clean-generic clean-libtool clean-noinstPROGRAMS \
-@@ -791,6 +880,7 @@
-
- @ENABLE_REGENERATE_MAN_TRUE@README: pam_timestamp.8.xml
- @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
-+
- # 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.
- .NOEXPORT:
-Index: pam.debian/modules/pam_umask/Makefile.in
+Index: pam.deb/modules/pam_umask/Makefile.in
===================================================================
---- pam.debian.orig/modules/pam_umask/Makefile.in
-+++ pam.debian/modules/pam_umask/Makefile.in
+--- pam.deb.orig/modules/pam_umask/Makefile.in
++++ pam.deb/modules/pam_umask/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -45070,67 +26770,7 @@ Index: pam.debian/modules/pam_umask/Makefile.in
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -21,8 +22,9 @@
-
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
--pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkglibexecdir = $(libexecdir)/@PACKAGE@
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
-@@ -58,14 +60,29 @@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
-+CONFIG_CLEAN_VPATH_FILES =
- am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
- am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-+am__install_max = 40
-+am__nobase_strip_setup = \
-+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-+am__nobase_strip = \
-+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-+am__nobase_list = $(am__nobase_strip_setup); \
-+ for p in $$list; do echo "$$p $$p"; done | \
-+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-+ if (++n[$$2] == $(am__install_max)) \
-+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-+ END { for (dir in files) print dir, files[dir] }'
-+am__base_list = \
-+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
- am__installdirs = "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man8dir)"
--securelibLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(securelib_LTLIBRARIES)
- pam_umask_la_DEPENDENCIES =
- pam_umask_la_SOURCES = pam_umask.c
-@@ -73,6 +90,7 @@
- DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
-+am__mv = mv -f
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-@@ -90,6 +108,8 @@
- DATA = $(noinst_DATA)
- ETAGS = etags
- CTAGS = ctags
-+am__tty_colors = \
-+red=; grn=; lgn=; blu=; std=
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- AMTAR = @AMTAR@
-@@ -174,6 +194,7 @@
+@@ -176,6 +177,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -45138,7 +26778,7 @@ Index: pam.debian/modules/pam_umask/Makefile.in
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PIE_CFLAGS = @PIE_CFLAGS@
-@@ -273,14 +294,14 @@
+@@ -277,8 +279,8 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -45149,163 +26789,18 @@ Index: pam.debian/modules/pam_umask/Makefile.in
exit 1;; \
esac; \
done; \
-- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/pam_umask/Makefile'; \
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu modules/pam_umask/Makefile
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/pam_umask/Makefile'; \
-+ $(am__cd) $(top_srcdir) && \
-+ $(AUTOMAKE) --gnu modules/pam_umask/Makefile
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
-@@ -298,23 +319,28 @@
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- $(ACLOCAL_M4): $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(am__aclocal_m4_deps):
- install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
- @$(NORMAL_INSTALL)
- test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
-- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-+ @list='$(securelib_LTLIBRARIES)'; test -n "$(securelibdir)" || list=; \
-+ list2=; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-- 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"; \
-+ list2="$$list2 $$p"; \
- else :; fi; \
-- done
-+ done; \
-+ test -z "$$list2" || { \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(securelibdir)'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(securelibdir)"; \
-+ }
-
- uninstall-securelibLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-+ @list='$(securelib_LTLIBRARIES)'; test -n "$(securelibdir)" || list=; \
-+ for p in $$list; do \
-+ $(am__strip_dir) \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$f'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$f"; \
- done
-
- clean-securelibLTLIBRARIES:
-@@ -338,21 +364,21 @@
-
- .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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @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,65 +388,58 @@
-
- clean-libtool:
- -rm -rf .libs _libs
--install-man8: $(man8_MANS) $(man_MANS)
-+install-man8: $(man_MANS)
- @$(NORMAL_INSTALL)
- 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 \
-- case "$$i" in \
-- *.8*) list="$$list $$i" ;; \
-- esac; \
-+ @list=''; test -n "$(man8dir)" || exit 0; \
-+ { for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.8[a-z]*$$/p'; \
-+ } | while read p; do \
-+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-+ echo "$$d$$p"; echo "$$p"; \
-+ done | \
-+ sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
-+ sed 'N;N;s,\n, ,g' | { \
-+ list=; while read file base inst; do \
-+ if test "$$base" = "$$inst"; then list="$$list $$file"; else \
-+ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-+ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst" || exit $$?; \
-+ fi; \
+@@ -377,8 +379,8 @@
+ esac; \
done; \
-- for i in $$list; do \
+ for i in $$list; do \
- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
- else file=$$i; fi; \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 8*) ;; \
-- *) ext='8' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-- $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \
-- done
-+ for i in $$list; do echo "$$i"; done | $(am__base_list) | \
-+ while read files; do \
-+ test -z "$$files" || { \
-+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man8dir)'"; \
-+ $(INSTALL_DATA) $$files "$(DESTDIR)$(man8dir)" || exit $$?; }; \
-+ done; }
-+
- uninstall-man8:
- @$(NORMAL_UNINSTALL)
-- @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
-- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-- for i in $$l2; do \
-- case "$$i" in \
-- *.8*) list="$$list $$i" ;; \
-- esac; \
-- done; \
-- for i in $$list; do \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 8*) ;; \
-- *) ext='8' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \
-- rm -f "$(DESTDIR)$(man8dir)/$$inst"; \
-- done
-+ @list=''; test -n "$(man8dir)" || exit 0; \
-+ files=`{ for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.8[a-z]*$$/p'; \
-+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-+ test -z "$$files" || { \
-+ echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \
-+ cd "$(DESTDIR)$(man8dir)" && rm -f $$files; }
-
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
++ if test -f $$i; then file=$$i; \
++ else file=$(srcdir)/$$i; fi; \
+ ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+ case "$$ext" in \
+ 8*) ;; \
+@@ -417,7 +419,7 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -45314,56 +26809,7 @@ Index: pam.debian/modules/pam_umask/Makefile.in
END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
-+ set x; \
- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -428,37 +447,43 @@
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ shift; \
-+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
-- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique; \
-+ if test $$# -gt 0; then \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ "$$@" $$unique; \
-+ else \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$unique; \
-+ fi; \
- fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
- 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; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+ test -z "$(CTAGS_ARGS)$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-- $$tags $$unique
-+ $$unique
-
- GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
-- && cd $(top_srcdir) \
-- && gtags -i $(GTAGS_ARGS) $$here
-+ && $(am__cd) $(top_srcdir) \
-+ && gtags -i $(GTAGS_ARGS) "$$here"
-
- distclean-tags:
+@@ -460,7 +462,7 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
check-TESTS: $(TESTS)
@@ -45371,11 +26817,8 @@ Index: pam.debian/modules/pam_umask/Makefile.in
+ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
srcdir=$(srcdir); export srcdir; \
list=' $(TESTS) '; \
-+ $(am__tty_colors); \
if test -n "$$list"; then \
- for tst in $$list; do \
- if test -f ./$$tst; then dir=./; \
-@@ -467,49 +492,63 @@
+@@ -471,7 +473,7 @@
if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
@@ -45383,35 +26826,19 @@ Index: pam.debian/modules/pam_umask/Makefile.in
+ *[\ \ ]$$tst[\ \ ]*) \
xpass=`expr $$xpass + 1`; \
failed=`expr $$failed + 1`; \
-- echo "XPASS: $$tst"; \
-+ col=$$red; res=XPASS; \
- ;; \
- *) \
-- echo "PASS: $$tst"; \
-+ col=$$grn; res=PASS; \
- ;; \
- esac; \
+ echo "XPASS: $$tst"; \
+@@ -483,7 +485,7 @@
elif test $$? -ne 77; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
- *$$ws$$tst$$ws*) \
+ *[\ \ ]$$tst[\ \ ]*) \
xfail=`expr $$xfail + 1`; \
-- echo "XFAIL: $$tst"; \
-+ col=$$lgn; res=XFAIL; \
- ;; \
- *) \
- failed=`expr $$failed + 1`; \
-- echo "FAIL: $$tst"; \
-+ col=$$red; res=FAIL; \
+ echo "XFAIL: $$tst"; \
;; \
- esac; \
- else \
- skip=`expr $$skip + 1`; \
-- echo "SKIP: $$tst"; \
-+ col=$$blu; res=SKIP; \
+@@ -497,23 +499,36 @@
+ echo "SKIP: $$tst"; \
fi; \
-+ echo "$${col}$$res$${std}: $$tst"; \
done; \
+ if test "$$all" -eq 1; then \
+ tests="test"; \
@@ -45451,22 +26878,7 @@ Index: pam.debian/modules/pam_umask/Makefile.in
test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
dashes="$$skipped"; \
fi; \
-@@ -520,15 +559,32 @@
- dashes="$$report"; \
- fi; \
- dashes=`echo "$$dashes" | sed s/./=/g`; \
-- echo "$$dashes"; \
-+ if test "$$failed" -eq 0; then \
-+ echo "$$grn$$dashes"; \
-+ else \
-+ echo "$$red$$dashes"; \
-+ fi; \
- echo "$$banner"; \
- test -z "$$skipped" || echo "$$skipped"; \
- test -z "$$report" || echo "$$report"; \
-- echo "$$dashes"; \
-+ echo "$$dashes$$std"; \
- test "$$failed" -eq 0; \
+@@ -533,6 +548,19 @@
else :; fi
distdir: $(DISTFILES)
@@ -45486,37 +26898,7 @@ Index: pam.debian/modules/pam_umask/Makefile.in
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
-@@ -544,13 +600,17 @@
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-+ if test -d "$(distdir)/$$file"; then \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+ fi; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
-- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
- else \
-- test -f $(distdir)/$$file \
-- || cp -p $$d/$$file $(distdir)/$$file \
-+ test -f "$(distdir)/$$file" \
-+ || cp -p $$d/$$file "$(distdir)/$$file" \
- || exit 1; \
- fi; \
- done
-@@ -583,6 +643,7 @@
-
- distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -605,6 +666,8 @@
+@@ -609,6 +637,8 @@
html: html-am
@@ -45525,7 +26907,7 @@ Index: pam.debian/modules/pam_umask/Makefile.in
info: info-am
info-am:
-@@ -613,18 +676,28 @@
+@@ -617,18 +647,28 @@
install-dvi: install-dvi-am
@@ -45554,30 +26936,13 @@ Index: pam.debian/modules/pam_umask/Makefile.in
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -649,7 +722,7 @@
-
- uninstall-man: uninstall-man8
-
--.MAKE: install-am install-strip
-+.MAKE: check-am install-am install-strip
-
- .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
- clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
-@@ -669,6 +742,7 @@
-
- @ENABLE_REGENERATE_MAN_TRUE@README: pam_umask.8.xml
- @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
-+
- # 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.
- .NOEXPORT:
-Index: pam.debian/modules/pam_userdb/Makefile.in
+Index: pam.deb/modules/pam_userdb/Makefile.in
===================================================================
---- pam.debian.orig/modules/pam_userdb/Makefile.in
-+++ pam.debian/modules/pam_userdb/Makefile.in
+--- pam.deb.orig/modules/pam_userdb/Makefile.in
++++ pam.deb/modules/pam_userdb/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -45587,67 +26952,7 @@ Index: pam.debian/modules/pam_userdb/Makefile.in
# 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.
-@@ -22,8 +23,9 @@
-
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
--pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkglibexecdir = $(libexecdir)/@PACKAGE@
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
-@@ -60,14 +62,29 @@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
-+CONFIG_CLEAN_VPATH_FILES =
- am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
- am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-+am__install_max = 40
-+am__nobase_strip_setup = \
-+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-+am__nobase_strip = \
-+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-+am__nobase_list = $(am__nobase_strip_setup); \
-+ for p in $$list; do echo "$$p $$p"; done | \
-+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-+ if (++n[$$2] == $(am__install_max)) \
-+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-+ END { for (dir in files) print dir, files[dir] }'
-+am__base_list = \
-+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
- am__installdirs = "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man8dir)"
--securelibLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(securelib_LTLIBRARIES)
- pam_userdb_la_LIBADD =
- pam_userdb_la_SOURCES = pam_userdb.c
-@@ -76,6 +93,7 @@
- DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
-+am__mv = mv -f
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-@@ -94,6 +112,8 @@
- HEADERS = $(noinst_HEADERS)
- ETAGS = etags
- CTAGS = ctags
-+am__tty_colors = \
-+red=; grn=; lgn=; blu=; std=
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- AMTAR = @AMTAR@
-@@ -178,6 +198,7 @@
+@@ -180,6 +181,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -45655,7 +26960,7 @@ Index: pam.debian/modules/pam_userdb/Makefile.in
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PIE_CFLAGS = @PIE_CFLAGS@
-@@ -279,14 +300,14 @@
+@@ -283,8 +285,8 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -45666,163 +26971,18 @@ Index: pam.debian/modules/pam_userdb/Makefile.in
exit 1;; \
esac; \
done; \
-- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/pam_userdb/Makefile'; \
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu modules/pam_userdb/Makefile
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/pam_userdb/Makefile'; \
-+ $(am__cd) $(top_srcdir) && \
-+ $(AUTOMAKE) --gnu modules/pam_userdb/Makefile
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
-@@ -304,23 +325,28 @@
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- $(ACLOCAL_M4): $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(am__aclocal_m4_deps):
- install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
- @$(NORMAL_INSTALL)
- test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
-- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-+ @list='$(securelib_LTLIBRARIES)'; test -n "$(securelibdir)" || list=; \
-+ list2=; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-- 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"; \
-+ list2="$$list2 $$p"; \
- else :; fi; \
-- done
-+ done; \
-+ test -z "$$list2" || { \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(securelibdir)'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(securelibdir)"; \
-+ }
-
- uninstall-securelibLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-+ @list='$(securelib_LTLIBRARIES)'; test -n "$(securelibdir)" || list=; \
-+ for p in $$list; do \
-+ $(am__strip_dir) \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$f'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$f"; \
- done
-
- clean-securelibLTLIBRARIES:
-@@ -344,21 +370,21 @@
-
- .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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @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 $@ $<
-@@ -368,65 +394,58 @@
-
- clean-libtool:
- -rm -rf .libs _libs
--install-man8: $(man8_MANS) $(man_MANS)
-+install-man8: $(man_MANS)
- @$(NORMAL_INSTALL)
- 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 \
-- case "$$i" in \
-- *.8*) list="$$list $$i" ;; \
-- esac; \
-+ @list=''; test -n "$(man8dir)" || exit 0; \
-+ { for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.8[a-z]*$$/p'; \
-+ } | while read p; do \
-+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-+ echo "$$d$$p"; echo "$$p"; \
-+ done | \
-+ sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
-+ sed 'N;N;s,\n, ,g' | { \
-+ list=; while read file base inst; do \
-+ if test "$$base" = "$$inst"; then list="$$list $$file"; else \
-+ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-+ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst" || exit $$?; \
-+ fi; \
+@@ -383,8 +385,8 @@
+ esac; \
done; \
-- for i in $$list; do \
+ for i in $$list; do \
- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
- else file=$$i; fi; \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 8*) ;; \
-- *) ext='8' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-- $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \
-- done
-+ for i in $$list; do echo "$$i"; done | $(am__base_list) | \
-+ while read files; do \
-+ test -z "$$files" || { \
-+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man8dir)'"; \
-+ $(INSTALL_DATA) $$files "$(DESTDIR)$(man8dir)" || exit $$?; }; \
-+ done; }
-+
- uninstall-man8:
- @$(NORMAL_UNINSTALL)
-- @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
-- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-- for i in $$l2; do \
-- case "$$i" in \
-- *.8*) list="$$list $$i" ;; \
-- esac; \
-- done; \
-- for i in $$list; do \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 8*) ;; \
-- *) ext='8' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \
-- rm -f "$(DESTDIR)$(man8dir)/$$inst"; \
-- done
-+ @list=''; test -n "$(man8dir)" || exit 0; \
-+ files=`{ for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.8[a-z]*$$/p'; \
-+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-+ test -z "$$files" || { \
-+ echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \
-+ cd "$(DESTDIR)$(man8dir)" && rm -f $$files; }
-
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
++ if test -f $$i; then file=$$i; \
++ else file=$(srcdir)/$$i; fi; \
+ ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+ case "$$ext" in \
+ 8*) ;; \
+@@ -423,7 +425,7 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -45831,56 +26991,7 @@ Index: pam.debian/modules/pam_userdb/Makefile.in
END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
-+ set x; \
- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -434,37 +453,43 @@
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ shift; \
-+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
-- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique; \
-+ if test $$# -gt 0; then \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ "$$@" $$unique; \
-+ else \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$unique; \
-+ fi; \
- fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
- 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; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+ test -z "$(CTAGS_ARGS)$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-- $$tags $$unique
-+ $$unique
-
- GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
-- && cd $(top_srcdir) \
-- && gtags -i $(GTAGS_ARGS) $$here
-+ && $(am__cd) $(top_srcdir) \
-+ && gtags -i $(GTAGS_ARGS) "$$here"
-
- distclean-tags:
+@@ -466,7 +468,7 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
check-TESTS: $(TESTS)
@@ -45888,11 +26999,8 @@ Index: pam.debian/modules/pam_userdb/Makefile.in
+ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
srcdir=$(srcdir); export srcdir; \
list=' $(TESTS) '; \
-+ $(am__tty_colors); \
if test -n "$$list"; then \
- for tst in $$list; do \
- if test -f ./$$tst; then dir=./; \
-@@ -473,49 +498,63 @@
+@@ -477,7 +479,7 @@
if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
@@ -45900,35 +27008,19 @@ Index: pam.debian/modules/pam_userdb/Makefile.in
+ *[\ \ ]$$tst[\ \ ]*) \
xpass=`expr $$xpass + 1`; \
failed=`expr $$failed + 1`; \
-- echo "XPASS: $$tst"; \
-+ col=$$red; res=XPASS; \
- ;; \
- *) \
-- echo "PASS: $$tst"; \
-+ col=$$grn; res=PASS; \
- ;; \
- esac; \
+ echo "XPASS: $$tst"; \
+@@ -489,7 +491,7 @@
elif test $$? -ne 77; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
- *$$ws$$tst$$ws*) \
+ *[\ \ ]$$tst[\ \ ]*) \
xfail=`expr $$xfail + 1`; \
-- echo "XFAIL: $$tst"; \
-+ col=$$lgn; res=XFAIL; \
- ;; \
- *) \
- failed=`expr $$failed + 1`; \
-- echo "FAIL: $$tst"; \
-+ col=$$red; res=FAIL; \
+ echo "XFAIL: $$tst"; \
;; \
- esac; \
- else \
- skip=`expr $$skip + 1`; \
-- echo "SKIP: $$tst"; \
-+ col=$$blu; res=SKIP; \
+@@ -503,23 +505,36 @@
+ echo "SKIP: $$tst"; \
fi; \
-+ echo "$${col}$$res$${std}: $$tst"; \
done; \
+ if test "$$all" -eq 1; then \
+ tests="test"; \
@@ -45968,22 +27060,7 @@ Index: pam.debian/modules/pam_userdb/Makefile.in
test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
dashes="$$skipped"; \
fi; \
-@@ -526,15 +565,32 @@
- dashes="$$report"; \
- fi; \
- dashes=`echo "$$dashes" | sed s/./=/g`; \
-- echo "$$dashes"; \
-+ if test "$$failed" -eq 0; then \
-+ echo "$$grn$$dashes"; \
-+ else \
-+ echo "$$red$$dashes"; \
-+ fi; \
- echo "$$banner"; \
- test -z "$$skipped" || echo "$$skipped"; \
- test -z "$$report" || echo "$$report"; \
-- echo "$$dashes"; \
-+ echo "$$dashes$$std"; \
- test "$$failed" -eq 0; \
+@@ -539,6 +554,19 @@
else :; fi
distdir: $(DISTFILES)
@@ -46003,37 +27080,7 @@ Index: pam.debian/modules/pam_userdb/Makefile.in
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
-@@ -550,13 +606,17 @@
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-+ if test -d "$(distdir)/$$file"; then \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+ fi; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
-- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
- else \
-- test -f $(distdir)/$$file \
-- || cp -p $$d/$$file $(distdir)/$$file \
-+ test -f "$(distdir)/$$file" \
-+ || cp -p $$d/$$file "$(distdir)/$$file" \
- || exit 1; \
- fi; \
- done
-@@ -589,6 +649,7 @@
-
- distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -611,6 +672,8 @@
+@@ -615,6 +643,8 @@
html: html-am
@@ -46042,7 +27089,7 @@ Index: pam.debian/modules/pam_userdb/Makefile.in
info: info-am
info-am:
-@@ -619,18 +682,28 @@
+@@ -623,18 +653,28 @@
install-dvi: install-dvi-am
@@ -46071,30 +27118,13 @@ Index: pam.debian/modules/pam_userdb/Makefile.in
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -655,7 +728,7 @@
-
- uninstall-man: uninstall-man8
-
--.MAKE: install-am install-strip
-+.MAKE: check-am install-am install-strip
-
- .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
- clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
-@@ -675,6 +748,7 @@
-
- @ENABLE_REGENERATE_MAN_TRUE@README: pam_userdb.8.xml
- @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
-+
- # 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.
- .NOEXPORT:
-Index: pam.debian/modules/pam_warn/Makefile.in
+Index: pam.deb/modules/pam_warn/Makefile.in
===================================================================
---- pam.debian.orig/modules/pam_warn/Makefile.in
-+++ pam.debian/modules/pam_warn/Makefile.in
+--- pam.deb.orig/modules/pam_warn/Makefile.in
++++ pam.deb/modules/pam_warn/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -46104,67 +27134,7 @@ Index: pam.debian/modules/pam_warn/Makefile.in
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -21,8 +22,9 @@
-
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
--pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkglibexecdir = $(libexecdir)/@PACKAGE@
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
-@@ -58,14 +60,29 @@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
-+CONFIG_CLEAN_VPATH_FILES =
- am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
- am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-+am__install_max = 40
-+am__nobase_strip_setup = \
-+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-+am__nobase_strip = \
-+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-+am__nobase_list = $(am__nobase_strip_setup); \
-+ for p in $$list; do echo "$$p $$p"; done | \
-+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-+ if (++n[$$2] == $(am__install_max)) \
-+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-+ END { for (dir in files) print dir, files[dir] }'
-+am__base_list = \
-+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
- am__installdirs = "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man8dir)"
--securelibLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(securelib_LTLIBRARIES)
- pam_warn_la_LIBADD =
- pam_warn_la_SOURCES = pam_warn.c
-@@ -73,6 +90,7 @@
- DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
-+am__mv = mv -f
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-@@ -90,6 +108,8 @@
- DATA = $(noinst_DATA)
- ETAGS = etags
- CTAGS = ctags
-+am__tty_colors = \
-+red=; grn=; lgn=; blu=; std=
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- AMTAR = @AMTAR@
-@@ -174,6 +194,7 @@
+@@ -176,6 +177,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -46172,7 +27142,7 @@ Index: pam.debian/modules/pam_warn/Makefile.in
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PIE_CFLAGS = @PIE_CFLAGS@
-@@ -273,14 +294,14 @@
+@@ -277,8 +279,8 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -46183,163 +27153,18 @@ Index: pam.debian/modules/pam_warn/Makefile.in
exit 1;; \
esac; \
done; \
-- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/pam_warn/Makefile'; \
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu modules/pam_warn/Makefile
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/pam_warn/Makefile'; \
-+ $(am__cd) $(top_srcdir) && \
-+ $(AUTOMAKE) --gnu modules/pam_warn/Makefile
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
-@@ -298,23 +319,28 @@
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- $(ACLOCAL_M4): $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(am__aclocal_m4_deps):
- install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
- @$(NORMAL_INSTALL)
- test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
-- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-+ @list='$(securelib_LTLIBRARIES)'; test -n "$(securelibdir)" || list=; \
-+ list2=; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-- 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"; \
-+ list2="$$list2 $$p"; \
- else :; fi; \
-- done
-+ done; \
-+ test -z "$$list2" || { \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(securelibdir)'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(securelibdir)"; \
-+ }
-
- uninstall-securelibLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-+ @list='$(securelib_LTLIBRARIES)'; test -n "$(securelibdir)" || list=; \
-+ for p in $$list; do \
-+ $(am__strip_dir) \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$f'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$f"; \
- done
-
- clean-securelibLTLIBRARIES:
-@@ -338,21 +364,21 @@
-
- .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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @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,65 +388,58 @@
-
- clean-libtool:
- -rm -rf .libs _libs
--install-man8: $(man8_MANS) $(man_MANS)
-+install-man8: $(man_MANS)
- @$(NORMAL_INSTALL)
- 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 \
-- case "$$i" in \
-- *.8*) list="$$list $$i" ;; \
-- esac; \
-+ @list=''; test -n "$(man8dir)" || exit 0; \
-+ { for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.8[a-z]*$$/p'; \
-+ } | while read p; do \
-+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-+ echo "$$d$$p"; echo "$$p"; \
-+ done | \
-+ sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
-+ sed 'N;N;s,\n, ,g' | { \
-+ list=; while read file base inst; do \
-+ if test "$$base" = "$$inst"; then list="$$list $$file"; else \
-+ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-+ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst" || exit $$?; \
-+ fi; \
+@@ -377,8 +379,8 @@
+ esac; \
done; \
-- for i in $$list; do \
+ for i in $$list; do \
- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
- else file=$$i; fi; \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 8*) ;; \
-- *) ext='8' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-- $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \
-- done
-+ for i in $$list; do echo "$$i"; done | $(am__base_list) | \
-+ while read files; do \
-+ test -z "$$files" || { \
-+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man8dir)'"; \
-+ $(INSTALL_DATA) $$files "$(DESTDIR)$(man8dir)" || exit $$?; }; \
-+ done; }
-+
- uninstall-man8:
- @$(NORMAL_UNINSTALL)
-- @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
-- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-- for i in $$l2; do \
-- case "$$i" in \
-- *.8*) list="$$list $$i" ;; \
-- esac; \
-- done; \
-- for i in $$list; do \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 8*) ;; \
-- *) ext='8' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \
-- rm -f "$(DESTDIR)$(man8dir)/$$inst"; \
-- done
-+ @list=''; test -n "$(man8dir)" || exit 0; \
-+ files=`{ for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.8[a-z]*$$/p'; \
-+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-+ test -z "$$files" || { \
-+ echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \
-+ cd "$(DESTDIR)$(man8dir)" && rm -f $$files; }
-
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
++ if test -f $$i; then file=$$i; \
++ else file=$(srcdir)/$$i; fi; \
+ ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+ case "$$ext" in \
+ 8*) ;; \
+@@ -417,7 +419,7 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -46348,56 +27173,7 @@ Index: pam.debian/modules/pam_warn/Makefile.in
END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
-+ set x; \
- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -428,37 +447,43 @@
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ shift; \
-+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
-- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique; \
-+ if test $$# -gt 0; then \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ "$$@" $$unique; \
-+ else \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$unique; \
-+ fi; \
- fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
- 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; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+ test -z "$(CTAGS_ARGS)$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-- $$tags $$unique
-+ $$unique
-
- GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
-- && cd $(top_srcdir) \
-- && gtags -i $(GTAGS_ARGS) $$here
-+ && $(am__cd) $(top_srcdir) \
-+ && gtags -i $(GTAGS_ARGS) "$$here"
-
- distclean-tags:
+@@ -460,7 +462,7 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
check-TESTS: $(TESTS)
@@ -46405,11 +27181,8 @@ Index: pam.debian/modules/pam_warn/Makefile.in
+ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
srcdir=$(srcdir); export srcdir; \
list=' $(TESTS) '; \
-+ $(am__tty_colors); \
if test -n "$$list"; then \
- for tst in $$list; do \
- if test -f ./$$tst; then dir=./; \
-@@ -467,49 +492,63 @@
+@@ -471,7 +473,7 @@
if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
@@ -46417,35 +27190,19 @@ Index: pam.debian/modules/pam_warn/Makefile.in
+ *[\ \ ]$$tst[\ \ ]*) \
xpass=`expr $$xpass + 1`; \
failed=`expr $$failed + 1`; \
-- echo "XPASS: $$tst"; \
-+ col=$$red; res=XPASS; \
- ;; \
- *) \
-- echo "PASS: $$tst"; \
-+ col=$$grn; res=PASS; \
- ;; \
- esac; \
+ echo "XPASS: $$tst"; \
+@@ -483,7 +485,7 @@
elif test $$? -ne 77; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
- *$$ws$$tst$$ws*) \
+ *[\ \ ]$$tst[\ \ ]*) \
xfail=`expr $$xfail + 1`; \
-- echo "XFAIL: $$tst"; \
-+ col=$$lgn; res=XFAIL; \
+ echo "XFAIL: $$tst"; \
;; \
- *) \
- failed=`expr $$failed + 1`; \
-- echo "FAIL: $$tst"; \
-+ col=$$red; res=FAIL; \
- ;; \
- esac; \
- else \
- skip=`expr $$skip + 1`; \
-- echo "SKIP: $$tst"; \
-+ col=$$blu; res=SKIP; \
+@@ -497,23 +499,36 @@
+ echo "SKIP: $$tst"; \
fi; \
-+ echo "$${col}$$res$${std}: $$tst"; \
done; \
+ if test "$$all" -eq 1; then \
+ tests="test"; \
@@ -46485,22 +27242,7 @@ Index: pam.debian/modules/pam_warn/Makefile.in
test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
dashes="$$skipped"; \
fi; \
-@@ -520,15 +559,32 @@
- dashes="$$report"; \
- fi; \
- dashes=`echo "$$dashes" | sed s/./=/g`; \
-- echo "$$dashes"; \
-+ if test "$$failed" -eq 0; then \
-+ echo "$$grn$$dashes"; \
-+ else \
-+ echo "$$red$$dashes"; \
-+ fi; \
- echo "$$banner"; \
- test -z "$$skipped" || echo "$$skipped"; \
- test -z "$$report" || echo "$$report"; \
-- echo "$$dashes"; \
-+ echo "$$dashes$$std"; \
- test "$$failed" -eq 0; \
+@@ -533,6 +548,19 @@
else :; fi
distdir: $(DISTFILES)
@@ -46520,37 +27262,7 @@ Index: pam.debian/modules/pam_warn/Makefile.in
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
-@@ -544,13 +600,17 @@
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-+ if test -d "$(distdir)/$$file"; then \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+ fi; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
-- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
- else \
-- test -f $(distdir)/$$file \
-- || cp -p $$d/$$file $(distdir)/$$file \
-+ test -f "$(distdir)/$$file" \
-+ || cp -p $$d/$$file "$(distdir)/$$file" \
- || exit 1; \
- fi; \
- done
-@@ -583,6 +643,7 @@
-
- distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -605,6 +666,8 @@
+@@ -609,6 +637,8 @@
html: html-am
@@ -46559,7 +27271,7 @@ Index: pam.debian/modules/pam_warn/Makefile.in
info: info-am
info-am:
-@@ -613,18 +676,28 @@
+@@ -617,18 +647,28 @@
install-dvi: install-dvi-am
@@ -46588,30 +27300,13 @@ Index: pam.debian/modules/pam_warn/Makefile.in
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -649,7 +722,7 @@
-
- uninstall-man: uninstall-man8
-
--.MAKE: install-am install-strip
-+.MAKE: check-am install-am install-strip
-
- .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
- clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
-@@ -669,6 +742,7 @@
-
- @ENABLE_REGENERATE_MAN_TRUE@README: pam_warn.8.xml
- @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
-+
- # 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.
- .NOEXPORT:
-Index: pam.debian/modules/pam_wheel/Makefile.in
+Index: pam.deb/modules/pam_wheel/Makefile.in
===================================================================
---- pam.debian.orig/modules/pam_wheel/Makefile.in
-+++ pam.debian/modules/pam_wheel/Makefile.in
+--- pam.deb.orig/modules/pam_wheel/Makefile.in
++++ pam.deb/modules/pam_wheel/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -46621,67 +27316,7 @@ Index: pam.debian/modules/pam_wheel/Makefile.in
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -21,8 +22,9 @@
-
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
--pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkglibexecdir = $(libexecdir)/@PACKAGE@
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
-@@ -58,14 +60,29 @@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
-+CONFIG_CLEAN_VPATH_FILES =
- am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
- am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-+am__install_max = 40
-+am__nobase_strip_setup = \
-+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-+am__nobase_strip = \
-+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-+am__nobase_list = $(am__nobase_strip_setup); \
-+ for p in $$list; do echo "$$p $$p"; done | \
-+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-+ if (++n[$$2] == $(am__install_max)) \
-+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-+ END { for (dir in files) print dir, files[dir] }'
-+am__base_list = \
-+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
- am__installdirs = "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man8dir)"
--securelibLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(securelib_LTLIBRARIES)
- pam_wheel_la_LIBADD =
- pam_wheel_la_SOURCES = pam_wheel.c
-@@ -73,6 +90,7 @@
- DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
-+am__mv = mv -f
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-@@ -90,6 +108,8 @@
- DATA = $(noinst_DATA)
- ETAGS = etags
- CTAGS = ctags
-+am__tty_colors = \
-+red=; grn=; lgn=; blu=; std=
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- AMTAR = @AMTAR@
-@@ -174,6 +194,7 @@
+@@ -176,6 +177,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -46689,7 +27324,7 @@ Index: pam.debian/modules/pam_wheel/Makefile.in
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PIE_CFLAGS = @PIE_CFLAGS@
-@@ -273,14 +294,14 @@
+@@ -277,8 +279,8 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -46700,163 +27335,18 @@ Index: pam.debian/modules/pam_wheel/Makefile.in
exit 1;; \
esac; \
done; \
-- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/pam_wheel/Makefile'; \
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu modules/pam_wheel/Makefile
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/pam_wheel/Makefile'; \
-+ $(am__cd) $(top_srcdir) && \
-+ $(AUTOMAKE) --gnu modules/pam_wheel/Makefile
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
-@@ -298,23 +319,28 @@
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- $(ACLOCAL_M4): $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(am__aclocal_m4_deps):
- install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
- @$(NORMAL_INSTALL)
- test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
-- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-+ @list='$(securelib_LTLIBRARIES)'; test -n "$(securelibdir)" || list=; \
-+ list2=; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-- 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"; \
-+ list2="$$list2 $$p"; \
- else :; fi; \
-- done
-+ done; \
-+ test -z "$$list2" || { \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(securelibdir)'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(securelibdir)"; \
-+ }
-
- uninstall-securelibLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-+ @list='$(securelib_LTLIBRARIES)'; test -n "$(securelibdir)" || list=; \
-+ for p in $$list; do \
-+ $(am__strip_dir) \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$f'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$f"; \
- done
-
- clean-securelibLTLIBRARIES:
-@@ -338,21 +364,21 @@
-
- .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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @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,65 +388,58 @@
-
- clean-libtool:
- -rm -rf .libs _libs
--install-man8: $(man8_MANS) $(man_MANS)
-+install-man8: $(man_MANS)
- @$(NORMAL_INSTALL)
- 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 \
-- case "$$i" in \
-- *.8*) list="$$list $$i" ;; \
-- esac; \
-+ @list=''; test -n "$(man8dir)" || exit 0; \
-+ { for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.8[a-z]*$$/p'; \
-+ } | while read p; do \
-+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-+ echo "$$d$$p"; echo "$$p"; \
-+ done | \
-+ sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
-+ sed 'N;N;s,\n, ,g' | { \
-+ list=; while read file base inst; do \
-+ if test "$$base" = "$$inst"; then list="$$list $$file"; else \
-+ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-+ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst" || exit $$?; \
-+ fi; \
+@@ -377,8 +379,8 @@
+ esac; \
done; \
-- for i in $$list; do \
+ for i in $$list; do \
- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
- else file=$$i; fi; \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 8*) ;; \
-- *) ext='8' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-- $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \
-- done
-+ for i in $$list; do echo "$$i"; done | $(am__base_list) | \
-+ while read files; do \
-+ test -z "$$files" || { \
-+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man8dir)'"; \
-+ $(INSTALL_DATA) $$files "$(DESTDIR)$(man8dir)" || exit $$?; }; \
-+ done; }
-+
- uninstall-man8:
- @$(NORMAL_UNINSTALL)
-- @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
-- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-- for i in $$l2; do \
-- case "$$i" in \
-- *.8*) list="$$list $$i" ;; \
-- esac; \
-- done; \
-- for i in $$list; do \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 8*) ;; \
-- *) ext='8' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \
-- rm -f "$(DESTDIR)$(man8dir)/$$inst"; \
-- done
-+ @list=''; test -n "$(man8dir)" || exit 0; \
-+ files=`{ for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.8[a-z]*$$/p'; \
-+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-+ test -z "$$files" || { \
-+ echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \
-+ cd "$(DESTDIR)$(man8dir)" && rm -f $$files; }
-
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
++ if test -f $$i; then file=$$i; \
++ else file=$(srcdir)/$$i; fi; \
+ ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+ case "$$ext" in \
+ 8*) ;; \
+@@ -417,7 +419,7 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -46865,56 +27355,7 @@ Index: pam.debian/modules/pam_wheel/Makefile.in
END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
-+ set x; \
- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -428,37 +447,43 @@
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ shift; \
-+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
-- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique; \
-+ if test $$# -gt 0; then \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ "$$@" $$unique; \
-+ else \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$unique; \
-+ fi; \
- fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
- 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; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+ test -z "$(CTAGS_ARGS)$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-- $$tags $$unique
-+ $$unique
-
- GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
-- && cd $(top_srcdir) \
-- && gtags -i $(GTAGS_ARGS) $$here
-+ && $(am__cd) $(top_srcdir) \
-+ && gtags -i $(GTAGS_ARGS) "$$here"
-
- distclean-tags:
+@@ -460,7 +462,7 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
check-TESTS: $(TESTS)
@@ -46922,11 +27363,8 @@ Index: pam.debian/modules/pam_wheel/Makefile.in
+ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
srcdir=$(srcdir); export srcdir; \
list=' $(TESTS) '; \
-+ $(am__tty_colors); \
if test -n "$$list"; then \
- for tst in $$list; do \
- if test -f ./$$tst; then dir=./; \
-@@ -467,49 +492,63 @@
+@@ -471,7 +473,7 @@
if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
@@ -46934,35 +27372,19 @@ Index: pam.debian/modules/pam_wheel/Makefile.in
+ *[\ \ ]$$tst[\ \ ]*) \
xpass=`expr $$xpass + 1`; \
failed=`expr $$failed + 1`; \
-- echo "XPASS: $$tst"; \
-+ col=$$red; res=XPASS; \
- ;; \
- *) \
-- echo "PASS: $$tst"; \
-+ col=$$grn; res=PASS; \
- ;; \
- esac; \
+ echo "XPASS: $$tst"; \
+@@ -483,7 +485,7 @@
elif test $$? -ne 77; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
- *$$ws$$tst$$ws*) \
+ *[\ \ ]$$tst[\ \ ]*) \
xfail=`expr $$xfail + 1`; \
-- echo "XFAIL: $$tst"; \
-+ col=$$lgn; res=XFAIL; \
+ echo "XFAIL: $$tst"; \
;; \
- *) \
- failed=`expr $$failed + 1`; \
-- echo "FAIL: $$tst"; \
-+ col=$$red; res=FAIL; \
- ;; \
- esac; \
- else \
- skip=`expr $$skip + 1`; \
-- echo "SKIP: $$tst"; \
-+ col=$$blu; res=SKIP; \
+@@ -497,23 +499,36 @@
+ echo "SKIP: $$tst"; \
fi; \
-+ echo "$${col}$$res$${std}: $$tst"; \
done; \
+ if test "$$all" -eq 1; then \
+ tests="test"; \
@@ -47002,22 +27424,7 @@ Index: pam.debian/modules/pam_wheel/Makefile.in
test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
dashes="$$skipped"; \
fi; \
-@@ -520,15 +559,32 @@
- dashes="$$report"; \
- fi; \
- dashes=`echo "$$dashes" | sed s/./=/g`; \
-- echo "$$dashes"; \
-+ if test "$$failed" -eq 0; then \
-+ echo "$$grn$$dashes"; \
-+ else \
-+ echo "$$red$$dashes"; \
-+ fi; \
- echo "$$banner"; \
- test -z "$$skipped" || echo "$$skipped"; \
- test -z "$$report" || echo "$$report"; \
-- echo "$$dashes"; \
-+ echo "$$dashes$$std"; \
- test "$$failed" -eq 0; \
+@@ -533,6 +548,19 @@
else :; fi
distdir: $(DISTFILES)
@@ -47037,37 +27444,7 @@ Index: pam.debian/modules/pam_wheel/Makefile.in
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
-@@ -544,13 +600,17 @@
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-+ if test -d "$(distdir)/$$file"; then \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+ fi; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
-- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
- else \
-- test -f $(distdir)/$$file \
-- || cp -p $$d/$$file $(distdir)/$$file \
-+ test -f "$(distdir)/$$file" \
-+ || cp -p $$d/$$file "$(distdir)/$$file" \
- || exit 1; \
- fi; \
- done
-@@ -583,6 +643,7 @@
-
- distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -605,6 +666,8 @@
+@@ -609,6 +637,8 @@
html: html-am
@@ -47076,7 +27453,7 @@ Index: pam.debian/modules/pam_wheel/Makefile.in
info: info-am
info-am:
-@@ -613,18 +676,28 @@
+@@ -617,18 +647,28 @@
install-dvi: install-dvi-am
@@ -47105,30 +27482,13 @@ Index: pam.debian/modules/pam_wheel/Makefile.in
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -649,7 +722,7 @@
-
- uninstall-man: uninstall-man8
-
--.MAKE: install-am install-strip
-+.MAKE: check-am install-am install-strip
-
- .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
- clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
-@@ -669,6 +742,7 @@
-
- @ENABLE_REGENERATE_MAN_TRUE@README: pam_wheel.8.xml
- @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
-+
- # 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.
- .NOEXPORT:
-Index: pam.debian/modules/pam_xauth/Makefile.in
+Index: pam.deb/modules/pam_xauth/Makefile.in
===================================================================
---- pam.debian.orig/modules/pam_xauth/Makefile.in
-+++ pam.debian/modules/pam_xauth/Makefile.in
+--- pam.deb.orig/modules/pam_xauth/Makefile.in
++++ pam.deb/modules/pam_xauth/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -47138,67 +27498,7 @@ Index: pam.debian/modules/pam_xauth/Makefile.in
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -21,8 +22,9 @@
-
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
--pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkglibexecdir = $(libexecdir)/@PACKAGE@
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
-@@ -58,14 +60,29 @@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
-+CONFIG_CLEAN_VPATH_FILES =
- am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
- am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-+am__install_max = 40
-+am__nobase_strip_setup = \
-+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-+am__nobase_strip = \
-+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-+am__nobase_list = $(am__nobase_strip_setup); \
-+ for p in $$list; do echo "$$p $$p"; done | \
-+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-+ if (++n[$$2] == $(am__install_max)) \
-+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-+ END { for (dir in files) print dir, files[dir] }'
-+am__base_list = \
-+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
- am__installdirs = "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man8dir)"
--securelibLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(securelib_LTLIBRARIES)
- pam_xauth_la_LIBADD =
- pam_xauth_la_SOURCES = pam_xauth.c
-@@ -73,6 +90,7 @@
- DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
-+am__mv = mv -f
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-@@ -90,6 +108,8 @@
- DATA = $(noinst_DATA)
- ETAGS = etags
- CTAGS = ctags
-+am__tty_colors = \
-+red=; grn=; lgn=; blu=; std=
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- AMTAR = @AMTAR@
-@@ -174,6 +194,7 @@
+@@ -176,6 +177,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -47206,7 +27506,7 @@ Index: pam.debian/modules/pam_xauth/Makefile.in
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PIE_CFLAGS = @PIE_CFLAGS@
-@@ -273,14 +294,14 @@
+@@ -277,8 +279,8 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -47217,163 +27517,18 @@ Index: pam.debian/modules/pam_xauth/Makefile.in
exit 1;; \
esac; \
done; \
-- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/pam_xauth/Makefile'; \
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu modules/pam_xauth/Makefile
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/pam_xauth/Makefile'; \
-+ $(am__cd) $(top_srcdir) && \
-+ $(AUTOMAKE) --gnu modules/pam_xauth/Makefile
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
-@@ -298,23 +319,28 @@
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- $(ACLOCAL_M4): $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(am__aclocal_m4_deps):
- install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
- @$(NORMAL_INSTALL)
- test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
-- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-+ @list='$(securelib_LTLIBRARIES)'; test -n "$(securelibdir)" || list=; \
-+ list2=; for p in $$list; do \
- if test -f $$p; then \
-- f=$(am__strip_dir) \
-- 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"; \
-+ list2="$$list2 $$p"; \
- else :; fi; \
-- done
-+ done; \
-+ test -z "$$list2" || { \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(securelibdir)'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(securelibdir)"; \
-+ }
-
- uninstall-securelibLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
-- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
-- p=$(am__strip_dir) \
-- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
-- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
-+ @list='$(securelib_LTLIBRARIES)'; test -n "$(securelibdir)" || list=; \
-+ for p in $$list; do \
-+ $(am__strip_dir) \
-+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$f'"; \
-+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$f"; \
- done
-
- clean-securelibLTLIBRARIES:
-@@ -338,21 +364,21 @@
-
- .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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @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,65 +388,58 @@
-
- clean-libtool:
- -rm -rf .libs _libs
--install-man8: $(man8_MANS) $(man_MANS)
-+install-man8: $(man_MANS)
- @$(NORMAL_INSTALL)
- 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 \
-- case "$$i" in \
-- *.8*) list="$$list $$i" ;; \
-- esac; \
-+ @list=''; test -n "$(man8dir)" || exit 0; \
-+ { for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.8[a-z]*$$/p'; \
-+ } | while read p; do \
-+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-+ echo "$$d$$p"; echo "$$p"; \
-+ done | \
-+ sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
-+ sed 'N;N;s,\n, ,g' | { \
-+ list=; while read file base inst; do \
-+ if test "$$base" = "$$inst"; then list="$$list $$file"; else \
-+ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-+ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst" || exit $$?; \
-+ fi; \
+@@ -377,8 +379,8 @@
+ esac; \
done; \
-- for i in $$list; do \
+ for i in $$list; do \
- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
- else file=$$i; fi; \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 8*) ;; \
-- *) ext='8' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-- $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \
-- done
-+ for i in $$list; do echo "$$i"; done | $(am__base_list) | \
-+ while read files; do \
-+ test -z "$$files" || { \
-+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man8dir)'"; \
-+ $(INSTALL_DATA) $$files "$(DESTDIR)$(man8dir)" || exit $$?; }; \
-+ done; }
-+
- uninstall-man8:
- @$(NORMAL_UNINSTALL)
-- @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
-- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-- for i in $$l2; do \
-- case "$$i" in \
-- *.8*) list="$$list $$i" ;; \
-- esac; \
-- done; \
-- for i in $$list; do \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 8*) ;; \
-- *) ext='8' ;; \
-- esac; \
-- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-- inst=`echo $$inst | sed -e 's/^.*\///'`; \
-- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \
-- rm -f "$(DESTDIR)$(man8dir)/$$inst"; \
-- done
-+ @list=''; test -n "$(man8dir)" || exit 0; \
-+ files=`{ for i in $$list; do echo "$$i"; done; \
-+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+ sed -n '/\.8[a-z]*$$/p'; \
-+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
-+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-+ test -z "$$files" || { \
-+ echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \
-+ cd "$(DESTDIR)$(man8dir)" && rm -f $$files; }
-
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
++ if test -f $$i; then file=$$i; \
++ else file=$(srcdir)/$$i; fi; \
+ ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+ case "$$ext" in \
+ 8*) ;; \
+@@ -417,7 +419,7 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -47382,56 +27537,7 @@ Index: pam.debian/modules/pam_xauth/Makefile.in
END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
-+ set x; \
- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -428,37 +447,43 @@
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ shift; \
-+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
-- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique; \
-+ if test $$# -gt 0; then \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ "$$@" $$unique; \
-+ else \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$unique; \
-+ fi; \
- fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
- 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; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+ test -z "$(CTAGS_ARGS)$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-- $$tags $$unique
-+ $$unique
-
- GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
-- && cd $(top_srcdir) \
-- && gtags -i $(GTAGS_ARGS) $$here
-+ && $(am__cd) $(top_srcdir) \
-+ && gtags -i $(GTAGS_ARGS) "$$here"
-
- distclean-tags:
+@@ -460,7 +462,7 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
check-TESTS: $(TESTS)
@@ -47439,11 +27545,8 @@ Index: pam.debian/modules/pam_xauth/Makefile.in
+ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
srcdir=$(srcdir); export srcdir; \
list=' $(TESTS) '; \
-+ $(am__tty_colors); \
if test -n "$$list"; then \
- for tst in $$list; do \
- if test -f ./$$tst; then dir=./; \
-@@ -467,49 +492,63 @@
+@@ -471,7 +473,7 @@
if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
@@ -47451,35 +27554,19 @@ Index: pam.debian/modules/pam_xauth/Makefile.in
+ *[\ \ ]$$tst[\ \ ]*) \
xpass=`expr $$xpass + 1`; \
failed=`expr $$failed + 1`; \
-- echo "XPASS: $$tst"; \
-+ col=$$red; res=XPASS; \
- ;; \
- *) \
-- echo "PASS: $$tst"; \
-+ col=$$grn; res=PASS; \
- ;; \
- esac; \
+ echo "XPASS: $$tst"; \
+@@ -483,7 +485,7 @@
elif test $$? -ne 77; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
- *$$ws$$tst$$ws*) \
+ *[\ \ ]$$tst[\ \ ]*) \
xfail=`expr $$xfail + 1`; \
-- echo "XFAIL: $$tst"; \
-+ col=$$lgn; res=XFAIL; \
+ echo "XFAIL: $$tst"; \
;; \
- *) \
- failed=`expr $$failed + 1`; \
-- echo "FAIL: $$tst"; \
-+ col=$$red; res=FAIL; \
- ;; \
- esac; \
- else \
- skip=`expr $$skip + 1`; \
-- echo "SKIP: $$tst"; \
-+ col=$$blu; res=SKIP; \
+@@ -497,23 +499,36 @@
+ echo "SKIP: $$tst"; \
fi; \
-+ echo "$${col}$$res$${std}: $$tst"; \
done; \
+ if test "$$all" -eq 1; then \
+ tests="test"; \
@@ -47519,22 +27606,7 @@ Index: pam.debian/modules/pam_xauth/Makefile.in
test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
dashes="$$skipped"; \
fi; \
-@@ -520,15 +559,32 @@
- dashes="$$report"; \
- fi; \
- dashes=`echo "$$dashes" | sed s/./=/g`; \
-- echo "$$dashes"; \
-+ if test "$$failed" -eq 0; then \
-+ echo "$$grn$$dashes"; \
-+ else \
-+ echo "$$red$$dashes"; \
-+ fi; \
- echo "$$banner"; \
- test -z "$$skipped" || echo "$$skipped"; \
- test -z "$$report" || echo "$$report"; \
-- echo "$$dashes"; \
-+ echo "$$dashes$$std"; \
- test "$$failed" -eq 0; \
+@@ -533,6 +548,19 @@
else :; fi
distdir: $(DISTFILES)
@@ -47554,37 +27626,7 @@ Index: pam.debian/modules/pam_xauth/Makefile.in
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
-@@ -544,13 +600,17 @@
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-+ if test -d "$(distdir)/$$file"; then \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+ fi; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
-- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
- else \
-- test -f $(distdir)/$$file \
-- || cp -p $$d/$$file $(distdir)/$$file \
-+ test -f "$(distdir)/$$file" \
-+ || cp -p $$d/$$file "$(distdir)/$$file" \
- || exit 1; \
- fi; \
- done
-@@ -583,6 +643,7 @@
-
- distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -605,6 +666,8 @@
+@@ -609,6 +637,8 @@
html: html-am
@@ -47593,7 +27635,7 @@ Index: pam.debian/modules/pam_xauth/Makefile.in
info: info-am
info-am:
-@@ -613,18 +676,28 @@
+@@ -617,18 +647,28 @@
install-dvi: install-dvi-am
@@ -47622,30 +27664,13 @@ Index: pam.debian/modules/pam_xauth/Makefile.in
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -649,7 +722,7 @@
-
- uninstall-man: uninstall-man8
-
--.MAKE: install-am install-strip
-+.MAKE: check-am install-am install-strip
-
- .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
- clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
-@@ -669,6 +742,7 @@
-
- @ENABLE_REGENERATE_MAN_TRUE@README: pam_xauth.8.xml
- @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
-+
- # 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.
- .NOEXPORT:
-Index: pam.debian/tests/Makefile.in
+Index: pam.deb/tests/Makefile.in
===================================================================
---- pam.debian.orig/tests/Makefile.in
-+++ pam.debian/tests/Makefile.in
+--- pam.deb.orig/tests/Makefile.in
++++ pam.deb/tests/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -47655,43 +27680,7 @@ Index: pam.debian/tests/Makefile.in
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -19,8 +20,9 @@
- #
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
--pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkglibexecdir = $(libexecdir)/@PACKAGE@
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
-@@ -64,6 +66,7 @@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
-+CONFIG_CLEAN_VPATH_FILES =
- am__EXEEXT_1 = 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) \
-@@ -138,6 +141,7 @@
- DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
-+am__mv = mv -f
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-@@ -161,6 +165,8 @@
- tst-pam_start.c
- ETAGS = etags
- CTAGS = ctags
-+am__tty_colors = \
-+red=; grn=; lgn=; blu=; std=
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- AMTAR = @AMTAR@
-@@ -245,6 +251,7 @@
+@@ -247,6 +248,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -47699,7 +27688,7 @@ Index: pam.debian/tests/Makefile.in
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PIE_CFLAGS = @PIE_CFLAGS@
-@@ -337,14 +344,14 @@
+@@ -341,8 +343,8 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -47710,63 +27699,7 @@ Index: pam.debian/tests/Makefile.in
exit 1;; \
esac; \
done; \
-- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tests/Makefile'; \
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu tests/Makefile
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tests/Makefile'; \
-+ $(am__cd) $(top_srcdir) && \
-+ $(AUTOMAKE) --gnu tests/Makefile
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
-@@ -362,13 +369,16 @@
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- $(ACLOCAL_M4): $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(am__aclocal_m4_deps):
-
- clean-checkPROGRAMS:
-- @list='$(check_PROGRAMS)'; for p in $$list; do \
-- f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-- echo " rm -f $$p $$f"; \
-- rm -f $$p $$f ; \
-- done
-+ @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \
-+ echo " rm -f" $$list; \
-+ rm -f $$list || exit $$?; \
-+ test -n "$(EXEEXT)" || exit 0; \
-+ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
-+ echo " rm -f" $$list; \
-+ rm -f $$list
- tst-dlopen$(EXEEXT): $(tst_dlopen_OBJECTS) $(tst_dlopen_DEPENDENCIES)
- @rm -f tst-dlopen$(EXEEXT)
- $(LINK) $(tst_dlopen_OBJECTS) $(tst_dlopen_LDADD) $(LIBS)
-@@ -443,21 +453,21 @@
-
- .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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @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 $@ $<
-@@ -473,14 +483,14 @@
+@@ -477,7 +479,7 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -47775,56 +27708,7 @@ Index: pam.debian/tests/Makefile.in
END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
-+ set x; \
- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -488,37 +498,43 @@
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ shift; \
-+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
-- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique; \
-+ if test $$# -gt 0; then \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ "$$@" $$unique; \
-+ else \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$unique; \
-+ fi; \
- fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
- 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; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+ test -z "$(CTAGS_ARGS)$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-- $$tags $$unique
-+ $$unique
-
- GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
-- && cd $(top_srcdir) \
-- && gtags -i $(GTAGS_ARGS) $$here
-+ && $(am__cd) $(top_srcdir) \
-+ && gtags -i $(GTAGS_ARGS) "$$here"
-
- distclean-tags:
+@@ -520,7 +522,7 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
check-TESTS: $(TESTS)
@@ -47832,11 +27716,8 @@ Index: pam.debian/tests/Makefile.in
+ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
srcdir=$(srcdir); export srcdir; \
list=' $(TESTS) '; \
-+ $(am__tty_colors); \
if test -n "$$list"; then \
- for tst in $$list; do \
- if test -f ./$$tst; then dir=./; \
-@@ -527,49 +543,63 @@
+@@ -531,7 +533,7 @@
if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
@@ -47844,35 +27725,19 @@ Index: pam.debian/tests/Makefile.in
+ *[\ \ ]$$tst[\ \ ]*) \
xpass=`expr $$xpass + 1`; \
failed=`expr $$failed + 1`; \
-- echo "XPASS: $$tst"; \
-+ col=$$red; res=XPASS; \
- ;; \
- *) \
-- echo "PASS: $$tst"; \
-+ col=$$grn; res=PASS; \
- ;; \
- esac; \
+ echo "XPASS: $$tst"; \
+@@ -543,7 +545,7 @@
elif test $$? -ne 77; then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
- *$$ws$$tst$$ws*) \
+ *[\ \ ]$$tst[\ \ ]*) \
xfail=`expr $$xfail + 1`; \
-- echo "XFAIL: $$tst"; \
-+ col=$$lgn; res=XFAIL; \
- ;; \
- *) \
- failed=`expr $$failed + 1`; \
-- echo "FAIL: $$tst"; \
-+ col=$$red; res=FAIL; \
+ echo "XFAIL: $$tst"; \
;; \
- esac; \
- else \
- skip=`expr $$skip + 1`; \
-- echo "SKIP: $$tst"; \
-+ col=$$blu; res=SKIP; \
+@@ -557,23 +559,36 @@
+ echo "SKIP: $$tst"; \
fi; \
-+ echo "$${col}$$res$${std}: $$tst"; \
done; \
+ if test "$$all" -eq 1; then \
+ tests="test"; \
@@ -47912,55 +27777,7 @@ Index: pam.debian/tests/Makefile.in
test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
dashes="$$skipped"; \
fi; \
-@@ -580,11 +610,15 @@
- dashes="$$report"; \
- fi; \
- dashes=`echo "$$dashes" | sed s/./=/g`; \
-- echo "$$dashes"; \
-+ if test "$$failed" -eq 0; then \
-+ echo "$$grn$$dashes"; \
-+ else \
-+ echo "$$red$$dashes"; \
-+ fi; \
- echo "$$banner"; \
- test -z "$$skipped" || echo "$$skipped"; \
- test -z "$$report" || echo "$$report"; \
-- echo "$$dashes"; \
-+ echo "$$dashes$$std"; \
- test "$$failed" -eq 0; \
- else :; fi
-
-@@ -604,13 +638,17 @@
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-+ if test -d "$(distdir)/$$file"; then \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+ fi; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
-- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
- else \
-- test -f $(distdir)/$$file \
-- || cp -p $$d/$$file $(distdir)/$$file \
-+ test -f "$(distdir)/$$file" \
-+ || cp -p $$d/$$file "$(distdir)/$$file" \
- || exit 1; \
- fi; \
- done
-@@ -641,6 +679,7 @@
-
- distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -662,6 +701,8 @@
+@@ -666,6 +681,8 @@
html: html-am
@@ -47969,7 +27786,7 @@ Index: pam.debian/tests/Makefile.in
info: info-am
info-am:
-@@ -670,18 +711,28 @@
+@@ -674,18 +691,28 @@
install-dvi: install-dvi-am
@@ -47998,30 +27815,13 @@ Index: pam.debian/tests/Makefile.in
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -704,7 +755,7 @@
-
- uninstall-am:
-
--.MAKE: install-am install-strip
-+.MAKE: check-am install-am install-strip
-
- .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
- clean-checkPROGRAMS clean-generic clean-libtool ctags \
-@@ -720,6 +771,7 @@
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-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.
- .NOEXPORT:
-Index: pam.debian/xtests/Makefile.in
+Index: pam.deb/xtests/Makefile.in
===================================================================
---- pam.debian.orig/xtests/Makefile.in
-+++ pam.debian/xtests/Makefile.in
+--- pam.deb.orig/xtests/Makefile.in
++++ pam.deb/xtests/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.10.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -48031,34 +27831,7 @@ Index: pam.debian/xtests/Makefile.in
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -20,8 +21,9 @@
-
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
--pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkglibexecdir = $(libexecdir)/@PACKAGE@
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
-@@ -57,6 +59,7 @@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
-+CONFIG_CLEAN_VPATH_FILES =
- am__EXEEXT_1 = tst-pam_dispatch1$(EXEEXT) tst-pam_dispatch2$(EXEEXT) \
- tst-pam_dispatch3$(EXEEXT) tst-pam_dispatch4$(EXEEXT) \
- tst-pam_dispatch5$(EXEEXT) tst-pam_cracklib1$(EXEEXT) \
-@@ -138,6 +141,7 @@
- DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
-+am__mv = mv -f
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-@@ -249,6 +253,7 @@
+@@ -249,6 +250,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -48066,7 +27839,7 @@ Index: pam.debian/xtests/Makefile.in
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PIE_CFLAGS = @PIE_CFLAGS@
-@@ -379,14 +384,14 @@
+@@ -381,8 +383,8 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -48077,63 +27850,7 @@ Index: pam.debian/xtests/Makefile.in
exit 1;; \
esac; \
done; \
-- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu xtests/Makefile'; \
-- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu xtests/Makefile
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu xtests/Makefile'; \
-+ $(am__cd) $(top_srcdir) && \
-+ $(AUTOMAKE) --gnu xtests/Makefile
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
-@@ -404,13 +409,16 @@
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- $(ACLOCAL_M4): $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(am__aclocal_m4_deps):
-
- clean-noinstPROGRAMS:
-- @list='$(noinst_PROGRAMS)'; for p in $$list; do \
-- f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-- echo " rm -f $$p $$f"; \
-- rm -f $$p $$f ; \
-- done
-+ @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
-+ echo " rm -f" $$list; \
-+ rm -f $$list || exit $$?; \
-+ test -n "$(EXEEXT)" || exit 0; \
-+ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
-+ echo " rm -f" $$list; \
-+ rm -f $$list
- 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)
-@@ -509,21 +517,21 @@
-
- .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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @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 $@ $<
-@@ -539,14 +547,14 @@
+@@ -534,7 +536,7 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -48142,88 +27859,7 @@ Index: pam.debian/xtests/Makefile.in
END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
-
- TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
-+ set x; \
- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -554,29 +562,34 @@
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+ shift; \
-+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
-- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$tags $$unique; \
-+ if test $$# -gt 0; then \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ "$$@" $$unique; \
-+ else \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$unique; \
-+ fi; \
- fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- tags=; \
- 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; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+ test -z "$(CTAGS_ARGS)$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-- $$tags $$unique
-+ $$unique
-
- GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
-- && cd $(top_srcdir) \
-- && gtags -i $(GTAGS_ARGS) $$here
-+ && $(am__cd) $(top_srcdir) \
-+ && gtags -i $(GTAGS_ARGS) "$$here"
-
- distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-@@ -597,13 +610,17 @@
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-+ if test -d "$(distdir)/$$file"; then \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+ fi; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
-- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
- else \
-- test -f $(distdir)/$$file \
-- || cp -p $$d/$$file $(distdir)/$$file \
-+ test -f "$(distdir)/$$file" \
-+ || cp -p $$d/$$file "$(distdir)/$$file" \
- || exit 1; \
- fi; \
- done
-@@ -632,6 +649,7 @@
-
- distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -653,6 +671,8 @@
+@@ -647,6 +649,8 @@
html: html-am
@@ -48232,7 +27868,7 @@ Index: pam.debian/xtests/Makefile.in
info: info-am
info-am:
-@@ -661,18 +681,28 @@
+@@ -655,18 +659,28 @@
install-dvi: install-dvi-am
@@ -48261,18 +27897,10 @@ Index: pam.debian/xtests/Makefile.in
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -713,6 +743,7 @@
-
- xtests: $(XTESTS) run-xtests.sh
- "$(srcdir)"/run-xtests.sh "$(srcdir)" ${XTESTS} ${NOSRCTESTS}
-+
- # 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.
- .NOEXPORT:
-Index: pam.debian/m4/ltversion.m4
+Index: pam.deb/m4/ltversion.m4
===================================================================
---- pam.debian.orig/m4/ltversion.m4
-+++ pam.debian/m4/ltversion.m4
+--- pam.deb.orig/m4/ltversion.m4
++++ pam.deb/m4/ltversion.m4
@@ -9,15 +9,15 @@
# Generated from ltversion.in.
diff --git a/debian/patches-applied/fix-man-crud b/debian/patches-applied/fix-man-crud
index 2975246e..b71a3dac 100644
--- a/debian/patches-applied/fix-man-crud
+++ b/debian/patches-applied/fix-man-crud
@@ -15,15 +15,15 @@ Index: pam.deb/doc/man/pam_close_session.3
.\" Title: pam_close_session
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 04/01/2010
+-.\" Date: 10/27/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/31/2010
++.\" Date: 06/04/2011
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_CLOSE_SESSION" "3" "04/01/2010" "Linux-PAM Manual" "Linux-PAM Manual"
-+.TH "PAM_CLOSE_SESSION" "3" "08/31/2010" "Linux-PAM Manual" "Linux-PAM Manual"
+-.TH "PAM_CLOSE_SESSION" "3" "10/27/2010" "Linux-PAM Manual" "Linux-PAM Manual"
++.TH "PAM_CLOSE_SESSION" "3" "06/04/2011" "Linux-PAM Manual" "Linux-PAM Manual"
.\" -----------------------------------------------------------------
-.\" * (re)Define some macros
+.\" * Define some portability stuff
@@ -225,15 +225,15 @@ Index: pam.deb/doc/man/pam_fail_delay.3
.\" Title: pam_fail_delay
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 04/01/2010
+-.\" Date: 10/27/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/31/2010
++.\" Date: 06/04/2011
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_FAIL_DELAY" "3" "04/01/2010" "Linux-PAM Manual" "Linux-PAM Manual"
-+.TH "PAM_FAIL_DELAY" "3" "08/31/2010" "Linux-PAM Manual" "Linux-PAM Manual"
+-.TH "PAM_FAIL_DELAY" "3" "10/27/2010" "Linux-PAM Manual" "Linux-PAM Manual"
++.TH "PAM_FAIL_DELAY" "3" "06/04/2011" "Linux-PAM Manual" "Linux-PAM Manual"
.\" -----------------------------------------------------------------
-.\" * (re)Define some macros
+.\" * Define some portability stuff
@@ -530,15 +530,15 @@ Index: pam.deb/doc/man/pam_get_data.3
.\" Title: pam_get_data
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 04/01/2010
+-.\" Date: 10/27/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/31/2010
++.\" Date: 06/04/2011
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_GET_DATA" "3" "04/01/2010" "Linux-PAM Manual" "Linux-PAM Manual"
-+.TH "PAM_GET_DATA" "3" "08/31/2010" "Linux-PAM Manual" "Linux-PAM Manual"
+-.TH "PAM_GET_DATA" "3" "10/27/2010" "Linux-PAM Manual" "Linux-PAM Manual"
++.TH "PAM_GET_DATA" "3" "06/04/2011" "Linux-PAM Manual" "Linux-PAM Manual"
.\" -----------------------------------------------------------------
-.\" * (re)Define some macros
+.\" * Define some portability stuff
@@ -731,15 +731,15 @@ Index: pam.deb/doc/man/pam_get_user.3
.\" Title: pam_get_user
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 04/01/2010
+-.\" Date: 10/27/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/31/2010
++.\" Date: 06/04/2011
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_GET_USER" "3" "04/01/2010" "Linux-PAM Manual" "Linux-PAM Manual"
-+.TH "PAM_GET_USER" "3" "08/31/2010" "Linux-PAM Manual" "Linux-PAM Manual"
+-.TH "PAM_GET_USER" "3" "10/27/2010" "Linux-PAM Manual" "Linux-PAM Manual"
++.TH "PAM_GET_USER" "3" "06/04/2011" "Linux-PAM Manual" "Linux-PAM Manual"
.\" -----------------------------------------------------------------
-.\" * (re)Define some macros
+.\" * Define some portability stuff
@@ -941,15 +941,15 @@ Index: pam.deb/doc/man/pam_set_data.3
.\" Title: pam_set_data
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 04/01/2010
+-.\" Date: 10/27/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/31/2010
++.\" Date: 06/04/2011
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_SET_DATA" "3" "04/01/2010" "Linux-PAM Manual" "Linux-PAM Manual"
-+.TH "PAM_SET_DATA" "3" "08/31/2010" "Linux-PAM Manual" "Linux-PAM Manual"
+-.TH "PAM_SET_DATA" "3" "10/27/2010" "Linux-PAM Manual" "Linux-PAM Manual"
++.TH "PAM_SET_DATA" "3" "06/04/2011" "Linux-PAM Manual" "Linux-PAM Manual"
.\" -----------------------------------------------------------------
-.\" * (re)Define some macros
+.\" * Define some portability stuff
@@ -1151,15 +1151,15 @@ Index: pam.deb/doc/man/pam_sm_authenticate.3
.\" Title: pam_sm_authenticate
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 04/01/2010
+-.\" Date: 10/27/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/31/2010
++.\" Date: 06/04/2011
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_SM_AUTHENTICATE" "3" "04/01/2010" "Linux-PAM Manual" "Linux-PAM Manual"
-+.TH "PAM_SM_AUTHENTICATE" "3" "08/31/2010" "Linux-PAM Manual" "Linux-PAM Manual"
+-.TH "PAM_SM_AUTHENTICATE" "3" "10/27/2010" "Linux-PAM Manual" "Linux-PAM Manual"
++.TH "PAM_SM_AUTHENTICATE" "3" "06/04/2011" "Linux-PAM Manual" "Linux-PAM Manual"
.\" -----------------------------------------------------------------
-.\" * (re)Define some macros
+.\" * Define some portability stuff
@@ -1375,15 +1375,15 @@ Index: pam.deb/doc/man/pam_sm_close_session.3
.\" Title: pam_sm_close_session
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 04/01/2010
+-.\" Date: 10/27/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/31/2010
++.\" Date: 06/04/2011
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_SM_CLOSE_SESSION" "3" "04/01/2010" "Linux-PAM Manual" "Linux-PAM Manual"
-+.TH "PAM_SM_CLOSE_SESSION" "3" "08/31/2010" "Linux-PAM Manual" "Linux-PAM Manual"
+-.TH "PAM_SM_CLOSE_SESSION" "3" "10/27/2010" "Linux-PAM Manual" "Linux-PAM Manual"
++.TH "PAM_SM_CLOSE_SESSION" "3" "06/04/2011" "Linux-PAM Manual" "Linux-PAM Manual"
.\" -----------------------------------------------------------------
-.\" * (re)Define some macros
+.\" * Define some portability stuff
@@ -1592,15 +1592,15 @@ Index: pam.deb/doc/man/pam_sm_setcred.3
.\" Title: pam_sm_setcred
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 04/01/2010
+-.\" Date: 10/27/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/31/2010
++.\" Date: 06/04/2011
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_SM_SETCRED" "3" "04/01/2010" "Linux-PAM Manual" "Linux-PAM Manual"
-+.TH "PAM_SM_SETCRED" "3" "08/31/2010" "Linux-PAM Manual" "Linux-PAM Manual"
+-.TH "PAM_SM_SETCRED" "3" "10/27/2010" "Linux-PAM Manual" "Linux-PAM Manual"
++.TH "PAM_SM_SETCRED" "3" "06/04/2011" "Linux-PAM Manual" "Linux-PAM Manual"
.\" -----------------------------------------------------------------
-.\" * (re)Define some macros
+.\" * Define some portability stuff
@@ -1833,15 +1833,15 @@ Index: pam.deb/modules/pam_pwhistory/pam_pwhistory.8
.\" Title: pam_pwhistory
.\" Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 07/08/2010
+-.\" Date: 10/27/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/31/2010
++.\" Date: 06/04/2011
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_PWHISTORY" "8" "07/08/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
-+.TH "PAM_PWHISTORY" "8" "08/31/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
+-.TH "PAM_PWHISTORY" "8" "10/27/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
++.TH "PAM_PWHISTORY" "8" "06/04/2011" "Linux-PAM Manual" "Linux\-PAM Manual"
.\" -----------------------------------------------------------------
-.\" * (re)Define some macros
+.\" * Define some portability stuff
@@ -2105,15 +2105,15 @@ Index: pam.deb/modules/pam_timestamp/pam_timestamp.8
.\" Title: pam_timestamp
.\" Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 07/08/2010
+-.\" Date: 10/27/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/31/2010
++.\" Date: 06/04/2011
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_TIMESTAMP" "8" "07/08/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
-+.TH "PAM_TIMESTAMP" "8" "08/31/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
+-.TH "PAM_TIMESTAMP" "8" "10/27/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
++.TH "PAM_TIMESTAMP" "8" "06/04/2011" "Linux-PAM Manual" "Linux\-PAM Manual"
.\" -----------------------------------------------------------------
-.\" * (re)Define some macros
+.\" * Define some portability stuff
@@ -2332,15 +2332,15 @@ Index: pam.deb/modules/pam_unix/unix_update.8
.\" Title: unix_update
.\" Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 08/13/2010
+-.\" Date: 10/27/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/31/2010
++.\" Date: 06/04/2011
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "UNIX_UPDATE" "8" "08/13/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
-+.TH "UNIX_UPDATE" "8" "08/31/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
+-.TH "UNIX_UPDATE" "8" "10/27/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
++.TH "UNIX_UPDATE" "8" "06/04/2011" "Linux-PAM Manual" "Linux\-PAM Manual"
.\" -----------------------------------------------------------------
-.\" * (re)Define some macros
+.\" * Define some portability stuff
@@ -2523,15 +2523,15 @@ Index: pam.deb/doc/man/pam_end.3
.\" Title: pam_end
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 04/01/2010
+-.\" Date: 10/27/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/31/2010
++.\" Date: 06/04/2011
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_END" "3" "04/01/2010" "Linux-PAM Manual" "Linux-PAM Manual"
-+.TH "PAM_END" "3" "08/31/2010" "Linux-PAM Manual" "Linux-PAM Manual"
+-.TH "PAM_END" "3" "10/27/2010" "Linux-PAM Manual" "Linux-PAM Manual"
++.TH "PAM_END" "3" "06/04/2011" "Linux-PAM Manual" "Linux-PAM Manual"
.\" -----------------------------------------------------------------
-.\" * (re)Define some macros
+.\" * Define some portability stuff
@@ -2740,15 +2740,15 @@ Index: pam.deb/doc/man/pam_get_item.3
.\" Title: pam_get_item
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 04/01/2010
+-.\" Date: 10/27/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/31/2010
++.\" Date: 06/04/2011
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_GET_ITEM" "3" "04/01/2010" "Linux-PAM Manual" "Linux-PAM Manual"
-+.TH "PAM_GET_ITEM" "3" "08/31/2010" "Linux-PAM Manual" "Linux-PAM Manual"
+-.TH "PAM_GET_ITEM" "3" "10/27/2010" "Linux-PAM Manual" "Linux-PAM Manual"
++.TH "PAM_GET_ITEM" "3" "06/04/2011" "Linux-PAM Manual" "Linux-PAM Manual"
.\" -----------------------------------------------------------------
-.\" * (re)Define some macros
+.\" * Define some portability stuff
@@ -2966,15 +2966,15 @@ Index: pam.deb/doc/man/pam_sm_acct_mgmt.3
.\" Title: pam_sm_acct_mgmt
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 04/01/2010
+-.\" Date: 10/27/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/31/2010
++.\" Date: 06/04/2011
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_SM_ACCT_MGMT" "3" "04/01/2010" "Linux-PAM Manual" "Linux-PAM Manual"
-+.TH "PAM_SM_ACCT_MGMT" "3" "08/31/2010" "Linux-PAM Manual" "Linux-PAM Manual"
+-.TH "PAM_SM_ACCT_MGMT" "3" "10/27/2010" "Linux-PAM Manual" "Linux-PAM Manual"
++.TH "PAM_SM_ACCT_MGMT" "3" "06/04/2011" "Linux-PAM Manual" "Linux-PAM Manual"
.\" -----------------------------------------------------------------
-.\" * (re)Define some macros
+.\" * Define some portability stuff
@@ -3199,15 +3199,15 @@ Index: pam.deb/doc/man/pam_sm_open_session.3
.\" Title: pam_sm_open_session
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 04/01/2010
+-.\" Date: 10/27/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/31/2010
++.\" Date: 06/04/2011
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_SM_OPEN_SESSION" "3" "04/01/2010" "Linux-PAM Manual" "Linux-PAM Manual"
-+.TH "PAM_SM_OPEN_SESSION" "3" "08/31/2010" "Linux-PAM Manual" "Linux-PAM Manual"
+-.TH "PAM_SM_OPEN_SESSION" "3" "10/27/2010" "Linux-PAM Manual" "Linux-PAM Manual"
++.TH "PAM_SM_OPEN_SESSION" "3" "06/04/2011" "Linux-PAM Manual" "Linux-PAM Manual"
.\" -----------------------------------------------------------------
-.\" * (re)Define some macros
+.\" * Define some portability stuff
@@ -3416,15 +3416,15 @@ Index: pam.deb/modules/pam_tally2/pam_tally2.8
.\" Title: pam_tally2
.\" Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 07/08/2010
+-.\" Date: 10/27/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/31/2010
++.\" Date: 06/04/2011
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_TALLY2" "8" "07/08/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
-+.TH "PAM_TALLY2" "8" "08/31/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
+-.TH "PAM_TALLY2" "8" "10/27/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
++.TH "PAM_TALLY2" "8" "06/04/2011" "Linux-PAM Manual" "Linux\-PAM Manual"
.\" -----------------------------------------------------------------
-.\" * (re)Define some macros
+.\" * Define some portability stuff
@@ -3715,15 +3715,15 @@ Index: pam.deb/modules/pam_unix/unix_chkpwd.8
.\" Title: unix_chkpwd
.\" Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 08/13/2010
+-.\" Date: 10/27/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/31/2010
++.\" Date: 06/04/2011
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "UNIX_CHKPWD" "8" "08/13/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
-+.TH "UNIX_CHKPWD" "8" "08/31/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
+-.TH "UNIX_CHKPWD" "8" "10/27/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
++.TH "UNIX_CHKPWD" "8" "06/04/2011" "Linux-PAM Manual" "Linux\-PAM Manual"
.\" -----------------------------------------------------------------
-.\" * (re)Define some macros
+.\" * Define some portability stuff
@@ -3906,15 +3906,15 @@ Index: pam.deb/doc/man/pam_sm_chauthtok.3
.\" Title: pam_sm_chauthtok
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 04/01/2010
+-.\" Date: 10/27/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/31/2010
++.\" Date: 06/04/2011
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_SM_CHAUTHTOK" "3" "04/01/2010" "Linux-PAM Manual" "Linux-PAM Manual"
-+.TH "PAM_SM_CHAUTHTOK" "3" "08/31/2010" "Linux-PAM Manual" "Linux-PAM Manual"
+-.TH "PAM_SM_CHAUTHTOK" "3" "10/27/2010" "Linux-PAM Manual" "Linux-PAM Manual"
++.TH "PAM_SM_CHAUTHTOK" "3" "06/04/2011" "Linux-PAM Manual" "Linux-PAM Manual"
.\" -----------------------------------------------------------------
-.\" * (re)Define some macros
+.\" * Define some portability stuff
@@ -4148,15 +4148,15 @@ Index: pam.deb/modules/pam_timestamp/pam_timestamp_check.8
.\" Title: pam_timestamp_check
.\" Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 07/08/2010
+-.\" Date: 10/27/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/31/2010
++.\" Date: 06/04/2011
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_TIMESTAMP_CHECK" "8" "07/08/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
-+.TH "PAM_TIMESTAMP_CHECK" "8" "08/31/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
+-.TH "PAM_TIMESTAMP_CHECK" "8" "10/27/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
++.TH "PAM_TIMESTAMP_CHECK" "8" "06/04/2011" "Linux-PAM Manual" "Linux\-PAM Manual"
.\" -----------------------------------------------------------------
-.\" * (re)Define some macros
+.\" * Define some portability stuff
@@ -4384,15 +4384,15 @@ Index: pam.deb/doc/man/pam_open_session.3
.\" Title: pam_open_session
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 04/01/2010
+-.\" Date: 10/27/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/31/2010
++.\" Date: 06/04/2011
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_OPEN_SESSION" "3" "04/01/2010" "Linux-PAM Manual" "Linux-PAM Manual"
-+.TH "PAM_OPEN_SESSION" "3" "08/31/2010" "Linux-PAM Manual" "Linux-PAM Manual"
+-.TH "PAM_OPEN_SESSION" "3" "10/27/2010" "Linux-PAM Manual" "Linux-PAM Manual"
++.TH "PAM_OPEN_SESSION" "3" "06/04/2011" "Linux-PAM Manual" "Linux-PAM Manual"
.\" -----------------------------------------------------------------
-.\" * (re)Define some macros
+.\" * Define some portability stuff
@@ -4594,15 +4594,15 @@ Index: pam.deb/doc/man/pam_set_item.3
.\" Title: pam_set_item
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 04/01/2010
+-.\" Date: 10/27/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/31/2010
++.\" Date: 06/04/2011
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_SET_ITEM" "3" "04/01/2010" "Linux-PAM Manual" "Linux-PAM Manual"
-+.TH "PAM_SET_ITEM" "3" "08/31/2010" "Linux-PAM Manual" "Linux-PAM Manual"
+-.TH "PAM_SET_ITEM" "3" "10/27/2010" "Linux-PAM Manual" "Linux-PAM Manual"
++.TH "PAM_SET_ITEM" "3" "06/04/2011" "Linux-PAM Manual" "Linux-PAM Manual"
.\" -----------------------------------------------------------------
-.\" * (re)Define some macros
+.\" * Define some portability stuff
@@ -4811,15 +4811,15 @@ Index: pam.deb/modules/pam_mkhomedir/mkhomedir_helper.8
.\" Title: mkhomedir_helper
.\" Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 07/08/2010
+-.\" Date: 10/27/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/31/2010
++.\" Date: 06/04/2011
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "MKHOMEDIR_HELPER" "8" "07/08/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
-+.TH "MKHOMEDIR_HELPER" "8" "08/31/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
+-.TH "MKHOMEDIR_HELPER" "8" "10/27/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
++.TH "MKHOMEDIR_HELPER" "8" "06/04/2011" "Linux-PAM Manual" "Linux\-PAM Manual"
.\" -----------------------------------------------------------------
-.\" * (re)Define some macros
+.\" * Define some portability stuff
@@ -5002,15 +5002,15 @@ Index: pam.deb/doc/man/pam.3
.\" Title: pam
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 04/01/2010
+-.\" Date: 10/27/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/31/2010
++.\" Date: 06/04/2011
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM" "3" "04/01/2010" "Linux-PAM Manual" "Linux-PAM Manual"
-+.TH "PAM" "3" "08/31/2010" "Linux-PAM Manual" "Linux-PAM Manual"
+-.TH "PAM" "3" "10/27/2010" "Linux-PAM Manual" "Linux-PAM Manual"
++.TH "PAM" "3" "06/04/2011" "Linux-PAM Manual" "Linux-PAM Manual"
.\" -----------------------------------------------------------------
-.\" * (re)Define some macros
+.\" * Define some portability stuff
@@ -5218,15 +5218,15 @@ Index: pam.deb/doc/man/pam_start.3
.\" Title: pam_start
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 04/01/2010
+-.\" Date: 10/27/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/31/2010
++.\" Date: 06/04/2011
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_START" "3" "04/01/2010" "Linux-PAM Manual" "Linux-PAM Manual"
-+.TH "PAM_START" "3" "08/31/2010" "Linux-PAM Manual" "Linux-PAM Manual"
+-.TH "PAM_START" "3" "10/27/2010" "Linux-PAM Manual" "Linux-PAM Manual"
++.TH "PAM_START" "3" "06/04/2011" "Linux-PAM Manual" "Linux-PAM Manual"
.\" -----------------------------------------------------------------
-.\" * (re)Define some macros
+.\" * Define some portability stuff
@@ -5422,3 +5422,934 @@ Index: pam.deb/doc/man/pam_start.3
.PP
The
\fIuser\fR
+Index: pam.deb/doc/man/pam_get_authtok.3
+===================================================================
+--- pam.deb.orig/doc/man/pam_get_authtok.3
++++ pam.deb/doc/man/pam_get_authtok.3
+@@ -1,161 +1,22 @@
++'\" t
+ .\" Title: pam_get_authtok
+ .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
+-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
+-.\" Date: 10/27/2010
++.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
++.\" Date: 06/04/2011
+ .\" Manual: Linux-PAM Manual
+ .\" Source: Linux-PAM Manual
+ .\" Language: English
+ .\"
+-.TH "PAM_GET_AUTHTOK" "3" "10/27/2010" "Linux-PAM Manual" "Linux-PAM Manual"
++.TH "PAM_GET_AUTHTOK" "3" "06/04/2011" "Linux-PAM Manual" "Linux-PAM Manual"
+ .\" -----------------------------------------------------------------
+-.\" * (re)Define some macros
++.\" * Define some portability stuff
+ .\" -----------------------------------------------------------------
+ .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-.\" toupper - uppercase a string (locale-aware)
++.\" http://bugs.debian.org/507673
++.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+ .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-.de toupper
+-.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ
+-\\$*
+-.tr aabbccddeeffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz
+-..
+-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-.\" SH-xref - format a cross-reference to an SH section
+-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-.de SH-xref
+-.ie n \{\
+-.\}
+-.toupper \\$*
+-.el \{\
+-\\$*
+-.\}
+-..
+-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-.\" SH - level-one heading that works better for non-TTY output
+-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-.de1 SH
+-.\" put an extra blank line of space above the head in non-TTY output
+-.if t \{\
+-.sp 1
+-.\}
+-.sp \\n[PD]u
+-.nr an-level 1
+-.set-an-margin
+-.nr an-prevailing-indent \\n[IN]
+-.fi
+-.in \\n[an-margin]u
+-.ti 0
+-.HTML-TAG ".NH \\n[an-level]"
+-.it 1 an-trap
+-.nr an-no-space-flag 1
+-.nr an-break-flag 1
+-\." make the size of the head bigger
+-.ps +3
+-.ft B
+-.ne (2v + 1u)
+-.ie n \{\
+-.\" if n (TTY output), use uppercase
+-.toupper \\$*
+-.\}
+-.el \{\
+-.nr an-break-flag 0
+-.\" if not n (not TTY), use normal case (not uppercase)
+-\\$1
+-.in \\n[an-margin]u
+-.ti 0
+-.\" if not n (not TTY), put a border/line under subheading
+-.sp -.6
+-\l'\n(.lu'
+-.\}
+-..
+-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-.\" SS - level-two heading that works better for non-TTY output
+-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-.de1 SS
+-.sp \\n[PD]u
+-.nr an-level 1
+-.set-an-margin
+-.nr an-prevailing-indent \\n[IN]
+-.fi
+-.in \\n[IN]u
+-.ti \\n[SN]u
+-.it 1 an-trap
+-.nr an-no-space-flag 1
+-.nr an-break-flag 1
+-.ps \\n[PS-SS]u
+-\." make the size of the head bigger
+-.ps +2
+-.ft B
+-.ne (2v + 1u)
+-.if \\n[.$] \&\\$*
+-..
+-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-.\" BB/BE - put background/screen (filled box) around block of text
+-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-.de BB
+-.if t \{\
+-.sp -.5
+-.br
+-.in +2n
+-.ll -2n
+-.gcolor red
+-.di BX
+-.\}
+-..
+-.de EB
+-.if t \{\
+-.if "\\$2"adjust-for-leading-newline" \{\
+-.sp -1
+-.\}
+-.br
+-.di
+-.in
+-.ll
+-.gcolor
+-.nr BW \\n(.lu-\\n(.i
+-.nr BH \\n(dn+.5v
+-.ne \\n(BHu+.5v
+-.ie "\\$2"adjust-for-leading-newline" \{\
+-\M[\\$1]\h'1n'\v'+.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[]
+-.\}
+-.el \{\
+-\M[\\$1]\h'1n'\v'-.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[]
+-.\}
+-.in 0
+-.sp -.5v
+-.nf
+-.BX
+-.in
+-.sp .5v
+-.fi
+-.\}
+-..
+-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-.\" BM/EM - put colored marker in margin next to block of text
+-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-.de BM
+-.if t \{\
+-.br
+-.ll -2n
+-.gcolor red
+-.di BX
+-.\}
+-..
+-.de EM
+-.if t \{\
+-.br
+-.di
+-.ll
+-.gcolor
+-.nr BH \\n(dn
+-.ne \\n(BHu
+-\M[\\$1]\D'P -.75n 0 0 \\n(BHu -(\\n[.i]u - \\n(INu - .75n) 0 0 -\\n(BHu'\M[]
+-.in 0
+-.nf
+-.BX
+-.in
+-.fi
+-.\}
+-..
++.ie \n(.g .ds Aq \(aq
++.el .ds Aq '
+ .\" -----------------------------------------------------------------
+ .\" * set default formatting
+ .\" -----------------------------------------------------------------
+@@ -166,31 +27,21 @@
+ .\" -----------------------------------------------------------------
+ .\" * MAIN CONTENT STARTS HERE *
+ .\" -----------------------------------------------------------------
+-.SH "Name"
++.SH "NAME"
+ pam_get_authtok, pam_get_authtok_verify, pam_get_authtok_noverify \- get authentication token
+-.SH "Synopsis"
++.SH "SYNOPSIS"
+ .sp
+ .ft B
+-.fam C
+-.ps -1
+ .nf
+ #include <security/pam_ext\&.h>
+ .fi
+-.fam
+-.ps +1
+ .ft
+-.fam C
+ .HP \w'int\ pam_get_authtok('u
+ .BI "int pam_get_authtok(pam_handle_t\ *" "pamh" ", int\ " "item" ", const\ char\ **" "authtok" ", const\ char\ *" "prompt" ");"
+-.fam
+-.fam C
+ .HP \w'int\ pam_get_authtok_noverify('u
+ .BI "int pam_get_authtok_noverify(pam_handle_t\ *" "pamh" ", const\ char\ **" "authtok" ", const\ char\ *" "prompt" ");"
+-.fam
+-.fam C
+ .HP \w'int\ pam_get_authtok_verify('u
+ .BI "int pam_get_authtok_verify(pam_handle_t\ *" "pamh" ", const\ char\ **" "authtok" ", const\ char\ *" "prompt" ");"
+-.fam
+ .SH "DESCRIPTION"
+ .PP
+ The
+@@ -202,7 +53,7 @@
+ data and should
+ \fBnot\fR
+ be
+-\fIfree()\fR\'ed or over\-written!
++\fIfree()\fR\*(Aqed or over\-written!
+ .PP
+ The
+ \fIprompt\fR
+@@ -238,7 +89,7 @@
+ data and should
+ \fBnot\fR
+ be
+-\fIfree()\fR\'ed or over\-written!
++\fIfree()\fR\*(Aqed or over\-written!
+ .PP
+ The
+ \fBpam_get_authtok_verify\fR
+@@ -252,7 +103,7 @@
+ data and should
+ \fBnot\fR
+ be
+-\fIfree()\fR\'ed or over\-written!
++\fIfree()\fR\*(Aqed or over\-written!
+ .SH "OPTIONS"
+ .PP
+
+@@ -261,7 +112,7 @@
+ .PP
+ \fBtry_first_pass\fR
+ .RS 4
+-Before prompting the user for their password, the module first tries the previous stacked module\'s password in case that satisfies this module as well\&.
++Before prompting the user for their password, the module first tries the previous stacked module\*(Aqs password in case that satisfies this module as well\&.
+ .RE
+ .PP
+ \fBuse_first_pass\fR
+Index: pam.deb/doc/man/pam_setcred.3
+===================================================================
+--- pam.deb.orig/doc/man/pam_setcred.3
++++ pam.deb/doc/man/pam_setcred.3
+@@ -1,161 +1,22 @@
++'\" t
+ .\" Title: pam_setcred
+ .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
+-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
+-.\" Date: 10/27/2010
++.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
++.\" Date: 06/04/2011
+ .\" Manual: Linux-PAM Manual
+ .\" Source: Linux-PAM Manual
+ .\" Language: English
+ .\"
+-.TH "PAM_SETCRED" "3" "10/27/2010" "Linux-PAM Manual" "Linux-PAM Manual"
++.TH "PAM_SETCRED" "3" "06/04/2011" "Linux-PAM Manual" "Linux-PAM Manual"
+ .\" -----------------------------------------------------------------
+-.\" * (re)Define some macros
++.\" * Define some portability stuff
+ .\" -----------------------------------------------------------------
+ .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-.\" toupper - uppercase a string (locale-aware)
++.\" http://bugs.debian.org/507673
++.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+ .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-.de toupper
+-.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ
+-\\$*
+-.tr aabbccddeeffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz
+-..
+-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-.\" SH-xref - format a cross-reference to an SH section
+-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-.de SH-xref
+-.ie n \{\
+-.\}
+-.toupper \\$*
+-.el \{\
+-\\$*
+-.\}
+-..
+-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-.\" SH - level-one heading that works better for non-TTY output
+-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-.de1 SH
+-.\" put an extra blank line of space above the head in non-TTY output
+-.if t \{\
+-.sp 1
+-.\}
+-.sp \\n[PD]u
+-.nr an-level 1
+-.set-an-margin
+-.nr an-prevailing-indent \\n[IN]
+-.fi
+-.in \\n[an-margin]u
+-.ti 0
+-.HTML-TAG ".NH \\n[an-level]"
+-.it 1 an-trap
+-.nr an-no-space-flag 1
+-.nr an-break-flag 1
+-\." make the size of the head bigger
+-.ps +3
+-.ft B
+-.ne (2v + 1u)
+-.ie n \{\
+-.\" if n (TTY output), use uppercase
+-.toupper \\$*
+-.\}
+-.el \{\
+-.nr an-break-flag 0
+-.\" if not n (not TTY), use normal case (not uppercase)
+-\\$1
+-.in \\n[an-margin]u
+-.ti 0
+-.\" if not n (not TTY), put a border/line under subheading
+-.sp -.6
+-\l'\n(.lu'
+-.\}
+-..
+-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-.\" SS - level-two heading that works better for non-TTY output
+-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-.de1 SS
+-.sp \\n[PD]u
+-.nr an-level 1
+-.set-an-margin
+-.nr an-prevailing-indent \\n[IN]
+-.fi
+-.in \\n[IN]u
+-.ti \\n[SN]u
+-.it 1 an-trap
+-.nr an-no-space-flag 1
+-.nr an-break-flag 1
+-.ps \\n[PS-SS]u
+-\." make the size of the head bigger
+-.ps +2
+-.ft B
+-.ne (2v + 1u)
+-.if \\n[.$] \&\\$*
+-..
+-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-.\" BB/BE - put background/screen (filled box) around block of text
+-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-.de BB
+-.if t \{\
+-.sp -.5
+-.br
+-.in +2n
+-.ll -2n
+-.gcolor red
+-.di BX
+-.\}
+-..
+-.de EB
+-.if t \{\
+-.if "\\$2"adjust-for-leading-newline" \{\
+-.sp -1
+-.\}
+-.br
+-.di
+-.in
+-.ll
+-.gcolor
+-.nr BW \\n(.lu-\\n(.i
+-.nr BH \\n(dn+.5v
+-.ne \\n(BHu+.5v
+-.ie "\\$2"adjust-for-leading-newline" \{\
+-\M[\\$1]\h'1n'\v'+.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[]
+-.\}
+-.el \{\
+-\M[\\$1]\h'1n'\v'-.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[]
+-.\}
+-.in 0
+-.sp -.5v
+-.nf
+-.BX
+-.in
+-.sp .5v
+-.fi
+-.\}
+-..
+-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-.\" BM/EM - put colored marker in margin next to block of text
+-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-.de BM
+-.if t \{\
+-.br
+-.ll -2n
+-.gcolor red
+-.di BX
+-.\}
+-..
+-.de EM
+-.if t \{\
+-.br
+-.di
+-.ll
+-.gcolor
+-.nr BH \\n(dn
+-.ne \\n(BHu
+-\M[\\$1]\D'P -.75n 0 0 \\n(BHu -(\\n[.i]u - \\n(INu - .75n) 0 0 -\\n(BHu'\M[]
+-.in 0
+-.nf
+-.BX
+-.in
+-.fi
+-.\}
+-..
++.ie \n(.g .ds Aq \(aq
++.el .ds Aq '
+ .\" -----------------------------------------------------------------
+ .\" * set default formatting
+ .\" -----------------------------------------------------------------
+@@ -166,23 +27,17 @@
+ .\" -----------------------------------------------------------------
+ .\" * MAIN CONTENT STARTS HERE *
+ .\" -----------------------------------------------------------------
+-.SH "Name"
++.SH "NAME"
+ pam_setcred \- establish / delete user credentials
+-.SH "Synopsis"
++.SH "SYNOPSIS"
+ .sp
+ .ft B
+-.fam C
+-.ps -1
+ .nf
+ #include <security/pam_appl\&.h>
+ .fi
+-.fam
+-.ps +1
+ .ft
+-.fam C
+ .HP \w'int\ pam_setcred('u
+ .BI "int pam_setcred(pam_handle_t\ *" "pamh" ", int\ " "flags" ");"
+-.fam
+ .SH "DESCRIPTION"
+ .PP
+ The
+@@ -193,15 +48,15 @@
+ .PP
+ A credential is something that the user possesses\&. It is some property, such as a
+ \fIKerberos\fR
+-ticket, or a supplementary group membership that make up the uniqueness of a given user\&. On a Linux system the user\'s
++ticket, or a supplementary group membership that make up the uniqueness of a given user\&. On a Linux system the user\*(Aqs
+ \fIUID\fR
+ and
+-\fIGID\fR\'s are credentials too\&. However, it has been decided that these properties (along with the default supplementary groups of which the user is a member) are credentials that should be set directly by the application and not by PAM\&. Such credentials should be established, by the application, prior to a call to this function\&. For example,
++\fIGID\fR\*(Aqs are credentials too\&. However, it has been decided that these properties (along with the default supplementary groups of which the user is a member) are credentials that should be set directly by the application and not by PAM\&. Such credentials should be established, by the application, prior to a call to this function\&. For example,
+ \fBinitgroups\fR(2)
+ (or equivalent) should have been performed\&.
+ .PP
+ Valid
+-\fIflags\fR, any one of which, may be logically OR\'d with
++\fIflags\fR, any one of which, may be logically OR\*(Aqd with
+ \fBPAM_SILENT\fR, are:
+ .PP
+ PAM_ESTABLISH_CRED
+@@ -211,12 +66,12 @@
+ .PP
+ PAM_DELETE_CRED
+ .RS 4
+-Delete the user\'s credentials\&.
++Delete the user\*(Aqs credentials\&.
+ .RE
+ .PP
+ PAM_REINITIALIZE_CRED
+ .RS 4
+-Fully reinitialize the user\'s credentials\&.
++Fully reinitialize the user\*(Aqs credentials\&.
+ .RE
+ .PP
+ PAM_REFRESH_CRED
+Index: pam.deb/modules/pam_sepermit/sepermit.conf.5
+===================================================================
+--- pam.deb.orig/modules/pam_sepermit/sepermit.conf.5
++++ pam.deb/modules/pam_sepermit/sepermit.conf.5
+@@ -1,161 +1,22 @@
++'\" t
+ .\" Title: sepermit.conf
+ .\" Author: [see the "AUTHOR" section]
+-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
+-.\" Date: 07/08/2010
++.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
++.\" Date: 06/04/2011
+ .\" Manual: Linux-PAM Manual
+ .\" Source: Linux-PAM Manual
+ .\" Language: English
+ .\"
+-.TH "SEPERMIT\&.CONF" "5" "07/08/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
++.TH "SEPERMIT\&.CONF" "5" "06/04/2011" "Linux-PAM Manual" "Linux\-PAM Manual"
+ .\" -----------------------------------------------------------------
+-.\" * (re)Define some macros
++.\" * Define some portability stuff
+ .\" -----------------------------------------------------------------
+ .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-.\" toupper - uppercase a string (locale-aware)
++.\" http://bugs.debian.org/507673
++.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+ .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-.de toupper
+-.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ
+-\\$*
+-.tr aabbccddeeffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz
+-..
+-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-.\" SH-xref - format a cross-reference to an SH section
+-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-.de SH-xref
+-.ie n \{\
+-.\}
+-.toupper \\$*
+-.el \{\
+-\\$*
+-.\}
+-..
+-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-.\" SH - level-one heading that works better for non-TTY output
+-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-.de1 SH
+-.\" put an extra blank line of space above the head in non-TTY output
+-.if t \{\
+-.sp 1
+-.\}
+-.sp \\n[PD]u
+-.nr an-level 1
+-.set-an-margin
+-.nr an-prevailing-indent \\n[IN]
+-.fi
+-.in \\n[an-margin]u
+-.ti 0
+-.HTML-TAG ".NH \\n[an-level]"
+-.it 1 an-trap
+-.nr an-no-space-flag 1
+-.nr an-break-flag 1
+-\." make the size of the head bigger
+-.ps +3
+-.ft B
+-.ne (2v + 1u)
+-.ie n \{\
+-.\" if n (TTY output), use uppercase
+-.toupper \\$*
+-.\}
+-.el \{\
+-.nr an-break-flag 0
+-.\" if not n (not TTY), use normal case (not uppercase)
+-\\$1
+-.in \\n[an-margin]u
+-.ti 0
+-.\" if not n (not TTY), put a border/line under subheading
+-.sp -.6
+-\l'\n(.lu'
+-.\}
+-..
+-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-.\" SS - level-two heading that works better for non-TTY output
+-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-.de1 SS
+-.sp \\n[PD]u
+-.nr an-level 1
+-.set-an-margin
+-.nr an-prevailing-indent \\n[IN]
+-.fi
+-.in \\n[IN]u
+-.ti \\n[SN]u
+-.it 1 an-trap
+-.nr an-no-space-flag 1
+-.nr an-break-flag 1
+-.ps \\n[PS-SS]u
+-\." make the size of the head bigger
+-.ps +2
+-.ft B
+-.ne (2v + 1u)
+-.if \\n[.$] \&\\$*
+-..
+-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-.\" BB/BE - put background/screen (filled box) around block of text
+-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-.de BB
+-.if t \{\
+-.sp -.5
+-.br
+-.in +2n
+-.ll -2n
+-.gcolor red
+-.di BX
+-.\}
+-..
+-.de EB
+-.if t \{\
+-.if "\\$2"adjust-for-leading-newline" \{\
+-.sp -1
+-.\}
+-.br
+-.di
+-.in
+-.ll
+-.gcolor
+-.nr BW \\n(.lu-\\n(.i
+-.nr BH \\n(dn+.5v
+-.ne \\n(BHu+.5v
+-.ie "\\$2"adjust-for-leading-newline" \{\
+-\M[\\$1]\h'1n'\v'+.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[]
+-.\}
+-.el \{\
+-\M[\\$1]\h'1n'\v'-.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[]
+-.\}
+-.in 0
+-.sp -.5v
+-.nf
+-.BX
+-.in
+-.sp .5v
+-.fi
+-.\}
+-..
+-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-.\" BM/EM - put colored marker in margin next to block of text
+-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-.de BM
+-.if t \{\
+-.br
+-.ll -2n
+-.gcolor red
+-.di BX
+-.\}
+-..
+-.de EM
+-.if t \{\
+-.br
+-.di
+-.ll
+-.gcolor
+-.nr BH \\n(dn
+-.ne \\n(BHu
+-\M[\\$1]\D'P -.75n 0 0 \\n(BHu -(\\n[.i]u - \\n(INu - .75n) 0 0 -\\n(BHu'\M[]
+-.in 0
+-.nf
+-.BX
+-.in
+-.fi
+-.\}
+-..
++.ie \n(.g .ds Aq \(aq
++.el .ds Aq '
+ .\" -----------------------------------------------------------------
+ .\" * set default formatting
+ .\" -----------------------------------------------------------------
+@@ -166,7 +27,7 @@
+ .\" -----------------------------------------------------------------
+ .\" * MAIN CONTENT STARTS HERE *
+ .\" -----------------------------------------------------------------
+-.SH "Name"
++.SH "NAME"
+ sepermit.conf \- configuration file for the pam_sepermit module
+ .SH "DESCRIPTION"
+ .PP
+@@ -220,7 +81,7 @@
+ .PP
+ \fBexclusive\fR
+ .RS 4
+-Only single login session will be allowed for the user and the user\'s processes will be killed on logout\&.
++Only single login session will be allowed for the user and the user\*(Aqs processes will be killed on logout\&.
+ .RE
+ .PP
+ \fBignore\fR
+@@ -232,31 +93,17 @@
+ .SH "EXAMPLES"
+ .PP
+ These are some example lines which might be specified in
+-\FC/etc/security/sepermit\&.conf\F[]\&.
++/etc/security/sepermit\&.conf\&.
+ .sp
+ .if n \{\
+ .RS 4
+ .\}
+-.fam C
+-.ps -1
+ .nf
+-.if t \{\
+-.sp -1
+-.\}
+-.BB lightgray adjust-for-leading-newline
+-.sp -1
+-
+ %guest_u:exclusive
+ %staff_u:ignore
+ %user_u:ignore
+
+-.EB lightgray adjust-for-leading-newline
+-.if t \{\
+-.sp 1
+-.\}
+ .fi
+-.fam
+-.ps +1
+ .if n \{\
+ .RE
+ .\}
+Index: pam.deb/modules/pam_tty_audit/pam_tty_audit.8
+===================================================================
+--- pam.deb.orig/modules/pam_tty_audit/pam_tty_audit.8
++++ pam.deb/modules/pam_tty_audit/pam_tty_audit.8
+@@ -1,161 +1,22 @@
++'\" t
+ .\" Title: pam_tty_audit
+ .\" Author: [see the "AUTHOR" section]
+-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
+-.\" Date: 10/27/2010
++.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
++.\" Date: 06/04/2011
+ .\" Manual: Linux-PAM Manual
+ .\" Source: Linux-PAM Manual
+ .\" Language: English
+ .\"
+-.TH "PAM_TTY_AUDIT" "8" "10/27/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
++.TH "PAM_TTY_AUDIT" "8" "06/04/2011" "Linux-PAM Manual" "Linux\-PAM Manual"
+ .\" -----------------------------------------------------------------
+-.\" * (re)Define some macros
++.\" * Define some portability stuff
+ .\" -----------------------------------------------------------------
+ .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-.\" toupper - uppercase a string (locale-aware)
++.\" http://bugs.debian.org/507673
++.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+ .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-.de toupper
+-.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ
+-\\$*
+-.tr aabbccddeeffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz
+-..
+-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-.\" SH-xref - format a cross-reference to an SH section
+-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-.de SH-xref
+-.ie n \{\
+-.\}
+-.toupper \\$*
+-.el \{\
+-\\$*
+-.\}
+-..
+-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-.\" SH - level-one heading that works better for non-TTY output
+-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-.de1 SH
+-.\" put an extra blank line of space above the head in non-TTY output
+-.if t \{\
+-.sp 1
+-.\}
+-.sp \\n[PD]u
+-.nr an-level 1
+-.set-an-margin
+-.nr an-prevailing-indent \\n[IN]
+-.fi
+-.in \\n[an-margin]u
+-.ti 0
+-.HTML-TAG ".NH \\n[an-level]"
+-.it 1 an-trap
+-.nr an-no-space-flag 1
+-.nr an-break-flag 1
+-\." make the size of the head bigger
+-.ps +3
+-.ft B
+-.ne (2v + 1u)
+-.ie n \{\
+-.\" if n (TTY output), use uppercase
+-.toupper \\$*
+-.\}
+-.el \{\
+-.nr an-break-flag 0
+-.\" if not n (not TTY), use normal case (not uppercase)
+-\\$1
+-.in \\n[an-margin]u
+-.ti 0
+-.\" if not n (not TTY), put a border/line under subheading
+-.sp -.6
+-\l'\n(.lu'
+-.\}
+-..
+-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-.\" SS - level-two heading that works better for non-TTY output
+-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-.de1 SS
+-.sp \\n[PD]u
+-.nr an-level 1
+-.set-an-margin
+-.nr an-prevailing-indent \\n[IN]
+-.fi
+-.in \\n[IN]u
+-.ti \\n[SN]u
+-.it 1 an-trap
+-.nr an-no-space-flag 1
+-.nr an-break-flag 1
+-.ps \\n[PS-SS]u
+-\." make the size of the head bigger
+-.ps +2
+-.ft B
+-.ne (2v + 1u)
+-.if \\n[.$] \&\\$*
+-..
+-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-.\" BB/BE - put background/screen (filled box) around block of text
+-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-.de BB
+-.if t \{\
+-.sp -.5
+-.br
+-.in +2n
+-.ll -2n
+-.gcolor red
+-.di BX
+-.\}
+-..
+-.de EB
+-.if t \{\
+-.if "\\$2"adjust-for-leading-newline" \{\
+-.sp -1
+-.\}
+-.br
+-.di
+-.in
+-.ll
+-.gcolor
+-.nr BW \\n(.lu-\\n(.i
+-.nr BH \\n(dn+.5v
+-.ne \\n(BHu+.5v
+-.ie "\\$2"adjust-for-leading-newline" \{\
+-\M[\\$1]\h'1n'\v'+.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[]
+-.\}
+-.el \{\
+-\M[\\$1]\h'1n'\v'-.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[]
+-.\}
+-.in 0
+-.sp -.5v
+-.nf
+-.BX
+-.in
+-.sp .5v
+-.fi
+-.\}
+-..
+-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-.\" BM/EM - put colored marker in margin next to block of text
+-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-.de BM
+-.if t \{\
+-.br
+-.ll -2n
+-.gcolor red
+-.di BX
+-.\}
+-..
+-.de EM
+-.if t \{\
+-.br
+-.di
+-.ll
+-.gcolor
+-.nr BH \\n(dn
+-.ne \\n(BHu
+-\M[\\$1]\D'P -.75n 0 0 \\n(BHu -(\\n[.i]u - \\n(INu - .75n) 0 0 -\\n(BHu'\M[]
+-.in 0
+-.nf
+-.BX
+-.in
+-.fi
+-.\}
+-..
++.ie \n(.g .ds Aq \(aq
++.el .ds Aq '
+ .\" -----------------------------------------------------------------
+ .\" * set default formatting
+ .\" -----------------------------------------------------------------
+@@ -166,13 +27,11 @@
+ .\" -----------------------------------------------------------------
+ .\" * MAIN CONTENT STARTS HERE *
+ .\" -----------------------------------------------------------------
+-.SH "Name"
++.SH "NAME"
+ pam_tty_audit \- Enable or disable TTY auditing for specified users
+-.SH "Synopsis"
+-.fam C
++.SH "SYNOPSIS"
+ .HP \w'\fBpam_tty_audit\&.so\fR\ 'u
+ \fBpam_tty_audit\&.so\fR [disable=\fIpatterns\fR] [enable=\fIpatterns\fR]
+-.fam
+ .SH "DESCRIPTION"
+ .PP
+ The pam_tty_audit PAM module is used to enable or disable TTY auditing\&. By default, the kernel does not audit input on any TTY\&.
+@@ -196,7 +55,7 @@
+ .PP
+ \fBopen_only\fR
+ .RS 4
+-Set the TTY audit flag when opening the session, but do not restore it when closing the session\&. Using this option is necessary for some services that don\'t
++Set the TTY audit flag when opening the session, but do not restore it when closing the session\&. Using this option is necessary for some services that don\*(Aqt
+ \fBfork()\fR
+ to run the authenticated session, such as
+ \fBsudo\fR\&.
+@@ -232,24 +91,10 @@
+ .if n \{\
+ .RS 4
+ .\}
+-.fam C
+-.ps -1
+ .nf
+-.if t \{\
+-.sp -1
+-.\}
+-.BB lightgray adjust-for-leading-newline
+-.sp -1
+-
+ session required pam_tty_audit\&.so disable=* enable=root
+
+-.EB lightgray adjust-for-leading-newline
+-.if t \{\
+-.sp 1
+-.\}
+ .fi
+-.fam
+-.ps +1
+ .if n \{\
+ .RE
+ .\}