rpms/nss/devel nss-clobber.sh,NONE,1.1 nss.spec,1.18,1.19

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Tue Jan 23 01:27:57 UTC 2007


Author: rrelyea

Update of /cvs/dist/rpms/nss/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10930

Modified Files:
	nss.spec 
Added Files:
	nss-clobber.sh 
Log Message:

 - disable ECC




--- NEW FILE nss-clobber.sh ---
#!/bin/sh 
FREEBLDIR=./mozilla/security/nss/lib/freebl
set -e 

mv ${FREEBLDIR}/ecl/ecl-exp.h ${FREEBLDIR}/save
rm -rf ${FREEBLDIR}/ecl/tests
for i in ${FREEBLDIR}/ecl/* ; do
echo clobbering $i
 > $i
done
mv ${FREEBLDIR}/save ${FREEBLDIR}/ecl/ecl-exp.h

for j in ${FREEBLDIR}/ec.*; do
        echo unifdef $j
	cat $j | \
	awk    'BEGIN {ech=1; prt=0;} \
		/^#[ \t]*ifdef.*NSS_ENABLE_ECC/ {ech--; next;} \
                /^#[ \t]*if/ {if(ech < 1) ech--;} \
		{if(ech>0) {;print $0};} \
		/^#[ \t]*endif/ {if(ech < 1) ech++;} \
		{if (prt && (ech<=0)) {;print $0}; } \
		{if (ech>0) {prt=0;} } \
                /^#[ \t]*else/ {if (ech == 0) prt=1;}' > $j.hobbled && \
	mv $j.hobbled $j
done


Index: nss.spec
===================================================================
RCS file: /cvs/dist/rpms/nss/devel/nss.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- nss.spec	21 Nov 2006 23:44:06 -0000	1.18
+++ nss.spec	23 Jan 2007 01:27:55 -0000	1.19
@@ -3,7 +3,7 @@
 Summary:          Network Security Services
 Name:             nss
 Version:          3.11.4
-Release:          1
+Release:          5%{?dist}
 License:          MPL/GPL/LGPL
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -21,7 +21,7 @@
 Source3:          blank-cert8.db
 Source4:          blank-key3.db
 Source5:          blank-secmod.db
-
+Source6:	  nss-clobber.sh
 
 %description
 Network Security Services (NSS) is a set of libraries designed to
@@ -71,6 +71,7 @@
 
 %prep
 %setup -q
+sh %{SOURCE6} > /dev/null
 
 %build
 
@@ -102,8 +103,8 @@
 export USE_64
 %endif
 
-NSS_ENABLE_ECC=1
-export NSS_ENABLE_ECC
+# NSS_ENABLE_ECC=1
+# export NSS_ENABLE_ECC
 
 %{__make} -C ./mozilla/security/coreconf
 %{__make} -C ./mozilla/security/dbm
@@ -326,7 +327,10 @@
 
 
 %changelog
-* Tue Nov 21 2006 Kai Engert <kengert at redhat.com> - 3.11.4-1
+* Tue Jan  9 2007 Bob Relyea <rrelyea at redhat.com> - 3.11.4-4
+- disable ECC, cleanout dead code
+
+* Tue Nov 28 2006 Kai Engert <kengert at redhat.com> - 3.11.4-1
 - Update to 3.11.4
 
 * Thu Sep 14 2006 Kai Engert <kengert at redhat.com> - 3.11.3-2




More information about the fedora-cvs-commits mailing list