From 120b88519c975627cb93b5ed16336f7453776f6d Mon Sep 17 00:00:00 2001
From: Wan-Teh Chang <wtc@google.com>
Date: Thu, 12 Aug 2010 14:13:12 -0700
Subject: [PATCH] Bug 567134: Update msvc-aslr.patch for NSS (already applied).
 Update NSS to NSS_3_12_8_BETA2 officially.  blocking2.0+

---
 security/nss/TAG-INFO            |  2 +-
 security/nss/lib/ssl/sslauth.c   |  2 +-
 security/nss/lib/ssl/sslreveal.c |  2 +-
 security/patches/msvc-aslr.patch | 20 ++++++++++++--------
 4 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/security/nss/TAG-INFO b/security/nss/TAG-INFO
index ad73e6bc06c..9f4a3d66b6f 100644
--- a/security/nss/TAG-INFO
+++ b/security/nss/TAG-INFO
@@ -1 +1 @@
-NSS_3_12_8_BETA1
+NSS_3_12_8_BETA2
diff --git a/security/nss/lib/ssl/sslauth.c b/security/nss/lib/ssl/sslauth.c
index 39c630d821c..6d1eab0f53b 100644
--- a/security/nss/lib/ssl/sslauth.c
+++ b/security/nss/lib/ssl/sslauth.c
@@ -33,7 +33,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-/* $Id: sslauth.c,v 1.16 2006/04/20 00:20:45 alexei.volkov.bugs%sun.com Exp $ */
+/* $Id: sslauth.c,v 1.16.66.1 2010/08/03 18:52:13 wtc%google.com Exp $ */
 #include "cert.h"
 #include "secitem.h"
 #include "ssl.h"
diff --git a/security/nss/lib/ssl/sslreveal.c b/security/nss/lib/ssl/sslreveal.c
index 8941ff2d968..94b2c2fd1d3 100644
--- a/security/nss/lib/ssl/sslreveal.c
+++ b/security/nss/lib/ssl/sslreveal.c
@@ -36,7 +36,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-/* $Id: sslreveal.c,v 1.7 2010/02/04 03:21:11 wtc%google.com Exp $ */
+/* $Id: sslreveal.c,v 1.7.2.1 2010/08/03 18:52:13 wtc%google.com Exp $ */
 
 #include "cert.h"
 #include "ssl.h"
diff --git a/security/patches/msvc-aslr.patch b/security/patches/msvc-aslr.patch
index f1ac7e2eb39..5097218b8e4 100644
--- a/security/patches/msvc-aslr.patch
+++ b/security/patches/msvc-aslr.patch
@@ -1,6 +1,10 @@
-diff --git a/security/coreconf/WIN32.mk b/security/coreconf/WIN32.mk
---- a/security/coreconf/WIN32.mk
-+++ b/security/coreconf/WIN32.mk
+Index: mozilla/security/coreconf/WIN32.mk
+===================================================================
+RCS file: /cvsroot/mozilla/security/coreconf/WIN32.mk,v
+retrieving revision 1.39.2.1
+diff -u -p -8 -r1.39.2.1 WIN32.mk
+--- mozilla/security/coreconf/WIN32.mk	31 Jul 2010 04:23:37 -0000	1.39.2.1
++++ mozilla/security/coreconf/WIN32.mk	10 Aug 2010 20:46:44 -0000
 @@ -126,17 +126,17 @@ else # !NS_USE_GCC
      ifdef BUILD_OPT
  	OS_CFLAGS  += -MD
@@ -13,10 +17,10 @@ diff --git a/security/coreconf/WIN32.mk b/security/coreconf/WIN32.mk
 -	DLLFLAGS   += -OUT:"$@"
 +	DLLFLAGS   += -DYNAMICBASE -OUT:"$@"
  	ifdef MOZ_DEBUG_SYMBOLS
- 		OPTIMIZER += -Zi -Fd$(OBJDIR)/
+ 		ifdef MOZ_DEBUG_FLAGS
+ 			OPTIMIZER += $(MOZ_DEBUG_FLAGS) -Fd$(OBJDIR)/
+ 		else
+ 			OPTIMIZER += -Zi -Fd$(OBJDIR)/
+ 		endif
  		DLLFLAGS += -DEBUG -OPT:REF
  		LDFLAGS += -DEBUG -OPT:REF
- 	endif
-     else
- 	#
- 	# Define USE_DEBUG_RTL if you want to use the debug runtime library