From 3be73792378d6bbfe3c901a250e89dadd35fda19 Mon Sep 17 00:00:00 2001 From: Elio Maldonado Date: Wed, 24 Oct 2012 11:13:25 -0700 Subject: [PATCH] Use only -f when removing unwanted headers - alerted to this flaw by Kamil Dudka - unneeded as we are only removing headers, not directories, and a dangerous practice --- nss.spec | 85 +++++++++++++++++++++++++++++--------------------------- 1 file changed, 44 insertions(+), 41 deletions(-) diff --git a/nss.spec b/nss.spec index 8924dc3..2a57e3f 100644 --- a/nss.spec +++ b/nss.spec @@ -7,7 +7,7 @@ Summary: Network Security Services Name: nss Version: 3.14 -Release: 2%{?dist} +Release: 3%{?dist} License: MPLv1.1 or GPLv2+ or LGPLv2+ URL: http://www.mozilla.org/projects/security/pki/nss/ Group: System Environment/Libraries @@ -410,48 +410,48 @@ done %{__install} -p -m 755 ./mozilla/dist/pkgconfig/setup-nsssysinit.sh $RPM_BUILD_ROOT/%{_bindir}/setup-nsssysinit.sh #remove the nss-util-devel headers -rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/base64.h -rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/ciferfam.h -rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/nssb64.h -rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/nssb64t.h -rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/nsslocks.h -rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/nssilock.h -rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/nssilckt.h -rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/nssrwlk.h -rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/nssrwlkt.h -rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/nssutil.h -rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/pkcs11.h -rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/pkcs11f.h -rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/pkcs11n.h -rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/pkcs11p.h -rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/pkcs11t.h -rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/pkcs11u.h -rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/portreg.h -rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/secasn1.h -rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/secasn1t.h -rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/seccomon.h -rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/secder.h -rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/secdert.h -rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/secdig.h -rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/secdigt.h -rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/secerr.h -rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/secitem.h -rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/secoid.h -rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/secoidt.h -rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/secport.h -rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/utilrename.h -rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/utilmodt.h -rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/utilpars.h -rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/utilparst.h +rm -f $RPM_BUILD_ROOT/%{_includedir}/nss3/base64.h +rm -f $RPM_BUILD_ROOT/%{_includedir}/nss3/ciferfam.h +rm -f $RPM_BUILD_ROOT/%{_includedir}/nss3/nssb64.h +rm -f $RPM_BUILD_ROOT/%{_includedir}/nss3/nssb64t.h +rm -f $RPM_BUILD_ROOT/%{_includedir}/nss3/nsslocks.h +rm -f $RPM_BUILD_ROOT/%{_includedir}/nss3/nssilock.h +rm -f $RPM_BUILD_ROOT/%{_includedir}/nss3/nssilckt.h +rm -f $RPM_BUILD_ROOT/%{_includedir}/nss3/nssrwlk.h +rm -f $RPM_BUILD_ROOT/%{_includedir}/nss3/nssrwlkt.h +rm -f $RPM_BUILD_ROOT/%{_includedir}/nss3/nssutil.h +rm -f $RPM_BUILD_ROOT/%{_includedir}/nss3/pkcs11.h +rm -f $RPM_BUILD_ROOT/%{_includedir}/nss3/pkcs11f.h +rm -f $RPM_BUILD_ROOT/%{_includedir}/nss3/pkcs11n.h +rm -f $RPM_BUILD_ROOT/%{_includedir}/nss3/pkcs11p.h +rm -f $RPM_BUILD_ROOT/%{_includedir}/nss3/pkcs11t.h +rm -f $RPM_BUILD_ROOT/%{_includedir}/nss3/pkcs11u.h +rm -f $RPM_BUILD_ROOT/%{_includedir}/nss3/portreg.h +rm -f $RPM_BUILD_ROOT/%{_includedir}/nss3/secasn1.h +rm -f $RPM_BUILD_ROOT/%{_includedir}/nss3/secasn1t.h +rm -f $RPM_BUILD_ROOT/%{_includedir}/nss3/seccomon.h +rm -f $RPM_BUILD_ROOT/%{_includedir}/nss3/secder.h +rm -f $RPM_BUILD_ROOT/%{_includedir}/nss3/secdert.h +rm -f $RPM_BUILD_ROOT/%{_includedir}/nss3/secdig.h +rm -f $RPM_BUILD_ROOT/%{_includedir}/nss3/secdigt.h +rm -f $RPM_BUILD_ROOT/%{_includedir}/nss3/secerr.h +rm -f $RPM_BUILD_ROOT/%{_includedir}/nss3/secitem.h +rm -f $RPM_BUILD_ROOT/%{_includedir}/nss3/secoid.h +rm -f $RPM_BUILD_ROOT/%{_includedir}/nss3/secoidt.h +rm -f $RPM_BUILD_ROOT/%{_includedir}/nss3/secport.h +rm -f $RPM_BUILD_ROOT/%{_includedir}/nss3/utilrename.h +rm -f $RPM_BUILD_ROOT/%{_includedir}/nss3/utilmodt.h +rm -f $RPM_BUILD_ROOT/%{_includedir}/nss3/utilpars.h +rm -f $RPM_BUILD_ROOT/%{_includedir}/nss3/utilparst.h #remove headers shipped nss-softokn-devel and nss-softokn-freebl-devel -rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/alghmac.h -rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/blapit.h -rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/ecl-exp.h -rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/hasht.h -rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/sechash.h -rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/shsign.h -rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/nsslowhash.h +rm -f $RPM_BUILD_ROOT/%{_includedir}/nss3/alghmac.h +rm -f $RPM_BUILD_ROOT/%{_includedir}/nss3/blapit.h +rm -f $RPM_BUILD_ROOT/%{_includedir}/nss3/ecl-exp.h +rm -f $RPM_BUILD_ROOT/%{_includedir}/nss3/hasht.h +rm -f $RPM_BUILD_ROOT/%{_includedir}/nss3/sechash.h +rm -f $RPM_BUILD_ROOT/%{_includedir}/nss3/shsign.h +rm -f $RPM_BUILD_ROOT/%{_includedir}/nss3/nsslowhash.h %clean %{__rm} -rf $RPM_BUILD_ROOT @@ -580,6 +580,9 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/nsslowhash.h %changelog +* Wed Oct 24 2012 Elio Maldonado - 3.14-3 +- Use only -f when removing unwanted headers + * Tue Oct 23 2012 Elio Maldonado - 3.14-2 - Add secmodt.h to the headers installed by nss-devel - nss-devel must install secmodt.h which moved from softoken to pk11wrap with nss-3.14