From 4af1e50d4b652c4ae5622c85cd0fb260a00ae4d0 Mon Sep 17 00:00:00 2001 From: Joachim Lingner Date: Mon, 14 Jun 2010 14:13:16 +0200 Subject: jl153 #i111877# updating nss libraries --- nss/makefile.mk | 58 ++++++++++++++++++++++++++-------------------------- nss/nss.patch | 47 +++++++++++++++++++++--------------------- nss/nss.patch.mingw | 44 +++++++++++++++++++-------------------- nss/nss_macosx.patch | 4 ++-- 4 files changed, 76 insertions(+), 77 deletions(-) (limited to 'nss') diff --git a/nss/makefile.mk b/nss/makefile.mk index 78de2a9afbf3..22b126a43c57 100644 --- a/nss/makefile.mk +++ b/nss/makefile.mk @@ -41,9 +41,9 @@ all: @echo "NSS will not be built. ENABLE_NSS_MODULE is '$(ENABLE_NSS_MODULE)'" .ENDIF -TARFILE_NAME=nss_3_12_5 -TARFILE_MD5=6244eb0b6e2647ee50470951fa6efb47 -TARFILE_ROOTDIR=mozilla +TARFILE_NAME=nss-3.12.6-with-nspr-4.8.4 +TARFILE_MD5=b92261a5679276c400555004937af965 +TARFILE_ROOTDIR=nss-3.12.6 PATCH_FILES=nss.patch .IF "$(OS)"=="MACOSX" @@ -83,9 +83,9 @@ MACOS_SDK_DIR*=$(MACDEVSDK) .ENDIF # "$(EXTRA_CFLAGS)"!="" .ENDIF # "$(OS)"=="MACOSX" -OUT2LIB=dist$/out$/lib$/*$(DLLPOST) +OUT2LIB=mozilla$/dist$/out$/lib$/*$(DLLPOST) -BUILD_DIR=security$/nss +BUILD_DIR=mozilla$/security$/nss BUILD_ACTION= $(GNUMAKE) nss_build_all #See #i105566# && moz#513024# .IF "$(OS)"=="LINUX" @@ -117,20 +117,20 @@ nss_LIBS+=-lstdc++_s .ENDIF -BUILD_DIR=security$/nss +BUILD_DIR=mozilla$/security$/nss BUILD_ACTION=NS_USE_GCC=1 CC="$(nss_CC)" CXX="$(nss_CXX)" OS_LIBS="$(nss_LIBS)" OS_TARGET=WIN95 _WIN32_IE=0x500 PATH="$(PATH)" DEFINES=-D_WIN32_IE=0x500 $(GNUMAKE) nss_build_all OUT2LIB= \ - dist$/out$/lib$/libnspr4.a \ - dist$/out$/lib$/libnss3.a \ - dist$/out$/lib$/libnssdbm3.a \ - dist$/out$/lib$/libnssutil3.a \ - dist$/out$/lib$/libplc4.a \ - dist$/out$/lib$/libplds4.a \ - dist$/out$/lib$/libsmime3.a \ - dist$/out$/lib$/libsoftokn3.a \ - dist$/out$/lib$/libsqlite3.a \ - dist$/out$/lib$/libssl3.a + mozilla$/dist$/out$/lib$/libnspr4.a \ + mozilla$/dist$/out$/lib$/libnss3.a \ + mozilla$/dist$/out$/lib$/libnssdbm3.a \ + mozilla$/dist$/out$/lib$/libnssutil3.a \ + mozilla$/dist$/out$/lib$/libplc4.a \ + mozilla$/dist$/out$/lib$/libplds4.a \ + mozilla$/dist$/out$/lib$/libsmime3.a \ + mozilla$/dist$/out$/lib$/libsoftokn3.a \ + mozilla$/dist$/out$/lib$/libsqlite3.a \ + mozilla$/dist$/out$/lib$/libssl3.a .ELSE # "$(COM)"=="GCC" MOZ_MSVCVERSION= 9 @@ -151,29 +151,29 @@ EXT_USE_STLPORT=TRUE #To build nss one has to call "make nss_build_all" in #mozilla/security/nss -NSS_BUILD_DIR= $(subst,\,/ $(PWD)/$(MISC)/build/mozilla/security/nss) +NSS_BUILD_DIR= $(subst,\,/ $(PWD)/$(MISC)/build/$(TARFILE_ROOTDIR)/mozilla/security/nss) BUILD_ACTION= $(subst,/,$/ $(MOZILLABUILD)/msys/bin/bash) -i \ -c "cd $(NSS_BUILD_DIR) && make nss_build_all" OUT2LIB= \ - dist$/out$/lib$/nspr4.lib \ - dist$/out$/lib$/nss3.lib \ - dist$/out$/lib$/nssdbm3.lib \ - dist$/out$/lib$/nssutil3.lib \ - dist$/out$/lib$/plc4.lib \ - dist$/out$/lib$/plds4.lib \ - dist$/out$/lib$/smime3.lib \ - dist$/out$/lib$/softokn3.lib \ - dist$/out$/lib$/sqlite3.lib \ - dist$/out$/lib$/ssl3.lib + mozilla$/dist$/out$/lib$/nspr4.lib \ + mozilla$/dist$/out$/lib$/nss3.lib \ + mozilla$/dist$/out$/lib$/nssdbm3.lib \ + mozilla$/dist$/out$/lib$/nssutil3.lib \ + mozilla$/dist$/out$/lib$/plc4.lib \ + mozilla$/dist$/out$/lib$/plds4.lib \ + mozilla$/dist$/out$/lib$/smime3.lib \ + mozilla$/dist$/out$/lib$/softokn3.lib \ + mozilla$/dist$/out$/lib$/sqlite3.lib \ + mozilla$/dist$/out$/lib$/ssl3.lib .ENDIF # "$(COM)"=="GCC" -OUT2BIN=dist$/out$/lib$/*$(DLLPOST) +OUT2BIN=mozilla$/dist$/out$/lib$/*$(DLLPOST) .ENDIF # "$(GUI)"=="WNT" -OUTDIR2INC=dist$/public$/nss dist$/out$/include +OUTDIR2INC=mozilla$/dist$/public$/nss mozilla$/dist$/out$/include # --- Targets ------------------------------------------------------ diff --git a/nss/nss.patch b/nss/nss.patch index a6ce16071919..b5f871dd1ecc 100644 --- a/nss/nss.patch +++ b/nss/nss.patch @@ -1,6 +1,6 @@ ---- 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 @@ +--- misc/nss-3.12.6/mozilla/nsprpub/config/rules.mk 2009-12-09 22:24:37.000000000 +0100 ++++ misc/build/nss-3.12.6/mozilla/nsprpub/config/rules.mk 2010-06-11 16:35:54.946870871 +0200 +@@ -345,7 +345,12 @@ ifdef NS_USE_GCC $(RC) $(RCFLAGS) $(filter-out -U%,$(DEFINES)) $(INCLUDES:-I%=--include-dir %) -o $@ $< else @@ -14,9 +14,9 @@ endif # GCC @echo $(RES) finished endif ---- 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 @@ +--- misc/nss-3.12.6/mozilla/nsprpub/configure 2010-02-08 19:41:35.000000000 +0100 ++++ misc/build/nss-3.12.6/mozilla/nsprpub/configure 2010-06-11 16:35:54.960188991 +0200 +@@ -3900,7 +3900,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 Thu Jul 30 23:36:02 2009 -+++ misc/build/mozilla/security/coreconf/Darwin.mk Wed Nov 25 08:06:47 2009 +--- misc/nss-3.12.6/mozilla/security/coreconf/Darwin.mk 2010-02-04 19:59:10.000000000 +0100 ++++ misc/build/nss-3.12.6/mozilla/security/coreconf/Darwin.mk 2010-06-11 16:35:54.966185975 +0200 @@ -39,8 +39,12 @@ DEFAULT_COMPILER = cc @@ -42,8 +42,8 @@ RANLIB = ranlib ifndef CPU_ARCH ---- 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 +--- misc/nss-3.12.6/mozilla/security/coreconf/Linux.mk 2010-01-15 23:19:00.000000000 +0100 ++++ misc/build/nss-3.12.6/mozilla/security/coreconf/Linux.mk 2010-06-11 16:35:54.981151732 +0200 @@ -46,8 +46,11 @@ IMPL_STRATEGY = _PTH endif @@ -58,7 +58,7 @@ RANLIB = ranlib DEFAULT_COMPILER = gcc -@@ -149,7 +152,7 @@ +@@ -147,7 +150,7 @@ # incorrectly reports undefined references in the libraries we link with, so # we don't use -z defs there. ZDEFS_FLAG = -Wl,-z,defs @@ -67,7 +67,7 @@ LDFLAGS += $(ARCHFLAG) # INCLUDES += -I/usr/include -Y/usr/include/linux -@@ -160,8 +163,13 @@ +@@ -158,8 +161,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 Thu Jun 11 02:55:32 2009 -+++ misc/build/mozilla/security/coreconf/SunOS5.mk Wed Nov 25 08:06:47 2009 +--- misc/nss-3.12.6/mozilla/security/coreconf/SunOS5.mk 2009-06-11 02:55:32.000000000 +0200 ++++ misc/build/nss-3.12.6/mozilla/security/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 @@ -98,8 +98,8 @@ ASFLAGS += -Wa,-P OS_CFLAGS += $(NOMD_OS_CFLAGS) $(ARCHFLAG) ifndef BUILD_OPT ---- 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 +--- misc/nss-3.12.6/mozilla/security/coreconf/arch.mk 2009-06-05 04:14:49.000000000 +0200 ++++ misc/build/nss-3.12.6/mozilla/security/coreconf/arch.mk 2010-06-11 16:35:54.990913282 +0200 @@ -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 Tue Aug 11 05:23:39 2009 -+++ misc/build/mozilla/security/coreconf/rules.mk Wed Nov 25 08:06:47 2009 +--- misc/nss-3.12.6/mozilla/security/coreconf/rules.mk 2009-12-08 02:33:36.000000000 +0100 ++++ misc/build/nss-3.12.6/mozilla/security/coreconf/rules.mk 2010-06-11 16:35:54.996448704 +0200 @@ -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 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 @@ +--- misc/nss-3.12.6/mozilla/security/nss/cmd/platlibs.mk 2010-02-04 19:59:10.000000000 +0100 ++++ misc/build/nss-3.12.6/mozilla/security/nss/cmd/platlibs.mk 2010-06-11 16:35:55.004869805 +0200 +@@ -41,27 +41,28 @@ ifeq ($(OS_ARCH), SunOS) ifeq ($(BUILD_SUN_PKG), 1) ifeq ($(USE_64), 1) @@ -149,7 +149,6 @@ endif endif -@@ -53,15 +54,15 @@ ifeq ($(OS_ARCH), Linux) ifeq ($(BUILD_SUN_PKG), 1) ifeq ($(USE_64), 1) @@ -169,8 +168,8 @@ endif endif endif ---- misc/mozilla/security/nss/cmd/shlibsign/Makefile Fri Aug 7 21:06:37 2009 -+++ misc/build/mozilla/security/nss/cmd/shlibsign/Makefile Fri Nov 27 13:07:52 2009 +--- misc/nss-3.12.6/mozilla/security/nss/cmd/shlibsign/Makefile 2009-08-07 21:06:37.000000000 +0200 ++++ misc/build/nss-3.12.6/mozilla/security/nss/cmd/shlibsign/Makefile 2010-06-11 16:35:55.009851148 +0200 @@ -78,10 +78,15 @@ # sign any and all shared libraries that contain the word freebl diff --git a/nss/nss.patch.mingw b/nss/nss.patch.mingw index bead79548d6e..01a9ff4e713d 100644 --- a/nss/nss.patch.mingw +++ b/nss/nss.patch.mingw @@ -1,5 +1,5 @@ ---- misc/mozilla/nsprpub/config/autoconf.mk.in 2009-03-03 23:04:23.000000000 +0100 -+++ misc/build/mozilla/nsprpub/config/autoconf.mk.in 2009-09-18 17:24:12.042630830 +0200 +--- misc/nss-3.12.6/mozilla/nsprpub/config/autoconf.mk.in 2009-03-03 23:04:23.000000000 +0100 ++++ misc/build/nss-3.12.6/mozilla/nsprpub/config/autoconf.mk.in 2009-09-18 17:24:12.042630830 +0200 @@ -22,6 +22,7 @@ RELEASE_OBJDIR_NAME = @RELEASE_OBJDIR_NAME@ OBJDIR_NAME = @OBJDIR_NAME@ @@ -8,8 +8,8 @@ OBJ_SUFFIX = @OBJ_SUFFIX@ LIB_SUFFIX = @LIB_SUFFIX@ DLL_SUFFIX = @DLL_SUFFIX@ ---- misc/mozilla/nsprpub/config/rules.mk 2009-05-02 01:08:01.000000000 +0200 -+++ misc/build/mozilla/nsprpub/config/rules.mk 2009-09-18 17:24:52.422809433 +0200 +--- misc/nss-3.12.6/mozilla/nsprpub/config/rules.mk 2009-05-02 01:08:01.000000000 +0200 ++++ misc/build/nss-3.12.6/mozilla/nsprpub/config/rules.mk 2009-09-18 17:24:52.422809433 +0200 @@ -113,9 +113,9 @@ # other platforms do not. # @@ -22,8 +22,8 @@ SHARED_LIB_PDB = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).pdb else LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION)_s.$(LIB_SUFFIX) ---- misc/mozilla/nsprpub/configure 2009-05-08 15:12:31.000000000 +0200 -+++ misc/build/mozilla/nsprpub/configure 2009-09-18 17:25:50.277803372 +0200 +--- misc/nss-3.12.6/mozilla/nsprpub/configure 2009-05-08 15:12:31.000000000 +0200 ++++ misc/build/nss-3.12.6/mozilla/nsprpub/configure 2009-09-18 17:25:50.277803372 +0200 @@ -2770,6 +2770,7 @@ LIB_SUFFIX=a DLL_SUFFIX=so @@ -48,8 +48,8 @@ s%@MKSHLIB@%$MKSHLIB%g s%@DSO_CFLAGS@%$DSO_CFLAGS%g s%@DSO_LDOPTS@%$DSO_LDOPTS%g ---- misc/mozilla/nsprpub/pr/src/Makefile.in 2009-02-04 23:47:01.000000000 +0100 -+++ misc/build/mozilla/nsprpub/pr/src/Makefile.in 2009-09-18 17:26:33.544145410 +0200 +--- misc/nss-3.12.6/mozilla/nsprpub/pr/src/Makefile.in 2009-02-04 23:47:01.000000000 +0100 ++++ misc/build/nss-3.12.6/mozilla/nsprpub/pr/src/Makefile.in 2009-09-18 17:26:33.544145410 +0200 @@ -195,7 +195,7 @@ ifeq ($(OS_ARCH),WINNT) @@ -59,8 +59,8 @@ else OS_LIBS = advapi32.lib wsock32.lib winmm.lib endif ---- misc/mozilla/security/coreconf/WIN32.mk 2009-07-29 02:15:46.000000000 +0200 -+++ misc/build/mozilla/security/coreconf/WIN32.mk 2009-09-18 17:27:39.253588269 +0200 +--- misc/nss-3.12.6/mozilla/security/coreconf/WIN32.mk 2009-07-29 02:15:46.000000000 +0200 ++++ misc/build/nss-3.12.6/mozilla/security/coreconf/WIN32.mk 2009-09-18 17:27:39.253588269 +0200 @@ -43,8 +43,8 @@ DEFAULT_COMPILER = cl @@ -72,8 +72,8 @@ LINK = ld AR = ar AR += cr $@ ---- misc/mozilla/security/coreconf/WIN95.mk 2009-02-14 06:51:10.000000000 +0100 -+++ misc/build/mozilla/security/coreconf/WIN95.mk 2009-09-18 17:28:06.433136076 +0200 +--- misc/nss-3.12.6/mozilla/security/coreconf/WIN95.mk 2009-02-14 06:51:10.000000000 +0100 ++++ misc/build/nss-3.12.6/mozilla/security/coreconf/WIN95.mk 2009-09-18 17:28:06.433136076 +0200 @@ -44,4 +44,8 @@ DEFINES += -DWIN95 @@ -85,8 +85,8 @@ + NSPR31_LIB_PREFIX = $(NULL) +endif \ No newline at end of file ---- misc/mozilla/security/coreconf/rules.mk 2009-08-11 05:23:39.000000000 +0200 -+++ misc/build/mozilla/security/coreconf/rules.mk 2009-09-18 17:29:05.079376677 +0200 +--- misc/nss-3.12.6/mozilla/security/coreconf/rules.mk 2009-08-11 05:23:39.000000000 +0200 ++++ misc/build/nss-3.12.6/mozilla/security/coreconf/rules.mk 2009-09-18 17:29:05.079376677 +0200 @@ -281,8 +281,12 @@ fi endif # MSVC with manifest tool @@ -100,8 +100,8 @@ get_objs: @echo $(OBJS) ---- misc/mozilla/security/nss/Makefile 2008-12-03 00:24:39.000000000 +0100 -+++ misc/build/mozilla/security/nss/Makefile 2009-09-18 17:29:46.194949392 +0200 +--- misc/nss-3.12.6/mozilla/security/nss/Makefile 2008-12-03 00:24:39.000000000 +0100 ++++ misc/build/nss-3.12.6/mozilla/security/nss/Makefile 2009-09-18 17:29:46.194949392 +0200 @@ -108,7 +108,7 @@ NSPR_CONFIGURE_OPTS += --enable-debug-rtl endif @@ -111,8 +111,8 @@ endif # ---- misc/mozilla/security/nss/cmd/crmftest/Makefile 2005-11-14 01:17:21.000000000 +0100 -+++ misc/build/mozilla/security/nss/cmd/crmftest/Makefile 2009-09-18 17:30:33.267190024 +0200 +--- misc/nss-3.12.6/mozilla/security/nss/cmd/crmftest/Makefile 2005-11-14 01:17:21.000000000 +0100 ++++ misc/build/nss-3.12.6/mozilla/security/nss/cmd/crmftest/Makefile 2009-09-18 17:30:33.267190024 +0200 @@ -90,7 +90,7 @@ LDDIST = $(DIST)/lib @@ -122,8 +122,8 @@ endif include ../platrules.mk ---- misc/mozilla/security/nss/cmd/shlibsign/Makefile 2009-08-07 21:06:37.000000000 +0200 -+++ misc/build/mozilla/security/nss/cmd/shlibsign/Makefile 2009-09-18 17:31:02.168253398 +0200 +--- misc/nss-3.12.6/mozilla/security/nss/cmd/shlibsign/Makefile 2009-08-07 21:06:37.000000000 +0200 ++++ misc/build/nss-3.12.6/mozilla/security/nss/cmd/shlibsign/Makefile 2009-09-18 17:31:02.168253398 +0200 @@ -115,10 +115,16 @@ $(call core_abspath,$(OBJDIR)) $(OS_TARGET) \ $(call core_abspath,$(NSPR_LIB_DIR)) $(call core_abspath,$<) @@ -141,8 +141,8 @@ libs install :: $(CHECKLOC) ---- misc/mozilla/security/nss/lib/freebl/config.mk 2009-04-11 23:18:42.000000000 +0200 -+++ misc/build/mozilla/security/nss/lib/freebl/config.mk 2009-09-18 17:31:40.067954076 +0200 +--- misc/nss-3.12.6/mozilla/security/nss/lib/freebl/config.mk 2009-04-11 23:18:42.000000000 +0200 ++++ misc/build/nss-3.12.6/mozilla/security/nss/lib/freebl/config.mk 2009-09-18 17:31:40.067954076 +0200 @@ -84,10 +84,6 @@ RES = $(OBJDIR)/$(LIBRARY_NAME).res RESNAME = freebl.rc diff --git a/nss/nss_macosx.patch b/nss/nss_macosx.patch index d6ce6ff4f8d0..5a0228355748 100644 --- a/nss/nss_macosx.patch +++ b/nss/nss_macosx.patch @@ -1,5 +1,5 @@ ---- misc/mozilla/security/nss/Makefile 2008-12-03 00:24:39.000000000 +0100 -+++ misc/build/mozilla/security/nss/Makefile 2009-11-27 13:36:22.662753328 +0100 +--- misc/nss-3.12.6/mozilla/security/nss/Makefile 2008-12-03 00:24:39.000000000 +0100 ++++ misc/build/nss-3.12.6/mozilla/security/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 -- cgit v1.2.3