cracklib: Update to 2.9.2

diff --git a/cracklib/cracklib.nm b/cracklib/cracklib.nm
index 93a3464a335b47ffaeb1bb72796f5c5ef0445ca9..d9d666f9aa27af89c3d49bd2b278bde594421502 100644 (file)
--- a/cracklib/cracklib.nm
+++ b/cracklib/cracklib.nm
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = cracklib
-version    = 2.8.18
-release    = 2
+version    = 2.9.2
+release    = 1
 
 groups     = Security/Password
 url        = http://sourceforge.net/projects/cracklib/
@@ -27,9 +27,6 @@ sources   += cracklib-words-20080507.gz
 
 build
        requires
-               autoconf
-               automake
-               gettext-devel
                python-devel
        end
 
@@ -49,11 +46,6 @@ build
                cp lib/packer.h lib/packer.h.in
                chmod +x util/cracklib-format
 
-               # Apply all patches.
-               %{MACRO_PATCHES}
-
-               #autoreconf -fi
-
                mkdir cracklib-dicts
                cp -vf %{DIR_DL}/cracklib-words-20080507.gz cracklib-dicts
 

diff --git a/cracklib/patches/cracklib-2.8.12-gettext.patch b/cracklib/patches/cracklib-2.8.12-gettext.patch
deleted file mode 100644 (file)
index 8608187..0000000
--- a/cracklib/patches/cracklib-2.8.12-gettext.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Newer autopoint chokes if we don't explicitly list a version here.
-diff -up cracklib-2.8.12/configure.in cracklib-2.8.12/configure.in
---- cracklib-2.8.12/configure.in       2008-10-28 13:27:06.000000000 -0400
-+++ cracklib-2.8.12/configure.in       2008-10-28 13:27:07.000000000 -0400
-@@ -58,7 +58,7 @@ AC_CHECK_FUNCS(strdup)
- AC_CHECK_FUNCS(getpwuid_r)
- 
- dnl internationalization macros
--AM_GNU_GETTEXT_VERSION
-+AM_GNU_GETTEXT_VERSION(0.14)
- AM_GNU_GETTEXT([external])
- 
- dnl Control default dictname

diff --git a/cracklib/patches/cracklib-2.8.15-inttypes.patch b/cracklib/patches/cracklib-2.8.15-inttypes.patch
deleted file mode 100644 (file)
index d1d6a23..0000000
--- a/cracklib/patches/cracklib-2.8.15-inttypes.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-Don't depend on a consumer of <packer.h> to be using autoconf, and to be
-checking for for the presence of <inttypes.h> and <stdint.h>, and including
-its own "config.h" before including <packer.h>, in order for this to be
-correct on 64-bit machines.
-
-diff -up cracklib-2.8.15/configure.in cracklib-2.8.15/configure.in
---- cracklib-2.8.15/configure.in       2009-11-18 18:58:21.000000000 -0500
-+++ cracklib-2.8.15/configure.in       2009-12-01 15:16:35.000000000 -0500
-@@ -26,6 +26,19 @@ AC_CHECK_HEADERS(zlib.h, AC_DEFINE(HAVE_
- 
- AC_SEARCH_LIBS(gzopen, z)
- 
-+if test x$ac_cv_header_inttypes_h = xyes ; then
-+      CRACKLIB_INTEGER_TYPES1="#include <inttypes.h>"
-+      CRACKLIB_INTEGER_TYPES2=
-+elif test x$ac_cv_header_stdint_h = xyes ; then
-+      CRACKLIB_INTEGER_TYPES1="#include <stdint.h>"
-+      CRACKLIB_INTEGER_TYPES2=
-+else
-+      CRACKLIB_INTEGER_TYPES1="typedef unsigned int uint32_t;"
-+      CRACKLIB_INTEGER_TYPES2="typedef unsigned short uint16_t;"
-+fi
-+AC_SUBST(CRACKLIB_INTEGER_TYPES1)
-+AC_SUBST(CRACKLIB_INTEGER_TYPES2)
-+
- dnl Cygwin workaround
- AC_MSG_CHECKING(if LINE_MAX is defined)
- AC_EGREP_CPP(yes,
-@@ -92,5 +105,6 @@ AC_SUBST(CROSS_COMPILING, $cross_compili
- 
- AC_OUTPUT(util/Makefile lib/Makefile doc/Makefile python/Makefile Makefile \
-               python/setup.py \
-+              lib/packer.h \
-               po/Makefile.in m4/Makefile dicts/Makefile cracklib.spec)
- 
-diff -up cracklib-2.8.15/lib/packer.h.in cracklib-2.8.15/lib/packer.h.in
---- cracklib-2.8.15/lib/packer.h.in    2009-12-01 15:15:38.000000000 -0500
-+++ cracklib-2.8.15/lib/packer.h.in    2009-12-01 15:15:38.000000000 -0500
-@@ -30,17 +30,8 @@
- #define _(String) (String)
- #endif
- 
--#if defined(HAVE_INTTYPES_H)
--#include <inttypes.h>
--#else
--#if defined(HAVE_STDINT_H)
--#include <stdint.h>
--#else
--typedef unsigned int uint32_t;
--typedef unsigned short uint16_t;
--#endif
--#endif
--
-+@CRACKLIB_INTEGER_TYPES1@
-+@CRACKLIB_INTEGER_TYPES2@
- 
- struct pi_header
- {
-@@ -83,6 +74,9 @@ typedef struct {
-       int dummy;
- } PWDICT;
- 
-+@CRACKLIB_INTEGER_TYPES1@
-+@CRACKLIB_INTEGER_TYPES2@
-+
- #endif
- 
- extern PWDICT *PWOpen(const char *prefix, char *mode);