Revert "bump nss to 3.25"

This reverts commit f10b31c2fe16bfcbb7cb278fdec65deacbe06219.

4 files changed, 23 insertions, 26 deletions

diff --git a/external/nss/nss-winXP-sdk.patch.1 b/external/nss/nss-winXP-sdk.patch.1
index 5273e71705b6..2c8189215083 100644
--- a/external/nss/nss-winXP-sdk.patch.1
+++ b/external/nss/nss-winXP-sdk.patch.1
@@ -1,12 +1,9 @@
 diff -ur nss.org/nss/coreconf/config.mk nss/nss/coreconf/config.mk
 --- nss.org/nss/coreconf/config.mk	2016-03-15 14:52:19.706093300 +0100
 +++ nss/nss/coreconf/config.mk	2016-03-15 14:56:51.549914800 +0100
-@@ -203,6 +203,8 @@
+@@ -188,3 +188,5 @@
  
  # Hide old, deprecated, TLS cipher suite names when building NSS
  DEFINES += -DSSL_DISABLE_DEPRECATED_CIPHER_SUITE_NAMES
 +# build with 7.1A SDK for winXP compatibility
 +DEFINES += -D_USING_V110_SDK71_
- 
- # Mozilla's mozilla/modules/zlib/src/zconf.h adds the MOZ_Z_ prefix to zlib
- # exported symbols, which causes problem when NSS is built as part of Mozilla.
diff --git a/external/nss/nss.nowerror.patch b/external/nss/nss.nowerror.patch
index ff81a9b33539..ca5f17ccbf66 100644
--- a/external/nss/nss.nowerror.patch
+++ b/external/nss/nss.nowerror.patch
@@ -1,12 +1,14 @@
 diff -ur nss.org/nss/coreconf/WIN32.mk nss/nss/coreconf/WIN32.mk
 --- a/nss.org/nss/coreconf/WIN32.mk	2016-04-13 11:33:09.322294523 +0200
 +++ b/nss/nss/coreconf/WIN32.mk	2016-04-13 11:33:27.744323969 +0200
-@@ -127,7 +127,7 @@
-                       -D_CRT_NONSTDC_NO_WARNINGS
+@@ -126,9 +126,9 @@
+     OS_CFLAGS += -W3 -nologo -D_CRT_SECURE_NO_WARNINGS \
+ 		 -D_CRT_NONSTDC_NO_WARNINGS
      OS_DLLFLAGS += -nologo -DLL -SUBSYSTEM:WINDOWS
      ifndef NSS_ENABLE_WERROR
 -        NSS_ENABLE_WERROR = 1
 +        NSS_ENABLE_WERROR = 0
      endif
      ifeq ($(NSS_ENABLE_WERROR),1)
-         WARNING_CFLAGS += -WX
+         OS_CFLAGS += -WX
+     endif
diff --git a/external/nss/nss.patch b/external/nss/nss.patch
index 771ebf59baed..548363578789 100644
--- a/external/nss/nss.patch
+++ b/external/nss/nss.patch
@@ -110,16 +110,16 @@ diff -ru a/nss/coreconf/Linux.mk b/nss/coreconf/Linux.mk
  RANLIB			= ranlib
  
  DEFAULT_COMPILER = gcc
-@@ -157,7 +160,7 @@
- # against the libsanitizer runtime built into the main executable.
+@@ -145,7 +148,7 @@
+ # incorrectly reports undefined references in the libraries we link with, so
+ # we don't use -z defs there.
  ZDEFS_FLAG		= -Wl,-z,defs
- ifneq ($(USE_ASAN),1)
 -DSO_LDOPTS		+= $(if $(findstring 2.11.90.0.8,$(shell ld -v)),,$(ZDEFS_FLAG))
-+DSO_LDOPTS             += $(if $(findstring 2.11.90.0.8,$(shell ld -v)),,$(ZDEFS_FLAG)) -Wl,-z,origin '-Wl,-rpath,$$ORIGIN'
- endif
++DSO_LDOPTS		+= $(if $(findstring 2.11.90.0.8,$(shell ld -v)),,$(ZDEFS_FLAG)) -Wl,-z,origin '-Wl,-rpath,$$ORIGIN'
  LDFLAGS			+= $(ARCHFLAG)
  
