From ec8362e10e0e61012bf8d32f489b931af505f857 Mon Sep 17 00:00:00 2001 From: Tomas Mraz Date: Mon, 9 Dec 2013 11:38:54 +0100 Subject: [PATCH] new upstream release --- .gitignore | 1 + cracklib-2.8.15-inttypes.patch | 68 ------ cracklib-2.9.0-packlib-gztype.patch | 24 -- cracklib-2.9.1-inttypes.patch | 22 ++ ...tch => cracklib-2.9.1-packlib-lookup.patch | 48 ++-- ... => cracklib-2.9.1-packlib-reentrant.patch | 104 ++++---- ...c.patch => cracklib-2.9.1-simplistic.patch | 14 +- ...> cracklib-2.9.1-translation-updates.patch | 230 ++++++++++-------- cracklib.spec | 25 +- sources | 2 +- 10 files changed, 245 insertions(+), 293 deletions(-) delete mode 100644 cracklib-2.8.15-inttypes.patch delete mode 100644 cracklib-2.9.0-packlib-gztype.patch create mode 100644 cracklib-2.9.1-inttypes.patch rename cracklib-2.9.0-packlib-lookup.patch => cracklib-2.9.1-packlib-lookup.patch (73%) rename cracklib-2.9.0-packlib-reentrant.patch => cracklib-2.9.1-packlib-reentrant.patch (89%) rename cracklib-2.9.0-simplistic.patch => cracklib-2.9.1-simplistic.patch (83%) rename cracklib-2.9.0-translation-updates.patch => cracklib-2.9.1-translation-updates.patch (91%) diff --git a/.gitignore b/.gitignore index 9dc597c..a7a9af9 100644 --- a/.gitignore +++ b/.gitignore @@ -50,3 +50,4 @@ cracklib-2.8.16.tar.gz /cracklib-2.8.21.tar.gz /cracklib-2.8.22.tar.gz /cracklib-2.9.0.tar.gz +/cracklib-2.9.1.tar.gz diff --git a/cracklib-2.8.15-inttypes.patch b/cracklib-2.8.15-inttypes.patch deleted file mode 100644 index d1d6a23..0000000 --- a/cracklib-2.8.15-inttypes.patch +++ /dev/null @@ -1,68 +0,0 @@ -Don't depend on a consumer of to be using autoconf, and to be -checking for for the presence of and , and including -its own "config.h" before including , 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 " -+ 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, -@@ -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 --#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 - { -@@ -83,6 +74,9 @@ typedef struct { - int dummy; - } PWDICT; - -+@CRACKLIB_INTEGER_TYPES1@ -+@CRACKLIB_INTEGER_TYPES2@ -+ - #endif - - extern PWDICT *PWOpen(const char *prefix, char *mode); diff --git a/cracklib-2.9.0-packlib-gztype.patch b/cracklib-2.9.0-packlib-gztype.patch deleted file mode 100644 index a65390f..0000000 --- a/cracklib-2.9.0-packlib-gztype.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -up cracklib-2.9.0/lib/packer.h.in.gztype cracklib-2.9.0/lib/packer.h.in ---- cracklib-2.9.0/lib/packer.h.in.gztype 2013-08-21 11:48:47.341631450 +0200 -+++ cracklib-2.9.0/lib/packer.h.in 2013-08-21 11:47:52.948471397 +0200 -@@ -44,7 +44,7 @@ struct pi_header - typedef struct - { - FILE *ifp; -- FILE *dfp; -+ void *dfp; - FILE *wfp; - - uint32_t flags; -diff -up cracklib-2.9.0/lib/packlib.c.gztype cracklib-2.9.0/lib/packlib.c ---- cracklib-2.9.0/lib/packlib.c.gztype 2013-08-21 11:27:12.000000000 +0200 -+++ cracklib-2.9.0/lib/packlib.c 2013-08-21 11:49:32.787600685 +0200 -@@ -72,7 +72,7 @@ PWOpen(prefix, mode) - char iname[STRINGSIZE]; - char dname[STRINGSIZE]; - char wname[STRINGSIZE]; -- FILE *dfp; -+ void *dfp; - FILE *ifp; - FILE *wfp; - diff --git a/cracklib-2.9.1-inttypes.patch b/cracklib-2.9.1-inttypes.patch new file mode 100644 index 0000000..c8d8fe8 --- /dev/null +++ b/cracklib-2.9.1-inttypes.patch @@ -0,0 +1,22 @@ +Do not depend on config.h in public header. +diff -up cracklib-2.9.1/lib/packer.h.inttypes cracklib-2.9.1/lib/packer.h +--- cracklib-2.9.1/lib/packer.h.inttypes 2013-12-03 15:00:15.000000000 +0100 ++++ cracklib-2.9.1/lib/packer.h 2013-12-09 09:07:38.306394809 +0100 +@@ -30,17 +30,7 @@ + #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 +- + + struct pi_header + { diff --git a/cracklib-2.9.0-packlib-lookup.patch b/cracklib-2.9.1-packlib-lookup.patch similarity index 73% rename from cracklib-2.9.0-packlib-lookup.patch rename to cracklib-2.9.1-packlib-lookup.patch index 5748326..a30fc98 100644 --- a/cracklib-2.9.0-packlib-lookup.patch +++ b/cracklib-2.9.1-packlib-lookup.patch @@ -1,6 +1,6 @@ -diff -up cracklib-2.9.0/lib/packer.h.in.lookup cracklib-2.9.0/lib/packer.h.in ---- cracklib-2.9.0/lib/packer.h.in.lookup 2013-08-21 14:43:16.832990712 +0200 -+++ cracklib-2.9.0/lib/packer.h.in 2013-08-21 14:43:16.835990775 +0200 +diff -up cracklib-2.9.1/lib/packer.h.lookup cracklib-2.9.1/lib/packer.h +--- cracklib-2.9.1/lib/packer.h.lookup 2013-12-09 09:52:42.153260712 +0100 ++++ cracklib-2.9.1/lib/packer.h 2013-12-09 09:52:42.155260757 +0100 @@ -60,6 +60,7 @@ typedef struct int count; char data_put[NUMWORDS][MAXWORDLEN]; @@ -9,9 +9,9 @@ diff -up cracklib-2.9.0/lib/packer.h.in.lookup cracklib-2.9.0/lib/packer.h.in } PWDICT; #define PW_WORDS(x) ((x)->header.pih_numwords) -diff -up cracklib-2.9.0/lib/packlib.c.lookup cracklib-2.9.0/lib/packlib.c ---- cracklib-2.9.0/lib/packlib.c.lookup 2013-06-01 16:47:13.000000000 +0200 -+++ cracklib-2.9.0/lib/packlib.c 2013-08-21 14:44:12.325177107 +0200 +diff -up cracklib-2.9.1/lib/packlib.c.lookup cracklib-2.9.1/lib/packlib.c +--- cracklib-2.9.1/lib/packlib.c.lookup 2013-12-03 15:00:15.000000000 +0100 ++++ cracklib-2.9.1/lib/packlib.c 2013-12-09 09:53:43.580643470 +0100 @@ -84,6 +84,7 @@ PWOpen(prefix, mode) memset(&pdesc, '\0', sizeof(pdesc)); @@ -34,8 +34,8 @@ diff -up cracklib-2.9.0/lib/packlib.c.lookup cracklib-2.9.0/lib/packlib.c { #if DEBUG fprintf(stderr, "returning (%s)\n", pwp->data_get[number % NUMWORDS]); -@@ -528,13 +528,16 @@ GetPW(pwp, number) - return ((char *) 0); +@@ -526,13 +526,16 @@ GetPW(pwp, number) + return NULL; } - prevblock = thisblock; @@ -52,7 +52,7 @@ diff -up cracklib-2.9.0/lib/packlib.c.lookup cracklib-2.9.0/lib/packlib.c for (i = 1; i < NUMWORDS; i++) { -@@ -545,6 +548,9 @@ GetPW(pwp, number) +@@ -543,6 +546,9 @@ GetPW(pwp, number) while ((*(ostr++) = *(bptr++))); ostr = nstr; @@ -62,32 +62,35 @@ diff -up cracklib-2.9.0/lib/packlib.c.lookup cracklib-2.9.0/lib/packlib.c } return (pwp->data_get[number % NUMWORDS]); -@@ -623,21 +629,27 @@ fprintf(stderr, "look for (%s)\n", strin +@@ -621,22 +627,28 @@ fprintf(stderr, "look for (%s)\n", strin return(middle); } - if (middle == hwm) - { -+ if (cmp < 0) -+ { -+ if (middle == lwm) -+ { - #if DEBUG +-#if DEBUG - fprintf(stderr, "at terminal subdivision, stopping search\n"); -+ fprintf(stderr, "at terminal subdivision from right, stopping search\n"); - #endif - break; +-#endif +- break; - } - -- if (cmp < 0) -- { + if (cmp < 0) + { - hwm = middle; +- } ++ if (middle == lwm) ++ { ++#if DEBUG ++ fprintf(stderr, "at terminal subdivision from right, stopping search\n"); ++#endif ++ break; + } + hwm = middle - 1; - } ++ } else if (cmp > 0) { - lwm = middle; +- } + if (middle == hwm) + { +#if DEBUG @@ -96,6 +99,7 @@ diff -up cracklib-2.9.0/lib/packlib.c.lookup cracklib-2.9.0/lib/packlib.c + break; + } + lwm = middle + 1; - } ++ } } + return (PW_WORDS(pwp)); diff --git a/cracklib-2.9.0-packlib-reentrant.patch b/cracklib-2.9.1-packlib-reentrant.patch similarity index 89% rename from cracklib-2.9.0-packlib-reentrant.patch rename to cracklib-2.9.1-packlib-reentrant.patch index ba13c09..824173f 100644 --- a/cracklib-2.9.0-packlib-reentrant.patch +++ b/cracklib-2.9.1-packlib-reentrant.patch @@ -1,6 +1,6 @@ -diff -up cracklib-2.9.0/lib/fascist.c.reentrant cracklib-2.9.0/lib/fascist.c ---- cracklib-2.9.0/lib/fascist.c.reentrant 2013-06-01 16:52:33.000000000 +0200 -+++ cracklib-2.9.0/lib/fascist.c 2013-08-21 15:31:18.700090735 +0200 +diff -up cracklib-2.9.1/lib/fascist.c.reentrant cracklib-2.9.1/lib/fascist.c +--- cracklib-2.9.1/lib/fascist.c.reentrant 2013-12-03 15:00:15.000000000 +0100 ++++ cracklib-2.9.1/lib/fascist.c 2013-12-09 09:38:23.165924179 +0100 @@ -36,8 +36,8 @@ typedef unsigned short uint16_t; #undef DEBUG #undef DEBUG2 @@ -103,10 +103,10 @@ diff -up cracklib-2.9.0/lib/fascist.c.reentrant cracklib-2.9.0/lib/fascist.c { continue; } -diff -up cracklib-2.9.0/lib/packer.h.in.reentrant cracklib-2.9.0/lib/packer.h.in ---- cracklib-2.9.0/lib/packer.h.in.reentrant 2013-08-21 15:29:24.245641356 +0200 -+++ cracklib-2.9.0/lib/packer.h.in 2013-08-21 15:29:24.247641399 +0200 -@@ -86,7 +86,7 @@ extern int PWClose(PWDICT *pwp); +diff -up cracklib-2.9.1/lib/packer.h.reentrant cracklib-2.9.1/lib/packer.h +--- cracklib-2.9.1/lib/packer.h.reentrant 2013-12-09 09:38:23.164924157 +0100 ++++ cracklib-2.9.1/lib/packer.h 2013-12-09 09:38:23.165924179 +0100 +@@ -83,7 +83,7 @@ extern int PWClose(PWDICT *pwp); extern unsigned int FindPW(PWDICT *pwp, char *string); extern int PutPW(PWDICT *pwp, char *string); extern int PMatch(char *control, char *string); @@ -115,9 +115,9 @@ diff -up cracklib-2.9.0/lib/packer.h.in.reentrant cracklib-2.9.0/lib/packer.h.in extern char Chop(char *string); extern char *Trim(char *string); extern char *FascistLook(PWDICT *pwp, char *instring); -diff -up cracklib-2.9.0/lib/packlib.c.reentrant cracklib-2.9.0/lib/packlib.c ---- cracklib-2.9.0/lib/packlib.c.reentrant 2013-08-21 15:29:24.245641356 +0200 -+++ cracklib-2.9.0/lib/packlib.c 2013-08-21 15:29:24.247641399 +0200 +diff -up cracklib-2.9.1/lib/packlib.c.reentrant cracklib-2.9.1/lib/packlib.c +--- cracklib-2.9.1/lib/packlib.c.reentrant 2013-12-09 09:38:23.164924157 +0100 ++++ cracklib-2.9.1/lib/packlib.c 2013-12-09 09:39:06.556900951 +0100 @@ -67,8 +67,8 @@ PWOpen(prefix, mode) char *mode; { @@ -130,17 +130,16 @@ diff -up cracklib-2.9.0/lib/packlib.c.reentrant cracklib-2.9.0/lib/packlib.c char dname[STRINGSIZE]; char wname[STRINGSIZE]; @@ -76,15 +76,13 @@ PWOpen(prefix, mode) - FILE *ifp; - FILE *wfp; + void *ifp; + void *wfp; - if (pdesc.header.pih_magic == PIH_MAGIC) - { - fprintf(stderr, "%s: another dictionary already open\n", prefix); -- return ((PWDICT *) 0); -- } + pdesc = malloc(sizeof(*pdesc)); + if (pdesc == NULL) -+ return NULL; + return NULL; +- } - memset(&pdesc, '\0', sizeof(pdesc)); + memset(pdesc, '\0', sizeof(*pdesc)); @@ -170,12 +169,12 @@ diff -up cracklib-2.9.0/lib/packlib.c.reentrant cracklib-2.9.0/lib/packlib.c { perror(dname); + free(pdesc); - return ((PWDICT *) 0); + return NULL; } #else perror(dname); + free(pdesc); - return ((PWDICT *) 0); + return NULL; #endif } } @@ -189,7 +188,7 @@ diff -up cracklib-2.9.0/lib/packlib.c.reentrant cracklib-2.9.0/lib/packlib.c { perror(dname); + free(pdesc); - return ((PWDICT *) 0); + return NULL; } } @@ -197,7 +196,7 @@ diff -up cracklib-2.9.0/lib/packlib.c.reentrant cracklib-2.9.0/lib/packlib.c + if (!(pdesc->ifp = fopen(iname, mode))) { #ifdef HAVE_ZLIB_H -- if(pdesc.flags & PFOR_USEZLIB) +- if (pdesc.flags & PFOR_USEZLIB) - gzclose(pdesc.dfp); + if(pdesc->flags & PFOR_USEZLIB) + gzclose(pdesc->dfp); @@ -207,7 +206,7 @@ diff -up cracklib-2.9.0/lib/packlib.c.reentrant cracklib-2.9.0/lib/packlib.c + fclose(pdesc->dfp); perror(iname); + free(pdesc); - return ((PWDICT *) 0); + return NULL; } - if ((pdesc.wfp = fopen(wname, mode))) @@ -250,17 +249,17 @@ diff -up cracklib-2.9.0/lib/packlib.c.reentrant cracklib-2.9.0/lib/packlib.c - pdesc.header.pih_magic = 0; fclose(ifp); #ifdef HAVE_ZLIB_H -- if(pdesc.flags & PFOR_USEZLIB) +- if (pdesc.flags & PFOR_USEZLIB) + if(pdesc->flags & PFOR_USEZLIB) gzclose(dfp); else #endif -@@ -171,21 +172,21 @@ PWOpen(prefix, mode) +@@ -171,10 +172,11 @@ PWOpen(prefix, mode) { fclose(wfp); } + free(pdesc); - return ((PWDICT *) 0); + return NULL; } - if ((pdesc.header.pih_magic == 0) || (pdesc.header.pih_numwords == 0)) @@ -268,37 +267,35 @@ diff -up cracklib-2.9.0/lib/packlib.c.reentrant cracklib-2.9.0/lib/packlib.c { /* uh-oh. either a broken "64-bit" file or a garbage file. */ rewind (ifp); - if (!fread((char *) &pdesc64.header, sizeof(pdesc64.header), 1, ifp)) +@@ -182,10 +184,9 @@ PWOpen(prefix, mode) { fprintf(stderr, "%s: error reading header\n", prefix); -- + - pdesc.header.pih_magic = 0; -+ fclose(ifp); #ifdef HAVE_ZLIB_H -- if(pdesc.flags & PFOR_USEZLIB) -+ if(pdesc->flags & PFOR_USEZLIB) +- if (pdesc.flags & PFOR_USEZLIB) ++ if (pdesc->flags & PFOR_USEZLIB) gzclose(dfp); else #endif -@@ -194,17 +195,17 @@ PWOpen(prefix, mode) +@@ -194,6 +195,7 @@ PWOpen(prefix, mode) { fclose(wfp); } + free(pdesc); - return ((PWDICT *) 0); + return NULL; } if (pdesc64.header.pih_magic != PIH_MAGIC) - { +@@ -201,10 +203,9 @@ PWOpen(prefix, mode) /* nope, not "64-bit" after all */ fprintf(stderr, "%s: error reading header\n", prefix); -- + - pdesc.header.pih_magic = 0; -+ fclose(ifp); #ifdef HAVE_ZLIB_H -- if(pdesc.flags & PFOR_USEZLIB) -+ if(pdesc->flags & PFOR_USEZLIB) +- if (pdesc.flags & PFOR_USEZLIB) ++ if (pdesc->flags & PFOR_USEZLIB) gzclose(dfp); else #endif @@ -307,7 +304,7 @@ diff -up cracklib-2.9.0/lib/packlib.c.reentrant cracklib-2.9.0/lib/packlib.c fclose(wfp); } + free(pdesc); - return ((PWDICT *) 0); + return NULL; } - pdesc.header.pih_magic = pdesc64.header.pih_magic; - pdesc.header.pih_numwords = pdesc64.header.pih_numwords; @@ -328,8 +325,8 @@ diff -up cracklib-2.9.0/lib/packlib.c.reentrant cracklib-2.9.0/lib/packlib.c - pdesc.header.pih_magic = 0; fclose(ifp); #ifdef HAVE_ZLIB_H -- if(pdesc.flags & PFOR_USEZLIB) -+ if(pdesc->flags & PFOR_USEZLIB) +- if (pdesc.flags & PFOR_USEZLIB) ++ if (pdesc->flags & PFOR_USEZLIB) gzclose(dfp); else #endif @@ -338,19 +335,19 @@ diff -up cracklib-2.9.0/lib/packlib.c.reentrant cracklib-2.9.0/lib/packlib.c fclose(wfp); } + free(pdesc); - return ((PWDICT *) 0); + return NULL; } - if (pdesc.header.pih_numwords < 1) + if (pdesc->header.pih_numwords < 1) { fprintf(stderr, "%s: invalid word count\n", prefix); - + - pdesc.header.pih_magic = 0; fclose(ifp); #ifdef HAVE_ZLIB_H -- if(pdesc.flags & PFOR_USEZLIB) -+ if(pdesc->flags & PFOR_USEZLIB) +- if (pdesc.flags & PFOR_USEZLIB) ++ if (pdesc->flags & PFOR_USEZLIB) gzclose(dfp); else #endif @@ -359,7 +356,7 @@ diff -up cracklib-2.9.0/lib/packlib.c.reentrant cracklib-2.9.0/lib/packlib.c fclose(wfp); } + free(pdesc); - return ((PWDICT *) 0); + return NULL; } - if (pdesc.header.pih_blocklen != NUMWORDS) @@ -370,8 +367,8 @@ diff -up cracklib-2.9.0/lib/packlib.c.reentrant cracklib-2.9.0/lib/packlib.c - pdesc.header.pih_magic = 0; fclose(ifp); #ifdef HAVE_ZLIB_H -- if(pdesc.flags & PFOR_USEZLIB) -+ if(pdesc->flags & PFOR_USEZLIB) +- if (pdesc.flags & PFOR_USEZLIB) ++ if (pdesc->flags & PFOR_USEZLIB) gzclose(dfp); else #endif @@ -380,7 +377,7 @@ diff -up cracklib-2.9.0/lib/packlib.c.reentrant cracklib-2.9.0/lib/packlib.c fclose(wfp); } + free(pdesc); - return ((PWDICT *) 0); + return NULL; } - if (pdesc.flags & PFOR_USEHWMS) @@ -401,8 +398,9 @@ diff -up cracklib-2.9.0/lib/packlib.c.reentrant cracklib-2.9.0/lib/packlib.c - pdesc.hwms[i] = pdesc64.hwms[i]; + pdesc->hwms[i] = pdesc64.hwms[i]; } - } +- } - else if (fread(pdesc.hwms, 1, sizeof(pdesc.hwms), wfp) != sizeof(pdesc.hwms)) ++ } + else if (fread(pdesc->hwms, 1, sizeof(pdesc->hwms), wfp) != sizeof(pdesc->hwms)) { - pdesc.flags &= ~PFOR_USEHWMS; @@ -454,9 +452,9 @@ diff -up cracklib-2.9.0/lib/packlib.c.reentrant cracklib-2.9.0/lib/packlib.c return (0); } -diff -up cracklib-2.9.0/lib/rules.c.reentrant cracklib-2.9.0/lib/rules.c ---- cracklib-2.9.0/lib/rules.c.reentrant 2013-06-01 16:47:13.000000000 +0200 -+++ cracklib-2.9.0/lib/rules.c 2013-08-21 15:29:24.247641399 +0200 +diff -up cracklib-2.9.1/lib/rules.c.reentrant cracklib-2.9.1/lib/rules.c +--- cracklib-2.9.1/lib/rules.c.reentrant 2013-12-03 15:00:15.000000000 +0100 ++++ cracklib-2.9.1/lib/rules.c 2013-12-09 09:38:23.166924202 +0100 @@ -82,12 +82,12 @@ Suffix(myword, suffix) } @@ -642,14 +640,14 @@ diff -up cracklib-2.9.0/lib/rules.c.reentrant cracklib-2.9.0/lib/rules.c strcpy(area2, area); @@ -548,7 +549,6 @@ Mangle(input, control) /* returns a poi Debug(1, "Mangle: extract: weird argument in '%s'\n", control); - return ((char *) 0); + return NULL; } - strcpy(area2, area); for (i = 0; length-- && area2[start + i]; i++) { area[i] = area2[start + i]; @@ -619,10 +619,10 @@ Mangle(input, control) /* returns a poi - return ((char *) 0); + return NULL; } else if (ptr[1] != RULE_CLASS) { - strcpy(area, Purge(area, *(++ptr))); @@ -662,7 +660,7 @@ diff -up cracklib-2.9.0/lib/rules.c.reentrant cracklib-2.9.0/lib/rules.c } break; @@ -633,11 +633,11 @@ Mangle(input, control) /* returns a poi - return ((char *) 0); + return NULL; } else if (ptr[1] != RULE_CLASS) { - strcpy(area, Substitute(area, ptr[1], ptr[2])); diff --git a/cracklib-2.9.0-simplistic.patch b/cracklib-2.9.1-simplistic.patch similarity index 83% rename from cracklib-2.9.0-simplistic.patch rename to cracklib-2.9.1-simplistic.patch index 4ee2946..100efe4 100644 --- a/cracklib-2.9.0-simplistic.patch +++ b/cracklib-2.9.1-simplistic.patch @@ -1,6 +1,6 @@ -diff -up cracklib-2.9.0/lib/fascist.c.simplistic cracklib-2.9.0/lib/fascist.c ---- cracklib-2.9.0/lib/fascist.c.simplistic 2013-10-31 14:46:23.160959124 +0100 -+++ cracklib-2.9.0/lib/fascist.c 2013-10-31 14:46:23.164959212 +0100 +diff -up cracklib-2.9.1/lib/fascist.c.simplistic cracklib-2.9.1/lib/fascist.c +--- cracklib-2.9.1/lib/fascist.c.simplistic 2013-12-09 09:31:47.136009210 +0100 ++++ cracklib-2.9.1/lib/fascist.c 2013-12-09 09:33:23.774184638 +0100 @@ -55,7 +55,6 @@ static char *r_destructors[] = { "/?p@?p", /* purging out punctuation/symbols/junk */ @@ -55,7 +55,7 @@ diff -up cracklib-2.9.0/lib/fascist.c.simplistic cracklib-2.9.0/lib/fascist.c ptr++; } -- /* Change by Ben Karsin from ITS at University of Hawaii at Manoa. Static MAXSTEP +- /* Change by Ben Karsin from ITS at University of Hawaii at Manoa. Static MAXSTEP - would generate many false positives for long passwords. */ - maxrepeat = 3+(0.09*strlen(password)); - if (i > maxrepeat) @@ -92,9 +92,9 @@ diff -up cracklib-2.9.0/lib/fascist.c.simplistic cracklib-2.9.0/lib/fascist.c #ifdef DEBUG printf("%-16s (reversed dict)\n", a); #endif -diff -up cracklib-2.9.0/util/cracklib-format.simplistic cracklib-2.9.0/util/cracklib-format ---- cracklib-2.9.0/util/cracklib-format.simplistic 2013-06-01 16:47:13.000000000 +0200 -+++ cracklib-2.9.0/util/cracklib-format 2013-10-31 15:24:01.976736045 +0100 +diff -up cracklib-2.9.1/util/cracklib-format.simplistic cracklib-2.9.1/util/cracklib-format +--- cracklib-2.9.1/util/cracklib-format.simplistic 2012-12-13 18:01:50.000000000 +0100 ++++ cracklib-2.9.1/util/cracklib-format 2013-12-09 09:31:47.138009255 +0100 @@ -3,8 +3,10 @@ # This preprocesses a set of word lists into a suitable form for input # into cracklib-packer diff --git a/cracklib-2.9.0-translation-updates.patch b/cracklib-2.9.1-translation-updates.patch similarity index 91% rename from cracklib-2.9.0-translation-updates.patch rename to cracklib-2.9.1-translation-updates.patch index d622fd1..0e13d3b 100644 --- a/cracklib-2.9.0-translation-updates.patch +++ b/cracklib-2.9.1-translation-updates.patch @@ -1,6 +1,6 @@ -diff -urN a/cracklib-2.9.0/po/as.po b/cracklib-2.9.0/po/as.po ---- a/cracklib-2.9.0/po/as.po 2013-11-28 14:45:28.760394985 +0530 -+++ b/cracklib-2.9.0/po/as.po 2013-11-28 14:45:39.734488460 +0530 +diff -up cracklib-2.9.1/po/as.po.translations cracklib-2.9.1/po/as.po +--- cracklib-2.9.1/po/as.po.translations 2013-12-09 09:34:43.044969070 +0100 ++++ cracklib-2.9.1/po/as.po 2013-12-02 09:40:11.000000000 +0100 @@ -1,82 +1,83 @@ # Copyright (C) 2009 Free Software Foundation, Inc. # This file is distributed under the same license as the PACKAGE package. @@ -11,10 +11,11 @@ diff -urN a/cracklib-2.9.0/po/as.po b/cracklib-2.9.0/po/as.po msgid "" msgstr "" "Project-Id-Version: \n" - "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2013-06-01 09:58-0500\n" +-"Report-Msgid-Bugs-To: cracklib-devel@lists.sourceforge.net\n" +-"POT-Creation-Date: 2013-12-06 07:51-0600\n" -"PO-Revision-Date: 2009-11-12 11:39+0530\n" -"Last-Translator: Amitakhya Phukan \n" ++"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2012-12-14 16:11-0600\n" +"PO-Revision-Date: 2013-09-23 10:11-0400\n" +"Last-Translator: ngoswami \n" @@ -111,9 +112,9 @@ diff -urN a/cracklib-2.9.0/po/as.po b/cracklib-2.9.0/po/as.po msgid "error loading dictionary" -msgstr "" +msgstr "শব্দকোষ ল'ড কৰোতে ত্ৰুটি" -diff -urN a/cracklib-2.9.0/po/bn_IN.po b/cracklib-2.9.0/po/bn_IN.po ---- a/cracklib-2.9.0/po/bn_IN.po 2013-11-28 14:45:28.759394977 +0530 -+++ b/cracklib-2.9.0/po/bn_IN.po 2013-11-28 14:45:39.734488460 +0530 +diff -up cracklib-2.9.1/po/bn_IN.po.translations cracklib-2.9.1/po/bn_IN.po +--- cracklib-2.9.1/po/bn_IN.po.translations 2013-12-09 09:34:43.044969070 +0100 ++++ cracklib-2.9.1/po/bn_IN.po 2013-12-02 09:40:11.000000000 +0100 @@ -1,83 +1,84 @@ # translation of cracklib.po to Bengali INDIA # Copyright (C) 2009 Free Software Foundation, Inc. @@ -125,10 +126,11 @@ diff -urN a/cracklib-2.9.0/po/bn_IN.po b/cracklib-2.9.0/po/bn_IN.po msgid "" msgstr "" "Project-Id-Version: cracklib.default.cracklib\n" - "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2013-06-01 09:58-0500\n" +-"Report-Msgid-Bugs-To: cracklib-devel@lists.sourceforge.net\n" +-"POT-Creation-Date: 2013-12-06 07:51-0600\n" -"PO-Revision-Date: 2009-11-11 12:34+0530\n" -"Last-Translator: Runa Bhattacharjee \n" ++"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2012-12-14 16:11-0600\n" +"PO-Revision-Date: 2013-10-03 05:14-0400\n" +"Last-Translator: sray \n" @@ -225,9 +227,9 @@ diff -urN a/cracklib-2.9.0/po/bn_IN.po b/cracklib-2.9.0/po/bn_IN.po msgid "error loading dictionary" -msgstr "" +msgstr "অভিধান লোড হতে সমস্যা" -diff -urN a/cracklib-2.9.0/po/de.po b/cracklib-2.9.0/po/de.po ---- a/cracklib-2.9.0/po/de.po 2013-11-28 14:45:28.758394968 +0530 -+++ b/cracklib-2.9.0/po/de.po 2013-11-28 14:45:39.734488460 +0530 +diff -up cracklib-2.9.1/po/de.po.translations cracklib-2.9.1/po/de.po +--- cracklib-2.9.1/po/de.po.translations 2013-12-09 09:34:43.044969070 +0100 ++++ cracklib-2.9.1/po/de.po 2013-12-02 09:40:11.000000000 +0100 @@ -4,82 +4,82 @@ # Antje Faber , 2000-2003. # Karl Eichwalder , 1999-2003. @@ -237,10 +239,11 @@ diff -urN a/cracklib-2.9.0/po/de.po b/cracklib-2.9.0/po/de.po msgid "" msgstr "" "Project-Id-Version: new\n" - "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2013-06-01 09:58-0500\n" +-"Report-Msgid-Bugs-To: cracklib-devel@lists.sourceforge.net\n" +-"POT-Creation-Date: 2013-12-06 07:51-0600\n" -"PO-Revision-Date: 2003-11-27 18:31GMT\n" -"Last-Translator: Novell Language \n" ++"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2012-12-14 16:11-0600\n" +"PO-Revision-Date: 2013-10-17 11:45-0400\n" +"Last-Translator: rgromans \n" @@ -338,9 +341,9 @@ diff -urN a/cracklib-2.9.0/po/de.po b/cracklib-2.9.0/po/de.po msgid "error loading dictionary" -msgstr "" +msgstr "Fehler beim Laden des Wörterbuches" -diff -urN a/cracklib-2.9.0/po/es.po b/cracklib-2.9.0/po/es.po ---- a/cracklib-2.9.0/po/es.po 2013-11-28 14:45:28.760394985 +0530 -+++ b/cracklib-2.9.0/po/es.po 2013-11-28 14:45:39.734488460 +0530 +diff -up cracklib-2.9.1/po/es.po.translations cracklib-2.9.1/po/es.po +--- cracklib-2.9.1/po/es.po.translations 2013-12-09 09:34:43.044969070 +0100 ++++ cracklib-2.9.1/po/es.po 2013-12-02 09:40:11.000000000 +0100 @@ -1,81 +1,82 @@ # translation of cracklib.po to # This file is put in the public domain. @@ -350,12 +353,13 @@ diff -urN a/cracklib-2.9.0/po/es.po b/cracklib-2.9.0/po/es.po msgid "" msgstr "" "Project-Id-Version: cracklib\n" - "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2013-06-01 09:58-0500\n" +-"Report-Msgid-Bugs-To: cracklib-devel@lists.sourceforge.net\n" +-"POT-Creation-Date: 2013-12-06 07:51-0600\n" -"PO-Revision-Date: 2005-06-23 13:17+02:00\n" -"Last-Translator: Novell Language \n" -"Language-Team: Novell Language \n" -"Language: \n" ++"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2012-12-14 16:11-0600\n" +"PO-Revision-Date: 2013-09-23 07:39-0400\n" +"Last-Translator: gguerrer \n" @@ -454,9 +458,9 @@ diff -urN a/cracklib-2.9.0/po/es.po b/cracklib-2.9.0/po/es.po msgid "error loading dictionary" -msgstr "" +msgstr "Error al cargar el diccionario" -diff -urN a/cracklib-2.9.0/po/fr.po b/cracklib-2.9.0/po/fr.po ---- a/cracklib-2.9.0/po/fr.po 2013-11-28 14:45:28.759394977 +0530 -+++ b/cracklib-2.9.0/po/fr.po 2013-11-28 14:45:39.734488460 +0530 +diff -up cracklib-2.9.1/po/fr.po.translations cracklib-2.9.1/po/fr.po +--- cracklib-2.9.1/po/fr.po.translations 2013-12-09 09:34:43.045969092 +0100 ++++ cracklib-2.9.1/po/fr.po 2013-12-02 09:40:11.000000000 +0100 @@ -1,81 +1,82 @@ # translation of cracklib.po to Français # This file is put in the public domain. @@ -466,9 +470,10 @@ diff -urN a/cracklib-2.9.0/po/fr.po b/cracklib-2.9.0/po/fr.po msgid "" msgstr "" "Project-Id-Version: cracklib\n" - "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2013-06-01 09:58-0500\n" +-"Report-Msgid-Bugs-To: cracklib-devel@lists.sourceforge.net\n" +-"POT-Creation-Date: 2013-12-06 07:51-0600\n" -"PO-Revision-Date: 2005-06-23 13:17+02:00\n" ++"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2012-12-14 16:11-0600\n" +"PO-Revision-Date: 2013-10-08 12:03-0400\n" "Last-Translator: Novell Language \n" @@ -566,9 +571,9 @@ diff -urN a/cracklib-2.9.0/po/fr.po b/cracklib-2.9.0/po/fr.po msgid "error loading dictionary" -msgstr "" +msgstr "erreur lors du chargement du dictionnaire" -diff -urN a/cracklib-2.9.0/po/gu.po b/cracklib-2.9.0/po/gu.po ---- a/cracklib-2.9.0/po/gu.po 2013-11-28 14:45:28.759394977 +0530 -+++ b/cracklib-2.9.0/po/gu.po 2013-11-28 14:45:39.734488460 +0530 +diff -up cracklib-2.9.1/po/gu.po.translations cracklib-2.9.1/po/gu.po +--- cracklib-2.9.1/po/gu.po.translations 2013-12-09 09:34:43.045969092 +0100 ++++ cracklib-2.9.1/po/gu.po 2013-12-02 09:40:11.000000000 +0100 @@ -1,84 +1,85 @@ # translation of cracklib.default.cracklib.gu.po to Gujarati # Copyright (C) 2009 Free Software Foundation, Inc. @@ -580,10 +585,11 @@ diff -urN a/cracklib-2.9.0/po/gu.po b/cracklib-2.9.0/po/gu.po msgid "" msgstr "" "Project-Id-Version: cracklib.default.cracklib.gu\n" - "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2013-06-01 09:58-0500\n" +-"Report-Msgid-Bugs-To: cracklib-devel@lists.sourceforge.net\n" +-"POT-Creation-Date: 2013-12-06 07:51-0600\n" -"PO-Revision-Date: 2009-10-22 18:13+0530\n" -"Last-Translator: Ankit Patel \n" ++"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2012-12-14 16:11-0600\n" +"PO-Revision-Date: 2013-09-24 05:01-0400\n" +"Last-Translator: swkothar \n" @@ -682,9 +688,9 @@ diff -urN a/cracklib-2.9.0/po/gu.po b/cracklib-2.9.0/po/gu.po msgid "error loading dictionary" -msgstr "" +msgstr "શબ્દકોષને લાવી રહ્યા હોય ત્યારે ભૂલ" -diff -urN a/cracklib-2.9.0/po/hi.po b/cracklib-2.9.0/po/hi.po ---- a/cracklib-2.9.0/po/hi.po 2013-11-28 14:45:28.761394994 +0530 -+++ b/cracklib-2.9.0/po/hi.po 2013-11-28 14:45:39.735488470 +0530 +diff -up cracklib-2.9.1/po/hi.po.translations cracklib-2.9.1/po/hi.po +--- cracklib-2.9.1/po/hi.po.translations 2013-12-09 09:34:43.045969092 +0100 ++++ cracklib-2.9.1/po/hi.po 2013-12-02 09:40:11.000000000 +0100 @@ -2,84 +2,85 @@ # Hindi translations for cracklib package. # Copyright (C) 2009, 2010 Free Software Foundation, Inc. @@ -696,10 +702,11 @@ diff -urN a/cracklib-2.9.0/po/hi.po b/cracklib-2.9.0/po/hi.po msgid "" msgstr "" "Project-Id-Version: cracklib.default.cracklib\n" - "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2013-06-01 09:58-0500\n" +-"Report-Msgid-Bugs-To: cracklib-devel@lists.sourceforge.net\n" +-"POT-Creation-Date: 2013-12-06 07:51-0600\n" -"PO-Revision-Date: 2010-04-06 12:21+0530\n" -"Last-Translator: Rajesh Ranjan \n" ++"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2012-12-14 16:11-0600\n" +"PO-Revision-Date: 2013-10-23 04:21-0400\n" +"Last-Translator: rranjan \n" @@ -797,9 +804,9 @@ diff -urN a/cracklib-2.9.0/po/hi.po b/cracklib-2.9.0/po/hi.po msgid "error loading dictionary" -msgstr "" +msgstr "शब्दकोश लोड करने में त्रुटि" -diff -urN a/cracklib-2.9.0/po/it.po b/cracklib-2.9.0/po/it.po ---- a/cracklib-2.9.0/po/it.po 2013-11-28 14:45:28.759394977 +0530 -+++ b/cracklib-2.9.0/po/it.po 2013-11-28 14:45:39.735488470 +0530 +diff -up cracklib-2.9.1/po/it.po.translations cracklib-2.9.1/po/it.po +--- cracklib-2.9.1/po/it.po.translations 2013-12-09 09:34:43.045969092 +0100 ++++ cracklib-2.9.1/po/it.po 2013-12-02 09:40:11.000000000 +0100 @@ -1,81 +1,82 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. @@ -809,10 +816,11 @@ diff -urN a/cracklib-2.9.0/po/it.po b/cracklib-2.9.0/po/it.po msgid "" msgstr "" "Project-Id-Version: cracklib\n" - "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2013-06-01 09:58-0500\n" +-"Report-Msgid-Bugs-To: cracklib-devel@lists.sourceforge.net\n" +-"POT-Creation-Date: 2013-12-06 07:51-0600\n" -"PO-Revision-Date: 2005-06-23 13:15+02:00\n" -"Last-Translator: Novell Language \n" ++"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2012-12-14 16:11-0600\n" +"PO-Revision-Date: 2013-09-24 10:43-0400\n" +"Last-Translator: fvalen \n" @@ -910,9 +918,9 @@ diff -urN a/cracklib-2.9.0/po/it.po b/cracklib-2.9.0/po/it.po msgid "error loading dictionary" -msgstr "" +msgstr "errore nel caricare il dizionario" -diff -urN a/cracklib-2.9.0/po/ja.po b/cracklib-2.9.0/po/ja.po ---- a/cracklib-2.9.0/po/ja.po 2013-11-28 14:45:28.761394994 +0530 -+++ b/cracklib-2.9.0/po/ja.po 2013-11-28 14:45:39.735488470 +0530 +diff -up cracklib-2.9.1/po/ja.po.translations cracklib-2.9.1/po/ja.po +--- cracklib-2.9.1/po/ja.po.translations 2013-12-09 09:34:43.046969115 +0100 ++++ cracklib-2.9.1/po/ja.po 2013-12-02 09:40:11.000000000 +0100 @@ -2,80 +2,82 @@ # Copyright (C) YEAR Free Software Foundation, Inc. # This file is distributed under the same license as the PACKAGE package. @@ -922,10 +930,11 @@ diff -urN a/cracklib-2.9.0/po/ja.po b/cracklib-2.9.0/po/ja.po msgid "" msgstr "" "Project-Id-Version: cracklib\n" - "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2013-06-01 09:58-0500\n" +-"Report-Msgid-Bugs-To: cracklib-devel@lists.sourceforge.net\n" +-"POT-Creation-Date: 2013-12-06 07:51-0600\n" -"PO-Revision-Date: 2005-08-18 11:52-0000\n" -"Last-Translator: Novell Language \n" ++"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2012-12-14 16:11-0600\n" +"PO-Revision-Date: 2013-09-30 01:55-0400\n" +"Last-Translator: noriko \n" @@ -1021,9 +1030,9 @@ diff -urN a/cracklib-2.9.0/po/ja.po b/cracklib-2.9.0/po/ja.po msgid "error loading dictionary" -msgstr "" +msgstr "辞書の読み込み中二エラーが発生しました" -diff -urN a/cracklib-2.9.0/po/kn.po b/cracklib-2.9.0/po/kn.po ---- a/cracklib-2.9.0/po/kn.po 2013-11-28 14:45:28.759394977 +0530 -+++ b/cracklib-2.9.0/po/kn.po 2013-11-28 14:45:39.735488470 +0530 +diff -up cracklib-2.9.1/po/kn.po.translations cracklib-2.9.1/po/kn.po +--- cracklib-2.9.1/po/kn.po.translations 2013-12-09 09:34:43.046969115 +0100 ++++ cracklib-2.9.1/po/kn.po 2013-12-02 09:40:11.000000000 +0100 @@ -1,83 +1,84 @@ # translation of cracklib.po to Kannada # Copyright (C) 2008 Free Software Foundation, Inc. @@ -1035,10 +1044,11 @@ diff -urN a/cracklib-2.9.0/po/kn.po b/cracklib-2.9.0/po/kn.po msgid "" msgstr "" -"Project-Id-Version: cracklib\n" -+"Project-Id-Version: PACKAGE VERSION\n" - "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2013-06-01 09:58-0500\n" +-"Report-Msgid-Bugs-To: cracklib-devel@lists.sourceforge.net\n" +-"POT-Creation-Date: 2013-12-06 07:51-0600\n" -"PO-Revision-Date: 2008-12-11 11:49+0530\n" ++"Project-Id-Version: PACKAGE VERSION\n" ++"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2013-08-06 14:45+0530\n" +"PO-Revision-Date: 2013-10-28 02:15-0400\n" "Last-Translator: Shankar Prasad \n" @@ -1137,9 +1147,9 @@ diff -urN a/cracklib-2.9.0/po/kn.po b/cracklib-2.9.0/po/kn.po msgid "error loading dictionary" -msgstr "" +msgstr "ಕೋಶವನ್ನು ಲೋಡ್ ಮಾಡುವಲ್ಲಿ ದೋಷ" -diff -urN a/cracklib-2.9.0/po/ko.po b/cracklib-2.9.0/po/ko.po ---- a/cracklib-2.9.0/po/ko.po 2013-11-28 14:45:28.761394994 +0530 -+++ b/cracklib-2.9.0/po/ko.po 2013-11-28 14:45:39.735488470 +0530 +diff -up cracklib-2.9.1/po/ko.po.translations cracklib-2.9.1/po/ko.po +--- cracklib-2.9.1/po/ko.po.translations 2013-12-09 09:34:43.046969115 +0100 ++++ cracklib-2.9.1/po/ko.po 2013-12-02 09:40:11.000000000 +0100 @@ -1,83 +1,84 @@ # translation of cracklib.default.po to Korean # Copyright (C) 2009 Free Software Foundation, Inc. @@ -1151,10 +1161,11 @@ diff -urN a/cracklib-2.9.0/po/ko.po b/cracklib-2.9.0/po/ko.po msgid "" msgstr "" "Project-Id-Version: cracklib.default\n" - "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2013-06-01 09:58-0500\n" +-"Report-Msgid-Bugs-To: cracklib-devel@lists.sourceforge.net\n" +-"POT-Creation-Date: 2013-12-06 07:51-0600\n" -"PO-Revision-Date: 2009-11-18 11:19+1000\n" -"Last-Translator: Eunju Kim \n" ++"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2012-12-14 16:11-0600\n" +"PO-Revision-Date: 2013-09-24 12:33-0400\n" +"Last-Translator: eukim \n" @@ -1252,9 +1263,9 @@ diff -urN a/cracklib-2.9.0/po/ko.po b/cracklib-2.9.0/po/ko.po msgid "error loading dictionary" -msgstr "" +msgstr "사전을 불러오는 도중 오류 발생 " -diff -urN a/cracklib-2.9.0/po/ml.po b/cracklib-2.9.0/po/ml.po ---- a/cracklib-2.9.0/po/ml.po 2013-11-28 14:45:28.760394985 +0530 -+++ b/cracklib-2.9.0/po/ml.po 2013-11-28 14:45:39.735488470 +0530 +diff -up cracklib-2.9.1/po/ml.po.translations cracklib-2.9.1/po/ml.po +--- cracklib-2.9.1/po/ml.po.translations 2013-12-09 09:34:43.046969115 +0100 ++++ cracklib-2.9.1/po/ml.po 2013-12-02 09:40:11.000000000 +0100 @@ -2,81 +2,82 @@ # Copyright (C) 2009 Free Software Foundation, Inc. # This file is distributed under the same license as the cracklib package. @@ -1264,10 +1275,11 @@ diff -urN a/cracklib-2.9.0/po/ml.po b/cracklib-2.9.0/po/ml.po msgid "" msgstr "" "Project-Id-Version: cracklib\n" - "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2013-06-01 09:58-0500\n" +-"Report-Msgid-Bugs-To: cracklib-devel@lists.sourceforge.net\n" +-"POT-Creation-Date: 2013-12-06 07:51-0600\n" -"PO-Revision-Date: 2009-11-11 14:46+0530\n" -"Last-Translator: Ani Peter \n" ++"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2012-12-14 16:11-0600\n" +"PO-Revision-Date: 2013-10-28 08:56-0400\n" +"Last-Translator: apeter \n" @@ -1364,9 +1376,9 @@ diff -urN a/cracklib-2.9.0/po/ml.po b/cracklib-2.9.0/po/ml.po msgid "error loading dictionary" -msgstr "" +msgstr "നിഘണ്ടു ലഭ്യമാക്കുന്നതില്‍ പിശക്" -diff -urN a/cracklib-2.9.0/po/mr.po b/cracklib-2.9.0/po/mr.po ---- a/cracklib-2.9.0/po/mr.po 2013-11-28 14:45:28.760394985 +0530 -+++ b/cracklib-2.9.0/po/mr.po 2013-11-28 14:45:39.735488470 +0530 +diff -up cracklib-2.9.1/po/mr.po.translations cracklib-2.9.1/po/mr.po +--- cracklib-2.9.1/po/mr.po.translations 2013-12-09 09:34:43.047969137 +0100 ++++ cracklib-2.9.1/po/mr.po 2013-12-02 09:40:11.000000000 +0100 @@ -1,83 +1,84 @@ # translation of cracklib.default.cracklib.po to Marathi # Copyright (C) 2009 Free Software Foundation, Inc. @@ -1378,10 +1390,11 @@ diff -urN a/cracklib-2.9.0/po/mr.po b/cracklib-2.9.0/po/mr.po msgid "" msgstr "" -"Project-Id-Version: cracklib.default.cracklib\n" -+"Project-Id-Version: PACKAGE VERSION\n" - "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2013-06-01 09:58-0500\n" +-"Report-Msgid-Bugs-To: cracklib-devel@lists.sourceforge.net\n" +-"POT-Creation-Date: 2013-12-06 07:51-0600\n" -"PO-Revision-Date: 2009-11-11 12:24+0530\n" ++"Project-Id-Version: PACKAGE VERSION\n" ++"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2013-08-06 14:45+0530\n" +"PO-Revision-Date: 2013-10-13 01:28-0400\n" "Last-Translator: Sandeep Shedmake \n" @@ -1478,9 +1491,9 @@ diff -urN a/cracklib-2.9.0/po/mr.po b/cracklib-2.9.0/po/mr.po msgid "error loading dictionary" -msgstr "" +msgstr "शब्दकोष लोड करतेवेळी त्रुटी" -diff -urN a/cracklib-2.9.0/po/or.po b/cracklib-2.9.0/po/or.po ---- a/cracklib-2.9.0/po/or.po 2013-11-28 14:45:28.760394985 +0530 -+++ b/cracklib-2.9.0/po/or.po 2013-11-28 14:45:39.735488470 +0530 +diff -up cracklib-2.9.1/po/or.po.translations cracklib-2.9.1/po/or.po +--- cracklib-2.9.1/po/or.po.translations 2013-12-09 09:34:43.047969137 +0100 ++++ cracklib-2.9.1/po/or.po 2013-12-02 09:40:11.000000000 +0100 @@ -1,84 +1,85 @@ # translation of cracklib.default.cracklib.or.po to Oriya # Copyright (C) 2009 Free Software Foundation, Inc. @@ -1492,10 +1505,11 @@ diff -urN a/cracklib-2.9.0/po/or.po b/cracklib-2.9.0/po/or.po msgid "" msgstr "" "Project-Id-Version: cracklib.default.cracklib.or\n" - "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2013-06-01 09:58-0500\n" +-"Report-Msgid-Bugs-To: cracklib-devel@lists.sourceforge.net\n" +-"POT-Creation-Date: 2013-12-06 07:51-0600\n" -"PO-Revision-Date: 2009-11-12 13:02+0530\n" -"Last-Translator: Manoj Kumar Giri \n" ++"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2012-12-14 16:11-0600\n" +"PO-Revision-Date: 2013-10-22 06:40-0400\n" +"Last-Translator: mgiri \n" @@ -1594,9 +1608,9 @@ diff -urN a/cracklib-2.9.0/po/or.po b/cracklib-2.9.0/po/or.po msgid "error loading dictionary" -msgstr "" +msgstr "ଅଭିଧାନ ଧାରଣ କରିବାରେ ତ୍ରୁଟି" -diff -urN a/cracklib-2.9.0/po/pa.po b/cracklib-2.9.0/po/pa.po ---- a/cracklib-2.9.0/po/pa.po 2013-11-28 14:45:28.759394977 +0530 -+++ b/cracklib-2.9.0/po/pa.po 2013-11-28 14:45:39.735488470 +0530 +diff -up cracklib-2.9.1/po/pa.po.translations cracklib-2.9.1/po/pa.po +--- cracklib-2.9.1/po/pa.po.translations 2013-12-09 09:34:43.047969137 +0100 ++++ cracklib-2.9.1/po/pa.po 2013-12-02 09:40:11.000000000 +0100 @@ -2,84 +2,85 @@ # translation of cracklib.po to Panjabi # Copyright (C) 2005 Free Software Foundation, Inc. @@ -1609,10 +1623,11 @@ diff -urN a/cracklib-2.9.0/po/pa.po b/cracklib-2.9.0/po/pa.po msgid "" msgstr "" "Project-Id-Version: cracklib.pa\n" - "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2013-06-01 09:58-0500\n" +-"Report-Msgid-Bugs-To: cracklib-devel@lists.sourceforge.net\n" +-"POT-Creation-Date: 2013-12-06 07:51-0600\n" -"PO-Revision-Date: 2009-11-17 05:52+0530\n" -"Last-Translator: A S Alam \n" ++"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2012-12-14 16:11-0600\n" +"PO-Revision-Date: 2013-10-08 08:06-0400\n" +"Last-Translator: asaini \n" @@ -1709,9 +1724,9 @@ diff -urN a/cracklib-2.9.0/po/pa.po b/cracklib-2.9.0/po/pa.po msgid "error loading dictionary" -msgstr "" +msgstr "ਸ਼ਬਦ-ਕੋਸ਼ ਲੋਡ ਕਰਨ ਵੇਲੇ ਗਲਤੀ" -diff -urN a/cracklib-2.9.0/po/pt_BR.po b/cracklib-2.9.0/po/pt_BR.po ---- a/cracklib-2.9.0/po/pt_BR.po 2013-11-28 14:45:28.760394985 +0530 -+++ b/cracklib-2.9.0/po/pt_BR.po 2013-11-28 14:45:39.735488470 +0530 +diff -up cracklib-2.9.1/po/pt_BR.po.translations cracklib-2.9.1/po/pt_BR.po +--- cracklib-2.9.1/po/pt_BR.po.translations 2013-12-09 09:34:43.047969137 +0100 ++++ cracklib-2.9.1/po/pt_BR.po 2013-12-02 09:40:11.000000000 +0100 @@ -2,80 +2,82 @@ # Copyright (C) YEAR Free Software Foundation, Inc. # This file is distributed under the same license as the PACKAGE package. @@ -1721,10 +1736,11 @@ diff -urN a/cracklib-2.9.0/po/pt_BR.po b/cracklib-2.9.0/po/pt_BR.po msgid "" msgstr "" "Project-Id-Version: cracklib\n" - "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2013-06-01 09:58-0500\n" +-"Report-Msgid-Bugs-To: cracklib-devel@lists.sourceforge.net\n" +-"POT-Creation-Date: 2013-12-06 07:51-0600\n" -"PO-Revision-Date: 2005-08-18 15:02+0000\n" -"Last-Translator: Novell Language \n" ++"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2012-12-14 16:11-0600\n" +"PO-Revision-Date: 2013-09-30 08:53-0400\n" +"Last-Translator: gcintra \n" @@ -1821,9 +1837,9 @@ diff -urN a/cracklib-2.9.0/po/pt_BR.po b/cracklib-2.9.0/po/pt_BR.po msgid "error loading dictionary" -msgstr "" +msgstr "erro ao carregar dicionário" -diff -urN a/cracklib-2.9.0/po/ru.po b/cracklib-2.9.0/po/ru.po ---- a/cracklib-2.9.0/po/ru.po 2013-11-28 14:45:28.760394985 +0530 -+++ b/cracklib-2.9.0/po/ru.po 2013-11-28 14:45:39.736488477 +0530 +diff -up cracklib-2.9.1/po/ru.po.translations cracklib-2.9.1/po/ru.po +--- cracklib-2.9.1/po/ru.po.translations 2013-12-09 09:34:43.048969160 +0100 ++++ cracklib-2.9.1/po/ru.po 2013-12-02 09:40:11.000000000 +0100 @@ -1,85 +1,86 @@ # translation of cracklib.pot to Russian # Copyright (C) 2008, 2009 @@ -1836,10 +1852,11 @@ diff -urN a/cracklib-2.9.0/po/ru.po b/cracklib-2.9.0/po/ru.po msgid "" msgstr "" "Project-Id-Version: cracklib\n" - "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2013-06-01 09:58-0500\n" +-"Report-Msgid-Bugs-To: cracklib-devel@lists.sourceforge.net\n" +-"POT-Creation-Date: 2013-12-06 07:51-0600\n" -"PO-Revision-Date: 2009-12-03 10:17+1100\n" -"Last-Translator: Yulia \n" ++"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2012-12-14 16:11-0600\n" +"PO-Revision-Date: 2013-09-22 07:44-0400\n" +"Last-Translator: ypoyarko \n" @@ -1943,9 +1960,9 @@ diff -urN a/cracklib-2.9.0/po/ru.po b/cracklib-2.9.0/po/ru.po msgid "error loading dictionary" -msgstr "" +msgstr "ошибка при загрузке словаря" -diff -urN a/cracklib-2.9.0/po/ta.po b/cracklib-2.9.0/po/ta.po ---- a/cracklib-2.9.0/po/ta.po 2013-11-28 14:45:28.759394977 +0530 -+++ b/cracklib-2.9.0/po/ta.po 2013-11-28 14:45:39.736488477 +0530 +diff -up cracklib-2.9.1/po/ta.po.translations cracklib-2.9.1/po/ta.po +--- cracklib-2.9.1/po/ta.po.translations 2013-12-09 09:34:43.048969160 +0100 ++++ cracklib-2.9.1/po/ta.po 2013-12-02 09:40:11.000000000 +0100 @@ -1,83 +1,84 @@ # translation of cracklib.default.cracklib.po to Tamil # Copyright (C) 2009 Free Software Foundation, Inc. @@ -1957,10 +1974,11 @@ diff -urN a/cracklib-2.9.0/po/ta.po b/cracklib-2.9.0/po/ta.po msgid "" msgstr "" "Project-Id-Version: cracklib.default.cracklib\n" - "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2013-06-01 09:58-0500\n" +-"Report-Msgid-Bugs-To: cracklib-devel@lists.sourceforge.net\n" +-"POT-Creation-Date: 2013-12-06 07:51-0600\n" -"PO-Revision-Date: 2009-11-11 14:21+0530\n" -"Last-Translator: I. Felix \n" ++"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2012-12-14 16:11-0600\n" +"PO-Revision-Date: 2013-11-11 09:51-0500\n" +"Last-Translator: shkumar \n" @@ -2057,9 +2075,9 @@ diff -urN a/cracklib-2.9.0/po/ta.po b/cracklib-2.9.0/po/ta.po msgid "error loading dictionary" -msgstr "" +msgstr "அகராதியை ஏற்றுவதில் பிழை" -diff -urN a/cracklib-2.9.0/po/te.po b/cracklib-2.9.0/po/te.po ---- a/cracklib-2.9.0/po/te.po 2013-11-28 14:45:28.759394977 +0530 -+++ b/cracklib-2.9.0/po/te.po 2013-11-28 14:45:39.736488477 +0530 +diff -up cracklib-2.9.1/po/te.po.translations cracklib-2.9.1/po/te.po +--- cracklib-2.9.1/po/te.po.translations 2013-12-09 09:34:43.048969160 +0100 ++++ cracklib-2.9.1/po/te.po 2013-12-02 09:40:11.000000000 +0100 @@ -1,84 +1,85 @@ # translation of cracklib.pot to Telugu # Copyright (C) 2009 Free Software Foundation, Inc. @@ -2071,10 +2089,11 @@ diff -urN a/cracklib-2.9.0/po/te.po b/cracklib-2.9.0/po/te.po msgid "" msgstr "" "Project-Id-Version: cracklib\n" - "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2013-06-01 09:58-0500\n" +-"Report-Msgid-Bugs-To: cracklib-devel@lists.sourceforge.net\n" +-"POT-Creation-Date: 2013-12-06 07:51-0600\n" -"PO-Revision-Date: 2009-11-11 15:13+0530\n" -"Last-Translator: Krishna Babu K \n" ++"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2012-12-14 16:11-0600\n" +"PO-Revision-Date: 2013-09-26 10:54-0400\n" +"Last-Translator: kkrothap \n" @@ -2172,9 +2191,9 @@ diff -urN a/cracklib-2.9.0/po/te.po b/cracklib-2.9.0/po/te.po msgid "error loading dictionary" -msgstr "" +msgstr "నిఘంటువును లోడు చేయుటలో దోషం" -diff -urN a/cracklib-2.9.0/po/zh_CN.po b/cracklib-2.9.0/po/zh_CN.po ---- a/cracklib-2.9.0/po/zh_CN.po 2013-11-28 14:45:28.759394977 +0530 -+++ b/cracklib-2.9.0/po/zh_CN.po 2013-11-28 14:45:39.736488477 +0530 +diff -up cracklib-2.9.1/po/zh_CN.po.translations cracklib-2.9.1/po/zh_CN.po +--- cracklib-2.9.1/po/zh_CN.po.translations 2011-07-26 11:55:29.000000000 +0200 ++++ cracklib-2.9.1/po/zh_CN.po 2013-12-02 09:40:11.000000000 +0100 @@ -1,78 +1,84 @@ # translation of cracklib.default.po to Wei Liu # Copyright (C) 2010 Free Software Foundation, Inc. @@ -2278,9 +2297,9 @@ diff -urN a/cracklib-2.9.0/po/zh_CN.po b/cracklib-2.9.0/po/zh_CN.po +#: ../lib/fascist.c:867 +msgid "error loading dictionary" +msgstr "载入字典出错" -diff -urN a/cracklib-2.9.0/po/zh_TW.po b/cracklib-2.9.0/po/zh_TW.po ---- a/cracklib-2.9.0/po/zh_TW.po 2013-11-28 14:45:28.758394968 +0530 -+++ b/cracklib-2.9.0/po/zh_TW.po 2013-11-28 14:45:39.736488477 +0530 +diff -up cracklib-2.9.1/po/zh_TW.po.translations cracklib-2.9.1/po/zh_TW.po +--- cracklib-2.9.1/po/zh_TW.po.translations 2013-12-09 09:34:43.048969160 +0100 ++++ cracklib-2.9.1/po/zh_TW.po 2013-12-02 09:40:11.000000000 +0100 @@ -2,80 +2,82 @@ # Copyright (C) YEAR Free Software Foundation, Inc. # This file is distributed under the same license as the PACKAGE package. @@ -2290,10 +2309,11 @@ diff -urN a/cracklib-2.9.0/po/zh_TW.po b/cracklib-2.9.0/po/zh_TW.po msgid "" msgstr "" "Project-Id-Version: cracklib\n" - "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2013-06-01 09:58-0500\n" +-"Report-Msgid-Bugs-To: cracklib-devel@lists.sourceforge.net\n" +-"POT-Creation-Date: 2013-12-06 07:51-0600\n" -"PO-Revision-Date: 2005-06-23 12:52+0200\n" -"Last-Translator: Novell Language \n" ++"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2012-12-14 16:11-0600\n" +"PO-Revision-Date: 2013-10-22 09:50-0400\n" +"Last-Translator: tchuang \n" diff --git a/cracklib.spec b/cracklib.spec index c801b51..8cfb716 100644 --- a/cracklib.spec +++ b/cracklib.spec @@ -4,8 +4,8 @@ Summary: A password-checking library Name: cracklib -Version: 2.9.0 -Release: 9%{?dist} +Version: 2.9.1 +Release: 1%{?dist} Group: System Environment/Libraries Source0: http://prdownloads.sourceforge.net/cracklib/cracklib-%{version}.tar.gz @@ -52,17 +52,16 @@ Source37: pass_file.gz # https://bugzilla.redhat.com/show_bug.cgi?id=557592 # https://bugzilla.redhat.com/attachment.cgi?id=386022 Source38: ry-threshold10.txt -Patch1: cracklib-2.8.15-inttypes.patch +Patch1: cracklib-2.9.1-inttypes.patch Patch2: cracklib-2.9.0-python-gzdicts.patch -Patch3: cracklib-2.9.0-packlib-lookup.patch -Patch4: cracklib-2.9.0-packlib-reentrant.patch -Patch5: cracklib-2.9.0-packlib-gztype.patch -Patch6: cracklib-2.9.0-simplistic.patch -Patch7: cracklib-2.9.0-translation-updates.patch +Patch3: cracklib-2.9.1-packlib-lookup.patch +Patch4: cracklib-2.9.1-packlib-reentrant.patch +Patch6: cracklib-2.9.1-simplistic.patch +Patch7: cracklib-2.9.1-translation-updates.patch URL: http://sourceforge.net/projects/cracklib/ License: LGPLv2+ Buildroot: %{_tmppath}/%{name}-%{version}-root -BuildRequires: python-devel, words, autoconf, automake, gettext, libtool +BuildRequires: python-devel, words, gettext BuildRequires: gettext-autopoint BuildRequires: zlib-devel Conflicts: cracklib-dicts < 2.8 @@ -122,7 +121,6 @@ If you are installing CrackLib, you should also install cracklib-dicts. %prep %setup -q -a 2 -cp lib/packer.h lib/packer.h.in # Replace zn_CN.po with one that wasn't mis-transcoded at some point. grep '????????????????' po/zh_CN.po install -p -m 644 %{SOURCE3} po/zh_CN.po @@ -131,11 +129,9 @@ install -p -m 644 %{SOURCE3} po/zh_CN.po %patch2 -p1 -b .gzdicts %patch3 -p1 -b .lookup %patch4 -p1 -b .reentrant -%patch5 -p1 -b .gztype %patch6 -p1 -b .simplistic -%patch7 -p2 -b .translations +%patch7 -p1 -b .translations -autoreconf -f -i mkdir cracklib-dicts for dict in %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} %{SOURCE14} \ %{SOURCE15} %{SOURCE16} %{SOURCE17} %{SOURCE18} %{SOURCE19} \ @@ -261,6 +257,9 @@ EOF %{_libdir}/../lib/python*/site-packages/*.py* %changelog +* Mon Dec 9 2013 Tomáš Mráz - 2.9.1-1 +- new upstream release + * Mon Dec 2 2013 Tomáš Mráz - 2.9.0-9 - update only .gmo files to avoid multilib conflicts (#1036305) diff --git a/sources b/sources index d062273..5b07a0f 100644 --- a/sources +++ b/sources @@ -29,4 +29,4 @@ c03b38448aefcde059e6fcfb20784f2c surnames.finnish.gz 7fa6ba0cd50e7f9ccaf4707c810b14f1 cracklib-words-20080507.gz 12936e97cc34a28f2efec62e115a60e1 cracklib2_2.8.19-1.debian.tar.gz bf8714368e0a485472b6ad7c4dba06a3 cracklib2_2.8.19-1.dsc -e0f94ac2138fd33c7e77b19c1e9a9390 cracklib-2.9.0.tar.gz +90536219c520add2ceb3c26f0d7da404 cracklib-2.9.1.tar.gz