[nss-softokn] Updated patch to reflect changes in sources for 3.12.7.

[Elio Maldonado]

commit ca91d8b67f3738ace8326cfe77a024032ba78644
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Wed Aug 18 17:00:16 2010 -0700

    Updated patch to reflect changes in sources for 3.12.7.

 nss-softokn-3.12.4-prelink.patch |   34 +++++++++++++---------------------
 1 files changed, 13 insertions(+), 21 deletions(-)
---
diff --git a/nss-softokn-3.12.4-prelink.patch b/nss-softokn-3.12.4-prelink.patch
index 8098d66..2816168 100644
--- a/nss-softokn-3.12.4-prelink.patch
+++ b/nss-softokn-3.12.4-prelink.patch
@@ -1,8 +1,8 @@
 diff -up ./mozilla/security/nss/lib/freebl/Makefile.prelink ./mozilla/security/nss/lib/freebl/Makefile
---- ./mozilla/security/nss/lib/freebl/Makefile.prelink	2009-06-10 17:55:43.000000000 -0700
-+++ ./mozilla/security/nss/lib/freebl/Makefile	2010-04-14 15:47:01.000000000 -0700
+--- ./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
- ifdef FREEBL_NO_DEPEND
+ ifeq ($(FREEBL_NO_DEPEND),1)
  	DEFINES += -DFREEBL_NO_DEPEND
  endif
 +ifdef FREEBL_USE_PRELINK
@@ -15,17 +15,9 @@ 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	2008-11-18 11:48:24.000000000 -0800
-+++ ./mozilla/security/nss/lib/freebl/shvfy.c	2010-04-16 10:29:33.418528000 -0700
-@@ -35,6 +35,7 @@
-  *
-  * ***** END LICENSE BLOCK ***** */
- /* $Id: nss-softokn-3.12.4-prelink.patch,v 1.2 2010/04/19 18:36:54 emaldonado Exp $ */
-+#define _GNU_SOURCE 1
- 
- #ifdef FREEBL_NO_DEPEND
- #include "stubs.h"
-@@ -48,6 +49,168 @@
+--- ./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
+@@ -48,6 +48,168 @@
  #include "stdio.h"
  #include "prmem.h"
  
@@ -194,7 +186,7 @@ diff -up ./mozilla/security/nss/lib/freebl/shvfy.c.prelink ./mozilla/security/ns
  
  /* #define DEBUG_SHVERIFY 1 */
  
-@@ -117,6 +280,9 @@ BLAPI_SHVerify(const char *name, PRFuncP
+@@ -117,6 +279,9 @@ BLAPI_SHVerify(const char *name, PRFuncP
      SECStatus rv;
      DSAPublicKey key;
      int count;
@@ -204,7 +196,7 @@ diff -up ./mozilla/security/nss/lib/freebl/shvfy.c.prelink ./mozilla/security/ns
  
      PRBool result = PR_FALSE; /* if anything goes wrong,
  			       * the signature does not verify */
-@@ -197,7 +363,11 @@ BLAPI_SHVerify(const char *name, PRFuncP
+@@ -197,7 +362,11 @@ BLAPI_SHVerify(const char *name, PRFuncP
      checkFD = NULL;
  
      /* open our library file */
@@ -216,7 +208,7 @@ diff -up ./mozilla/security/nss/lib/freebl/shvfy.c.prelink ./mozilla/security/ns
      if (shFD == NULL) {
  #ifdef DEBUG_SHVERIFY
          fprintf(stderr, "Failed to open the library file %s: (%d, %d)\n",
-@@ -218,7 +388,11 @@ BLAPI_SHVerify(const char *name, PRFuncP
+@@ -218,7 +387,11 @@ BLAPI_SHVerify(const char *name, PRFuncP
  	SHA1_Update(hashcx, buf, bytesRead);
  	count += bytesRead;
      }
@@ -229,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	2009-06-11 16:11:22.000000000 -0700
-+++ ./mozilla/security/nss/lib/freebl/stubs.c	2010-04-14 15:47:01.000000000 -0700
+--- ./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
 @@ -69,6 +69,7 @@
  #include <secport.h>
  #include <secitem.h>
@@ -293,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	2009-03-28 19:21:50.000000000 -0700
-+++ ./mozilla/security/nss/lib/freebl/stubs.h	2010-04-14 15:47:01.000000000 -0700
+--- ./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
 @@ -78,6 +78,8 @@
  #define PR_Lock  PR_Lock_stub
  #define PR_NewLock  PR_NewLock_stub