Update to 24.2.0

* Fix PR pkg/48420: fix build on NetBSD with drace support
  Patches from richard@

Changelog:
Fixed in Firefox ESR 24.2
MFSA 2013-117 Mis-issued ANSSI/DCSSI certificate
MFSA 2013-116 JPEG information leak
MFSA 2013-115 GetElementIC typed array stubs can be generated outside observed typesets
MFSA 2013-114 Use-after-free in synthetic mouse movement
MFSA 2013-113 Trust settings for built-in roots ignored during EV certificate validation
MFSA 2013-111 Segmentation violation when replacing ordered list elements
MFSA 2013-109 Use-after-free during Table Editing
MFSA 2013-108 Use-after-free in event listeners
MFSA 2013-104 Miscellaneous memory safety hazards (rv:26.0 / rv:24.2)

5 files changed, 55 insertions, 38 deletions

diff --git a/www/firefox24/Makefile b/www/firefox24/Makefile
index 384442bf508..496211c9345 100644
--- a/www/firefox24/Makefile
+++ b/www/firefox24/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.8 2013/11/25 12:00:48 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2013/12/15 14:02:25 ryoon Exp $
 
 FIREFOX_VER=	${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
-MOZ_BRANCH=	24.1.1
+MOZ_BRANCH=	24.2.0
 MOZ_BRANCH_MINOR=	esr
 
 DISTNAME=	firefox-${FIREFOX_VER}.source
 PKGNAME=	firefox24-${MOZ_BRANCH}${MOZ_BRANCH_MINOR:S/b/beta/:S/esr//}
-PKGREVISION=	2
 CATEGORIES=	www
 #MASTER_SITES=	${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
 MASTER_SITES+=	${MASTER_SITE_MOZILLA_ALL:=firefox/releases/${FIREFOX_VER}/source/}
diff --git a/www/firefox24/distinfo b/www/firefox24/distinfo
index cfe5de1ec5a..18023bb91d3 100644
--- a/www/firefox24/distinfo
+++ b/www/firefox24/distinfo
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.4 2013/11/21 15:25:17 ryoon Exp $
+$NetBSD: distinfo,v 1.5 2013/12/15 14:02:25 ryoon Exp $
 
-SHA1 (firefox-24.1.1esr.source.tar.bz2) = 742b1f134db47793a1426ce4ee09a5f9dc6b51fc
-RMD160 (firefox-24.1.1esr.source.tar.bz2) = 47c6040f82867b874a3044afe86550c1b4c50d1f
-Size (firefox-24.1.1esr.source.tar.bz2) = 119861572 bytes
-SHA1 (patch-aa) = e8a10637cefb668f1db518464ba75b5469090f8f
+SHA1 (firefox-24.2.0esr.source.tar.bz2) = 20d6fd8be73ff09d14e31543a2ce134dc6d503a4
+RMD160 (firefox-24.2.0esr.source.tar.bz2) = 1395d54881c9ebc3e7ddee27b55b247f94025916
+Size (firefox-24.2.0esr.source.tar.bz2) = 119820009 bytes
+SHA1 (patch-aa) = bc6b89aa36a429ee148685618cca08dba3e01bbc
 SHA1 (patch-ak) = 971ddb1f12b14bcee604c9d7e72da5e7bf47d9be
 SHA1 (patch-al) = 553c6042a98e4b381a46eec50c02cff349d88bd2
 SHA1 (patch-ao) = ebf95a9abf76439cdd890ea34f75f0d8d1114fe0
-SHA1 (patch-as) = 678d50cccaa29e32bb703a8c66ecf31a10fe8078
+SHA1 (patch-as) = f526273a9080e46e4b8da8e10735babd865c9a92
 SHA1 (patch-bf) = 75c971043e9f693203d6bd670b2c20c4952a7756
 SHA1 (patch-bg) = e5af56b3dca81ad67149c09942580ebd9062b38d
 SHA1 (patch-bi) = 3dd927d93431afe000cd4a45b4d9920e63158a85
@@ -117,7 +117,7 @@ SHA1 (patch-rc) = 2733724442a2cb49c5091146fd7e6001af686121
 SHA1 (patch-security_manager_ssl_src_JARSignatureVerification.cpp) = e9749dfeb0d3fcb4637935322ffd1e0cad4f8ec3
 SHA1 (patch-security_manager_ssl_src_nsNSSComponent.cpp) = c4c96b7d3cb0c5dbcfe3820fd52421eec2592452
 SHA1 (patch-toolkit_components_osfile_osfile__unix__allthreads.jsm) = 0bb66da3445da1cab81b9ddf46e74b03070243af
-SHA1 (patch-toolkit_components_osfile_osfile__unix__back.jsm) = c5069994938d2b2640c527cc63aed186e174d235
+SHA1 (patch-toolkit_components_osfile_osfile__unix__back.jsm) = 796c666fc6941ca62eda711cf94bdde45a3fe3c0
 SHA1 (patch-toolkit_components_osfile_osfile__unix__front.jsm) = 0d8200b8c43dc4c56f5e3d53fd13f48d7ff6dc38
 SHA1 (patch-toolkit_library_Makefile.in) = 0c91d647f0f3a4653d39f11c9d8fd63611235932
 SHA1 (patch-toolkit_mozapps_update_updater_updater.cpp) = 6936e5408fc7f0110768f3fc8f27506c0e7879fa
diff --git a/www/firefox24/patches/patch-aa b/www/firefox24/patches/patch-aa
index 347be79aca5..7859ecf08ae 100644
--- a/www/firefox24/patches/patch-aa
+++ b/www/firefox24/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.1 2013/11/03 04:51:59 ryoon Exp $
+$NetBSD: patch-aa,v 1.2 2013/12/15 14:02:25 ryoon Exp $
 
---- configure.in.orig	2013-09-10 03:43:23.000000000 +0000
+--- configure.in.orig	2013-12-06 02:21:00.000000000 +0000
 +++ configure.in
 @@ -1370,6 +1370,17 @@ if test "$GNU_CC"; then
      CFLAGS=$_SAVE_CFLAGS
@@ -20,7 +20,7 @@ $NetBSD: patch-aa,v 1.1 2013/11/03 04:51:59 ryoon Exp $
      # Turn on GNU-specific warnings:
      # -Wall - turn on a lot of warnings
      # -Wpointer-arith - good to have
-@@ -2047,6 +2058,9 @@ ia64*-hpux*)
+@@ -2049,6 +2060,9 @@ ia64*-hpux*)
      if test -z "$MC"; then
          MC=mc.exe
      fi
