Author: hdu Date: Thu Nov 7 13:27:38 2013 New Revision: 1539631 URL: http://svn.apache.org/r1539631 Log: #i123637# update nss libraries to 3.14.4
Patch by: Pedro Giffuni <[email protected]> Modified: openoffice/trunk/main/external_deps.lst openoffice/trunk/main/nss/makefile.mk openoffice/trunk/main/nss/nss.patch openoffice/trunk/main/nss/nss.patch.mingw openoffice/trunk/main/nss/nss_linux.patch openoffice/trunk/main/nss/nss_macosx.patch openoffice/trunk/main/nss/readme.txt Modified: openoffice/trunk/main/external_deps.lst URL: http://svn.apache.org/viewvc/openoffice/trunk/main/external_deps.lst?rev=1539631&r1=1539630&r2=1539631&view=diff ============================================================================== --- openoffice/trunk/main/external_deps.lst (original) +++ openoffice/trunk/main/external_deps.lst Thu Nov 7 13:27:38 2013 @@ -305,9 +305,10 @@ if (ENABLE_CATEGORY_B==YES && SOLAR_JAVA URL2 = $(OOO_EXTRAS)$(MD5)-$(name) if (ENABLE_CATEGORY_B==YES && ENABLE_NSS_MODULE==YES) - MD5 = b92261a5679276c400555004937af965 - name = nss-3.12.6-with-nspr-4.8.4.tar.gz - URL1 = $(OOO_EXTRAS)$(MD5)-$(name) + MD5 = 067a04150b1d8b64f7da3019688a7547 + name = nss-3.14.4-with-nspr-4.9.5.tar.gz + URL1 = ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_14_4_RTM/src/nss-3.14.4-with-nspr-4.9.5.tar.gz + URL2 = $(OOO_EXTRAS)$(MD5)-$(name) if (ENABLE_CATEGORY_B==YES && SYSTEM_SAXON!=YES && DISABLE_SAXON!=YES && SOLAR_JAVA==TRUE) MD5 = 24be19595acad0a2cae931af77a0148a Modified: openoffice/trunk/main/nss/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/main/nss/makefile.mk?rev=1539631&r1=1539630&r2=1539631&view=diff ============================================================================== --- openoffice/trunk/main/nss/makefile.mk (original) +++ openoffice/trunk/main/nss/makefile.mk Thu Nov 7 13:27:38 2013 @@ -39,9 +39,9 @@ all: .ELSE -TARFILE_NAME=nss-3.12.6-with-nspr-4.8.4 -TARFILE_MD5=b92261a5679276c400555004937af965 -TARFILE_ROOTDIR=nss-3.12.6 +TARFILE_NAME=nss-3.14.4-with-nspr-4.9.5 +TARFILE_MD5=067a04150b1d8b64f7da3019688a7547 +TARFILE_ROOTDIR=nss-3.14.4 PATCH_FILES=nss.patch .IF "$(OS)"=="MACOSX" Modified: openoffice/trunk/main/nss/nss.patch URL: http://svn.apache.org/viewvc/openoffice/trunk/main/nss/nss.patch?rev=1539631&r1=1539630&r2=1539631&view=diff ============================================================================== --- openoffice/trunk/main/nss/nss.patch (original) +++ openoffice/trunk/main/nss/nss.patch Thu Nov 7 13:27:38 2013 @@ -1,6 +1,6 @@ ---- 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 @@ +--- 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 @@ 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/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 @@ +--- 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 @@ PR_MD_CSRCS=linux.c MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@' DSO_CFLAGS=-fPIC @@ -25,26 +25,27 @@ _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.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 @@ +--- 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 @@ - DEFAULT_COMPILER = cc + include $(CORE_DEPTH)/coreconf/UNIX.mk --CC = cc --CCC = c++ +-DEFAULT_COMPILER = gcc ++DEFAULT_COMPILER = cc ++ +# CC is taken from environment automatically. +#CC = cc -+# Use CCC from environment. -+#CCC = c++ +CCC = $(CXX) -+ + +-CC = gcc +-CCC = g++ RANLIB = ranlib ifndef CPU_ARCH ---- 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 @@ +--- 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 +@@ -16,8 +16,11 @@ IMPL_STRATEGY = _PTH endif @@ -58,7 +59,7 @@ RANLIB = ranlib DEFAULT_COMPILER = gcc -@@ -147,7 +150,7 @@ +@@ -143,7 +146,7 @@ # incorrectly reports undefined references in the libraries we link with, so # we don't use -z defs there. ZDEFS_FLAG = -Wl,-z,defs @@ -66,10 +67,10 @@ +DSO_LDOPTS += $(if $(findstring 2.11.90.0.8,$(shell ld -v)),,$(ZDEFS_FLAG)) '-Wl,-rpath,$$ORIGIN' LDFLAGS += $(ARCHFLAG) - # INCLUDES += -I/usr/include -Y/usr/include/linux -@@ -158,8 +161,13 @@ - # - CPU_TAG = _$(CPU_ARCH) + # On Maemo, we need to use the -rpath-link flag for even the standard system +@@ -174,8 +177,13 @@ + endif + endif +ifeq ($(SYSTEM_ZLIB),YES) +# Currently (3.12.4) only the tools modutil and signtool are linked with libz @@ -81,9 +82,9 @@ # The -rpath '$$ORIGIN' linker option instructs this library to search for its # dependencies in the same directory where it resides. ---- 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 @@ +--- 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 +@@ -48,8 +48,12 @@ # OPTIMIZER += -mno-omit-leaf-frame-pointer -fno-omit-frame-pointer endif else @@ -98,9 +99,9 @@ ASFLAGS += -Wa,-P OS_CFLAGS += $(NOMD_OS_CFLAGS) $(ARCHFLAG) ifndef BUILD_OPT ---- 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 @@ +--- 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. # @@ -114,9 +115,9 @@ ifeq (,$(filter-out WIN%,$(OS_TARGET))) ifndef BUILD_OPT ---- 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 @@ +--- 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 @@ ifdef NS_USE_GCC $(RC) $(filter-out -U%,$(DEFINES)) $(INCLUDES:-I%=--include-dir %) -o $@ $< else @@ -130,27 +131,22 @@ endif @echo $(RES) finished endif ---- 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 @@ +--- 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 ($(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 ++#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 - else --EXTRA_SHARED_LIBS += -R '$$ORIGIN/../lib' -+EXTRA_SHARED_LIBS += -R '$$ORIGIN' - endif 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,-rpath,'$$ORIGIN' @@ -158,19 +154,11 @@ -EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib:/opt/sun/private/lib' +EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN' endif - else - ifeq ($(USE_64), 1) --EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:$$ORIGIN/../lib' -+EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN' - else --EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib' -+EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN' - endif endif - endif ---- 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 @@ + +--- 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 Modified: openoffice/trunk/main/nss/nss.patch.mingw URL: http://svn.apache.org/viewvc/openoffice/trunk/main/nss/nss.patch.mingw?rev=1539631&r1=1539630&r2=1539631&view=diff ============================================================================== --- openoffice/trunk/main/nss/nss.patch.mingw (original) +++ openoffice/trunk/main/nss/nss.patch.mingw Thu Nov 7 13:27:38 2013 @@ -1,5 +1,5 @@ ---- misc/nss-3.12.6/mozilla/nsprpub/config/autoconf.mk.in 2009-03-04 07:04:23.000000000 +0900 -+++ misc/build/nss-3.12.6/mozilla/nsprpub/config/autoconf.mk.in 2010-06-17 08:42:08.010625000 +0900 +--- misc/nss-3.13.6/mozilla/nsprpub/config/autoconf.mk.in 2009-03-04 07:04:23.000000000 +0900 ++++ misc/build/nss-3.13.6/mozilla/nsprpub/config/autoconf.mk.in 2010-06-17 08:42:08.010625000 +0900 @@ -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/nss-3.12.6/mozilla/nsprpub/config/rules.mk 2009-12-10 06:24:37.000000000 +0900 -+++ misc/build/nss-3.12.6/mozilla/nsprpub/config/rules.mk 2010-06-17 08:42:08.057500000 +0900 +--- misc/nss-3.13.6/mozilla/nsprpub/config/rules.mk 2009-12-10 06:24:37.000000000 +0900 ++++ misc/build/nss-3.13.6/mozilla/nsprpub/config/rules.mk 2010-06-17 08:42:08.057500000 +0900 @@ -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/nss-3.12.6/mozilla/nsprpub/configure 2010-02-09 03:41:35.000000000 +0900 -+++ misc/build/nss-3.12.6/mozilla/nsprpub/configure 2010-06-17 08:42:10.000000000 +0900 +--- misc/nss-3.13.6/mozilla/nsprpub/configure 2010-02-09 03:41:35.000000000 +0900 ++++ misc/build/nss-3.13.6/mozilla/nsprpub/configure 2010-06-17 08:42:10.000000000 +0900 @@ -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/nss-3.12.6/mozilla/nsprpub/pr/src/Makefile.in 2009-12-19 18:06:07.000000000 +0900 -+++ misc/build/nss-3.12.6/mozilla/nsprpub/pr/src/Makefile.in 2010-06-17 08:42:08.151250000 +0900 +--- misc/nss-3.13.6/mozilla/nsprpub/pr/src/Makefile.in 2009-12-19 18:06:07.000000000 +0900 ++++ misc/build/nss-3.13.6/mozilla/nsprpub/pr/src/Makefile.in 2010-06-17 08:42:08.151250000 +0900 @@ -195,7 +195,7 @@ ifeq ($(OS_ARCH),WINNT) @@ -59,8 +59,8 @@ else OS_LIBS = advapi32.lib wsock32.lib winmm.lib endif ---- misc/nss-3.12.6/mozilla/security/coreconf/WIN32.mk 2009-07-29 09:15:46.000000000 +0900 -+++ misc/build/nss-3.12.6/mozilla/security/coreconf/WIN32.mk 2010-06-17 08:42:08.198125000 +0900 +--- misc/nss-3.13.6/mozilla/security/coreconf/WIN32.mk 2009-07-29 09:15:46.000000000 +0900 ++++ misc/build/nss-3.13.6/mozilla/security/coreconf/WIN32.mk 2010-06-17 08:42:08.198125000 +0900 @@ -43,8 +43,8 @@ DEFAULT_COMPILER = cl @@ -72,8 +72,8 @@ LINK = ld AR = ar AR += cr $@ ---- misc/nss-3.12.6/mozilla/security/coreconf/WIN95.mk 2009-02-14 14:51:10.000000000 +0900 -+++ misc/build/nss-3.12.6/mozilla/security/coreconf/WIN95.mk 2010-06-17 08:42:08.245000000 +0900 +--- misc/nss-3.13.6/mozilla/security/coreconf/WIN95.mk 2009-02-14 14:51:10.000000000 +0900 ++++ misc/build/nss-3.13.6/mozilla/security/coreconf/WIN95.mk 2010-06-17 08:42:08.245000000 +0900 @@ -44,4 +44,8 @@ DEFINES += -DWIN95 @@ -85,8 +85,8 @@ + NSPR31_LIB_PREFIX = $(NULL) +endif \ No newline at end of file ---- misc/nss-3.12.6/mozilla/security/coreconf/rules.mk 2009-12-08 10:33:36.000000000 +0900 -+++ misc/build/nss-3.12.6/mozilla/security/coreconf/rules.mk 2010-06-17 08:42:08.291875000 +0900 +--- misc/nss-3.13.6/mozilla/security/coreconf/rules.mk 2009-12-08 10:33:36.000000000 +0900 ++++ misc/build/nss-3.13.6/mozilla/security/coreconf/rules.mk 2010-06-17 08:42:08.291875000 +0900 @@ -281,8 +281,12 @@ fi endif # MSVC with manifest tool @@ -100,8 +100,8 @@ get_objs: @echo $(OBJS) ---- misc/nss-3.12.6/mozilla/security/nss/Makefile 2009-12-09 01:47:03.000000000 +0900 -+++ misc/build/nss-3.12.6/mozilla/security/nss/Makefile 2010-06-17 08:42:08.338750000 +0900 +--- misc/nss-3.13.6/mozilla/security/nss/Makefile 2009-12-09 01:47:03.000000000 +0900 ++++ misc/build/nss-3.13.6/mozilla/security/nss/Makefile 2010-06-17 08:42:08.338750000 +0900 @@ -108,7 +108,7 @@ NSPR_CONFIGURE_OPTS += --enable-debug-rtl endif @@ -111,8 +111,8 @@ endif # ---- misc/nss-3.12.6/mozilla/security/nss/cmd/crmftest/Makefile 2005-11-14 09:17:21.000000000 +0900 -+++ misc/build/nss-3.12.6/mozilla/security/nss/cmd/crmftest/Makefile 2010-06-17 08:42:08.370000000 +0900 +--- misc/nss-3.13.6/mozilla/security/nss/cmd/crmftest/Makefile 2005-11-14 09:17:21.000000000 +0900 ++++ misc/build/nss-3.13.6/mozilla/security/nss/cmd/crmftest/Makefile 2010-06-17 08:42:08.370000000 +0900 @@ -90,7 +90,7 @@ LDDIST = $(DIST)/lib @@ -122,8 +122,8 @@ endif include ../platrules.mk ---- misc/nss-3.12.6/mozilla/security/nss/cmd/shlibsign/Makefile 2009-08-08 04:06:37.000000000 +0900 -+++ misc/build/nss-3.12.6/mozilla/security/nss/cmd/shlibsign/Makefile 2010-06-17 08:42:10.000000000 +0900 +--- misc/nss-3.13.6/mozilla/security/nss/cmd/shlibsign/Makefile 2009-08-08 04:06:37.000000000 +0900 ++++ misc/build/nss-3.13.6/mozilla/security/nss/cmd/shlibsign/Makefile 2010-06-17 08:42:10.000000000 +0900 @@ -115,10 +115,16 @@ $(call core_abspath,$(OBJDIR)) $(OS_TARGET) \ $(call core_abspath,$(NSPR_LIB_DIR)) $(call core_abspath,$<) @@ -141,27 +141,3 @@ libs install :: $(CHECKLOC) ---- misc/nss-3.12.6/mozilla/security/nss/lib/freebl/config.mk 2009-04-12 06:18:42.000000000 +0900 -+++ misc/build/nss-3.12.6/mozilla/security/nss/lib/freebl/config.mk 2010-06-17 08:42:08.557500000 +0900 -@@ -84,10 +84,6 @@ - RES = $(OBJDIR)/$(LIBRARY_NAME).res - RESNAME = freebl.rc - --ifndef WINCE --OS_LIBS += shell32.lib --endif -- - ifdef NS_USE_GCC - EXTRA_SHARED_LIBS += \ - -L$(DIST)/lib \ -@@ -97,6 +93,10 @@ - -lnspr4 \ - $(NULL) - else # ! NS_USE_GCC -+ifndef WINCE -+OS_LIBS += shell32.lib -+endif -+ - EXTRA_SHARED_LIBS += \ - $(DIST)/lib/nssutil3.lib \ - $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)nspr4.lib \ Modified: openoffice/trunk/main/nss/nss_linux.patch URL: http://svn.apache.org/viewvc/openoffice/trunk/main/nss/nss_linux.patch?rev=1539631&r1=1539630&r2=1539631&view=diff ============================================================================== --- openoffice/trunk/main/nss/nss_linux.patch (original) +++ openoffice/trunk/main/nss/nss_linux.patch Thu Nov 7 13:27:38 2013 @@ -1,19 +1,7 @@ -diff -uNrp misc/nss-3.12.6/mozilla/security/coreconf/config.mk misc/build/nss-3.12.6/mozilla/security/coreconf/config.mk ---- misc/nss-3.12.6/mozilla/security/coreconf/config.mk 2009-08-25 19:35:11.000000000 -0300 -+++ misc/build/nss-3.12.6/mozilla/security/coreconf/config.mk 2011-12-14 14:07:30.979358265 -0300 -@@ -63,7 +63,7 @@ endif - ####################################################################### - - TARGET_OSES = FreeBSD BSD_OS NetBSD OpenUNIX OS2 QNX Darwin BeOS OpenBSD \ -- AIX RISCOS WINNT WIN95 WINCE -+ AIX RISCOS WINNT WIN95 WINCE Linux - - ifeq (,$(filter-out $(TARGET_OSES),$(OS_TARGET))) - include $(CORE_DEPTH)/coreconf/$(OS_TARGET).mk -diff -uNrp misc/nss-3.12.6/mozilla/security/coreconf/Linux.mk misc/build/nss-3.12.6/mozilla/security/coreconf/Linux.mk ---- misc/nss-3.12.6/mozilla/security/coreconf/Linux.mk 2011-12-14 14:06:50.112354384 -0300 -+++ misc/build/nss-3.12.6/mozilla/security/coreconf/Linux.mk 2011-12-14 14:07:30.978358265 -0300 -@@ -179,3 +179,18 @@ RPATH = -Wl,-rpath,'$$ORIGIN:/opt/sun/pr +diff -uNrp misc/nss-3.14.4/mozilla/security/coreconf/Linux.mk misc/build/nss-3.14.4/mozilla/security/coreconf/Linux.mk +--- misc/nss-3.14.4/mozilla/security/coreconf/Linux.mk 2011-12-14 14:06:50.112354384 -0300 ++++ misc/build/nss-3.14.4/mozilla/security/coreconf/Linux.mk 2011-12-14 14:07:30.978358265 -0300 +@@ -174,3 +174,18 @@ RPATH = -Wl,-rpath,'$$ORIGIN:/opt/sun/pr endif endif Modified: openoffice/trunk/main/nss/nss_macosx.patch URL: http://svn.apache.org/viewvc/openoffice/trunk/main/nss/nss_macosx.patch?rev=1539631&r1=1539630&r2=1539631&view=diff ============================================================================== --- openoffice/trunk/main/nss/nss_macosx.patch (original) +++ openoffice/trunk/main/nss/nss_macosx.patch Thu Nov 7 13:27:38 2013 @@ -1,6 +1,6 @@ ---- 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 @@ +--- 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 Modified: openoffice/trunk/main/nss/readme.txt URL: http://svn.apache.org/viewvc/openoffice/trunk/main/nss/readme.txt?rev=1539631&r1=1539630&r2=1539631&view=diff ============================================================================== --- openoffice/trunk/main/nss/readme.txt (original) +++ openoffice/trunk/main/nss/readme.txt Thu Nov 7 13:27:38 2013 @@ -1,13 +1,13 @@ Relation between nss, moz, moz_prebuilt --------------------------------------- -nss containes the security libraries which are also part of moz. However nss is -meant to be more current, that is it to be updated more often. This should be -easier than doing this with moz. +nss contains the security libraries which are also part of moz. However nss is +meant to be more current, that is, it to be updated more often. This +should be easier than updating moz. -If nss is build depends on an environment variable (ENABLE_NSS_MODULE=YES) which -is per default set to YES. In this case nss is build before moz. The nss +When nss is build, it depends on an environment variable (ENABLE_NSS_MODULE) +which is by default set to YES. In this case nss is build before moz. The nss libraries/lib files/headers built in moz are then not delivered. Otherwise they -would overwrite those from nss. That is, the nss libraries build in moz are +would overwrite those from nss. The nss libraries build in moz are then removed from mozruntime.zip (build in moz/solver/bin), they are removed from the lib directory (for example moz/unxlngi6.pro/lib), and the nss and nspr headers are also removed (inc/nss and inc/nspr). The nss libraries from the nss module @@ -27,7 +27,7 @@ checksums for the cryptographic module a not be part of the OOo installation sets. Signing has been turned off because -- we change the rpath (install names) after signing which breaks the signatures +- we change the rpath (install names) after signing which breaks the signatures (Mac) - sqlite conflicts with the system sqlite when signing which breaks the build
