pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/www/firefox68 firefox68: Update to 68.6.0
details: https://anonhg.NetBSD.org/pkgsrc/rev/59ecd73dbfa2
branches: trunk
changeset: 412864:59ecd73dbfa2
user: nia <nia%pkgsrc.org@localhost>
date: Thu Mar 12 19:39:35 2020 +0000
description:
firefox68: Update to 68.6.0
While here,
- Remove OSS support now that cubeb_sun has been stable for a long while
- Appease pkglint
Security fixes in this release:
#CVE-2020-6805: Use-after-free when removing data about origins
#CVE-2020-6806: BodyStream::OnInputStreamReady was missing protections
#CVE-2020-6807: Use-after-free in cubeb during stream destruction
#CVE-2020-6811: Devtools' 'Copy as cURL' feature did not fully escape
#CVE-2019-20503: Out of bounds reads in sctp_load_addresses_from_init
#CVE-2020-6812: The names of AirPods with personally identifiable
#CVE-2020-6814: Memory safety bugs fixed in Firefox 74 and Firefox ESR 68.6
diffstat:
www/firefox68/Makefile | 5 +-
www/firefox68/PLIST | 9 +-
www/firefox68/distinfo | 24 +-
www/firefox68/mozilla-common.mk | 8 +-
www/firefox68/options.mk | 11 +-
www/firefox68/patches/patch-aa | 64 +-
www/firefox68/patches/patch-build_moz.configure_old.configure | 12 -
www/firefox68/patches/patch-dom_media_CubebUtils.cpp | 6 +-
www/firefox68/patches/patch-media_libcubeb_src_cubeb.c | 38 +-
www/firefox68/patches/patch-media_libcubeb_src_cubeb__oss.c | 461 ----------
www/firefox68/patches/patch-media_libcubeb_src_moz.build | 21 +-
www/firefox68/patches/patch-media_libcubeb_update.sh | 7 +-
www/firefox68/patches/patch-toolkit_library_moz.build | 13 +-
13 files changed, 49 insertions(+), 630 deletions(-)
diffs (truncated from 896 to 300 lines):
diff -r 61719068841c -r 59ecd73dbfa2 www/firefox68/Makefile
--- a/www/firefox68/Makefile Thu Mar 12 19:34:56 2020 +0000
+++ b/www/firefox68/Makefile Thu Mar 12 19:39:35 2020 +0000
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.14 2020/03/10 22:11:10 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2020/03/12 19:39:35 nia Exp $
FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
-MOZ_BRANCH= 68.5
+MOZ_BRANCH= 68.6
MOZ_BRANCH_MINOR= .0esr
DISTNAME= firefox-${FIREFOX_VER}.source
PKGNAME= ${DISTNAME:S/.source//:S/b/beta/:S/esr//:S/firefox-/firefox68-/}
-PKGREVISION= 3
CATEGORIES= www
MASTER_SITES+= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
EXTRACT_SUFX= .tar.xz
diff -r 61719068841c -r 59ecd73dbfa2 www/firefox68/PLIST
--- a/www/firefox68/PLIST Thu Mar 12 19:34:56 2020 +0000
+++ b/www/firefox68/PLIST Thu Mar 12 19:39:35 2020 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2020/02/15 12:48:22 nia Exp $
+@comment $NetBSD: PLIST,v 1.5 2020/03/12 19:39:35 nia Exp $
bin/firefox68
lib/firefox68/actors/AudioPlaybackChild.jsm
lib/firefox68/actors/AutoplayChild.jsm
@@ -2887,13 +2887,13 @@
${PLIST.debug}lib/firefox68/browser/chrome/devtools/modules/devtools/client/shared/vendor/react-dev.js
${PLIST.debug}lib/firefox68/browser/chrome/devtools/modules/devtools/client/shared/vendor/react-dom-dev.js
lib/firefox68/browser/chrome/devtools/modules/devtools/client/shared/vendor/react-dom-factories.js
+${PLIST.debug}lib/firefox68/browser/chrome/devtools/modules/devtools/client/shared/vendor/react-dom-server-dev.js
lib/firefox68/browser/chrome/devtools/modules/devtools/client/shared/vendor/react-dom-server.js
-${PLIST.debug}lib/firefox68/browser/chrome/devtools/modules/devtools/client/shared/vendor/react-dom-server-dev.js
-lib/firefox68/browser/chrome/devtools/modules/devtools/client/shared/vendor/react-dom-test-utils.js
${PLIST.debug}lib/firefox68/browser/chrome/devtools/modules/devtools/client/shared/vendor/react-dom-test-utils-dev.js
+lib/firefox68/browser/chrome/devtools/modules/devtools/client/shared/vendor/react-dom-test-utils.js
lib/firefox68/browser/chrome/devtools/modules/devtools/client/shared/vendor/react-dom.js
+${PLIST.debug}lib/firefox68/browser/chrome/devtools/modules/devtools/client/shared/vendor/react-prop-types-dev.js
lib/firefox68/browser/chrome/devtools/modules/devtools/client/shared/vendor/react-prop-types.js
-${PLIST.debug}lib/firefox68/browser/chrome/devtools/modules/devtools/client/shared/vendor/react-prop-types-dev.js
lib/firefox68/browser/chrome/devtools/modules/devtools/client/shared/vendor/react-redux.js
lib/firefox68/browser/chrome/devtools/modules/devtools/client/shared/vendor/react-router-dom.js
lib/firefox68/browser/chrome/devtools/modules/devtools/client/shared/vendor/react-test-renderer-shallow.js
@@ -4271,6 +4271,7 @@
lib/firefox68/browser/features/webcompat%mozilla.org@localhost/injections/css/bug1605611-maps.google.com-directions-time.css
lib/firefox68/browser/features/webcompat%mozilla.org@localhost/injections/css/bug1609991-cracked.com-flex-basis-fix.css
lib/firefox68/browser/features/webcompat%mozilla.org@localhost/injections/css/bug1610016-gaana.com-input-position-fix.css
+lib/firefox68/browser/features/webcompat%mozilla.org@localhost/injections/css/bug1610344-directv.com.co-hide-unsupported-message.css
lib/firefox68/browser/features/webcompat%mozilla.org@localhost/injections/js/bug0000000-testbed-js-injection.js
lib/firefox68/browser/features/webcompat%mozilla.org@localhost/injections/js/bug1452707-window.controllers-shim-ib.absa.co.za.js
lib/firefox68/browser/features/webcompat%mozilla.org@localhost/injections/js/bug1457335-histography.io-ua-change.js
diff -r 61719068841c -r 59ecd73dbfa2 www/firefox68/distinfo
--- a/www/firefox68/distinfo Thu Mar 12 19:34:56 2020 +0000
+++ b/www/firefox68/distinfo Thu Mar 12 19:39:35 2020 +0000
@@ -1,14 +1,13 @@
-$NetBSD: distinfo,v 1.10 2020/02/15 12:48:22 nia Exp $
+$NetBSD: distinfo,v 1.11 2020/03/12 19:39:35 nia Exp $
-SHA1 (firefox-68.5.0esr.source.tar.xz) = 5e74dc0335b09819b24285d23e7746ca70af1dae
-RMD160 (firefox-68.5.0esr.source.tar.xz) = 34b2446b42e98de3e9f5798466bd4f49375dd44a
-SHA512 (firefox-68.5.0esr.source.tar.xz) = 0acf4ecd47bccf062ab330231e36355f5d84e66ab411f653ae3160583613840925bb473c0f7dfa4b15311a543940293c4633516851c9466c4b0133c9271710d3
-Size (firefox-68.5.0esr.source.tar.xz) = 314176068 bytes
-SHA1 (patch-aa) = 1f292aae7d37bd480ba834324b737bfebee52503
+SHA1 (firefox-68.6.0esr.source.tar.xz) = 85d35d0a0190d56585f93c9f117d5c0f52bcbc44
+RMD160 (firefox-68.6.0esr.source.tar.xz) = d11d44f5400ca1f5c3b721dd974a77fbf7cf7e7a
+SHA512 (firefox-68.6.0esr.source.tar.xz) = 84565d654ed8bd2d036d08de4d16e41ae8881f0b20b34424ab347d50a37384acf50c04f74269720e79db28028569dff79f2b910848939ff87c078f36684a75a3
+Size (firefox-68.6.0esr.source.tar.xz) = 313814396 bytes
+SHA1 (patch-aa) = 9f7200c411cd2217a80ec10a276c8877bc6b845c
SHA1 (patch-browser_app_profile_firefox.js) = 076cc2892547bac07fe907533f4e821f13f5738e
-SHA1 (patch-build_moz.configure_old.configure) = 05963b12fd908d90e3378b30cff7e48291b8a447
SHA1 (patch-dom_base_nsAttrName.h) = ac7ba441a3b27df2855cf2673eea36b1cb44ad49
-SHA1 (patch-dom_media_CubebUtils.cpp) = b1b4f981c4bede877e3bd092d2648d4b8cbc73a5
+SHA1 (patch-dom_media_CubebUtils.cpp) = 3cd2c65ab281d802c56216565970450767a3fb24
SHA1 (patch-gfx_angle_checkout_src_common_third__party_smhasher_src_PMurHash.cpp) = e458c9c8dc66edc69c1874734af28a77fc5e3993
SHA1 (patch-gfx_angle_checkout_src_compiler_translator_InfoSink.h) = 2f73c76c48852613e0c55c1680fcc2a9eb3cf4ef
SHA1 (patch-gfx_gl_GLContextProviderGLX.cpp) = 2c909a10a341e600392417240ad0c556f495d6ba
@@ -24,15 +23,14 @@
SHA1 (patch-js_src_util_NativeStack.cpp) = 2c6f844d38343f40ebbc8fd665279256e4ae6d35
SHA1 (patch-media_ffvpx_libavutil_arm_bswap.h) = de58daa0fd23d4fec50426602b65c9ea5862558a
SHA1 (patch-media_libcubeb_gtest_moz.build) = ea6dcc7ceeb76ce1fb9d508cf43080a2eef3a9e4
-SHA1 (patch-media_libcubeb_src_cubeb.c) = e3446562ed16ec9643df42ee0b9c46ee91f22913
+SHA1 (patch-media_libcubeb_src_cubeb.c) = dcc173f0bef8b7b12c45739bf04577f3292a517e
SHA1 (patch-media_libcubeb_src_cubeb__alsa.c) = f359a66a22f11142d05746e15894d998d3e3bf5a
-SHA1 (patch-media_libcubeb_src_cubeb__oss.c) = 103f751d5a7bc14a81a6ed43e1afc722bc092f7e
-SHA1 (patch-media_libcubeb_src_moz.build) = dcca90cb5132442877712cd7b1f4e832c93d2655
-SHA1 (patch-media_libcubeb_update.sh) = 4508319d8534a0cc983e4767c2142169af9e5033
+SHA1 (patch-media_libcubeb_src_moz.build) = 7d66d9e0d7129b2106885201f88355262ee1a22a
+SHA1 (patch-media_libcubeb_update.sh) = 8dcc4ca8e2812b4063f28e5d6308abbee0b1c9d9
SHA1 (patch-media_libpng_pngpriv.h) = c8084332560017cd7c9b519b61d125fa28af0dbc
SHA1 (patch-nsprpub_pr_src_pthreads_ptsynch.c) = c39a222c5ab16c26cb214e5e53a0b61291a00512
SHA1 (patch-toolkit_components_terminator_nsTerminator.cpp) = e5700d95302ef9672b404ab19e13ef7ba3ede5cf
-SHA1 (patch-toolkit_library_moz.build) = 102e3713552c26f76e8b4e473846bb8fbc44b278
+SHA1 (patch-toolkit_library_moz.build) = 57516a1cc888fdbaf39ba90f73e5de488ad1f01e
SHA1 (patch-toolkit_modules_subprocess_subprocess__shared__unix.js) = 22a39e54e042ab2270a3cb54e4e307c8900cad12
SHA1 (patch-toolkit_moz.configure) = 40ee147cc1d2c62dd6c83b3f67ce9e61f758ea57
SHA1 (patch-toolkit_mozapps_installer_packager.mk) = b2343fbad2556504dfd13601c02e6e2357c7d2bc
diff -r 61719068841c -r 59ecd73dbfa2 www/firefox68/mozilla-common.mk
--- a/www/firefox68/mozilla-common.mk Thu Mar 12 19:34:56 2020 +0000
+++ b/www/firefox68/mozilla-common.mk Thu Mar 12 19:39:35 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.6 2019/12/22 14:33:58 gdt Exp $
+# $NetBSD: mozilla-common.mk,v 1.7 2020/03/12 19:39:35 nia Exp $
#
# common Makefile fragment for mozilla packages based on gecko 2.0.
#
@@ -38,8 +38,8 @@
.endif
# For rustc/cargo detection
-CONFIGURE_ARGS+= --target=${MACHINE_GNU_PLATFORM:Q}
-CONFIGURE_ARGS+= --host=${MACHINE_GNU_PLATFORM:Q}
+CONFIGURE_ARGS+= --target=${MACHINE_GNU_PLATFORM}
+CONFIGURE_ARGS+= --host=${MACHINE_GNU_PLATFORM}
CONFIGURE_ENV+= BINDGEN_CFLAGS="-isystem${PREFIX}/include/nspr \
-isystem${X11BASE}/include/pixman-1"
@@ -126,7 +126,7 @@
CONFIG_SUB_OVERRIDE+= ${MOZILLA_DIR}nsprpub/build/autoconf/config.sub
CONFIG_SUB_OVERRIDE+= ${MOZILLA_DIR}/js/ctypes/libffi/config.sub
-CONFIGURE_ENV+= CPP=${CPP}
+CONFIGURE_ENV+= CPP=${CPP:Q}
# Build outside ${WRKSRC}
# Try to avoid conflict with config/makefiles/xpidl/Makefile.in
diff -r 61719068841c -r 59ecd73dbfa2 www/firefox68/options.mk
--- a/www/firefox68/options.mk Thu Mar 12 19:34:56 2020 +0000
+++ b/www/firefox68/options.mk Thu Mar 12 19:39:35 2020 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: options.mk,v 1.7 2020/02/27 11:06:30 nia Exp $
+# $NetBSD: options.mk,v 1.8 2020/03/12 19:39:35 nia Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.firefox
PKG_SUPPORTED_OPTIONS= official-mozilla-branding
PKG_SUPPORTED_OPTIONS+= debug debug-info mozilla-jemalloc webrtc
-PKG_SUPPORTED_OPTIONS+= alsa oss pulseaudio dbus wayland
+PKG_SUPPORTED_OPTIONS+= alsa pulseaudio dbus wayland
PLIST_VARS+= jemalloc debug
.include "../../devel/wayland/platform.mk"
@@ -15,7 +15,7 @@
.if ${OPSYS} == "Linux"
PKG_SUGGESTED_OPTIONS+= pulseaudio mozilla-jemalloc dbus webrtc
.else
-PKG_SUGGESTED_OPTIONS+= oss dbus
+PKG_SUGGESTED_OPTIONS+= dbus
.endif
.if ${OPSYS} == "NetBSD" && empty(OS_VERSION:M[0-8].*)
@@ -31,11 +31,6 @@
CONFIGURE_ARGS+= --disable-alsa
.endif
-.if !empty(PKG_OPTIONS:Moss)
-CONFIGURE_ARGS+= --with-oss
-.include "../../mk/oss.buildlink3.mk"
-.endif
-
.if !empty(PKG_OPTIONS:Mmozilla-jemalloc)
PLIST.jemalloc= yes
CONFIGURE_ARGS+= --enable-jemalloc
diff -r 61719068841c -r 59ecd73dbfa2 www/firefox68/patches/patch-aa
--- a/www/firefox68/patches/patch-aa Thu Mar 12 19:34:56 2020 +0000
+++ b/www/firefox68/patches/patch-aa Thu Mar 12 19:39:35 2020 +0000
@@ -1,79 +1,25 @@
-$NetBSD: patch-aa,v 1.1 2019/09/21 07:31:44 ryoon Exp $
+$NetBSD: patch-aa,v 1.2 2020/03/12 19:39:35 nia Exp $
-* Add OSS audio support
* Add Sun audio support
-* Disable libav-fft on SunOS (relocation errors)
---- old-configure.in.orig 2019-05-29 15:39:16.000000000 +0000
+--- old-configure.in.orig 2020-03-05 20:57:20.000000000 +0000
+++ old-configure.in
-@@ -2043,6 +2043,71 @@ MOZ_WEBM_ENCODER=1
+@@ -1987,6 +1987,19 @@ MOZ_WEBM_ENCODER=1
AC_DEFINE(MOZ_WEBM_ENCODER)
AC_SUBST(MOZ_WEBM_ENCODER)
+dnl ==================================
-+dnl = Check OSS/sunaudio availability
++dnl = Check sunaudio availability
+dnl ==================================
+
-+dnl If using Linux, Solaris or BSDs, ensure that OSS/sunaudio is available
++dnl If using Solaris or NetBSD, ensure that sunaudio is available
+case "$OS_TARGET" in
-+Linux|DragonFly|FreeBSD|GNU/kFreeBSD)
-+ MOZ_OSS=1
-+ ;;
+SunOS|NetBSD)
+ MOZ_SUNAUDIO=1
+ ;;
+esac
+
-+MOZ_ARG_WITH_STRING(oss,
-+[ --with-oss[=PFX] Enable OpenSoundSystem support [installed at prefix PFX]],
-+ OSSPREFIX=$withval)
-+
-+if test -n "$OSSPREFIX"; then
-+ if test "$OSSPREFIX" != "no"; then
-+ MOZ_OSS=1
-+ else
-+ MOZ_OSS=
-+ fi
-+fi
-+
-+_SAVE_CFLAGS=$CFLAGS
-+_SAVE_LIBS=$LIBS
-+if test -n "$MOZ_OSS"; then
-+ dnl Prefer 4Front implementation
-+ AC_MSG_CHECKING([MOZ_OSS_CFLAGS])
-+ if test "$OSSPREFIX" != "yes"; then
-+ oss_conf=${OSSPREFIX%/usr}/etc/oss.conf
-+ if test -f "$oss_conf"; then
-+ . "$oss_conf"
-+ else
-+ OSSLIBDIR=$OSSPREFIX/lib/oss
-+ fi
-+ if test -d "$OSSLIBDIR"; then
-+ MOZ_OSS_CFLAGS="$MOZ_OSS_CFLAGS -I$OSSLIBDIR/include"
-+ fi
-+ fi
-+ AC_MSG_RESULT([$MOZ_OSS_CFLAGS])
-+
-+ CFLAGS="$CFLAGS $MOZ_OSS_CFLAGS"
-+ MOZ_CHECK_HEADERS(sys/soundcard.h soundcard.h)
-+
-+ if test "$ac_cv_header_sys_soundcard_h" != "yes" -a \
-+ "$ac_cv_header_soundcard_h" != "yes"; then
-+ AC_MSG_ERROR([Need OSS for Ogg, Wave or WebM decoding on $OS_TARGET. Disable with --without-oss.])
-+ fi
-+
-+ dnl Assume NetBSD implementation over SunAudio
-+ AC_CHECK_LIB(ossaudio, _oss_ioctl,
-+ [AC_DEFINE_UNQUOTED(CUBEB_OSS_DEFAULT_OUTPUT, "/dev/audio")
-+ MOZ_OSS_LIBS="$MOZ_OSS_LIBS -lossaudio"])
-+fi
-+CFLAGS=$_SAVE_CFLAGS
-+LIBS=$_SAVE_LIBS
-+
+AC_SUBST(MOZ_SUNAUDIO)
-+AC_SUBST(MOZ_OSS)
-+AC_SUBST_LIST(MOZ_OSS_CFLAGS)
-+AC_SUBST_LIST(MOZ_OSS_LIBS)
+
dnl ========================================================
dnl NegotiateAuth
diff -r 61719068841c -r 59ecd73dbfa2 www/firefox68/patches/patch-build_moz.configure_old.configure
--- a/www/firefox68/patches/patch-build_moz.configure_old.configure Thu Mar 12 19:34:56 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-$NetBSD: patch-build_moz.configure_old.configure,v 1.1 2019/09/21 07:31:44 ryoon Exp $
-
---- build/moz.configure/old.configure.orig 2019-07-06 01:48:30.000000000 +0000
-+++ build/moz.configure/old.configure
-@@ -248,6 +248,7 @@ def old_configure_options(*options):
- '--with-nspr-prefix',
- '--with-nss-exec-prefix',
- '--with-nss-prefix',
-+ '--with-oss',
- '--with-qemu-exe',
- '--with-sixgill',
- '--with-system-bz2',
diff -r 61719068841c -r 59ecd73dbfa2 www/firefox68/patches/patch-dom_media_CubebUtils.cpp
--- a/www/firefox68/patches/patch-dom_media_CubebUtils.cpp Thu Mar 12 19:34:56 2020 +0000
+++ b/www/firefox68/patches/patch-dom_media_CubebUtils.cpp Thu Mar 12 19:39:35 2020 +0000
@@ -1,4 +1,6 @@
-$NetBSD: patch-dom_media_CubebUtils.cpp,v 1.1 2019/09/21 07:31:44 ryoon Exp $
+$NetBSD: patch-dom_media_CubebUtils.cpp,v 1.2 2020/03/12 19:39:35 nia Exp $
+
+Add Sun audio support.
--- dom/media/CubebUtils.cpp.orig 2019-07-06 01:48:31.000000000 +0000
+++ dom/media/CubebUtils.cpp
@@ -7,7 +9,7 @@
const char* AUDIOSTREAM_BACKEND_ID_STR[] = {
"jack", "pulse", "alsa", "audiounit", "audioqueue", "wasapi",
- "winmm", "directsound", "sndio", "opensl", "audiotrack", "kai"};
-+ "winmm", "directsound", "sndio", "opensl", "audiotrack", "kai", "oss", "sun"};
++ "winmm", "directsound", "sndio", "opensl", "audiotrack", "kai", "sun"};
/* Index for failures to create an audio stream the first time. */
const int CUBEB_BACKEND_INIT_FAILURE_FIRST =
ArrayLength(AUDIOSTREAM_BACKEND_ID_STR);
diff -r 61719068841c -r 59ecd73dbfa2 www/firefox68/patches/patch-media_libcubeb_src_cubeb.c
--- a/www/firefox68/patches/patch-media_libcubeb_src_cubeb.c Thu Mar 12 19:34:56 2020 +0000
+++ b/www/firefox68/patches/patch-media_libcubeb_src_cubeb.c Thu Mar 12 19:39:35 2020 +0000
@@ -1,9 +1,8 @@
-$NetBSD: patch-media_libcubeb_src_cubeb.c,v 1.1 2019/09/21 07:31:44 ryoon Exp $
+$NetBSD: patch-media_libcubeb_src_cubeb.c,v 1.2 2020/03/12 19:39:35 nia Exp $
-* Support OSS audio
* Support Sun audio
---- media/libcubeb/src/cubeb.c.orig 2019-06-09 08:15:58.000000000 +0000
+--- media/libcubeb/src/cubeb.c.orig 2020-03-05 20:57:11.000000000 +0000
+++ media/libcubeb/src/cubeb.c
Home |
Main Index |
Thread Index |
Old Index