- update to 2.8.18

- add man pages from Debian (#583932)
- replace zh_CN translation (related to #627449)

.gitignore

@@ -41,3 +41,5 @@ cracklib-2.8.13.tar.gz
 cracklib-2.8.15.tar.gz
 cracklib-words-20080507.gz
 cracklib-2.8.16.tar.gz
+/cracklib2_2.8.18-1.debian.tar.gz
+/cracklib-2.8.18.tar.gz

cracklib-2.8.15-init.patch

@@ -1,13 +0,0 @@
-Don't free an uninitialized pointer. SF#2907102
-
-diff -up cracklib-2.8.15/python/_cracklibmodule.c cracklib-2.8.15/python/_cracklibmodule.c
---- cracklib-2.8.15/python/_cracklibmodule.c	2009-12-01 15:39:57.000000000 -0500
-+++ cracklib-2.8.15/python/_cracklibmodule.c	2009-12-01 15:39:59.000000000 -0500
-@@ -106,6 +106,7 @@ _cracklib_FascistCheck(PyObject *self, P
-             return NULL;
-         }
-         free(dictfile);
-+        defaultdict = NULL;
-     } else
-     {
-         defaultdict = strdup(GetDefaultCracklibDict());

cracklib-2.8.16-hi_update.patch

@@ -1,39 +0,0 @@
-Among as, bn_IN, de, es, fr, gu, hi, it, ja, kn, ko, ml, mr, or, pa, pt_BR, ru,
-ta, te, zh_CN, zh_TW,, this is the only translation changed between 2.8.16 and
-transifex as of 20 May 2010.
-
---- cracklib/po/hi.po	2010-03-02 22:00:08.000000000 -0500
-+++ cracklib/po/hi.po	2010-05-20 14:00:30.000000000 -0400
-@@ -1,16 +1,17 @@
- # translation of cracklib.default.cracklib.po to Hindi
--# Copyright (C) 2009 Free Software Foundation, Inc.
--# This file is distributed under the same license as the PACKAGE package.
-+# Hindi translations for cracklib package.
-+# Copyright (C) 2009, 2010 Free Software Foundation, Inc.
-+# This file is distributed under the same license as the cracklib package.
- #
--# Rajesh Ranjan <rajesh672@gmail.com>, 2009.
-+# Rajesh Ranjan <rranjan@redhat.com>, 2010.
- msgid ""
- msgstr ""
- "Project-Id-Version: cracklib.default.cracklib\n"
- "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2010-03-02 21:00-0600\n"
--"PO-Revision-Date: 2009-11-23 01:39+0530\n"
--"Last-Translator: Rajesh Ranjan <rajesh672@gmail.com>\n"
--"Language-Team: Hindi <hindi.sf.net>\n"
-+"PO-Revision-Date: 2010-04-06 12:21+0530\n"
-+"Last-Translator: Rajesh Ranjan <rranjan@redhat.com>\n"
-+"Language-Team: Hindi <Red Hat>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
- "Content-Transfer-Encoding: 8bit\n"
-@@ -56,7 +57,7 @@
- 
- #: lib/fascist.c:748
- msgid "it does not contain enough DIFFERENT characters"
--msgstr "इसमें पर्याप्त मात्रा में भिन्न वर्ण नहीं समाहित हैं"
-+msgstr "इसमें पर्याप्त मात्रा में भिन्न वर्ण समाहित नहीं हैं"
- 
- #: lib/fascist.c:762
- msgid "it is all whitespace"

cracklib.spec

@@ -4,14 +4,20 @@
 
 Summary: A password-checking library
 Name: cracklib
-Version: 2.8.16
+Version: 2.8.18
-Release: 4%{?dist}
+Release: 1%{?dist}
 Group: System Environment/Libraries
 Source0: http://prdownloads.sourceforge.net/cracklib/cracklib-%{version}.tar.gz
 
 # Retrieved at 20091201191719Z.
 Source1: http://iweb.dl.sourceforge.net/project/cracklib/cracklib-words/2008-05-07/cracklib-words-20080507.gz
 
+# For man pages.
+Source2: http://ftp.us.debian.org/debian/pool/main/c/cracklib2/cracklib2_2.8.18-1.debian.tar.gz
+
+# From attachment to https://bugzilla.redhat.com/show_bug.cgi?id=627449
+Source3: cracklib.default.zh_CN.po
+
 Source10: http://ftp.cerias.purdue.edu/pub/dict/wordlists/computer/Domains.gz
 Source11: http://ftp.cerias.purdue.edu/pub/dict/wordlists/computer/Dosref.gz
 Source12: http://ftp.cerias.purdue.edu/pub/dict/wordlists/computer/Ftpsites.gz
@@ -47,8 +53,6 @@ Source37: pass_file.gz
 Source38: ry-threshold10.txt
 Patch1: cracklib-2.8.15-inttypes.patch
 Patch2: cracklib-2.8.12-gettext.patch
-Patch3: cracklib-2.8.15-init.patch
-Patch4: cracklib-2.8.16-hi_update.patch
 URL: http://sourceforge.net/projects/cracklib/
 License: LGPLv2+
 Buildroot: %{_tmppath}/%{name}-%{version}-root
@@ -109,12 +113,13 @@ contains the utilities necessary for the creation of new dictionaries.
 If you are installing CrackLib, you should also install cracklib-dicts.
 
 %prep
-%setup -q
+%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
 %patch1 -p1 -b .inttypes
 %patch2 -p1 -b .gettext
-%patch3 -p1 -b .init
-%patch4 -p1 -b .hi_update
 autoreconf -f -i
 mkdir cracklib-dicts
 for dict in %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} %{SOURCE14} \
@@ -160,6 +165,10 @@ fi
 rm -f $RPM_BUILD_ROOT/%{_libdir}/python*/site-packages/_cracklibmodule.*a
 rm -f $RPM_BUILD_ROOT/%{_libdir}/libcrack.la
 
+mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man{3,8}
+install -p -m644 debian/*.3 $RPM_BUILD_ROOT/%{_mandir}/man3/
+install -p -m644 debian/*.8 $RPM_BUILD_ROOT/%{_mandir}/man8/
+
 %find_lang %{name}
 
 %check
@@ -207,11 +216,13 @@ EOF
 %dir %{_datadir}/cracklib
 %{_datadir}/cracklib/cracklib.magic
 %{_sbindir}/*cracklib*
+%{_mandir}/man8/*
 
 %files devel
 %defattr(-,root,root)
 %{_includedir}/*
 %{_libdir}/libcrack.so
+%{_mandir}/man3/*
 
 %files dicts
 %defattr(-,root,root)
@@ -228,6 +239,11 @@ EOF
 %{_libdir}/../lib/python*/site-packages/*.py*
 
 %changelog
+* Thu Jan 27 2011 Nalin Dahyabhai <nalin@redhat.com> - 2.8.18-1
+- update to 2.8.18
+- add man pages from Debian (#583932)
+- replace zh_CN translation (related to #627449)
+
 * Wed Jul 21 2010 David Malcolm <dmalcolm@redhat.com> - 2.8.16-4
 - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
 

sources

@@ -26,5 +26,6 @@ a2bd31ce25a3057b61d2e5a1182d93a9  sf.gz
 15ec61296de799eaa8111cfabbcbb44f  shakespeare.gz
 c03b38448aefcde059e6fcfb20784f2c  surnames.finnish.gz
 6e76a087a646ede5eba05e9259fd84d4  pass_file.gz
-3bfb22db8fcffd019463ee415a1b25b7  cracklib-2.8.16.tar.gz
 7fa6ba0cd50e7f9ccaf4707c810b14f1  cracklib-words-20080507.gz
+79053ad8bc714a44cd660cb12116211b  cracklib-2.8.18.tar.gz
+1e33cdc76486e89a11a230f098ef651c  cracklib2_2.8.18-1.debian.tar.gz