-@@ -189,8 +192,13 @@
+ # On Maemo, we need to use the -rpath-link flag for even the standard system
+@@ -176,8 +179,13 @@
  endif
  endif
  
@@ -175,13 +175,13 @@ diff -ru a/nss/Makefile b/nss/Makefile
 diff -ru nss.orig/nss/coreconf/Werror.mk nss/nss/coreconf/Werror.mk
 --- a/nss.orig/nss/coreconf/Werror.mk	2016-02-12 15:36:18.000000000 +0100
 +++ b/nss/nss/coreconf/Werror.mk	2016-02-23 23:58:15.119584046 +0100
-@@ -94,7 +94,8 @@
-     endif #ndef NSS_ENABLE_WERROR
+@@ -60,7 +60,8 @@
+   endif #ndef NSS_ENABLE_WERROR
  
-     ifeq ($(NSS_ENABLE_WERROR),1)
--      WARNING_CFLAGS += -Werror
+   ifeq ($(NSS_ENABLE_WERROR),1)
+-    WARNING_CFLAGS += -Werror
 +# We do not treat warnings as errors.
 +#    WARNING_CFLAGS += -Werror
-     else
-       # Old versions of gcc (< 4.8) don't support #pragma diagnostic in functions.
-       # Use this to disable use of that #pragma and the warnings it suppresses.
+   else
+     # Old versions of gcc (< 4.8) don't support #pragma diagnostic in functions.
+     # Use this to disable use of that #pragma and the warnings it suppresses.
diff --git a/external/nss/nss_macosx.patch b/external/nss/nss_macosx.patch
index dfbad1a36f32..40d02c955160 100644
--- a/external/nss/nss_macosx.patch
+++ b/external/nss/nss_macosx.patch
@@ -13,7 +13,7 @@ diff -ru a/nspr/configure b/nspr/configure
 diff -ru a/nss/coreconf/Darwin.mk b/nss/coreconf/Darwin.mk
 --- a/a/nss/coreconf/Darwin.mk	2014-09-29 16:50:22.992304799 +0100
 +++ b/b/nss/coreconf/Darwin.mk	2014-09-29 16:51:59.214931953 +0100
-@@ -8,8 +8,12 @@
+@@ -7,8 +7,12 @@
  
  DEFAULT_COMPILER = gcc
  
@@ -28,25 +28,23 @@ diff -ru a/nss/coreconf/Darwin.mk b/nss/coreconf/Darwin.mk
  RANLIB		= ranlib
  
  ifndef CPU_ARCH
-@@ -20,13 +24,17 @@
+@@ -19,11 +23,15 @@
  
  ifeq (,$(filter-out i%86,$(CPU_ARCH)))
  ifdef USE_64
 +ifeq (,$(findstring -arch ,$(CC)))
  CC              += -arch x86_64
- CCC             += -arch x86_64
 +endif
  override CPU_ARCH	= x86_64
  else
  OS_REL_CFLAGS	= -Di386
 +ifeq (,$(findstring -arch ,$(CC)))
  CC              += -arch i386
- CCC             += -arch i386
 +endif
  override CPU_ARCH	= x86
  endif
  else
-@@ -40,12 +48,16 @@
+@@ -31,12 +39,16 @@
  endif
  
  ifneq (,$(MACOS_SDK_DIR))
@@ -64,7 +62,7 @@ diff -ru a/nss/coreconf/Darwin.mk b/nss/coreconf/Darwin.mk
          # GCC <= 3
          DARWIN_SDK_FRAMEWORKS = -F$(MACOS_SDK_DIR)/System/Library/Frameworks
          ifneq (,$(shell find $(MACOS_SDK_DIR)/Library/Frameworks -maxdepth 0))
-@@ -108,7 +120,7 @@
+@@ -104,7 +115,7 @@
  # May override this with different compatibility and current version numbers.
  DARWIN_DYLIB_VERSIONS = -compatibility_version 1 -current_version 1
  # May override this with -bundle to create a loadable module.