[nss-softokn/f18: 3/3] Merge branch 'master' into f18

[Elio Maldonado]

commit de6ed995fd43f6df0210e037387cdf020eb538dc
Merge: 812d754 8533793
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Mon Feb 4 13:53:25 2013 -0800

    Merge branch 'master' into f18
    
    - Add patch approved and applied upstream for nss-3.14.3 by Kai Engert
    - Revert changes made to the nss split softoken script
    - Using the same sources tar ball as the master branch

 Bug-829088-nss-3.13.4-fips-sha224-selftest.patch   |   18 -
 add-rsaperf_low-test.patch                         |  883 --------------------
 ...building-nss-softokn-against-older-sqlite.patch |   20 +
 nss-softokn.spec                                   |   36 +-
 nss-split-softokn.sh                               |    3 -
 sources                                            |    2 +-
 6 files changed, 42 insertions(+), 920 deletions(-)
---
diff --cc nss-softokn.spec
index 782d5ea,453fdf5..901bdfb
--- a/nss-softokn.spec
+++ b/nss-softokn.spec
@@@ -390,21 -385,16 +385,32 @@@ don
  %{_includedir}/nss3/shsign.h
  
  %changelog
+ * Mon Feb 04 2013 Elio Maldonado <emaldona at redhat.com> - 3.14.2-3
+ - Allow building nss-softokn against older system sqlite
++- Add patch approved and applied upstream for nss-3.14.3
++- Revert previous changes to the nss split softoken script
++- Use same source tar ball as the master branch
+ 
+ * Sat Feb 02 2013 Elio Maldonado <emaldona at redhat.com> - 3.14.2-2
+ - Update to NSS_3_14_2_RTM
+ - Restore comments on how to transition when signing algorithm changes
+ - Remove unused patches
+ 
  * Fri Feb 01 2013 Elio Maldonado <emaldona at redhat.com> - 3.14.2-1
  - Update to NSS_3_14_2_RTM
 +- Use nss sqlite copy until this fedora branch is updated to sqlite-3.17.5
 +- Modify softokn split script to include sqlite in the softokn sources
 +- Add temporary patch that adds sqlite to list of source directories to compile
 +
 +* Wed Jan 02 2013 Elio Maldonado <emaldona at redhat.com> - 3.14.1-7
 +- Actually add the LD_LIBRARY_PATH line to the post-install scriptlet 
 +- Resolves: rhbz#891369
 +
 +* Wed Jan 02 2013 Elio Maldonado <emaldona at redhat.com> - 3.14.1-6
 +- Resolves: Bug 891369 - shared libraries not found due to signature verification failure
 +- Fix failure signature verification failures on post-install scriplet
 +- Add export LD_LIBRARY_PATH=$RPM_BUILD_ROOT/%{_libdir} before the signing commands
 +- Ensure tool links with in-tree freebl so verification uses same algorithm as in signing
  
  * Thu Dec 27 2012 Elio Maldonado <emaldona at redhat.com> - 3.14.1-5
  - Add RSA performance test for freebl