[nss/f16: 53/53] Merge branch 'f17' into f16

[Elio Maldonado]

commit a8b285778add2239c7832fc727e499e8e6c8f279
Merge: 5836e14 aec3543
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Tue Dec 18 10:19:05 2012 -0800

    Merge branch 'f17' into f16

 .gitignore                                         |    5 +-
 ...d-key-usage-for-MS-Authenticode-Code-Sign.patch |  168 +++++++++
 Bug-772628-nss_Init-leaks-memory.patch             |   27 --
 ...ble-to-contact-LDAP-Server-during-winsync.patch |   27 --
 ...MQP-daemon-fails-to-load-after-nss-update.patch |   15 -
 Bug-872124-fix-pk11wrap-locking.patch              |  393 ++++++++++++++++++++
 ...672-protect-against-calls-before-nss_init.patch |   40 --
 nofipstest.patch                                   |   19 -
 nss-3.14.0.0-disble-ocsp-test.patch                |    9 +
 nss-539183.patch                                   |   43 ++-
 nss-ssl-cbc-random-iv-off-by-default.patch         |   12 +-
 nss-ssl-enforce-no-pkcs11-bypass.path              |   15 +
 nss.spec                                           |  178 ++++++----
 sources                                            |    5 +-
 14 files changed, 748 insertions(+), 208 deletions(-)
---
diff --cc nss.spec
index 3001d10,13373f3..b50cf6c
--- a/nss.spec
+++ b/nss.spec
@@@ -593,6 -593,52 +593,52 @@@ rm -f $RPM_BUILD_ROOT/%{_includedir}/ns
  
  
  %changelog
 -* Mon Nov 19 2012 Elio Maldonado <emaldona at redhat.com> - 3.14-7
++* Tue Dec 18 2012 Elio Maldonado <emaldona at redhat.com> - 3.14-7
+ - Bug 870864 - Add support in NSS for Secure Boot
+ 
+ * Fri Nov 09 2012 Elio Maldonado <emaldona at redhat.com> - 3.14-6
+ - Disable bypass code at build time and return failure on attempts to enable at runtime
+ - Bug 806588 - Disable SSL PKCS #11 bypass at build time
+ - Fix changelog release tags to match what was actually built
+ 
+ * Mon Nov 05 2012 Elio Maldonado <emaldona at redhat.com> - 3.14-5
+ - Fix pk11wrap locking which fixes 'fedpkg new-sources' and 'fedpkg update' hangs
+ - Bug 872124 - nss-3.14 breaks fedpkg new-sources
+ 
+ * Thu Nov 01 2012 Elio Maldonado <emaldona at redhat.com> - 3.14-4
+ - Add a dummy source file for testing /preventing fedpkg breakage
+ - Helps test the fedpkg new-sources and upload commands for breakage by nss updates
+ - Related to Bug 872124 - nss 3.14 breaks fedpkg new-sources
+ 
+ * Thu Nov 01 2012 Elio Maldonado <emaldona at redhat.com> - 3.14-3
+ - Reenable patch to set NSS_SSL_CBC_RANDOM_IV to 1 by default
+ - Update the patch to account for the new sources
+ - Resolves Bug 872124 - nss 3.14 breaks fedpkg new-sources
+ 
+ * Wed Oct 31 2012 Elio Maldonado <emaldona at redhat.com> - 3.14-2
+ - Fix the spec file so sechash.h gets installed
+ - Resolves: rhbz#871882 - missing header: sechash.h in nss 3.14
+ 
+ * Sat Oct 27 2012 Elio Maldonado <emaldona at redhat.com> - 3.14-4
+ - Update the license to MPLv2.0
+ 
+ * Wed Oct 24 2012 Elio Maldonado <emaldona at redhat.com> - 3.14-3
+ - Use only -f when removing unwanted headers
+ 
+ * Tue Oct 23 2012 Elio Maldonado <emaldona at redhat.com> - 3.14-2
+ - Add secmodt.h to the headers installed by nss-devel
+ - nss-devel must install secmodt.h which moved from softoken to pk11wrap with nss-3.14
+ 
+ * 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.rc.1
+ - Update to NSS_3_14_RC1
+ - update nss-589636.patch to apply to httpdserv
+ - turn off ocsp tests for now
+ - remove no longer needed patches
+ - remove headers shipped by nss-util
+ 
  * Fri Oct 05 2012 Kai Engert <kaie at redhat.com> - 3.13.6-1
  - Update to NSS_3_13_6_RTM