Hello community,
here is the log from the commit of package pam-modules
checked in at Wed Aug 23 20:49:32 CEST 2006.
--------
--- pam-modules/pam-modules.changes 2006-08-10 13:57:49.000000000 +0200
+++ pam-modules/pam-modules.changes 2006-08-22 23:34:56.000000000 +0200
@@ -1,0 +2,6 @@
+Tue Aug 22 23:33:55 CEST 2006 - kukuk@suse.de
+
+- Update pam_pwcheck and pam_unix2 (drop obsolete arguments, fix
+ stacking with other modules).
+
+-------------------------------------------------------------------
Old:
----
pam_pwcheck-3.8.diff
pam_pwcheck-3.8.tar.bz2
pam_unix2-1.34.tar.bz2
New:
----
pam_pwcheck-3.9.tar.bz2
pam_unix2-1.99.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ pam-modules.spec ++++++
--- /var/tmp/diff_new_pack.3WB90Z/_old 2006-08-23 20:49:23.000000000 +0200
+++ /var/tmp/diff_new_pack.3WB90Z/_new 2006-08-23 20:49:23.000000000 +0200
@@ -14,18 +14,12 @@
BuildRequires: cracklib-devel libxcrypt-devel pam-devel
License: GPL, BSD
Group: System/Libraries
-Requires: pam
-Provides: pam_devperm
-%ifarch sparc %ix86 axp ppc
-Provides: pam:/lib/security/pam_unix2.so
-%endif
-Obsoletes: pam_devperm
Autoreqprov: on
Version: 10.2
-Release: 1
+Release: 3
Summary: Additional PAM Modules
-Source0: ftp://ftp.suse.com/pub/people/kukuk/pam/pam_unix2/pam_unix2-1.34.tar.bz2
-Source1: ftp://ftp.suse.com/pub/people/kukuk/pam/pam_pwcheck/pam_pwcheck-3.8.tar.bz2
+Source0: pam_unix2-1.99.0.tar.bz2
+Source1: pam_pwcheck-3.9.tar.bz2
Source2: pam_homecheck-2.0.tar.bz2
Source3: pam_devperm-1.6.tar.bz2
Source5: pam_make-1.1.tar.bz2
@@ -34,9 +28,7 @@
Source22: pam_pwcheck.conf.sles
Source41: unix2_chkpwd.8
Source50: dlopen.sh
-#Patch0: pam_unix2-po.diff
-Patch1: pam_pwcheck-3.8.diff
-Patch3: pam_devperm-1.6.diff
+Patch: pam_devperm-1.6.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -52,25 +44,13 @@
%prep
%setup -q -c %{name} -b1 -b2 -b3 -b5
-#cd pam_unix2-*
-#%patch0
-cd pam_pwcheck-*
-%patch1
-cd ../pam_devperm-*
-%patch3
+cd pam_devperm-*
+%patch
%build
for i in * ; do
cd $i;
- OPT_FLAGS="$RPM_OPT_FLAGS"
- case $i in
- pam_unix2*)
- CFLAGS="$OPT_FLAGS -fno-strict-aliasing" ./configure --libdir=/%{_lib} --mandir=%{_mandir}
- ;;
- *)
- CFLAGS="$OPT_FLAGS" ./configure --libdir=/%{_lib} --mandir=%{_mandir}
- ;;
- esac
+ CFLAGS="$RPM_OPT_FLAGS" ./configure --libdir=/%{_lib} --mandir=%{_mandir}
make
cd ..
done
@@ -143,6 +123,9 @@
%attr(644,root,root) %doc %{_mandir}/man8/unix*_chkpwd.8.gz
%changelog -n pam-modules
+* Tue Aug 22 2006 - kukuk@suse.de
+- Update pam_pwcheck and pam_unix2 (drop obsolete arguments, fix
+ stacking with other modules).
* Thu Aug 10 2006 - mc@suse.de
- move pam_chroot, pam_mktemp, pam_passwdqc and pam_userpass
in own RPMs
++++++ pam_pwcheck-3.8.tar.bz2 -> pam_pwcheck-3.9.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pam_pwcheck-3.8/ChangeLog new/pam_pwcheck-3.9/ChangeLog
--- old/pam_pwcheck-3.8/ChangeLog 2006-04-11 16:19:04.000000000 +0200
+++ new/pam_pwcheck-3.9/ChangeLog 2006-08-22 23:07:24.000000000 +0200
@@ -1,3 +1,13 @@
+2006-08-22 Thorsten Kukuk
+
+ * release version 3.9
+
+ * src/pam_pwcheck.c (pam_sm_chauthtok): Don't check
+ password, following modules have to do that.
+
+ * src/opasswd.c (save_old_password): Don't warn if
+ we create files the first time.
+
2006-04-11 Thorsten Kukuk
* release version 3.8
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pam_pwcheck-3.8/Makefile.am new/pam_pwcheck-3.9/Makefile.am
--- old/pam_pwcheck-3.8/Makefile.am 2005-06-24 14:30:44.000000000 +0200
+++ new/pam_pwcheck-3.9/Makefile.am 2006-08-22 22:26:16.000000000 +0200
@@ -4,13 +4,15 @@
#
# Author: Thorsten Kukuk
#
-AUTOMAKE_OPTIONS = 1.5 gnits dist-bzip2
-MAINT_CHARSET = latin1
-#
-SUBDIRS = m4 etc src po doc
+AUTOMAKE_OPTIONS = 1.7 gnits dist-bzip2
+
+SUBDIRS = etc src po doc
CLEANFILES = *~
+M4_FILES = $(shell ls $(srcdir)/m4/*.m4)
+
+EXTRA_DIST = config.rpath $(M4_FILES)
+
ACLOCAL_AMFLAGS = -I m4
-EXTRA_DIST = config.rpath
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pam_pwcheck-3.8/Makefile.in new/pam_pwcheck-3.9/Makefile.in
--- old/pam_pwcheck-3.8/Makefile.in 2006-04-11 16:20:12.000000000 +0200
+++ new/pam_pwcheck-3.9/Makefile.in 2006-08-22 22:47:09.000000000 +0200
@@ -42,11 +42,12 @@
depcomp install-sh missing mkinstalldirs
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
- $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
- $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
- $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
- $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/acinclude.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/c___attribute__.m4 \
+ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/iconv.m4 \
+ $(top_srcdir)/m4/japhar_grep_cflags.m4 \
+ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
+ $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
$(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -177,13 +178,12 @@
#
# Author: Thorsten Kukuk
#
-AUTOMAKE_OPTIONS = 1.5 gnits dist-bzip2
-MAINT_CHARSET = latin1
-#
-SUBDIRS = m4 etc src po doc
+AUTOMAKE_OPTIONS = 1.7 gnits dist-bzip2
+SUBDIRS = etc src po doc
CLEANFILES = *~
+M4_FILES = $(shell ls $(srcdir)/m4/*.m4)
+EXTRA_DIST = config.rpath $(M4_FILES)
ACLOCAL_AMFLAGS = -I m4
-EXTRA_DIST = config.rpath
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
@@ -381,7 +381,7 @@
esac
$(am__remove_distdir)
mkdir $(distdir)
- $(mkdir_p) $(distdir)/m4 $(distdir)/po
+ $(mkdir_p) $(distdir)/$(srcdir)/m4 $(distdir)/m4 $(distdir)/po
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pam_pwcheck-3.8/NEWS new/pam_pwcheck-3.9/NEWS
--- old/pam_pwcheck-3.8/NEWS 2006-04-11 16:19:26.000000000 +0200
+++ new/pam_pwcheck-3.9/NEWS 2006-08-22 22:47:05.000000000 +0200
@@ -6,6 +6,9 @@
Please send bug reports, questions and suggestions to .
+Version 3.9
+* Don't verify old password
+
Version 3.8
* Update translations for pt, fi, cs, pl
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pam_pwcheck-3.8/acinclude.m4 new/pam_pwcheck-3.9/acinclude.m4
--- old/pam_pwcheck-3.8/acinclude.m4 2005-11-24 17:32:18.000000000 +0100
+++ new/pam_pwcheck-3.9/acinclude.m4 1970-01-01 01:00:00.000000000 +0100
@@ -1,47 +0,0 @@
-dnl
-dnl JAPHAR_GREP_CFLAGS(flag, cmd_if_missing, cmd_if_present)
-dnl
-dnl From Japhar. Report changes to japhar@hungry.com
-dnl
-AC_DEFUN([JAPHAR_GREP_CFLAGS],
-[case "$CFLAGS" in
-"$1" | "$1 "* | *" $1" | *" $1 "* )
- ifelse($#, 3, [$3], [:])
- ;;
-*)
- $2
- ;;
-esac
-])
-
-dnl
-dnl Test for __attribute__ ((unused))
-dnl Based on code from the tcpdump version 3.7.2 source.
-dnl
-
-AC_DEFUN([AC_C___ATTRIBUTE__], [
-AC_MSG_CHECKING(for __attribute__)
-AC_CACHE_VAL(ac_cv___attribute__, [
-AC_TRY_COMPILE([
-#include
-static void foo (void) __attribute__ ((unused));
-
-static void
-foo (void)
-{
- exit(1);
-}
-],
-[
- exit (0);
-],
-ac_cv___attribute__=yes,
-ac_cv___attribute__=no)])
-if test "$ac_cv___attribute__" = "yes"; then
- AC_DEFINE(attribute_unused, __attribute__ ((unused)), [define if your compiler has __att
-ribute__ ((unused))])
-else
- AC_DEFINE(attribute_unused,,)
-fi
-AC_MSG_RESULT($ac_cv___attribute__)
-])
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pam_pwcheck-3.8/aclocal.m4 new/pam_pwcheck-3.9/aclocal.m4
--- old/pam_pwcheck-3.8/aclocal.m4 2006-04-11 16:20:07.000000000 +0200
+++ new/pam_pwcheck-3.9/aclocal.m4 2006-08-22 22:47:07.000000000 +0200
@@ -860,12 +860,13 @@
AC_SUBST([am__untar])
]) # _AM_PROG_TAR
+m4_include([m4/c___attribute__.m4])
m4_include([m4/gettext.m4])
m4_include([m4/iconv.m4])
+m4_include([m4/japhar_grep_cflags.m4])
m4_include([m4/lib-ld.m4])
m4_include([m4/lib-link.m4])
m4_include([m4/lib-prefix.m4])
m4_include([m4/nls.m4])
m4_include([m4/po.m4])
m4_include([m4/progtest.m4])
-m4_include([acinclude.m4])
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pam_pwcheck-3.8/config.h.in new/pam_pwcheck-3.9/config.h.in
--- old/pam_pwcheck-3.8/config.h.in 2006-04-11 16:20:19.000000000 +0200
+++ new/pam_pwcheck-3.9/config.h.in 2006-08-22 22:47:15.000000000 +0200
@@ -150,5 +150,5 @@
# undef _GNU_SOURCE
#endif
-/* define if your compiler has __att ribute__ ((unused)) */
+/* define if your compiler has __attribute__ ((unused)) */
#undef attribute_unused
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pam_pwcheck-3.8/configure new/pam_pwcheck-3.9/configure
--- old/pam_pwcheck-3.8/configure 2006-04-11 16:20:09.000000000 +0200
+++ new/pam_pwcheck-3.9/configure 2006-08-22 22:47:10.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for pam_pwcheck 3.8.
+# Generated by GNU Autoconf 2.59 for pam_pwcheck 3.9.
#
# Report bugs to .
#
@@ -269,8 +269,8 @@
# Identity of this package.
PACKAGE_NAME='pam_pwcheck'
PACKAGE_TARNAME='pam_pwcheck'
-PACKAGE_VERSION='3.8'
-PACKAGE_STRING='pam_pwcheck 3.8'
+PACKAGE_VERSION='3.9'
+PACKAGE_STRING='pam_pwcheck 3.9'
PACKAGE_BUGREPORT='kukuk@thkukuk.de'
ac_unique_file="src/pam_pwcheck.c"
@@ -781,7 +781,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures pam_pwcheck 3.8 to adapt to many kinds of systems.
+\`configure' configures pam_pwcheck 3.9 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -847,7 +847,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of pam_pwcheck 3.8:";;
+ short | recursive ) echo "Configuration of pam_pwcheck 3.9:";;
esac
cat <<\_ACEOF
@@ -976,7 +976,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-pam_pwcheck configure 3.8
+pam_pwcheck configure 3.9
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -990,7 +990,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by pam_pwcheck $as_me 3.8, which was
+It was created by pam_pwcheck $as_me 3.9, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1633,7 +1633,7 @@
# Define the identity of the package.
PACKAGE='pam_pwcheck'
- VERSION='3.8'
+ VERSION='3.9'
cat >>confdefs.h <<_ACEOF
@@ -7239,7 +7239,7 @@
- ac_config_files="$ac_config_files doc/Makefile etc/Makefile src/Makefile Makefile po/Makefile.in m4/Makefile"
+ ac_config_files="$ac_config_files doc/Makefile etc/Makefile src/Makefile Makefile po/Makefile.in"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
@@ -7616,7 +7616,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by pam_pwcheck $as_me 3.8, which was
+This file was extended by pam_pwcheck $as_me 3.9, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -7679,7 +7679,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-pam_pwcheck config.status 3.8
+pam_pwcheck config.status 3.9
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
@@ -7801,7 +7801,6 @@
"src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
"Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"po/Makefile.in" ) CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
- "m4/Makefile" ) CONFIG_FILES="$CONFIG_FILES m4/Makefile" ;;
"depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
"default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
"config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pam_pwcheck-3.8/configure.in new/pam_pwcheck-3.9/configure.in
--- old/pam_pwcheck-3.8/configure.in 2006-04-11 16:19:11.000000000 +0200
+++ new/pam_pwcheck-3.9/configure.in 2006-08-22 22:46:42.000000000 +0200
@@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
-AC_INIT(pam_pwcheck, 3.8, kukuk@thkukuk.de, pam_pwcheck)
+AC_INIT(pam_pwcheck, 3.9, kukuk@thkukuk.de, pam_pwcheck)
AM_INIT_AUTOMAKE
AC_CONFIG_SRCDIR([src/pam_pwcheck.c])
AM_CONFIG_HEADER(config.h)
@@ -102,5 +102,4 @@
AM_GNU_GETTEXT_VERSION(0.14.3)
AM_GNU_GETTEXT([external])
-AC_OUTPUT([doc/Makefile etc/Makefile src/Makefile Makefile po/Makefile.in \
- m4/Makefile ])
+AC_OUTPUT([doc/Makefile etc/Makefile src/Makefile Makefile po/Makefile.in])
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pam_pwcheck-3.8/doc/Makefile.am new/pam_pwcheck-3.9/doc/Makefile.am
--- old/pam_pwcheck-3.8/doc/Makefile.am 2002-12-21 14:52:56.000000000 +0100
+++ new/pam_pwcheck-3.9/doc/Makefile.am 2006-08-22 22:25:39.000000000 +0200
@@ -3,13 +3,10 @@
#
# Author: Thorsten Kukuk
#
-AUTOMAKE_OPTIONS = 1.5 gnits
-MAINT_CHARSET = latin1
-#
CLEANFILES = *~
-EXTRA_DIST = pam_pwcheck.sgml pam_pwcheck.8
+EXTRA_DIST = pam_pwcheck.8
man_MANS = pam_pwcheck.8
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pam_pwcheck-3.8/doc/Makefile.in new/pam_pwcheck-3.9/doc/Makefile.in
--- old/pam_pwcheck-3.8/doc/Makefile.in 2006-04-11 16:20:11.000000000 +0200
+++ new/pam_pwcheck-3.9/doc/Makefile.in 2006-08-22 22:47:09.000000000 +0200
@@ -13,6 +13,12 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
+
+#
+# Copyright (c) 2002 SuSE Linux AG, Nürnberg
+#
+# Author: Thorsten Kukuk
+#
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
@@ -38,11 +44,12 @@
subdir = doc
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
- $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
- $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
- $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
- $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/acinclude.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/c___attribute__.m4 \
+ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/iconv.m4 \
+ $(top_srcdir)/m4/japhar_grep_cflags.m4 \
+ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
+ $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
$(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -149,17 +156,8 @@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-
-#
-# Copyright (c) 2002 SuSE Linux AG, Nürnberg
-#
-# Author: Thorsten Kukuk
-#
-AUTOMAKE_OPTIONS = 1.5 gnits
-MAINT_CHARSET = latin1
-#
CLEANFILES = *~
-EXTRA_DIST = pam_pwcheck.sgml pam_pwcheck.8
+EXTRA_DIST = pam_pwcheck.8
man_MANS = pam_pwcheck.8
all: all-am
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pam_pwcheck-3.8/doc/pam_pwcheck.sgml new/pam_pwcheck-3.9/doc/pam_pwcheck.sgml
--- old/pam_pwcheck-3.8/doc/pam_pwcheck.sgml 2001-10-16 15:45:01.000000000 +0200
+++ new/pam_pwcheck-3.9/doc/pam_pwcheck.sgml 1970-01-01 01:00:00.000000000 +0100
@@ -1,127 +0,0 @@
-
-
-<sect1>The Password Check module
-
-<sect2>Synopsis
-
-<p>
-<descrip>
-
-<tag><bf>Module Name:</bf></tag>
-pam_pwcheck
-
-<tag><bf>Author:</bf></tag>
-Thorsten Kukuk <kukuk@suse.de>
-
-<tag><bf>Maintainer:</bf></tag>
-Author.
-
-<tag><bf>Management groups provided:</bf></tag>
-password
-
-<tag><bf>Cryptographically sensitive:</bf></tag>
-
-<tag><bf>Security rating:</bf></tag>
-
-<tag><bf>Clean code base:</bf></tag>
-
-<tag><bf>System dependencies:</bf></tag>
-Requires cracklib library
-
-
-<tag><bf>Network aware:</bf></tag>
-
-</descrip>
-
-<sect2>Overview of module
-
-<p>
-This is a module for checking passwords. It reads /etc/login.defs
-and makes the checks the standard Linux shadow suite also does.
-If configured, it also uses the cracklib library to check the
-password.
-
-<sect2>Password component
-
-<p>
-<descrip>
-
-<tag><bf>Recognized arguments:</bf></tag>
-
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pam_pwcheck-3.8/etc/Makefile.am new/pam_pwcheck-3.9/etc/Makefile.am
--- old/pam_pwcheck-3.8/etc/Makefile.am 2002-12-21 14:52:56.000000000 +0100
+++ new/pam_pwcheck-3.9/etc/Makefile.am 2006-08-22 22:25:46.000000000 +0200
@@ -3,9 +3,6 @@
#
# Author: Thorsten Kukuk
#
-AUTOMAKE_OPTIONS = 1.5 gnits
-MAINT_CHARSET = latin1
-#
CLEANFILES = *~
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pam_pwcheck-3.8/etc/Makefile.in new/pam_pwcheck-3.9/etc/Makefile.in
--- old/pam_pwcheck-3.8/etc/Makefile.in 2006-04-11 16:20:11.000000000 +0200
+++ new/pam_pwcheck-3.9/etc/Makefile.in 2006-08-22 22:47:09.000000000 +0200
@@ -14,6 +14,12 @@
@SET_MAKE@
+#
+# Copyright (c) 2002 SuSE GmbH, Nürnberg
+#
+# Author: Thorsten Kukuk
+#
+
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
@@ -39,11 +45,12 @@
subdir = etc
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
- $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
- $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
- $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
- $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/acinclude.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/c___attribute__.m4 \
+ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/iconv.m4 \
+ $(top_srcdir)/m4/japhar_grep_cflags.m4 \
+ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
+ $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
$(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -155,15 +162,6 @@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-
-#
-# Copyright (c) 2002 SuSE GmbH, Nürnberg
-#
-# Author: Thorsten Kukuk
-#
-AUTOMAKE_OPTIONS = 1.5 gnits
-MAINT_CHARSET = latin1
-#
CLEANFILES = *~
EXTRA_DIST = pam_pwcheck.conf
securitydir = $(sysconfdir)/security
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pam_pwcheck-3.8/m4/Makefile.am new/pam_pwcheck-3.9/m4/Makefile.am
--- old/pam_pwcheck-3.8/m4/Makefile.am 2005-08-30 08:36:48.000000000 +0200
+++ new/pam_pwcheck-3.9/m4/Makefile.am 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-EXTRA_DIST = codeset.m4 gettext.m4 glibc2.m4 glibc21.m4 iconv.m4 intdiv0.m4 intmax.m4 inttypes.m4 inttypes_h.m4 inttypes-pri.m4 isc-posix.m4 lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 longdouble.m4 longlong.m4 nls.m4 po.m4 printf-posix.m4 progtest.m4 signed.m4 size_max.m4 stdint_h.m4 uintmax_t.m4 ulonglong.m4 wchar_t.m4 wint_t.m4 xsize.m4
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pam_pwcheck-3.8/m4/Makefile.in new/pam_pwcheck-3.9/m4/Makefile.in
--- old/pam_pwcheck-3.8/m4/Makefile.in 2006-04-11 16:20:11.000000000 +0200
+++ new/pam_pwcheck-3.9/m4/Makefile.in 1970-01-01 01:00:00.000000000 +0100
@@ -1,301 +0,0 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = m4
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
- $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
- $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
- $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
- $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.in
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-SOURCES =
-DIST_SOURCES =
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-GMSGFMT = @GMSGFMT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBOBJS = @LIBOBJS@
-LIBPAM = @LIBPAM@
-LIBS = @LIBS@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-MSGFMT = @MSGFMT@
-MSGMERGE = @MSGMERGE@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-POSUB = @POSUB@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-EXTRA_DIST = codeset.m4 gettext.m4 glibc2.m4 glibc21.m4 iconv.m4 intdiv0.m4 intmax.m4 inttypes.m4 inttypes_h.m4 inttypes-pri.m4 isc-posix.m4 lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 longdouble.m4 longlong.m4 nls.m4 po.m4 printf-posix.m4 progtest.m4 signed.m4 size_max.m4 stdint_h.m4 uintmax_t.m4 ulonglong.m4 wchar_t.m4 wint_t.m4 xsize.m4
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
- && exit 0; \
- exit 1;; \
- esac; \
- done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu m4/Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu m4/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
- *config.status*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
- *) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
- esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-uninstall-info-am:
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-
-distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
- if test -d $$d/$$file; then \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
- else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
- || exit 1; \
- fi; \
- done
-check-am: all-am
-check: check-am
-all-am: Makefile
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
- @echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic mostlyclean-am
-
-distclean: distclean-am
- -rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-exec-am:
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
- -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-info-am
-
-.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-exec \
- install-exec-am install-info install-info-am install-man \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \
- uninstall-info-am
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pam_pwcheck-3.8/m4/c___attribute__.m4 new/pam_pwcheck-3.9/m4/c___attribute__.m4
--- old/pam_pwcheck-3.8/m4/c___attribute__.m4 1970-01-01 01:00:00.000000000 +0100
+++ new/pam_pwcheck-3.9/m4/c___attribute__.m4 2006-08-22 22:40:05.000000000 +0200
@@ -0,0 +1,30 @@
+dnl
+dnl Test for __attribute__ ((unused))
+dnl Based on code from the tcpdump version 3.7.2 source.
+dnl
+
+AC_DEFUN([AC_C___ATTRIBUTE__], [
+AC_MSG_CHECKING(for __attribute__)
+AC_CACHE_VAL(ac_cv___attribute__, [
+AC_TRY_COMPILE([
+#include
+static void foo (void) __attribute__ ((unused));
+
+static void
+foo (void)
+{
+ exit(1);
+}
+],
+[
+ exit (0);
+],
+ac_cv___attribute__=yes,
+ac_cv___attribute__=no)])
+if test "$ac_cv___attribute__" = "yes"; then
+ AC_DEFINE(attribute_unused, __attribute__ ((unused)), [define if your compiler has __attribute__ ((unused))])
+else
+ AC_DEFINE(attribute_unused,,)
+fi
+AC_MSG_RESULT($ac_cv___attribute__)
+])
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pam_pwcheck-3.8/m4/japhar_grep_cflags.m4 new/pam_pwcheck-3.9/m4/japhar_grep_cflags.m4
--- old/pam_pwcheck-3.8/m4/japhar_grep_cflags.m4 1970-01-01 01:00:00.000000000 +0100
+++ new/pam_pwcheck-3.9/m4/japhar_grep_cflags.m4 2006-08-22 22:32:11.000000000 +0200
@@ -0,0 +1,16 @@
+dnl
+dnl JAPHAR_GREP_CFLAGS(flag, cmd_if_missing, cmd_if_present)
+dnl
+dnl From Japhar. Report changes to japhar@hungry.com
+dnl
+AC_DEFUN([JAPHAR_GREP_CFLAGS],
+[case "$CFLAGS" in
+"$1" | "$1 "* | *" $1" | *" $1 "* )
+ ifelse($#, 3, [$3], [:])
+ ;;
+*)
+ $2
+ ;;
+esac
+])
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pam_pwcheck-3.8/src/Makefile.am new/pam_pwcheck-3.9/src/Makefile.am
--- old/pam_pwcheck-3.8/src/Makefile.am 2005-08-30 09:20:19.000000000 +0200
+++ new/pam_pwcheck-3.9/src/Makefile.am 2006-08-22 22:26:02.000000000 +0200
@@ -4,10 +4,6 @@
#
# Author: Thorsten Kukuk
#
-AUTOMAKE_OPTIONS = 1.7 gnits
-MAINT_CHARSET = latin1
-#
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ -s -m 755
EXTRA_DIST = pam_pwcheck.map
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pam_pwcheck-3.8/src/Makefile.in new/pam_pwcheck-3.9/src/Makefile.in
--- old/pam_pwcheck-3.8/src/Makefile.in 2006-04-11 16:20:11.000000000 +0200
+++ new/pam_pwcheck-3.9/src/Makefile.in 2006-08-22 22:47:09.000000000 +0200
@@ -14,6 +14,13 @@
@SET_MAKE@
+#
+# Copyright (c) 2003 SuSE Linux AG
+# Copyright (c) 2001, 2002 SuSE GmbH, Nürnberg
+#
+# Author: Thorsten Kukuk
+#
+
srcdir = @srcdir@
top_srcdir = @top_srcdir@
@@ -42,11 +49,12 @@
DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
- $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
- $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
- $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
- $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/acinclude.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/c___attribute__.m4 \
+ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/iconv.m4 \
+ $(top_srcdir)/m4/japhar_grep_cflags.m4 \
+ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+ $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
+ $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
$(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -97,8 +105,7 @@
EXEEXT = @EXEEXT@
GMSGFMT = @GMSGFMT@
INSTALL_DATA = @INSTALL_DATA@
-#
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ -s -m 755
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INTLLIBS = @INTLLIBS@
@@ -168,15 +175,6 @@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-
-#
-# Copyright (c) 2003 SuSE Linux AG
-# Copyright (c) 2001, 2002 SuSE GmbH, Nürnberg
-#
-# Author: Thorsten Kukuk
-#
-AUTOMAKE_OPTIONS = 1.7 gnits
-MAINT_CHARSET = latin1
EXTRA_DIST = pam_pwcheck.map
pamdir = $(libdir)/security
AM_LDFLAGS = -Wl,--version-script=$(srcdir)/pam_pwcheck.map \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pam_pwcheck-3.8/src/get_options.c new/pam_pwcheck-3.9/src/get_options.c
--- old/pam_pwcheck-3.8/src/get_options.c 2006-01-11 18:03:09.000000000 +0100
+++ new/pam_pwcheck-3.9/src/get_options.c 2006-08-22 22:45:36.000000000 +0200
@@ -60,8 +60,6 @@
{
if (strcasecmp (argv, "nullok") == 0)
options->nullok = 1;
- else if (strcasecmp (argv, "not_set_pass") == 0)
- options->not_set_pass = 1;
else if (strcasecmp (argv, "use_first_pass") == 0)
options->use_first_pass = 1;
else if (strcasecmp (argv, "use_authtok") == 0)
@@ -90,8 +88,6 @@
if (options->remember > 400)
options->remember = 400;
}
- else if (strcasecmp (argv, "nopasswordverify") == 0)
- options->nopasswordverify = 1;
else if (strcasecmp (argv, "no_obscure_checks") == 0)
options->no_obscure_checks = 1;
else if (strncasecmp (argv, "maxlen=", 7) == 0)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pam_pwcheck-3.8/src/opasswd.c new/pam_pwcheck-3.9/src/opasswd.c
--- old/pam_pwcheck-3.8/src/opasswd.c 2006-01-13 13:28:48.000000000 +0100
+++ new/pam_pwcheck-3.9/src/opasswd.c 2006-08-22 23:02:33.000000000 +0200
@@ -579,7 +579,8 @@
}
unlink (OLD_PASSWORDS_FILE".old");
- if (link (OLD_PASSWORDS_FILE, OLD_PASSWORDS_FILE".old") != 0)
+ if (link (OLD_PASSWORDS_FILE, OLD_PASSWORDS_FILE".old") != 0 &&
+ errno != ENOENT)
__write_message (pamh, flags, PAM_ERROR_MSG,
_("Cannot create backup file of %s: %m"),
OLD_PASSWORDS_FILE);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pam_pwcheck-3.8/src/pam_pwcheck.c new/pam_pwcheck-3.9/src/pam_pwcheck.c
--- old/pam_pwcheck-3.8/src/pam_pwcheck.c 2006-01-12 18:06:36.000000000 +0100
+++ new/pam_pwcheck-3.9/src/pam_pwcheck.c 2006-08-22 22:58:38.000000000 +0200
@@ -212,7 +212,7 @@
char *oldmono, *newmono, *wrapped;
if (options->debug)
- pam_syslog (pamh, LOG_DEBUG, "pam_pwcheck: entered obscure_check");
+ pam_syslog (pamh, LOG_DEBUG, "entered obscure_check");
if (strcmp (oldpass, newpass) == 0)
{
@@ -254,7 +254,7 @@
const char *msg = NULL;
if (options->debug)
- pam_syslog (pamh, LOG_DEBUG, "pam_pwcheck: entered password_check");
+ pam_syslog (pamh, LOG_DEBUG, "entered password_check");
if (strlen (newpass) < options->minlen)
msg = _("Bad password: too short");
@@ -293,7 +293,7 @@
options->cracklib_path);
if (options->debug)
- pam_syslog (pamh, LOG_DEBUG, "pam_pwcheck: run cracklib");
+ pam_syslog (pamh, LOG_DEBUG, "run cracklib");
if (cp)
{
@@ -310,7 +310,7 @@
{
if (options->debug)
pam_syslog (pamh, LOG_DEBUG,
- "pam_pwcheck: look in old password file");
+ "look in old password file");
if (check_old_password (pamh, flags, user, newpass) != PAM_SUCCESS)
msg = _("Password has been used already. Choose another.");
@@ -359,7 +359,7 @@
}
if (options.debug)
- pam_syslog (pamh, LOG_DEBUG, "pam_pwcheck: pam_sm_chauthtok entered");
+ pam_syslog (pamh, LOG_DEBUG, "pam_sm_chauthtok entered");
retval = pam_get_item (pamh, PAM_USER, (const void **) &user_void);
user = (char *) user_void;
@@ -370,7 +370,7 @@
{
if (options.debug)
pam_syslog (pamh, LOG_DEBUG,
- "pam_pwcheck: User is not known to system");
+ "User is not known to system");
/* The app is supposed to get us the username! */
return PAM_USER_UNKNOWN;
@@ -380,7 +380,7 @@
{
if (options.debug)
pam_syslog (pamh, LOG_DEBUG,
- "pam_pwcheck: pam_sm_chauthtok(PAM_PRELIM_CHECK)");
+ "pam_sm_chauthtok(PAM_PRELIM_CHECK)");
if (options.use_cracklib && options.cracklib_path)
{
@@ -400,7 +400,7 @@
__write_message (pamh, flags, PAM_ERROR_MSG,
_("Dictionary path %s is invalid"), dictpath);
pam_syslog (pamh, LOG_ERR,
- "pam_pwcheck: dict path '%s' is invalid",
+ "dict path '%s' is invalid",
dictpath);
return PAM_ABORT;
}
@@ -417,7 +417,7 @@
{
if (options.debug)
pam_syslog (pamh, LOG_DEBUG,
- "pam_pwcheck: user not found in passwd database.");
+ "user not found in passwd database.");
return PAM_USER_UNKNOWN;
}
@@ -432,7 +432,7 @@
{
if (options.debug)
pam_syslog (pamh, LOG_DEBUG,
- "pam_pwcheck: too early to change password.");
+ "too early to change password.");
free_user_t (data);
return PAM_AUTHTOK_ERR;
@@ -441,7 +441,7 @@
{
if (options.debug)
pam_syslog (pamh, LOG_DEBUG,
- "pam_pwcheck: account is already expired.");
+ "account is already expired.");
free_user_t (data);
return PAM_ACCT_EXPIRED; /* If their account has expired, we
@@ -515,7 +515,7 @@
{
if (options.debug)
pam_syslog (pamh, LOG_DEBUG,
- "pam_pwcheck: we can only change expiring accounts.");
+ "we can only change expiring accounts.");
free_user_t (data);
return PAM_SUCCESS;
@@ -527,85 +527,19 @@
{
if (options.debug)
pam_syslog (pamh, LOG_DEBUG,
- "pam_pwcheck: cannot get old auth token.");
+ "cannot get old auth token.");
return retval;
}
else if (options.debug)
{
if (oldpass)
- pam_syslog (pamh, LOG_DEBUG, "pam_pwcheck: get old auth token");
+ pam_syslog (pamh, LOG_DEBUG, "get old auth token");
else
- pam_syslog (pamh, LOG_DEBUG, "pam_pwcheck: old auth token not set");
+ pam_syslog (pamh, LOG_DEBUG, "old auth token not set");
}
- /* If this is being run by root, we don't need to get the old password. */
- if (oldpass == NULL &&
- (getuid () || (flags & PAM_CHANGE_EXPIRED_AUTHTOK) ||
- (data->service != S_LOCAL &&
- !(data->service == S_YP && options.nisdir != NULL ))) &&
- !options.nopasswordverify)
- {
- char *tmp_oldpass;
-
- if (options.use_first_pass)
- {
- free_user_t (data);
- return PAM_AUTHTOK_RECOVER_ERR;
- }
-
- retval = __get_passwd (pamh, OLD_PASSWORD_PROMPT, &tmp_oldpass);
- if (retval != PAM_SUCCESS)
- {
- free_user_t (data);
- return retval;
- }
-
- if (tmp_oldpass == NULL)
- {
- free_user_t (data);
- return PAM_AUTH_ERR;
- }
-
- oldpass = strdupa (tmp_oldpass);
- free (tmp_oldpass);
-
- if ((data->oldpassword == NULL || strlen (data->oldpassword) == 0)
- && !options.nullok)
- {
- free_user_t (data);
- return PAM_AUTH_ERR;
- }
-
- if (strcmp (data->oldpassword, crypt (oldpass, data->oldpassword)) != 0)
- {
- if (options.debug)
- pam_syslog (pamh, LOG_DEBUG, "oldpass (%s, %s, %s) is wrong",
- oldpass, data->oldpassword,
- crypt (oldpass, data->oldpassword));
- free_user_t (data);
- return PAM_AUTH_ERR;
- }
-
- if (!options.not_set_pass)
- {
- retval = pam_set_item (pamh, PAM_OLDAUTHTOK, oldpass);
- if (retval != PAM_SUCCESS)
- return retval;
- }
- }
- else
- {
- if (options.debug)
- {
- if (options.nopasswordverify)
- pam_syslog (pamh, LOG_DEBUG,
- "pam_pwcheck: password verify disabled.");
- else
- pam_syslog (pamh, LOG_DEBUG,
- "pam_pwcheck: run as root, don't ask for password.");
- }
- oldpass = "";
- }
+ if (!oldpass)
+ oldpass = ""; /* We are root, we don't know the users password. */
/* If we haven't been given a password yet, prompt for one... */
trys = 0;
@@ -616,9 +550,9 @@
if (options.debug)
{
if (newpass)
- pam_syslog (pamh, LOG_DEBUG, "pam_pwcheck: got new auth token");
+ pam_syslog (pamh, LOG_DEBUG, "got new auth token");
else
- pam_syslog (pamh, LOG_DEBUG, "pam_pwcheck: new auth token not set");
+ pam_syslog (pamh, LOG_DEBUG, "new auth token not set");
}
if (options.use_authtok || newpass)
@@ -728,14 +662,13 @@
free_user_t (data);
if (options.debug)
pam_syslog (pamh, LOG_DEBUG,
- "pam_pwcheck: newpass == NULL, return PAM_MAXTRIES");
+ "newpass == NULL, return PAM_MAXTRIES");
return PAM_MAXTRIES; /* They didn't seem to enter the right
password for three tries - error */
}
}
- if (!options.not_set_pass)
- pam_set_item (pamh, PAM_AUTHTOK, (void *) newpass);
+ pam_set_item (pamh, PAM_AUTHTOK, (void *) newpass);
save_old_password (pamh, flags, user, newpass, options.remember);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pam_pwcheck-3.8/src/public.h new/pam_pwcheck-3.9/src/public.h
--- old/pam_pwcheck-3.8/src/public.h 2006-01-11 18:06:54.000000000 +0100
+++ new/pam_pwcheck-3.9/src/public.h 2006-08-22 22:45:45.000000000 +0200
@@ -49,7 +49,6 @@
int debug;
int maxlen;
size_t minlen;
- int not_set_pass;
int nullok;
int no_obscure_checks;
int use_authtok;
@@ -60,7 +59,6 @@
crypt_t use_crypt;
int remember;
int tries;
- int nopasswordverify;
char *nisdir;
};
typedef struct options_t options_t;
++++++ pam_unix2-1.34.tar.bz2 -> pam_unix2-1.99.0.tar.bz2 ++++++
++++ 11547 lines of diff (skipped)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org