From a71e02ef014d044ab3e8c0938003b4183c3e26fc Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 17 Oct 2019 01:06:33 +0300 Subject: [PATCH] firefox: bump to 70.0 --- extra/firefox/build | 47 ++-- extra/firefox/checksums | 9 +- extra/firefox/depends | 29 ++- extra/firefox/files/mozconfig | 4 +- .../firefox/files/policies.json | 0 {testing => extra}/firefox/files/vendor.js | 0 .../patches/firefox-69.0.2-no-dbus.patch | 214 ------------------ .../firefox/patches/firefox-70-no-dbus.patch | 0 extra/firefox/sources | 7 +- extra/firefox/version | 2 +- testing/firefox/build | 44 ---- testing/firefox/checksums | 14 -- testing/firefox/depends | 53 ----- testing/firefox/files/mozconfig | 58 ----- testing/firefox/files/stab.h | 71 ------ .../patches/fix-fortify-system-wrappers.patch | 13 -- testing/firefox/patches/fix-rust-target.patch | 24 -- .../patches/fix-sandbox-membarrier.patch | 54 ----- testing/firefox/patches/fix-seccomp-bpf.patch | 14 -- testing/firefox/patches/fix-toolkit.patch | 90 -------- testing/firefox/patches/fix-tools.patch | 37 --- .../patches/fix-webrtc-glibcisms.patch | 20 -- testing/firefox/patches/mallinfo.patch | 34 --- testing/firefox/sources | 14 -- testing/firefox/version | 1 - 25 files changed, 56 insertions(+), 797 deletions(-) rename {testing => extra}/firefox/files/policies.json (100%) rename {testing => extra}/firefox/files/vendor.js (100%) delete mode 100644 extra/firefox/patches/firefox-69.0.2-no-dbus.patch rename {testing => extra}/firefox/patches/firefox-70-no-dbus.patch (100%) delete mode 100755 testing/firefox/build delete mode 100644 testing/firefox/checksums delete mode 100644 testing/firefox/depends delete mode 100644 testing/firefox/files/mozconfig delete mode 100644 testing/firefox/files/stab.h delete mode 100644 testing/firefox/patches/fix-fortify-system-wrappers.patch delete mode 100644 testing/firefox/patches/fix-rust-target.patch delete mode 100644 testing/firefox/patches/fix-sandbox-membarrier.patch delete mode 100644 testing/firefox/patches/fix-seccomp-bpf.patch delete mode 100644 testing/firefox/patches/fix-toolkit.patch delete mode 100644 testing/firefox/patches/fix-tools.patch delete mode 100644 testing/firefox/patches/fix-webrtc-glibcisms.patch delete mode 100644 testing/firefox/patches/mallinfo.patch delete mode 100644 testing/firefox/sources delete mode 100644 testing/firefox/version diff --git a/extra/firefox/build b/extra/firefox/build index e41f136f..479fbdcc 100755 --- a/extra/firefox/build +++ b/extra/firefox/build @@ -4,28 +4,30 @@ # See: https://bugzilla.mozilla.org/show_bug.cgi?id=104642 ( cd autoconf2.13 - ./configure --prefix="$PWD/../autoconf" --program-suffix=-2.13 + + ./configure \ + --prefix="$PWD/../autoconf" \ + --program-suffix=-2.13 + make make install ) -export PATH="$PWD/autoconf/bin:$PATH" - -# Fix linker errors at runtime. -export LDFLAGS="$LDFLAGS -Wl,-rpath=/usr/lib/firefox" +export PATH=$PWD/autoconf/bin:$PATH unset MOZ_TELEMETRY_REPORTING +export LDFLAGS="$LDFLAGS -Wl,-rpath=/usr/lib/firefox" export MOZ_NOSPAM=1 cd firefox -# Fix OOM errors. -cores=$(nproc) -printf '%s\n' "mk_add_options MOZ_MAKE_FLAGS=\"-j$cores -l$cores\"" >> mozconfig - for patch in *.patch; do patch -p1 < "$patch" done +# Fix OOM errors. +cores=$(nproc) +printf '%s\n' "mk_add_options MOZ_MAKE_FLAGS=\"-j$cores -l$cores\"" >> mozconfig + ./mach build DESTDIR="$1" ./mach install @@ -33,25 +35,10 @@ rm -rf "$1/usr/include" rm -rf "$1/usr/lib/firefox-devel" rm -rf "$1/usr/share/idl" rm -rf "$1/usr/lib/firefox/gtk2" +rm -f "$1/usr/lib/firefox/browser/features/fxmonitor@mozilla.org.xpi" +rm -f "$1/usr/lib/firefox/browser/features/screenshots@mozilla.org.xpi" +rm -f "$1/usr/lib/firefox/browser/features/webcompat-reporter@mozilla.org.xpi" +rm -f "$1/usr/lib/firefox/browser/features/webcompat@mozilla.org.xpi" -# Disable nasty features by default. -# This extends the Ghacks user.js file. -cat >> user.js < - -Firefox 69 - Disable mandatory dependency on dbus. - -Firefox has historically allowed the disablement of dbus through -the '--disable-dbus' mozconfig option, in 69.0 this option is broken. - -The new feature to prioritize audio threads requires dbus to function -and the build will fail when dbus isn't installed on the host machine. - -This patch disables 'audio_thread_priority' which in effect disables -the dbus dependency. - -diff --git a/Cargo.lock b/Cargo.lock -index 9aef82c139..8f2400e746 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -76,19 +76,6 @@ dependencies = [ - "winapi 0.3.6 (git+https://github.com/froydnj/winapi-rs?branch=aarch64)", - ] - --[[package]] --name = "audio_thread_priority" --version = "0.15.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --dependencies = [ -- "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "dbus 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", -- "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "mach 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "winapi 0.3.6 (git+https://github.com/froydnj/winapi-rs?branch=aarch64)", --] -- - [[package]] - name = "audioipc" - version = "0.2.4" -@@ -117,7 +104,6 @@ dependencies = [ - name = "audioipc-client" - version = "0.4.0" - dependencies = [ -- "audio_thread_priority 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", - "audioipc 0.2.4", - "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "cubeb-backend 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)", -@@ -135,7 +121,6 @@ dependencies = [ - name = "audioipc-server" - version = "0.2.3" - dependencies = [ -- "audio_thread_priority 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", - "audioipc 0.2.4", - "bytes 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)", - "cubeb-core 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)", -@@ -1242,7 +1227,6 @@ name = "gkrust-shared" - version = "0.1.0" - dependencies = [ - "arrayvec 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "audio_thread_priority 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)", - "audioipc-client 0.4.0", - "audioipc-server 0.2.3", - "authenticator 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", -@@ -3845,7 +3829,6 @@ dependencies = [ - "checksum arrayvec 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2f0ef4a9820019a0c91d918918c93dc71d469f581a49b47ddc1d285d4270bbe2" - "checksum atomic_refcell 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fb2dcb6e6d35f20276943cc04bb98e538b348d525a04ac79c10021561d202f21" - "checksum atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "9a7d5b8723950951411ee34d271d99dddcc2035a16ab25310ea2c8cfd4369652" --"checksum audio_thread_priority 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)" = "047460864ea9f62fbdfb80fc04a2e5d844aef9e50727e6e9730ca58d9f1a9267" - "checksum authenticator 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "ec149e5d5d4caa2c9ead53a8ce1ea9c4204c388c65bf3b96c2d1dc0fcf4aeb66" - "checksum autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a6d640bee2da49f60a4068a7fae53acde8982514ab7bae8b8cea9e88cbcfd799" - "checksum backtrace 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "89a47830402e9981c5c41223151efcced65a0510c13097c769cede7efb34782a" -diff --git a/dom/ipc/ContentChild.cpp b/dom/ipc/ContentChild.cpp -index 659d4f94f6..9fe6583fb2 100644 ---- a/dom/ipc/ContentChild.cpp -+++ b/dom/ipc/ContentChild.cpp -@@ -104,7 +104,6 @@ - #include "nsIStringBundle.h" - #include "nsIWorkerDebuggerManager.h" - #include "nsGeolocation.h" --#include "audio_thread_priority.h" - - #if !defined(XP_WIN) - # include "mozilla/Omnijar.h" -diff --git a/dom/media/GraphRunner.cpp b/dom/media/GraphRunner.cpp -index f764623737..73811c0f8c 100644 ---- a/dom/media/GraphRunner.cpp -+++ b/dom/media/GraphRunner.cpp -@@ -13,7 +13,6 @@ - #include "nsISupportsImpl.h" - #include "prthread.h" - #include "Tracing.h" --#include "audio_thread_priority.h" - - namespace mozilla { - -@@ -93,9 +92,6 @@ bool GraphRunner::OneIteration(GraphTime aStateEnd) { - void GraphRunner::Run() { - PR_SetCurrentThreadName("GraphRunner"); - -- atp_handle* handle = -- atp_promote_current_thread_to_real_time(0, mGraph->GraphRate()); -- - MonitorAutoLock lock(mMonitor); - while (true) { - while (mThreadState == ThreadState::Wait) { -@@ -111,10 +107,6 @@ void GraphRunner::Run() { - mMonitor.Notify(); - } - -- if (handle) { -- atp_demote_current_thread_from_real_time(handle); -- } -- - dom::WorkletThread::DeleteCycleCollectedJSContext(); - } - -diff --git a/dom/media/moz.build b/dom/media/moz.build -index 8f89e7b940..524bb3a4de 100644 ---- a/dom/media/moz.build -+++ b/dom/media/moz.build -@@ -89,7 +89,6 @@ XPIDL_SOURCES += [ - XPIDL_MODULE = 'dom_media' - - EXPORTS += [ -- '../../third_party/rust/audio_thread_priority/audio_thread_priority.h', - 'ADTSDecoder.h', - 'ADTSDemuxer.h', - 'AsyncLogger.h', -diff --git a/media/audioipc/client/Cargo.toml b/media/audioipc/client/Cargo.toml -index 90fa464f2a..60039f3117 100644 ---- a/media/audioipc/client/Cargo.toml -+++ b/media/audioipc/client/Cargo.toml -@@ -17,6 +17,5 @@ libc = "0.2" - log = "0.4" - tokio-core = "0.1" - tokio-uds = "0.1.7" --audio_thread_priority = "0.15.0" - lazy_static = "1.2.0" - cfg-if = "0.1.0" -diff --git a/media/audioipc/client/src/lib.rs b/media/audioipc/client/src/lib.rs -index 848559607b..9b30a2643e 100644 ---- a/media/audioipc/client/src/lib.rs -+++ b/media/audioipc/client/src/lib.rs -@@ -14,7 +14,6 @@ extern crate libc; - extern crate log; - extern crate tokio_core; - extern crate tokio_uds; --extern crate audio_thread_priority; - #[macro_use] - extern crate lazy_static; - #[macro_use] -@@ -32,7 +31,6 @@ use std::os::raw::{c_char, c_int}; - use stream::ClientStream; - use std::sync::{Mutex}; - use futures_cpupool::CpuPool; --use audio_thread_priority::RtPriorityHandle; - cfg_if! { - if #[cfg(target_os = "linux")] { - use std::sync::{Arc, Condvar}; -@@ -45,7 +43,6 @@ type InitParamsTls = std::cell::RefCell>; - - thread_local!(static IN_CALLBACK: std::cell::RefCell = std::cell::RefCell::new(false)); - thread_local!(static CPUPOOL_INIT_PARAMS: InitParamsTls = std::cell::RefCell::new(None)); --thread_local!(static G_PRIORITY_HANDLES: std::cell::RefCell> = std::cell::RefCell::new(vec![])); - - lazy_static! { - static ref G_THREAD_POOL: Mutex> = Mutex::new(None); -diff --git a/media/audioipc/server/Cargo.toml b/media/audioipc/server/Cargo.toml -index 8daa952823..62b6d838ea 100644 ---- a/media/audioipc/server/Cargo.toml -+++ b/media/audioipc/server/Cargo.toml -@@ -18,7 +18,6 @@ slab = "0.3.0" - futures = "0.1.18" - tokio-core = "0.1" - tokio-uds = "0.1.7" --audio_thread_priority = "0.15.0" - - [dependencies.error-chain] - version = "0.11.0" -diff --git a/media/audioipc/server/src/lib.rs b/media/audioipc/server/src/lib.rs -index 776c6e5000..df1a6a3396 100644 ---- a/media/audioipc/server/src/lib.rs -+++ b/media/audioipc/server/src/lib.rs -@@ -18,7 +18,6 @@ extern crate libc; - extern crate slab; - extern crate tokio_core; - extern crate tokio_uds; --extern crate audio_thread_priority; - - use audioipc::core; - use audioipc::platformhandle_passing::framed_with_platformhandles; -diff --git a/toolkit/library/rust/shared/Cargo.toml b/toolkit/library/rust/shared/Cargo.toml -index c659552cdc..71b9d64942 100644 ---- a/toolkit/library/rust/shared/Cargo.toml -+++ b/toolkit/library/rust/shared/Cargo.toml -@@ -39,7 +39,6 @@ bitsdownload = { path = "../../../components/bitsdownload", optional = true } - storage = { path = "../../../../storage/rust" } - bookmark_sync = { path = "../../../components/places/bookmark_sync", optional = true } - shift_or_euc_c = "0.1.0" --audio_thread_priority = "0.15.0" - - [build-dependencies] - rustc_version = "0.2" -diff --git a/toolkit/library/rust/shared/lib.rs b/toolkit/library/rust/shared/lib.rs -index c5ff9e10dc..a648c7ea13 100644 ---- a/toolkit/library/rust/shared/lib.rs -+++ b/toolkit/library/rust/shared/lib.rs -@@ -48,8 +48,6 @@ extern crate shift_or_euc_c; - - extern crate arrayvec; - --extern crate audio_thread_priority; -- - use std::boxed::Box; - use std::env; - use std::ffi::{CStr, CString}; diff --git a/testing/firefox/patches/firefox-70-no-dbus.patch b/extra/firefox/patches/firefox-70-no-dbus.patch similarity index 100% rename from testing/firefox/patches/firefox-70-no-dbus.patch rename to extra/firefox/patches/firefox-70-no-dbus.patch diff --git a/extra/firefox/sources b/extra/firefox/sources index 925661dd..713a6d9a 100644 --- a/extra/firefox/sources +++ b/extra/firefox/sources @@ -1,8 +1,9 @@ -https://archive.mozilla.org/pub/firefox/candidates/69.0.3-candidates/build1/source/firefox-69.0.3.source.tar.xz firefox/ +https://archive.mozilla.org/pub/firefox/candidates/70.0-candidates/build1/source/firefox-70.0.source.tar.xz firefox/ https://ftp.gnu.org/gnu/autoconf/autoconf-2.13.tar.gz autoconf2.13/ -https://raw.githubusercontent.com/ghacksuserjs/ghacks-user.js/335299a0cfc083e86e1b88e849999b5daffd5a58/user.js firefox/ files/mozconfig firefox/ files/stab.h firefox/toolkit/crashreporter/google-breakpad/src/ +files/vendor.js firefox/ +files/policies.json firefox/ patches/fix-fortify-system-wrappers.patch firefox/ patches/fix-sandbox-membarrier.patch firefox/ patches/fix-seccomp-bpf.patch firefox/ @@ -10,4 +11,4 @@ patches/fix-toolkit.patch firefox/ patches/fix-tools.patch firefox/ patches/fix-webrtc-glibcisms.patch firefox/ patches/mallinfo.patch firefox/ -patches/firefox-69.0.2-no-dbus.patch firefox/ +patches/firefox-70-no-dbus.patch firefox/ diff --git a/extra/firefox/version b/extra/firefox/version index db35bd46..60941d1c 100644 --- a/extra/firefox/version +++ b/extra/firefox/version @@ -1 +1 @@ -69.0.3 1 +70.0 1 diff --git a/testing/firefox/build b/testing/firefox/build deleted file mode 100755 index 479fbdcc..00000000 --- a/testing/firefox/build +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/sh -e - -# Build autoconf 2.13 for Firefox's sole use. -# See: https://bugzilla.mozilla.org/show_bug.cgi?id=104642 -( - cd autoconf2.13 - - ./configure \ - --prefix="$PWD/../autoconf" \ - --program-suffix=-2.13 - - make - make install -) -export PATH=$PWD/autoconf/bin:$PATH - -unset MOZ_TELEMETRY_REPORTING -export LDFLAGS="$LDFLAGS -Wl,-rpath=/usr/lib/firefox" -export MOZ_NOSPAM=1 - -cd firefox - -for patch in *.patch; do - patch -p1 < "$patch" -done - -# Fix OOM errors. -cores=$(nproc) -printf '%s\n' "mk_add_options MOZ_MAKE_FLAGS=\"-j$cores -l$cores\"" >> mozconfig - -./mach build -DESTDIR="$1" ./mach install - -rm -rf "$1/usr/include" -rm -rf "$1/usr/lib/firefox-devel" -rm -rf "$1/usr/share/idl" -rm -rf "$1/usr/lib/firefox/gtk2" -rm -f "$1/usr/lib/firefox/browser/features/fxmonitor@mozilla.org.xpi" -rm -f "$1/usr/lib/firefox/browser/features/screenshots@mozilla.org.xpi" -rm -f "$1/usr/lib/firefox/browser/features/webcompat-reporter@mozilla.org.xpi" -rm -f "$1/usr/lib/firefox/browser/features/webcompat@mozilla.org.xpi" - -install -D vendor.js "$1/usr/lib/firefox/browser/defaults/preferences/vendor.js" -install -D policies.json "$1/usr/lib/firefox/distribution/policies.json" diff --git a/testing/firefox/checksums b/testing/firefox/checksums deleted file mode 100644 index 9aa8c8a9..00000000 --- a/testing/firefox/checksums +++ /dev/null @@ -1,14 +0,0 @@ -b53e893c0584f2f890f1675cd76001cfb68a03648fe21d430a7195a14270427b firefox-70.0b13.source.tar.xz -f0611136bee505811e9ca11ca7ac188ef5323a8e2ef19cffd3edb3cf08fd791e autoconf-2.13.tar.gz -03d70dc6ba6979de07af0be8beb39c00739d33c214521e5fec2d7c2dc589f25b mozconfig -960d82bbfdc88c95f5cb4f2e1c1bf23dae7519b3b7203914d7b3ddbff1ba4c28 stab.h -297d016429ae44ebabfc3864a1077807fba97b4652e4be7350e24a7b894a5d56 vendor.js -f4ce7ee2485256b3f8c2bc467445f14b4730a7b895b17de7a21711d78bcfedea policies.json -315880530f09175788dfa48a1915bfa1e190bfd3e267988b9100cb93006c808c fix-fortify-system-wrappers.patch -418a2a9f80c41ee004cb640968617cab283b99f3d109aaf6180b0088d60c84b0 fix-sandbox-membarrier.patch -14f281ee323aa682e04479019171bde243ac6227820856aa03b162179b14bfd9 fix-seccomp-bpf.patch -b19aaae7fc45db643f8d2540d96919c745ea341e36d9aea2df40e3e90eb951f0 fix-toolkit.patch -e24f71a6a0d8d4637b2081780c66b01be4eeb4dd496031270d0ae0b898be94d2 fix-tools.patch -5e0fcfde375837074baad21a8ab26aa442a7940617ebd074a6b238a48f2ceb63 fix-webrtc-glibcisms.patch -1d4a8f110d34da478f5597727eda9acacebd443dd86cce5bb64f898c01feabce mallinfo.patch -e3b3d354bcc1a3cca3029ecdbc4237f5ed0aa9fbb62919e2dfbfc697d5a4f5f5 firefox-70-no-dbus.patch diff --git a/testing/firefox/depends b/testing/firefox/depends deleted file mode 100644 index 7b3a39b9..00000000 --- a/testing/firefox/depends +++ /dev/null @@ -1,53 +0,0 @@ -alsa-lib -atk -bzip2 -cairo -cbindgen make -clang make -expat -ffmpeg -fontconfig -freetype-harfbuzz -fribidi -gdk-pixbuf -glib -gtk+2 make -gtk+3 -hicolor-icon-theme -libICE -libSM -libX11 -libXau -libXcomposite -libXcursor -libXdamage -libXext -libXfixes -libXi -libXinerama -libXrandr -libXrender -libXt -libXxf86vm -libdrm -libepoxy -libffi -libjpeg-turbo -libpng -libvpx -libxcb -libxshmfence -llvm make -mesa -nasm make -nodejs make -pango -perl make -pixman -python make -python2 make -rust make -util-linux -yasm make -zip make -zlib diff --git a/testing/firefox/files/mozconfig b/testing/firefox/files/mozconfig deleted file mode 100644 index bddf7b4d..00000000 --- a/testing/firefox/files/mozconfig +++ /dev/null @@ -1,58 +0,0 @@ -ac_add_options --prefix=/usr -ac_add_options --libdir=/usr/lib - -ac_add_options --enable-official-branding -ac_add_options --enable-optimize="$CFLAGS" -ac_add_options --enable-install-strip -ac_add_options --enable-strip - -ac_add_options --without-system-nspr -ac_add_options --without-system-nss -ac_add_options --with-system-jpeg -ac_add_options --with-system-zlib -ac_add_options --with-system-bz2 -ac_add_options --with-system-png - -# System 'libvpx' is too new. -ac_add_options --without-system-libvpx - -ac_add_options --with-system-pixman -ac_add_options --with-system-ffi - -ac_add_options --disable-gconf -ac_add_options --disable-profiling -ac_add_options --disable-accessibility -ac_add_options --disable-tests -ac_add_options --disable-system-extension-dirs -ac_add_options --disable-parental-controls -ac_add_options --disable-debug-symbols -ac_add_options --disable-callgrind -ac_add_options --disable-vtune - -# Settings for musl. -ac_add_options --disable-elf-hack -ac_add_options --disable-gold -ac_add_options --disable-jemalloc -ac_add_options --enable-release - -# ALSA/PulseAudio (removed in 70 (still present in 70b12(!)) -ac_add_options --disable-pulseaudio -ac_add_options --enable-alsa - -ac_add_options --disable-startup-notification - -# Respect the user. -export MOZ_SERVICES_METRICS=0 -export MOZ_PAY=0 -export MOZ_SERVICES_HEALTHREPORTER=0 -export MOZ_SERVICES_FXACCOUNTS=0 -export MOZ_SERVICES_METRICS=0 -export MOZ_DATA_REPORTING=0 -export MOZ_DEVICES=0 -export MOZ_REQUIRE_SIGNING=0 -ac_add_options --disable-crashreporter -ac_add_options --disable-updater -ac_add_options --disable-dbus -ac_add_options --disable-eme -ac_add_options --disable-necko-wifi -ac_add_options --disable-webrtc diff --git a/testing/firefox/files/stab.h b/testing/firefox/files/stab.h deleted file mode 100644 index 6f70af39..00000000 --- a/testing/firefox/files/stab.h +++ /dev/null @@ -1,71 +0,0 @@ -/* $OpenBSD: stab.h,v 1.3 2003/06/02 19:34:12 millert Exp $ */ -/* $NetBSD: stab.h,v 1.4 1994/10/26 00:56:25 cgd Exp $ */ - -/*- - * Copyright (c) 1991 The Regents of the University of California. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)stab.h 5.2 (Berkeley) 4/4/91 - */ - -#ifndef _STAB_H_ -#define _STAB_H_ - -/* - * The following are symbols used by various debuggers and by the Pascal - * compiler. Each of them must have one (or more) of the bits defined by - * the N_STAB mask set. - */ - -#define N_GSYM 0x20 /* global symbol */ -#define N_FNAME 0x22 /* F77 function name */ -#define N_FUN 0x24 /* procedure name */ -#define N_STSYM 0x26 /* data segment variable */ -#define N_LCSYM 0x28 /* bss segment variable */ -#define N_MAIN 0x2a /* main function name */ -#define N_PC 0x30 /* global Pascal symbol */ -#define N_RSYM 0x40 /* register variable */ -#define N_SLINE 0x44 /* text segment line number */ -#define N_DSLINE 0x46 /* data segment line number */ -#define N_BSLINE 0x48 /* bss segment line number */ -#define N_SSYM 0x60 /* structure/union element */ -#define N_SO 0x64 /* main source file name */ -#define N_LSYM 0x80 /* stack variable */ -#define N_BINCL 0x82 /* include file beginning */ -#define N_SOL 0x84 /* included source file name */ -#define N_PSYM 0xa0 /* parameter variable */ -#define N_EINCL 0xa2 /* include file end */ -#define N_ENTRY 0xa4 /* alternate entry point */ -#define N_LBRAC 0xc0 /* left bracket */ -#define N_EXCL 0xc2 /* deleted include file */ -#define N_RBRAC 0xe0 /* right bracket */ -#define N_BCOMM 0xe2 /* begin common */ -#define N_ECOMM 0xe4 /* end common */ -#define N_ECOML 0xe8 /* end common (local name) */ -#define N_LENG 0xfe /* length of preceding entry */ - -#endif /* !_STAB_H_ */ diff --git a/testing/firefox/patches/fix-fortify-system-wrappers.patch b/testing/firefox/patches/fix-fortify-system-wrappers.patch deleted file mode 100644 index 17cf7e30..00000000 --- a/testing/firefox/patches/fix-fortify-system-wrappers.patch +++ /dev/null @@ -1,13 +0,0 @@ -The wrapper features.h gets pulled in by system headers causing thigns to -break. We work around it by simply not wrap features.h - ---- ./config/system-headers.mozbuild.orig -+++ ./config/system-headers.mozbuild -@@ -229,7 +229,6 @@ - 'execinfo.h', - 'extras.h', - 'fcntl.h', -- 'features.h', - 'fenv.h', - 'ffi.h', - 'fibdef.h', diff --git a/testing/firefox/patches/fix-rust-target.patch b/testing/firefox/patches/fix-rust-target.patch deleted file mode 100644 index 8c4b6739..00000000 --- a/testing/firefox/patches/fix-rust-target.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- a/build/moz.configure/rust.configure -+++ b/build/moz.configure/rust.configure -@@ -280,9 +280,11 @@ - die("Don't know how to translate {} for rustc".format( - host_or_target.alias)) - -+ fixed_alias = rustc_target.alias.replace("-unknown-", "-alpine-").replace("-gnu", "-musl") -+ - # Check to see whether our rustc has a reasonably functional stdlib - # for our chosen target. -- target_arg = '--target=' + rustc_target.alias -+ target_arg = '--target=' + fixed_alias - in_fd, in_path = mkstemp(prefix='conftest', suffix='.rs') - out_fd, out_path = mkstemp(prefix='conftest', suffix='.rlib') - os.close(out_fd) -@@ -319,7 +321,7 @@ - os.remove(out_path) - - # This target is usable. -- return rustc_target.alias -+ return fixed_alias - - return rust_target - diff --git a/testing/firefox/patches/fix-sandbox-membarrier.patch b/testing/firefox/patches/fix-sandbox-membarrier.patch deleted file mode 100644 index 4bd3b80d..00000000 --- a/testing/firefox/patches/fix-sandbox-membarrier.patch +++ /dev/null @@ -1,54 +0,0 @@ -allow usage of SYS_membarrier, needed since musl-1.1.22 - -Taken from voidlinux: https://github.com/void-linux/void-packages/commit/4198411ac3b9e2620e171c662df82008da0faebb - ---- a/security/sandbox/linux/SandboxFilter.cpp -+++ b/security/sandbox/linux/SandboxFilter.cpp -@@ -572,6 +572,8 @@ - case __NR_set_tid_address: - return Allow(); - #endif -+ case __NR_membarrier: -+ return Allow(); - - // prctl - case __NR_prctl: { - ---- a/security/sandbox/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h -+++ b/security/sandbox/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h -@@ -1385,6 +1385,10 @@ - #define __NR_memfd_create (__NR_SYSCALL_BASE+385) - #endif - -+#if !defined(__NR_membarrier) -+#define __NR_membarrier (__NR_SYSCALL_BASE+389) -+#endif -+ - // ARM private syscalls. - #if !defined(__ARM_NR_BASE) - #define __ARM_NR_BASE (__NR_SYSCALL_BASE + 0xF0000) - ---- a/security/sandbox/chromium/sandbox/linux/system_headers/x86_64_linux_syscalls.h -+++ b/security/sandbox/chromium/sandbox/linux/system_headers/x86_64_linux_syscalls.h -@@ -1290,5 +1290,9 @@ - #define __NR_memfd_create 319 - #endif - -+#if !defined(__NR_membarrier) -+#define __NR_membarrier 324 -+#endif -+ - #endif // SANDBOX_LINUX_SYSTEM_HEADERS_X86_64_LINUX_SYSCALLS_H_ - ---- a/security/sandbox/chromium/sandbox/linux/system_headers/x86_32_linux_syscalls.h -+++ b/security/sandbox/chromium/sandbox/linux/system_headers/x86_32_linux_syscalls.h -@@ -1490,5 +1490,9 @@ - #define __NR_shutdown 373 - #endif - -+#if !defined(__NR_membarrier) -+#define __NR_membarrier 375 -+#endif -+ - #endif // SANDBOX_LINUX_SYSTEM_HEADERS_X86_32_LINUX_SYSCALLS_H_ - diff --git a/testing/firefox/patches/fix-seccomp-bpf.patch b/testing/firefox/patches/fix-seccomp-bpf.patch deleted file mode 100644 index da102b46..00000000 --- a/testing/firefox/patches/fix-seccomp-bpf.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/security/sandbox/chromium/sandbox/linux/seccomp-bpf/trap.cc -+++ b/security/sandbox/chromium/sandbox/linux/seccomp-bpf/trap.cc -@@ -25,6 +25,11 @@ - #include "sandbox/linux/system_headers/linux_seccomp.h" - #include "sandbox/linux/system_headers/linux_signal.h" - -+// musl libc defines siginfo_t __si_fields instead of _sifields -+#if defined(OS_LINUX) && !defined(__GLIBC__) -+#define _sifields __si_fields -+#endif -+ - namespace { - - struct arch_sigsys { diff --git a/testing/firefox/patches/fix-toolkit.patch b/testing/firefox/patches/fix-toolkit.patch deleted file mode 100644 index 414734df..00000000 --- a/testing/firefox/patches/fix-toolkit.patch +++ /dev/null @@ -1,90 +0,0 @@ -diff --git a/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc b/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc -index 4222ce3..4d40c6a 100644 ---- a/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc -+++ b/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc -@@ -46,6 +46,7 @@ - #include - #include - #include -+#include - - #include - #include -diff --git a/toolkit/crashreporter/google-breakpad/src/common/stabs_reader.cc b/toolkit/crashreporter/google-breakpad/src/common/stabs_reader.cc -index 6019fc7..5953e32 100644 ---- a/toolkit/crashreporter/google-breakpad/src/common/stabs_reader.cc -+++ b/toolkit/crashreporter/google-breakpad/src/common/stabs_reader.cc -@@ -41,6 +41,10 @@ - - #include "common/using_std_string.h" - -+#ifndef N_UNDF -+#define N_UNDF 0 -+#endif -+ - using std::vector; - - namespace google_breakpad { -diff --git a/toolkit/crashreporter/google-breakpad/src/common/stabs_reader.h b/toolkit/crashreporter/google-breakpad/src/common/stabs_reader.h -index 98ee2dd..d57aa68 100644 ---- a/toolkit/crashreporter/google-breakpad/src/common/stabs_reader.h -+++ b/toolkit/crashreporter/google-breakpad/src/common/stabs_reader.h -@@ -55,7 +55,7 @@ - - #ifdef HAVE_MACH_O_NLIST_H - #include --#elif defined(HAVE_A_OUT_H) -+#elif 0 - #include - #endif - -diff --git a/toolkit/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h b/toolkit/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h -index 93fdad7..f34e5e0 100644 ---- a/toolkit/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h -+++ b/toolkit/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h -@@ -1239,6 +1239,12 @@ struct kernel_statfs { - #ifndef __NR_fallocate - #define __NR_fallocate 285 - #endif -+ -+#undef __NR_pread -+#define __NR_pread __NR_pread64 -+#undef __NR_pwrite -+#define __NR_pwrite __NR_pwrite64 -+ - /* End of x86-64 definitions */ - #elif defined(__mips__) - #if _MIPS_SIM == _MIPS_SIM_ABI32 -diff --git a/toolkit/mozapps/update/common/updatedefines.h b/toolkit/mozapps/update/common/updatedefines.h -index 79276f7..4c67976 100644 ---- a/toolkit/mozapps/update/common/updatedefines.h -+++ b/toolkit/mozapps/update/common/updatedefines.h -@@ -87,7 +87,7 @@ static inline int mywcsprintf(WCHAR* dest, size_t count, const WCHAR* fmt, - - # ifdef SOLARIS - # include --# else -+# elif !defined(__linux__) || defined(__GLIBC__) - # include - # endif - # include -diff --git a/toolkit/mozapps/update/updater/updater.cpp b/toolkit/mozapps/update/updater/updater.cpp -index 257ccb4..01314e4 100644 ---- a/toolkit/mozapps/update/updater/updater.cpp -+++ b/toolkit/mozapps/update/updater/updater.cpp -@@ -3978,6 +3978,7 @@ - - int add_dir_entries(const NS_tchar* dirpath, ActionList* list) { - int rv = OK; -+#if !defined(__linux__) || defined(__GLIBC__) - FTS* ftsdir; - FTSENT* ftsdirEntry; - mozilla::UniquePtr searchpath(get_full_path(dirpath)); -@@ -4085,6 +4086,7 @@ - } - - fts_close(ftsdir); -+#endif - - return rv; - } diff --git a/testing/firefox/patches/fix-tools.patch b/testing/firefox/patches/fix-tools.patch deleted file mode 100644 index 93b9d19c..00000000 --- a/testing/firefox/patches/fix-tools.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff --git a/tools/profiler/core/platform-linux-android.cpp b/tools/profiler/core/platform-linux-android.cpp -index 19d0a5c56d..b64b543066 100644 ---- a/tools/profiler/core/platform-linux-android.cpp -+++ b/tools/profiler/core/platform-linux-android.cpp -@@ -506,8 +506,10 @@ static void PlatformInit(PSLockRef aLock) {} - ucontext_t sSyncUContext; - - void Registers::SyncPopulate() { -- if (!getcontext(&sSyncUContext)) { -- PopulateRegsFromContext(*this, &sSyncUContext); -- } -+ #if defined(__GLIBC__) -+ if (!getcontext(&sSyncUContext)) { -+ PopulateRegsFromContext(*this, &sSyncUContext); -+ } -+ #endif - } - #endif -diff --git a/tools/profiler/lul/LulElf.cpp b/tools/profiler/lul/LulElf.cpp -index 9998d04d0d..348a7086fc 100644 ---- a/tools/profiler/lul/LulElf.cpp -+++ b/tools/profiler/lul/LulElf.cpp -@@ -469,10 +469,10 @@ string FormatIdentifier(unsigned char identifier[16]) { - // Return the non-directory portion of FILENAME: the portion after the - // last slash, or the whole filename if there are no slashes. - string BaseFileName(const string& filename) { -- // Lots of copies! basename's behavior is less than ideal. -- char* c_filename = strdup(filename.c_str()); -- string base = basename(c_filename); -- free(c_filename); -+ // basename's behavior is less than ideal so avoid it -+ const char *c_filename = filename.c_str(); -+ const char *p = strrchr(c_filename, '/'); -+ string base = p ? p+1 : c_filename; - return base; - } - diff --git a/testing/firefox/patches/fix-webrtc-glibcisms.patch b/testing/firefox/patches/fix-webrtc-glibcisms.patch deleted file mode 100644 index 658b076d..00000000 --- a/testing/firefox/patches/fix-webrtc-glibcisms.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- ./media/webrtc/trunk/webrtc/system_wrappers/source/cpu_features_linux.c.orig 2018-05-09 23:48:44.677389171 +0200 -+++ ./media/webrtc/trunk/webrtc/system_wrappers/source/cpu_features_linux.c 2018-05-09 23:48:56.254373557 +0200 -@@ -14,7 +14,7 @@ - #ifndef __GLIBC_PREREQ - #define __GLIBC_PREREQ(a, b) 0 - #endif --#if __GLIBC_PREREQ(2, 16) -+#if !__GLIBC__ || __GLIBC_PREREQ(2, 16) - #include - #else - #include -@@ -32,7 +32,7 @@ - int architecture = 0; - unsigned long hwcap = 0; - const char* platform = NULL; --#if __GLIBC_PREREQ(2, 16) -+#if !__GLIBC__ || __GLIBC_PREREQ(2, 16) - hwcap = getauxval(AT_HWCAP); - platform = (const char*)getauxval(AT_PLATFORM); - #else diff --git a/testing/firefox/patches/mallinfo.patch b/testing/firefox/patches/mallinfo.patch deleted file mode 100644 index 0649413c..00000000 --- a/testing/firefox/patches/mallinfo.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- a/xpcom/base/nsMemoryReporterManager.cpp.orig 2019-03-19 17:12:20.844810044 +0100 -+++ b/xpcom/base/nsMemoryReporterManager.cpp 2019-03-19 17:13:32.505133615 +0100 -@@ -123,6 +123,7 @@ - return GetProcSelfSmapsPrivate(aN); - } - -+#ifdef __GLIBC__ - # ifdef HAVE_MALLINFO - # define HAVE_SYSTEM_HEAP_REPORTER 1 - static MOZ_MUST_USE nsresult SystemHeapSize(int64_t* aSizeOut) { -@@ -142,6 +143,7 @@ - return NS_OK; - } - # endif -+#endif // __GLIBC__ - - #elif defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || \ - defined(__OpenBSD__) || defined(__FreeBSD_kernel__) -@@ -642,6 +644,7 @@ - return NS_OK; - } - -+#ifdef __GLIBC__ - # define HAVE_SYSTEM_HEAP_REPORTER 1 - // Windows can have multiple separate heaps. During testing there were multiple - // heaps present but the non-default ones had sizes no more than a few 10s of -@@ -698,6 +701,7 @@ - *aSizeOut = heapsSize; - return NS_OK; - } -+#endif // __GLIBC__ - - struct SegmentKind { - DWORD mState; diff --git a/testing/firefox/sources b/testing/firefox/sources deleted file mode 100644 index 7c7eb2c5..00000000 --- a/testing/firefox/sources +++ /dev/null @@ -1,14 +0,0 @@ -https://archive.mozilla.org/pub/firefox/releases/70.0b13/source/firefox-70.0b13.source.tar.xz firefox/ -https://ftp.gnu.org/gnu/autoconf/autoconf-2.13.tar.gz autoconf2.13/ -files/mozconfig firefox/ -files/stab.h firefox/toolkit/crashreporter/google-breakpad/src/ -files/vendor.js firefox/ -files/policies.json firefox/ -patches/fix-fortify-system-wrappers.patch firefox/ -patches/fix-sandbox-membarrier.patch firefox/ -patches/fix-seccomp-bpf.patch firefox/ -patches/fix-toolkit.patch firefox/ -patches/fix-tools.patch firefox/ -patches/fix-webrtc-glibcisms.patch firefox/ -patches/mallinfo.patch firefox/ -patches/firefox-70-no-dbus.patch firefox/ diff --git a/testing/firefox/version b/testing/firefox/version deleted file mode 100644 index e3b7603f..00000000 --- a/testing/firefox/version +++ /dev/null @@ -1 +0,0 @@ -70.0b13 1