--- /dev/null
+Index: security/nss/cmd/modutil/install-ds.c
+===================================================================
+RCS file: /cvsroot/mozilla/security/nss/cmd/modutil/install-ds.c,v
+retrieving revision 1.2
+diff -u -p -6 -r1.2 install-ds.c
+--- security/nss/cmd/modutil/install-ds.c 25 Apr 2004 15:02:47 -0000 1.2
++++ security/nss/cmd/modutil/install-ds.c 5 Feb 2007 06:57:38 -0000
+@@ -249,13 +249,13 @@ Pk11Install_File_Generate(Pk11Install_Fi
+ if(!subval || (subval->type != STRING_VALUE)){
+ errStr = PR_smprintf(errString[BOGUS_FILE_PERMISSIONS],
+ _this->jarPath);
+ goto loser;
+ }
+ _this->permissions = (int) strtol(subval->string, &endp, 8);
+- if(*endp != '\0' || subval->string == "\0") {
++ if(*endp != '\0' || subval->string[0] == '\0') {
+ errStr = PR_smprintf(errString[BOGUS_FILE_PERMISSIONS],
+ _this->jarPath);
+ goto loser;
+ }
+ gotPerms = PR_TRUE;
+ Pk11Install_ListIter_delete(subiter);
--- /dev/null
+Index: security/nss/tests/ssl/ssl.sh
+===================================================================
+RCS file: /cvsroot/mozilla/security/nss/tests/ssl/ssl.sh,v
+retrieving revision 1.100
+diff -u -r1.100 ssl.sh
+--- security/nss/tests/ssl/ssl.sh 26 Mar 2009 23:14:34 -0000 1.100
++++ security/nss/tests/ssl/ssl.sh 6 Jun 2009 06:21:07 -0000
+@@ -974,6 +974,7 @@
+
+ ################################# main #################################
+
++unset MALLOC_CHECK_
+ ssl_init
+ ssl_run_tests
+ ssl_cleanup
--- /dev/null
+Index: security/nss/cmd/platlibs.mk
+===================================================================
+RCS file: /cvsroot/mozilla/security/nss/cmd/platlibs.mk,v
+retrieving revision 1.64
+diff -u -r1.64 platlibs.mk
+--- security/nss/cmd/platlibs.mk 17 Jun 2009 23:01:48 -0000 1.64
++++ security/nss/cmd/platlibs.mk 31 Jul 2009 08:04:09 -0000
+@@ -53,9 +53,9 @@
+ ifeq ($(OS_ARCH), Linux)
+ ifeq ($(BUILD_SUN_PKG), 1)
+ ifeq ($(USE_64), 1)
+-EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:/opt/sun/private/lib64:$$ORIGIN/../lib'
++#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:/opt/sun/private/lib64:$$ORIGIN/../lib'
+ else
+-EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib:/opt/sun/private/lib'
++#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib:/opt/sun/private/lib'
+ endif
+ else
+ ifeq ($(USE_64), 1)
--- /dev/null
+Index: security/coreconf/Linux.mk
+===================================================================
+RCS file: /cvsroot/mozilla/security/coreconf/Linux.mk,v
+retrieving revision 1.45.2.1
+diff -u -r1.45.2.1 Linux.mk
+--- security/coreconf/Linux.mk 31 Jul 2010 04:23:37 -0000 1.45.2.1
++++ security/coreconf/Linux.mk 5 Aug 2010 07:35:06 -0000
+@@ -112,11 +112,7 @@
+ endif
+
+ ifdef BUILD_OPT
+-ifeq (11,$(ALLOW_OPT_CODE_SIZE)$(OPT_CODE_SIZE))
+- OPTIMIZER = -Os
+-else
+- OPTIMIZER = -O2
+-endif
++ OPTIMIZER = $(OPT_FLAGS)
+ ifdef MOZ_DEBUG_SYMBOLS
+ ifdef MOZ_DEBUG_FLAGS
+ OPTIMIZER += $(MOZ_DEBUG_FLAGS)
--- /dev/null
+Index: security/nss/lib/ssl/sslsock.c
+===================================================================
+RCS file: /cvsroot/mozilla/security/nss/lib/ssl/sslsock.c,v
+retrieving revision 1.75
+diff -u -p -6 -r1.75 sslsock.c
+--- security/nss/lib/ssl/sslsock.c 22 Oct 2011 16:45:40 -0000 1.75
++++ security/nss/lib/ssl/sslsock.c 24 Oct 2011 12:52:25 -0000
+@@ -178,13 +178,13 @@ static sslOptions ssl_defaults = {
+ PR_TRUE, /* detectRollBack */
+ PR_FALSE, /* noStepDown */
+ PR_FALSE, /* bypassPKCS11 */
+ PR_FALSE, /* noLocks */
+ PR_FALSE, /* enableSessionTickets */
+ PR_FALSE, /* enableDeflate */
+- 2, /* enableRenegotiation (default: requires extension) */
++ 3, /* enableRenegotiation (default: transitional) */
+ PR_FALSE, /* requireSafeNegotiation */
+ PR_FALSE, /* enableFalseStart */
+ PR_TRUE /* cbcRandomIV */
+ };
+
+ sslSessionIDLookupFunc ssl_sid_lookup;
--- /dev/null
+Index: security/nss/Makefile
+===================================================================
+RCS file: /cvsroot/mozilla/security/nss/Makefile,v
+retrieving revision 1.36
+diff -u -p -r1.36 Makefile
+--- security/nss/Makefile 2 Dec 2008 23:24:39 -0000 1.36
++++ security/nss/Makefile 23 Nov 2009 16:19:04 -0000
+@@ -78,7 +78,7 @@ include $(CORE_DEPTH)/coreconf/rules.mk
+ # (7) Execute "local" rules. (OPTIONAL). #
+ #######################################################################
+
+-nss_build_all: build_coreconf build_nspr build_dbm all
++nss_build_all: build_coreconf build_dbm all
+
+ nss_clean_all: clobber_coreconf clobber_nspr clobber_dbm clobber