[nss-softokn] Update to NSS_3_14_2_RTM
Elio Maldonado
emaldonado at fedoraproject.org
Fri Feb 1 17:50:53 UTC 2013
commit 852db1eb48140d7d994823e6e8c5beda940c2be6
Author: Elio Maldonado <emaldona at redhat.com>
Date: Fri Feb 1 09:48:27 2013 -0800
Update to NSS_3_14_2_RTM
- active the iquote patch as a new api was added
- don't add freebl-only rsa perf tool until it gets approved upstream
.gitignore | 2 +-
iquote.patch | 18 +++++++++---------
nss-softokn.spec | 15 +++++++--------
sources | 2 +-
4 files changed, 18 insertions(+), 19 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 21e3583..d0eae96 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/nss-softokn-3.14.1-stripped.tar.bz2
+/nss-softokn-3.14.2-stripped.tar.bz2
diff --git a/iquote.patch b/iquote.patch
index 30a0ef6..2868329 100644
--- a/iquote.patch
+++ b/iquote.patch
@@ -1,21 +1,21 @@
diff -up ./mozilla/security/coreconf/location.mk.iquote ./mozilla/security/coreconf/location.mk
---- ./mozilla/security/coreconf/location.mk.iquote 2010-06-11 17:58:32.000000000 -0700
-+++ ./mozilla/security/coreconf/location.mk 2011-12-13 21:36:05.966187158 -0800
-@@ -85,6 +85,10 @@ endif
+--- ./mozilla/security/coreconf/location.mk.iquote 2013-02-01 09:10:55.124322280 -0800
++++ ./mozilla/security/coreconf/location.mk 2013-02-01 09:18:47.201168455 -0800
+@@ -45,6 +45,10 @@ endif
- ifdef NSSUTIL_INCLUDE_DIR
- INCLUDES += -I$(NSSUTIL_INCLUDE_DIR)
+ ifdef NSS_INCLUDE_DIR
+ INCLUDES += -I$(NSS_INCLUDE_DIR)
+ ifdef IN_TREE_FREEBL_HEADERS_FIRST
+ INCLUDES += -iquote $(DIST)/../public/nss
+ INCLUDES += -iquote $(DIST)/../private/nss
+ endif
endif
- ifndef NSSUTIL_LIB_DIR
+ ifndef NSS_LIB_DIR
diff -up ./mozilla/security/nss/cmd/bltest/Makefile.iquote ./mozilla/security/nss/cmd/bltest/Makefile
---- ./mozilla/security/nss/cmd/bltest/Makefile.iquote 2004-04-25 08:02:39.000000000 -0700
-+++ ./mozilla/security/nss/cmd/bltest/Makefile 2011-12-13 21:39:40.891182125 -0800
-@@ -77,6 +77,7 @@ include $(CORE_DEPTH)/coreconf/rules.mk
+--- ./mozilla/security/nss/cmd/bltest/Makefile.iquote 2013-02-01 09:14:25.092449279 -0800
++++ ./mozilla/security/nss/cmd/bltest/Makefile 2013-02-01 09:21:26.200995421 -0800
+@@ -45,6 +45,7 @@ include $(CORE_DEPTH)/coreconf/rules.mk
# (6) Execute "component" rules. (OPTIONAL) #
#######################################################################
diff --git a/nss-softokn.spec b/nss-softokn.spec
index 82864f0..c016aac 100644
--- a/nss-softokn.spec
+++ b/nss-softokn.spec
@@ -1,6 +1,6 @@
-%global nspr_version 4.9.4
+%global nspr_version 4.9.5
%global nss_name nss
-%global nss_util_version 3.14
+%global nss_util_version 3.14.2
%global unsupported_tools_directory %{_libdir}/nss/unsupported-tools
%global saved_files_dir %{_libdir}/nss/saved
@@ -15,8 +15,8 @@
Summary: Network Security Services Softoken Module
Name: nss-softokn
-Version: 3.14.1
-Release: 5%{?dist}
+Version: 3.14.2
+Release: 1%{?dist}
License: MPLv2.0
URL: http://www.mozilla.org/projects/security/pki/nss/
Group: System Environment/Libraries
@@ -66,8 +66,6 @@ Patch8: softoken-minimal-test-dependencies.patch
# NSSUTIL_INCLUDE_DIR, after all, contains both util and freebl headers.
# Once has been bootstapped the patch may be removed, but it doesn't hurt to keep it.
Patch9: iquote.patch
-# Upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=820207
-Patch10: add-rsaperf_low-test.patch
%description
@@ -123,8 +121,6 @@ Header and library files for doing development with Network Security Services.
%patch8 -p0 -b .crypto
# activate if needed when doing a major update with new apis
%patch9 -p0 -b .iquote
-# upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=820207
-%patch10 -p0 -b .rsaperf
%build
@@ -378,6 +374,9 @@ done
%{_includedir}/nss3/shsign.h
%changelog
+* Fri Feb 01 2013 Elio Maldonado <emaldona at redhat.com> - 3.14.2-1
+- Update to NSS_3_14_2_RTM
+
* Thu Dec 27 2012 Elio Maldonado <emaldona at redhat.com> - 3.14.1-5
- Add RSA performance test for freebl
- Fix bogus date in changelog warnings
diff --git a/sources b/sources
index 5f7fd50..7ecf740 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-630baa0395eab789e091dd4d2a69a99d nss-softokn-3.14.1-stripped.tar.bz2
+d200ec78ced4c79a9a52a70590027878 nss-softokn-3.14.2-stripped.tar.bz2
More information about the scm-commits
mailing list