Revisions of cracklib
Michael Calmer (mcalmer)
committed
(revision 2)
- update to version 2.8.13
* Compressed dictionary support and better python module
- remove zlib patch which is now upstream.
--This line, and those below, will be ignored--
D cracklib-2.8.12.tar.bz2
A cracklib-2.8.13.tar.bz2
D cracklib-zlib.dif
M cracklib.changes
M cracklib.spec
Diff for working copy: .
Index: cracklib.changes
===================================================================
--- cracklib.changes (revision 939067bfc4aca541bbe466b77b8cc766)
+++ cracklib.changes (working copy)
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed May 20 13:17:17 CEST 2009 - mc@suse.de
+
+- update to version 2.8.13
+ * Compressed dictionary support and better python module
+- remove zlib patch which is now upstream.
+
-------------------------------------------------------------------
Sat Apr 4 20:58:08 CEST 2009 - crrodriguez@suse.de
Index: cracklib.spec
===================================================================
--- cracklib.spec (revision 939067bfc4aca541bbe466b77b8cc766)
+++ cracklib.spec (working copy)
@@ -1,5 +1,5 @@
#
-# spec file for package cracklib (Version 2.8.12)
+# spec file for package cracklib (Version 2.8.13)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -29,7 +29,7 @@
Obsoletes: cracklib-64bit
%endif
#
-Version: 2.8.12
+Version: 2.8.13
Release: 58
Requires: cracklib-dict
Summary: Full Dictionary for cracklib
@@ -38,7 +38,6 @@
Patch: cracklib-magic.diff
Patch1: cracklib-trans.diff
Patch2: datarootdir.patch
-Patch3: cracklib-zlib.dif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -87,7 +86,6 @@
%patch
%patch1
%patch2
-%patch3 -p1
%build
AUTOPOINT=true autoreconf -fi
Index: cracklib-2.8.13.tar.bz2
===================================================================
Binary file cracklib-2.8.13.tar.bz2 has changed
Index: cracklib-2.8.12.tar.bz2
===================================================================
Binary file cracklib-2.8.12.tar.bz2 has changed
Index: cracklib-zlib.dif
===================================================================
--- cracklib-zlib.dif (revision 939067bfc4aca541bbe466b77b8cc766)
+++ cracklib-zlib.dif (working copy)
@@ -1,239 +1,0 @@
-Index: cracklib-2.8.12/lib/packlib.c
-===================================================================
---- cracklib-2.8.12.orig/lib/packlib.c
-+++ cracklib-2.8.12/lib/packlib.c
-@@ -7,6 +7,9 @@
- #include "config.h"
- #include <string.h>
- #include <stdlib.h>
-+#ifdef HAVE_ZLIB_H
-+#include <zlib.h>
-+#endif
- #ifdef HAVE_INTTYPES_H
- #include <inttypes.h>
- #endif
-@@ -82,15 +85,46 @@ PWOpen(prefix, mode)
- snprintf(dname, STRINGSIZE, "%s.pwd", prefix);
- snprintf(wname, STRINGSIZE, "%s.hwm", prefix);
-
-- if (!(pdesc.dfp = fopen(dname, mode)))
-+ if (mode[0] == 'r')
- {
-- perror(dname);
-- return ((PWDICT *) 0);
-- }
-+ pdesc.flags &= ~PFOR_USEZLIB;
-+ /* first try the normal db file */
-+ if (!(pdesc.dfp = fopen(dname, mode)))
-+ {
-+#ifdef HAVE_ZLIB_H
-+ pdesc.flags |= PFOR_USEZLIB;
-+ /* try extension .gz */
-+ snprintf(dname, STRINGSIZE, "%s.pwd.gz", prefix);
-+ if (!(pdesc.dfp = gzopen(dname, mode)))
-+ {
-+ perror(dname);
-+ return ((PWDICT *) 0);
-+ }
-+#else
-+ perror(dname);
-+ return ((PWDICT *) 0);
-+#endif
-+ }
-+ }
-+ else
-+ {
-+ pdesc.flags &= ~PFOR_USEZLIB;
-+ /* write mode: use fopen */
-+ if (!(pdesc.dfp = fopen(dname, mode)))
-+ {
-+ perror(dname);
-+ return ((PWDICT *) 0);
-+ }
-+ }
-
- if (!(pdesc.ifp = fopen(iname, mode)))
- {
-- fclose(pdesc.dfp);
-+#ifdef HAVE_ZLIB_H
-+ if(pdesc.flags & PFOR_USEZLIB)
-+ gzclose(pdesc.dfp);
-+ else
-+#endif
-+ fclose(pdesc.dfp);
- perror(iname);
- return ((PWDICT *) 0);
- }
-@@ -122,7 +156,12 @@ PWOpen(prefix, mode)
-
- pdesc.header.pih_magic = 0;
- fclose(ifp);
-- fclose(dfp);
-+#ifdef HAVE_ZLIB_H
-+ if(pdesc.flags & PFOR_USEZLIB)
-+ gzclose(dfp);
-+ else
-+#endif
-+ fclose(dfp);
- if(wfp)
- {
- fclose(wfp);
-@@ -140,7 +179,12 @@ PWOpen(prefix, mode)
-
- pdesc.header.pih_magic = 0;
- fclose(ifp);
-- fclose(dfp);
-+#ifdef HAVE_ZLIB_H
-+ if(pdesc.flags & PFOR_USEZLIB)
-+ gzclose(dfp);
-+ else
-+#endif
-+ fclose(dfp);
- if(wfp)
- {
- fclose(wfp);
-@@ -154,7 +198,13 @@ PWOpen(prefix, mode)
-
- pdesc.header.pih_magic = 0;
- fclose(ifp);
-- fclose(dfp);
-+#ifdef HAVE_ZLIB_H
-+ if(pdesc.flags & PFOR_USEZLIB)
-+ gzclose(dfp);
-+ else
-+#endif
-+ fclose(dfp);
-+
- if(wfp)
- {
- fclose(wfp);
-@@ -174,7 +224,13 @@ PWOpen(prefix, mode)
-
- pdesc.header.pih_magic = 0;
- fclose(ifp);
-- fclose(dfp);
-+#ifdef HAVE_ZLIB_H
-+ if(pdesc.flags & PFOR_USEZLIB)
-+ gzclose(dfp);
-+ else
-+#endif
-+ fclose(dfp);
-+
- if(wfp)
- {
- fclose(wfp);
-@@ -188,7 +244,12 @@ PWOpen(prefix, mode)
-
- pdesc.header.pih_magic = 0;
- fclose(ifp);
-- fclose(dfp);
-+#ifdef HAVE_ZLIB_H
-+ if(pdesc.flags & PFOR_USEZLIB)
-+ gzclose(dfp);
-+ else
-+#endif
-+ fclose(dfp);
- if(wfp)
- {
- fclose(wfp);
-@@ -202,8 +263,13 @@ PWOpen(prefix, mode)
-
- pdesc.header.pih_magic = 0;
- fclose(ifp);
-- fclose(dfp);
-- if(wfp)
-+#ifdef HAVE_ZLIB_H
-+ if(pdesc.flags & PFOR_USEZLIB)
-+ gzclose(dfp);
-+ else
-+#endif
-+ fclose(dfp);
-+ if(wfp)
- {
- fclose(wfp);
- }
-@@ -286,7 +352,12 @@ PWClose(pwp)
- }
-
- fclose(pwp->ifp);
-- fclose(pwp->dfp);
-+#ifdef HAVE_ZLIB_H
-+ if(pwp->flags & PFOR_USEZLIB)
-+ gzclose(pwp->dfp);
-+ else
-+#endif
-+ fclose(pwp->dfp);
- if(pwp->wfp)
- {
- fclose(pwp->wfp);
-@@ -414,13 +485,40 @@ GetPW(pwp, number)
- }
- }
-
-- if (fseek(pwp->dfp, datum, 0))
-+ int r = 1;
-+#ifdef HAVE_ZLIB_H
-+ if (pwp->flags & PFOR_USEZLIB)
-+ {
-+ r = gzseek(pwp->dfp, datum, 0);
-+ if(r >= 0)
-+ r = 0;
-+ }
-+ else
-+#endif
-+ r = fseek(pwp->dfp, datum, 0);
-+
-+
-+ if (r)
- {
- perror("(data fseek failed)");
- return ((char *) 0);
- }
--
-- if (!fread(buffer, 1, sizeof(buffer), pwp->dfp))
-+ r = 0;
-+
-+#ifdef HAVE_ZLIB_H
-+ if (pwp->flags & PFOR_USEZLIB)
-+ {
-+ r = gzread(pwp->dfp, buffer, sizeof(buffer));
-+ if(r < 0)
-+ r = 0;
-+ }
-+ else
-+#endif
-+ r = fread(buffer, 1, sizeof(buffer), pwp->dfp);
-+
-+
-+
-+ if (!r)
- {
- perror("(data fread failed)");
- return ((char *) 0);
-Index: cracklib-2.8.12/configure.in
-===================================================================
---- cracklib-2.8.12.orig/configure.in
-+++ cracklib-2.8.12/configure.in
-@@ -22,6 +22,9 @@ 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)
-
- dnl Cygwin workaround
- AC_MSG_CHECKING(if LINE_MAX is defined)
-Index: cracklib-2.8.12/lib/packer.h
-===================================================================
---- cracklib-2.8.12.orig/lib/packer.h
-+++ cracklib-2.8.12/lib/packer.h
-@@ -61,6 +61,8 @@ typedef struct
- #define PFOR_FLUSH 0x0002
- #define PFOR_USEHWMS 0x0004
-
-+#define PFOR_USEZLIB 0x0008
-+
- uint32_t hwms[256];
-
- struct pi_header header;
unknown
committed
(revision 1)
Displaying all 3 revisions