@@ -30,7 +30,7 @@ $NetBSD: patch-aa,v 1.1 2013/11/03 04:51:59 ryoon Exp $
      ;;
  *-mingw*)
      DSO_CFLAGS=
-@@ -2843,6 +2857,7 @@ EOF
+@@ -2845,6 +2859,7 @@ EOF
  #pragma GCC visibility push(hidden)
  #pragma GCC visibility push(default)
  #include <string.h>
@@ -38,7 +38,7 @@ $NetBSD: patch-aa,v 1.1 2013/11/03 04:51:59 ryoon Exp $
  #pragma GCC visibility pop
  
  __attribute__ ((visibility ("default"))) void Func() {
-@@ -2851,7 +2866,7 @@ __attribute__ ((visibility ("default")))
+@@ -2853,7 +2868,7 @@ __attribute__ ((visibility ("default")))
  }
  EOF
                         ac_cv_have_visibility_builtin_bug=no
@@ -47,7 +47,16 @@ $NetBSD: patch-aa,v 1.1 2013/11/03 04:51:59 ryoon Exp $
                           ac_cv_have_visibility_builtin_bug=yes
                         else
                           if test `grep -c "@PLT" conftest.S` = 0; then
-@@ -3017,6 +3032,9 @@ dnl ====================================
+@@ -2993,7 +3008,7 @@ AC_LANG_C
+ 
+ AC_ARG_ENABLE(dtrace,
+               [  --enable-dtrace         build with dtrace support if available (default=no)],
+-              [enable_dtrace="yes"],)
++              [enable_dtrace=$enableval],)
+ if test "x$enable_dtrace" = "xyes"; then
+   MOZ_CHECK_HEADER(sys/sdt.h, HAVE_DTRACE=1)
+   if test -n "$HAVE_DTRACE"; then
+@@ -3019,6 +3034,9 @@ dnl ====================================
  case $target in
  *-hpux11.*)
  	;;
