From 99a740d2ee1b93d393b153cdf5fbe0001ec23e06 Mon Sep 17 00:00:00 2001
From: Elio Maldonado <emaldona@redhat.com>
Date: Mon, 13 Aug 2012 15:05:06 -0700
Subject: [PATCH] Fix pluggable ecc support

- Build nss in three phases
- Phase 1: build softoken, freebl, and util with NSS_ENABLE_ECC unset
- Phase 2: build the rest of nss (muinus bltest and fipstest) with NSS_ENABLE_ECC and NSS_ECC_MORE_THAN_SUITEB set
- Phase 3: build bltest and fipstest with NSS_ENABLE_ECC unset as in phsae 1
---
 nss.spec | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/nss.spec b/nss.spec
index 52901f2..daeb7b1 100644
--- a/nss.spec
+++ b/nss.spec
@@ -7,7 +7,7 @@
 Summary:          Network Security Services
 Name:             nss
 Version:          3.13.5
-Release:          6%{?dist}
+Release:          7%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -217,7 +217,19 @@ unset NSS_ENABLE_ECC
 # Compile softoken plus needed support
 %{__make} -C ./mozilla/security/coreconf
 %{__make} -C ./mozilla/security/dbm
-%{__make} -C ./mozilla/security/nss
+
+%{__make} -C ./mozilla/security/nss/lib/util export
+%{__make} -C ./mozilla/security/nss/lib/freebl export
+%{__make} -C ./mozilla/security/nss/lib/softoken export
+
+%{__make} -C ./mozilla/security/nss/lib/util
+%{__make} -C ./mozilla/security/nss/lib/freebl
+%{__make} -C ./mozilla/security/nss/lib/softoken
+
+# stash away the bltest and fipstest to build them last
+tar cf build_these_later.tar ./mozilla/security/nss/cmd/bltest ./mozilla/security/nss/cmd/fipstest
+rm -rf ./mozilla/security/nss/cmd/bltest
+rm -rf ./mozilla/security/nss/cmd/fipstest
 
 ##### phase 2: build the rest of nss
 # nss supports pluggable ecc
@@ -235,6 +247,12 @@ export NSS_ECC_MORE_THAN_SUITE_B
 %{__make} -C ./mozilla/security/dbm
 %{__make} -C ./mozilla/security/nss
 
+##### phase 3: build bltest and fipstest
+tar xf build_these_later.tar
+unset NSS_ENABLE_ECC; %{__make} -C ./mozilla/security/nss/cmd/bltest
+unset NSS_ENABLE_ECC; %{__make} -C ./mozilla/security/nss/cmd/fipstest
+%{__rm} -f build_these_later.tar
+
 # Set up our package file
 # The nspr_version and nss_{util|softokn}_version globals used
 # here match the ones nss has for its Requires. 
@@ -580,6 +598,9 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/nsslowhash.h
 
 
 %changelog
+* Mon Aug 13 2012 Elio Maldonado <emaldona@redhat.com> - 3.13.5-7
+- Fix pluggable ecc support
+
 * Fri Jul 20 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.13.5-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild