Date: Wed, 3 Jul 2013 16:14:40 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1275 - in trunk: . www/firefox www/firefox-nightly www/firefox-nightly/files www/firefox/files Message-ID: <201307031614.r63GEeNx051597@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Wed Jul 3 16:14:40 2013
New Revision: 1275
Log:
update
Added:
trunk/www/firefox/files/patch-bug862759
Deleted:
trunk/Gecko_ChangeLog
trunk/www/firefox-nightly/files/patch-bug834091
Modified:
trunk/www/firefox-nightly/Makefile
trunk/www/firefox-nightly/Makefile.hgrev
trunk/www/firefox-nightly/distinfo
trunk/www/firefox/Makefile
trunk/www/firefox/distinfo
trunk/www/firefox/files/patch-bug807492
trunk/www/firefox/files/patch-bug826985
Deleted: trunk/Gecko_ChangeLog
==============================================================================
--- trunk/Gecko_ChangeLog Wed Jul 3 16:14:40 2013 (r1274)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,4 +0,0 @@
-22.0:
-- OSS was removed upstream
-- media.use_cubeb preference no longer exists, if ALSA crashes
- re-read UPDATING@20121010 for the second workaround
Modified: trunk/www/firefox-nightly/Makefile
==============================================================================
--- trunk/www/firefox-nightly/Makefile Thu Jun 27 07:24:16 2013 (r1274)
+++ trunk/www/firefox-nightly/Makefile Wed Jul 3 16:14:40 2013 (r1275)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= firefox
-PORTVERSION= 24.0.${HGREV:C/:.*//}
+PORTVERSION= 25.0.${HGREV:C/:.*//}
PORTEPOCH= 1
CATEGORIES= www ipv6
MASTER_SITES= http://hg.mozilla.org/mozilla-central/archive/
@@ -14,18 +14,18 @@
COMMENT= Web browser based on the browser portion of Mozilla
BUILD_DEPENDS= nspr>=4.9.6:${PORTSDIR}/devel/nspr \
- nss>=3.14.3:${PORTSDIR}/security/nss \
sqlite3>=3.7.17:${PORTSDIR}/databases/sqlite3 \
${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \
unzip:${PORTSDIR}/archivers/unzip
+# nss>=3.15:${PORTSDIR}/security/nss \
USE_AUTOTOOLS= autoconf213:env
USE_PYTHON_BUILD=2.7
OBJDIR_BUILD= # in-tree build broken after bug 789837
USE_GECKO= gecko
MOZ_PKGCONFIG_FILES= # empty
-USE_MOZILLA= # empty
+USE_MOZILLA= -nss # bug713933
MOZILLA_NAME= Nightly
MOZILLA_SUFX= -nightly
MOZILLA= ${PORTNAME}${MOZILLA_SUFX}
Modified: trunk/www/firefox-nightly/Makefile.hgrev
==============================================================================
--- trunk/www/firefox-nightly/Makefile.hgrev Thu Jun 27 07:24:16 2013 (r1274)
+++ trunk/www/firefox-nightly/Makefile.hgrev Wed Jul 3 16:14:40 2013 (r1275)
@@ -1 +1 @@
-HGREV= 135870:7ba8c86f1a56
+HGREV= 137216:2cae857c17cb
Modified: trunk/www/firefox-nightly/distinfo
==============================================================================
--- trunk/www/firefox-nightly/distinfo Thu Jun 27 07:24:16 2013 (r1274)
+++ trunk/www/firefox-nightly/distinfo Wed Jul 3 16:14:40 2013 (r1275)
@@ -1,2 +1,2 @@
-SHA256 (firefox-nightly/7ba8c86f1a56.tar.bz2) = dd1ffa666ed7b3e2f6d85e980b8172615536eb938080d45b1327a9b3530bf84e
-SIZE (firefox-nightly/7ba8c86f1a56.tar.bz2) = 113520736
+SHA256 (firefox-nightly/2cae857c17cb.tar.bz2) = e582ebfb9e1dc61d89778ff0979187574a996c1f6e17fbc33927810c1300c105
+SIZE (firefox-nightly/2cae857c17cb.tar.bz2) = 116852816
Deleted: trunk/www/firefox-nightly/files/patch-bug834091
==============================================================================
--- trunk/www/firefox-nightly/files/patch-bug834091 Wed Jul 3 16:14:40 2013 (r1274)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,35 +0,0 @@
-commit 8d8975b
-Author: Carmen Jiménez Cabezas <macajc@gmail.com>
-Date: Fri Jan 25 15:36:36 2013 -0800
-
- Bug 834091: Verify certificate chain for signed B2G apps as of the current time (now) instead of the signing time, r=bsmith
-
- --HG--
- extra : amend_source : 86d8ca2b28259aaf41983740b809ef8a51befc4f
- extra : rebase_source : e5a1c1199756e929f14852f5c83ba28d097449f4
----
- .../manager/ssl/src/JARSignatureVerification.cpp | 6 +-
- security/nss/lib/pkcs7/p7decode.c | 41 +++-
- security/nss/lib/pkcs7/secpkcs7.h | 17 ++
- security/nss/lib/smime/smime.def | 6 +
- security/patches/README | 4 +
- security/patches/bug-834091.patch | 216 +++++++++++++++++++++
- 6 files changed, 281 insertions(+), 9 deletions(-)
-
-diff --git security/manager/ssl/src/JARSignatureVerification.cpp security/manager/ssl/src/JARSignatureVerification.cpp
-index d0a8b98..8e694d3 100644
---- security/manager/ssl/src/JARSignatureVerification.cpp
-+++ security/manager/ssl/src/JARSignatureVerification.cpp
-@@ -586,9 +586,9 @@
- }
-
- // Verify that the signature file is a valid signature of the SF file
-- if (!SEC_PKCS7VerifyDetachedSignatureAtTime(p7_info, certUsageObjectSigner,
-- &sfCalculatedDigest.get(),
-- HASH_AlgSHA1, false, PR_Now())) {
-+ if (!SEC_PKCS7VerifyDetachedSignature(p7_info, certUsageObjectSigner,
-+ &sfCalculatedDigest.get(), HASH_AlgSHA1,
-+ false)) {
- PRErrorCode error = PR_GetError();
- const char * errorName = PR_ErrorToName(error);
- PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("Failed to verify detached signature: %s",
Modified: trunk/www/firefox/Makefile
==============================================================================
--- trunk/www/firefox/Makefile Thu Jun 27 07:24:16 2013 (r1274)
+++ trunk/www/firefox/Makefile Wed Jul 3 16:14:40 2013 (r1275)
@@ -2,7 +2,7 @@
# $FreeBSD: head/www/firefox/Makefile 310227 2013-01-11 10:22:40Z ehaupt $
PORTNAME= firefox
-DISTVERSION= 22.0
+DISTVERSION= 23.0b2
PORTEPOCH= 1
CATEGORIES= www ipv6
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source
@@ -12,7 +12,7 @@
COMMENT= Web browser based on the browser portion of Mozilla
BUILD_DEPENDS= nspr>=4.9.6:${PORTSDIR}/devel/nspr \
- nss>=3.14.3:${PORTSDIR}/security/nss \
+ nss>=3.15:${PORTSDIR}/security/nss \
sqlite3>=3.7.16.1:${PORTSDIR}/databases/sqlite3 \
${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \
@@ -55,7 +55,7 @@
.include <bsd.port.pre.mk>
-WRKSRC:= ${WRKDIR}/mozilla-release
+WRKSRC:= ${WRKDIR}/mozilla-beta
.if ${PORT_OPTIONS:MPGO}
USE_GCC?= yes
Modified: trunk/www/firefox/distinfo
==============================================================================
--- trunk/www/firefox/distinfo Thu Jun 27 07:24:16 2013 (r1274)
+++ trunk/www/firefox/distinfo Wed Jul 3 16:14:40 2013 (r1275)
@@ -1,2 +1,2 @@
-SHA256 (firefox-22.0.source.tar.bz2) = 040d4e7fb5076b6aa25f0d3851f8d98c2a2e72ef1599f4387f09f47f6096515e
-SIZE (firefox-22.0.source.tar.bz2) = 111109062
+SHA256 (firefox-23.0b2.source.tar.bz2) = 3d95bf9c578aed8ec153c292576ad777e8362a78436aca60568caf8f7b2cf4a8
+SIZE (firefox-23.0b2.source.tar.bz2) = 115799917
Modified: trunk/www/firefox/files/patch-bug807492
==============================================================================
--- trunk/www/firefox/files/patch-bug807492 Thu Jun 27 07:24:16 2013 (r1274)
+++ trunk/www/firefox/files/patch-bug807492 Wed Jul 3 16:14:40 2013 (r1275)
@@ -17,17 +17,17 @@
index c167461..8346c11 100644
--- configure.in
+++ configure.in
-@@ -5258,17 +5258,17 @@ if test -n "$MOZ_WEBRTC"; then
- *-android*|*-linuxandroid*)
- if test -n "$MOZ_B2G"; then
- MOZ_WEBRTC=1
- else
- dnl Make sure doesn't get matched by *-linux*
- MOZ_WEBRTC=
- fi
- ;;
-- *-linux*|*-mingw*|*-darwin*)
-+ *-linux*|*-mingw*|*-darwin*|*-dragonfly*|*-freebsd*|*-netbsd*|*-openbsd*)
+@@ -5246,17 +5246,17 @@ if test "$NS_PRINTING"; then
+ AC_DEFINE(NS_PRINT_PREVIEW)
+ fi
+
+ dnl Turn off webrtc for OS's we don't handle yet, but allow
+ dnl --enable-webrtc to override. Can disable for everything in
+ dnl the master list above.
+ if test -n "$MOZ_WEBRTC"; then
+ case "$target" in
+- *-linux*|*-mingw*|*-darwin*|*-android*|*-linuxandroid*)
++ *-linux*|*-mingw*|*-darwin*|*-android*|*-linuxandroid*|*-dragonfly*|*-freebsd*|*-netbsd*|*-openbsd*)
dnl Leave enabled
;;
*)
Modified: trunk/www/firefox/files/patch-bug826985
==============================================================================
--- trunk/www/firefox/files/patch-bug826985 Thu Jun 27 07:24:16 2013 (r1274)
+++ trunk/www/firefox/files/patch-bug826985 Wed Jul 3 16:14:40 2013 (r1275)
@@ -16,16 +16,16 @@
index 55e4cd1..76567b3 100644
--- configure.in
+++ configure.in
-@@ -5294,6 +5294,9 @@ if test -n "$MOZ_WEBRTC"; then
+@@ -5309,6 +5309,9 @@ if test -n "$MOZ_WEBRTC"; then
MOZ_VP8_ENCODER=1
MOZ_VP8_ERROR_CONCEALMENT=1
+ dnl with libv4l2 we can support more cameras
+ PKG_CHECK_MODULES(MOZ_LIBV4L2, libv4l2)
+
- if test "$MOZ_WIDGET_TOOLKIT" != "gonk"; then
- dnl OpenSLES is only available in Android 2.3 and later; we'll change this
- dnl hard dependency to a dynamic load with graceful runtime failure before
+ dnl enable once Signaling lands
+ MOZ_WEBRTC_SIGNALING=1
+ AC_DEFINE(MOZ_WEBRTC_SIGNALING)
@@ -8981,6 +8984,10 @@ elif test "${OS_TARGET}" = "Android"; then
fi
fi
Added: trunk/www/firefox/files/patch-bug862759
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/www/firefox/files/patch-bug862759 Wed Jul 3 16:14:40 2013 (r1275)
@@ -0,0 +1,10 @@
+--- js/src/frontend/ParseMaps.cpp~
++++ js/src/frontend/ParseMaps.cpp
+@@ -134,5 +134,5 @@ frontend::InitAtomMap(JSContext *cx, frontend::AtomIndexMap *indices, HeapPtrAto
+ }
+ }
+
+-template class AtomDecls<FullParseHandler>;
+-template class AtomDecls<SyntaxParseHandler>;
++template class frontend::AtomDecls<FullParseHandler>;
++template class frontend::AtomDecls<SyntaxParseHandler>;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201307031614.r63GEeNx051597>