rpms/cracklib/devel cracklib-2.8.9-docstring.patch, 1.1, 1.2 cracklib-2.8.9-suffix.patch, 1.1, 1.2 cracklib.spec, 1.39, 1.40 cracklib.spec.fc7, 1.2, NONE

[Nalin Somabhai Dahyabhai (nalin)]

Author: nalin

Update of /cvs/pkgs/rpms/cracklib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27430

Modified Files:
	cracklib-2.8.9-docstring.patch cracklib-2.8.9-suffix.patch 
	cracklib.spec 
Removed Files:
	cracklib.spec.fc7 
Log Message:
- improve reports of out-of-memory exceptions so that they don't include a
  bogus filename
- improve reports of file-missing exceptions from the python module so that
  they give the right filename (#225858)


cracklib-2.8.9-docstring.patch:

Index: cracklib-2.8.9-docstring.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cracklib/devel/cracklib-2.8.9-docstring.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cracklib-2.8.9-docstring.patch	29 Jan 2007 22:30:35 -0000	1.1
+++ cracklib-2.8.9-docstring.patch	20 Jun 2007 18:39:28 -0000	1.2
@@ -9,7 +9,7 @@
  cracklib_FascistCheck(PyObject *self, PyObject *args, PyObject *kwargs)
  {
 -    int i;
-     char *candidate, *dict;
+     char *candidate, *dict, *dictfile;
      const char *result;
      struct stat st;
 @@ -96,12 +95,21 @@

cracklib-2.8.9-suffix.patch:

Index: cracklib-2.8.9-suffix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cracklib/devel/cracklib-2.8.9-suffix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cracklib-2.8.9-suffix.patch	25 Jan 2007 17:33:12 -0000	1.1
+++ cracklib-2.8.9-suffix.patch	20 Jun 2007 18:39:28 -0000	1.2
@@ -1,6 +1,6 @@
---- cracklib-2.8.9/python/cracklibmodule.c	2007-01-25 12:16:30.000000000 -0500
-+++ cracklib-2.8.9/python/cracklibmodule.c	2007-01-25 12:16:32.000000000 -0500
-@@ -19,6 +19,8 @@
+--- cracklib-2.8.9/python/cracklibmodule.c.suffix	2005-09-26 16:42:34.000000000 -0400
++++ cracklib-2.8.9/python/cracklibmodule.c	2007-06-20 14:16:52.000000000 -0400
+@@ -19,11 +19,13 @@ static pthread_mutex_t cracklib_mutex = 
  #define UNLOCK()
  #endif
  
@@ -9,15 +9,13 @@
  static PyObject *
  cracklib_FascistCheck(PyObject *self, PyObject *args, PyObject *kwargs)
  {
-@@ -27,6 +29,7 @@
+     int i;
+-    char *candidate, *dict;
++    char *candidate, *dict, *dictfile;
      const char *result;
      struct stat st;
      char *keywords[] = {"pw", "dictpath", NULL};
-+    char *dictfile;
- 
-     self = NULL;
-     candidate = NULL;
-@@ -52,14 +55,23 @@
+@@ -52,17 +54,26 @@ cracklib_FascistCheck(PyObject *self, Py
                              "second argument was not an absolute path!");
              return NULL;
          }
@@ -25,13 +23,14 @@
 +        dictfile = malloc(strlen(dict) + sizeof(DICT_SUFFIX));
 +        if (dictfile == NULL)
 +        {
-+            PyErr_SetFromErrnoWithFilename(PyExc_OSError, dict);
++            PyErr_SetFromErrno(PyExc_MemoryError);
 +            return NULL;
 +        }
 +        sprintf(dictfile, "%s" DICT_SUFFIX, dict);
 +        if (lstat(dictfile, &st) == -1)
          {
-             PyErr_SetFromErrnoWithFilename(PyExc_OSError, dict);
+-            PyErr_SetFromErrnoWithFilename(PyExc_OSError, dict);
++            PyErr_SetFromErrnoWithFilename(PyExc_OSError, dictfile);
 +            free(dictfile);
              return NULL;
          }
@@ -42,4 +41,8 @@
 +        if (lstat(DEFAULT_CRACKLIB_DICT DICT_SUFFIX, &st) == -1)
          {
              PyErr_SetFromErrnoWithFilename(PyExc_OSError,
-                                            DEFAULT_CRACKLIB_DICT);
+-                                           DEFAULT_CRACKLIB_DICT);
++                                           DEFAULT_CRACKLIB_DICT DICT_SUFFIX);
+             return NULL;
+         }
+     }


Index: cracklib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cracklib/devel/cracklib.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- cracklib.spec	12 Mar 2007 23:19:00 -0000	1.39
+++ cracklib.spec	20 Jun 2007 18:39:28 -0000	1.40
@@ -4,7 +4,7 @@
 Summary: A password-checking library
 Name: cracklib
 Version: 2.8.9
-Release: 10
+Release: 11
 Group: System Environment/Libraries
 Source0: http://prdownloads.sourceforge.net/cracklib/cracklib-%{version}.tar.gz
 
@@ -184,6 +184,12 @@
 %{_libdir}/python*/site-packages/cracklibmodule.so
 
 %changelog
+* Wed Jun 20 2007 Nalin Dahyabhai <nalin at redhat.com> - 2.8.9-11
+- improve reports of out-of-memory exceptions so that they don't include a
+  bogus filename
+- improve reports of file-missing exceptions from the python module so that
+  they give the right filename (#225858)
+
 * Mon Mar 12 2007 Nalin Dahyabhai <nalin at redhat.com> - 2.8.9-10
 - explicitly include required headers from <packer.h> (#228698)
 - attempt to provide doc strings in the python module


--- cracklib.spec.fc7 DELETED ---