Date: Sat, 16 Feb 2013 15:46:29 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1172 - in trunk: security/ca_root_nss security/nss www/firefox-nightly www/firefox-nightly/files Message-ID: <201302161546.r1GFkT0w097218@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Sat Feb 16 15:46:29 2013
New Revision: 1172
Log:
update
Added:
trunk/www/firefox-nightly/files/patch-bug807883
trunk/www/firefox-nightly/files/patch-js-public-RequiredDefines.h
Deleted:
trunk/www/firefox-nightly/files/patch-js-src-js-confdefs.h.in
Modified:
trunk/security/ca_root_nss/Makefile
trunk/security/ca_root_nss/distinfo
trunk/security/nss/Makefile
trunk/security/nss/distinfo
trunk/www/firefox-nightly/Makefile.hgrev
trunk/www/firefox-nightly/distinfo
Modified: trunk/security/ca_root_nss/Makefile
==============================================================================
--- trunk/security/ca_root_nss/Makefile Sat Feb 16 14:11:14 2013 (r1171)
+++ trunk/security/ca_root_nss/Makefile Sat Feb 16 15:46:29 2013 (r1172)
@@ -25,7 +25,7 @@
# !!! Please DO NOT submit patches for new version until it has !!!
# !!! been committed there first. !!!
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-VERSION_NSS= 3.14.2
+VERSION_NSS= 3.14.3
#NSS_SUFFIX= .with.ckbi.1.93
CERTDATA_TXT_PATH= nss-${VERSION_NSS}/mozilla/security/nss/lib/ckfw/builtins/certdata.txt
BUNDLE_PROCESSOR= MAca-bundle.pl
Modified: trunk/security/ca_root_nss/distinfo
==============================================================================
--- trunk/security/ca_root_nss/distinfo Sat Feb 16 14:11:14 2013 (r1171)
+++ trunk/security/ca_root_nss/distinfo Sat Feb 16 15:46:29 2013 (r1172)
@@ -1,2 +1,2 @@
-SHA256 (nss-3.14.2.tar.gz) = a22691209f4c4989812939c7e38c48a1df09f4b80e7ce4c66b66c9a59235ae95
-SIZE (nss-3.14.2.tar.gz) = 6178419
+SHA256 (nss-3.14.3.tar.gz) = d9d366be94d33395597ebf82363fcdedfa693a6d627cf7f6bec025f609d54cc0
+SIZE (nss-3.14.3.tar.gz) = 6189790
Modified: trunk/security/nss/Makefile
==============================================================================
--- trunk/security/nss/Makefile Sat Feb 16 14:11:14 2013 (r1171)
+++ trunk/security/nss/Makefile Sat Feb 16 15:46:29 2013 (r1172)
@@ -2,7 +2,7 @@
# $FreeBSD: head/security/nss/Makefile 310165 2013-01-09 23:28:19Z flo $
PORTNAME= nss
-PORTVERSION= 3.14.2
+PORTVERSION= 3.14.3
#DISTVERSIONSUFFIX= .with.ckbi.1.93
CATEGORIES= security
MASTER_SITES= ${MASTER_SITE_MOZILLA}
Modified: trunk/security/nss/distinfo
==============================================================================
--- trunk/security/nss/distinfo Sat Feb 16 14:11:14 2013 (r1171)
+++ trunk/security/nss/distinfo Sat Feb 16 15:46:29 2013 (r1172)
@@ -1,2 +1,2 @@
-SHA256 (nss-3.14.2.tar.gz) = a22691209f4c4989812939c7e38c48a1df09f4b80e7ce4c66b66c9a59235ae95
-SIZE (nss-3.14.2.tar.gz) = 6178419
+SHA256 (nss-3.14.3.tar.gz) = d9d366be94d33395597ebf82363fcdedfa693a6d627cf7f6bec025f609d54cc0
+SIZE (nss-3.14.3.tar.gz) = 6189790
Modified: trunk/www/firefox-nightly/Makefile.hgrev
==============================================================================
--- trunk/www/firefox-nightly/Makefile.hgrev Sat Feb 16 14:11:14 2013 (r1171)
+++ trunk/www/firefox-nightly/Makefile.hgrev Sat Feb 16 15:46:29 2013 (r1172)
@@ -1 +1 @@
-HGREV= 121606:161a347bda5b
+HGREV= 122046:fdc78cc42ca3
Modified: trunk/www/firefox-nightly/distinfo
==============================================================================
--- trunk/www/firefox-nightly/distinfo Sat Feb 16 14:11:14 2013 (r1171)
+++ trunk/www/firefox-nightly/distinfo Sat Feb 16 15:46:29 2013 (r1172)
@@ -1,2 +1,2 @@
-SHA256 (firefox-nightly/161a347bda5b.tar.bz2) = 852b4c60b1494098079db5bbb7a244f88539736b93b1776473aa4933ace77f28
-SIZE (firefox-nightly/161a347bda5b.tar.bz2) = 102510472
+SHA256 (firefox-nightly/fdc78cc42ca3.tar.bz2) = f8343aa922ade20feda19b38faede51d6b2ac16e8d5fa2dd918955a0699e55cb
+SIZE (firefox-nightly/fdc78cc42ca3.tar.bz2) = 103276807
Added: trunk/www/firefox-nightly/files/patch-bug807883
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/www/firefox-nightly/files/patch-bug807883 Sat Feb 16 15:46:29 2013 (r1172)
@@ -0,0 +1,109 @@
+commit 9bc203a
+Author: Wan-Teh Chang <wtc@google.com>
+Date: Tue Feb 12 08:54:38 2013 -0800
+
+ Bug 807883: Use the new PL_SizeOfArenaPoolExcludingPool function
+ in NSPR 4.9.6. Portions of the patch were written by Nicholas
+ Nethercote <n.nethercote@gmail.com>. r=n.nethercote.
+---
+ configure.in | 2 +-
+ layout/base/nsPresArena.cpp | 11 ++---------
+ modules/libpref/src/prefapi.cpp | 9 +--------
+ xpcom/components/nsCategoryManager.cpp | 9 +--------
+ xpcom/components/nsComponentManager.cpp | 9 +--------
+ 5 files changed, 6 insertions(+), 34 deletions(-)
+
+diff --git configure.in configure.in
+index b2225f4..55e4cd1 100644
+--- configure.in
++++ configure.in
+@@ -3856,7 +3856,7 @@
+ _USE_SYSTEM_NSPR=1 )
+
+ if test -n "$_USE_SYSTEM_NSPR"; then
+- AM_PATH_NSPR(4.9.6, [MOZ_NATIVE_NSPR=1], [AC_MSG_ERROR([your don't have NSPR installed or your version is too old])])
++ AM_PATH_NSPR(4.9.4, [MOZ_NATIVE_NSPR=1], [AC_MSG_ERROR([your don't have NSPR installed or your version is too old])])
+ fi
+
+ if test -n "$MOZ_NATIVE_NSPR"; then
+diff --git layout/base/nsPresArena.cpp layout/base/nsPresArena.cpp
+index 8721eec..7daafb4 100644
+--- layout/base/nsPresArena.cpp
++++ layout/base/nsPresArena.cpp
+@@ -405,7 +405,15 @@
+ size_t SizeOfIncludingThisFromMalloc(nsMallocSizeOfFun aMallocSizeOf) const
+ {
+ size_t n = aMallocSizeOf(this);
+- n += PL_SizeOfArenaPoolExcludingPool(&mPool, aMallocSizeOf);
++
++ // The first PLArena is within the PLArenaPool, i.e. within |this|, so we
++ // don't measure it. Subsequent PLArenas are by themselves and must be
++ // measured.
++ const PLArena *arena = mPool.first.next;
++ while (arena) {
++ n += aMallocSizeOf(arena);
++ arena = arena->next;
++ }
+ n += mFreeLists.SizeOfExcludingThis(SizeOfFreeListEntryExcludingThis,
+ aMallocSizeOf);
+ return n;
+diff --git modules/libpref/src/prefapi.cpp modules/libpref/src/prefapi.cpp
+index 85dea39..0dd74de 100644
+--- modules/libpref/src/prefapi.cpp
++++ modules/libpref/src/prefapi.cpp
+@@ -809,7 +809,14 @@
+ size_t
+ pref_SizeOfPrivateData(nsMallocSizeOfFun aMallocSizeOf)
+ {
+- size_t n = PL_SizeOfArenaPoolExcludingPool(&gPrefNameArena, aMallocSizeOf);
++ size_t n = 0;
++ // The first PLArena is within the PLArenaPool, so start measuring
++ // malloc'd data with the second arena.
++ const PLArena* arena = gPrefNameArena.first.next;
++ while (arena) {
++ n += aMallocSizeOf(arena);
++ arena = arena->next;
++ }
+ for (struct CallbackNode* node = gCallbacks; node; node = node->next) {
+ n += aMallocSizeOf(node);
+ n += aMallocSizeOf(node->domain);
+diff --git xpcom/components/nsCategoryManager.cpp xpcom/components/nsCategoryManager.cpp
+index 8e964bb..62e873c 100644
+--- xpcom/components/nsCategoryManager.cpp
++++ xpcom/components/nsCategoryManager.cpp
+@@ -512,7 +512,14 @@
+ {
+ size_t n = aMallocSizeOf(this);
+
+- n += PL_SizeOfArenaPoolExcludingPool(&mArena, aMallocSizeOf);
++ // The first PLArena is within the PLArenaPool, i.e. within |this|, so we
++ // don't measure it. Subsequent PLArenas are by themselves and must be
++ // measured.
++ const PLArena *arena = mArena.first.next;
++ while (arena) {
++ n += aMallocSizeOf(arena);
++ arena = arena->next;
++ }
+
+ n += mTable.SizeOfExcludingThis(SizeOfCategoryManagerTableEntryExcludingThis,
+ aMallocSizeOf);
+diff --git xpcom/components/nsComponentManager.cpp xpcom/components/nsComponentManager.cpp
+index f6f9f0a..c80f4c3 100644
+--- xpcom/components/nsComponentManager.cpp
++++ xpcom/components/nsComponentManager.cpp
+@@ -1680,7 +1680,14 @@
+ n += mKnownStaticModules.SizeOfExcludingThis(aMallocSizeOf);
+ n += mKnownModules.SizeOfExcludingThis(nullptr, aMallocSizeOf);
+
+- n += PL_SizeOfArenaPoolExcludingPool(&mArena, aMallocSizeOf);
++ // The first PLArena is within the PLArenaPool, i.e. within |this|, so we
++ // don't measure it. Subsequent PLArenas are by themselves and must be
++ // measured.
++ const PLArena *arena = mArena.first.next;
++ while (arena) {
++ n += aMallocSizeOf(arena);
++ arena = arena->next;
++ }
+
+ n += mPendingServices.SizeOfExcludingThis(aMallocSizeOf);
+
Added: trunk/www/firefox-nightly/files/patch-js-public-RequiredDefines.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/www/firefox-nightly/files/patch-js-public-RequiredDefines.h Sat Feb 16 15:46:29 2013 (r1172)
@@ -0,0 +1,9 @@
+--- js/public/RequiredDefines.h~
++++ js/public/RequiredDefines.h
+@@ -20,5 +20,6 @@
+ * is defined before <stdint.h> is included.
+ */
+ #define __STDC_LIMIT_MACROS
++#define __STDC_CONSTANT_MACROS
+
+ #endif /* js_RequiredDefines_h___ */
Deleted: trunk/www/firefox-nightly/files/patch-js-src-js-confdefs.h.in
==============================================================================
--- trunk/www/firefox-nightly/files/patch-js-src-js-confdefs.h.in Sat Feb 16 15:46:29 2013 (r1171)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,10 +0,0 @@
---- js/src/js-confdefs.h.in~
-+++ js/src/js-confdefs.h.in
-@@ -12,6 +12,7 @@
- * C++ implementations should define these macros only when __STDC_LIMIT_MACROS
- * is defined before <stdint.h> is included. */
- #define __STDC_LIMIT_MACROS
-+#define __STDC_CONSTANT_MACROS
-
- #endif /* _JS_CONFDEFS_H_ */
-
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201302161546.r1GFkT0w097218>