[nss/f16] Update to NSS_3_13_4_RTM

Elio Maldonado emaldonado at fedoraproject.org
Sat Apr 7 17:16:08 UTC 2012


commit 421ec14b0e65ff3a49dd0fab8c29b515a0d0528c
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Sat Apr 7 10:15:40 2012 -0700

    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                                           |   41 +++----
 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, 21 insertions(+), 376 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index abf5f25..b5ff2c8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,8 @@
-nss-3.13.3-stripped.tar.bz2
-nss-pem-20101125.tar.bz2
 blank-cert8.db
 blank-key3.db
 blank-secmod.db
 blank-cert9.db
 blank-key4.db
 PayPalEE.cert
+/nss-3.13.4-stripped.tar.bz2
+/nss-pem-20120402.tar.bz2
diff --git a/nss.spec b/nss.spec
index 0677c3b..1447264 100644
--- a/nss.spec
+++ b/nss.spec
@@ -1,13 +1,13 @@
 %global nspr_version 4.9
-%global nss_util_version 3.13.3
+%global nss_util_version 3.13.4
 %global nss_softokn_fips_version 3.12.9
-%global nss_softokn_version 3.13.3
+%global nss_softokn_version 3.13.4
 %global unsupported_tools_directory %{_libdir}/nss/unsupported-tools
 
 Summary:          Network Security Services
 Name:             nss
-Version:          3.13.3
-Release:          2%{?dist}
+Version:          3.13.4
+Release:          1%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -52,24 +52,18 @@ Source7:          blank-key4.db
 Source8:          system-pkcs11.txt
 Source9:          setup-nsssysinit.sh
 Source10:         PayPalEE.cert
-Source12:         %{name}-pem-20101125.tar.bz2
+Source12:         %{name}-pem-20120402.tar.bz2
 
 Patch3:           renegotiate-transitional.patch
 Patch6:           nss-enable-pem.patch
-Patch7:           nsspem-642433.patch
-Patch8:           0001-Bug-695011-PEM-logging.patch
 Patch16:          nss-539183.patch
 Patch18:          nss-646045.patch
-Patch20:          nsspem-createobject-initialize-pointer.patch
-Patch21:          0001-libnsspem-rhbz-734760.patch
-Patch22:          nsspem-init-inform-not-thread-safe.patch
-# must statically link pem against the 3.12.x system freebl in the buildroot
+# must statically link pem against the freebl in the buildroot
+# Needed only when freebl on tree has newe APIS
 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 current stable branches
+# 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
@@ -81,9 +75,6 @@ Patch32:          Bug-800674-Unable-to-contact-LDAP-Server-during-winsync.patch
 # upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=734492
 Patch33:          Bug-800682-Qpid-AMQP-daemon-fails-to-load-after-nss-update.patch
 
-# upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=734441
-Patch34:          Bug-800676-nss-workaround-for-freebl-bug-that-causes-openswan-to-drop-connections.patch
-
 
 %description
 Network Security Services (NSS) is a set of libraries designed to
@@ -159,14 +150,9 @@ 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
@@ -174,7 +160,6 @@ low level services.
 %patch30 -p0 -b .784672
 %patch32 -p0 -b .800674
 %patch33 -p0 -b .800682
-%patch34 -p0 -b .800676
 
 
 %build
@@ -593,6 +578,14 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/nsslowhash.h
 
 
 %changelog
+* Sat Apr 07 2012 Elio Maldonado <emaldona at redhat.com> - 3.13.4-1
+- 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
+
 * Wed Mar 28 2012 Elio Maldonado <emaldona at redhat.com> - 3.13.3-2
 - Resolves: Bug 805723 - Library needs partial RELRO support added
 
diff --git a/sources b/sources
index e9123b8..58481cf 100644
--- a/sources
+++ b/sources
@@ -1,8 +1,8 @@
-3d211ab803585d449f94e67cbeca8502  nss-3.13.3-stripped.tar.bz2
-e63cddf74c07f0d818d1052ecc6fbb1f  nss-pem-20101125.tar.bz2
 a5ae49867124ac75f029a9a33af31bad  blank-cert8.db
 9315689bbd9f28ceebd47894f99fccbd  blank-key3.db
 73bc040a0542bba387e6dd7fb9fd7d23  blank-secmod.db
 691e663ccc07b7a1eaa6f088e03bf8e2  blank-cert9.db
 2ec9e0606ba40fe65196545564b7cc2a  blank-key4.db
 bf47cecad861efa77d1488ad4a73cb5b  PayPalEE.cert
+d19159b7f91b94afaf7fa78bba006c13  nss-pem-20120402.tar.bz2
+74bbd7b520179c2e226a021fba8ff365  nss-3.13.4-stripped.tar.bz2


More information about the scm-commits mailing list