From cca8c8cf79e0d9bcfb8798de3948aa446317b08e Mon Sep 17 00:00:00 2001
From: Michael Stahl <mstahl@redhat.com>
Date: Wed, 13 Nov 2013 17:08:03 +0100
Subject: nss: upgrade to 3.15.3

- from nss_macosx.patch drop nmedit hunk (removed upstream)
- adapt include and lib paths to changed tarball directory layout

Change-Id: Ia5dcce8dfd9d10e7e4ba689eefa9f39a51596dfe
Reviewed-on: https://gerrit.libreoffice.org/6670
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
---
 RepositoryExternal.mk                             |  22 ++---
 download.lst                                      |   2 +-
 external/curl/ExternalProject_curl.mk             |   4 +-
 external/libxmlsec/xmlsec1-configure.patch        |   4 +-
 external/nss/ExternalPackage_nss.mk               |  70 +++++++-------
 external/nss/ExternalProject_nss.mk               |  38 ++++----
 external/nss/UnpackedTarball_nss.mk               |   5 +-
 external/nss/nspr-4.9-build.patch.3               |  36 +++----
 external/nss/nss-3.13.3-build.patch.3             | 110 ++++++++--------------
 external/nss/nss-3.13.5-zlib-werror.patch         |   4 +-
 external/nss/nss.aix.patch                        |  38 ++++----
 external/nss/nss.mingw.patch.3                    |  58 ++++--------
 external/nss/nss.patch                            |  63 +++++--------
 external/nss/nss.wheader-guard.patch.0            |  11 ---
 external/nss/nss.windows.patch                    |   8 +-
 external/nss/nss_macosx.patch                     |  35 +++----
 external/openldap/ExternalProject_openldap.mk     |   6 +-
 external/postgresql/ExternalProject_postgresql.mk |   2 +-
 18 files changed, 215 insertions(+), 301 deletions(-)
 delete mode 100644 external/nss/nss.wheader-guard.patch.0

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 4ec63ae02c6e..3dcca01391c5 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2360,7 +2360,7 @@ $(call gb_LinkTarget_set_include,$(1),\
 )
 
 $(call gb_LinkTarget_add_libs,$(1),\
-	$(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/lib/nspr4.lib \
+	$(call gb_UnpackedTarball_get_dir,nss)/dist/out/lib/nspr4.lib \
 	$(call gb_UnpackedTarball_get_dir,moz_lib)/xpcom.lib \
 	$(call gb_UnpackedTarball_get_dir,moz_lib)/xpcom_core.lib \
 )
@@ -2765,19 +2765,19 @@ define gb_LinkTarget__use_nss3
 $(call gb_LinkTarget_use_package,$(1),nss)
 $(call gb_LinkTarget_set_include,$(1),\
 	$$(INCLUDE) \
-	-I$(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/public/nss \
-	-I$(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/include \
+	-I$(call gb_UnpackedTarball_get_dir,nss)/dist/public/nss \
+	-I$(call gb_UnpackedTarball_get_dir,nss)/dist/out/include \
 )
 
 ifeq ($(COM),MSC)
 $(call gb_LinkTarget_add_libs,$(1),\
-	$(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/lib/nspr4.lib \
-	$(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/lib/nss3.lib \
-	$(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/lib/smime3.lib \
+	$(call gb_UnpackedTarball_get_dir,nss)/dist/out/lib/nspr4.lib \
+	$(call gb_UnpackedTarball_get_dir,nss)/dist/out/lib/nss3.lib \
+	$(call gb_UnpackedTarball_get_dir,nss)/dist/out/lib/smime3.lib \
 )
 else
 $(call gb_LinkTarget_add_libs,$(1),\
-	-L$(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/lib \
+	-L$(call gb_UnpackedTarball_get_dir,nss)/dist/out/lib \
 	-lnspr4 \
 	-lnss3 \
 	-lsmime3 \
@@ -2790,11 +2790,11 @@ define gb_LinkTarget__use_plc4
 $(call gb_LinkTarget_use_package,$(1),nss)
 ifeq ($(COM),MSC)
 $(call gb_LinkTarget_add_libs,$(1),\
-	$(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/lib/plc4.lib \
+	$(call gb_UnpackedTarball_get_dir,nss)/dist/out/lib/plc4.lib \
 )
 else
 $(call gb_LinkTarget_add_libs,$(1),\
-    -L$(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/lib -lplc4 \
+    -L$(call gb_UnpackedTarball_get_dir,nss)/dist/out/lib -lplc4 \
 )
 endif
 
@@ -2804,11 +2804,11 @@ define gb_LinkTarget__use_ssl3
 $(call gb_LinkTarget_use_package,$(1),nss)
 ifeq ($(COM),MSC)
 $(call gb_LinkTarget_add_libs,$(1),\
-	$(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/lib/ssl3.lib \
+	$(call gb_UnpackedTarball_get_dir,nss)/dist/out/lib/ssl3.lib \
 )
 else
 $(call gb_LinkTarget_add_libs,$(1),\
-	-L$(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/lib -lssl3 \
+	-L$(call gb_UnpackedTarball_get_dir,nss)/dist/out/lib -lssl3 \
 )
 endif
 
diff --git a/download.lst b/download.lst
index 238407c3277b..ddccc9cef73b 100644
--- a/download.lst
+++ b/download.lst
@@ -84,7 +84,7 @@ export MDDS_TARBALL := 8c853024fbcff39113d9285250dafc66-mdds_0.9.1.tar.bz2
 export MYSQLCPPCONN_TARBALL := 0981bda6548a8c8233ffce2b6e4b2a23-mysql-connector-c++-1.1.0.tar.gz
 export MYTHES_TARBALL := 46e92b68e31e858512b680b3b61dc4c1-mythes-1.2.3.tar.gz
 export NEON_TARBALL := ff369e69ef0f0143beb5626164e87ae2-neon-0.29.5.tar.gz
-export NSS_TARBALL := a0a861f539f0e7a91d05e6b9457e4db1-nss-3.13.5-with-nspr-4.9.1.tar.gz
+export NSS_TARBALL := 06beb053e257d9e22641339c905c6eba-nss-3.15.3-with-nspr-4.10.2.tar.gz
 export OPENLDAP_TARBALL := 804c6cb5698db30b75ad0ff1c25baefd-openldap-2.4.31.tgz
 export OPENSSL_TARBALL := 66bf6f10f060d561929de96f9dfe5b8c-openssl-1.0.1e.tar.gz
 export ORCUS_TARBALL := ea2acaf140ae40a87a952caa75184f4d-liborcus-0.5.1.tar.bz2
diff --git a/external/curl/ExternalProject_curl.mk b/external/curl/ExternalProject_curl.mk
index 680c9e5d25eb..932c08bd7c23 100644
--- a/external/curl/ExternalProject_curl.mk
+++ b/external/curl/ExternalProject_curl.mk
@@ -32,7 +32,7 @@ endif
 
 # there are 2 include paths, the other one is passed to --with-nss below
 ifeq ($(SYSTEM_NSS),NO)
-curl_CPPFLAGS += -I$(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/public/nss
+curl_CPPFLAGS += -I$(call gb_UnpackedTarball_get_dir,nss)/dist/public/nss
 endif
 
 $(call gb_ExternalProject_get_state_target,curl,build):
@@ -40,7 +40,7 @@ $(call gb_ExternalProject_get_state_target,curl,build):
 		CPPFLAGS="$(curl_CPPFLAGS)" \
 		LDFLAGS=$(curl_LDFLAGS) \
 		./configure \
-			--with-nss$(if $(filter NO,$(SYSTEM_NSS)),="$(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out") \
+			--with-nss$(if $(filter NO,$(SYSTEM_NSS)),="$(call gb_UnpackedTarball_get_dir,nss)/dist/out") \
 			--without-ssl \
 			--without-libidn --enable-ftp --enable-ipv6 --enable-http --disable-gopher \
 			--disable-file --disable-ldap --disable-telnet --disable-dict --without-libssh2 \
diff --git a/external/libxmlsec/xmlsec1-configure.patch b/external/libxmlsec/xmlsec1-configure.patch
index 622c0632154c..19fdc570d806 100644
--- a/external/libxmlsec/xmlsec1-configure.patch
+++ b/external/libxmlsec/xmlsec1-configure.patch
@@ -109,8 +109,8 @@
  
 -    ac_nss_lib_dir="/usr/lib /usr/lib64 /usr/local/lib /usr/lib/$ac_mozilla_name /usr/local/lib/$ac_mozilla_name"
 -    ac_nss_inc_dir="/usr/include /usr/include/mozilla /usr/local/include /usr/local/include/mozilla /usr/include/$ac_mozilla_name /usr/local/include/$ac_mozilla_name"
-+    ac_nss_lib_dir="${WORKDIR}/UnpackedTarball/nss/mozilla/dist/out/lib"
-+    ac_nss_inc_dir="${WORKDIR}/UnpackedTarball/nss/mozilla/dist/out/include ${WORKDIR}/UnpackedTarball/nss/mozilla/dist/public"
++    ac_nss_lib_dir="${WORKDIR}/UnpackedTarball/nss/dist/out/lib"
++    ac_nss_inc_dir="${WORKDIR}/UnpackedTarball/nss/dist/out/include ${WORKDIR}/UnpackedTarball/nss/dist/public"
  
      AC_MSG_CHECKING(for nspr libraries >= $NSPR_MIN_VERSION)
      NSPR_INCLUDES_FOUND="no"
diff --git a/external/nss/ExternalPackage_nss.mk b/external/nss/ExternalPackage_nss.mk
index 054c7977984f..ea686c27aaf2 100644
--- a/external/nss/ExternalPackage_nss.mk
+++ b/external/nss/ExternalPackage_nss.mk
@@ -13,47 +13,47 @@ $(eval $(call gb_ExternalPackage_use_external_project,nss,nss))
 
 ifeq ($(OS),MACOSX)
 $(eval $(call gb_ExternalPackage_add_files,nss,$(LIBO_LIB_FOLDER),\
-		mozilla/dist/out/lib/libfreebl3.dylib \
-		mozilla/dist/out/lib/libnspr4.dylib \
-		mozilla/dist/out/lib/libnss3.dylib \
-		mozilla/dist/out/lib/libnssckbi.dylib \
-		mozilla/dist/out/lib/libnssdbm3.dylib \
-		mozilla/dist/out/lib/libnssutil3.dylib \
-		mozilla/dist/out/lib/libplc4.dylib \
-		mozilla/dist/out/lib/libplds4.dylib \
-		mozilla/dist/out/lib/libsmime3.dylib \
-		mozilla/dist/out/lib/libsoftokn3.dylib \
-		mozilla/dist/out/lib/libssl3.dylib \
+		dist/out/lib/libfreebl3.dylib \
+		dist/out/lib/libnspr4.dylib \
+		dist/out/lib/libnss3.dylib \
+		dist/out/lib/libnssckbi.dylib \
+		dist/out/lib/libnssdbm3.dylib \
+		dist/out/lib/libnssutil3.dylib \
+		dist/out/lib/libplc4.dylib \
+		dist/out/lib/libplds4.dylib \
+		dist/out/lib/libsmime3.dylib \
+		dist/out/lib/libsoftokn3.dylib \
+		dist/out/lib/libssl3.dylib \
 ))
 else ifeq ($(OS),WNT)
 $(eval $(call gb_ExternalPackage_add_files,nss,$(LIBO_LIB_FOLDER),\
-		mozilla/dist/out/lib/freebl3.dll \
-		mozilla/dist/out/lib/nspr4.dll \
-		mozilla/dist/out/lib/nss3.dll \
-		mozilla/dist/out/lib/nssckbi.dll \
-		mozilla/dist/out/lib/nssdbm3.dll \
-		mozilla/dist/out/lib/nssutil3.dll \
-		mozilla/dist/out/lib/plc4.dll \
-		mozilla/dist/out/lib/plds4.dll \
-		mozilla/dist/out/lib/smime3.dll \
-		mozilla/dist/out/lib/softokn3.dll \
-		mozilla/dist/out/lib/sqlite3.dll \
-		mozilla/dist/out/lib/ssl3.dll \
+		dist/out/lib/freebl3.dll \
+		dist/out/lib/nspr4.dll \
+		dist/out/lib/nss3.dll \
+		dist/out/lib/nssckbi.dll \
+		dist/out/lib/nssdbm3.dll \
+		dist/out/lib/nssutil3.dll \
+		dist/out/lib/plc4.dll \
+		dist/out/lib/plds4.dll \
+		dist/out/lib/smime3.dll \
+		dist/out/lib/softokn3.dll \
+		dist/out/lib/sqlite3.dll \
+		dist/out/lib/ssl3.dll \
 ))
 else # OS!=WNT/MACOSX
 $(eval $(call gb_ExternalPackage_add_files,nss,$(LIBO_LIB_FOLDER),\
-		mozilla/dist/out/lib/libfreebl3.so \
-		mozilla/dist/out/lib/libnspr4.so \
-		mozilla/dist/out/lib/libnss3.so \
-		mozilla/dist/out/lib/libnssckbi.so \
-		mozilla/dist/out/lib/libnssdbm3.so \
-		mozilla/dist/out/lib/libnssutil3.so \
-		mozilla/dist/out/lib/libplc4.so \
-		mozilla/dist/out/lib/libplds4.so \
-		mozilla/dist/out/lib/libsmime3.so \
-		mozilla/dist/out/lib/libsoftokn3.so \
-		mozilla/dist/out/lib/libssl3.so \
-		mozilla/dist/out/lib/libsqlite3.so \
+		dist/out/lib/libfreebl3.so \
+		dist/out/lib/libnspr4.so \
+		dist/out/lib/libnss3.so \
+		dist/out/lib/libnssckbi.so \
+		dist/out/lib/libnssdbm3.so \
+		dist/out/lib/libnssutil3.so \
+		dist/out/lib/libplc4.so \
+		dist/out/lib/libplds4.so \
+		dist/out/lib/libsmime3.so \
+		dist/out/lib/libsoftokn3.so \
+		dist/out/lib/libssl3.so \
+		dist/out/lib/libsqlite3.so \
 ))
 endif
 
diff --git a/external/nss/ExternalProject_nss.mk b/external/nss/ExternalProject_nss.mk
index 0bd7a38a451a..38dec3c49644 100644
--- a/external/nss/ExternalProject_nss.mk
+++ b/external/nss/ExternalProject_nss.mk
@@ -16,10 +16,10 @@ $(eval $(call gb_ExternalProject_register_targets,nss,\
 
 $(call gb_ExternalProject_get_state_target,nss,configure):
 	$(call gb_ExternalProject_run,configure,\
-	$(if $(filter MSC,$(COM)),LIB="$(ILIB)") \
-	mozilla/nsprpub/configure --includedir=$(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/include \
-		$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
-		$(if $(filter MSC-X86_64,$(COM)-$(CPUNAME)),--enable-64bit) \
+		$(if $(filter MSC,$(COM)),LIB="$(ILIB)") \
+		nspr/configure --includedir=$(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/include \
+			$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
+			$(if $(filter MSC-X86_64,$(COM)-$(CPUNAME)),--enable-64bit) \
 	,,nss_configure.log)
 
 ifeq ($(OS),WNT)
@@ -33,7 +33,7 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalProject
 		XCFLAGS="$(SOLARINC)" \
 		$(MAKE) -j1 nss_build_all RC="rc.exe $(SOLARINC)" \
 			NSINSTALL='$(call gb_ExternalExecutable_get_command,python) $(SRCDIR)/external/nss/nsinstall.py' \
-	,mozilla/security/nss)
+	,nss)
 
 
 else
@@ -52,7 +52,7 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalProject
 			NSPR_CONFIGURE_OPTS="--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --enable-shared --disable-static" \
 			NSINSTALL="$(call gb_ExternalExecutable_get_command,python) $(SRCDIR)/external/nss/nsinstall.py" \
 		&& rm -f $(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/lib/*.a \
-	,mozilla/security/nss)
+	,nss)
 
 endif
 else # OS!=WNT
@@ -66,21 +66,21 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalProject
 		NSINSTALL="$(call gb_ExternalExecutable_get_command,python) $(SRCDIR)/external/nss/nsinstall.py") \
 		NSDISTMODE=copy \
 		$(MAKE) -j1 AR=$(AR) RANLIB=$(RANLIB) NMEDIT=$(NM)edit nss_build_all \
-		&& rm -f $(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/lib/*.a \
+		&& rm -f $(call gb_UnpackedTarball_get_dir,nss)/dist/out/lib/*.a \
 		$(if $(filter MACOSX,$(OS)),&& $(PERL) \
 			$(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \
-			$(gb_Package_SOURCEDIR_nss)/mozilla/dist/out/lib/libfreebl3.dylib \
-			$(gb_Package_SOURCEDIR_nss)/mozilla/dist/out/lib/libnspr4.dylib \
-			$(gb_Package_SOURCEDIR_nss)/mozilla/dist/out/lib/libnss3.dylib \
-			$(gb_Package_SOURCEDIR_nss)/mozilla/dist/out/lib/libnssckbi.dylib \
-			$(gb_Package_SOURCEDIR_nss)/mozilla/dist/out/lib/libnssdbm3.dylib \
-			$(gb_Package_SOURCEDIR_nss)/mozilla/dist/out/lib/libnssutil3.dylib \
-			$(gb_Package_SOURCEDIR_nss)/mozilla/dist/out/lib/libplc4.dylib \
-			$(gb_Package_SOURCEDIR_nss)/mozilla/dist/out/lib/libplds4.dylib \
-			$(gb_Package_SOURCEDIR_nss)/mozilla/dist/out/lib/libsmime3.dylib \
-			$(gb_Package_SOURCEDIR_nss)/mozilla/dist/out/lib/libsoftokn3.dylib \
-			$(gb_Package_SOURCEDIR_nss)/mozilla/dist/out/lib/libssl3.dylib) \
-	,mozilla/security/nss)
+			$(gb_Package_SOURCEDIR_nss)/dist/out/lib/libfreebl3.dylib \
+			$(gb_Package_SOURCEDIR_nss)/dist/out/lib/libnspr4.dylib \
+			$(gb_Package_SOURCEDIR_nss)/dist/out/lib/libnss3.dylib \
+			$(gb_Package_SOURCEDIR_nss)/dist/out/lib/libnssckbi.dylib \
+			$(gb_Package_SOURCEDIR_nss)/dist/out/lib/libnssdbm3.dylib \
+			$(gb_Package_SOURCEDIR_nss)/dist/out/lib/libnssutil3.dylib \
+			$(gb_Package_SOURCEDIR_nss)/dist/out/lib/libplc4.dylib \
+			$(gb_Package_SOURCEDIR_nss)/dist/out/lib/libplds4.dylib \
+			$(gb_Package_SOURCEDIR_nss)/dist/out/lib/libsmime3.dylib \
+			$(gb_Package_SOURCEDIR_nss)/dist/out/lib/libsoftokn3.dylib \
+			$(gb_Package_SOURCEDIR_nss)/dist/out/lib/libssl3.dylib) \
+	,nss)
 
 endif
 
diff --git a/external/nss/UnpackedTarball_nss.mk b/external/nss/UnpackedTarball_nss.mk
index 529f2fd61e08..888e1ecc6466 100644
--- a/external/nss/UnpackedTarball_nss.mk
+++ b/external/nss/UnpackedTarball_nss.mk
@@ -18,9 +18,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\
 	$(if $(filter MACOSX,$(OS)),external/nss/nss_macosx.patch) \
 	$(if $(filter WNTMSC,$(OS)$(COM)),external/nss/nss.windows.patch) \
 	$(if $(filter WNTGCC,$(OS)$(COM)),external/nss/nspr-4.9-build.patch.3 \
-	external/nss/nss-3.13.3-build.patch.3 \
-	external/nss/nss.mingw.patch.3) \
-	external/nss/nss.wheader-guard.patch.0 \
+		external/nss/nss-3.13.3-build.patch.3 \
+		external/nss/nss.mingw.patch.3) \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/nss/nspr-4.9-build.patch.3 b/external/nss/nspr-4.9-build.patch.3
index 1ed211a803a6..6f80f8023569 100644
--- a/external/nss/nspr-4.9-build.patch.3
+++ b/external/nss/nspr-4.9-build.patch.3
@@ -1,5 +1,5 @@
----  misc/build/nss-3.13.5/mozilla/nsprpub/config/autoconf.mk.in	2011-08-29 19:02:51.000000000 +0200
-+++  misc/build/nss-3.13.5/mozilla/nsprpub/config/autoconf.mk.in	2012-03-22 11:24:22.137097336 +0100
+---  a/a/a/nspr/config/autoconf.mk.in	2011-08-29 19:02:51.000000000 +0200
++++  a/a/a/nspr/config/autoconf.mk.in	2012-03-22 11:24:22.137097336 +0100
 @@ -27,6 +27,7 @@
  OBJ_SUFFIX	= $(error config/config.mk needs to be included before using OBJ_SUFFIX)
  _OBJ_SUFFIX	= @OBJ_SUFFIX@
@@ -8,8 +8,8 @@
  DLL_SUFFIX	= @DLL_SUFFIX@
  ASM_SUFFIX	= @ASM_SUFFIX@
  MOD_NAME	= @NSPR_MODNAME@
----  misc/build/nss-3.13.5/mozilla/nsprpub/config/rules.mk	2011-08-29 19:02:51.000000000 +0200
-+++  misc/build/nss-3.13.5/mozilla/nsprpub/config/rules.mk	2012-03-22 11:24:22.138097311 +0100
+---  a/a/a/nspr/config/rules.mk	2011-08-29 19:02:51.000000000 +0200
++++  a/a/a/nspr/config/rules.mk	2012-03-22 11:24:22.138097311 +0100
 @@ -115,21 +115,21 @@
  #
  
@@ -36,8 +36,8 @@
  SHARED_LIB_PDB	= $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION).pdb
  endif
  
----  misc/build/nss-3.13.5/mozilla/nsprpub/configure	2012-02-14 20:06:00.000000000 +0100
-+++  misc/build/nss-3.13.5/mozilla/nsprpub/configure	2012-03-22 11:24:22.139097286 +0100
+---  a/a/a/nspr/configure	2012-02-14 20:06:00.000000000 +0100
++++  a/a/a/nspr/configure	2012-03-22 11:24:22.139097286 +0100
 @@ -3034,6 +3034,7 @@
  
  OBJ_SUFFIX=o
@@ -121,8 +121,8 @@
  s%@DLL_SUFFIX@%$DLL_SUFFIX%g
  s%@ASM_SUFFIX@%$ASM_SUFFIX%g
  s%@WRAP_LDFLAGS@%$WRAP_LDFLAGS%g
----  misc/build/nss-3.13.5/mozilla/nsprpub/configure.in	2012-02-14 20:06:00.000000000 +0100
-+++  misc/build/nss-3.13.5/mozilla/nsprpub/configure.in	2012-03-22 11:24:22.139097286 +0100
+---  a/a/a/nspr/configure.in	2012-02-14 20:06:00.000000000 +0100
++++  a/a/a/nspr/configure.in	2012-03-22 11:24:22.139097286 +0100
 @@ -834,6 +834,7 @@
  dnl ========================================================
  OBJ_SUFFIX=o
@@ -206,8 +206,8 @@
  AC_SUBST(DLL_SUFFIX)
  AC_SUBST(ASM_SUFFIX)
  AC_SUBST(WRAP_LDFLAGS)
----  misc/build/nss-3.13.5/mozilla/nsprpub/pr/include/md/_win95.cfg	2010-01-27 03:45:49.000000000 +0100
-+++  misc/build/nss-3.13.5/mozilla/nsprpub/pr/include/md/_win95.cfg	2012-03-22 11:24:22.139097286 +0100
+---  a/a/a/nspr/pr/include/md/_win95.cfg	2010-01-27 03:45:49.000000000 +0100
++++  a/a/a/nspr/pr/include/md/_win95.cfg	2012-03-22 11:24:22.139097286 +0100
 @@ -106,7 +106,7 @@
  #define PR_BYTES_PER_WORD_LOG2	2
  #define PR_BYTES_PER_DWORD_LOG2	3
@@ -217,8 +217,8 @@
  
  #define IS_LITTLE_ENDIAN 1
  #undef  IS_BIG_ENDIAN
----  misc/build/nss-3.13.5/mozilla/nsprpub/pr/include/md/_winnt.cfg	2010-01-27 03:45:49.000000000 +0100
-+++  misc/build/nss-3.13.5/mozilla/nsprpub/pr/include/md/_winnt.cfg	2012-03-22 11:24:22.140097261 +0100
+---  a/a/a/nspr/pr/include/md/_winnt.cfg	2010-01-27 03:45:49.000000000 +0100
++++  a/a/a/nspr/pr/include/md/_winnt.cfg	2012-03-22 11:24:22.140097261 +0100
 @@ -100,7 +100,7 @@
  #define PR_BYTES_PER_WORD_LOG2	2
  #define PR_BYTES_PER_DWORD_LOG2	2
@@ -228,8 +228,8 @@
  
  #define IS_LITTLE_ENDIAN 1
  #undef  IS_BIG_ENDIAN
----  misc/build/nss-3.13.5/mozilla/nsprpub/pr/src/Makefile.in	2011-09-22 17:21:06.000000000 +0200
-+++  misc/build/nss-3.13.5/mozilla/nsprpub/pr/src/Makefile.in	2012-03-22 11:24:22.140097261 +0100
+---  a/a/a/nspr/pr/src/Makefile.in	2011-09-22 17:21:06.000000000 +0200
++++  a/a/a/nspr/pr/src/Makefile.in	2012-03-22 11:24:22.140097261 +0100
 @@ -9,6 +9,9 @@
  topsrcdir	= @top_srcdir@
  srcdir		= @srcdir@
@@ -261,8 +261,8 @@
  
  RELEASE_LIBS = $(TARGETS)
  
----  misc/build/nss-3.13.5/mozilla/nsprpub/pr/src/md/windows/ntgc.c	2010-11-30 00:26:19.000000000 +0100
-+++  misc/build/nss-3.13.5/mozilla/nsprpub/pr/src/md/windows/ntgc.c	2012-03-22 11:24:22.140097261 +0100
+---  a/a/a/nspr/pr/src/md/windows/ntgc.c	2010-11-30 00:26:19.000000000 +0100
++++  a/a/a/nspr/pr/src/md/windows/ntgc.c	2012-03-22 11:24:22.140097261 +0100
 @@ -44,7 +44,7 @@
  
  PRWord *_MD_HomeGCRegisters(PRThread *t, int isCurrent, int *np) 
@@ -272,8 +272,8 @@
      CONTEXT context;
      context.ContextFlags = CONTEXT_INTEGER;
  
----  misc/build/nss-3.13.5/mozilla/nsprpub/tools/Makefile.in	2008-05-04 00:28:44.000000000 +0200
-+++  misc/build/nss-3.13.5/mozilla/nsprpub/tools/Makefile.in	2012-03-22 11:24:22.140097261 +0100
+---  a/a/a/nspr/tools/Makefile.in	2008-05-04 00:28:44.000000000 +0200
++++  a/a/a/nspr/tools/Makefile.in	2012-03-22 11:24:22.140097261 +0100
 @@ -219,7 +219,7 @@
  	echo winsock.lib     >>w16link
  	wlink @w16link.
diff --git a/external/nss/nss-3.13.3-build.patch.3 b/external/nss/nss-3.13.3-build.patch.3
index ee4ff042cf29..7412c288ab77 100644
--- a/external/nss/nss-3.13.3-build.patch.3
+++ b/external/nss/nss-3.13.3-build.patch.3
@@ -1,5 +1,5 @@
----  misc/build/nss-3.13.5/mozilla/security/coreconf/rules.mk	2013-06-14 13:31:28.569204870 +0100
-+++  misc/build/nss-3.13.5/mozilla/security/coreconf/rules.mk	2013-06-14 13:31:59.277567709 +0100
+---  a/a/a/nss/coreconf/rules.mk	2013-06-14 13:31:28.569204870 +0100
++++  a/a/a/nss/coreconf/rules.mk	2013-06-14 13:31:59.277567709 +0100
 @@ -400,7 +400,7 @@
  PWD := $(shell pwd)
  ifeq (,$(findstring ;,$(PATH)))
@@ -8,9 +8,9 @@
 +#PWD := $(subst \,/,$(shell cygpath -w $(PWD)))
  endif
  endif
- 
----  misc/build/nss-3.13.5/mozilla/security/coreconf/WIN32.mk	2013-06-14 13:31:28.557204728 +0100
-+++  misc/build/nss-3.13.5/mozilla/security/coreconf/WIN32.mk	2013-06-14 13:31:59.278567724 +0100
+ endif
+---  a/a/a/nss/coreconf/WIN32.mk	2013-06-14 13:31:28.557204728 +0100
++++  a/a/a/nss/coreconf/WIN32.mk	2013-06-14 13:31:59.278567724 +0100
 @@ -124,7 +124,7 @@
      # The -mnop-fun-dllimport flag allows us to avoid a drawback of
      # the dllimport attribute that a pointer to a function marked as
@@ -20,8 +20,8 @@
      _GEN_IMPORT_LIB=-Wl,--out-implib,$(IMPORT_LIBRARY)
      DLLFLAGS  += -mwindows -o $@ -shared -Wl,--export-all-symbols $(if $(IMPORT_LIBRARY),$(_GEN_IMPORT_LIB))
      ifdef BUILD_OPT
----  misc/build/nss-3.13.5/mozilla/security/coreconf/WINNT.mk	2013-06-14 13:31:28.560204763 +0100
-+++  misc/build/nss-3.13.5/mozilla/security/coreconf/WINNT.mk	2013-06-14 13:31:59.278567724 +0100
+---  a/a/a/nss/coreconf/WINNT.mk	2013-06-14 13:31:28.560204763 +0100
++++  a/a/a/nss/coreconf/WINNT.mk	2013-06-14 13:31:59.278567724 +0100
 @@ -46,7 +46,7 @@
  #
  # Win NT needs -GT so that fibers can work
@@ -29,10 +29,10 @@
 -OS_CFLAGS += -GT
 +#OS_CFLAGS += -GT
  
- # WINNT uses the lib prefix, Win95 and WinCE don't
+ # WINNT uses the lib prefix, Win95 doesn't
  NSPR31_LIB_PREFIX = lib
----  misc/build/nss-3.13.5/mozilla/security/nss/cmd/crmftest/Makefile	2013-06-14 13:31:28.678206158 +0100
-+++  misc/build/nss-3.13.5/mozilla/security/nss/cmd/crmftest/Makefile	2013-06-14 13:31:59.278567724 +0100
+---  a/a/a/nss/cmd/crmftest/Makefile	2013-06-14 13:31:28.678206158 +0100
++++  a/a/a/nss/cmd/crmftest/Makefile	2013-06-14 13:31:59.278567724 +0100
 @@ -90,7 +90,7 @@
  LDDIST = $(DIST)/lib
  
@@ -42,8 +42,8 @@
  endif
  
  include ../platrules.mk
----  misc/build/nss-3.13.5/mozilla/security/nss/cmd/pk11mode/Makefile	2013-06-14 13:31:28.709206524 +0100
-+++  misc/build/nss-3.13.5/mozilla/security/nss/cmd/pk11mode/Makefile	2013-06-14 13:31:59.279567738 +0100
+---  a/a/a/nss/cmd/pk11mode/Makefile	2013-06-14 13:31:28.709206524 +0100
++++  a/a/a/nss/cmd/pk11mode/Makefile	2013-06-14 13:31:59.279567738 +0100
 @@ -61,9 +61,9 @@
  ifeq ($(OS_ARCH), WINNT)
  
@@ -57,8 +57,8 @@
  	$(NULL)
  
  else
----  misc/build/nss-3.13.5/mozilla/security/nss/cmd/shlibsign/Makefile	2013-06-14 13:31:28.680206181 +0100
-+++  misc/build/nss-3.13.5/mozilla/security/nss/cmd/shlibsign/Makefile	2013-06-14 13:31:59.279567738 +0100
+---  a/a/a/nss/cmd/shlibsign/Makefile	2013-06-14 13:31:28.680206181 +0100
++++  a/a/a/nss/cmd/shlibsign/Makefile	2013-06-14 13:31:59.279567738 +0100
 @@ -59,9 +59,9 @@
  ifeq ($(OS_ARCH), WINNT)
  
@@ -80,18 +80,18 @@
 -ALL_TRASH += $(CHECKLOC)
 +MD_LIB_RELEASE_FILES = # $(CHECKLOC)
 +#ALL_TRASH += $(CHECKLOC)
- 
+ endif
  
  #######################################################################
 @@ -128,5 +128,5 @@
- 	$(call core_abspath,$(NSPR_LIB_DIR)) $(call core_abspath,$<)
+     endif
  endif
  
 -libs install :: $(CHECKLOC)
 +libs install :: #$(CHECKLOC)
  
----  misc/build/nss-3.13.5/mozilla/security/nss/cmd/shlibsign/mangle/Makefile	2013-06-14 13:31:28.681206193 +0100
-+++  misc/build/nss-3.13.5/mozilla/security/nss/cmd/shlibsign/mangle/Makefile	2013-06-14 13:31:59.279567738 +0100
+---  a/a/a/nss/cmd/shlibsign/mangle/Makefile	2013-06-14 13:31:28.681206193 +0100
++++  a/a/a/nss/cmd/shlibsign/mangle/Makefile	2013-06-14 13:31:59.279567738 +0100
 @@ -59,9 +59,9 @@
  ifeq ($(OS_ARCH), WINNT)
  
@@ -105,8 +105,8 @@
  	$(NULL)
  
  else
----  misc/build/nss-3.13.5/mozilla/security/nss/lib/ckfw/builtins/config.mk	2013-06-14 13:31:28.666206016 +0100
-+++  misc/build/nss-3.13.5/mozilla/security/nss/lib/ckfw/builtins/config.mk	2013-06-14 13:31:59.280567750 +0100
+---  a/a/a/nss/lib/ckfw/builtins/config.mk	2013-06-14 13:31:28.666206016 +0100
++++  a/a/a/nss/lib/ckfw/builtins/config.mk	2013-06-14 13:31:59.280567750 +0100
 @@ -48,7 +48,7 @@
  
  ifeq (,$(filter-out WIN%,$(OS_TARGET)))
@@ -116,8 +116,8 @@
      RESNAME = $(LIBRARY_NAME).rc
  endif
  
----  misc/build/nss-3.13.5/mozilla/security/nss/lib/ckfw/capi/Makefile	2013-06-14 13:31:28.669206051 +0100
-+++  misc/build/nss-3.13.5/mozilla/security/nss/lib/ckfw/capi/Makefile	2013-06-14 13:31:59.280567750 +0100
+---  a/a/a/nss/lib/ckfw/capi/Makefile	2013-06-14 13:31:28.669206051 +0100
++++  a/a/a/nss/lib/ckfw/capi/Makefile	2013-06-14 13:31:59.280567750 +0100
 @@ -75,6 +75,9 @@
  	-lplc4 \
  	-lplds4 \
@@ -128,8 +128,8 @@
  	$(NULL)
  endif
  
----  misc/build/nss-3.13.5/mozilla/security/nss/lib/freebl/config.mk	2013-06-14 13:31:28.593205153 +0100
-+++  misc/build/nss-3.13.5/mozilla/security/nss/lib/freebl/config.mk	2013-06-14 13:31:59.280567750 +0100
+---  a/a/a/nss/lib/freebl/config.mk	2013-06-14 13:31:28.593205153 +0100
++++  a/a/a/nss/lib/freebl/config.mk	2013-06-14 13:31:59.280567750 +0100
 @@ -82,7 +82,7 @@
  # don't want the 32 in the shared library name
  SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
@@ -138,37 +138,9 @@
 +RES     = $(OBJDIR)/$(LIBRARY_NAME).res.o
  RESNAME = freebl.rc
  
- ifndef WINCE
----  misc/build/nss-3.13.5/mozilla/security/nss/lib/freebl/Makefile	2013-06-14 13:31:28.588205094 +0100
-+++  misc/build/nss-3.13.5/mozilla/security/nss/lib/freebl/Makefile	2013-06-14 13:31:59.281567762 +0100
-@@ -171,6 +171,17 @@
-     endif
- endif
- else
-+# 64-bit Windows
-+ifdef NS_USE_GCC
-+    # win64/gcc - use the x86 code for now, skipping optimization
-+    ifdef BUILD_OPT
-+	OPTIMIZER += -Os
-+    endif
-+    ASFILES  =
-+    DEFINES += -DMPI_AMD64 -DMP_USE_UINT_DIGIT
-+    DEFINES += -DMP_CHAR_STORE_SLOW -DMP_IS_LITTLE_ENDIAN
-+else
-+# MSVC
-     # -DMP_NO_MP_WORD
-     ifdef BUILD_OPT
- 	OPTIMIZER += -Ox  # maximum optimization for freebl
-@@ -182,6 +193,7 @@
-     MPI_SRCS += mpi_amd64.c
- endif
- endif
-+endif
- 
- ifeq ($(OS_TARGET),WINCE)
-     DEFINES += -DMP_ARGCHK=0	# no assert in WinCE
----  misc/build/nss-3.13.5/mozilla/security/nss/lib/freebl/mpi/mpi-priv.h	2013-06-14 13:31:28.605205295 +0100
-+++  misc/build/nss-3.13.5/mozilla/security/nss/lib/freebl/mpi/mpi-priv.h	2013-06-14 13:31:59.281567762 +0100
+ ifdef NS_USE_GCC
+---  a/a/a/nss/lib/freebl/mpi/mpi-priv.h	2013-06-14 13:31:28.605205295 +0100
++++  a/a/a/nss/lib/freebl/mpi/mpi-priv.h	2013-06-14 13:31:59.281567762 +0100
 @@ -254,7 +254,7 @@
  #define MPI_ASM_DECL
  #endif
@@ -178,8 +150,8 @@
  
  mp_digit MPI_ASM_DECL s_mpv_mul_set_vec64(mp_digit*, mp_digit *, mp_size, mp_digit);
  mp_digit MPI_ASM_DECL s_mpv_mul_add_vec64(mp_digit*, const mp_digit*, mp_size, mp_digit);
----  misc/build/nss-3.13.5/mozilla/security/nss/lib/nss/config.mk	2013-06-14 13:31:28.620205472 +0100
-+++  misc/build/nss-3.13.5/mozilla/security/nss/lib/nss/config.mk	2013-06-14 13:31:59.281567762 +0100
+---  a/a/a/nss/lib/nss/config.mk	2013-06-14 13:31:28.620205472 +0100
++++  a/a/a/nss/lib/nss/config.mk	2013-06-14 13:31:59.281567762 +0100
 @@ -42,7 +42,7 @@
  SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
  IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(IMPORT_LIB_SUFFIX)
@@ -189,8 +161,8 @@
  RESNAME = $(LIBRARY_NAME).rc
  
  ifdef NS_USE_GCC
----  misc/build/nss-3.13.5/mozilla/security/nss/lib/smime/config.mk	2013-06-14 13:31:28.580205000 +0100
-+++  misc/build/nss-3.13.5/mozilla/security/nss/lib/smime/config.mk	2013-06-14 13:31:59.282567773 +0100
+---  a/a/a/nss/lib/smime/config.mk	2013-06-14 13:31:28.580205000 +0100
++++  a/a/a/nss/lib/smime/config.mk	2013-06-14 13:31:59.282567773 +0100
 @@ -43,7 +43,7 @@
  SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
  IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(IMPORT_LIB_SUFFIX)
@@ -200,8 +172,8 @@
  RESNAME = smime.rc
  
  ifdef NS_USE_GCC
----  misc/build/nss-3.13.5/mozilla/security/nss/lib/softoken/config.mk	2013-06-14 13:31:28.662205969 +0100
-+++  misc/build/nss-3.13.5/mozilla/security/nss/lib/softoken/config.mk	2013-06-14 13:31:59.282567773 +0100
+---  a/a/a/nss/lib/softoken/config.mk	2013-06-14 13:31:28.662205969 +0100
++++  a/a/a/nss/lib/softoken/config.mk	2013-06-14 13:31:59.282567773 +0100
 @@ -49,7 +49,7 @@
  SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
  IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(IMPORT_LIB_SUFFIX)
@@ -211,8 +183,8 @@
  RESNAME = $(LIBRARY_NAME).rc
  
  ifdef NS_USE_GCC
----  misc/build/nss-3.13.5/mozilla/security/nss/lib/softoken/legacydb/config.mk	2013-06-14 13:31:28.660205945 +0100
-+++  misc/build/nss-3.13.5/mozilla/security/nss/lib/softoken/legacydb/config.mk	2013-06-14 13:31:59.282567773 +0100
+---  a/a/a/nss/lib/softoken/legacydb/config.mk	2013-06-14 13:31:28.660205945 +0100
++++  a/a/a/nss/lib/softoken/legacydb/config.mk	2013-06-14 13:31:59.282567773 +0100
 @@ -50,7 +50,7 @@
  SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
  IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(IMPORT_LIB_SUFFIX)
@@ -222,8 +194,8 @@
  RESNAME = $(LIBRARY_NAME).rc
  
  ifdef NS_USE_GCC
----  misc/build/nss-3.13.5/mozilla/security/nss/lib/ssl/config.mk	2013-06-14 13:31:28.614205402 +0100
-+++  misc/build/nss-3.13.5/mozilla/security/nss/lib/ssl/config.mk	2013-06-14 13:31:59.283567784 +0100
+---  a/a/a/nss/lib/ssl/config.mk	2013-06-14 13:31:28.614205402 +0100
++++  a/a/a/nss/lib/ssl/config.mk	2013-06-14 13:31:59.283567784 +0100
 @@ -55,7 +55,7 @@
  SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
  IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(IMPORT_LIB_SUFFIX)
@@ -233,8 +205,8 @@
  RESNAME = ssl.rc
  
  ifdef NS_USE_GCC
----  misc/build/nss-3.13.5/mozilla/security/nss/lib/sysinit/config.mk	2013-06-14 13:31:28.674206110 +0100
-+++  misc/build/nss-3.13.5/mozilla/security/nss/lib/sysinit/config.mk	2013-06-14 13:31:59.283567784 +0100
+---  a/a/a/nss/lib/sysinit/config.mk	2013-06-14 13:31:28.674206110 +0100
++++  a/a/a/nss/lib/sysinit/config.mk	2013-06-14 13:31:59.283567784 +0100
 @@ -47,8 +47,8 @@
  SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
  IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(IMPORT_LIB_SUFFIX)
@@ -246,8 +218,8 @@
  
  ifdef NS_USE_GCC
  EXTRA_SHARED_LIBS += \
----  misc/build/nss-3.13.5/mozilla/security/nss/lib/util/config.mk	2013-06-14 13:31:28.629205579 +0100
-+++  misc/build/nss-3.13.5/mozilla/security/nss/lib/util/config.mk	2013-06-14 13:31:59.283567784 +0100
+---  a/a/a/nss/lib/util/config.mk	2013-06-14 13:31:28.629205579 +0100
++++  a/a/a/nss/lib/util/config.mk	2013-06-14 13:31:59.283567784 +0100
 @@ -42,7 +42,7 @@
  SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
  IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(IMPORT_LIB_SUFFIX)
diff --git a/external/nss/nss-3.13.5-zlib-werror.patch b/external/nss/nss-3.13.5-zlib-werror.patch
index c3440c8ed99f..6cda50023f1b 100644
--- a/external/nss/nss-3.13.5-zlib-werror.patch
+++ b/external/nss/nss-3.13.5-zlib-werror.patch
@@ -1,5 +1,5 @@
---- misc/nss-3.13.5/mozilla/security/nss/lib/zlib/gzguts.h	2010-08-22 03:07:03.000000000 +0200
-+++ misc/build/nss-3.13.5/mozilla/security/nss/lib/zlib/gzguts.h	2012-07-17 08:52:14.821552788 +0200
+--- a/a/nss/lib/zlib/gzguts.h	2010-08-22 03:07:03.000000000 +0200
++++ b/b/nss/lib/zlib/gzguts.h	2012-07-17 08:52:14.821552788 +0200
 @@ -26,6 +26,9 @@
  #  include <limits.h>
  #endif
diff --git a/external/nss/nss.aix.patch b/external/nss/nss.aix.patch
index a8a6a8eaf1ee..c83ae5758e7a 100644
--- a/external/nss/nss.aix.patch
+++ b/external/nss/nss.aix.patch
@@ -1,5 +1,5 @@
---- misc/nss-3.13.5/mozilla/nsprpub/configure	2010-08-18 07:23:01.000000000 -0500
-+++ misc/build/nss-3.13.5/mozilla/nsprpub/configure	2010-08-18 07:33:11.000000000 -0500
+--- a/a/nspr/configure	2010-08-18 07:23:01.000000000 -0500
++++ b/b/nspr/configure	2010-08-18 07:33:11.000000000 -0500
 @@ -2973,7 +2973,8 @@
  #define SYSV 1
  EOF
@@ -9,7 +9,7 @@
 +    DSO_LDOPTS='-Wl,-brtl -Wl,-bnortllib -Wl,-blibpath:/usr/lib:/lib'
      ac_safe=`echo "sys/atomic_op.h" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for sys/atomic_op.h""... $ac_c" 1>&6
- echo "configure:3466: checking for sys/atomic_op.h" >&5
+ echo "configure:3477: checking for sys/atomic_op.h" >&5
 @@ -3102,7 +3103,6 @@
          AIX_LINK_OPTS='-brtl -bnso -berok'
          ;;
@@ -18,8 +18,8 @@
      AIX_WRAP='$(DIST)/lib/aixwrap.o'
      AIX_TMP='./_aix_tmp.o'
      if test -n "$USE_64"; then
---- misc/nss-3.13.5/mozilla/nsprpub/configure.in	2010-08-18 07:23:01.000000000 -0500
-+++ misc/build/nss-3.13.5/mozilla/nsprpub/configure.in	2010-08-18 07:32:36.000000000 -0500
+--- a/a/nspr/configure.in	2010-08-18 07:23:01.000000000 -0500
++++ b/b/nspr/configure.in	2010-08-18 07:32:36.000000000 -0500
 @@ -831,7 +831,8 @@
      AC_DEFINE(XP_UNIX)
      AC_DEFINE(AIX)
@@ -42,8 +42,8 @@
      AIX_WRAP='$(DIST)/lib/aixwrap.o'
      AIX_TMP='./_aix_tmp.o'
      if test -n "$USE_64"; then
---- misc/nss-3.13.5/mozilla/nsprpub/pr/src/Makefile.in	2010-08-18 07:23:04.000000000 -0500
-+++ misc/build/nss-3.13.5/mozilla/nsprpub/pr/src/Makefile.in	2010-08-18 07:24:49.000000000 -0500
+--- a/a/nspr/pr/src/Makefile.in	2010-08-18 07:23:04.000000000 -0500
++++ b/b/nspr/pr/src/Makefile.in	2010-08-18 07:24:49.000000000 -0500
 @@ -110,7 +110,6 @@
  endif
  
@@ -52,8 +52,8 @@
  OS_LIBS		= -lodm -lcfg
  ifeq ($(CLASSIC_NSPR),1)
  ifeq ($(OS_RELEASE),4.1)
---- misc/nss-3.13.5/mozilla/security/coreconf/AIX.mk	2010-08-18 07:23:06.000000000 -0500
-+++ misc/build/nss-3.13.5/mozilla/security/coreconf/AIX.mk	2010-08-18 07:26:26.000000000 -0500
+--- a/a/nss/coreconf/AIX.mk	2010-08-18 07:23:06.000000000 -0500
++++ b/b/nss/coreconf/AIX.mk	2010-08-18 07:26:26.000000000 -0500
 @@ -62,35 +62,30 @@
  
  DEFAULT_COMPILER = xlc_r
@@ -96,9 +96,9 @@
  ifeq ($(USE_64), 1)
  	OS_CFLAGS	+= -DAIX_64BIT
  	OBJECT_MODE=64
---- misc/nss-3.13.5/mozilla/security/nss/cmd/platlibs.mk	2010-08-18 07:23:18.000000000 -0500
-+++ misc/build/nss-3.13.5/mozilla/security/nss/cmd/platlibs.mk	2010-08-18 07:26:48.000000000 -0500
-@@ -173,7 +173,7 @@
+--- a/a/nss/cmd/platlibs.mk	2010-08-18 07:23:18.000000000 -0500
++++ b/b/nss/cmd/platlibs.mk	2010-08-18 07:26:48.000000000 -0500
+@@ -136,7 +136,7 @@
  	$(NULL)
  
  ifeq ($(OS_ARCH), AIX) 
@@ -107,7 +107,7 @@
  endif
  
  # $(PROGRAM) has NO explicit dependencies on $(EXTRA_SHARED_LIBS)
-@@ -223,7 +223,7 @@
+@@ -186,7 +186,7 @@
  	$(NULL)
  
  ifeq ($(OS_ARCH), AIX) 
@@ -116,8 +116,8 @@
  endif
  
  # $(PROGRAM) has NO explicit dependencies on $(EXTRA_SHARED_LIBS)
---- misc/nss-3.13.5/mozilla/security/nss/cmd/shlibsign/mangle/Makefile	2010-08-18 07:23:20.000000000 -0500
-+++ misc/build/nss-3.13.5/mozilla/security/nss/cmd/shlibsign/mangle/Makefile	2010-08-18 07:42:44.000000000 -0500
+--- a/a/nss/cmd/shlibsign/mangle/Makefile	2010-08-18 07:23:20.000000000 -0500
++++ b/b/nss/cmd/shlibsign/mangle/Makefile	2010-08-18 07:42:44.000000000 -0500
 @@ -75,7 +75,9 @@
  
  endif
@@ -129,9 +129,9 @@
  
  #######################################################################
  # (5) Execute "global" rules. (OPTIONAL)                              #
---- misc/nss-3.13.5/mozilla/security/nss/cmd/shlibsign/Makefile	2010-08-18 08:00:17.000000000 -0500
-+++ misc/build/nss-3.13.5/mozilla/security/nss/cmd/shlibsign/Makefile	2010-08-18 07:55:55.000000000 -0500
-@@ -75,6 +75,9 @@
+--- a/a/nss/cmd/shlibsign/Makefile	2010-08-18 08:00:17.000000000 -0500
++++ b/b/nss/cmd/shlibsign/Makefile	2010-08-18 07:55:55.000000000 -0500
+@@ -45,6 +45,9 @@
  
  endif
  
@@ -140,4 +140,4 @@
 +endif
  
  # sign any and all shared libraries that contain the word freebl
- 
+ ifeq ($(NSS_BUILD_WITHOUT_SOFTOKEN),1)
diff --git a/external/nss/nss.mingw.patch.3 b/external/nss/nss.mingw.patch.3
index db073e94919a..53aecc515731 100644
--- a/external/nss/nss.mingw.patch.3
+++ b/external/nss/nss.mingw.patch.3
@@ -1,6 +1,5 @@
-diff -up misc/build/nss-3.13.5/mozilla/nsprpub/config/Makefile.in.dt nss/wntgcci.pro/misc/build/nss-3.13.5/mozilla/nsprpub/config/Makefile.in
---- misc/build/nss-3.13.5/mozilla/nsprpub/config/Makefile.in.dt	2012-10-29 13:30:49.244696426 +0100
-+++ misc/build/nss-3.13.5/mozilla/nsprpub/config/Makefile.in	2012-10-29 13:31:26.541830215 +0100
+--- a/a/a/nspr/config/Makefile.in.dt	2012-10-29 13:30:49.244696426 +0100
++++ a/a/a/nspr/config/Makefile.in	2012-10-29 13:31:26.541830215 +0100
 @@ -30,7 +30,6 @@ CSRCS	= now.c
  
  # This version hasn't been ported for us; the one in mozilla/config has
@@ -17,22 +16,8 @@ diff -up misc/build/nss-3.13.5/mozilla/nsprpub/config/Makefile.in.dt nss/wntgcci
  TARGETS = $(PROGS) $(PLSRCS:.pl=)
  endif
  endif
-diff -up ./nss-3.13.5/mozilla/security/nss/Makefile.dt ./nss-3.13.5/mozilla/security/nss/Makefile
---- misc/build/nss-3.13.5/mozilla/security/nss/Makefile.dt	2012-10-30 10:13:07.165713712 +0100
-+++ misc/build/nss-3.13.5/mozilla/security/nss/Makefile	2012-10-30 10:13:09.680656998 +0100
-@@ -58,7 +58,7 @@ include $(CORE_DEPTH)/coreconf/config.mk
- # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
- #######################################################################
- 
--ifeq ($(OS_TARGET),WINCE)
-+ifeq ($(OS_TARGET),WINNT)
- DIRS	= lib	# omit cmd since wince has no command line shell
- endif
- 
-diff -up misc/build/nss-3.13.5/mozilla/security/nss/cmd/platlibs.mk.dt misc/build/nss-3.13.5/mozilla/security/nss/cmd/platlibs.mk
-diff -up misc/build/nss-3.13.5/mozilla/security/nss/lib/nss/config.mk.dt misc/build/nss-3.13.5/mozilla/security/nss/lib/nss/config.mk
---- misc/build/nss-3.13.5/mozilla/security/nss/lib/nss/config.mk.dt	2012-10-30 12:31:06.675726730 +0100
-+++ misc/build/nss-3.13.5/mozilla/security/nss/lib/nss/config.mk	2012-10-30 12:31:08.860676053 +0100
+--- a/a/a/nss/lib/nss/config.mk.dt	2012-10-30 12:31:06.675726730 +0100
++++ a/a/a/nss/lib/nss/config.mk	2012-10-30 12:31:08.860676053 +0100
 @@ -40,7 +40,7 @@ ifeq (,$(filter-out WIN%,$(OS_TARGET)))
  
  # don't want the 32 in the shared library name
@@ -42,9 +27,8 @@ diff -up misc/build/nss-3.13.5/mozilla/security/nss/lib/nss/config.mk.dt misc/bu
  
  RES = $(OBJDIR)/$(LIBRARY_NAME).res.o
  RESNAME = $(LIBRARY_NAME).rc
-diff -up misc/build/nss-3.13.5/mozilla/security/nss/lib/smime/config.mk.dt misc/build/nss-3.13.5/mozilla/security/nss/lib/smime/config.mk
---- misc/build/nss-3.13.5/mozilla/security/nss/lib/smime/config.mk.dt	2012-10-30 12:30:52.020062600 +0100
-+++ misc/build/nss-3.13.5/mozilla/security/nss/lib/smime/config.mk	2012-10-30 12:30:54.504004586 +0100
+--- a/a/a/nss/lib/smime/config.mk.dt	2012-10-30 12:30:52.020062600 +0100
++++ a/a/a/nss/lib/smime/config.mk	2012-10-30 12:30:54.504004586 +0100
 @@ -41,7 +41,7 @@ ifeq (,$(filter-out WIN%,$(OS_TARGET)))
  
  # don't want the 32 in the shared library name
@@ -54,9 +38,8 @@ diff -up misc/build/nss-3.13.5/mozilla/security/nss/lib/smime/config.mk.dt misc/
  
  RES = $(OBJDIR)/smime.res.o
  RESNAME = smime.rc
-diff -up misc/build/nss-3.13.5/mozilla/security/nss/lib/softoken/config.mk.dt misc/build/nss-3.13.5/mozilla/security/nss/lib/softoken/config.mk
---- misc/build/nss-3.13.5/mozilla/security/nss/lib/softoken/config.mk.dt	2012-10-30 12:31:02.707816790 +0100
-+++ misc/build/nss-3.13.5/mozilla/security/nss/lib/softoken/config.mk	2012-10-30 12:31:04.388778631 +0100
+--- a/a/a/nss/lib/softoken/config.mk.dt	2012-10-30 12:31:02.707816790 +0100
++++ a/a/a/nss/lib/softoken/config.mk	2012-10-30 12:31:04.388778631 +0100
 @@ -47,7 +47,7 @@ ifeq (,$(filter-out WIN%,$(OS_TARGET)))
  
  # don't want the 32 in the shared library name
@@ -66,9 +49,8 @@ diff -up misc/build/nss-3.13.5/mozilla/security/nss/lib/softoken/config.mk.dt mi
  
  RES = $(OBJDIR)/$(LIBRARY_NAME).res.o
  RESNAME = $(LIBRARY_NAME).rc
-diff -up misc/build/nss-3.13.5/mozilla/security/nss/lib/softoken/legacydb/config.mk.dt misc/build/nss-3.13.5/mozilla/security/nss/lib/softoken/legacydb/config.mk
---- misc/build/nss-3.13.5/mozilla/security/nss/lib/softoken/legacydb/config.mk.dt	2012-10-30 12:30:56.531958414 +0100
-+++ misc/build/nss-3.13.5/mozilla/security/nss/lib/softoken/legacydb/config.mk	2012-10-30 12:31:00.575865594 +0100
+--- a/a/a/nss/lib/softoken/legacydb/config.mk.dt	2012-10-30 12:30:56.531958414 +0100
++++ a/a/a/nss/lib/softoken/legacydb/config.mk	2012-10-30 12:31:00.575865594 +0100
 @@ -48,7 +48,7 @@ ifeq (,$(filter-out WIN%,$(OS_TARGET)))
  
  # don't want the 32 in the shared library name
@@ -78,9 +60,8 @@ diff -up misc/build/nss-3.13.5/mozilla/security/nss/lib/softoken/legacydb/config
  
  RES = $(OBJDIR)/$(LIBRARY_NAME).res.o
  RESNAME = $(LIBRARY_NAME).rc
-diff -up misc/build/nss-3.13.5/mozilla/security/nss/lib/sqlite/config.mk.dt misc/build/nss-3.13.5/mozilla/security/nss/lib/sqlite/config.mk
---- misc/build/nss-3.13.5/mozilla/security/nss/lib/sqlite/config.mk.dt	2012-10-30 12:31:10.499638736 +0100
-+++ misc/build/nss-3.13.5/mozilla/security/nss/lib/sqlite/config.mk	2012-10-30 12:31:12.624590177 +0100
+--- a/a/a/nss/lib/sqlite/config.mk.dt	2012-10-30 12:31:10.499638736 +0100
++++ a/a/a/nss/lib/sqlite/config.mk	2012-10-30 12:31:12.624590177 +0100
 @@ -41,7 +41,7 @@ ifeq (,$(filter-out WIN%,$(OS_TARGET)))
  
  # don't want the 32 in the shared library name
@@ -90,9 +71,8 @@ diff -up misc/build/nss-3.13.5/mozilla/security/nss/lib/sqlite/config.mk.dt misc
  
  #RES = $(OBJDIR)/$(LIBRARY_NAME).res
  #RESNAME = $(LIBRARY_NAME).rc
-diff -up misc/build/nss-3.13.5/mozilla/security/nss/lib/ssl/config.mk.dt misc/build/nss-3.13.5/mozilla/security/nss/lib/ssl/config.mk
---- misc/build/nss-3.13.5/mozilla/security/nss/lib/ssl/config.mk.dt	2012-10-30 12:31:14.882539495 +0100
-+++ misc/build/nss-3.13.5/mozilla/security/nss/lib/ssl/config.mk	2012-10-30 12:31:16.379504032 +0100
+--- a/a/a/nss/lib/ssl/config.mk.dt	2012-10-30 12:31:14.882539495 +0100
++++ a/a/a/nss/lib/ssl/config.mk	2012-10-30 12:31:16.379504032 +0100
 @@ -53,7 +53,7 @@ ifeq (,$(filter-out WIN%,$(OS_TARGET)))
  
  # don't want the 32 in the shared library name
@@ -102,9 +82,8 @@ diff -up misc/build/nss-3.13.5/mozilla/security/nss/lib/ssl/config.mk.dt misc/bu
  
  RES = $(OBJDIR)/ssl.res.o
  RESNAME = ssl.rc
-diff -up misc/build/nss-3.13.5/mozilla/security/nss/lib/sysinit/config.mk.dt misc/build/nss-3.13.5/mozilla/security/nss/lib/sysinit/config.mk
---- misc/build/nss-3.13.5/mozilla/security/nss/lib/sysinit/config.mk.dt	2012-10-30 12:31:18.195462428 +0100
-+++ misc/build/nss-3.13.5/mozilla/security/nss/lib/sysinit/config.mk	2012-10-30 12:31:20.277414942 +0100
+--- a/a/a/nss/lib/sysinit/config.mk.dt	2012-10-30 12:31:18.195462428 +0100
++++ a/a/a/nss/lib/sysinit/config.mk	2012-10-30 12:31:20.277414942 +0100
 @@ -45,7 +45,7 @@ ifeq (,$(filter-out WIN%,$(OS_TARGET)))
  
  # don't want the 32 in the shared library name
@@ -114,9 +93,8 @@ diff -up misc/build/nss-3.13.5/mozilla/security/nss/lib/sysinit/config.mk.dt mis
  
  #RES = $(OBJDIR)/$(LIBRARY_NAME).res
  #RESNAME = $(LIBRARY_NAME).rc
-diff -up misc/build/nss-3.13.5/mozilla/security/nss/lib/util/config.mk.dt misc/build/nss-3.13.5/mozilla/security/nss/lib/util/config.mk
---- misc/build/nss-3.13.5/mozilla/security/nss/lib/util/config.mk.dt	2012-10-30 12:31:22.179371231 +0100
-+++ misc/build/nss-3.13.5/mozilla/security/nss/lib/util/config.mk	2012-10-30 12:31:24.074328169 +0100
+--- a/a/a/nss/lib/util/config.mk.dt	2012-10-30 12:31:22.179371231 +0100
++++ a/a/a/nss/lib/util/config.mk	2012-10-30 12:31:24.074328169 +0100
 @@ -40,7 +40,7 @@ ifeq (,$(filter-out WIN%,$(OS_TARGET)))
  
  # don't want the 32 in the shared library name
diff --git a/external/nss/nss.patch b/external/nss/nss.patch
index 841685b9c15a..d7f13e537a7d 100644
--- a/external/nss/nss.patch
+++ b/external/nss/nss.patch
@@ -1,5 +1,5 @@
---- misc/nss-3.13.5/mozilla/nsprpub/configure	2010-02-08 19:41:35.000000000 +0100
-+++ misc/build/nss-3.13.5/mozilla/nsprpub/configure	2010-06-11 16:35:54.960188991 +0200
+--- a/a/nspr/configure	2010-02-08 19:41:35.000000000 +0100
++++ b/b/nspr/configure	2010-06-11 16:35:54.960188991 +0200
 @@ -3900,7 +3900,7 @@
      PR_MD_CSRCS=linux.c
      MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
@@ -9,8 +9,8 @@
      _OPTIMIZE_FLAGS=-O2
      _DEBUG_FLAGS="-g -fno-inline"  # most people on linux use gcc/gdb, and that
                                     # combo is not yet good at debugging inlined
---- misc/nss-3.13.5/mozilla/security/coreconf/Darwin.mk	2010-02-04 19:59:10.000000000 +0100
-+++ misc/build/nss-3.13.5/mozilla/security/coreconf/Darwin.mk	2010-06-11 16:35:54.966185975 +0200
+--- a/a/nss/coreconf/Darwin.mk	2010-02-04 19:59:10.000000000 +0100
++++ b/b/nss/coreconf/Darwin.mk	2010-06-11 16:35:54.966185975 +0200
 @@ -39,8 +39,12 @@
  
  DEFAULT_COMPILER = gcc
@@ -52,8 +52,8 @@
  endif
  endif
  
---- misc/nss-3.13.5/mozilla/security/coreconf/FreeBSD.mk	2009-11-23 05:06:29.000000000 -0500
-+++ misc/build/nss-3.13.5/mozilla/security/coreconf/FreeBSD.mk	2012-08-28 20:27:20.000000000 -0400
+--- a/a/nss/coreconf/FreeBSD.mk	2009-11-23 05:06:29.000000000 -0500
++++ b/b/nss/coreconf/FreeBSD.mk	2012-08-28 20:27:20.000000000 -0400
 @@ -57,6 +57,7 @@
  
  DSO_CFLAGS		= -fPIC
@@ -62,8 +62,8 @@
  
  #
  # The default implementation strategy for FreeBSD is pthreads.
---- misc/nss-3.13.5/mozilla/security/coreconf/Linux.mk	2010-01-15 23:19:00.000000000 +0100
-+++ misc/build/nss-3.13.5/mozilla/security/coreconf/Linux.mk	2010-06-11 16:35:54.981151732 +0200
+--- a/a/nss/coreconf/Linux.mk	2010-01-15 23:19:00.000000000 +0100
++++ b/b/nss/coreconf/Linux.mk	2010-06-11 16:35:54.981151732 +0200
 @@ -46,8 +46,11 @@
  	IMPL_STRATEGY = _PTH
  endif
@@ -101,8 +101,8 @@
  
  # The -rpath '$$ORIGIN' linker option instructs this library to search for its
  # dependencies in the same directory where it resides.
---- misc/nss-3.13.5/mozilla/security/coreconf/SunOS5.mk	2009-06-11 02:55:32.000000000 +0200
-+++ misc/build/nss-3.13.5/mozilla/security/coreconf/SunOS5.mk	2010-06-11 16:35:54.985571182 +0200
+--- a/a/nss/coreconf/SunOS5.mk	2009-06-11 02:55:32.000000000 +0200
++++ b/b/nss/coreconf/SunOS5.mk	2010-06-11 16:35:54.985571182 +0200
 @@ -89,8 +89,12 @@
  	    # OPTIMIZER += -mno-omit-leaf-frame-pointer -fno-omit-frame-pointer
  	endif
@@ -118,8 +118,8 @@
  	ASFLAGS   += -Wa,-P
  	OS_CFLAGS += $(NOMD_OS_CFLAGS) $(ARCHFLAG)
  	ifndef BUILD_OPT
---- misc/nss-3.13.5/mozilla/security/coreconf/arch.mk	2009-06-05 04:14:49.000000000 +0200
-+++ misc/build/nss-3.13.5/mozilla/security/coreconf/arch.mk	2010-06-11 16:35:54.990913282 +0200
+--- a/a/nss/coreconf/arch.mk	2009-06-05 04:14:49.000000000 +0200
++++ b/b/nss/coreconf/arch.mk	2010-06-11 16:35:54.990913282 +0200
 @@ -324,10 +324,15 @@
  # IMPL_STRATEGY may be defined too.
  #
@@ -138,8 +138,8 @@
  #
  # Define USE_DEBUG_RTL if you want to use the debug runtime library
  # (RTL) in the debug build
---- misc/nss-3.13.5/mozilla/security/coreconf/rules.mk
-+++ misc/build/nss-3.13.5/mozilla/security/coreconf/rules.mk
+--- a/a/nss/coreconf/rules.mk
++++ b/b/nss/coreconf/rules.mk
 @@ -293,7 +293,7 @@
  ifeq (,$(filter-out _WIN%,$(NS_USE_GCC)_$(OS_TARGET)))
  	$(AR) $(subst /,\\,$(OBJS))
@@ -149,29 +149,25 @@
  endif
  	$(RANLIB) $@
  
---- misc/nss-3.13.5/mozilla/security/nss/Makefile
-+++ misc/build/nss-3.13.5/mozilla/security/nss/Makefile
-@@ 1,0 +1,0 @@
+--- a/a/nss/Makefile
++++ b/b/nss/Makefile
+@@ -1,3 +1,5 @@
 +export AR
 +export RANLIB
  #! gmake
  #
- # ***** BEGIN LICENSE BLOCK *****
---- misc/nss-3.13.5/mozilla/security/nss/cmd/platlibs.mk	2010-02-04 19:59:10.000000000 +0100
-+++ misc/build/nss-3.13.5/mozilla/security/nss/cmd/platlibs.mk	2010-06-11 16:35:55.004869805 +0200
-@@ -41,27 +41,32 @@
+ # This Source Code Form is subject to the terms of the Mozilla Public
+--- a/a/nss/cmd/platlibs.mk	2010-02-04 19:59:10.000000000 +0100
++++ b/b/nss/cmd/platlibs.mk	2010-06-11 16:35:55.004869805 +0200
+@@ -41,17 +41,22 @@
+ 
  ifeq ($(OS_ARCH), SunOS) 
- ifeq ($(BUILD_SUN_PKG), 1)
  ifeq ($(USE_64), 1)
 -EXTRA_SHARED_LIBS += -R '$$ORIGIN/../lib:/usr/lib/mps/secv1/64:/usr/lib/mps/64'
 +#In OOo we would probable put the executables next to libs
 +EXTRA_SHARED_LIBS += -R '$$ORIGIN'
  else
 -EXTRA_SHARED_LIBS += -R '$$ORIGIN/../lib:/usr/lib/mps/secv1:/usr/lib/mps'
-+EXTRA_SHARED_LIBS += -R '$$ORIGIN'
- endif
- else
--EXTRA_SHARED_LIBS += -R '$$ORIGIN/../lib'
 +EXTRA_SHARED_LIBS += -R '$$ORIGIN'
  endif
  endif
@@ -181,26 +177,17 @@
 +endif
 +
  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,-z,origin -Wl,-rpath,'$$ORIGIN'
  else
 -EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib:/opt/sun/private/lib'
 +EXTRA_SHARED_LIBS += -Wl,-z,origin -Wl,-rpath,'$$ORIGIN'
- endif
- else
- ifeq ($(USE_64), 1)
--EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:$$ORIGIN/../lib'
-+EXTRA_SHARED_LIBS += -Wl,-z,origin -Wl,-rpath,'$$ORIGIN'
- else
--EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib'
-+EXTRA_SHARED_LIBS += -Wl,-z,origin -Wl,-rpath,'$$ORIGIN'
- endif
  endif
  endif
---- misc/nss-3.13.5/mozilla/security/coreconf/Darwin.mk
-+++ misc/build/nss-3.13.5/mozilla/security/coreconf/Darwin.mk
+ 
+--- a/a/nss/coreconf/Darwin.mk
++++ b/b/nss/coreconf/Darwin.mk
 @@ -64,12 +64,16 @@
  endif
  
diff --git a/external/nss/nss.wheader-guard.patch.0 b/external/nss/nss.wheader-guard.patch.0
deleted file mode 100644
index a5d4060392ce..000000000000
--- a/external/nss/nss.wheader-guard.patch.0
+++ /dev/null
@@ -1,11 +0,0 @@
---- mozilla/security/nss/lib/pk11wrap/secmod.h
-+++ mozilla/security/nss/lib/pk11wrap/secmod.h
-@@ -34,7 +34,7 @@
-  *
-  * ***** END LICENSE BLOCK ***** */
- #ifndef _SECMOD_H_
--#define _SEDMOD_H_
-+#define _SECMOD_H_
- #include "seccomon.h"
- #include "secmodt.h"
- #include "prinrval.h"
diff --git a/external/nss/nss.windows.patch b/external/nss/nss.windows.patch
index 0d4ce1b5baea..e94b3dd69863 100644
--- a/external/nss/nss.windows.patch
+++ b/external/nss/nss.windows.patch
@@ -1,5 +1,5 @@
---- misc/nss-3.13.5/mozilla/nsprpub/config/rules.mk	2008-12-03 00:24:39.000000000 +0100
-+++ misc/build/nss-3.13.5/mozilla/nsprpub/config/rules.mk	2009-11-27 13:36:22.662753328 +0100
+--- a/a/nspr/config/rules.mk	2008-12-03 00:24:39.000000000 +0100
++++ b/b/nspr/config/rules.mk	2009-11-27 13:36:22.662753328 +0100
 @@ -415,7 +415,7 @@
  
  ifdef NEED_ABSOLUTE_PATH
@@ -9,8 +9,8 @@
  endif
  
  $(OBJDIR)/%.$(OBJ_SUFFIX): %.cpp
---- misc/nss-3.13.5/mozilla/security/coreconf/rules.mk	2008-12-03 00:24:39.000000000 +0100
-+++ misc/build/nss-3.13.5/mozilla/security/coreconf/rules.mk	2009-11-27 13:36:22.662753328 +0100
+--- a/a/nss/coreconf/rules.mk	2008-12-03 00:24:39.000000000 +0100
++++ b/b/nss/coreconf/rules.mk	2009-11-27 13:36:22.662753328 +0100
 @@ -411,7 +411,7 @@
  endif
  
diff --git a/external/nss/nss_macosx.patch b/external/nss/nss_macosx.patch
index 102e9a322fdc..ce64074b6336 100644
--- a/external/nss/nss_macosx.patch
+++ b/external/nss/nss_macosx.patch
@@ -1,5 +1,5 @@
---- misc/nss-3.13.5/mozilla/security/nss/Makefile	2008-12-03 00:24:39.000000000 +0100
-+++ misc/build/nss-3.13.5/mozilla/security/nss/Makefile	2009-11-27 13:36:22.662753328 +0100
+--- a/a/nss/Makefile	2008-12-03 00:24:39.000000000 +0100
++++ b/b/nss/Makefile	2009-11-27 13:36:22.662753328 +0100
 @@ -104,6 +104,9 @@
  ifeq ($(OS_TARGET),WIN95)
  NSPR_CONFIGURE_OPTS += --enable-win32-target=WIN95
@@ -10,8 +10,8 @@
  ifdef USE_DEBUG_RTL
  NSPR_CONFIGURE_OPTS += --enable-debug-rtl
  endif
---- misc/nss-3.13.5/mozilla/nsprpub/configure
-+++ misc/build/nss-3.13.5/mozilla/nsprpub/configure
+--- a/a/nspr/configure
++++ b/b/nspr/configure
 @@ -3888,7 +3889,7 @@
  fi
  
@@ -21,8 +21,8 @@
      _OPTIMIZE_FLAGS=-O2
      MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
      STRIP="$STRIP -x -S"
---- misc/nss-3.13.5/mozilla/nsprpub/lib/ds/Makefile.in
-+++ misc/build/nss-3.13.5/mozilla/nsprpub/lib/ds/Makefile.in
+--- a/a/nspr/lib/ds/Makefile.in
++++ b/b/nspr/lib/ds/Makefile.in
 @@ -143,7 +143,7 @@
  
  export:: $(TARGETS)
@@ -32,8 +32,8 @@
  ifdef SHARED_LIBRARY
  ifeq ($(OS_ARCH),HP-UX)
  	$(INSTALL) -m 755 $(SHARED_LIBRARY) $(dist_libdir)
---- misc/nss-3.13.5/mozilla/nsprpub/lib/libc/src/Makefile.in
-+++ misc/build/nss-3.13.5/mozilla/nsprpub/lib/libc/src/Makefile.in
+--- a/a/nspr/lib/libc/src/Makefile.in
++++ b/b/nspr/lib/libc/src/Makefile.in
 @@ -144,7 +144,7 @@
  #
  
@@ -43,8 +43,8 @@
  ifdef SHARED_LIBRARY
  ifeq ($(OS_ARCH),HP-UX)
  	$(INSTALL) -m 755 $(SHARED_LIBRARY) $(dist_libdir)
---- misc/nss-3.13.5/mozilla/nsprpub/pr/src/Makefile.in
-+++ misc/build/nss-3.13.5/mozilla/nsprpub/pr/src/Makefile.in
+--- a/a/nspr/pr/src/Makefile.in
++++ b/b/nspr/pr/src/Makefile.in
 @@ -365,7 +365,7 @@
  #
  
@@ -54,8 +54,8 @@
  ifdef SHARED_LIBRARY
  ifeq ($(OS_ARCH),HP-UX)
  	$(INSTALL) -m 755 $(SHARED_LIBRARY) $(dist_libdir)
---- misc/nss-3.13.5/mozilla/security/coreconf/Darwin.mk
-+++ misc/build/nss-3.13.5/mozilla/security/coreconf/Darwin.mk
+--- a/a/nss/coreconf/Darwin.mk
++++ b/b/nss/coreconf/Darwin.mk
 @@ -150,7 +150,7 @@
  # May override this with different compatibility and current version numbers.
  DARWIN_DYLIB_VERSIONS = -compatibility_version 1 -current_version 1
@@ -65,14 +65,3 @@
  
  MKSHLIB		= $(CC) $(DSO_LDOPTS) $(DARWIN_SDK_SHLIBFLAGS)
  DLL_SUFFIX	= dylib
---- misc/nss-3.13.5/mozilla/security/coreconf/rules.mk
-+++ misc/build/nss-3.13.5/mozilla/security/coreconf/rules.mk
-@@ -342,7 +342,7 @@
- 	chmod +x $@
- ifeq ($(OS_TARGET),Darwin)
- ifdef MAPFILE
--	nmedit -s $(MAPFILE) $@
-+	$(NMEDIT) -s $(MAPFILE) $@
- endif
- endif
- endif
diff --git a/external/openldap/ExternalProject_openldap.mk b/external/openldap/ExternalProject_openldap.mk
index 36c844c0b6d5..10de51fbfe42 100644
--- a/external/openldap/ExternalProject_openldap.mk
+++ b/external/openldap/ExternalProject_openldap.mk
@@ -32,9 +32,9 @@ $(call gb_ExternalProject_get_state_target,openldap,build) :
 			$(if $(filter YES,$(SYSTEM_NSS)), \
 				CPPFLAGS="$(NSS_CFLAGS)" CFLAGS="$(NSS_CFLAGS)" LDFLAGS="$(NSS_LIBS)" \
 				, \
-				CPPFLAGS="-I$(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/public/nss -I$(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/include" \
-				CFLAGS="-I$(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/public/nss -I$(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/include" \
-				LDFLAGS="-L$(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/lib $(if $(filter AIX,$(OS)),-Wl$(COMMA)-brtl)" \
+				CPPFLAGS="-I$(call gb_UnpackedTarball_get_dir,nss)/dist/public/nss -I$(call gb_UnpackedTarball_get_dir,nss)/dist/out/include" \
+				CFLAGS="-I$(call gb_UnpackedTarball_get_dir,nss)/dist/public/nss -I$(call gb_UnpackedTarball_get_dir,nss)/dist/out/include" \
+				LDFLAGS="-L$(call gb_UnpackedTarball_get_dir,nss)/dist/out/lib $(if $(filter AIX,$(OS)),-Wl$(COMMA)-brtl)" \
 			) \
 		&& MAKEFLAGS= && $(MAKE) \
 	)
diff --git a/external/postgresql/ExternalProject_postgresql.mk b/external/postgresql/ExternalProject_postgresql.mk
index afa7ff3162b7..3afa7b80ff28 100644
--- a/external/postgresql/ExternalProject_postgresql.mk
+++ b/external/postgresql/ExternalProject_postgresql.mk
@@ -45,7 +45,7 @@ postgresql_LDFLAGS  += \
 	-L$(call gb_UnpackedTarball_get_dir,openldap)/libraries/libldap/.libs \
 	-L$(call gb_UnpackedTarball_get_dir,openldap)/libraries/liblber/.libs \
 	$(if $(filter NO,$(SYSTEM_NSS)),\
-		-L$(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/lib) \
+		-L$(call gb_UnpackedTarball_get_dir,nss)/dist/out/lib) \
 
 endif
 
-- 
cgit v1.2.3