CWS-TOOLING: integrate CWS jl143_DEV300

2 files changed, 22 insertions, 21 deletions

diff --git a/nss/makefile.mk b/nss/makefile.mk
index 2123c36b57a1..04adb4c35456 100644
--- a/nss/makefile.mk
+++ b/nss/makefile.mk
@@ -45,7 +45,7 @@ all:
     @echo "NSS will not be built. ENABLE_NSS_MODULE is '$(ENABLE_NSS_MODULE)'"
 .ENDIF	
 
-TARFILE_NAME=nss_3_12_4
+TARFILE_NAME=nss_3_12_5
 TARFILE_ROOTDIR=mozilla
 PATCH_FILES=nss.patch dtoa.patch
     # Note: dtoa.patch fixes https://bugzilla.mozilla.org/show_bug.cgi?id=516396. It can be removed as soon as
diff --git a/nss/nss.patch b/nss/nss.patch
index 32831ea29d52..9605e0d64b1e 100644
--- a/nss/nss.patch
+++ b/nss/nss.patch
@@ -1,5 +1,5 @@
---- misc/mozilla/nsprpub/config/rules.mk	2009-05-02 01:08:01.000000000 +0200
-+++ misc/build/mozilla/nsprpub/config/rules.mk	2009-10-20 17:03:24.733286198 +0200
+--- misc/mozilla/nsprpub/config/rules.mk	Sat May  2 01:08:01 2009
++++ misc/build/mozilla/nsprpub/config/rules.mk	Wed Nov 25 08:06:47 2009
 @@ -350,7 +350,12 @@
  ifdef NS_USE_GCC
  	$(RC) $(RCFLAGS) $(filter-out -U%,$(DEFINES)) $(INCLUDES:-I%=--include-dir %) -o $@ $<
@@ -14,9 +14,9 @@
  endif # GCC
  	@echo $(RES) finished
  endif
---- misc/mozilla/nsprpub/configure	2009-05-08 15:12:31.000000000 +0200
-+++ misc/build/mozilla/nsprpub/configure	2009-10-20 17:03:24.759501457 +0200
-@@ -3898,7 +3898,7 @@
+--- misc/mozilla/nsprpub/configure	Mon Nov 23 11:44:15 2009
++++ misc/build/mozilla/nsprpub/configure	Wed Nov 25 08:06:47 2009
+@@ -3899,7 +3899,7 @@
      PR_MD_CSRCS=linux.c
      MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
      DSO_CFLAGS=-fPIC
@@ -25,8 +25,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/mozilla/security/coreconf/Darwin.mk	2009-07-30 23:36:02.000000000 +0200
-+++ misc/build/mozilla/security/coreconf/Darwin.mk	2009-10-20 17:03:24.767804881 +0200
+--- misc/mozilla/security/coreconf/Darwin.mk	Thu Jul 30 23:36:02 2009
++++ misc/build/mozilla/security/coreconf/Darwin.mk	Wed Nov 25 08:06:47 2009
 @@ -39,8 +39,12 @@
  
  DEFAULT_COMPILER = cc
@@ -42,8 +42,8 @@
  RANLIB		= ranlib
  
  ifndef CPU_ARCH
---- misc/mozilla/security/coreconf/Linux.mk	2009-07-30 01:43:41.000000000 +0200
-+++ misc/build/mozilla/security/coreconf/Linux.mk	2009-10-20 17:04:09.972612751 +0200
+--- misc/mozilla/security/coreconf/Linux.mk	Mon Nov 23 11:06:29 2009
++++ misc/build/mozilla/security/coreconf/Linux.mk	Wed Nov 25 08:11:35 2009
 @@ -46,8 +46,11 @@
  	IMPL_STRATEGY = _PTH
  endif
@@ -64,10 +64,10 @@
  ZDEFS_FLAG		= -Wl,-z,defs
 -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,-rpath,$$ORIGIN'
- DSO_LDFLAGS		=
  LDFLAGS			+= $(ARCHFLAG)
  
-@@ -161,8 +164,13 @@
+ # INCLUDES += -I/usr/include -Y/usr/include/linux
+@@ -160,8 +163,13 @@
  #
  CPU_TAG = _$(CPU_ARCH)
  
@@ -81,8 +81,8 @@
  
  # The -rpath '$$ORIGIN' linker option instructs this library to search for its
  # dependencies in the same directory where it resides.
---- misc/mozilla/security/coreconf/SunOS5.mk	2009-06-11 02:55:32.000000000 +0200
-+++ misc/build/mozilla/security/coreconf/SunOS5.mk	2009-10-20 17:03:24.786509911 +0200
+--- misc/mozilla/security/coreconf/SunOS5.mk	Thu Jun 11 02:55:32 2009
++++ misc/build/mozilla/security/coreconf/SunOS5.mk	Wed Nov 25 08:06:47 2009
 @@ -89,8 +89,12 @@
  	    # OPTIMIZER += -mno-omit-leaf-frame-pointer -fno-omit-frame-pointer
  	endif
@@ -98,8 +98,8 @@
  	ASFLAGS   += -Wa,-P
  	OS_CFLAGS += $(NOMD_OS_CFLAGS) $(ARCHFLAG)
  	ifndef BUILD_OPT
---- misc/mozilla/security/coreconf/arch.mk	2009-06-05 04:14:49.000000000 +0200
-+++ misc/build/mozilla/security/coreconf/arch.mk	2009-10-20 17:03:24.807236644 +0200
+--- misc/mozilla/security/coreconf/arch.mk	Fri Jun  5 04:14:49 2009
++++ misc/build/mozilla/security/coreconf/arch.mk	Wed Nov 25 08:06:47 2009
 @@ -324,7 +324,12 @@
  # IMPL_STRATEGY may be defined too.
  #
@@ -114,8 +114,8 @@
  
  ifeq (,$(filter-out WIN%,$(OS_TARGET)))
  ifndef BUILD_OPT
---- misc/mozilla/security/coreconf/rules.mk	2009-08-11 05:23:39.000000000 +0200
-+++ misc/build/mozilla/security/coreconf/rules.mk	2009-10-20 17:03:24.815121351 +0200
+--- misc/mozilla/security/coreconf/rules.mk	Tue Aug 11 05:23:39 2009
++++ misc/build/mozilla/security/coreconf/rules.mk	Wed Nov 25 08:06:47 2009
 @@ -355,7 +355,12 @@
  ifdef NS_USE_GCC
  	$(RC) $(filter-out -U%,$(DEFINES)) $(INCLUDES:-I%=--include-dir %) -o $@ $<
@@ -130,9 +130,9 @@
  endif
  	@echo $(RES) finished
  endif
---- misc/mozilla/security/nss/cmd/platlibs.mk	2009-06-18 01:01:48.000000000 +0200
-+++ misc/build/mozilla/security/nss/cmd/platlibs.mk	2009-10-20 17:03:24.831220397 +0200
-@@ -41,27 +41,28 @@
+--- misc/mozilla/security/nss/cmd/platlibs.mk	Thu Jun 18 01:01:48 2009
++++ misc/build/mozilla/security/nss/cmd/platlibs.mk	Wed Nov 25 08:06:47 2009
+@@ -41,12 +41,13 @@
  ifeq ($(OS_ARCH), SunOS) 
  ifeq ($(BUILD_SUN_PKG), 1)
  ifeq ($(USE_64), 1)
@@ -149,6 +149,7 @@
  endif
  endif
  
+@@ -53,15 +54,15 @@
  ifeq ($(OS_ARCH), Linux)
  ifeq ($(BUILD_SUN_PKG), 1)
  ifeq ($(USE_64), 1)