From 191c28e50ca387e70fdbf218b6274a3b6127e97d Mon Sep 17 00:00:00 2001 From: Robert Relyea Date: Jan 23 2007 01:27:55 +0000 Subject: - disable ECC --- diff --git a/nss-clobber.sh b/nss-clobber.sh new file mode 100755 index 0000000..5ace9da --- /dev/null +++ b/nss-clobber.sh @@ -0,0 +1,25 @@ +#!/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 diff --git a/nss.spec b/nss.spec index b612e54..e4bfd90 100644 --- a/nss.spec +++ b/nss.spec @@ -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 @@ Source2: nss-config.in 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 @@ low level services. %prep %setup -q +sh %{SOURCE6} > /dev/null %build @@ -102,8 +103,8 @@ USE_64=1 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 @@ done %changelog -* Tue Nov 21 2006 Kai Engert - 3.11.4-1 +* Tue Jan 9 2007 Bob Relyea - 3.11.4-4 +- disable ECC, cleanout dead code + +* Tue Nov 28 2006 Kai Engert - 3.11.4-1 - Update to 3.11.4 * Thu Sep 14 2006 Kai Engert - 3.11.3-2