Skip to content

C
core
Kaydet (Commit) 602c1e59 authored tarafından Fridrich Štrba's avatar Fridrich Štrba
Dosyalara gözat
Seçenekler

Upgrade nss to the latest release

üst 1038efa1
Hide whitespace changes
Inline Side-by-side
Showing with 37 additions and 37 deletions
nss/makefile.mk
Dosyayı görüntüle @ 602c1e59
......@@ -41,9 +41,9 @@ all:
@echo "NSS will not be built. ENABLE_NSS_MODULE is '$(ENABLE_NSS_MODULE)'"
.ENDIF
TARFILE_NAME=nss-3.12.6-with-nspr-4.8.4
TARFILE_MD5=b92261a5679276c400555004937af965
TARFILE_ROOTDIR=nss-3.12.6
TARFILE_NAME=nss-3.12.8-with-nspr-4.8.6
TARFILE_MD5=71474203939fafbe271e1263e61d083e
TARFILE_ROOTDIR=nss-3.12.8
PATCH_FILES=nss.patch nss.aix.patch
.IF "$(OS)"=="MACOSX"
......
nss/nss.aix.patch
Dosyayı görüntüle @ 602c1e59
--- misc/nss-3.12.6/mozilla/nsprpub/configure 2010-08-18 07:23:01.000000000 -0500
+++ misc/build/nss-3.12.6/mozilla/nsprpub/configure 2010-08-18 07:33:11.000000000 -0500
--- misc/nss-3.12.8/mozilla/nsprpub/configure 2010-08-18 07:23:01.000000000 -0500
+++ misc/build/nss-3.12.8/mozilla/nsprpub/configure 2010-08-18 07:33:11.000000000 -0500
@@ -2973,7 +2973,8 @@
#define SYSV 1
EOF
......@@ -18,8 +18,8 @@
AIX_WRAP='$(DIST)/lib/aixwrap.o'
AIX_TMP='./_aix_tmp.o'
if test -n "$USE_64"; then
--- misc/nss-3.12.6/mozilla/nsprpub/configure.in 2010-08-18 07:23:01.000000000 -0500
+++ misc/build/nss-3.12.6/mozilla/nsprpub/configure.in 2010-08-18 07:32:36.000000000 -0500
--- misc/nss-3.12.8/mozilla/nsprpub/configure.in 2010-08-18 07:23:01.000000000 -0500
+++ misc/build/nss-3.12.8/mozilla/nsprpub/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.12.6/mozilla/nsprpub/pr/src/Makefile.in 2010-08-18 07:23:04.000000000 -0500
+++ misc/build/nss-3.12.6/mozilla/nsprpub/pr/src/Makefile.in 2010-08-18 07:24:49.000000000 -0500
--- misc/nss-3.12.8/mozilla/nsprpub/pr/src/Makefile.in 2010-08-18 07:23:04.000000000 -0500
+++ misc/build/nss-3.12.8/mozilla/nsprpub/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.12.6/mozilla/security/coreconf/AIX.mk 2010-08-18 07:23:06.000000000 -0500
+++ misc/build/nss-3.12.6/mozilla/security/coreconf/AIX.mk 2010-08-18 07:26:26.000000000 -0500
--- misc/nss-3.12.8/mozilla/security/coreconf/AIX.mk 2010-08-18 07:23:06.000000000 -0500
+++ misc/build/nss-3.12.8/mozilla/security/coreconf/AIX.mk 2010-08-18 07:26:26.000000000 -0500
@@ -62,35 +62,30 @@
DEFAULT_COMPILER = xlc_r
......@@ -96,8 +96,8 @@
ifeq ($(USE_64), 1)
OS_CFLAGS += -DAIX_64BIT
OBJECT_MODE=64
--- misc/nss-3.12.6/mozilla/security/nss/cmd/platlibs.mk 2010-08-18 07:23:18.000000000 -0500
+++ misc/build/nss-3.12.6/mozilla/security/nss/cmd/platlibs.mk 2010-08-18 07:26:48.000000000 -0500
--- misc/nss-3.12.8/mozilla/security/nss/cmd/platlibs.mk 2010-08-18 07:23:18.000000000 -0500
+++ misc/build/nss-3.12.8/mozilla/security/nss/cmd/platlibs.mk 2010-08-18 07:26:48.000000000 -0500
@@ -173,7 +173,7 @@
$(NULL)
......@@ -116,8 +116,8 @@
endif
# $(PROGRAM) has NO explicit dependencies on $(EXTRA_SHARED_LIBS)
--- misc/nss-3.12.6/mozilla/security/nss/cmd/shlibsign/mangle/Makefile 2010-08-18 07:23:20.000000000 -0500
+++ misc/build/nss-3.12.6/mozilla/security/nss/cmd/shlibsign/mangle/Makefile 2010-08-18 07:42:44.000000000 -0500
--- misc/nss-3.12.8/mozilla/security/nss/cmd/shlibsign/mangle/Makefile 2010-08-18 07:23:20.000000000 -0500
+++ misc/build/nss-3.12.8/mozilla/security/nss/cmd/shlibsign/mangle/Makefile 2010-08-18 07:42:44.000000000 -0500
@@ -75,7 +75,9 @@
endif
......@@ -129,8 +129,8 @@
#######################################################################
# (5) Execute "global" rules. (OPTIONAL) #
--- misc/nss-3.12.6/mozilla/security/nss/cmd/shlibsign/Makefile 2010-08-18 08:00:17.000000000 -0500
+++ misc/build/nss-3.12.6/mozilla/security/nss/cmd/shlibsign/Makefile 2010-08-18 07:55:55.000000000 -0500
--- misc/nss-3.12.8/mozilla/security/nss/cmd/shlibsign/Makefile 2010-08-18 08:00:17.000000000 -0500
+++ misc/build/nss-3.12.8/mozilla/security/nss/cmd/shlibsign/Makefile 2010-08-18 07:55:55.000000000 -0500
@@ -75,6 +75,9 @@
endif
......
nss/nss.patch
Dosyayı görüntüle @ 602c1e59
--- 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
--- misc/nss-3.12.8/mozilla/nsprpub/config/rules.mk 2009-12-09 22:24:37.000000000 +0100
+++ misc/build/nss-3.12.8/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 $@ $<
......@@ -14,8 +14,8 @@
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
--- misc/nss-3.12.8/mozilla/nsprpub/configure 2010-02-08 19:41:35.000000000 +0100
+++ misc/build/nss-3.12.8/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 $@'
......@@ -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/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
--- misc/nss-3.12.8/mozilla/security/coreconf/Darwin.mk 2010-02-04 19:59:10.000000000 +0100
+++ misc/build/nss-3.12.8/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/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
--- misc/nss-3.12.8/mozilla/security/coreconf/Linux.mk 2010-01-15 23:19:00.000000000 +0100
+++ misc/build/nss-3.12.8/mozilla/security/coreconf/Linux.mk 2010-06-11 16:35:54.981151732 +0200
@@ -46,8 +46,11 @@
IMPL_STRATEGY = _PTH
endif
......@@ -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/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
--- misc/nss-3.12.8/mozilla/security/coreconf/SunOS5.mk 2009-06-11 02:55:32.000000000 +0200
+++ misc/build/nss-3.12.8/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/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
--- misc/nss-3.12.8/mozilla/security/coreconf/arch.mk 2009-06-05 04:14:49.000000000 +0200
+++ misc/build/nss-3.12.8/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/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
--- misc/nss-3.12.8/mozilla/security/coreconf/rules.mk 2009-12-08 02:33:36.000000000 +0100
+++ misc/build/nss-3.12.8/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,8 +130,8 @@
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
--- misc/nss-3.12.8/mozilla/security/nss/cmd/platlibs.mk 2010-02-04 19:59:10.000000000 +0100
+++ misc/build/nss-3.12.8/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)
......@@ -168,8 +168,8 @@
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
--- misc/nss-3.12.8/mozilla/security/nss/cmd/shlibsign/Makefile 2009-08-07 21:06:37.000000000 +0200
+++ misc/build/nss-3.12.8/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
......
nss/nss_macosx.patch
Dosyayı görüntüle @ 602c1e59
--- 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
--- misc/nss-3.12.8/mozilla/security/nss/Makefile 2008-12-03 00:24:39.000000000 +0100
+++ misc/build/nss-3.12.8/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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment