[nss/f17: 7/7] Merge branch 'master' into f17

[Elio Maldonado]

commit 034c16be3604dfe1dd20408559d3e906bee49ba4
Merge: 51c4dcf 99d4b15
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Fri Apr 6 15:26:15 2012 -0700

    Merge branch 'master' into f17
    
    - Update to NSS_3_13_4_RTM
    - Update the nss-pem source archive to the latest version
    - Remove no longer needed patches
    - Resolves: Bug 806043 - use pem files interchangeably in a single process
    - Resolves: Bug 806051 - PEM various flaws detected by Coverity
    - Resolves: Bug 806058 - PEM pem_CreateObject leaks memory given a non-existing file name

 .gitignore                                         |    4 +-
 0001-Bug-695011-PEM-logging.patch                  |  107 ----------------
 0001-libnsspem-rhbz-734760.patch                   |   21 ---
 ...-that-causes-openswan-to-drop-connections.patch |   15 ---
 nss.spec                                           |   49 +++-----
 nsspem-642433.patch                                |   52 --------
 nsspem-bz754771.patch                              |   13 --
 nsspem-createobject-initialize-pointer.patch       |   11 --
 nsspem-init-inform-not-thread-safe.patch           |  129 --------------------
 sources                                            |    4 +-
 10 files changed, 23 insertions(+), 382 deletions(-)
---
diff --cc nss.spec
index 49915fa,ca84b47..5443482
--- a/nss.spec
+++ b/nss.spec
@@@ -67,10 -63,8 +63,8 @@@ Patch18:          nss-646045.patc
  Patch25:          nsspem-use-system-freebl.patch
  # don't compile the fipstest application
  Patch26:          nofipstest.patch
- # include this patch in the upstream pem review
- Patch28:          nsspem-bz754771.patch
- # This patch is currently meant for f16 and f15 only, and f17 now
 -# This patch is currently meant for f16 and f15 only
 -#Patch29:          nss-ssl-cbc-random-iv-off-by-default.patch
++# This patch is currently meant for stable branches
 +Patch29:          nss-ssl-cbc-random-iv-off-by-default.patch
  
  # upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=734492
  Patch30:          bz784672-protect-against-calls-before-nss_init.patch
@@@ -165,19 -153,13 +153,13 @@@ low level services
  
  %patch3 -p0 -b .transitional
  %patch6 -p0 -b .libpem
- %patch7 -p0 -b .642433
- %patch8 -p1 -b .695011
  %patch16 -p0 -b .539183
  %patch18 -p0 -b .646045
- %patch20 -p1 -b .717338
- %patch21 -p1 -b .734760
- %patch22 -p0 -b .736410
- # link pem against buildroot's 3.12 freebl
+ # link pem against buildroot's freebl, esential wen mixing and matching
  %patch25 -p0 -b .systemfreebl
  %patch26 -p0 -b .nofipstest
- %patch28 -p0 -b .754771
- # activate only if requested for f17
- #%patch29 -p0 -b .770682
+ # activate only if requested for this branch
 -#%patch29 -p0 -b .770682
++%patch29 -p0 -b .770682
  %patch30 -p0 -b .784672
  %patch31 -p0 -b .gcc47
  %patch32 -p0 -b .800674
@@@ -601,6 -582,19 +582,14 @@@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/n
  
  
  %changelog
+ * Fri Apr 06 2012 Elio Maldonado <emaldona at redhat.com> - 3.13.4-1
+ - Update to NSS_3_13_4_RTM
 -
 -* Mon Apr 02 2012 Elio Maldonado <emaldona at redhat.com> - 3.13.4-0.1.beta1.2
+ - Update the nss-pem source archive to the latest version
+ - Remove no longer needed patches
+ - Resolves: Bug 806043 - use pem files interchangeably in a single process
+ - Resolves: Bug 806051 - PEM various flaws detected by Coverity
+ - Resolves: Bug 806058 - PEM pem_CreateObject leaks memory given a non-existing file name
+ 
 -* Sun Apr 01 2012 Elio Maldonado <emaldona at redhat.com> - 3.13.4-0.1.beta1.1
 -- Update to NSS_3_13.4_BETA1
 -
  * Wed Mar 21 2012 Elio Maldonado <emaldona at redhat.com> - 3.13.3-4
  - Resolves: Bug 805723 - Library needs partial RELRO support added