[nss/f18: 9/9] Merge branch 'master' into f18

[Elio Maldonado]

commit 7430fa825a11dc45e4d07a827ee56ec91a4a99e4
Merge: ed2b41d 192d1d3
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Sat Oct 27 14:38:50 2012 -0400

    Merge branch 'master' into f18
    
    - Update to NSS_3_14_RTM
    - Update the license to MPLv2.0
    - Use only -f when removing unwanted headers
    - Add secmodt.h to the headers installed by nss-devel
    - update nss-589636.patch to apply to httpdserv
    - turn off ocsp tests for now
    - remove no longer needed patches
    - remove secmodt.h now installed by nss-util

 .gitignore                                         |    2 +-
 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 ---
 ...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-fix-gcc47-secmodt.patch                        |   12 --
 nss.spec                                           |  126 ++++++++++----------
 sources                                            |    2 +-
 11 files changed, 111 insertions(+), 211 deletions(-)
---
diff --cc .gitignore
index 02a1448,52bee26..84ffe22
--- a/.gitignore
+++ b/.gitignore
@@@ -5,4 -5,5 +5,4 @@@ blank-cert9.d
  blank-key4.db
  PayPalEE.cert
  /nss-pem-20120811.tar.bz2
--/nss-3.13.6-stripped.tar.bz2
+ /nss-3.14-stripped.tar.bz2
diff --cc nss.spec
index 3622e1a,dc290fd..e6928a8
--- a/nss.spec
+++ b/nss.spec
@@@ -6,9 -6,9 +6,9 @@@
  
  Summary:          Network Security Services
  Name:             nss
- Version:          3.13.6
+ Version:          3.14
 -Release:          4%{?dist}
 +Release:          1%{?dist}
- License:          MPLv1.1 or GPLv2+ or LGPLv2+
+ License:          MPLv2.0
  URL:              http://www.mozilla.org/projects/security/pki/nss/
  Group:            System Environment/Libraries
  Requires:         nspr >= %{nspr_version}
@@@ -594,6 -580,26 +580,16 @@@ rm -f $RPM_BUILD_ROOT/%{_includedir}/ns
  
  
  %changelog
 -* Sat Oct 27 2012 Elio Maldonado <emaldona at redhat.com> - 3.14-4
++* Sat Oct 27 2012 Elio Maldonado <emaldona at redhat.com> - 3.14-1
++- Update to NSS_3_14_RTM
+ - 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
++- remove secmodt.h now installed by nss-util
+ 
  * Fri Oct 05 2012 Kai Engert <kaie at redhat.com> - 3.13.6-1
  - Update to NSS_3_13_6_RTM