@@ -57,7 +66,7 @@ $NetBSD: patch-aa,v 1.1 2013/11/03 04:51:59 ryoon Exp $
  *)
  	AC_CHECK_LIB(c_r, gethostbyname_r)
  	;;
-@@ -3319,6 +3337,9 @@ AC_CACHE_CHECK(
+@@ -3321,6 +3339,9 @@ AC_CACHE_CHECK(
          #ifdef linux
          #define _BSD_SOURCE 1
          #endif
@@ -67,7 +76,7 @@ $NetBSD: patch-aa,v 1.1 2013/11/03 04:51:59 ryoon Exp $
          #include <resolv.h>
          ],
          [int foo = res_ninit(&_res);],
-@@ -3973,6 +3994,14 @@ if test -n "$YASM"; then
+@@ -3975,6 +3996,14 @@ if test -n "$YASM"; then
    _YASM_BUILD=`        echo ${YASM_VERSION} | $AWK -F\. '{ print $4 }'`
  fi
  
@@ -82,7 +91,7 @@ $NetBSD: patch-aa,v 1.1 2013/11/03 04:51:59 ryoon Exp $
  if test -z "$SKIP_LIBRARY_CHECKS"; then
  dnl system JPEG support
  dnl ========================================================
-@@ -4000,11 +4029,7 @@ if test "$MOZ_NATIVE_JPEG" = 1; then
+@@ -4002,11 +4031,7 @@ if test "$MOZ_NATIVE_JPEG" = 1; then
                       #include <jpeglib.h> ],
                     [ #if JPEG_LIB_VERSION < $MOZJPEG
                       #error "Insufficient JPEG library version ($MOZJPEG required)."
@@ -95,7 +104,7 @@ $NetBSD: patch-aa,v 1.1 2013/11/03 04:51:59 ryoon Exp $
                     MOZ_NATIVE_JPEG=1,
                     AC_MSG_ERROR([Insufficient JPEG library version for --with-system-jpeg]))
  fi
-@@ -4139,6 +4164,22 @@ if test -n "$MOZ_NATIVE_FFI"; then
+@@ -4141,6 +4166,22 @@ if test -n "$MOZ_NATIVE_FFI"; then
  fi
  
  dnl ========================================================
@@ -118,7 +127,7 @@ $NetBSD: patch-aa,v 1.1 2013/11/03 04:51:59 ryoon Exp $
  dnl Java SDK support
  dnl ========================================================
  
-@@ -5297,7 +5338,7 @@ dnl --enable-webrtc to override.  Can di
+@@ -5299,7 +5340,7 @@ dnl --enable-webrtc to override.  Can di
  dnl the master list above.
  if test -n "$MOZ_WEBRTC"; then
      case "$target" in
@@ -127,7 +136,7 @@ $NetBSD: patch-aa,v 1.1 2013/11/03 04:51:59 ryoon Exp $
          dnl Leave enabled
          ;;
      *)
-@@ -5353,6 +5394,9 @@ if test -n "$MOZ_WEBRTC"; then
+@@ -5355,6 +5396,9 @@ if test -n "$MOZ_WEBRTC"; then
      MOZ_VP8_ENCODER=1
      MOZ_VP8_ERROR_CONCEALMENT=1
  
@@ -137,7 +146,7 @@ $NetBSD: patch-aa,v 1.1 2013/11/03 04:51:59 ryoon Exp $
  dnl enable once Signaling lands
      MOZ_WEBRTC_SIGNALING=1
      AC_DEFINE(MOZ_WEBRTC_SIGNALING)
-@@ -5379,15 +5423,18 @@ AC_SUBST(MOZ_SRTP)
+@@ -5381,15 +5425,18 @@ AC_SUBST(MOZ_SRTP)
  
  dnl Use integers over floats for audio on B2G and Android, because audio
  dnl backends for those platforms don't support floats.
