[nss-softokn/f17: 12/12] Merge branch 'f18' into f17

[Elio Maldonado]

commit 0983b11dd82de82f0092cb43ac6ed2783f23015d
Merge: 02959ed de6ed99
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Tue Feb 5 10:10:41 2013 -0800

    Merge branch 'f18' into f17
    
    - Update to NSS_3_14_2_RTM

 .gitignore                                         |    2 +-
 Bug-829088-nss-3.13.4-fips-sha224-selftest.patch   |   18 -----
 ...building-nss-softokn-against-older-sqlite.patch |   20 ++++++
 iquote.patch                                       |   18 +++---
 nss-softokn.spec                                   |   70 +++++++++++++++++--
 sources                                            |    2 +-
 6 files changed, 93 insertions(+), 37 deletions(-)
---
diff --cc nss-softokn.spec
index 1959c7c,901bdfb..960e25f
--- a/nss-softokn.spec
+++ b/nss-softokn.spec
@@@ -389,26 -432,45 +432,37 @@@ don
  - Bug 883114 - Install bltest and fipstest as unsupported tools
  
  * Mon Nov 19 2012 Elio Maldonado <emaldona at redhat.com> - 3.14-5
 -- Truly apply the bug 829088 patch this time
 -- Resolves: rhbz#829088 - Fix failure in sha244 self-test
 -
 -* Mon Nov 19 2012 Elio Maldonado <emaldona at redhat.com> - 3.14-4
 -- Apply the bug 829088 patch in question
 -- Adjust the patch to account for code changes in nss-3.14
 -- Resolves: rhbz#829088 - Fix failure in sha244 self-test
 -
 -* Sun Nov 18 2012 Elio Maldonado <emaldona at redhat.com> - 3.14-3
 -- Resolves: rhbz#829088 - Fix failure in sha244 self-test
 -- Fixes login failures on fips mode
 -
 -* Sat Oct 27 2012 Elio Maldonado <emaldona at redhat.com> - 3.14-2
 - - Update the license to MPLv2.0
 -
 -* Mon Oct 22 2012 Elio Maldonado <emaldona at redhat.com> - 3.14-1
  - Update to NSS_3_14_RTM
 -
 -* Sun Oct 21 2012 Elio Maldonado <emaldona at redhat.com> - 3.14-0.1.rc1.2
 -- Update to NSS_3_14_RC
 -- Remove the temporary bootstrapping modifications
 +- Restore and update patch for Bug 829088 for code changes in nss-3.14
 +- Update the license to MPLv2.0
 +- Add export LD_LIBRARY_PATH=$RPM_BUILD_ROOT/%{_libdir} to the signing commands
 +- Ensures in-tree libraries are the ones the shlibsign tools dynamically links to
 +- Now we digest and sign with SHA256 and before we used SHA1 and verification would fail
 +- This is a temporary fix while the buildroot is being bootstrapped
 +- Can be removed in the next build
 +
 +* Fri Oct 26 2012 Elio Maldonado <emaldona at redhat.com> - 3.13.6-2
 +- Bootstrapping build prior to upcoming update of nss packages to nss-3.14
 +- Don't install sechasht.h as nss-util-devel will install when updated to 3.14
 +- Prevent update conflict between nss-util-devel-3.14 and nss-softokn-devel-3.13.6
  
- * Fri Oct 05 2012 Kai Engert <kaie at redhat.com> - 3.13.6-1
- - Update to NSS_3_13_6_RTM
+ * Sun Oct 21 2012 Elio Maldonado <emaldona at redhat.com> - 3.14-0.1.rc.1
+ - Update to NSS_3_14_RC1
+ - Remove patches rendered obsolete by this update and update others
+ - Temporarily modifiy the spec file while bootstrapping the buildroot a follows:
+ - Remove unwanted headers that we lo loger ship
+ - Modified the post install scriplet to ensure the in-tree freebl library is loaded
+ 
+ * Fri Jul 20 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.13.5-3
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+ 
+ * Wed Jun 20 2012 Elio Maldonado <emaldona at redhat.com> - 3.13.5-2
+ - Resolves: rhbz#833529 - revert unwanted change to nss-softokn.pc.in
  
- * Sun Jul 01 2012 Elio Maldonado <emaldona at redhat.com> - 3.13.5-1
+ * Mon Jun 18 2012 Elio Maldonado <emaldona at redhat.com> - 3.13.5-1
  - Update to NSS_3_13_5_RTM
  - Remove unneeded fix for gcc 4.7 c++ issue in secmodt.h which undoes the upstream fix
+ - Fix Libs: line on nss-softokn.pc.in
  
  * Wed Jun 13 2012 Elio Maldonado <emaldona at redhat.com> - 3.13.4-3
  - Resolves: rhbz#745224 - nss-softokn sha224 self-test fails in fips mode