From dce5bd911cd89a26bac429b3c084d050ee244eff Mon Sep 17 00:00:00 2001 From: Nalin Dahyabhai Date: Jan 25 2008 18:50:10 +0000 Subject: - update to 2.8.12, which relicenses to GPLv2 License note: consumers of this package in the development repository are pam (pam_cracklib is BSD or GPL), netatalk (GPL), revelation (GPLv2+), which should all prefer this license to the previous one ("Artistic"). --- diff --git a/.cvsignore b/.cvsignore index 2c2c93a..4b49299 100644 --- a/.cvsignore +++ b/.cvsignore @@ -36,3 +36,4 @@ cracklib-2.8.6.tar.gz cracklib-2.8.9.tar.gz pass_file.gz cracklib-2.8.10.tar.gz +cracklib-2.8.12.tar.gz diff --git a/cracklib-2.8.12-inttypes.patch b/cracklib-2.8.12-inttypes.patch new file mode 100644 index 0000000..8a5b82c --- /dev/null +++ b/cracklib-2.8.12-inttypes.patch @@ -0,0 +1,65 @@ +--- cracklib-2.8.9/configure.in 2006-02-17 14:49:12.000000000 -0500 ++++ cracklib-2.8.9/configure.in 2007-03-12 18:47:32.000000000 -0400 +@@ -23,6 +23,19 @@ + AC_CHECK_HEADERS(stdint.h) + AC_CHECK_HEADERS(pthread.h) + ++if test x$ac_cv_header_inttypes_h = xyes ; then ++ CRACKLIB_INTEGER_TYPES1="#include " ++ CRACKLIB_INTEGER_TYPES2= ++elif test x$ac_cv_header_stdint_h = xyes ; then ++ CRACKLIB_INTEGER_TYPES1="#include " ++ 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, +@@ -87,6 +100,8 @@ + dnl Handle local dict compiling properly + AC_SUBST(CROSS_COMPILING, $cross_compiling) + +-AC_OUTPUT(util/Makefile lib/Makefile doc/Makefile python/Makefile Makefile \ +- po/Makefile.in m4/Makefile dicts/Makefile cracklib.spec) ++AC_CONFIG_FILES(util/Makefile lib/Makefile doc/Makefile python/Makefile \ ++ Makefile po/Makefile.in m4/Makefile dicts/Makefile \ ++ cracklib.spec lib/packer.h) ++AC_OUTPUT + +--- cracklib-2.8.9/lib/packer.h.in 2007-03-12 18:47:32.000000000 -0400 ++++ cracklib-2.8.9/lib/packer.h.in 2007-03-12 18:49:50.000000000 -0400 +@@ -32,17 +32,8 @@ + #define _(String) (String) + #endif + +-#if defined(HAVE_INTTYPES_H) +-#include +-#else +-#if defined(HAVE_STDINT_H) +-#include +-#else +-typedef unsigned int uint32_t; +-typedef unsigned short uint16_t; +-#endif +-#endif +- ++@CRACKLIB_INTEGER_TYPES1@ ++@CRACKLIB_INTEGER_TYPES2@ + + struct pi_header + { +@@ -84,6 +75,9 @@ + int dummy; + } PWDICT; + ++@CRACKLIB_INTEGER_TYPES1@ ++@CRACKLIB_INTEGER_TYPES2@ ++ + #endif + + extern PWDICT *PWOpen(const char *prefix, char *mode); diff --git a/cracklib-2.8.9-inttypes.patch b/cracklib-2.8.9-inttypes.patch deleted file mode 100644 index 416d424..0000000 --- a/cracklib-2.8.9-inttypes.patch +++ /dev/null @@ -1,64 +0,0 @@ ---- cracklib-2.8.9/configure.in 2006-02-17 14:49:12.000000000 -0500 -+++ cracklib-2.8.9/configure.in 2007-03-12 18:47:32.000000000 -0400 -@@ -23,6 +23,19 @@ - AC_CHECK_HEADERS(stdint.h) - AC_CHECK_HEADERS(pthread.h) - -+if test x$ac_cv_header_inttypes_h = xyes ; then -+ CRACKLIB_INTEGER_TYPES1="#include " -+ CRACKLIB_INTEGER_TYPES2= -+elif test x$ac_cv_header_stdint_h = xyes ; then -+ CRACKLIB_INTEGER_TYPES1="#include " -+ 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, -@@ -87,6 +100,7 @@ - dnl Handle local dict compiling properly - AC_SUBST(CROSS_COMPILING, $cross_compiling) - --AC_OUTPUT(util/Makefile lib/Makefile doc/Makefile python/Makefile Makefile \ -- po/Makefile.in m4/Makefile cracklib.spec) -+AC_CONFIG_FILES(util/Makefile lib/Makefile doc/Makefile python/Makefile \ -+ Makefile po/Makefile.in m4/Makefile cracklib.spec lib/packer.h) -+AC_OUTPUT - ---- cracklib-2.8.9/lib/packer.h.in 2007-03-12 18:47:32.000000000 -0400 -+++ cracklib-2.8.9/lib/packer.h.in 2007-03-12 18:49:50.000000000 -0400 -@@ -32,17 +32,8 @@ - #define _(String) (String) - #endif - --#if defined(HAVE_INTTYPES_H) --#include --#else --#if defined(HAVE_STDINT_H) --#include --#else --typedef unsigned int uint32_t; --typedef unsigned short uint16_t; --#endif --#endif -- -+@CRACKLIB_INTEGER_TYPES1@ -+@CRACKLIB_INTEGER_TYPES2@ - - struct pi_header - { -@@ -84,6 +75,9 @@ - int dummy; - } PWDICT; - -+@CRACKLIB_INTEGER_TYPES1@ -+@CRACKLIB_INTEGER_TYPES2@ -+ - #endif - - extern PWDICT *PWOpen(const char *prefix, char *mode); diff --git a/cracklib.spec b/cracklib.spec index 9545ef5..4894d0b 100644 --- a/cracklib.spec +++ b/cracklib.spec @@ -3,8 +3,8 @@ Summary: A password-checking library Name: cracklib -Version: 2.8.10 -Release: 3 +Version: 2.8.12 +Release: 1 Group: System Environment/Libraries Source0: http://prdownloads.sourceforge.net/cracklib/cracklib-%{version}.tar.gz @@ -43,10 +43,10 @@ Source36: ftp://ftp.cerias.purdue.edu/pub/dict/wordlists/names/surnames.finnish. Source37: pass_file.gz Patch0: cracklib-2.8.10-suffix.patch -Patch1: cracklib-2.8.9-inttypes.patch +Patch1: cracklib-2.8.12-inttypes.patch Patch2: cracklib-2.8.10-docstring.patch URL: http://sourceforge.net/projects/cracklib/ -License: Artistic +License: GPLv2 Buildroot: %{_tmppath}/%{name}-%{version}-root BuildRequires: python-devel, words, automake, libtool Conflicts: cracklib-dicts < 2.8 @@ -208,6 +208,9 @@ EOF %{_libdir}/python*/site-packages/cracklibmodule.so %changelog +* Fri Jan 25 2008 Nalin Dahyabhai - 2.8.12-1 +- update to 2.8.12, which was relicensed to GPLv2 + * Tue Aug 21 2007 Nalin Dahyabhai - 2.8.10-3 - rebuild diff --git a/sources b/sources index 64aeabe..7db85d3 100644 --- a/sources +++ b/sources @@ -27,4 +27,4 @@ a2bd31ce25a3057b61d2e5a1182d93a9 sf.gz c03b38448aefcde059e6fcfb20784f2c surnames.finnish.gz 6e76a087a646ede5eba05e9259fd84d4 pass_file.gz d18e670e5df560a8745e1b4dede8f84f cracklib-words.gz -555f7832b63ebc7fb70b0373500c2358 cracklib-2.8.10.tar.gz +580346fa1012f9d9769192f49d3801fa cracklib-2.8.12.tar.gz