cracklib-2.9.7-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@12186 ec354946-7b23-47d6-9f5a-488ba84defc7

c/cracklib/cracklib-vl.spec

@@ -5,52 +5,29 @@
 Summary: A password-checking library.
 Summary(ja): パスワードチェック用ライブラリ
 Name: cracklib
-Version: 2.8.22
+Version: 2.9.7
 Release: 1%{?_dist_release}
 Group: System Environment/Libraries
-URL: http://sourceforge.net/projects/cracklib/
+URL: https://github.com/cracklib/cracklib
 License: LGPLv2+
+Vendor: Project Vine
+Distribution: Vine Linux
 
-Source0: http://prdownloads.sourceforge.net/cracklib/cracklib-%{version}.tar.gz
+Source0: https://github.com/cracklib/cracklib/releases/download/v%{version}/cracklib-%{version}.tar.bz2
-
+Source1: https://github.com/cracklib/cracklib/releases/download/v%{version}/cracklib-words-%{version}.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
+Source2: http://ftp.us.debian.org/debian/pool/main/c/cracklib2/cracklib2_2.9.6-2.debian.tar.xz
-
+
-Source10: ftp://ftp.cerias.purdue.edu/pub/dict/wordlists/computer/Domains.gz
+# No upstream source for this, just words missing from the current cracklib-words
-Source11: ftp://ftp.cerias.purdue.edu/pub/dict/wordlists/computer/Dosref.gz
+Source10: missing-words.gz
-Source12: ftp://ftp.cerias.purdue.edu/pub/dict/wordlists/computer/Ftpsites.gz
+
-Source13: ftp://ftp.cerias.purdue.edu/pub/dict/wordlists/computer/Jargon.gz
+Patch1: cracklib-2.9.1-inttypes.patch
-Source14: ftp://ftp.cerias.purdue.edu/pub/dict/wordlists/computer/common-passwords.txt.gz
+Patch2: cracklib-2.9.0-python-gzdicts.patch
-Source15: ftp://ftp.cerias.purdue.edu/pub/dict/wordlists/computer/etc-hosts.gz
+Patch4: cracklib-2.9.7-packlib-reentrant.patch
-Source16: ftp://ftp.cerias.purdue.edu/pub/dict/wordlists/movieTV/Movies.gz
+Patch6: cracklib-2.9.6-simplistic.patch
-Source17: ftp://ftp.cerias.purdue.edu/pub/dict/wordlists/movieTV/Python.gz
+Patch9: cracklib-2.9.6-coverity.patch
-Source18: ftp://ftp.cerias.purdue.edu/pub/dict/wordlists/movieTV/Trek.gz
+Patch10: cracklib-2.9.6-lookup.patch
-Source19: ftp://ftp.cerias.purdue.edu/pub/dict/wordlists/literature/LCarrol.gz
-Source20: ftp://ftp.cerias.purdue.edu/pub/dict/wordlists/literature/Paradise.Lost.gz
-Source21: ftp://ftp.cerias.purdue.edu/pub/dict/wordlists/literature/cartoon.gz
-Source22: ftp://ftp.cerias.purdue.edu/pub/dict/wordlists/literature/myths-legends.gz
-Source23: ftp://ftp.cerias.purdue.edu/pub/dict/wordlists/literature/sf.gz
-Source24: ftp://ftp.cerias.purdue.edu/pub/dict/wordlists/literature/shakespeare.gz
-Source25: ftp://ftp.cerias.purdue.edu/pub/dict/wordlists/names/ASSurnames.gz
-Source26: ftp://ftp.cerias.purdue.edu/pub/dict/wordlists/names/Congress.gz
-Source27: ftp://ftp.cerias.purdue.edu/pub/dict/wordlists/names/Family-Names.gz
-Source28: ftp://ftp.cerias.purdue.edu/pub/dict/wordlists/names/Given-Names.gz
-Source29: ftp://ftp.cerias.purdue.edu/pub/dict/wordlists/names/famous.gz
-Source30: ftp://ftp.cerias.purdue.edu/pub/dict/wordlists/names/fast-names.gz
-Source31: ftp://ftp.cerias.purdue.edu/pub/dict/wordlists/names/female-names.gz
-Source32: ftp://ftp.cerias.purdue.edu/pub/dict/wordlists/names/male-names.gz
-Source33: ftp://ftp.cerias.purdue.edu/pub/dict/wordlists/names/names.french.gz
-Source34: ftp://ftp.cerias.purdue.edu/pub/dict/wordlists/names/names.hp.gz
-Source35: ftp://ftp.cerias.purdue.edu/pub/dict/wordlists/names/other-names.gz
-Source36: ftp://ftp.cerias.purdue.edu/pub/dict/wordlists/names/surnames.finnish.gz
-
-# No upstream source for this; it came in as a bugzilla attachment.
-Source37: pass_file.gz
-
-Patch1: cracklib-2.8.15-inttypes.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: words, autoconf, automake, gettext, libtool
@@ -139,23 +116,30 @@ If you are installing CrackLib, you should also install cracklib-dicts.
 
 %prep
 %setup -q -a 2