@@ -159,7 +168,7 @@ $NetBSD: patch-aa,v 1.1 2013/11/03 04:51:59 ryoon Exp $
  
  dnl ========================================================
  dnl = Disable Speech API code
-@@ -5737,7 +5784,7 @@ MOZ_ALSA=)
+@@ -5739,7 +5786,7 @@ MOZ_ALSA=)
  
  if test -n "$MOZ_ALSA"; then
      AC_DEFINE(MOZ_CUBEB)
@@ -168,7 +177,7 @@ $NetBSD: patch-aa,v 1.1 2013/11/03 04:51:59 ryoon Exp $
           [echo "$MOZ_ALSA_PKG_ERRORS"
            AC_MSG_ERROR([Need alsa for Ogg, Wave or WebM decoding on Linux.  Disable with --disable-ogg --disable-wave --disable-webm.  (On Ubuntu, you might try installing the package libasound2-dev.)])])
  fi
-@@ -8385,7 +8432,7 @@ if test "$MOZ_ENABLE_SKIA"; then
+@@ -8387,7 +8434,7 @@ if test "$MOZ_ENABLE_SKIA"; then
      AC_DEFINE(GR_DLL)
    fi
  
@@ -177,7 +186,7 @@ $NetBSD: patch-aa,v 1.1 2013/11/03 04:51:59 ryoon Exp $
      MOZ_ENABLE_SKIA_GPU=1
      AC_DEFINE(USE_SKIA_GPU)
      AC_SUBST(MOZ_ENABLE_SKIA_GPU)
-@@ -8466,16 +8513,26 @@ MOZ_ARG_DISABLE_BOOL(necko-wifi,
+@@ -8468,16 +8515,26 @@ MOZ_ARG_DISABLE_BOOL(necko-wifi,
      NECKO_WIFI=,
      NECKO_WIFI=1)
  
@@ -214,7 +223,7 @@ $NetBSD: patch-aa,v 1.1 2013/11/03 04:51:59 ryoon Exp $
  fi
  
  if test "$NECKO_WIFI"; then
-@@ -9186,6 +9243,27 @@ if test -z "$HAVE_TOOLCHAIN_SUPPORT_SSSE
+@@ -9188,6 +9245,27 @@ if test -z "$HAVE_TOOLCHAIN_SUPPORT_SSSE
    EXTRA_GYP_DEFINES="$EXTRA_GYP_DEFINES -D yuv_disable_asm=1"
  fi
  
diff --git a/www/firefox24/patches/patch-as b/www/firefox24/patches/patch-as
index f5efac5d708..8aa8f282e67 100644
--- a/www/firefox24/patches/patch-as
+++ b/www/firefox24/patches/patch-as
@@ -1,10 +1,10 @@
-$NetBSD: patch-as,v 1.1 2013/11/03 04:51:59 ryoon Exp $
+$NetBSD: patch-as,v 1.2 2013/12/15 14:02:25 ryoon Exp $
 
 Treat DragonFly like FreeBSD.
 
---- js/src/configure.in.orig	2013-09-10 03:43:34.000000000 +0000
+--- js/src/configure.in.orig	2013-12-06 02:21:11.000000000 +0000
 +++ js/src/configure.in
-@@ -2424,6 +2424,7 @@ EOF
+@@ -2426,6 +2426,7 @@ EOF
  #pragma GCC visibility push(hidden)
  #pragma GCC visibility push(default)
  #include <string.h>
@@ -12,7 +12,7 @@ Treat DragonFly like FreeBSD.
  #pragma GCC visibility pop
  
  __attribute__ ((visibility ("default"))) void Func() {
-@@ -2432,7 +2433,7 @@ __attribute__ ((visibility ("default")))
+@@ -2434,7 +2435,7 @@ __attribute__ ((visibility ("default")))
  }
  EOF
                         ac_cv_have_visibility_builtin_bug=no
@@ -21,7 +21,16 @@ Treat DragonFly like FreeBSD.
                           ac_cv_have_visibility_builtin_bug=yes
                         else
                           if test `grep -c "@PLT" conftest.S` = 0; then
-@@ -2657,7 +2658,7 @@ then
+@@ -2500,7 +2501,7 @@ AC_LANG_C
+ AC_ARG_ENABLE(dtrace,
+               [  --enable-dtrace         build with dtrace support if available (default=no)],
+               [enable_dtrace="yes"],)
+-if test "x$enable_dtrace" = "xyes"; then
++if test "x$enable_dtrace" = $enableval; then
+   MOZ_CHECK_HEADER(sys/sdt.h, HAVE_DTRACE=1)
+   if test -n "$HAVE_DTRACE"; then
+       AC_DEFINE(INCLUDE_MOZILLA_DTRACE)
+@@ -2659,7 +2660,7 @@ then
      fi
  
  	case "$target" in
@@ -30,7 +39,7 @@ Treat DragonFly like FreeBSD.
  			AC_DEFINE(_REENTRANT)
  			AC_DEFINE(_THREAD_SAFE)
  			dnl -pthread links in -lpthread, so don't specify it explicitly.
-@@ -2736,14 +2737,19 @@ fi
+@@ -2738,14 +2739,19 @@ fi
  AC_CACHE_CHECK(
      [for res_ninit()],
      ac_cv_func_res_ninit,
@@ -53,7 +62,7 @@ Treat DragonFly like FreeBSD.
          [ac_cv_func_res_ninit=no])
      ])
  
