wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 567134: Update msvc-aslr.patch for NSS (already applied).

Browse Source 
Update NSS to NSS_3_12_8_BETA2 officially.  blocking2.0+
This commit is contained in:
Wan-Teh Chang 2010-08-12 14:13:12 -07:00
parent 17b96c0c9b
commit 589c5b93a7
4 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
security/nss/TAG-INFO
View File

@ -1 +1 @@
NSS_3_12_8_BETA1
NSS_3_12_8_BETA2

2
security/nss/lib/ssl/sslauth.c
View File

@ -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"

2
security/nss/lib/ssl/sslreveal.c
View File

@ -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"

20
security/patches/msvc-aslr.patch
View File

@ -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