[nss/f14/master: 4/5] Merge branch 'f15' into f14, partial merge

[Elio Maldonado]

commit 4e9256eccb5c256eda6f768765fd959da96a9023
Merge: c400a7a 11feb76
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Tue Apr 12 13:01:57 2011 -0700

    Merge branch 'f15' into f14, partial merge

 0001-Bug-695011-PEM-logging.patch |  107 +++++++++++++++++++++++++++++++++++++
 nss.spec                          |    8 +++-
 sources                           |    2 +-
 3 files changed, 115 insertions(+), 2 deletions(-)
---
diff --cc nss.spec
index bfeae60,7c9ed95..e876951
--- a/nss.spec
+++ b/nss.spec
@@@ -6,7 -6,7 +6,7 @@@
  Summary:          Network Security Services
  Name:             nss
  Version:          3.12.9
- Release:          9%{?dist}
 -Release:          15%{?dist}
++Release:          10%{?dist}
  License:          MPLv1.1 or GPLv2+ or LGPLv2+
  URL:              http://www.mozilla.org/projects/security/pki/nss/
  Group:            System Environment/Libraries
@@@ -42,7 -42,11 +42,8 @@@ Source12:         %{name}-pem-20101125.
  Patch3:           renegotiate-transitional.patch
  Patch6:           nss-enable-pem.patch
  Patch7:           nsspem-642433.patch
+ Patch8:           0001-Bug-695011-PEM-logging.patch
  Patch11:          honor-user-trust-preferences.patch
 -Patch12:          allow-content-types-beyond-smime.patch
 -Patch13:          nss-recurse.patch
 -Patch14:          dont-use-cpp-reserved-words.patch
  Patch15:          swap-internal-key-slot.patch
  Patch16:          nss-539183.patch
  
@@@ -117,7 -121,11 +118,8 @@@ low level services
  %patch3 -p0 -b .transitional
  %patch6 -p0 -b .libpem
  %patch7 -p0 -b .642433
+ %patch8 -p1 -b .695011          
  %patch11 -p1 -b .643134
 -%patch12 -p1 -b .contenttypes
 -%patch13 -p1 -b .recurse
 -%patch14 -p1 -b .676036
  %patch15 -p1 -b .jss
  %patch16 -p0 -b .539183
  
@@@ -513,22 -521,44 +515,26 @@@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/n
  
  
  %changelog
+ * Mon Apr 11 2011 Elio Maldonado <emaldona at redhat.com> - 3.12.9-15
+ - Implement PEM logging using NSPR's own (#695011)
+ - Update the expired PayPalEE test certificate to one good until April 1, 2013
 - 
 -* Wed Mar 25 2011 Elio Maldonado <emaldona at redhat.com> - 3.12.9-14
++
 +* Wed Mar 25 2011 Elio Maldonado <emaldona at redhat.com> - 3.12.9-9
  - Update to NSS_3.12.9_WITH_CKBI_1_82_RTM
  
 -* Wed Feb 24 2011 Elio Maldonado <emaldona at redhat.com> - 3.12.9-13
 +* Wed Feb 24 2011 Elio Maldonado <emaldona at redhat.com> - 3.12.9-8
  - Short-term fix for ssl test suites hangs on ipv6 type connections (#539183)
  
 -* Fri Feb 18 2011 Elio Maldonado <emaldona at redhat.com> - 3.12.9-12
 +* Fri Feb 18 2011 Elio Maldonado <emaldona at redhat.com> - 3.12.9-7
  - Add a missing requires for pkcs11-devel (#675196)
 +- Remove a header that now nss-softokn-freebl-devel ships
  
 -* Tue Feb 15 2011 Elio Maldonado <emaldona at redhat.com> - 3.12.9-11
 -- Run the test suites in the check section (#677809)
 -
 -* Thu Feb 10 2011 Elio Maldonado <emaldona at redhat.com> - 3.12.9-10
 -- Fix cms headers to not use c++ reserved words (#676036)
 -- Reenabling Bug 499444 patches
 -- Fix to swap internal key slot on fips mode switches
 -
 -* Tue Feb 08 2011 Elio Maldonado <emaldona at redhat.com> - 3.12.9-9
 -- Revert patches for 499444 until all c++ reserved words are found and extirpated
 -
 -* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.12.9-8
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 -
 -* Tue Feb 08 2011 Elio Maldonado <emaldona at redhat.com> - 3.12.9-7
 -- Fix cms header to not use c++ reserved word (#676036)
 -- Reenable patches for bug 499444
 -
 -* Tue Feb 08 2011 Christopher Aillon <caillon at redhat.com> - 3.12.9-6
 -- Revert patches for 499444 as they use a C++ reserved word and
 -  cause compilation of Firefox to fail
 +* Thu Feb 10 2011 Elio Maldonado <emaldona at redhat.com> - 3.12.9-6
 +- Fix to swap internal key slot on fips mode switches, related to #633043
  
 -* Fri Feb 04 2011 Elio Maldonado <emaldona at redhat.com> - 3.12.9-5
 -- Fix the earlier infinite recursion patch (#499444)
 -- Remove a header that now nss-softokn-freebl-devel ships
 +* Mon Feb 07 2011 Elio Maldonado <emaldona at redhat.com> - 3.12.9-5
 +- Remove a header that now nss-softokn-freebl-devel ships, related to #675196
 +- Backing out earlier patch until further testing from upstream for 3.12.10
  
  * Tue Feb 01 2011 Elio Maldonado <emaldona at redhat.com> - 3.12.9-4
  - Fix infinite recursion when encoding NSS enveloped/digested data (#499444)