-@@ -3517,7 +3523,7 @@ if test "$MOZ_MEMORY"; then
+@@ -3519,7 +3525,7 @@ if test "$MOZ_MEMORY"; then
    *-darwin*)
      AC_DEFINE(MOZ_MEMORY_DARWIN)
      ;;
@@ -62,7 +71,7 @@ Treat DragonFly like FreeBSD.
      AC_DEFINE(MOZ_MEMORY_BSD)
      ;;
    *-android*|*-linuxandroid*)
-@@ -4417,6 +4423,16 @@ fi
+@@ -4419,6 +4425,16 @@ fi
  dnl ========================================================
  dnl ECMAScript Internationalization API Support (uses ICU)
  dnl ========================================================
@@ -79,7 +88,7 @@ Treat DragonFly like FreeBSD.
  
  if test -n "$JS_STANDALONE"; then
      ENABLE_INTL_API=1
-@@ -4429,37 +4445,36 @@ MOZ_ARG_ENABLE_BOOL(intl-api,
+@@ -4431,37 +4447,36 @@ MOZ_ARG_ENABLE_BOOL(intl-api,
  dnl Settings for the implementation of the ECMAScript Internationalization API
  if test -n "$ENABLE_INTL_API"; then
      AC_DEFINE(ENABLE_INTL_API)
diff --git a/www/firefox24/patches/patch-toolkit_components_osfile_osfile__unix__back.jsm b/www/firefox24/patches/patch-toolkit_components_osfile_osfile__unix__back.jsm
index 8dde913df8e..12616d42c1a 100644
--- a/www/firefox24/patches/patch-toolkit_components_osfile_osfile__unix__back.jsm
+++ b/www/firefox24/patches/patch-toolkit_components_osfile_osfile__unix__back.jsm
@@ -1,11 +1,11 @@
-$NetBSD: patch-toolkit_components_osfile_osfile__unix__back.jsm,v 1.2 2013/11/13 14:17:12 ryoon Exp $
+$NetBSD: patch-toolkit_components_osfile_osfile__unix__back.jsm,v 1.3 2013/12/15 14:02:25 ryoon Exp $
 
 Based on martin@'s patch for firefox 27.0
 
 * Use off_t for st_size
 * Use function name for NetBSD
 
---- toolkit/components/osfile/osfile_unix_back.jsm.orig	2013-10-22 06:19:20.000000000 +0000
+--- toolkit/components/osfile/osfile_unix_back.jsm.orig	2013-12-06 02:21:29.000000000 +0000
 +++ toolkit/components/osfile/osfile_unix_back.jsm
 @@ -173,7 +173,7 @@
           }