[nss-softokn/f14/master] Update to 3.12.8

Mon Oct 4 20:40:24 UTC 2010

commit 5b29a41050a65f48d7a311d1e77b5d53346fa34f
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Mon Oct 4 13:40:10 2010 -0700

    Update to 3.12.8

 freebl-no-depend.patch            |   33 ---------------------------------
 nss-softokn-3.12.4-fips-fix.patch |    5 +++--
 nss-softokn-3.12.4-prelink.patch  |   22 +++++++++++-----------
 nss-softokn.spec                  |   14 ++++++++------
 sources                           |    2 +-
 5 files changed, 23 insertions(+), 53 deletions(-)
---

diff --git a/nss-softokn-3.12.4-fips-fix.patch b/nss-softokn-3.12.4-fips-fix.patch
index 05ae9cb..011a148 100644
--- a/nss-softokn-3.12.4-fips-fix.patch
+++ b/nss-softokn-3.12.4-fips-fix.patch
@@ -1,5 +1,6 @@
---- ./mozilla/security/nss/lib/freebl/nsslowhash.c	2010-05-08 18:02:39.592248982 +0300
-+++ ./mozilla/security/nss/lib/freebl/nsslowhash.c.fix	2010-05-08 18:01:45.564454513 +0300
+diff -up ./mozilla/security/nss/lib/freebl/nsslowhash.c.fips ./mozilla/security/nss/lib/freebl/nsslowhash.c
+--- ./mozilla/security/nss/lib/freebl/nsslowhash.c.fips	2010-09-04 20:23:14.764313661 -0700
++++ ./mozilla/security/nss/lib/freebl/nsslowhash.c	2010-09-04 20:25:52.622313780 -0700
 @@ -275,7 +275,7 @@ static int nsslow_GetFIPSEnabled(void) {
  
      f = fopen("/proc/sys/crypto/fips_enabled", "r");
diff --git a/nss-softokn-3.12.4-prelink.patch b/nss-softokn-3.12.4-prelink.patch
index 2816168..5f2e46f 100644
--- a/nss-softokn-3.12.4-prelink.patch
+++ b/nss-softokn-3.12.4-prelink.patch
@@ -1,9 +1,9 @@
 diff -up ./mozilla/security/nss/lib/freebl/Makefile.prelink ./mozilla/security/nss/lib/freebl/Makefile
---- ./mozilla/security/nss/lib/freebl/Makefile.prelink	2010-08-16 13:14:24.051331965 -0700
-+++ ./mozilla/security/nss/lib/freebl/Makefile	2010-08-16 13:17:09.662207034 -0700
-@@ -77,6 +77,12 @@ endif
- ifeq ($(FREEBL_NO_DEPEND),1)
- 	DEFINES += -DFREEBL_NO_DEPEND
+--- ./mozilla/security/nss/lib/freebl/Makefile.prelink	2010-09-04 14:13:58.846327263 -0700
++++ ./mozilla/security/nss/lib/freebl/Makefile	2010-09-04 14:15:11.544326993 -0700
+@@ -82,6 +82,12 @@ ifeq ($(FREEBL_NO_DEPEND),1)
+ else
+ 	MAPFILE_SOURCE = freebl.def
  endif
 +ifdef FREEBL_USE_PRELINK
 +	DEFINES += -DFREEBL_USE_PRELINK
@@ -15,8 +15,8 @@ diff -up ./mozilla/security/nss/lib/freebl/Makefile.prelink ./mozilla/security/n
  # NSS_X64 means the target is a 64-bits x64 CPU architecture
  # NSS_X86_OR_X64 means the target is either x86 or x64
 diff -up ./mozilla/security/nss/lib/freebl/shvfy.c.prelink ./mozilla/security/nss/lib/freebl/shvfy.c
---- ./mozilla/security/nss/lib/freebl/shvfy.c.prelink	2010-08-16 13:17:03.717207534 -0700
-+++ ./mozilla/security/nss/lib/freebl/shvfy.c	2010-08-16 13:19:25.512206767 -0700
+--- ./mozilla/security/nss/lib/freebl/shvfy.c.prelink	2010-09-04 14:16:01.518326988 -0700
++++ ./mozilla/security/nss/lib/freebl/shvfy.c	2010-09-04 14:25:44.770326384 -0700
 @@ -48,6 +48,168 @@
  #include "stdio.h"
  #include "prmem.h"
@@ -221,8 +221,8 @@ diff -up ./mozilla/security/nss/lib/freebl/shvfy.c.prelink ./mozilla/security/ns
  
      SHA1_End(hashcx, hash.data, &hash.len, hash.len);
 diff -up ./mozilla/security/nss/lib/freebl/stubs.c.prelink ./mozilla/security/nss/lib/freebl/stubs.c
---- ./mozilla/security/nss/lib/freebl/stubs.c.prelink	2010-08-16 13:20:17.670332737 -0700
-+++ ./mozilla/security/nss/lib/freebl/stubs.c	2010-08-16 13:21:38.505206889 -0700
+--- ./mozilla/security/nss/lib/freebl/stubs.c.prelink	2010-09-04 14:26:27.454327120 -0700
++++ ./mozilla/security/nss/lib/freebl/stubs.c	2010-09-04 14:31:56.778327428 -0700
 @@ -69,6 +69,7 @@
  #include <secport.h>
  #include <secitem.h>
@@ -285,8 +285,8 @@ diff -up ./mozilla/security/nss/lib/freebl/stubs.c.prelink ./mozilla/security/ns
      STUB_FETCH_FUNCTION(PR_Read);
      STUB_FETCH_FUNCTION(PR_Seek);
 diff -up ./mozilla/security/nss/lib/freebl/stubs.h.prelink ./mozilla/security/nss/lib/freebl/stubs.h
---- ./mozilla/security/nss/lib/freebl/stubs.h.prelink	2010-08-16 13:20:38.678332705 -0700
-+++ ./mozilla/security/nss/lib/freebl/stubs.h	2010-08-16 13:21:48.271206855 -0700
+--- ./mozilla/security/nss/lib/freebl/stubs.h.prelink	2010-09-04 14:26:41.822327256 -0700
++++ ./mozilla/security/nss/lib/freebl/stubs.h	2010-09-04 14:32:53.498540767 -0700
 @@ -78,6 +78,8 @@
  #define PR_Lock  PR_Lock_stub
  #define PR_NewLock  PR_NewLock_stub
diff --git a/nss-softokn.spec b/nss-softokn.spec
index b673203..0aeede1 100644
--- a/nss-softokn.spec
+++ b/nss-softokn.spec
@@ -1,6 +1,6 @@
 %global nspr_version 4.8.6
 %global nss_name nss
-%global nss_util_version 3.12.7
+%global nss_util_version 3.12.8
 %global unsupported_tools_directory %{_libdir}/nss/unsupported-tools
 %global saved_files_dir %{_libdir}/nss/saved
 
@@ -16,8 +16,8 @@
 
 Summary:          Network Security Services Softoken Module
 Name:             nss-softokn
-Version:          3.12.7
-Release:          7%{?dist}
+Version:          3.12.8
+Release:          1%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -36,7 +36,7 @@ BuildRequires:    perl
 
 Source0:          %{name}-%{version}-stripped.tar.bz2
 # The nss-softokn tar ball is a subset of nss-{version}-stripped.tar.bz2, 
-# Thereforee use the nss-split-softokn.sh script to keep only what we need.
+# Therefore we use the nss-split-softokn.sh script to keep only what we need.
 # Download the nss tarball via git from the nss project and follow these
 # steps to make the tarball for nss-util out of the one for nss:
 # fedpkg clone nss
@@ -51,7 +51,6 @@ Source3:          nss-softokn-config.in
 
 Patch2:           nss-softokn-3.12.4-prelink.patch
 Patch3:           nss-softokn-3.12.4-fips-fix.patch
-Patch4:           freebl-no-depend.patch
 
 %description
 Network Security Services Softoken Cryptographic Module
@@ -98,7 +97,7 @@ Header and Library files for doing development with Network Security Services.
 
 %patch2 -p0 -b .prelink
 %patch3 -p0 -b .fipsfix
-%patch4 -p0 -b .freeblnodepend
+
 
 %build
 
@@ -313,6 +312,9 @@ done
 %{_includedir}/nss3/shsign.h
 
 %changelog
+* Tue Sep 28 2010 Elio Maldonado <emaldona at redhat.com> - 3.12.8-1
+- Update to 3.12.8
+
 * Tue Sep 28 2010 Elio Maldonado <emaldona at redhat.com> - 3.12.7-7
 - Add provides nss-softokn-freebl-static to adhere to static library packaging guidelines (#609613)
 - Cleanup some comments to address rpmlint warnings
diff --git a/sources b/sources
index f0c310d..36c472a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b8ae15ba114e25cc41e4116934cf2999  nss-softokn-3.12.7-stripped.tar.bz2
+a18e2fe939298e8d44659d1413ce5fcd  nss-softokn-3.12.8-stripped.tar.bz2
