[Pkg-cracklib-commits] [pkg-cracklib] 01/05: Imported Upstream version 2.9.2
Jan Dittberner
jandd at moszumanska.debian.org
Sun Oct 5 19:50:16 UTC 2014
This is an automated email from the git hooks/post-receive script.
jandd pushed a commit to branch newmaster
in repository pkg-cracklib.
commit c4af91a341ebb84c48e2722fbaa1e7d9e8244c62
Author: Jan Dittberner <jandd at debian.org>
Date: Sun Oct 5 19:50:22 2014 +0200
Imported Upstream version 2.9.2
---
Makefile.in | 7 +-
NEWS | 8 +-
aclocal.m4 | 12 -
config.guess | 346 +++++++------------
config.h.in | 7 +-
config.sub | 128 ++++---
configure | 774 +++----------------------------------------
configure.in => configure.ac | 21 +-
dicts/Makefile.am | 4 +-
dicts/Makefile.in | 43 ++-
doc/Makefile.am | 4 +-
doc/Makefile.in | 43 ++-
lib/Makefile.in | 7 +-
lib/fascist.c | 20 +-
lib/packer.h | 7 +-
lib/packlib.c | 113 +++----
lib/rules.c | 72 ++--
m4/Makefile.in | 7 +-
po/as.gmo | Bin 2566 -> 2602 bytes
po/as.po | 4 +-
po/bn_IN.gmo | Bin 3064 -> 3100 bytes
po/bn_IN.po | 4 +-
po/cracklib.pot | 6 +-
po/cs.gmo | Bin 1771 -> 1807 bytes
po/cs.po | 4 +-
po/da.gmo | Bin 1750 -> 1786 bytes
po/da.po | 4 +-
po/de.gmo | Bin 1907 -> 1943 bytes
po/de.po | 4 +-
po/el.gmo | Bin 2186 -> 2222 bytes
po/el.po | 4 +-
po/es.gmo | Bin 1827 -> 1863 bytes
po/es.po | 4 +-
po/fi.gmo | Bin 1728 -> 1764 bytes
po/fi.po | 4 +-
po/fr.gmo | Bin 1786 -> 1822 bytes
po/fr.po | 4 +-
po/gu.gmo | Bin 2608 -> 2644 bytes
po/gu.po | 4 +-
po/hi.gmo | Bin 2708 -> 2744 bytes
po/hi.po | 4 +-
po/hu.gmo | Bin 1807 -> 1843 bytes
po/hu.po | 4 +-
po/it.gmo | Bin 1857 -> 1893 bytes
po/it.po | 4 +-
po/ja.gmo | Bin 1948 -> 1984 bytes
po/ja.po | 4 +-
po/kn.gmo | Bin 2951 -> 2987 bytes
po/kn.po | 4 +-
po/ko.gmo | Bin 1976 -> 2012 bytes
po/ko.po | 4 +-
po/lt.gmo | Bin 1812 -> 1848 bytes
po/lt.po | 4 +-
po/ml.gmo | Bin 2903 -> 2939 bytes
po/ml.po | 4 +-
po/mr.gmo | Bin 2644 -> 2680 bytes
po/mr.po | 4 +-
po/nb.gmo | Bin 1707 -> 1743 bytes
po/nb.po | 4 +-
po/nl.gmo | Bin 1904 -> 1940 bytes
po/nl.po | 4 +-
po/or.gmo | Bin 2832 -> 2868 bytes
po/or.po | 4 +-
po/pa.gmo | Bin 2617 -> 2653 bytes
po/pa.po | 4 +-
po/pl.gmo | Bin 1715 -> 1751 bytes
po/pl.po | 4 +-
po/pt.gmo | Bin 1884 -> 1920 bytes
po/pt.po | 4 +-
po/pt_BR.gmo | Bin 1780 -> 1816 bytes
po/pt_BR.po | 4 +-
po/ru.gmo | Bin 2207 -> 2243 bytes
po/ru.po | 4 +-
po/sk.gmo | Bin 1792 -> 1828 bytes
po/sk.po | 4 +-
po/sl_SI.gmo | Bin 1902 -> 1938 bytes
po/sl_SI.po | 4 +-
po/ta.gmo | Bin 3096 -> 3132 bytes
po/ta.po | 4 +-
po/te.gmo | Bin 2894 -> 2930 bytes
po/te.po | 4 +-
po/tr.gmo | Bin 1992 -> 2028 bytes
po/tr.po | 4 +-
po/uk.gmo | Bin 2360 -> 2396 bytes
po/uk.po | 4 +-
po/zh_CN.gmo | Bin 1599 -> 1635 bytes
po/zh_CN.po | 4 +-
po/zh_TW.gmo | Bin 1700 -> 1736 bytes
po/zh_TW.po | 4 +-
python/Makefile.in | 7 +-
python/cracklib.py | 22 +-
python/setup.py.in | 5 +-
util/Makefile.am | 6 +-
util/Makefile.in | 73 ++--
util/packer.c | 6 +-
util/testlib.c | 4 +-
96 files changed, 545 insertions(+), 1347 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 93eb2d4..0ed69e0 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -65,7 +65,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
- $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.in
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
@@ -221,11 +221,6 @@ VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-XMKMF = @XMKMF@
-X_CFLAGS = @X_CFLAGS@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_LIBS = @X_LIBS@
-X_PRE_LIBS = @X_PRE_LIBS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/NEWS b/NEWS
index 851b01b..257dea0 100644
--- a/NEWS
+++ b/NEWS
@@ -1,9 +1,13 @@
+v2.9.2 support build of python support outside of source tree (Michał Górny)
+ fix bug in Python string distance calculation (Pascal Muetschard)
+ fix bug #16 / debian bug 724570 - broken optimization with packlib prevblock (Russ Allbery)
+v2.9.1 added updated config.sub/config.guess in autogen
v2.9.0 add new FascistCheckUser function from Enrico Scholz, bumped minor version for library
v2.8.22 error return instead of exit if dictionary can't be opened (Nalin Dahyabhai)
v2.8.21 export prototype for FascistLook (Nalin Dahyabhai)
v2.8.20 include python/test_cracklib.py in release tarball (Jan Dittberner)
rename python/_cracklibmodule.c to python/_cracklib.c to support Python 3.3 (Jan Dittberner)
- patch from Ivosh (iraisr) for uninitialized buffer issue with small dictionaries.
+ patch from Ivosh (iraisr) for uninitialized buffer issue with small dictionaries.
v2.8.19 drop autogenerated files from SVN (Mike Frysinger)
add words from "The Top 500 Worst Passwords of All Time" <http://www.whatsmypass.com/the-top-500-worst-passwords-of-all-time> to dicts/cracklib-small (patch by Fabian Greffrath)
include sys/stat.h in python/_cracklibmodule.c (Mike Frysinger)
@@ -18,7 +22,7 @@ v2.8.17 fixed compilation on interix systems
fix segmentation fault in Python extension (Peter Palfrader)
add -Wall to AM_CFLAGS to discover possible programming errors (Jan Dittberner)
updated Wei Liu (zh_CN) translation (Leah Liu)
- fixed NLS support in python module compilation (Mike Frysinger)
+ fixed NLS support in python module compilation (Mike Frysinger)
v2.8.16 update licensing information in Python extension (Jan Dittberner)
make translations work in Python extension (Jan Dittberner)
fix Python extension compilation warning (Jan Dittberner)
diff --git a/aclocal.m4 b/aclocal.m4
index be7bb78..30001b5 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -416,18 +416,6 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
[AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
])
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 8
-
-# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS.
-AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
-
# Do all the work for Automake. -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
diff --git a/config.guess b/config.guess
index d622a44..1f5c50c 100755
--- a/config.guess
+++ b/config.guess
@@ -1,14 +1,12 @@
#! /bin/sh
# Attempt to guess a canonical system name.
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-# 2011, 2012 Free Software Foundation, Inc.
+# Copyright 1992-2014 Free Software Foundation, Inc.
-timestamp='2012-02-10'
+timestamp='2014-03-23'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful, but
@@ -22,19 +20,17 @@ timestamp='2012-02-10'
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-
-# Originally written by Per Bothner. Please send patches (context
-# diff format) to <config-patches at gnu.org> and include a ChangeLog
-# entry.
+# the same distribution terms that you use for the rest of that
+# program. This Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 ("GPLv3").
#
-# This script attempts to guess a canonical system name similar to
-# config.sub. If it succeeds, it prints the system name on stdout, and
-# exits with 0. Otherwise, it exits with 1.
+# Originally written by Per Bothner.
#
# You can get the latest version of this script from:
# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+#
+# Please send patches with a ChangeLog entry to config-patches at gnu.org.
+
me=`echo "$0" | sed -e 's,.*/,,'`
@@ -54,9 +50,7 @@ version="\
GNU config.guess ($timestamp)
Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
-Free Software Foundation, Inc.
+Copyright 1992-2014 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -138,6 +132,27 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+case "${UNAME_SYSTEM}" in
+Linux|GNU|GNU/*)
+ # If the system lacks a compiler, then just pick glibc.
+ # We could probably try harder.
+ LIBC=gnu
+
+ eval $set_cc_for_build
+ cat <<-EOF > $dummy.c
+ #include <features.h>
+ #if defined(__UCLIBC__)
+ LIBC=uclibc
+ #elif defined(__dietlibc__)
+ LIBC=dietlibc
+ #else
+ LIBC=gnu
+ #endif
+ EOF
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
+ ;;
+esac
+
# Note: order is significant - the case branches are not exclusive.
case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
@@ -200,6 +215,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
echo "${machine}-${os}${release}"
exit ;;
+ *:Bitrig:*:*)
+ UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
+ echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
+ exit ;;
*:OpenBSD:*:*)
UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
@@ -302,7 +321,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
echo arm-acorn-riscix${UNAME_RELEASE}
exit ;;
- arm:riscos:*:*|arm:RISCOS:*:*)
+ arm*:riscos:*:*|arm*:RISCOS:*:*)
echo arm-unknown-riscos
exit ;;
SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
@@ -801,10 +820,13 @@ EOF
i*:CYGWIN*:*)
echo ${UNAME_MACHINE}-pc-cygwin
exit ;;
+ *:MINGW64*:*)
+ echo ${UNAME_MACHINE}-pc-mingw64
+ exit ;;
*:MINGW*:*)
echo ${UNAME_MACHINE}-pc-mingw32
exit ;;
- i*:MSYS*:*)
+ *:MSYS*:*)
echo ${UNAME_MACHINE}-pc-msys
exit ;;
i*:windows32*:*)
@@ -852,21 +874,21 @@ EOF
exit ;;
*:GNU:*:*)
# the GNU system
- echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+ echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
exit ;;
*:GNU/*:*:*)
# other systems with GNU libc and userland
- echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
+ echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
exit ;;
i*86:Minix:*:*)
echo ${UNAME_MACHINE}-pc-minix
exit ;;
aarch64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
aarch64_be:Linux:*:*)
UNAME_MACHINE=aarch64_be
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
alpha:Linux:*:*)
case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
@@ -879,59 +901,54 @@ EOF
EV68*) UNAME_MACHINE=alphaev68 ;;
esac
objdump --private-headers /bin/sh | grep -q ld.so.1
- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+ if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
+ arc:Linux:*:* | arceb:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
arm*:Linux:*:*)
eval $set_cc_for_build
if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
| grep -q __ARM_EABI__
then
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
else
if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
| grep -q __ARM_PCS_VFP
then
- echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
else
- echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
fi
fi
exit ;;
avr32*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
cris:Linux:*:*)
- echo ${UNAME_MACHINE}-axis-linux-gnu
+ echo ${UNAME_MACHINE}-axis-linux-${LIBC}
exit ;;
crisv32:Linux:*:*)
- echo ${UNAME_MACHINE}-axis-linux-gnu
+ echo ${UNAME_MACHINE}-axis-linux-${LIBC}
exit ;;
frv:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
hexagon:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
i*86:Linux:*:*)
- LIBC=gnu
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
- #ifdef __dietlibc__
- LIBC=dietlibc
- #endif
-EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
- echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+ echo ${UNAME_MACHINE}-pc-linux-${LIBC}
exit ;;
ia64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
m32r*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
m68*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
mips:Linux:*:* | mips64:Linux:*:*)
eval $set_cc_for_build
@@ -950,54 +967,63 @@ EOF
#endif
EOF
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
;;
- or32:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ openrisc*:Linux:*:*)
+ echo or1k-unknown-linux-${LIBC}
+ exit ;;
+ or32:Linux:*:* | or1k*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
padre:Linux:*:*)
- echo sparc-unknown-linux-gnu
+ echo sparc-unknown-linux-${LIBC}
exit ;;
parisc64:Linux:*:* | hppa64:Linux:*:*)
- echo hppa64-unknown-linux-gnu
+ echo hppa64-unknown-linux-${LIBC}
exit ;;
parisc:Linux:*:* | hppa:Linux:*:*)
# Look for CPU level
case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
- PA7*) echo hppa1.1-unknown-linux-gnu ;;
- PA8*) echo hppa2.0-unknown-linux-gnu ;;
- *) echo hppa-unknown-linux-gnu ;;
+ PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
+ PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
+ *) echo hppa-unknown-linux-${LIBC} ;;
esac
exit ;;
ppc64:Linux:*:*)
- echo powerpc64-unknown-linux-gnu
+ echo powerpc64-unknown-linux-${LIBC}
exit ;;
ppc:Linux:*:*)
- echo powerpc-unknown-linux-gnu
+ echo powerpc-unknown-linux-${LIBC}
+ exit ;;
+ ppc64le:Linux:*:*)
+ echo powerpc64le-unknown-linux-${LIBC}
+ exit ;;
+ ppcle:Linux:*:*)
+ echo powerpcle-unknown-linux-${LIBC}
exit ;;
s390:Linux:*:* | s390x:Linux:*:*)
- echo ${UNAME_MACHINE}-ibm-linux
+ echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
exit ;;
sh64*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
sh*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
sparc:Linux:*:* | sparc64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
tile*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
vax:Linux:*:*)
- echo ${UNAME_MACHINE}-dec-linux-gnu
+ echo ${UNAME_MACHINE}-dec-linux-${LIBC}
exit ;;
x86_64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
xtensa*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
i*86:DYNIX/ptx:4*:*)
# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
@@ -1201,6 +1227,9 @@ EOF
BePC:Haiku:*:*) # Haiku running on Intel PC compatible.
echo i586-pc-haiku
exit ;;
+ x86_64:Haiku:*:*)
+ echo x86_64-unknown-haiku
+ exit ;;
SX-4:SUPER-UX:*:*)
echo sx4-nec-superux${UNAME_RELEASE}
exit ;;
@@ -1227,19 +1256,31 @@ EOF
exit ;;
*:Darwin:*:*)
UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
- case $UNAME_PROCESSOR in
- i386)
- eval $set_cc_for_build
- if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
- if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
- (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
- grep IS_64BIT_ARCH >/dev/null
- then
- UNAME_PROCESSOR="x86_64"
- fi
- fi ;;
- unknown) UNAME_PROCESSOR=powerpc ;;
- esac
+ eval $set_cc_for_build
+ if test "$UNAME_PROCESSOR" = unknown ; then
+ UNAME_PROCESSOR=powerpc
+ fi
+ if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+ grep IS_64BIT_ARCH >/dev/null
+ then
+ case $UNAME_PROCESSOR in
+ i386) UNAME_PROCESSOR=x86_64 ;;
+ powerpc) UNAME_PROCESSOR=powerpc64 ;;
+ esac
+ fi
+ fi
+ elif test "$UNAME_PROCESSOR" = i386 ; then
+ # Avoid executing cc on OS X 10.9, as it ships with a stub
+ # that puts up a graphical alert prompting to install
+ # developer tools. Any system running Mac OS X 10.7 or
+ # later (Darwin 11 and later) is required to have a 64-bit
+ # processor. This is not true of the ARM version of Darwin
+ # that Apple uses in portable devices.
+ UNAME_PROCESSOR=x86_64
+ fi
echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
exit ;;
*:procnto*:*:* | *:QNX:[0123456789]*:*)
@@ -1256,7 +1297,7 @@ EOF
NEO-?:NONSTOP_KERNEL:*:*)
echo neo-tandem-nsk${UNAME_RELEASE}
exit ;;
- NSE-?:NONSTOP_KERNEL:*:*)
+ NSE-*:NONSTOP_KERNEL:*:*)
echo nse-tandem-nsk${UNAME_RELEASE}
exit ;;
NSR-?:NONSTOP_KERNEL:*:*)
@@ -1330,157 +1371,6 @@ EOF
exit ;;
esac
-#echo '(No uname command or uname output not recognized.)' 1>&2
-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
-
-eval $set_cc_for_build
-cat >$dummy.c <<EOF
-#ifdef _SEQUENT_
-# include <sys/types.h>
-# include <sys/utsname.h>
-#endif
-main ()
-{
-#if defined (sony)
-#if defined (MIPSEB)
- /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed,
- I don't know.... */
- printf ("mips-sony-bsd\n"); exit (0);
-#else
-#include <sys/param.h>
- printf ("m68k-sony-newsos%s\n",
-#ifdef NEWSOS4
- "4"
-#else
- ""
-#endif
- ); exit (0);
-#endif
-#endif
-
-#if defined (__arm) && defined (__acorn) && defined (__unix)
- printf ("arm-acorn-riscix\n"); exit (0);
-#endif
-
-#if defined (hp300) && !defined (hpux)
- printf ("m68k-hp-bsd\n"); exit (0);
-#endif
-
-#if defined (NeXT)
-#if !defined (__ARCHITECTURE__)
-#define __ARCHITECTURE__ "m68k"
-#endif
- int version;
- version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
- if (version < 4)
- printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
- else
- printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
- exit (0);
-#endif
-
-#if defined (MULTIMAX) || defined (n16)
-#if defined (UMAXV)
- printf ("ns32k-encore-sysv\n"); exit (0);
-#else
-#if defined (CMU)
- printf ("ns32k-encore-mach\n"); exit (0);
-#else
- printf ("ns32k-encore-bsd\n"); exit (0);
-#endif
-#endif
-#endif
-
-#if defined (__386BSD__)
- printf ("i386-pc-bsd\n"); exit (0);
-#endif
-
-#if defined (sequent)
-#if defined (i386)
- printf ("i386-sequent-dynix\n"); exit (0);
-#endif
-#if defined (ns32000)
- printf ("ns32k-sequent-dynix\n"); exit (0);
-#endif
-#endif
-
-#if defined (_SEQUENT_)
- struct utsname un;
-
- uname(&un);
-
- if (strncmp(un.version, "V2", 2) == 0) {
- printf ("i386-sequent-ptx2\n"); exit (0);
- }
- if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
- printf ("i386-sequent-ptx1\n"); exit (0);
- }
- printf ("i386-sequent-ptx\n"); exit (0);
-
-#endif
-
-#if defined (vax)
-# if !defined (ultrix)
-# include <sys/param.h>
-# if defined (BSD)
-# if BSD == 43
- printf ("vax-dec-bsd4.3\n"); exit (0);
-# else
-# if BSD == 199006
- printf ("vax-dec-bsd4.3reno\n"); exit (0);
-# else
- printf ("vax-dec-bsd\n"); exit (0);
-# endif
-# endif
-# else
- printf ("vax-dec-bsd\n"); exit (0);
-# endif
-# else
- printf ("vax-dec-ultrix\n"); exit (0);
-# endif
-#endif
-
-#if defined (alliant) && defined (i860)
- printf ("i860-alliant-bsd\n"); exit (0);
-#endif
-
- exit (1);
-}
-EOF
-
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
- { echo "$SYSTEM_NAME"; exit; }
-
-# Apollos put the system type in the environment.
-
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
-
-# Convex versions that predate uname can use getsysinfo(1)
-
-if [ -x /usr/convex/getsysinfo ]
-then
- case `getsysinfo -f cpu_type` in
- c1*)
- echo c1-convex-bsd
- exit ;;
- c2*)
- if getsysinfo -f scalar_acc
- then echo c32-convex-bsd
- else echo c2-convex-bsd
- fi
- exit ;;
- c34*)
- echo c34-convex-bsd
- exit ;;
- c38*)
- echo c38-convex-bsd
- exit ;;
- c4*)
- echo c4-convex-bsd
- exit ;;
- esac
-fi
-
cat >&2 <<EOF
$0: unable to guess system type
diff --git a/config.h.in b/config.h.in
index 9c2116e..d714cd3 100644
--- a/config.h.in
+++ b/config.h.in
@@ -1,4 +1,4 @@
-/* config.h.in. Generated from configure.in by autoheader. */
+/* config.h.in. Generated from configure.ac by autoheader. */
/* Define to 1 if translation of program messages to the user's native
language is requested. */
@@ -64,7 +64,7 @@
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
-/* Define to 1 if you have the <zlib.h> header file. */
+/* found zlib */
#undef HAVE_ZLIB_H
/* Define to the sub-directory in which libtool stores uninstalled libraries.
@@ -98,8 +98,5 @@
/* Version number of package */
#undef VERSION
-/* Define to 1 if the X Window System is missing or not being used. */
-#undef X_DISPLAY_MISSING
-
/* Define to empty if `const' does not conform to ANSI C. */
#undef const
diff --git a/config.sub b/config.sub
index c894da4..d4c8338 100755
--- a/config.sub
+++ b/config.sub
@@ -1,24 +1,18 @@
#! /bin/sh
# Configuration validation subroutine script.
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-# 2011, 2012 Free Software Foundation, Inc.
+# Copyright 1992-2014 Free Software Foundation, Inc.
-timestamp='2012-02-10'
+timestamp='2014-09-26'
-# This file is (in principle) common to ALL GNU software.
-# The presence of a machine in this file suggests that SOME GNU software
-# can handle that machine. It does not imply ALL GNU software can.
-#
-# This file is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, see <http://www.gnu.org/licenses/>.
@@ -26,11 +20,12 @@ timestamp='2012-02-10'
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
+# the same distribution terms that you use for the rest of that
+# program. This Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 ("GPLv3").
-# Please send patches to <config-patches at gnu.org>. Submit a context
-# diff and a properly formatted GNU ChangeLog entry.
+# Please send patches with a ChangeLog entry to config-patches at gnu.org.
#
# Configuration subroutine to validate and canonicalize a configuration type.
# Supply the specified configuration type as an argument.
@@ -73,9 +68,7 @@ Report bugs and patches to <config-patches at gnu.org>."
version="\
GNU config.sub ($timestamp)
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
-Free Software Foundation, Inc.
+Copyright 1992-2014 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -123,7 +116,7 @@ esac
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
case $maybe_os in
nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
- linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+ linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
knetbsd*-gnu* | netbsd*-gnu* | \
kopensolaris*-gnu* | \
storm-chaos* | os2-emx* | rtmk-nova*)
@@ -156,7 +149,7 @@ case $os in
-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
- -apple | -axis | -knuth | -cray | -microblaze)
+ -apple | -axis | -knuth | -cray | -microblaze*)
os=
basic_machine=$1
;;
@@ -225,6 +218,12 @@ case $os in
-isc*)
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
;;
+ -lynx*178)
+ os=-lynxos178
+ ;;
+ -lynx*5)
+ os=-lynxos5
+ ;;
-lynx*)
os=-lynxos
;;
@@ -253,10 +252,12 @@ case $basic_machine in
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
| am33_2.0 \
- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
- | be32 | be64 \
+ | arc | arceb \
+ | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
+ | avr | avr32 \
+ | be32 | be64 \
| bfin \
- | c4x | clipper \
+ | c4x | c8051 | clipper \
| d10v | d30v | dlx | dsp16xx \
| epiphany \
| fido | fr30 | frv \
@@ -264,10 +265,11 @@ case $basic_machine in
| hexagon \
| i370 | i860 | i960 | ia64 \
| ip2k | iq2000 \
+ | k1om \
| le32 | le64 \
| lm32 \
| m32c | m32r | m32rle | m68000 | m68k | m88k \
- | maxq | mb | microblaze | mcore | mep | metag \
+ | maxq | mb | microblaze | microblazeel | mcore | mep | metag \
| mips | mipsbe | mipseb | mipsel | mipsle \
| mips16 \
| mips64 | mips64el \
@@ -281,23 +283,26 @@ case $basic_machine in
| mips64vr5900 | mips64vr5900el \
| mipsisa32 | mipsisa32el \
| mipsisa32r2 | mipsisa32r2el \
+ | mipsisa32r6 | mipsisa32r6el \
| mipsisa64 | mipsisa64el \
| mipsisa64r2 | mipsisa64r2el \
+ | mipsisa64r6 | mipsisa64r6el \
| mipsisa64sb1 | mipsisa64sb1el \
| mipsisa64sr71k | mipsisa64sr71kel \
+ | mipsr5900 | mipsr5900el \
| mipstx39 | mipstx39el \
| mn10200 | mn10300 \
| moxie \
| mt \
| msp430 \
| nds32 | nds32le | nds32be \
- | nios | nios2 \
+ | nios | nios2 | nios2eb | nios2el \
| ns16k | ns32k \
- | open8 \
- | or32 \
+ | open8 | or1k | or1knd | or32 \
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle \
| pyramid \
+ | riscv32 | riscv64 \
| rl78 | rx \
| score \
| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
@@ -322,7 +327,10 @@ case $basic_machine in
c6x)
basic_machine=tic6x-unknown
;;
- m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
+ leon|leon[3-9])
+ basic_machine=sparc-$basic_machine
+ ;;
+ m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
basic_machine=$basic_machine-unknown
os=-none
;;
@@ -364,13 +372,13 @@ case $basic_machine in
| aarch64-* | aarch64_be-* \
| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
- | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
| avr-* | avr32-* \
| be32-* | be64-* \
| bfin-* | bs2000-* \
| c[123]* | c30-* | [cjt]90-* | c4x-* \
- | clipper-* | craynv-* | cydra-* \
+ | c8051-* | clipper-* | craynv-* | cydra-* \
| d10v-* | d30v-* | dlx-* \
| elxsi-* \
| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
@@ -379,11 +387,13 @@ case $basic_machine in
| hexagon-* \
| i*86-* | i860-* | i960-* | ia64-* \
| ip2k-* | iq2000-* \
+ | k1om-* \
| le32-* | le64-* \
| lm32-* \
| m32c-* | m32r-* | m32rle-* \
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
- | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
+ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
+ | microblaze-* | microblazeel-* \
| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
| mips16-* \
| mips64-* | mips64el-* \
@@ -397,18 +407,22 @@ case $basic_machine in
| mips64vr5900-* | mips64vr5900el-* \
| mipsisa32-* | mipsisa32el-* \
| mipsisa32r2-* | mipsisa32r2el-* \
+ | mipsisa32r6-* | mipsisa32r6el-* \
| mipsisa64-* | mipsisa64el-* \
| mipsisa64r2-* | mipsisa64r2el-* \
+ | mipsisa64r6-* | mipsisa64r6el-* \
| mipsisa64sb1-* | mipsisa64sb1el-* \
| mipsisa64sr71k-* | mipsisa64sr71kel-* \
+ | mipsr5900-* | mipsr5900el-* \
| mipstx39-* | mipstx39el-* \
| mmix-* \
| mt-* \
| msp430-* \
| nds32-* | nds32le-* | nds32be-* \
- | nios-* | nios2-* \
+ | nios-* | nios2-* | nios2eb-* | nios2el-* \
| none-* | np1-* | ns16k-* | ns32k-* \
| open8-* \
+ | or1k*-* \
| orion-* \
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
@@ -763,6 +777,9 @@ case $basic_machine in
basic_machine=m68k-isi
os=-sysv
;;
+ leon-*|leon[3-9]-*)
+ basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'`
+ ;;
m68knommu)
basic_machine=m68k-unknown
os=-linux
@@ -782,11 +799,15 @@ case $basic_machine in
basic_machine=ns32k-utek
os=-sysv
;;
- microblaze)
+ microblaze*)
basic_machine=microblaze-xilinx
;;
+ mingw64)
+ basic_machine=x86_64-pc
+ os=-mingw64
+ ;;
mingw32)
- basic_machine=i386-pc
+ basic_machine=i686-pc
os=-mingw32
;;
mingw32ce)
@@ -814,6 +835,10 @@ case $basic_machine in
basic_machine=powerpc-unknown
os=-morphos
;;
+ moxiebox)
+ basic_machine=moxie-unknown
+ os=-moxiebox
+ ;;
msdos)
basic_machine=i386-pc
os=-msdos
@@ -822,7 +847,7 @@ case $basic_machine in
basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
;;
msys)
- basic_machine=i386-pc
+ basic_machine=i686-pc
os=-msys
;;
mvs)
@@ -1013,7 +1038,11 @@ case $basic_machine in
basic_machine=i586-unknown
os=-pw32
;;
- rdos)
+ rdos | rdos64)
+ basic_machine=x86_64-pc
+ os=-rdos
+ ;;
+ rdos32)
basic_machine=i386-pc
os=-rdos
;;
@@ -1340,29 +1369,29 @@ case $os in
-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
| -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
| -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
- | -sym* | -kopensolaris* \
+ | -sym* | -kopensolaris* | -plan9* \
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
| -aos* | -aros* \
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
| -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
- | -openbsd* | -solidbsd* \
+ | -bitrig* | -openbsd* | -solidbsd* \
| -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
| -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
| -chorusos* | -chorusrdb* | -cegcc* \
| -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
- | -mingw32* | -linux-gnu* | -linux-android* \
- | -linux-newlib* | -linux-uclibc* \
- | -uxpv* | -beos* | -mpeix* | -udk* \
+ | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
+ | -linux-newlib* | -linux-musl* | -linux-uclibc* \
+ | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
| -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
- | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
@@ -1486,9 +1515,6 @@ case $os in
-aros*)
os=-aros
;;
- -kaos*)
- os=-kaos
- ;;
-zvmoe)
os=-zvmoe
;;
@@ -1537,6 +1563,12 @@ case $basic_machine in
c4x-* | tic4x-*)
os=-coff
;;
+ c8051-*)
+ os=-elf
+ ;;
+ hexagon-*)
+ os=-elf
+ ;;
tic54x-*)
os=-coff
;;
diff --git a/configure b/configure
index 82240cd..d6d97a6 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,8 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68.
+# Generated by GNU Autoconf 2.68 for cracklib 2.9.2.
+#
+# Report bugs to <cracklib-devel at lists.sourceforge.net>.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -244,7 +246,8 @@ fi
$as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
$as_echo "$0: be upgraded to zsh 4.3.4 or later."
else
- $as_echo "$0: Please tell bug-autoconf at gnu.org about your system,
+ $as_echo "$0: Please tell bug-autoconf at gnu.org and
+$0: cracklib-devel at lists.sourceforge.net about your system,
$0: including any error possibly output before this
$0: message. Then install a modern shell, or manually run
$0: the script under such a shell if you do have one."
@@ -565,14 +568,13 @@ MFLAGS=
MAKEFLAGS=
# Identity of this package.
-PACKAGE_NAME=
-PACKAGE_TARNAME=
-PACKAGE_VERSION=
-PACKAGE_STRING=
-PACKAGE_BUGREPORT=
-PACKAGE_URL=
-
-ac_unique_file="lib/crack.h"
+PACKAGE_NAME='cracklib'
+PACKAGE_TARNAME='cracklib'
+PACKAGE_VERSION='2.9.2'
+PACKAGE_STRING='cracklib 2.9.2'
+PACKAGE_BUGREPORT='cracklib-devel at lists.sourceforge.net'
+PACKAGE_URL=''
+
# Factoring default headers for most tests.
ac_includes_default="\
#include <stdio.h>
@@ -644,11 +646,6 @@ GMSGFMT
MSGFMT
GETTEXT_MACRO_VERSION
USE_NLS
-X_EXTRA_LIBS
-X_LIBS
-X_PRE_LIBS
-X_CFLAGS
-XMKMF
CPP
OTOOL64
OTOOL
@@ -768,7 +765,7 @@ enable_dependency_tracking
with_gnu_ld
with_sysroot
enable_libtool_lock
-with_x
+with_zlib
enable_nls
enable_rpath
with_libiconv_prefix
@@ -785,7 +782,6 @@ LDFLAGS
LIBS
CPPFLAGS
CPP
-XMKMF
PYTHON'
@@ -827,7 +823,7 @@ sharedstatedir='${prefix}/com'
localstatedir='${prefix}/var'
includedir='${prefix}/include'
oldincludedir='/usr/include'
-docdir='${datarootdir}/doc/${PACKAGE}'
+docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
infodir='${datarootdir}/info'
htmldir='${docdir}'
dvidir='${docdir}'
@@ -1329,7 +1325,7 @@ if test "$ac_init_help" = "long"; then
# 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 this package to adapt to many kinds of systems.
+\`configure' configures cracklib 2.9.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1377,7 +1373,7 @@ Fine tuning of the installation directories:
--infodir=DIR info documentation [DATAROOTDIR/info]
--localedir=DIR locale-dependent data [DATAROOTDIR/locale]
--mandir=DIR man documentation [DATAROOTDIR/man]
- --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE]
+ --docdir=DIR documentation root [DATAROOTDIR/doc/cracklib]
--htmldir=DIR html documentation [DOCDIR]
--dvidir=DIR dvi documentation [DOCDIR]
--pdfdir=DIR pdf documentation [DOCDIR]
@@ -1391,10 +1387,6 @@ Program names:
--program-suffix=SUFFIX append SUFFIX to installed program names
--program-transform-name=PROGRAM run sed PROGRAM on installed program names
-X features:
- --x-includes=DIR X include files are in DIR
- --x-libraries=DIR X library files are in DIR
-
System types:
--build=BUILD configure for building on BUILD [guessed]
--host=HOST cross-compile to build programs to run on HOST [BUILD]
@@ -1402,7 +1394,9 @@ _ACEOF
fi
if test -n "$ac_init_help"; then
-
+ case $ac_init_help in
+ short | recursive ) echo "Configuration of cracklib 2.9.2:";;
+ esac
cat <<\_ACEOF
Optional Features:
@@ -1427,7 +1421,7 @@ Optional Packages:
--with-gnu-ld assume the C compiler uses GNU ld [default=no]
--with-sysroot=DIR Search for dependent libraries within DIR
(or the compiler's sysroot if not specified).
- --with-x use the X Window System
+ --without-zlib build without zlib support [default=auto]
--with-gnu-ld assume the C compiler uses GNU ld default=no
--with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib
--without-libiconv-prefix don't search for libiconv in includedir and libdir
@@ -1445,13 +1439,12 @@ Some influential environment variables:
CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
you have headers in a nonstandard directory <include dir>
CPP C preprocessor
- XMKMF Path to xmkmf, Makefile generator for X Window System
PYTHON the Python interpreter
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
-Report bugs to the package provider.
+Report bugs to <cracklib-devel at lists.sourceforge.net>.
_ACEOF
ac_status=$?
fi
@@ -1514,7 +1507,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-configure
+cracklib configure 2.9.2
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1859,6 +1852,10 @@ $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+( $as_echo "## --------------------------------------------------- ##
+## Report this to cracklib-devel at lists.sourceforge.net ##
+## --------------------------------------------------- ##"
+ ) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
@@ -1879,7 +1876,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by $as_me, which was
+It was created by cracklib $as_me 2.9.2, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2694,8 +2691,8 @@ fi
# Define the identity of the package.
- PACKAGE=cracklib
- VERSION=2.9.0
+ PACKAGE='cracklib'
+ VERSION='2.9.2'
cat >>confdefs.h <<_ACEOF
@@ -12157,690 +12154,6 @@ $as_echo "no" >&6; }
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for X" >&5
-$as_echo_n "checking for X... " >&6; }
-
-
-# Check whether --with-x was given.
-if test "${with_x+set}" = set; then :
- withval=$with_x;
-fi
-
-# $have_x is `yes', `no', `disabled', or empty when we do not yet know.
-if test "x$with_x" = xno; then
- # The user explicitly disabled X.
- have_x=disabled
-else
- case $x_includes,$x_libraries in #(
- *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5;; #(
- *,NONE | NONE,*) if ${ac_cv_have_x+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- # One or both of the vars are not set, and there is no cached value.
-ac_x_includes=no ac_x_libraries=no
-rm -f -r conftest.dir
-if mkdir conftest.dir; then
- cd conftest.dir
- cat >Imakefile <<'_ACEOF'
-incroot:
- @echo incroot='${INCROOT}'
-usrlibdir:
- @echo usrlibdir='${USRLIBDIR}'
-libdir:
- @echo libdir='${LIBDIR}'
-_ACEOF
- if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then
- # GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
- for ac_var in incroot usrlibdir libdir; do
- eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`"
- done
- # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
- for ac_extension in a so sl dylib la dll; do
- if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" &&
- test -f "$ac_im_libdir/libX11.$ac_extension"; then
- ac_im_usrlibdir=$ac_im_libdir; break
- fi
- done
- # Screen out bogus values from the imake configuration. They are
- # bogus both because they are the default anyway, and because
- # using them would break gcc on systems where it needs fixed includes.
- case $ac_im_incroot in
- /usr/include) ac_x_includes= ;;
- *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
- esac
- case $ac_im_usrlibdir in
- /usr/lib | /usr/lib64 | /lib | /lib64) ;;
- *) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;;
- esac
- fi
- cd ..
- rm -f -r conftest.dir
-fi
-
-# Standard set of common directories for X headers.
-# Check X11 before X11Rn because it is often a symlink to the current release.
-ac_x_header_dirs='
-/usr/X11/include
-/usr/X11R7/include
-/usr/X11R6/include
-/usr/X11R5/include
-/usr/X11R4/include
-
-/usr/include/X11
-/usr/include/X11R7
-/usr/include/X11R6
-/usr/include/X11R5
-/usr/include/X11R4
-
-/usr/local/X11/include
-/usr/local/X11R7/include
-/usr/local/X11R6/include
-/usr/local/X11R5/include
-/usr/local/X11R4/include
-
-/usr/local/include/X11
-/usr/local/include/X11R7
-/usr/local/include/X11R6
-/usr/local/include/X11R5
-/usr/local/include/X11R4
-
-/usr/X386/include
-/usr/x386/include
-/usr/XFree86/include/X11
-
-/usr/include
-/usr/local/include
-/usr/unsupported/include
-/usr/athena/include
-/usr/local/x11r5/include
-/usr/lpp/Xamples/include
-
-/usr/openwin/include
-/usr/openwin/share/include'
-
-if test "$ac_x_includes" = no; then
- # Guess where to find include files, by looking for Xlib.h.
- # First, try using that file with no special directory specified.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <X11/Xlib.h>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
- # We can compile using X headers with no special include directory.
-ac_x_includes=
-else
- for ac_dir in $ac_x_header_dirs; do
- if test -r "$ac_dir/X11/Xlib.h"; then
- ac_x_includes=$ac_dir
- break
- fi
-done
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-fi # $ac_x_includes = no
-
-if test "$ac_x_libraries" = no; then
- # Check for the libraries.
- # See if we find them without any special options.
- # Don't add to $LIBS permanently.
- ac_save_LIBS=$LIBS
- LIBS="-lX11 $LIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <X11/Xlib.h>
-int
-main ()
-{
-XrmInitialize ()
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- LIBS=$ac_save_LIBS
-# We can link X programs with no special library path.
-ac_x_libraries=
-else
- LIBS=$ac_save_LIBS
-for ac_dir in `$as_echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
-do
- # Don't even attempt the hair of trying to link an X program!
- for ac_extension in a so sl dylib la dll; do
- if test -r "$ac_dir/libX11.$ac_extension"; then
- ac_x_libraries=$ac_dir
- break 2
- fi
- done
-done
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-fi # $ac_x_libraries = no
-
-case $ac_x_includes,$ac_x_libraries in #(
- no,* | *,no | *\'*)
- # Didn't find X, or a directory has "'" in its name.
- ac_cv_have_x="have_x=no";; #(
- *)
- # Record where we found X for the cache.
- ac_cv_have_x="have_x=yes\
- ac_x_includes='$ac_x_includes'\
- ac_x_libraries='$ac_x_libraries'"
-esac
-fi
-;; #(
- *) have_x=yes;;
- esac
- eval "$ac_cv_have_x"
-fi # $with_x != no
-
-if test "$have_x" != yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_x" >&5
-$as_echo "$have_x" >&6; }
- no_x=yes
-else
- # If each of the values was on the command line, it overrides each guess.
- test "x$x_includes" = xNONE && x_includes=$ac_x_includes
- test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries
- # Update the cache value to reflect the command line values.
- ac_cv_have_x="have_x=yes\
- ac_x_includes='$x_includes'\
- ac_x_libraries='$x_libraries'"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: libraries $x_libraries, headers $x_includes" >&5
-$as_echo "libraries $x_libraries, headers $x_includes" >&6; }
-fi
-
-if test "$no_x" = yes; then
- # Not all programs may use this symbol, but it does not hurt to define it.
-
-$as_echo "#define X_DISPLAY_MISSING 1" >>confdefs.h
-
- X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS=
-else
- if test -n "$x_includes"; then
- X_CFLAGS="$X_CFLAGS -I$x_includes"
- fi
-
- # It would also be nice to do this for all -L options, not just this one.
- if test -n "$x_libraries"; then
- X_LIBS="$X_LIBS -L$x_libraries"
- # For Solaris; some versions of Sun CC require a space after -R and
- # others require no space. Words are not sufficient . . . .
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -R must be followed by a space" >&5
-$as_echo_n "checking whether -R must be followed by a space... " >&6; }
- ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
- ac_xsave_c_werror_flag=$ac_c_werror_flag
- ac_c_werror_flag=yes
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- X_LIBS="$X_LIBS -R$x_libraries"
-else
- LIBS="$ac_xsave_LIBS -R $x_libraries"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
- X_LIBS="$X_LIBS -R $x_libraries"
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: neither works" >&5
-$as_echo "neither works" >&6; }
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- ac_c_werror_flag=$ac_xsave_c_werror_flag
- LIBS=$ac_xsave_LIBS
- fi
-
- # Check for system-dependent libraries X programs must link with.
- # Do this before checking for the system-independent R6 libraries
- # (-lICE), since we may need -lsocket or whatever for X linking.
-
- if test "$ISC" = yes; then
- X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet"
- else
- # Martyn Johnson says this is needed for Ultrix, if the X
- # libraries were built with DECnet support. And Karl Berry says
- # the Alpha needs dnet_stub (dnet does not exist).
- ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char XOpenDisplay ();
-int
-main ()
-{
-return XOpenDisplay ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet" >&5
-$as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; }
-if ${ac_cv_lib_dnet_dnet_ntoa+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldnet $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dnet_ntoa ();
-int
-main ()
-{
-return dnet_ntoa ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_dnet_dnet_ntoa=yes
-else
- ac_cv_lib_dnet_dnet_ntoa=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
-$as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; }
-if test "x$ac_cv_lib_dnet_dnet_ntoa" = xyes; then :
- X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
-fi
-
- if test $ac_cv_lib_dnet_dnet_ntoa = no; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet_stub" >&5
-$as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; }
-if ${ac_cv_lib_dnet_stub_dnet_ntoa+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldnet_stub $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dnet_ntoa ();
-int
-main ()
-{
-return dnet_ntoa ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_dnet_stub_dnet_ntoa=yes
-else
- ac_cv_lib_dnet_stub_dnet_ntoa=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
-$as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; }
-if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = xyes; then :
- X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
-fi
-
- fi
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- LIBS="$ac_xsave_LIBS"
-
- # msh at cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
- # to get the SysV transport functions.
- # Chad R. Larson says the Pyramis MIS-ES running DC/OSx (SVR4)
- # needs -lnsl.
- # The nsl library prevents programs from opening the X display
- # on Irix 5.2, according to T.E. Dickey.
- # The functions gethostbyname, getservbyname, and inet_addr are
- # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
- ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname"
-if test "x$ac_cv_func_gethostbyname" = xyes; then :
-
-fi
-
- if test $ac_cv_func_gethostbyname = no; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5
-$as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
-if ${ac_cv_lib_nsl_gethostbyname+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- 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.
- 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 gethostbyname ();
-int
-main ()
-{
-return gethostbyname ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_nsl_gethostbyname=yes
-else
- ac_cv_lib_nsl_gethostbyname=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5
-$as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
-if test "x$ac_cv_lib_nsl_gethostbyname" = xyes; then :
- X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
-fi
-
- if test $ac_cv_lib_nsl_gethostbyname = no; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lbsd" >&5
-$as_echo_n "checking for gethostbyname in -lbsd... " >&6; }
-if ${ac_cv_lib_bsd_gethostbyname+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lbsd $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char gethostbyname ();
-int
-main ()
-{
-return gethostbyname ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_bsd_gethostbyname=yes
-else
- ac_cv_lib_bsd_gethostbyname=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_gethostbyname" >&5
-$as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; }
-if test "x$ac_cv_lib_bsd_gethostbyname" = xyes; then :
- X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
-fi
-
- fi
- fi
-
- # lieder at skyler.mavd.honeywell.com says without -lsocket,
- # socket/setsockopt and other routines are undefined under SCO ODT
- # 2.0. But -lsocket is broken on IRIX 5.2 (and is not necessary
- # on later versions), says Simon Leinen: it contains gethostby*
- # variants that don't use the name server (or something). -lsocket
- # must be given before -lnsl if both are needed. We assume that
- # if connect needs -lnsl, so does gethostbyname.
- ac_fn_c_check_func "$LINENO" "connect" "ac_cv_func_connect"
-if test "x$ac_cv_func_connect" = xyes; then :
-
-fi
-
- if test $ac_cv_func_connect = no; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5
-$as_echo_n "checking for connect in -lsocket... " >&6; }
-if ${ac_cv_lib_socket_connect+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char connect ();
-int
-main ()
-{
-return connect ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_socket_connect=yes
-else
- ac_cv_lib_socket_connect=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5
-$as_echo "$ac_cv_lib_socket_connect" >&6; }
-if test "x$ac_cv_lib_socket_connect" = xyes; then :
- X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
-fi
-
- fi
-
- # Guillermo Gomez says -lposix is necessary on A/UX.
- ac_fn_c_check_func "$LINENO" "remove" "ac_cv_func_remove"
-if test "x$ac_cv_func_remove" = xyes; then :
-
-fi
-
- if test $ac_cv_func_remove = no; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for remove in -lposix" >&5
-$as_echo_n "checking for remove in -lposix... " >&6; }
-if ${ac_cv_lib_posix_remove+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lposix $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char remove ();
-int
-main ()
-{
-return remove ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_posix_remove=yes
-else
- ac_cv_lib_posix_remove=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix_remove" >&5
-$as_echo "$ac_cv_lib_posix_remove" >&6; }
-if test "x$ac_cv_lib_posix_remove" = xyes; then :
- X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
-fi
-
- fi
-
- # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
- ac_fn_c_check_func "$LINENO" "shmat" "ac_cv_func_shmat"
-if test "x$ac_cv_func_shmat" = xyes; then :
-
-fi
-
- if test $ac_cv_func_shmat = no; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shmat in -lipc" >&5
-$as_echo_n "checking for shmat in -lipc... " >&6; }
-if ${ac_cv_lib_ipc_shmat+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lipc $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char shmat ();
-int
-main ()
-{
-return shmat ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_ipc_shmat=yes
-else
- ac_cv_lib_ipc_shmat=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ipc_shmat" >&5
-$as_echo "$ac_cv_lib_ipc_shmat" >&6; }
-if test "x$ac_cv_lib_ipc_shmat" = xyes; then :
- X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
-fi
-
- fi
- fi
-
- # Check for libraries that X11R6 Xt/Xaw programs need.
- ac_save_LDFLAGS=$LDFLAGS
- test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries"
- # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to
- # check for ICE first), but we must link in the order -lSM -lICE or
- # we get undefined symbols. So assume we have SM if we have ICE.
- # These have to be linked with before -lX11, unlike the other
- # libraries we check for below, so use a different variable.
- # John Interrante, Karl Berry
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IceConnectionNumber in -lICE" >&5
-$as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; }
-if ${ac_cv_lib_ICE_IceConnectionNumber+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lICE $X_EXTRA_LIBS $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char IceConnectionNumber ();
-int
-main ()
-{
-return IceConnectionNumber ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_ICE_IceConnectionNumber=yes
-else
- ac_cv_lib_ICE_IceConnectionNumber=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
-$as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; }
-if test "x$ac_cv_lib_ICE_IceConnectionNumber" = xyes; then :
- X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
-fi
-
- LDFLAGS=$ac_save_LDFLAGS
-
-fi
-
-
for ac_header in unistd.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "unistd.h" "ac_cv_header_unistd_h" "$ac_includes_default"
@@ -12901,7 +12214,16 @@ fi
done
-for ac_header in zlib.h
+
+
+# Check whether --with-zlib was given.
+if test "${with_zlib+set}" = set; then :
+ withval=$with_zlib;
+fi
+
+if test "$with_zlib" != "no"; then :
+ found_zlib=yes
+ for ac_header in zlib.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default"
if test "x$ac_cv_header_zlib_h" = xyes; then :
@@ -12911,12 +12233,13 @@ _ACEOF
$as_echo "#define HAVE_ZLIB_H /**/" >>confdefs.h
+else
+ found_zlib=no
fi
done
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing gzopen" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing gzopen" >&5
$as_echo_n "checking for library containing gzopen... " >&6; }
if ${ac_cv_search_gzopen+:} false; then :
$as_echo_n "(cached) " >&6
@@ -12970,8 +12293,15 @@ ac_res=$ac_cv_search_gzopen
if test "$ac_res" != no; then :
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+else
+ found_zlib=no
+fi
+
+ if test "$with_zlib$found_zlib" = "yesno"; then :
+ as_fn_error $? "zlib not found" "$LINENO" 5
fi
+fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if LINE_MAX is defined" >&5
$as_echo_n "checking if LINE_MAX is defined... " >&6; }
@@ -15794,7 +15124,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by $as_me, which was
+This file was extended by cracklib $as_me 2.9.2, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -15854,13 +15184,13 @@ $config_headers
Configuration commands:
$config_commands
-Report bugs to the package provider."
+Report bugs to <cracklib-devel at lists.sourceforge.net>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-config.status
+cracklib config.status 2.9.2
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/configure.in b/configure.ac
similarity index 83%
rename from configure.in
rename to configure.ac
index 993587d..f2a65b6 100644
--- a/configure.in
+++ b/configure.ac
@@ -1,7 +1,7 @@
dnl Process this file with autoconf to produce a configure script.
-AC_INIT([lib/crack.h])
-AM_INIT_AUTOMAKE(cracklib, 2.9.0)
-AM_CONFIG_HEADER(config.h)
+AC_INIT([cracklib], [2.9.2], [cracklib-devel at lists.sourceforge.net])
+AM_INIT_AUTOMAKE
+AC_CONFIG_HEADERS([config.h])
AC_CONFIG_MACRO_DIR([m4])
dnl Set of available languages.
@@ -15,16 +15,23 @@ AC_PROG_INSTALL
AC_PROG_LN_S
AC_PROG_MAKE_SET
-AC_PATH_XTRA
-
AC_CHECK_HEADERS(unistd.h)
AC_CHECK_HEADERS(fcntl.h)
AC_CHECK_HEADERS(inttypes.h)
AC_CHECK_HEADERS(stdint.h)
AC_CHECK_HEADERS(pthread.h)
-AC_CHECK_HEADERS(zlib.h, AC_DEFINE(HAVE_ZLIB_H, [], [found zlib]))
-AC_SEARCH_LIBS(gzopen, z)
+AC_ARG_WITH([zlib],
+ [AS_HELP_STRING([--without-zlib], [build without zlib support @<:@default=auto@:>@])])
+AS_IF([test "$with_zlib" != "no"], [dnl
+ found_zlib=yes
+ AC_CHECK_HEADERS([zlib.h],
+ [AC_DEFINE(HAVE_ZLIB_H, [], [found zlib])],
+ [found_zlib=no])
+ AC_SEARCH_LIBS([gzopen], [z], [], [found_zlib=no])
+ AS_IF([test "$with_zlib$found_zlib" = "yesno"],
+ [AC_MSG_ERROR([zlib not found])])
+])
dnl Cygwin workaround
AC_MSG_CHECKING(if LINE_MAX is defined)
diff --git a/dicts/Makefile.am b/dicts/Makefile.am
index d363725..3bc8dd3 100644
--- a/dicts/Makefile.am
+++ b/dicts/Makefile.am
@@ -1,3 +1 @@
-pkgdata_DATA = cracklib-small
-
-EXTRA_DIST = cracklib-small
+dist_pkgdata_DATA = cracklib-small
diff --git a/dicts/Makefile.in b/dicts/Makefile.in
index 666d17d..b4ab493 100644
--- a/dicts/Makefile.in
+++ b/dicts/Makefile.in
@@ -52,7 +52,8 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
subdir = dicts
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(dist_pkgdata_DATA) $(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/intlmacosx.m4 \
@@ -61,7 +62,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
- $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.in
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
@@ -103,7 +104,7 @@ am__uninstall_files_from_dir = { \
$(am__cd) "$$dir" && rm -f $$files; }; \
}
am__installdirs = "$(DESTDIR)$(pkgdatadir)"
-DATA = $(pkgdata_DATA)
+DATA = $(dist_pkgdata_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -190,11 +191,6 @@ VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-XMKMF = @XMKMF@
-X_CFLAGS = @X_CFLAGS@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_LIBS = @X_LIBS@
-X_PRE_LIBS = @X_PRE_LIBS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
@@ -251,8 +247,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-pkgdata_DATA = cracklib-small
-EXTRA_DIST = cracklib-small
+dist_pkgdata_DATA = cracklib-small
all: all-am
.SUFFIXES:
@@ -292,9 +287,9 @@ mostlyclean-libtool:
clean-libtool:
-rm -rf .libs _libs
-install-pkgdataDATA: $(pkgdata_DATA)
+install-dist_pkgdataDATA: $(dist_pkgdata_DATA)
@$(NORMAL_INSTALL)
- @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+ @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
if test -n "$$list"; then \
echo " $(MKDIR_P) '$(DESTDIR)$(pkgdatadir)'"; \
$(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" || exit 1; \
@@ -308,9 +303,9 @@ install-pkgdataDATA: $(pkgdata_DATA)
$(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \
done
-uninstall-pkgdataDATA:
+uninstall-dist_pkgdataDATA:
@$(NORMAL_UNINSTALL)
- @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+ @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
dir='$(DESTDIR)$(pkgdatadir)'; $(am__uninstall_files_from_dir)
tags: TAGS
@@ -407,7 +402,7 @@ info: info-am
info-am:
-install-data-am: install-pkgdataDATA
+install-data-am: install-dist_pkgdataDATA
install-dvi: install-dvi-am
@@ -451,21 +446,21 @@ ps: ps-am
ps-am:
-uninstall-am: uninstall-pkgdataDATA
+uninstall-am: uninstall-dist_pkgdataDATA
.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic clean-libtool \
distclean distclean-generic distclean-libtool distdir dvi \
dvi-am html html-am info info-am install install-am \
- install-data install-data-am install-dvi install-dvi-am \
- install-exec install-exec-am install-html install-html-am \
- install-info install-info-am install-man install-pdf \
- install-pdf-am install-pkgdataDATA install-ps install-ps-am \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- uninstall uninstall-am uninstall-pkgdataDATA
+ install-data install-data-am install-dist_pkgdataDATA \
+ 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 maintainer-clean maintainer-clean-generic \
+ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+ ps ps-am uninstall uninstall-am uninstall-dist_pkgdataDATA
# Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/doc/Makefile.am b/doc/Makefile.am
index ee5b21a..30bf3eb 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,3 +1 @@
-pkgdata_DATA = cracklib.magic
-
-EXTRA_DIST = cracklib.magic
+dist_pkgdata_DATA = cracklib.magic
diff --git a/doc/Makefile.in b/doc/Makefile.in
index af2055c..cd85751 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -52,7 +52,8 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
subdir = doc
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(dist_pkgdata_DATA) $(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/intlmacosx.m4 \
@@ -61,7 +62,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
- $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.in
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
@@ -103,7 +104,7 @@ am__uninstall_files_from_dir = { \
$(am__cd) "$$dir" && rm -f $$files; }; \
}
am__installdirs = "$(DESTDIR)$(pkgdatadir)"
-DATA = $(pkgdata_DATA)
+DATA = $(dist_pkgdata_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -190,11 +191,6 @@ VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-XMKMF = @XMKMF@
-X_CFLAGS = @X_CFLAGS@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_LIBS = @X_LIBS@
-X_PRE_LIBS = @X_PRE_LIBS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
@@ -251,8 +247,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-pkgdata_DATA = cracklib.magic
-EXTRA_DIST = cracklib.magic
+dist_pkgdata_DATA = cracklib.magic
all: all-am
.SUFFIXES:
@@ -292,9 +287,9 @@ mostlyclean-libtool:
clean-libtool:
-rm -rf .libs _libs
-install-pkgdataDATA: $(pkgdata_DATA)
+install-dist_pkgdataDATA: $(dist_pkgdata_DATA)
@$(NORMAL_INSTALL)
- @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+ @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
if test -n "$$list"; then \
echo " $(MKDIR_P) '$(DESTDIR)$(pkgdatadir)'"; \
$(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" || exit 1; \
@@ -308,9 +303,9 @@ install-pkgdataDATA: $(pkgdata_DATA)
$(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \
done
-uninstall-pkgdataDATA:
+uninstall-dist_pkgdataDATA:
@$(NORMAL_UNINSTALL)
- @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+ @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
dir='$(DESTDIR)$(pkgdatadir)'; $(am__uninstall_files_from_dir)
tags: TAGS
@@ -407,7 +402,7 @@ info: info-am
info-am:
-install-data-am: install-pkgdataDATA
+install-data-am: install-dist_pkgdataDATA
install-dvi: install-dvi-am
@@ -451,21 +446,21 @@ ps: ps-am
ps-am:
-uninstall-am: uninstall-pkgdataDATA
+uninstall-am: uninstall-dist_pkgdataDATA
.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic clean-libtool \
distclean distclean-generic distclean-libtool distdir dvi \
dvi-am html html-am info info-am install install-am \
- install-data install-data-am install-dvi install-dvi-am \
- install-exec install-exec-am install-html install-html-am \
- install-info install-info-am install-man install-pdf \
- install-pdf-am install-pkgdataDATA install-ps install-ps-am \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- uninstall uninstall-am uninstall-pkgdataDATA
+ install-data install-data-am install-dist_pkgdataDATA \
+ 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 maintainer-clean maintainer-clean-generic \
+ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+ ps ps-am uninstall uninstall-am uninstall-dist_pkgdataDATA
# Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/lib/Makefile.in b/lib/Makefile.in
index 92bee2a..d4b712c 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -63,7 +63,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
- $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.in
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
@@ -215,11 +215,6 @@ VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-XMKMF = @XMKMF@
-X_CFLAGS = @X_CFLAGS@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_LIBS = @X_LIBS@
-X_PRE_LIBS = @X_PRE_LIBS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/lib/fascist.c b/lib/fascist.c
index a142abc..578ea84 100644
--- a/lib/fascist.c
+++ b/lib/fascist.c
@@ -43,7 +43,7 @@ static char *r_destructors[] = {
":", /* noop - must do this to test raw word. */
#ifdef DEBUG2
- (char *) 0,
+ NULL,
#endif
"[", /* trimming leading/trailing junk */
@@ -412,14 +412,14 @@ static char *r_destructors[] = {
"/4s4h",
/* done */
- (char *) 0
+ NULL
};
static char *r_constructors[] = {
":",
#ifdef DEBUG2
- (char *) 0,
+ NULL,
#endif
"r",
@@ -428,7 +428,7 @@ static char *r_constructors[] = {
"dr",
"fr",
"rf",
- (char *) 0
+ NULL
};
int
@@ -525,7 +525,7 @@ FascistGecosUser(char *password, const char *user, const char *gecos)
wc = 0;
ptr = gbuffer;
gwords = 0;
- uwords[0] = (char *)0;
+ uwords[0] = NULL;
while (*ptr)
{
@@ -544,11 +544,11 @@ FascistGecosUser(char *password, const char *user, const char *gecos)
if (wc == STRINGSIZE)
{
- uwords[--wc] = (char *) 0; /* to hell with it */
+ uwords[--wc] = NULL; /* to hell with it */
break;
} else
{
- uwords[wc] = (char *) 0;
+ uwords[wc] = NULL;
}
while (*ptr && !ISSKIP(*ptr))
@@ -619,7 +619,7 @@ FascistGecosUser(char *password, const char *user, const char *gecos)
}
}
- return ((char *) 0);
+ return NULL;
}
char *
@@ -756,7 +756,7 @@ FascistLookUser(PWDICT *pwp, char *instring,
ptr++;
}
- /* Change by Ben Karsin from ITS at University of Hawaii at Manoa. Static MAXSTEP
+ /* Change by Ben Karsin from ITS at University of Hawaii at Manoa. Static MAXSTEP
would generate many false positives for long passwords. */
maxrepeat = 3+(0.09*strlen(password));
if (i > maxrepeat)
@@ -821,7 +821,7 @@ FascistLookUser(PWDICT *pwp, char *instring,
}
}
- return ((char *) 0);
+ return NULL;
}
char *
diff --git a/lib/packer.h b/lib/packer.h
index d1b9bb4..d7584b3 100644
--- a/lib/packer.h
+++ b/lib/packer.h
@@ -52,9 +52,10 @@ struct pi_header
typedef struct
{
- FILE *ifp;
- FILE *dfp;
- FILE *wfp;
+ /* Might be FILE* or gzFile */
+ void *ifp;
+ void *dfp;
+ void *wfp;
uint32_t flags;
#define PFOR_WRITE 0x0001
diff --git a/lib/packlib.c b/lib/packlib.c
index 8f32d14..f851424 100644
--- a/lib/packlib.c
+++ b/lib/packlib.c
@@ -34,9 +34,9 @@ struct pi_header64
typedef struct
{
- FILE *ifp;
- FILE *dfp;
- FILE *wfp;
+ void *ifp;
+ void *dfp;
+ void *wfp;
uint64_t flags;
uint64_t hwms[256];
struct pi_header64 header;
@@ -72,14 +72,14 @@ PWOpen(prefix, mode)
char iname[STRINGSIZE];
char dname[STRINGSIZE];
char wname[STRINGSIZE];
- FILE *dfp;
- FILE *ifp;
- FILE *wfp;
+ void *dfp;
+ void *ifp;
+ void *wfp;
if (pdesc.header.pih_magic == PIH_MAGIC)
{
fprintf(stderr, "%s: another dictionary already open\n", prefix);
- return ((PWDICT *) 0);
+ return NULL;
}
memset(&pdesc, '\0', sizeof(pdesc));
@@ -102,11 +102,11 @@ PWOpen(prefix, mode)
if (!(pdesc.dfp = gzopen(dname, mode)))
{
perror(dname);
- return ((PWDICT *) 0);
+ return NULL;
}
#else
perror(dname);
- return ((PWDICT *) 0);
+ return NULL;
#endif
}
}
@@ -117,20 +117,20 @@ PWOpen(prefix, mode)
if (!(pdesc.dfp = fopen(dname, mode)))
{
perror(dname);
- return ((PWDICT *) 0);
+ return NULL;
}
}
if (!(pdesc.ifp = fopen(iname, mode)))
{
#ifdef HAVE_ZLIB_H
- if(pdesc.flags & PFOR_USEZLIB)
+ if (pdesc.flags & PFOR_USEZLIB)
gzclose(pdesc.dfp);
else
#endif
fclose(pdesc.dfp);
perror(iname);
- return ((PWDICT *) 0);
+ return NULL;
}
if ((pdesc.wfp = fopen(wname, mode)))
@@ -161,16 +161,16 @@ PWOpen(prefix, mode)
pdesc.header.pih_magic = 0;
fclose(ifp);
#ifdef HAVE_ZLIB_H
- if(pdesc.flags & PFOR_USEZLIB)
+ if (pdesc.flags & PFOR_USEZLIB)
gzclose(dfp);
else
#endif
fclose(dfp);
- if(wfp)
+ if (wfp)
{
fclose(wfp);
}
- return ((PWDICT *) 0);
+ return NULL;
}
if ((pdesc.header.pih_magic == 0) || (pdesc.header.pih_numwords == 0))
@@ -180,40 +180,40 @@ PWOpen(prefix, mode)
if (!fread((char *) &pdesc64.header, sizeof(pdesc64.header), 1, ifp))
{
fprintf(stderr, "%s: error reading header\n", prefix);
-
+
pdesc.header.pih_magic = 0;
fclose(ifp);
#ifdef HAVE_ZLIB_H
- if(pdesc.flags & PFOR_USEZLIB)
+ if (pdesc.flags & PFOR_USEZLIB)
gzclose(dfp);
else
#endif
fclose(dfp);
- if(wfp)
+ if (wfp)
{
fclose(wfp);
}
- return ((PWDICT *) 0);
+ return NULL;
}
if (pdesc64.header.pih_magic != PIH_MAGIC)
{
/* nope, not "64-bit" after all */
fprintf(stderr, "%s: error reading header\n", prefix);
-
+
pdesc.header.pih_magic = 0;
fclose(ifp);
#ifdef HAVE_ZLIB_H
- if(pdesc.flags & PFOR_USEZLIB)
+ if (pdesc.flags & PFOR_USEZLIB)
gzclose(dfp);
else
#endif
fclose(dfp);
- if(wfp)
+ if (wfp)
{
fclose(wfp);
}
- return ((PWDICT *) 0);
+ return NULL;
}
pdesc.header.pih_magic = pdesc64.header.pih_magic;
pdesc.header.pih_numwords = pdesc64.header.pih_numwords;
@@ -229,36 +229,36 @@ PWOpen(prefix, mode)
pdesc.header.pih_magic = 0;
fclose(ifp);
#ifdef HAVE_ZLIB_H
- if(pdesc.flags & PFOR_USEZLIB)
+ if (pdesc.flags & PFOR_USEZLIB)
gzclose(dfp);
else
#endif
fclose(dfp);
- if(wfp)
+ if (wfp)
{
fclose(wfp);
}
- return ((PWDICT *) 0);
+ return NULL;
}
if (pdesc.header.pih_numwords < 1)
{
fprintf(stderr, "%s: invalid word count\n", prefix);
-
+
pdesc.header.pih_magic = 0;
fclose(ifp);
#ifdef HAVE_ZLIB_H
- if(pdesc.flags & PFOR_USEZLIB)
+ if (pdesc.flags & PFOR_USEZLIB)
gzclose(dfp);
else
#endif
fclose(dfp);
- if(wfp)
+ if (wfp)
{
fclose(wfp);
}
- return ((PWDICT *) 0);
+ return NULL;
}
if (pdesc.header.pih_blocklen != NUMWORDS)
@@ -268,16 +268,16 @@ PWOpen(prefix, mode)
pdesc.header.pih_magic = 0;
fclose(ifp);
#ifdef HAVE_ZLIB_H
- if(pdesc.flags & PFOR_USEZLIB)
+ if (pdesc.flags & PFOR_USEZLIB)
gzclose(dfp);
else
#endif
fclose(dfp);
- if(wfp)
+ if (wfp)
{
fclose(wfp);
}
- return ((PWDICT *) 0);
+ return NULL;
}
if (pdesc.flags & PFOR_USEHWMS)
@@ -294,7 +294,7 @@ PWOpen(prefix, mode)
{
pdesc.hwms[i] = pdesc64.hwms[i];
}
- }
+ }
else if (fread(pdesc.hwms, 1, sizeof(pdesc.hwms), wfp) != sizeof(pdesc.hwms))
{
pdesc.flags &= ~PFOR_USEHWMS;
@@ -324,7 +324,7 @@ PWClose(pwp)
if (pwp->flags & PFOR_WRITE)
{
pwp->flags |= PFOR_FLUSH;
- PutPW(pwp, (char *) 0); /* flush last index if necess */
+ PutPW(pwp, NULL); /* flush last index if necess */
if (fseek(pwp->ifp, 0L, 0))
{
@@ -357,12 +357,12 @@ PWClose(pwp)
fclose(pwp->ifp);
#ifdef HAVE_ZLIB_H
- if(pwp->flags & PFOR_USEZLIB)
+ if (pwp->flags & PFOR_USEZLIB)
gzclose(pwp->dfp);
else
#endif
fclose(pwp->dfp);
- if(pwp->wfp)
+ if (pwp->wfp)
{
fclose(pwp->wfp);
}
@@ -446,45 +446,36 @@ GetPW(pwp, number)
register char *nstr;
register char *bptr;
char buffer[NUMWORDS * MAXWORDLEN];
- static uint32_t prevblock = 0xffffffff;
uint32_t thisblock;
thisblock = number / NUMWORDS;
- if (prevblock == thisblock)
- {
-#if DEBUG
- fprintf(stderr, "returning (%s)\n", pwp->data_get[number % NUMWORDS]);
-#endif
- return (pwp->data_get[number % NUMWORDS]);
- }
-
if (_PWIsBroken64(pwp->ifp))
{
uint64_t datum64;
if (fseek(pwp->ifp, sizeof(struct pi_header64) + (thisblock * sizeof(uint64_t)), 0))
{
perror("(index fseek failed)");
- return ((char *) 0);
+ return NULL;
}
if (!fread((char *) &datum64, sizeof(datum64), 1, pwp->ifp))
{
perror("(index fread failed)");
- return ((char *) 0);
+ return NULL;
}
datum = datum64;
} else {
if (fseek(pwp->ifp, sizeof(struct pi_header) + (thisblock * sizeof(uint32_t)), 0))
{
perror("(index fseek failed)");
- return ((char *) 0);
+ return NULL;
}
if (!fread((char *) &datum, sizeof(datum), 1, pwp->ifp))
{
perror("(index fread failed)");
- return ((char *) 0);
+ return NULL;
}
}
@@ -493,18 +484,18 @@ GetPW(pwp, number)
if (pwp->flags & PFOR_USEZLIB)
{
r = gzseek(pwp->dfp, datum, 0);
- if(r >= 0)
+ if (r >= 0)
r = 0;
}
else
#endif
r = fseek(pwp->dfp, datum, 0);
-
+
if (r)
{
perror("(data fseek failed)");
- return ((char *) 0);
+ return NULL;
}
r = 0;
@@ -513,23 +504,19 @@ GetPW(pwp, number)
if (pwp->flags & PFOR_USEZLIB)
{
r = gzread(pwp->dfp, buffer, sizeof(buffer));
- if(r < 0)
+ if (r < 0)
r = 0;
}
else
#endif
r = fread(buffer, 1, sizeof(buffer), pwp->dfp);
-
-
-
+
if (!r)
{
perror("(data fread failed)");
- return ((char *) 0);
+ return NULL;
}
- prevblock = thisblock;
-
bptr = buffer;
for (ostr = pwp->data_get[0]; (*(ostr++) = *(bptr++)); /* nothing */ );
@@ -625,7 +612,7 @@ fprintf(stderr, "look for (%s)\n", string);
if (middle == hwm)
{
-#if DEBUG
+#if DEBUG
fprintf(stderr, "at terminal subdivision, stopping search\n");
#endif
break;
@@ -634,11 +621,11 @@ fprintf(stderr, "look for (%s)\n", string);
if (cmp < 0)
{
hwm = middle;
- }
+ }
else if (cmp > 0)
{
lwm = middle;
- }
+ }
}
return (PW_WORDS(pwp));
diff --git a/lib/rules.c b/lib/rules.c
index 7091464..d193cc0 100644
--- a/lib/rules.c
+++ b/lib/rules.c
@@ -368,7 +368,7 @@ PolyStrchr(string, class)
}
string++;
}
- return ((char *) 0);
+ return NULL;
}
char *
@@ -471,18 +471,18 @@ Mangle(input, control) /* returns a pointer to a controlled Mangle */
if (!ptr[1])
{
Debug(1, "Mangle: '>' missing argument in '%s'\n", control);
- return ((char *) 0);
+ return NULL;
} else
{
limit = Char2Int(*(++ptr));
if (limit < 0)
{
Debug(1, "Mangle: '>' weird argument in '%s'\n", control);
- return ((char *) 0);
+ return NULL;
}
if ( (int) strlen(area) <= limit)
{
- return ((char *) 0);
+ return NULL;
}
}
break;
@@ -490,18 +490,18 @@ Mangle(input, control) /* returns a pointer to a controlled Mangle */
if (!ptr[1])
{
Debug(1, "Mangle: '<' missing argument in '%s'\n", control);
- return ((char *) 0);
+ return NULL;
} else
{
limit = Char2Int(*(++ptr));
if (limit < 0)
{
Debug(1, "Mangle: '<' weird argument in '%s'\n", control);
- return ((char *) 0);
+ return NULL;
}
if ( (int) strlen(area) >= limit)
{
- return ((char *) 0);
+ return NULL;
}
}
break;
@@ -509,7 +509,7 @@ Mangle(input, control) /* returns a pointer to a controlled Mangle */
if (!ptr[1])
{
Debug(1, "Mangle: prepend missing argument in '%s'\n", control);
- return ((char *) 0);
+ return NULL;
} else
{
area2[0] = *(++ptr);
@@ -521,7 +521,7 @@ Mangle(input, control) /* returns a pointer to a controlled Mangle */
if (!ptr[1])
{
Debug(1, "Mangle: append missing argument in '%s'\n", control);
- return ((char *) 0);
+ return NULL;
} else
{
register char *string;
@@ -535,7 +535,7 @@ Mangle(input, control) /* returns a pointer to a controlled Mangle */
if (!ptr[1] || !ptr[2])
{
Debug(1, "Mangle: extract missing argument in '%s'\n", control);
- return ((char *) 0);
+ return NULL;
} else
{
register int i;
@@ -546,7 +546,7 @@ Mangle(input, control) /* returns a pointer to a controlled Mangle */
if (start < 0 || length < 0)
{
Debug(1, "Mangle: extract: weird argument in '%s'\n", control);
- return ((char *) 0);
+ return NULL;
}
strcpy(area2, area);
for (i = 0; length-- && area2[start + i]; i++)
@@ -561,7 +561,7 @@ Mangle(input, control) /* returns a pointer to a controlled Mangle */
if (!ptr[1] || !ptr[2])
{
Debug(1, "Mangle: overstrike missing argument in '%s'\n", control);
- return ((char *) 0);
+ return NULL;
} else
{
register int i;
@@ -570,7 +570,7 @@ Mangle(input, control) /* returns a pointer to a controlled Mangle */
{
Debug(1, "Mangle: overstrike weird argument in '%s'\n",
control);
- return ((char *) 0);
+ return NULL;
} else
{
++ptr;
@@ -585,7 +585,7 @@ Mangle(input, control) /* returns a pointer to a controlled Mangle */
if (!ptr[1] || !ptr[2])
{
Debug(1, "Mangle: insert missing argument in '%s'\n", control);
- return ((char *) 0);
+ return NULL;
} else
{
register int i;
@@ -596,7 +596,7 @@ Mangle(input, control) /* returns a pointer to a controlled Mangle */
{
Debug(1, "Mangle: insert weird argument in '%s'\n",
control);
- return ((char *) 0);
+ return NULL;
}
p1 = area;
p2 = area2;
@@ -616,7 +616,7 @@ Mangle(input, control) /* returns a pointer to a controlled Mangle */
if (!ptr[1] || (ptr[1] == RULE_CLASS && !ptr[2]))
{
Debug(1, "Mangle: delete missing arguments in '%s'\n", control);
- return ((char *) 0);
+ return NULL;
} else if (ptr[1] != RULE_CLASS)
{
strcpy(area, Purge(area, *(++ptr)));
@@ -630,7 +630,7 @@ Mangle(input, control) /* returns a pointer to a controlled Mangle */
if (!ptr[1] || !ptr[2] || (ptr[1] == RULE_CLASS && !ptr[3]))
{
Debug(1, "Mangle: subst missing argument in '%s'\n", control);
- return ((char *) 0);
+ return NULL;
} else if (ptr[1] != RULE_CLASS)
{
strcpy(area, Substitute(area, ptr[1], ptr[2]));
@@ -645,18 +645,18 @@ Mangle(input, control) /* returns a pointer to a controlled Mangle */
if (!ptr[1] || (ptr[1] == RULE_CLASS && !ptr[2]))
{
Debug(1, "Mangle: '/' missing argument in '%s'\n", control);
- return ((char *) 0);
+ return NULL;
} else if (ptr[1] != RULE_CLASS)
{
if (!strchr(area, *(++ptr)))
{
- return ((char *) 0);
+ return NULL;
}
} else
{
if (!PolyStrchr(area, ptr[2]))
{
- return ((char *) 0);
+ return NULL;
}
ptr += 2;
}
@@ -665,18 +665,18 @@ Mangle(input, control) /* returns a pointer to a controlled Mangle */
if (!ptr[1] || (ptr[1] == RULE_CLASS && !ptr[2]))
{
Debug(1, "Mangle: '!' missing argument in '%s'\n", control);
- return ((char *) 0);
+ return NULL;
} else if (ptr[1] != RULE_CLASS)
{
if (strchr(area, *(++ptr)))
{
- return ((char *) 0);
+ return NULL;
}
} else
{
if (PolyStrchr(area, ptr[2]))
{
- return ((char *) 0);
+ return NULL;
}
ptr += 2;
}
@@ -694,28 +694,28 @@ Mangle(input, control) /* returns a pointer to a controlled Mangle */
if (!ptr[1] || !ptr[2] || (ptr[2] == RULE_CLASS && !ptr[3]))
{
Debug(1, "Mangle: '=' missing argument in '%s'\n", control);
- return ((char *) 0);
+ return NULL;
} else
{
register int i;
if ((i = Char2Int(ptr[1])) < 0)
{
Debug(1, "Mangle: '=' weird argument in '%s'\n", control);
- return ((char *) 0);
+ return NULL;
}
if (ptr[2] != RULE_CLASS)
{
ptr += 2;
if (area[i] != *ptr)
{
- return ((char *) 0);
+ return NULL;
}
} else
{
ptr += 3;
if (!MatchClass(*ptr, area[i]))
{
- return ((char *) 0);
+ return NULL;
}
}
}
@@ -746,7 +746,7 @@ Mangle(input, control) /* returns a pointer to a controlled Mangle */
if (!ptr[1] || (ptr[1] == RULE_CLASS && !ptr[2]))
{
Debug(1, "Mangle: '(' missing argument in '%s'\n", control);
- return ((char *) 0);
+ return NULL;
} else
{
if (ptr[1] != RULE_CLASS)
@@ -754,14 +754,14 @@ Mangle(input, control) /* returns a pointer to a controlled Mangle */
ptr++;
if (area[0] != *ptr)
{
- return ((char *) 0);
+ return NULL;
}
} else
{
ptr += 2;
if (!MatchClass(*ptr, area[0]))
{
- return ((char *) 0);
+ return NULL;
}
}
}
@@ -769,7 +769,7 @@ Mangle(input, control) /* returns a pointer to a controlled Mangle */
if (!ptr[1] || (ptr[1] == RULE_CLASS && !ptr[2]))
{
Debug(1, "Mangle: ')' missing argument in '%s'\n", control);
- return ((char *) 0);
+ return NULL;
} else
{
register int i;
@@ -781,7 +781,7 @@ Mangle(input, control) /* returns a pointer to a controlled Mangle */
i--;
} else
{
- return ((char *) 0);
+ return NULL;
}
if (ptr[1] != RULE_CLASS)
@@ -789,27 +789,27 @@ Mangle(input, control) /* returns a pointer to a controlled Mangle */
ptr++;
if (area[i] != *ptr)
{
- return ((char *) 0);
+ return NULL;
}
} else
{
ptr += 2;
if (!MatchClass(*ptr, area[i]))
{
- return ((char *) 0);
+ return NULL;
}
}
}
default:
Debug(1, "Mangle: unknown command %c in %s\n", *ptr, control);
- return ((char *) 0);
+ return NULL;
break;
}
}
if (!area[0]) /* have we deweted de poor widdle fing away? */
{
- return ((char *) 0);
+ return NULL;
}
return (area);
}
diff --git a/m4/Makefile.in b/m4/Makefile.in
index c7744d7..aec2368 100644
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -60,7 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
- $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.in
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
@@ -160,11 +160,6 @@ VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-XMKMF = @XMKMF@
-X_CFLAGS = @X_CFLAGS@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_LIBS = @X_LIBS@
-X_PRE_LIBS = @X_PRE_LIBS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/po/as.gmo b/po/as.gmo
index 4746b00..083171e 100644
Binary files a/po/as.gmo and b/po/as.gmo differ
diff --git a/po/as.po b/po/as.po
index 6322b13..b76cca0 100644
--- a/po/as.po
+++ b/po/as.po
@@ -5,8 +5,8 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-01 09:58-0500\n"
+"Report-Msgid-Bugs-To: cracklib-devel at lists.sourceforge.net\n"
+"POT-Creation-Date: 2014-10-05 10:58-0500\n"
"PO-Revision-Date: 2009-11-12 11:39+0530\n"
"Last-Translator: Amitakhya Phukan <aphukan at fedoraproject.org>\n"
"Language-Team: Assamese <>\n"
diff --git a/po/bn_IN.gmo b/po/bn_IN.gmo
index c2ffcb0..4398ae7 100644
Binary files a/po/bn_IN.gmo and b/po/bn_IN.gmo differ
diff --git a/po/bn_IN.po b/po/bn_IN.po
index c4e7f51..674e4d8 100644
--- a/po/bn_IN.po
+++ b/po/bn_IN.po
@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: cracklib.default.cracklib\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-01 09:58-0500\n"
+"Report-Msgid-Bugs-To: cracklib-devel at lists.sourceforge.net\n"
+"POT-Creation-Date: 2014-10-05 10:58-0500\n"
"PO-Revision-Date: 2009-11-11 12:34+0530\n"
"Last-Translator: Runa Bhattacharjee <runab at redhat.com>\n"
"Language-Team: Bengali INDIA <anubad at lists.ankur.org.in>\n"
diff --git a/po/cracklib.pot b/po/cracklib.pot
index 495de30..8396bf5 100644
--- a/po/cracklib.pot
+++ b/po/cracklib.pot
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: cracklib 2.9.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-01 09:58-0500\n"
+"Project-Id-Version: cracklib 2.9.2\n"
+"Report-Msgid-Bugs-To: cracklib-devel at lists.sourceforge.net\n"
+"POT-Creation-Date: 2014-10-05 10:58-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
diff --git a/po/cs.gmo b/po/cs.gmo
index 3befb3f..485f8e5 100644
Binary files a/po/cs.gmo and b/po/cs.gmo differ
diff --git a/po/cs.po b/po/cs.po
index 14343e6..4160091 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -4,8 +4,8 @@
msgid ""
msgstr ""
"Project-Id-Version: cracklib\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-01 09:58-0500\n"
+"Report-Msgid-Bugs-To: cracklib-devel at lists.sourceforge.net\n"
+"POT-Creation-Date: 2014-10-05 10:58-0500\n"
"PO-Revision-Date: 2005-06-23 13:18+02:00\n"
"Last-Translator: Klara Cihlarova <koty at seznam.cz>\n"
"Language-Team: czech <suse at suse.cz>\n"
diff --git a/po/da.gmo b/po/da.gmo
index 47dd586..62cb836 100644
Binary files a/po/da.gmo and b/po/da.gmo differ
diff --git a/po/da.po b/po/da.po
index caa3e60..43b01bb 100644
--- a/po/da.po
+++ b/po/da.po
@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: cracklib\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-01 09:58-0500\n"
+"Report-Msgid-Bugs-To: cracklib-devel at lists.sourceforge.net\n"
+"POT-Creation-Date: 2014-10-05 10:58-0500\n"
"PO-Revision-Date: 2005-08-16 20:11+0200\n"
"Last-Translator: Martin Møller <martin at martinm-76.dk>\n"
"Language-Team: Dansk <da at li.org>\n"
diff --git a/po/de.gmo b/po/de.gmo
index 6292a4b..f4eb85e 100644
Binary files a/po/de.gmo and b/po/de.gmo differ
diff --git a/po/de.po b/po/de.po
index a010e76..7fa4faf 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,8 +8,8 @@
msgid ""
msgstr ""
"Project-Id-Version: new\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-01 09:58-0500\n"
+"Report-Msgid-Bugs-To: cracklib-devel at lists.sourceforge.net\n"
+"POT-Creation-Date: 2014-10-05 10:58-0500\n"
"PO-Revision-Date: 2003-11-27 18:31GMT\n"
"Last-Translator: Novell Language <language at novell.com>\n"
"Language-Team: Novell Language <language at novell.com>\n"
diff --git a/po/el.gmo b/po/el.gmo
index 67795c9..60a6336 100644
Binary files a/po/el.gmo and b/po/el.gmo differ
diff --git a/po/el.po b/po/el.po
index 96dbb80..deceff1 100644
--- a/po/el.po
+++ b/po/el.po
@@ -8,8 +8,8 @@
msgid ""
msgstr ""
"Project-Id-Version: el\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-01 09:58-0500\n"
+"Report-Msgid-Bugs-To: cracklib-devel at lists.sourceforge.net\n"
+"POT-Creation-Date: 2014-10-05 10:58-0500\n"
"PO-Revision-Date: 2005-08-26 19:19+0300\n"
"Last-Translator: Hellenic SuSE Translation Group <hstg at billg.gr>\n"
"Language-Team: Hellenic-Ελληνικά-Greek <hstg at billg.gr>\n"
diff --git a/po/es.gmo b/po/es.gmo
index 78b57e2..48bd363 100644
Binary files a/po/es.gmo and b/po/es.gmo differ
diff --git a/po/es.po b/po/es.po
index e29eac6..d377f18 100644
--- a/po/es.po
+++ b/po/es.po
@@ -5,8 +5,8 @@
msgid ""
msgstr ""
"Project-Id-Version: cracklib\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-01 09:58-0500\n"
+"Report-Msgid-Bugs-To: cracklib-devel at lists.sourceforge.net\n"
+"POT-Creation-Date: 2014-10-05 10:58-0500\n"
"PO-Revision-Date: 2005-06-23 13:17+02:00\n"
"Last-Translator: Novell Language <language at novell.com>\n"
"Language-Team: Novell Language <language at novell.com>\n"
diff --git a/po/fi.gmo b/po/fi.gmo
index 9e540f6..989439c 100644
Binary files a/po/fi.gmo and b/po/fi.gmo differ
diff --git a/po/fi.po b/po/fi.po
index a7e9cfc..e2b60b7 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: cracklib\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-01 09:58-0500\n"
+"Report-Msgid-Bugs-To: cracklib-devel at lists.sourceforge.net\n"
+"POT-Creation-Date: 2014-10-05 10:58-0500\n"
"PO-Revision-Date: 2005-08-25 15:20+0300\n"
"Last-Translator: Jyri Palokangas <jmp at netti.fi>\n"
"Language-Team: <fi at li.org>\n"
diff --git a/po/fr.gmo b/po/fr.gmo
index ef7f403..1b92d8f 100644
Binary files a/po/fr.gmo and b/po/fr.gmo differ
diff --git a/po/fr.po b/po/fr.po
index 929b564..ae7b11f 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -5,8 +5,8 @@
msgid ""
msgstr ""
"Project-Id-Version: cracklib\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-01 09:58-0500\n"
+"Report-Msgid-Bugs-To: cracklib-devel at lists.sourceforge.net\n"
+"POT-Creation-Date: 2014-10-05 10:58-0500\n"
"PO-Revision-Date: 2005-06-23 13:17+02:00\n"
"Last-Translator: Novell Language <language at novell.com>\n"
"Language-Team: Novell Language <language at novell.com>\n"
diff --git a/po/gu.gmo b/po/gu.gmo
index 173ee18..0df4ab2 100644
Binary files a/po/gu.gmo and b/po/gu.gmo differ
diff --git a/po/gu.po b/po/gu.po
index 595bda2..b9f3225 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: cracklib.default.cracklib.gu\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-01 09:58-0500\n"
+"Report-Msgid-Bugs-To: cracklib-devel at lists.sourceforge.net\n"
+"POT-Creation-Date: 2014-10-05 10:58-0500\n"
"PO-Revision-Date: 2009-10-22 18:13+0530\n"
"Last-Translator: Ankit Patel <ankit at redhat.com>\n"
"Language-Team: Gujarati <fedora-trans-gu at redhat.com>\n"
diff --git a/po/hi.gmo b/po/hi.gmo
index 179e2df..22c6376 100644
Binary files a/po/hi.gmo and b/po/hi.gmo differ
diff --git a/po/hi.po b/po/hi.po
index 64d787e..3589da7 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -7,8 +7,8 @@
msgid ""
msgstr ""
"Project-Id-Version: cracklib.default.cracklib\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-01 09:58-0500\n"
+"Report-Msgid-Bugs-To: cracklib-devel at lists.sourceforge.net\n"
+"POT-Creation-Date: 2014-10-05 10:58-0500\n"
"PO-Revision-Date: 2010-04-06 12:21+0530\n"
"Last-Translator: Rajesh Ranjan <rranjan at redhat.com>\n"
"Language-Team: Hindi <Red Hat>\n"
diff --git a/po/hu.gmo b/po/hu.gmo
index 52f660e..c8d99ba 100644
Binary files a/po/hu.gmo and b/po/hu.gmo differ
diff --git a/po/hu.po b/po/hu.po
index 9479c44..5cccc7f 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: cracklib.hu\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-01 09:58-0500\n"
+"Report-Msgid-Bugs-To: cracklib-devel at lists.sourceforge.net\n"
+"POT-Creation-Date: 2014-10-05 10:58-0500\n"
"PO-Revision-Date: 2005-08-06 20:20+0100\n"
"Last-Translator: Szabolcs Varga <shirokuma at shirokuma.hu>\n"
"Language-Team: hungarian\n"
diff --git a/po/it.gmo b/po/it.gmo
index ad79a00..79ba54d 100644
Binary files a/po/it.gmo and b/po/it.gmo differ
diff --git a/po/it.po b/po/it.po
index 4b5780a..e0b3547 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,8 +5,8 @@
msgid ""
msgstr ""
"Project-Id-Version: cracklib\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-01 09:58-0500\n"
+"Report-Msgid-Bugs-To: cracklib-devel at lists.sourceforge.net\n"
+"POT-Creation-Date: 2014-10-05 10:58-0500\n"
"PO-Revision-Date: 2005-06-23 13:15+02:00\n"
"Last-Translator: Novell Language <language at novell.com>\n"
"Language-Team: Novell Language <language at novell.com>\n"
diff --git a/po/ja.gmo b/po/ja.gmo
index edea950..3b3106b 100644
Binary files a/po/ja.gmo and b/po/ja.gmo differ
diff --git a/po/ja.po b/po/ja.po
index 66e4134..141e534 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: cracklib\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-01 09:58-0500\n"
+"Report-Msgid-Bugs-To: cracklib-devel at lists.sourceforge.net\n"
+"POT-Creation-Date: 2014-10-05 10:58-0500\n"
"PO-Revision-Date: 2005-08-18 11:52-0000\n"
"Last-Translator: Novell Language <language at novell.com>\n"
"Language-Team: Novell Language <language at novell.com>\n"
diff --git a/po/kn.gmo b/po/kn.gmo
index 62f7a9f..6dc6f93 100644
Binary files a/po/kn.gmo and b/po/kn.gmo differ
diff --git a/po/kn.po b/po/kn.po
index 50212b5..1ef1be2 100644
--- a/po/kn.po
+++ b/po/kn.po
@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: cracklib\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-01 09:58-0500\n"
+"Report-Msgid-Bugs-To: cracklib-devel at lists.sourceforge.net\n"
+"POT-Creation-Date: 2014-10-05 10:58-0500\n"
"PO-Revision-Date: 2008-12-11 11:49+0530\n"
"Last-Translator: Shankar Prasad <svenkate at redhat.com>\n"
"Language-Team: Kannada <en at li.org>\n"
diff --git a/po/ko.gmo b/po/ko.gmo
index eeb7933..6e485bd 100644
Binary files a/po/ko.gmo and b/po/ko.gmo differ
diff --git a/po/ko.po b/po/ko.po
index 2a46665..4d27804 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: cracklib.default\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-01 09:58-0500\n"
+"Report-Msgid-Bugs-To: cracklib-devel at lists.sourceforge.net\n"
+"POT-Creation-Date: 2014-10-05 10:58-0500\n"
"PO-Revision-Date: 2009-11-18 11:19+1000\n"
"Last-Translator: Eunju Kim <eukim at redhat.com>\n"
"Language-Team: Korean <ko at li.org>\n"
diff --git a/po/lt.gmo b/po/lt.gmo
index 26a40ee..1912bd1 100644
Binary files a/po/lt.gmo and b/po/lt.gmo differ
diff --git a/po/lt.po b/po/lt.po
index 1219c3c..c2d5c7e 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: cracklib\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-01 09:58-0500\n"
+"Report-Msgid-Bugs-To: cracklib-devel at lists.sourceforge.net\n"
+"POT-Creation-Date: 2014-10-05 10:58-0500\n"
"PO-Revision-Date: 2005-08-04 12:05+0200\n"
"Last-Translator: Linas Spraunius <linas at operis.org>\n"
"Language-Team: lt\n"
diff --git a/po/ml.gmo b/po/ml.gmo
index 09a3504..60ac8d1 100644
Binary files a/po/ml.gmo and b/po/ml.gmo differ
diff --git a/po/ml.po b/po/ml.po
index 073fca3..0082fbc 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: cracklib\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-01 09:58-0500\n"
+"Report-Msgid-Bugs-To: cracklib-devel at lists.sourceforge.net\n"
+"POT-Creation-Date: 2014-10-05 10:58-0500\n"
"PO-Revision-Date: 2009-11-11 14:46+0530\n"
"Last-Translator: Ani Peter <apeter at redhat.com>\n"
"Language-Team: Malayalam\n"
diff --git a/po/mr.gmo b/po/mr.gmo
index 6745d97..e02e6b6 100644
Binary files a/po/mr.gmo and b/po/mr.gmo differ
diff --git a/po/mr.po b/po/mr.po
index bd283f7..e01820a 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: cracklib.default.cracklib\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-01 09:58-0500\n"
+"Report-Msgid-Bugs-To: cracklib-devel at lists.sourceforge.net\n"
+"POT-Creation-Date: 2014-10-05 10:58-0500\n"
"PO-Revision-Date: 2009-11-11 12:24+0530\n"
"Last-Translator: Sandeep Shedmake <sshedmak at redhat.com>\n"
"Language-Team: Marathi <fedora-trans-mr at redhat.com>\n"
diff --git a/po/nb.gmo b/po/nb.gmo
index 15291c7..ca2f8b0 100644
Binary files a/po/nb.gmo and b/po/nb.gmo differ
diff --git a/po/nb.po b/po/nb.po
index cebe4a8..0ef700e 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: nb\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-01 09:58-0500\n"
+"Report-Msgid-Bugs-To: cracklib-devel at lists.sourceforge.net\n"
+"POT-Creation-Date: 2014-10-05 10:58-0500\n"
"PO-Revision-Date: 2005-08-11 20:48+0200\n"
"Last-Translator: Olav Pettershagen <olav.pet at online.no>\n"
"Language-Team: <nb at li.org>\n"
diff --git a/po/nl.gmo b/po/nl.gmo
index 2899a2d..349ff3c 100644
Binary files a/po/nl.gmo and b/po/nl.gmo differ
diff --git a/po/nl.po b/po/nl.po
index e363839..b820b71 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -8,8 +8,8 @@
msgid ""
msgstr ""
"Project-Id-Version: nl\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-01 09:58-0500\n"
+"Report-Msgid-Bugs-To: cracklib-devel at lists.sourceforge.net\n"
+"POT-Creation-Date: 2014-10-05 10:58-0500\n"
"PO-Revision-Date: 2005-08-14 05:41+0200\n"
"Last-Translator: Rinse de Vries <rinsedevries at kde.nl>\n"
"Language-Team: Dutch <kde-i18n-nl at kde.org>\n"
diff --git a/po/or.gmo b/po/or.gmo
index acaad2f..03b9768 100644
Binary files a/po/or.gmo and b/po/or.gmo differ
diff --git a/po/or.po b/po/or.po
index 3e7f416..131e882 100644
--- a/po/or.po
+++ b/po/or.po
@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: cracklib.default.cracklib.or\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-01 09:58-0500\n"
+"Report-Msgid-Bugs-To: cracklib-devel at lists.sourceforge.net\n"
+"POT-Creation-Date: 2014-10-05 10:58-0500\n"
"PO-Revision-Date: 2009-11-12 13:02+0530\n"
"Last-Translator: Manoj Kumar Giri <mgiri at redhat.com>\n"
"Language-Team: Oriya <oriya-it at googlegroups.com>\n"
diff --git a/po/pa.gmo b/po/pa.gmo
index f5436f2..e5e9d13 100644
Binary files a/po/pa.gmo and b/po/pa.gmo differ
diff --git a/po/pa.po b/po/pa.po
index bc0311a..d054e85 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -8,8 +8,8 @@
msgid ""
msgstr ""
"Project-Id-Version: cracklib.pa\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-01 09:58-0500\n"
+"Report-Msgid-Bugs-To: cracklib-devel at lists.sourceforge.net\n"
+"POT-Creation-Date: 2014-10-05 10:58-0500\n"
"PO-Revision-Date: 2009-11-17 05:52+0530\n"
"Last-Translator: A S Alam <aalam at users.sf.net>\n"
"Language-Team: Punjabi/Panjabi <punjabi-users at lists.sf.net>\n"
diff --git a/po/pl.gmo b/po/pl.gmo
index 454bb22..3cea78a 100644
Binary files a/po/pl.gmo and b/po/pl.gmo differ
diff --git a/po/pl.po b/po/pl.po
index 235a46d..69ae2ad 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -5,8 +5,8 @@
msgid ""
msgstr ""
"Project-Id-Version: pl\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-01 09:58-0500\n"
+"Report-Msgid-Bugs-To: cracklib-devel at lists.sourceforge.net\n"
+"POT-Creation-Date: 2014-10-05 10:58-0500\n"
"PO-Revision-Date: 2009-10-12 15:57+0200\n"
"Last-Translator: Piotr Drąg <piotrdrag at gmail.com>\n"
"Language-Team: Polish <fedora-trans-pl at redhat.com>\n"
diff --git a/po/pt.gmo b/po/pt.gmo
index c96aee5..b5c39fc 100644
Binary files a/po/pt.gmo and b/po/pt.gmo differ
diff --git a/po/pt.po b/po/pt.po
index 063bde1..4c8d124 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: cracklib.pt\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-01 09:58-0500\n"
+"Report-Msgid-Bugs-To: cracklib-devel at lists.sourceforge.net\n"
+"POT-Creation-Date: 2014-10-05 10:58-0500\n"
"PO-Revision-Date: 2005-08-05 00:45+0100\n"
"Last-Translator: Antonio Cardoso Martins <digiplan at netvisao.pt>\n"
"Language-Team: portuguese\n"
diff --git a/po/pt_BR.gmo b/po/pt_BR.gmo
index 5d74251..f1fb6f6 100644
Binary files a/po/pt_BR.gmo and b/po/pt_BR.gmo differ
diff --git a/po/pt_BR.po b/po/pt_BR.po
index cd8c973..31f152f 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: cracklib\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-01 09:58-0500\n"
+"Report-Msgid-Bugs-To: cracklib-devel at lists.sourceforge.net\n"
+"POT-Creation-Date: 2014-10-05 10:58-0500\n"
"PO-Revision-Date: 2005-08-18 15:02+0000\n"
"Last-Translator: Novell Language <language at novell.com>\n"
"Language-Team: Novell Language <language at novell.com>\n"
diff --git a/po/ru.gmo b/po/ru.gmo
index baca351..1cfe2a8 100644
Binary files a/po/ru.gmo and b/po/ru.gmo differ
diff --git a/po/ru.po b/po/ru.po
index 73e7461..5f71ef4 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,8 +7,8 @@
msgid ""
msgstr ""
"Project-Id-Version: cracklib\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-01 09:58-0500\n"
+"Report-Msgid-Bugs-To: cracklib-devel at lists.sourceforge.net\n"
+"POT-Creation-Date: 2014-10-05 10:58-0500\n"
"PO-Revision-Date: 2009-12-03 10:17+1100\n"
"Last-Translator: Yulia <ypoyarko at redhat.com>\n"
"Language-Team: \n"
diff --git a/po/sk.gmo b/po/sk.gmo
index 7ec35fa..0ef02c1 100644
Binary files a/po/sk.gmo and b/po/sk.gmo differ
diff --git a/po/sk.po b/po/sk.po
index 0b4837a..2efb1d7 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,8 +5,8 @@
msgid ""
msgstr ""
"Project-Id-Version: cracklib\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-01 09:58-0500\n"
+"Report-Msgid-Bugs-To: cracklib-devel at lists.sourceforge.net\n"
+"POT-Creation-Date: 2014-10-05 10:58-0500\n"
"PO-Revision-Date: 2005-06-23 13:12+02:00\n"
"Last-Translator: Stanislav Visnovsky <visnov at suse.cz>\n"
"Language-Team: Slovak <sk-i18n at linux.sk>\n"
diff --git a/po/sl_SI.gmo b/po/sl_SI.gmo
index 46243a0..cbcf740 100644
Binary files a/po/sl_SI.gmo and b/po/sl_SI.gmo differ
diff --git a/po/sl_SI.po b/po/sl_SI.po
index 1acf9a5..593038a 100644
--- a/po/sl_SI.po
+++ b/po/sl_SI.po
@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: sl_SI\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-01 09:58-0500\n"
+"Report-Msgid-Bugs-To: cracklib-devel at lists.sourceforge.net\n"
+"POT-Creation-Date: 2014-10-05 10:58-0500\n"
"PO-Revision-Date: 2005-08-21 18:02+0200\n"
"Last-Translator: Janez Krek <janez.krek at euroteh.si>\n"
"Language-Team: Slovenščina <sl at li.org>\n"
diff --git a/po/ta.gmo b/po/ta.gmo
index cef747b..f298eae 100644
Binary files a/po/ta.gmo and b/po/ta.gmo differ
diff --git a/po/ta.po b/po/ta.po
index a159f2d..7b52802 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: cracklib.default.cracklib\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-01 09:58-0500\n"
+"Report-Msgid-Bugs-To: cracklib-devel at lists.sourceforge.net\n"
+"POT-Creation-Date: 2014-10-05 10:58-0500\n"
"PO-Revision-Date: 2009-11-11 14:21+0530\n"
"Last-Translator: I. Felix <ifelix at redhat.com>\n"
"Language-Team: Tamil <fedora-trans-ta at redhat.com>\n"
diff --git a/po/te.gmo b/po/te.gmo
index 5f55a96..2b3c66d 100644
Binary files a/po/te.gmo and b/po/te.gmo differ
diff --git a/po/te.po b/po/te.po
index ee1340c..5232b7d 100644
--- a/po/te.po
+++ b/po/te.po
@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: cracklib\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-01 09:58-0500\n"
+"Report-Msgid-Bugs-To: cracklib-devel at lists.sourceforge.net\n"
+"POT-Creation-Date: 2014-10-05 10:58-0500\n"
"PO-Revision-Date: 2009-11-11 15:13+0530\n"
"Last-Translator: Krishna Babu K <kkrothap at redhat.com>\n"
"Language-Team: Telugu <en at li.org>\n"
diff --git a/po/tr.gmo b/po/tr.gmo
index 137c5e8..af9c6b8 100644
Binary files a/po/tr.gmo and b/po/tr.gmo differ
diff --git a/po/tr.po b/po/tr.po
index 4adf037..82a7485 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: cracklib\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-01 09:58-0500\n"
+"Report-Msgid-Bugs-To: cracklib-devel at lists.sourceforge.net\n"
+"POT-Creation-Date: 2014-10-05 10:58-0500\n"
"PO-Revision-Date: 2006-03-12 22:56+0200\n"
"Last-Translator: Görkem Çetin <gorkem at uludag.org.tr>\n"
"Language-Team: <yerellestirme at kde.org.tr>\n"
diff --git a/po/uk.gmo b/po/uk.gmo
index d83e3b9..45e9124 100644
Binary files a/po/uk.gmo and b/po/uk.gmo differ
diff --git a/po/uk.po b/po/uk.po
index 10931c3..07722dc 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -5,8 +5,8 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-01 09:58-0500\n"
+"Report-Msgid-Bugs-To: cracklib-devel at lists.sourceforge.net\n"
+"POT-Creation-Date: 2014-10-05 10:58-0500\n"
"PO-Revision-Date: 2010-04-16 19:43+0300\n"
"Last-Translator: Yuri Chornoivan <yurchor at ukr.net>\n"
"Language-Team: Ukrainian <translation at linux.org.ua>\n"
diff --git a/po/zh_CN.gmo b/po/zh_CN.gmo
index 479b0c5..9574673 100644
Binary files a/po/zh_CN.gmo and b/po/zh_CN.gmo differ
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 5216e59..14f4c2e 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: cracklib\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-01 09:58-0500\n"
+"Report-Msgid-Bugs-To: cracklib-devel at lists.sourceforge.net\n"
+"POT-Creation-Date: 2014-10-05 10:58-0500\n"
"PO-Revision-Date: 2010-09-22 10:07+1000\n"
"Last-Translator: Leah Liu <lliu at redhat.com>\n"
"Language-Team: Wei Liu\n"
diff --git a/po/zh_TW.gmo b/po/zh_TW.gmo
index 47d1e0d..b9be99e 100644
Binary files a/po/zh_TW.gmo and b/po/zh_TW.gmo differ
diff --git a/po/zh_TW.po b/po/zh_TW.po
index b8c33b2..e14082b 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: cracklib\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-01 09:58-0500\n"
+"Report-Msgid-Bugs-To: cracklib-devel at lists.sourceforge.net\n"
+"POT-Creation-Date: 2014-10-05 10:58-0500\n"
"PO-Revision-Date: 2005-06-23 12:52+0200\n"
"Last-Translator: Novell Language <language at novell.com>\n"
"Language-Team: Novell Language <language at novell.com>\n"
diff --git a/python/Makefile.in b/python/Makefile.in
index ac4584e..eb44457 100644
--- a/python/Makefile.in
+++ b/python/Makefile.in
@@ -64,7 +64,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
- $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.in
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
@@ -218,11 +218,6 @@ VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-XMKMF = @XMKMF@
-X_CFLAGS = @X_CFLAGS@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_LIBS = @X_LIBS@
-X_PRE_LIBS = @X_PRE_LIBS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/python/cracklib.py b/python/cracklib.py
index aee9a0d..9de7e89 100644
--- a/python/cracklib.py
+++ b/python/cracklib.py
@@ -57,12 +57,12 @@ def distdifferent(old, new, i, j):
cval = 0
else:
cval = old[i - 1]
-
- if j == 0 or len(new) <= i:
+
+ if j == 0 or len(new) <= j:
dval = 0
else:
dval = new[j - 1]
-
+
return cval != dval
@@ -70,7 +70,7 @@ def distcalculate(distances, old, new, i, j):
"""Calculates the distance between two strings.
"""
tmp = 0
-
+
if distances[i][j] != -1:
return distances[i][j]
@@ -93,7 +93,7 @@ def distance(old, new):
distances = [ [] for i in range(oldlength + 1) ]
for i in range(oldlength + 1):
distances[i] = [ -1 for j in range(newlength + 1) ]
-
+
for i in range(oldlength + 1):
distances[i][0] = i
for j in range(newlength + 1):
@@ -114,7 +114,7 @@ def similar(old, new):
"""
if distance(old, new) >= DIFF_OK:
return 0
-
+
if len(new) >= (len(old) * 2):
return 0
@@ -164,12 +164,12 @@ def simple(new):
size = size - digits
elif digits < (DIG_CREDIT * -1):
return 1
-
+
if UP_CREDIT >= 0:
size = size - uppers
elif uppers < (UP_CREDIT * -1):
return 1
-
+
if LOW_CREDIT >= 0:
size = size - lowers
elif lowers < (LOW_CREDIT * -1):
@@ -182,7 +182,7 @@ def simple(new):
if len(new) < size:
return 1
-
+
return 0
@@ -193,7 +193,7 @@ def VeryFascistCheck(new, old = None, dictpath = None):
if old != None:
if new == old:
raise ValueError("is the same as the old one")
-
+
oldmono = old.lower()
newmono = new.lower()
wrapped = old + old
@@ -204,7 +204,7 @@ def VeryFascistCheck(new, old = None, dictpath = None):
raise ValueError("is rotated")
if similar(oldmono, newmono):
raise ValueError("is too similar to the old one")
-
+
if dictpath == None:
FascistCheck(new)
else:
diff --git a/python/setup.py.in b/python/setup.py.in
index 4a258a0..4c70de4 100644
--- a/python/setup.py.in
+++ b/python/setup.py.in
@@ -23,8 +23,8 @@ from setuptools import setup, Extension, find_packages
extensions = [
Extension("_cracklib",
- ["_cracklib.c"],
- include_dirs = ["@top_builddir@/lib"],
+ ["@srcdir@/_cracklib.c"],
+ include_dirs = ["@top_srcdir@/lib"],
libraries = ["crack"],
library_dirs = ["@top_builddir@/lib/.libs"]),
]
@@ -43,6 +43,7 @@ convenience functions.
url="http://cracklib.sourceforge.net/",
license="GPLv2+",
py_modules=['cracklib', 'test_cracklib'],
+ package_dir={'': '@srcdir@'},
ext_modules=extensions,
zip_safe=False,
classifiers=[
diff --git a/util/Makefile.am b/util/Makefile.am
index 6a570e8..f2825bf 100644
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -1,10 +1,8 @@
sbin_PROGRAMS = cracklib-packer cracklib-unpacker cracklib-check
-noinst_PROGRAMS = testlib testnum teststr
+check_PROGRAMS = testlib testnum teststr
-sbin_SCRIPTS = create-cracklib-dict cracklib-format
-
-EXTRA_DIST = create-cracklib-dict cracklib-format
+dist_sbin_SCRIPTS = create-cracklib-dict cracklib-format
LDADD = ../lib/libcrack.la
diff --git a/util/Makefile.in b/util/Makefile.in
index 9395b31..25b1a3b 100644
--- a/util/Makefile.in
+++ b/util/Makefile.in
@@ -54,9 +54,10 @@ build_triplet = @build@
host_triplet = @host@
sbin_PROGRAMS = cracklib-packer$(EXEEXT) cracklib-unpacker$(EXEEXT) \
cracklib-check$(EXEEXT)
-noinst_PROGRAMS = testlib$(EXEEXT) testnum$(EXEEXT) teststr$(EXEEXT)
+check_PROGRAMS = testlib$(EXEEXT) testnum$(EXEEXT) teststr$(EXEEXT)
subdir = util
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(dist_sbin_SCRIPTS) $(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/intlmacosx.m4 \
@@ -65,7 +66,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
- $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.in
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
@@ -73,7 +74,7 @@ CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
am__installdirs = "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(sbindir)"
-PROGRAMS = $(noinst_PROGRAMS) $(sbin_PROGRAMS)
+PROGRAMS = $(sbin_PROGRAMS)
am_cracklib_check_OBJECTS = check.$(OBJEXT)
cracklib_check_OBJECTS = $(am_cracklib_check_OBJECTS)
cracklib_check_DEPENDENCIES = $(LDADD)
@@ -119,7 +120,7 @@ am__uninstall_files_from_dir = { \
|| { echo " ( cd '$$dir' && rm -f" $$files ")"; \
$(am__cd) "$$dir" && rm -f $$files; }; \
}
-SCRIPTS = $(sbin_SCRIPTS)
+SCRIPTS = $(dist_sbin_SCRIPTS)
DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
@@ -232,11 +233,6 @@ VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-XMKMF = @XMKMF@
-X_CFLAGS = @X_CFLAGS@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_LIBS = @X_LIBS@
-X_PRE_LIBS = @X_PRE_LIBS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
@@ -293,8 +289,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-sbin_SCRIPTS = create-cracklib-dict cracklib-format
-EXTRA_DIST = create-cracklib-dict cracklib-format
+dist_sbin_SCRIPTS = create-cracklib-dict cracklib-format
LDADD = ../lib/libcrack.la
AM_CPPFLAGS = -I. -I.. -I$(top_srcdir)/lib '-DDEFAULT_CRACKLIB_DICT="$(DEFAULT_CRACKLIB_DICT)"' -Wall
cracklib_check_SOURCES = check.c
@@ -344,8 +339,8 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
-clean-noinstPROGRAMS:
- @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
+clean-checkPROGRAMS:
+ @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \
echo " rm -f" $$list; \
rm -f $$list || exit $$?; \
test -n "$(EXEEXT)" || exit 0; \
@@ -416,9 +411,9 @@ testnum$(EXEEXT): $(testnum_OBJECTS) $(testnum_DEPENDENCIES) $(EXTRA_testnum_DEP
teststr$(EXEEXT): $(teststr_OBJECTS) $(teststr_DEPENDENCIES) $(EXTRA_teststr_DEPENDENCIES)
@rm -f teststr$(EXEEXT)
$(LINK) $(teststr_OBJECTS) $(teststr_LDADD) $(LIBS)
-install-sbinSCRIPTS: $(sbin_SCRIPTS)
+install-dist_sbinSCRIPTS: $(dist_sbin_SCRIPTS)
@$(NORMAL_INSTALL)
- @list='$(sbin_SCRIPTS)'; test -n "$(sbindir)" || list=; \
+ @list='$(dist_sbin_SCRIPTS)'; test -n "$(sbindir)" || list=; \
if test -n "$$list"; then \
echo " $(MKDIR_P) '$(DESTDIR)$(sbindir)'"; \
$(MKDIR_P) "$(DESTDIR)$(sbindir)" || exit 1; \
@@ -445,9 +440,9 @@ install-sbinSCRIPTS: $(sbin_SCRIPTS)
} \
; done
-uninstall-sbinSCRIPTS:
+uninstall-dist_sbinSCRIPTS:
@$(NORMAL_UNINSTALL)
- @list='$(sbin_SCRIPTS)'; test -n "$(sbindir)" || exit 0; \
+ @list='$(dist_sbin_SCRIPTS)'; test -n "$(sbindir)" || exit 0; \
files=`for p in $$list; do echo "$$p"; done | \
sed -e 's,.*/,,;$(transform)'`; \
dir='$(DESTDIR)$(sbindir)'; $(am__uninstall_files_from_dir)
@@ -575,6 +570,7 @@ distdir: $(DISTFILES)
fi; \
done
check-am: all-am
+ $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
check: check-am
all-am: Makefile $(PROGRAMS) $(SCRIPTS)
installdirs:
@@ -613,7 +609,7 @@ maintainer-clean-generic:
@echo "it deletes files that may require special tools to rebuild."
clean: clean-am
-clean-am: clean-generic clean-libtool clean-noinstPROGRAMS \
+clean-am: clean-checkPROGRAMS clean-generic clean-libtool \
clean-sbinPROGRAMS mostlyclean-am
distclean: distclean-am
@@ -640,7 +636,7 @@ install-dvi: install-dvi-am
install-dvi-am:
-install-exec-am: install-sbinPROGRAMS install-sbinSCRIPTS
+install-exec-am: install-dist_sbinSCRIPTS install-sbinPROGRAMS
install-html: install-html-am
@@ -680,24 +676,25 @@ ps: ps-am
ps-am:
-uninstall-am: uninstall-sbinPROGRAMS uninstall-sbinSCRIPTS
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-libtool clean-noinstPROGRAMS clean-sbinPROGRAMS ctags \
- distclean distclean-compile distclean-generic \
- distclean-libtool distclean-tags distdir dvi dvi-am html \
- html-am info info-am install install-am install-data \
- install-data-am install-dvi install-dvi-am install-exec \
- install-exec-am install-html install-html-am install-info \
- install-info-am install-man install-pdf install-pdf-am \
- install-ps install-ps-am install-sbinPROGRAMS \
- install-sbinSCRIPTS install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-compile mostlyclean-generic \
- mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
- uninstall-am uninstall-sbinPROGRAMS uninstall-sbinSCRIPTS
+uninstall-am: uninstall-dist_sbinSCRIPTS uninstall-sbinPROGRAMS
+
+.MAKE: check-am install-am install-strip
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean \
+ clean-checkPROGRAMS clean-generic clean-libtool \
+ clean-sbinPROGRAMS ctags distclean distclean-compile \
+ distclean-generic distclean-libtool distclean-tags distdir dvi \
+ dvi-am html html-am info info-am install install-am \
+ install-data install-data-am install-dist_sbinSCRIPTS \
+ 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-sbinPROGRAMS install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ tags uninstall uninstall-am uninstall-dist_sbinSCRIPTS \
+ uninstall-sbinPROGRAMS
# Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/util/packer.c b/util/packer.c
index cfb57a2..70075eb 100644
--- a/util/packer.c
+++ b/util/packer.c
@@ -1,7 +1,7 @@
/*
- * This program is copyright Alec Muffett 1993, portions copyright other authors.
+ * This program is copyright Alec Muffett 1993, portions copyright other authors.
* The authors disclaim all responsibility or liability with respect to it's usage
- * or its effect upon hardware or computer systems.
+ * or its effect upon hardware or computer systems.
*/
#include <stdio.h>
@@ -27,7 +27,7 @@ main(argc, argv)
{
file = DEFAULT_CRACKLIB_DICT;
}
- else
+ else
{
file = argv[1];
}
diff --git a/util/testlib.c b/util/testlib.c
index 4a2465d..0a57783 100644
--- a/util/testlib.c
+++ b/util/testlib.c
@@ -22,7 +22,7 @@ main ()
while (fgets (buffer, 1000, stdin))
{
const char *val;
-
+
Chop(buffer);
val = FascistCheck(buffer, NULL);
@@ -30,7 +30,7 @@ main ()
if (!val)
{
val = "ok";
- }
+ }
printf ("%s: %s\n", buffer, val);
}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cracklib/pkg-cracklib.git
More information about the Pkg-cracklib-commits
mailing list