[nss/f19: 3/3] Merge branch 'master' into f19

[Elio Maldonado]

commit b8228ed18c0df027af9f872bc10e3bb5cbf99baa
Merge: 497b79c e36079d
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Tue Jun 18 18:29:01 2013 -0700

    Merge branch 'master' into f19

 no-softoken-freebl-tests.patch   |   19 -----
 nss.spec                         |  143 +++++++++++++++++---------------------
 utilwrap-include-templates.patch |   14 ++---
 3 files changed, 68 insertions(+), 108 deletions(-)
---
diff --cc nss.spec
index c94fd66,3998a4e..cf6ede0
--- a/nss.spec
+++ b/nss.spec
@@@ -184,17 -183,32 +184,33 @@@ low level services
  # link pem against buildroot's freebl, essential when mixing and matching
  %patch25 -p0 -b .systemfreebl
  # activate for stable and beta branches
 -#%patch29 -p0 -b .cbcrandomivoff
 +%patch29 -p0 -b .cbcrandomivoff
  #%patch39 -p0 -b .nobypass
  %patch40 -p0 -b .noocsptest
  %patch44 -p1 -b .syncupwithupstream
  %patch45 -p0 -b .notrash
  %patch46 -p0 -b .skipoutbound
- #%patch47 -p0 -b .templates
+ %patch47 -p0 -b .templates
  %patch48 -p0 -b .crypto
  %patch49 -p0 -b .skipthem
- %patch50 -p0 -b .iquote
++#%patch50 -p0 -b .iquote
+ 
+ #########################################################
+ # Higher-level libraries and test tools need access to
+ # module-private headers from util, freebl, and softoken
+ # until fixed upstream we must copy some headers locally
+ #########################################################
+ 
+ pemNeedsFromSoftoken="lowkeyi lowkeyti softoken softoknt"
+ for file in ${pemNeedsFromSoftoken}; do
+     %{__cp} ./nss/lib/softoken/${file}.h ./nss/lib/ckfw/pem/
+ done
+ 
+ # Copying these header util the upstream bug is accepted
+ # Upstream https://bugzilla.mozilla.org/show_bug.cgi?id=820207
+ %{__cp} ./nss/lib/softoken/lowkeyi.h ./nss/cmd/rsaperf
+ %{__cp} ./nss/lib/softoken/lowkeyti.h ./nss/cmd/rsaperf
+ 
  
  %build
  
@@@ -240,27 -270,16 +272,19 @@@ USE_64=
  export USE_64
  %endif
  
 +# uncomment if the iquote patch is activated
- export IN_TREE_FREEBL_HEADERS_FIRST=1
- 
- ##### phase 1: build freebl/softokn shared libraries
- # there no ecc in freebl
- unset NSS_ENABLE_ECC
- # Compile softoken plus needed support
- %{__make} -C ./nss/coreconf
++#export IN_TREE_FREEBL_HEADERS_FIRST=1
 +
- %{__make} -C ./nss/lib/util export
- %{__make} -C ./nss/lib/freebl export
- %{__make} -C ./nss/lib/softoken export
- 
- %{__make} -C ./nss/lib/util
- %{__make} -C ./nss/lib/dbm
- %{__make} -C ./nss/lib/freebl
- %{__make} -C ./nss/lib/softoken
- 
- # stash away the bltest and fipstest to build them last
- tar cf build_these_later.tar ./nss/cmd/bltest ./nss/cmd/fipstest
- rm -rf ./nss/cmd/bltest ./nss/cmd/fipstest
+ ##### phase 1: remove util/freebl/softoken and low level tools
+ #
+ ######## Remove freebl, softoken and util
+ %{__rm} -rf ./mozilla/security/nss/lib/freebl
+ %{__rm} -rf ./mozilla/security/nss/lib/softoken
+ %{__rm} -rf ./mozilla/security/nss/lib/util
+ ######## Remove nss-softokn test tools
+ %{__rm} -rf ./mozilla/security/nss/cmd/bltest
+ %{__rm} -rf ./mozilla/security/nss/cmd/fipstest
+ %{__rm} -rf ./mozilla/security/nss/cmd/rsaperf_low
  
  ##### phase 2: build the rest of nss
  # nss supports pluggable ecc
@@@ -699,16 -667,30 +672,26 @@@ f
  
  
  %changelog
- * Mon Jun 17 2013 Elio Maldonado <emaldona at redhat.com> - 3.15-2
+ * Tue Jun 18 2013 emaldona <emaldona at redhat.com> - 3.15-4
+ - Build nss without softoken or util sources in the tree
+ - Resolves: rhbz#689918
+ 
+ * Mon Jun 17 2013 emaldona <emaldona at redhat.com> - 3.15-3
+ - Update ssl-cbc-random-iv-by-default.patch
+ 
+ * Sun Jun 16 2013 Elio Maldonado <emaldona at redhat.com> - 3.15-2
+ - Fix generation of NSS_VMAJOR, NSS_VMINOR, and NSS_VPATCH for nss-config
+ 
+ * Sat Jun 15 2013 Elio Maldonado <emaldona at redhat.com> - 3.15-1
  - Update to NSS_3_15_RTM
  
 -* Wed Apr 24 2013 Elio Maldonado <emaldona at redhat.com> - 3.15-0.1.beta1.2
 -- Fix incorrect path that hid failed test from view
 -- Add ocsp to the test suites to run but ...
 -- Temporarily disable the ocsp stapling tests
 -- Do not treat failed attempts at ssl pkcs11 bypass as fatal errors
 +* Tue May 14 2013 Elio Maldonado <emaldona at redhat.com> - 3.14.3-13.0
 +- Reactivate nss-ssl-cbc-random-iv-off-by-default.patch
  
 -* Thu Apr 04 2013 Elio Maldonado <emaldona at redhat.com> - 3.15-0.1.beta1.1
 -- Update to NSS_3_15_BETA1
 -- Update spec file, patches, and helper scripts on account of a shallower source tree
 +* Fri Apr 19 2013 Kai Engert <kaie at redhat.com> - 3.14.3-12.0
 +- Add upstream patch to fix rhbz#872761
  
 -* Sun Mar 24 2013 Kai Engert <kaie at redhat.com> - 3.14.3-12
 +* Sun Mar 24 2013 Kai Engert <kaie at redhat.com> - 3.14.3-11
  - Update expired test certificates (fixed in upstream bug 852781)
  
  * Fri Mar 08 2013 Kai Engert <kaie at redhat.com> - 3.14.3-10