-cp lib/packer.h lib/packer.h.in
+
 %patch1 -p1 -b .inttypes
-autoreconf -f -i
+%patch2 -p1 -b .gzdicts
+%patch4 -p1 -b .reentrant
+%patch6 -p1 -b .simplistic
+%patch9 -p1 -b .coverity
+%patch10 -p1 -b .lookup
+
 mkdir cracklib-dicts
-for dict in %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} %{SOURCE14} \
+for dict in %{SOURCE10} %{SOURCE1}
-            %{SOURCE15} %{SOURCE16} %{SOURCE17} %{SOURCE18} %{SOURCE19} \
-            %{SOURCE20} %{SOURCE21} %{SOURCE22} %{SOURCE23} %{SOURCE24} \
-            %{SOURCE25} %{SOURCE26} %{SOURCE27} %{SOURCE28} %{SOURCE29} \
-            %{SOURCE30} %{SOURCE31} %{SOURCE32} %{SOURCE33} %{SOURCE34} \
-            %{SOURCE35} %{SOURCE36} %{SOURCE37} %{SOURCE1}
 do
 	cp -fv ${dict} cracklib-dicts/
 done
 chmod +x util/cracklib-format
 
 %build
-%configure --with-pic --without-python --with-default-dict=%{dictpath} --disable-static
+# Use the dictionary from the build to test
+sed -i 's,util/cracklib-check <,util/cracklib-check $(DESTDIR)/$(DEFAULT_CRACKLIB_DICT) <,' Makefile.in
+%configure \
+	--with-pic \
+	--without-python \
+	--with-default-dict=%{dictpath} \
+	--disable-static
+make -C po update-po
 make
 
 %install
@@ -186,9 +170,23 @@ 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/
+if ! test -s $RPM_BUILD_ROOT/%{_mandir}/man8/cracklib-packer.8 ; then
+    echo .so man8/cracklib-format.8 > $RPM_BUILD_ROOT/%{_mandir}/man8/cracklib-packer.8
+fi
+if ! test -s $RPM_BUILD_ROOT/%{_mandir}/man8/cracklib-unpacker.8 ; then
+    echo .so man8/cracklib-format.8 > $RPM_BUILD_ROOT/%{_mandir}/man8/cracklib-unpacker.8
+fi
+
 %find_lang %{name}
 
 
+%check
+make test DESTDIR=$RPM_BUILD_ROOT
+
+
 %clean
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
 
@@ -206,13 +204,14 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/libcrack.la
 %files -f %{name}.lang
 %defattr(-,root,root)
 %doc README README-WORDS NEWS README-LICENSE AUTHORS
-%{_includedir}/*
+%{!?_licensedir:%global license %%doc}
+%license COPYING.LIB
 %{_libdir}/libcrack.so*
-#{_libdir}/libcrack.a*
 %dir %{_datadir}/cracklib
 %{_datadir}/cracklib/cracklib.magic
 %{_sbindir}/*cracklib*
-
+%{_mandir}/man*/*
+%{_includedir}/*
 
 %files dicts
 %defattr(-,root,root)
@@ -228,7 +227,6 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/libcrack.la
 %files -n compat32-%{name}
 %defattr(-,root,root)
 %{_libdir}/libcrack.so*
-#{_libdir}/libcrack.a*
 
 
 %files -n compat32-%{name}-dicts
@@ -238,6 +236,15 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/libcrack.la
 
 
 %changelog
+* Fri Sep 06 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.9.7-1
+- new upstream release.
+- updated Patch1.
+- imported Patch2-10 from rawhide.
+- updated: Source2.
+- dropped Source10-37.
+- added Source10.
+- enabled %%check.
+
 * Sat Dec 28 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.8.22-1
 - update to 2.8.22
 - remove Patch2 (cracklib-2.8.12-gettext.patch)