rpms/cracklib/devel cracklib-2.8.13-inttypes.patch, NONE, 1.1 cracklib-2.8.13-suffix.patch, NONE, 1.1 .cvsignore, 1.12, 1.13 cracklib.spec, 1.48, 1.49 sources, 1.14, 1.15 cracklib-2.8.10-docstring.patch, 1.2, NONE cracklib-2.8.10-suffix.patch, 1.2, NONE cracklib-2.8.12-inttypes.patch, 1.1, NONE

Tue Oct 28 18:01:11 UTC 2008

Author: nalin

Update of /cvs/pkgs/rpms/cracklib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv300

Modified Files:
	.cvsignore cracklib.spec sources 
Added Files:
	cracklib-2.8.13-inttypes.patch cracklib-2.8.13-suffix.patch 
Removed Files:
	cracklib-2.8.10-docstring.patch cracklib-2.8.10-suffix.patch 
	cracklib-2.8.12-inttypes.patch 
Log Message:
update to 2.8.13, which mainly overhauls the python bindings

cracklib-2.8.13-inttypes.patch:

--- NEW FILE cracklib-2.8.13-inttypes.patch ---
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.13/configure.in cracklib-2.8.13/configure.in
--- cracklib-2.8.13/configure.in	2008-09-23 07:53:24.000000000 -0400
+++ cracklib-2.8.13/configure.in	2008-10-28 13:39:08.000000000 -0400
@@ -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,
@@ -90,6 +103,8 @@ AM_CONDITIONAL(BUILD_PYTHON,[test "$buil
 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
 
diff -up cracklib-2.8.13/lib/packer.h.in cracklib-2.8.13/lib/packer.h.in
--- cracklib-2.8.13/lib/packer.h.in	2008-10-28 13:38:25.000000000 -0400
+++ cracklib-2.8.13/lib/packer.h.in	2008-10-28 13:38:25.000000000 -0400
@@ -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
-
+ at CRACKLIB_INTEGER_TYPES1@
+ at CRACKLIB_INTEGER_TYPES2@
 
 struct pi_header
 {
@@ -83,6 +74,9 @@ typedef struct {
 	int dummy;
 } PWDICT;
 
+ at CRACKLIB_INTEGER_TYPES1@
+ at CRACKLIB_INTEGER_TYPES2@
+
 #endif
 
 extern PWDICT *PWOpen(const char *prefix, char *mode);

cracklib-2.8.13-suffix.patch:

--- NEW FILE cracklib-2.8.13-suffix.patch ---
Don't drop the file's extension when naming the file that we couldn't access.
diff -up cracklib-2.8.13/python/_cracklibmodule.c cracklib-2.8.13/python/_cracklibmodule.c
--- cracklib-2.8.13/python/_cracklibmodule.c	2008-10-28 13:17:48.000000000 -0400
+++ cracklib-2.8.13/python/_cracklibmodule.c	2008-10-28 13:17:54.000000000 -0400
@@ -100,7 +100,7 @@ _cracklib_FascistCheck(PyObject *self, P
         sprintf(dictfile, "%s" DICT_SUFFIX, dict);
         if (lstat(dictfile, &st) == -1)
         {
-            PyErr_SetFromErrnoWithFilename(PyExc_OSError, dict);
+            PyErr_SetFromErrnoWithFilename(PyExc_OSError, dictfile);
             free(dictfile);
             return NULL;
         }
@@ -110,7 +110,7 @@ _cracklib_FascistCheck(PyObject *self, P
         if (lstat(DEFAULT_CRACKLIB_DICT DICT_SUFFIX, &st) == -1)
         {
             PyErr_SetFromErrnoWithFilename(PyExc_OSError,
-                                           DEFAULT_CRACKLIB_DICT);
+                                           DEFAULT_CRACKLIB_DICT DICT_SUFFIX);
             return NULL;
         }
     }


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cracklib/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	25 Jan 2008 18:50:10 -0000	1.12
+++ .cvsignore	28 Oct 2008 18:00:40 -0000	1.13
@@ -37,3 +37,4 @@
 pass_file.gz
 cracklib-2.8.10.tar.gz
 cracklib-2.8.12.tar.gz
+cracklib-2.8.13.tar.gz


Index: cracklib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cracklib/devel/cracklib.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- cracklib.spec	28 Oct 2008 17:35:23 -0000	1.48
+++ cracklib.spec	28 Oct 2008 18:00:40 -0000	1.49
@@ -4,8 +4,8 @@
 
 Summary: A password-checking library
 Name: cracklib
-Version: 2.8.12
-Release: 3
+Version: 2.8.13
+Release: 1
 Group: System Environment/Libraries
 Source0: http://prdownloads.sourceforge.net/cracklib/cracklib-%{version}.tar.gz
 
@@ -43,10 +43,9 @@
 # No upstream source for this; it came in as a bugzilla attachment.
 Source37: pass_file.gz
 
-Patch0: cracklib-2.8.10-suffix.patch
-Patch1: cracklib-2.8.12-inttypes.patch
-Patch2: cracklib-2.8.10-docstring.patch
-Patch3: cracklib-2.8.12-gettext.patch
+Patch0: cracklib-2.8.13-suffix.patch
+Patch1: cracklib-2.8.13-inttypes.patch
+Patch2: cracklib-2.8.12-gettext.patch
 URL: http://sourceforge.net/projects/cracklib/
 License: GPLv2
 Buildroot: %{_tmppath}/%{name}-%{version}-root
@@ -108,8 +107,7 @@
 %patch0 -p1 -b .suffix
 cp lib/packer.h lib/packer.h.in
 %patch1 -p1 -b .inttypes
-%patch2 -p1 -b .docstring
-%patch3 -p1 -b .gettext
+%patch2 -p1 -b .gettext
 autoreconf -f -i
 mkdir cracklib-dicts
 for dict in %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} %{SOURCE14} \
@@ -215,6 +213,9 @@
 %{_libdir}/python*/site-packages/cracklibmodule.so
 
 %changelog
+* Tue Oct 28 2008 Nalin Dahyabhai <nalin at redhat.com> - 2.8.13-1
+- update to 2.8.13, which mainly overhauls the python bindings
+
 * Tue Oct 28 2008 Nalin Dahyabhai <nalin at redhat.com> - 2.8.12-3
 - fix errors rebuilding with libtool that's newer than the one upstream
   has (#467364)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cracklib/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	25 Jan 2008 18:50:10 -0000	1.14
+++ sources	28 Oct 2008 18:00:40 -0000	1.15
@@ -27,4 +27,4 @@
 c03b38448aefcde059e6fcfb20784f2c  surnames.finnish.gz
 6e76a087a646ede5eba05e9259fd84d4  pass_file.gz
 d18e670e5df560a8745e1b4dede8f84f  cracklib-words.gz
-580346fa1012f9d9769192f49d3801fa  cracklib-2.8.12.tar.gz
+5beb4c6b3c31c83fc98c4c225b25cd94  cracklib-2.8.13.tar.gz


--- cracklib-2.8.10-docstring.patch DELETED ---


--- cracklib-2.8.10-suffix.patch DELETED ---


--- cracklib-2.8.12-inttypes.patch DELETED ---


