X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=cracklib.spec;h=eed5e53a9dbb96af8aed0e98a47693808c379952;hb=7a7df55e7ce57692b1eac7a5bca8891ae5ae1a53;hp=723baee0027c8f6e3838bb54cb0ef399b0c6a7c6;hpb=7b72b9b76a654c030c6fa05f56501c21dedfa0c2;p=packages%2Fcracklib.git

diff --git a/cracklib.spec b/cracklib.spec
index 723baee..eed5e53 100644
--- a/cracklib.spec
+++ b/cracklib.spec
@@ -1,3 +1,7 @@
+#
+# Conditional build:
+%bcond_with	ssp	# disable stack-smashing protector (vide dietlibc.spec)
+#
 Summary:	Password checking library
 Summary(es):	Biblioteca de chequeo de contraseñas
 Summary(fr):	Bibliothèque de vérification de mots de passe
@@ -8,7 +12,7 @@ Summary(tr):	Parola denetim kitapl
 Summary(uk):	â¦Â̦ÏÔÅËÁ ÐÅÒÅצÒËÉ ÐÁÒÏ̦×
 Name:		cracklib
 Version:	2.7
-Release:	17
+Release:	18
 License:	Artistic
 Group:		Libraries
 Source0:	ftp://coast.cs.purdue.edu/pub/tools/unix/libs/cracklib/%{name}_%{version}.tgz
@@ -16,6 +20,7 @@ Source0:	ftp://coast.cs.purdue.edu/pub/tools/unix/libs/cracklib/%{name}_%{versio
 Patch0:		%{name}.patch
 Patch1:		%{name}-pld.patch
 Patch2:		%{name}-nss.patch
+Patch3:		%{name}-libdir.patch
 BuildRequires:	words
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -176,17 +181,19 @@ s
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %{__make} all \
 	CC="%{__cc}" \
-	OPTFLAGS="%{rpmcflags}"
+	OPTFLAGS="%{rpmcflags} %{?with_ssp:-fno-stack-protector}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sbindir},%{_libdir},%{_includedir},%{_datadir}/dict}
 
 %{__make} install \
+	libdir=%{_libdir} \
 	ROOT=$RPM_BUILD_ROOT
 
 install cracklib/packer.h $RPM_BUILD_ROOT%{_includedir}