Index: main/external_deps.lst =================================================================== --- main/external_deps.lst (revision 1748497) +++ main/external_deps.lst (working copy) @@ -313,9 +313,9 @@ URL2 = $(OOO_EXTRAS)$(MD5)-$(name) if (ENABLE_CATEGORY_B==YES && ENABLE_NSS_MODULE==YES) - MD5 = 067a04150b1d8b64f7da3019688a7547 - name = nss-3.14.4-with-nspr-4.9.5.tar.gz - URL1 = https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_14_4_RTM/src/$(name) + MD5 = a668a0df123bbb57ee14820dd61151e0 + name = nss-3.24-with-nspr-4.12.tar.gz + URL1 = https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_24_RTM/src/$(name) URL2 = $(OOO_EXTRAS)$(MD5)-$(name) if (ENABLE_CATEGORY_B==YES && SYSTEM_SAXON!=YES && DISABLE_SAXON!=YES && SOLAR_JAVA==TRUE) Index: main/nss/makefile.mk =================================================================== --- main/nss/makefile.mk (revision 1748496) +++ main/nss/makefile.mk (working copy) @@ -39,9 +39,9 @@ .ELSE -TARFILE_NAME=nss-3.14.4-with-nspr-4.9.5 -TARFILE_MD5=067a04150b1d8b64f7da3019688a7547 -TARFILE_ROOTDIR=nss-3.14.4 +TARFILE_NAME=nss-3.24-with-nspr-4.12 +TARFILE_MD5=a668a0df123bbb57ee14820dd61151e0 +TARFILE_ROOTDIR=nss-3.24 PATCH_FILES=nss.patch .IF "$(OS)"=="MACOSX" @@ -50,10 +50,6 @@ PATCH_FILES+=nss_macosx.patch .ENDIF # "$(OS)"=="MACOSX" -.IF "$(OS)"=="FREEBSD" -PATCH_FILES+=nss_freebsd.patch -.ENDIF - .IF "$(debug)" != "" .ELSE BUILD_OPT=1 @@ -66,17 +62,21 @@ .EXPORT : USE_64 .ENDIF # "$(BUILD64)"=="1" -OUT2LIB=mozilla$/dist$/out$/lib$/*$(DLLPOST) +OUT2LIB=dist$/out$/lib$/*$(DLLPOST) -BUILD_DIR=mozilla$/security$/nss +BUILD_DIR=nss BUILD_ACTION= $(GNUMAKE) nss_build_all #See #i105566# && moz#513024# .IF "$(OS)"=="LINUX" -BUILD_ACTION+=FREEBL_NO_DEPEND=1 FREEBL_LOWHASH=1 +BUILD_ACTION+=FREEBL_NO_DEPEND=1 FREEBL_LOWHASH=1 NSS_DISABLE_GTESTS=1 PATCH_FILES+=nss_linux.patch .ENDIF +.IF "$(OS)"=="FREEBSD" +BUILD_ACTION+=FREEBL_LOWHASH=1 NSS_DISABLE_GTESTS=1 +.ENDIF + .IF "$(GUI)"=="WNT" .IF "$(COM)"=="GCC" @@ -99,20 +99,20 @@ .ENDIF -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 +BUILD_DIR=nss +BUILD_ACTION= NSS_DISABLE_GTESTS=1 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= \ - 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 + 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 .ELSE # "$(COM)"=="GCC" MOZ_MSVCVERSION= 9 @@ -130,30 +130,30 @@ 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/$(TARFILE_ROOTDIR)/mozilla/security/nss) +#nss +NSS_BUILD_DIR= $(subst,\,/ $(PWD)/$(MISC)/build/$(TARFILE_ROOTDIR)/nss) BUILD_ACTION= PATH="$(PATH):$(moz_build)/msys/bin:$(moz_build)/moztools/bin" && $(subst,/,$/ $(MOZILLABUILD)/msys/bin/bash) -i \ - -c "cd $(NSS_BUILD_DIR) && make nss_build_all" + -c "cd $(NSS_BUILD_DIR) && make nss_build_all NSS_DISABLE_GTESTS=1" OUT2LIB= \ - 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 + 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 .ENDIF # "$(COM)"=="GCC" -OUT2BIN=mozilla$/dist$/out$/lib$/*$(DLLPOST) +OUT2BIN=dist$/out$/lib$/*$(DLLPOST) .ENDIF # "$(GUI)"=="WNT" -OUTDIR2INC=mozilla$/dist$/public$/nss mozilla$/dist$/out$/include +OUTDIR2INC=dist$/public$/nss dist$/out$/include # --- Targets ------------------------------------------------------ Index: main/nss/nss.patch =================================================================== --- main/nss/nss.patch (revision 1748496) +++ main/nss/nss.patch (working copy) @@ -1,6 +1,7 @@ ---- misc/nss-3.14.4/mozilla/nsprpub/config/rules.mk 2009-12-09 22:24:37.000000000 +0100 -+++ misc/build/nss-3.14.4/mozilla/nsprpub/config/rules.mk 2010-06-11 16:35:54.946870871 +0200 -@@ -377,7 +377,12 @@ +diff -ur misc/nss-3.24/nspr/config/rules.mk misc/build/nss-3.24/nspr/config/rules.mk +--- misc/nss-3.24/nspr/config/rules.mk 2016-02-12 05:51:25.000000000 -0800 ++++ misc/build/nss-3.24/nspr/config/rules.mk 2016-06-14 19:20:50.671910000 -0700 +@@ -382,7 +382,12 @@ ifdef NS_USE_GCC $(RC) $(RCFLAGS) $(filter-out -U%,$(DEFINES)) $(INCLUDES:-I%=--include-dir %) -o $@ $< else @@ -14,9 +15,10 @@ endif # GCC @echo $(RES) finished endif ---- misc/nss-3.14.4/mozilla/nsprpub/configure 2010-02-08 19:41:35.000000000 +0100 -+++ misc/build/nss-3.14.4/mozilla/nsprpub/configure 2010-06-11 16:35:54.960188991 +0200 -@@ -4443,7 +4443,7 @@ +diff -ur misc/nss-3.24/nspr/configure misc/build/nss-3.24/nspr/configure +--- misc/nss-3.24/nspr/configure 2016-02-12 05:51:25.000000000 -0800 ++++ misc/build/nss-3.24/nspr/configure 2016-06-14 19:20:50.701096000 -0700 +@@ -6992,7 +6992,7 @@ PR_MD_CSRCS=linux.c MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@' DSO_CFLAGS=-fPIC @@ -25,11 +27,73 @@ _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.14.4/mozilla/security/coreconf/Darwin.mk 2010-02-04 19:59:10.000000000 +0100 -+++ misc/build/nss-3.14.4/mozilla/security/coreconf/Darwin.mk 2010-06-11 16:35:54.966185975 +0200 -@@ -5,10 +5,12 @@ +diff -ur misc/nss-3.24/nss/Makefile misc/build/nss-3.24/nss/Makefile +--- misc/nss-3.24/nss/Makefile 2016-05-17 00:58:45.000000000 -0700 ++++ misc/build/nss-3.24/nss/Makefile 2016-06-14 19:20:50.705365000 -0700 +@@ -76,6 +76,9 @@ + ifeq ($(OS_TARGET),WIN95) + NSPR_CONFIGURE_OPTS += --enable-win32-target=WIN95 + endif ++ifdef MACOS_SDK_DIR ++NSPR_CONFIGURE_OPTS += --with-macos-sdk=$(MACOS_SDK_DIR) ++endif + ifdef USE_DEBUG_RTL + NSPR_CONFIGURE_OPTS += --enable-debug-rtl + endif +diff -ur misc/nss-3.24/nss/cmd/platlibs.mk misc/build/nss-3.24/nss/cmd/platlibs.mk +--- misc/nss-3.24/nss/cmd/platlibs.mk 2016-05-17 00:58:45.000000000 -0700 ++++ misc/build/nss-3.24/nss/cmd/platlibs.mk 2016-06-14 19:20:50.709845000 -0700 +@@ -10,17 +10,18 @@ + ifeq ($(OS_ARCH), SunOS) + ifeq ($(USE_64), 1) +-EXTRA_SHARED_LIBS += -R '$$ORIGIN/../lib:/usr/lib/mps/secv1/64:/usr/lib/mps/64' ++#In AOO 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 + endif + + ifeq ($(OS_ARCH), Linux) + ifeq ($(USE_64), 1) +-EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:/opt/sun/private/lib64:$$ORIGIN/../lib' ++EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN' + else +-EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib:/opt/sun/private/lib' ++EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN' + endif + endif + +diff -ur misc/nss-3.24/nss/cmd/shlibsign/Makefile misc/build/nss-3.24/nss/cmd/shlibsign/Makefile +--- misc/nss-3.24/nss/cmd/shlibsign/Makefile 2016-05-17 00:58:45.000000000 -0700 ++++ misc/build/nss-3.24/nss/cmd/shlibsign/Makefile 2016-06-14 19:20:50.713690000 -0700 +@@ -49,10 +49,15 @@ + CHECKLIBS = + CHECKLOC = + else +-CHECKLIBS = $(DIST)/lib/$(DLL_PREFIX)softokn3.$(DLL_SUFFIX) +-CHECKLIBS += $(wildcard $(DIST)/lib/$(DLL_PREFIX)freebl*3.$(DLL_SUFFIX)) ++# Signing causes loading of some system library which in turn loads ++# libsqlite3. Then it loads libsqulite3 from nss, which does not have the proper ++# version. Therefore signing fails. ++# We cannot build with the system sqlite3, because it is too old (SDK ++# 10.4). Otherwise one could set NSS_USE_SYSTEM_SQLITE=1 and use the system lib. ++#CHECKLIBS = $(DIST)/lib/$(DLL_PREFIX)softokn3.$(DLL_SUFFIX) ++#CHECKLIBS += $(wildcard $(DIST)/lib/$(DLL_PREFIX)freebl*3.$(DLL_SUFFIX)) + ifndef NSS_DISABLE_DBM +-CHECKLIBS += $(DIST)/lib/$(DLL_PREFIX)nssdbm3.$(DLL_SUFFIX) ++#CHECKLIBS += $(DIST)/lib/$(DLL_PREFIX)nssdbm3.$(DLL_SUFFIX) + endif + CHECKLOC = $(CHECKLIBS:.$(DLL_SUFFIX)=.chk) + +diff -ur misc/nss-3.24/nss/coreconf/Darwin.mk misc/build/nss-3.24/nss/coreconf/Darwin.mk +--- misc/nss-3.24/nss/coreconf/Darwin.mk 2016-05-17 00:58:45.000000000 -0700 ++++ misc/build/nss-3.24/nss/coreconf/Darwin.mk 2016-06-14 19:20:50.717849000 -0700 +@@ -6,10 +6,12 @@ include $(CORE_DEPTH)/coreconf/UNIX.mk + include $(CORE_DEPTH)/coreconf/Werror.mk -DEFAULT_COMPILER = gcc +DEFAULT_COMPILER = cc @@ -43,8 +107,33 @@ RANLIB = ranlib ifndef CPU_ARCH ---- misc/nss-3.14.4/mozilla/security/coreconf/Linux.mk 2010-01-15 23:19:00.000000000 +0100 -+++ misc/build/nss-3.14.4/mozilla/security/coreconf/Linux.mk 2010-06-11 16:35:54.981151732 +0200 +diff -ur misc/nss-3.24/nss/coreconf/FreeBSD.mk misc/build/nss-3.24/nss/coreconf/FreeBSD.mk +--- misc/nss-3.24/nss/coreconf/FreeBSD.mk 2016-05-17 00:58:45.000000000 -0700 ++++ misc/build/nss-3.24/nss/coreconf/FreeBSD.mk 2016-06-14 21:58:17.482409000 -0700 +@@ -5,9 +5,8 @@ + + include $(CORE_DEPTH)/coreconf/UNIX.mk + +-DEFAULT_COMPILER = gcc +-CC = gcc +-CCC = g++ ++DEFAULT_COMPILER = $(CC) ++CCC = $(CXX) + RANLIB = ranlib + + CPU_ARCH = $(OS_TEST) +@@ -21,7 +20,7 @@ + CPU_ARCH = x86_64 + endif + +-OS_CFLAGS = $(DSO_CFLAGS) -Wall -Wno-switch -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK ++OS_CFLAGS = $(DSO_CFLAGS) -Wall -Wno-switch -DFREEBSD -DHAVE_STRERROR -DHAVE_UNISTD_H -DHAVE_BSD_FLOCK + + DSO_CFLAGS = -fPIC + DSO_LDOPTS = -shared -Wl,-soname -Wl,$(notdir $@) +diff -ur misc/nss-3.24/nss/coreconf/Linux.mk misc/build/nss-3.24/nss/coreconf/Linux.mk +--- misc/nss-3.24/nss/coreconf/Linux.mk 2016-05-17 00:58:45.000000000 -0700 ++++ misc/build/nss-3.24/nss/coreconf/Linux.mk 2016-06-14 19:23:50.797057000 -0700 @@ -16,8 +16,11 @@ IMPL_STRATEGY = _PTH endif @@ -59,16 +148,25 @@ RANLIB = ranlib DEFAULT_COMPILER = gcc -@@ -143,7 +146,7 @@ +@@ -139,7 +142,7 @@ + OS_PTHREAD = -lpthread + endif + +-OS_CFLAGS = $(DSO_CFLAGS) $(OS_REL_CFLAGS) $(ARCHFLAG) -pipe -ffunction-sections -fdata-sections -DLINUX -Dlinux -DHAVE_STRERROR ++OS_CFLAGS = $(DSO_CFLAGS) $(OS_REL_CFLAGS) $(ARCHFLAG) -pipe -ffunction-sections -fdata-sections -DLINUX -Dlinux -DHAVE_STRERROR -DHAVE_UNISTD_H + OS_LIBS = $(OS_PTHREAD) -ldl -lc + + ifdef USE_PTHREADS +@@ -149,7 +152,7 @@ + ARCH = linux + + DSO_CFLAGS = -fPIC +-DSO_LDOPTS = -shared $(ARCHFLAG) -Wl,--gc-sections ++DSO_LDOPTS = -shared $(ARCHFLAG) -Wl,--gc-sections '-Wl,-rpath,$$ORIGIN' + # The linker on Red Hat Linux 7.2 and RHEL 2.1 (GNU ld version 2.11.90.0.8) # incorrectly reports undefined references in the libraries we link with, so # we don't use -z defs there. - 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' - LDFLAGS += $(ARCHFLAG) - - # On Maemo, we need to use the -rpath-link flag for even the standard system -@@ -174,8 +177,13 @@ +@@ -189,8 +192,13 @@ endif endif @@ -82,8 +180,9 @@ # The -rpath '$$ORIGIN' linker option instructs this library to search for its # dependencies in the same directory where it resides. ---- misc/nss-3.14.4/mozilla/security/coreconf/SunOS5.mk 2009-06-11 02:55:32.000000000 +0200 -+++ misc/build/nss-3.14.4/mozilla/security/coreconf/SunOS5.mk 2010-06-11 16:35:54.985571182 +0200 +diff -ur misc/nss-3.24/nss/coreconf/SunOS5.mk misc/build/nss-3.24/nss/coreconf/SunOS5.mk +--- misc/nss-3.24/nss/coreconf/SunOS5.mk 2016-05-17 00:58:45.000000000 -0700 ++++ misc/build/nss-3.24/nss/coreconf/SunOS5.mk 2016-06-14 19:20:50.732524000 -0700 @@ -48,8 +48,12 @@ # OPTIMIZER += -mno-omit-leaf-frame-pointer -fno-omit-frame-pointer endif @@ -99,25 +198,27 @@ ASFLAGS += -Wa,-P OS_CFLAGS += $(NOMD_OS_CFLAGS) $(ARCHFLAG) ifndef BUILD_OPT ---- misc/nss-3.14.4/mozilla/security/coreconf/arch.mk 2009-06-05 04:14:49.000000000 +0200 -+++ misc/build/nss-3.14.4/mozilla/security/coreconf/arch.mk 2010-06-11 16:35:54.990913282 +0200 -@@ -302,7 +302,12 @@ - # IMPL_STRATEGY may be defined too. - # - +diff -ur misc/nss-3.24/nss/coreconf/arch.mk misc/build/nss-3.24/nss/coreconf/arch.mk +--- misc/nss-3.24/nss/coreconf/arch.mk 2016-05-17 00:58:45.000000000 -0700 ++++ misc/build/nss-3.24/nss/coreconf/arch.mk 2016-06-14 19:20:50.736819000 -0700 +@@ -294,7 +294,12 @@ + ifdef CROSS_COMPILE + OBJDIR_NAME = $(OS_TARGET)$(OS_RELEASE)$(CPU_TAG)$(LIBC_TAG)$(IMPL_STRATEGY)$(OBJDIR_TAG).OBJ + else -OBJDIR_NAME = $(OS_TARGET)$(OS_RELEASE)$(CPU_TAG)$(COMPILER_TAG)$(LIBC_TAG)$(IMPL_STRATEGY)$(OBJDIR_TAG).OBJ -+# OBJDIR_NAME is used to build the directory containing the built objects, for ++# OBJDIR_NAME is used to build the directory containing the built objects, for +# example mozilla/dist/Linux2.6_x86_glibc_PTH_DBG.OBJ +# We need to deliver the contents of that folder into the solver. To make that easier -+# in the makefile we rename this directory to "out". ++# in the makefile we rename this directory to "out". +#OBJDIR_NAME = $(OS_TARGET)$(OS_RELEASE)$(CPU_TAG)$(COMPILER_TAG)$(LIBC_TAG)$(IMPL_STRATEGY)$(OBJDIR_TAG).OBJ +OBJDIR_NAME = out + endif - ifeq (,$(filter-out WIN%,$(OS_TARGET))) - ifndef BUILD_OPT ---- misc/nss-3.14.4/mozilla/security/coreconf/rules.mk 2009-12-08 02:33:36.000000000 +0100 -+++ misc/build/nss-3.14.4/mozilla/security/coreconf/rules.mk 2010-06-11 16:35:54.996448704 +0200 -@@ -318,7 +318,12 @@ + +diff -ur misc/nss-3.24/nss/coreconf/rules.mk misc/build/nss-3.24/nss/coreconf/rules.mk +--- misc/nss-3.24/nss/coreconf/rules.mk 2016-05-17 00:58:45.000000000 -0700 ++++ misc/build/nss-3.24/nss/coreconf/rules.mk 2016-06-14 19:20:50.743043000 -0700 +@@ -322,7 +322,12 @@ ifdef NS_USE_GCC $(RC) $(filter-out -U%,$(DEFINES)) $(INCLUDES:-I%=--include-dir %) -o $@ $< else @@ -131,49 +232,3 @@ endif @echo $(RES) finished endif ---- misc/nss-3.14.4/mozilla/security/nss/cmd/platlibs.mk 2010-02-04 19:59:10.000000000 +0100 -+++ misc/build/nss-3.14.4/mozilla/security/nss/cmd/platlibs.mk 2010-06-11 16:35:55.004869805 +0200 -@@ -10,17 +10,18 @@ - - ifeq ($(OS_ARCH), SunOS) - ifeq ($(USE_64), 1) --EXTRA_SHARED_LIBS += -R '$$ORIGIN/../lib:/usr/lib/mps/secv1/64:/usr/lib/mps/64' -+#In AOO 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 - endif - - ifeq ($(OS_ARCH), Linux) - ifeq ($(USE_64), 1) --EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:/opt/sun/private/lib64:$$ORIGIN/../lib' -+EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN' - else --EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib:/opt/sun/private/lib' -+EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN' - endif - endif - ---- misc/nss-3.14.4/mozilla/security/nss/cmd/shlibsign/Makefile 2009-08-07 21:06:37.000000000 +0200 -+++ misc/build/nss-3.14.4/mozilla/security/nss/cmd/shlibsign/Makefile 2010-06-11 16:35:55.009851148 +0200 -@@ -46,10 +46,15 @@ - - # sign any and all shared libraries that contain the word freebl - --CHECKLIBS = $(DIST)/lib/$(DLL_PREFIX)softokn3.$(DLL_SUFFIX) --CHECKLIBS += $(wildcard $(DIST)/lib/$(DLL_PREFIX)freebl*3.$(DLL_SUFFIX)) -+# Signing causes loading of some system library which in turn loads -+# libsqlite3. Then it loads libsqulite3 from nss, which does not have the proper -+# version. Therefore signing fails. -+# We cannot build with the system sqlite3, because it is too old (SDK -+# 10.4). Otherwise one could set NSS_USE_SYSTEM_SQLITE=1 and use the system lib. -+#CHECKLIBS = $(DIST)/lib/$(DLL_PREFIX)softokn3.$(DLL_SUFFIX) -+#CHECKLIBS += $(wildcard $(DIST)/lib/$(DLL_PREFIX)freebl*3.$(DLL_SUFFIX)) - ifndef NSS_DISABLE_DBM --CHECKLIBS += $(DIST)/lib/$(DLL_PREFIX)nssdbm3.$(DLL_SUFFIX) -+#CHECKLIBS += $(DIST)/lib/$(DLL_PREFIX)nssdbm3.$(DLL_SUFFIX) - endif - CHECKLOC = $(CHECKLIBS:.$(DLL_SUFFIX)=.chk) - Index: main/nss/nss_freebsd.patch =================================================================== --- main/nss/nss_freebsd.patch (revision 1748496) +++ main/nss/nss_freebsd.patch (working copy) @@ -1,5 +1,5 @@ ---- misc/nss-3.14.4/mozilla/security/coreconf/FreeBSD.mk 2012-05-03 09:42:51.000000000 +0000 -+++ misc/build/nss-3.14.4/mozilla/security/coreconf/FreeBSD.mk 2015-07-13 23:42:44.915864000 +0000 +--- misc/nss-3.24/nss/coreconf/FreeBSD.mk 2012-05-03 09:42:51.000000000 +0000 ++++ misc/build/nss-3.24/nss/coreconf/FreeBSD.mk 2015-07-13 23:42:44.915864000 +0000 @@ -5,9 +5,8 @@ include $(CORE_DEPTH)/coreconf/UNIX.mk Index: main/nss/nss_linux.patch =================================================================== --- main/nss/nss_linux.patch (revision 1748496) +++ main/nss/nss_linux.patch (working copy) @@ -1,24 +1,14 @@ ---- misc/nss-3.14.4/mozilla/security/coreconf/Linux.mk 2013-11-01 14:39:28.195966851 +0100 -+++ misc/build/nss-3.14.4/mozilla/security/coreconf/Linux.mk 2013-11-01 14:39:10.246610849 +0100 -@@ -131,7 +131,7 @@ - # -ansi on platforms like Android where the system headers are C99 and do - # not build with -ansi. - STANDARDS_CFLAGS = -D_POSIX_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE --OS_CFLAGS = $(STANDARDS_CFLAGS) $(DSO_CFLAGS) $(OS_REL_CFLAGS) $(ARCHFLAG) -Wall -Werror-implicit-function-declaration -Wno-switch -pipe -DLINUX -Dlinux -DHAVE_STRERROR -+OS_CFLAGS = $(STANDARDS_CFLAGS) $(DSO_CFLAGS) $(OS_REL_CFLAGS) $(ARCHFLAG) -Wall -Werror-implicit-function-declaration -Wno-switch -pipe -DLINUX -Dlinux -DHAVE_STRERROR -DHAVE_UNISTD_H - OS_LIBS = $(OS_PTHREAD) -ldl -lc - - ifdef USE_PTHREADS ---- misc/nss-3.14.4/mozilla/security/nss/lib/freebl/Makefile 2013-01-31 02:08:59.000000000 +0100 -+++ misc/build/nss-3.14.4/mozilla/security/nss/lib/freebl/Makefile 2014-01-10 13:57:48.000000000 +0100 -@@ -186,8 +186,8 @@ - DEFINES += -DMP_CHAR_STORE_SLOW -DMP_IS_LITTLE_ENDIAN - # DEFINES += -DMPI_AMD64_ADD - # comment the next two lines to turn off intel HW accelleration -- DEFINES += -DUSE_HW_AES -- ASFILES += intel-aes.s intel-gcm.s -+# DEFINES += -DUSE_HW_AES -+# ASFILES += intel-aes.s intel-gcm.s - EXTRA_SRCS += intel-gcm-wrap.c - INTEL_GCM = 1 - MPI_SRCS += mpi_amd64.c mp_comba.c +diff -ur misc/nss-3.24/nss/lib/freebl/Makefile misc/build/nss-3.24/nss/lib/freebl/Makefile +--- misc/nss-3.24/nss/lib/freebl/Makefile 2016-02-26 12:51:11.000000000 -0800 ++++ misc/build/nss-3.24/nss/lib/freebl/Makefile 2016-03-25 12:09:13.161402000 -0700 +@@ -138,8 +138,8 @@ + # The Intel AES assembly code requires Visual C++ 2010. + # if $(_MSC_VER) >= 1600 (Visual C++ 2010) + ifeq ($(firstword $(sort $(_MSC_VER) 1600)),1600) +- DEFINES += -DUSE_HW_AES -DINTEL_GCM +- ASFILES += intel-aes-x86-masm.asm intel-gcm-x86-masm.asm ++ #DEFINES += -DUSE_HW_AES -DINTEL_GCM ++ #ASFILES += intel-aes-x86-masm.asm intel-gcm-x86-masm.asm + EXTRA_SRCS += intel-gcm-wrap.c + ifeq ($(CLANG_CL),1) + INTEL_GCM_CLANG_CL = 1 Index: main/nss/nss_macosx.patch =================================================================== --- main/nss/nss_macosx.patch (revision 1748496) +++ main/nss/nss_macosx.patch (working copy) @@ -1,18 +1,7 @@ ---- misc/nss-3.14.4/mozilla/security/nss/Makefile 2008-12-03 00:24:39.000000000 +0100 -+++ misc/build/nss-3.14.4/mozilla/security/nss/Makefile 2009-11-27 13:36:22.662753328 +0100 -@@ -73,6 +73,9 @@ - ifeq ($(OS_TARGET),WIN95) - NSPR_CONFIGURE_OPTS += --enable-win32-target=WIN95 - endif -+ifdef MACOS_SDK_DIR -+NSPR_CONFIGURE_OPTS += --with-macos-sdk=$(MACOS_SDK_DIR) -+endif - ifdef USE_DEBUG_RTL - NSPR_CONFIGURE_OPTS += --enable-debug-rtl - endif ---- misc/nss-3.14.4/mozilla/security/nss/lib/sqlite/config.mk 2012-12-12 13:30:51.000000000 +0100 -+++ misc/build/nss-3.14.4/mozilla/security/nss/lib/sqlite/config.mk 2013-10-31 15:45:49.000000000 +0100 -@@ -39,9 +39,9 @@ +diff -ur misc/nss-3.24/nss/lib/sqlite/config.mk misc/build/nss-3.24/nss/lib/sqlite/config.mk +--- misc/nss-3.24/nss/lib/sqlite/config.mk 2016-02-26 12:51:11.000000000 -0800 ++++ misc/build/nss-3.24/nss/lib/sqlite/config.mk 2016-03-25 12:18:56.114947000 -0700 +@@ -35,9 +35,9 @@ # OSAtomicCompareAndSwapPtrBarrier, which is only available on Mac OS X 10.5 # (Darwin 9.0) and later. Define SQLITE_WITHOUT_ZONEMALLOC to disable # that code for older versions of Mac OS X. See bug 820374. @@ -23,5 +12,5 @@ +OSX_MINOR_LT_5 := $(shell [ $(OSX_TARGET_MINOR) -lt 5 ] && echo true) +ifeq ($(OSX_MINOR_LT_5),true) OS_CFLAGS += -DSQLITE_WITHOUT_ZONEMALLOC + endif endif # Darwin - endif