diff --git a/.firefox.metadata b/.firefox.metadata index bce7a76..8f267ce 100644 --- a/.firefox.metadata +++ b/.firefox.metadata @@ -1,7 +1,7 @@ 18a8f30a0356c751b8d0ea6f76e764cab13ee046 SOURCES/Python-2.7.13.tar.xz a9effcc06cf80eaa22f12c1f7d6aa4266a1c4966 SOURCES/cbindgen-vendor-0.14.3.tar.xz -319b0d40c27299d5646587f5928e8f90abeb28a1 SOURCES/firefox-78.8.0esr.source.tar.xz -2f8d4b32580c20e42a99c419fcb24c8fb3e2a679 SOURCES/firefox-langpacks-78.8.0esr-20210217.tar.xz +8d5b4f10557cf7aec25edb2d3dd8b9282224ff53 SOURCES/firefox-78.11.0esr.source.tar.xz +91a31ce33cb1fb2fdea96cbc14ddc82950bb388d SOURCES/firefox-langpacks-78.11.0esr-20210531.tar.xz 0de63f863b158454b9429234b52ed28a397ec45c SOURCES/gtk3-private-3.22.26-1.el6.src.rpm e188ab1a444697bc649e223c28389d82ca94c472 SOURCES/libffi-3.0.13-18.el7_3.src.rpm 5715f987bc0024ce5d72993cb101b8268350033b SOURCES/nodejs-10.21.0-5.fc32.src.rpm diff --git a/.gitignore b/.gitignore index 10dab0c..cc1b41e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,7 @@ SOURCES/Python-2.7.13.tar.xz SOURCES/cbindgen-vendor-0.14.3.tar.xz -SOURCES/firefox-78.8.0esr.source.tar.xz -SOURCES/firefox-langpacks-78.8.0esr-20210217.tar.xz +SOURCES/firefox-78.11.0esr.source.tar.xz +SOURCES/firefox-langpacks-78.11.0esr-20210531.tar.xz SOURCES/gtk3-private-3.22.26-1.el6.src.rpm SOURCES/libffi-3.0.13-18.el7_3.src.rpm SOURCES/nodejs-10.21.0-5.fc32.src.rpm diff --git a/README.debrand b/README.debrand deleted file mode 100644 index 01c46d2..0000000 --- a/README.debrand +++ /dev/null @@ -1,2 +0,0 @@ -Warning: This package was configured for automatic debranding, but the changes -failed to apply. diff --git a/SOURCES/D110204-fscreen.diff b/SOURCES/D110204-fscreen.diff new file mode 100644 index 0000000..0249fd0 --- /dev/null +++ b/SOURCES/D110204-fscreen.diff @@ -0,0 +1,70 @@ +diff -up firefox-78.9.0/widget/gtk/nsWindow.cpp.D110204-fscreen firefox-78.9.0/widget/gtk/nsWindow.cpp +--- firefox-78.9.0/widget/gtk/nsWindow.cpp.D110204-fscreen 2021-03-30 13:28:56.212009697 +0200 ++++ firefox-78.9.0/widget/gtk/nsWindow.cpp 2021-03-30 13:37:41.925850585 +0200 +@@ -139,6 +139,7 @@ using namespace mozilla::widget; + + #include + #include "nsPresContext.h" ++#include "nsIBrowserHandler.h" + + using namespace mozilla; + using namespace mozilla::gfx; +@@ -416,6 +417,7 @@ nsWindow::nsWindow() { + mRetryPointerGrab = false; + mWindowType = eWindowType_child; + mSizeState = nsSizeMode_Normal; ++ mPendingFullscreen = false; + mBoundsAreValid = true; + mAspectRatio = 0.0f; + mAspectRatioSaved = 0.0f; +@@ -3887,6 +3889,19 @@ void nsWindow::OnWindowStateEvent(GtkWid + } + } + } ++ ++ // Hack to ensure window switched to fullscreen - avoid to fail when starting ++ // in kiosk mode ++ if (mPendingFullscreen && ++ !(aEvent->new_window_state & GDK_WINDOW_STATE_FULLSCREEN)) { ++ LOG( ++ (" Window should be fullscreen, but it's not, retrying set to " ++ "fullscreen.\n")); ++ MakeFullScreen(true); ++ } else { ++ LOG((" Window successfully switched to fullscreen, happy now\n")); ++ mPendingFullscreen = false; ++ } + } + + void nsWindow::ThemeChanged() { +@@ -6010,6 +6025,19 @@ nsresult nsWindow::MakeFullScreen(bool a + } + } + ++ // if in kiosk, ensure the fullscreen is called ++ nsCOMPtr browserHandler = ++ do_GetService("@mozilla.org/browser/clh;1"); ++ if (browserHandler) { ++ bool isKiosk; ++ browserHandler->GetKiosk(&isKiosk); ++ if (isKiosk) { ++ LOG((" is kiosk, ensure the window switch to fullscreen\n")); ++ mPendingFullscreen = true; ++ } ++ } else { ++ LOG((" Cannot find the browserHandler service.\n")); ++ } + gtk_window_fullscreen(GTK_WINDOW(mShell)); + } else { + mSizeMode = mLastSizeMode; +diff -up firefox-78.9.0/widget/gtk/nsWindow.h.D110204-fscreen firefox-78.9.0/widget/gtk/nsWindow.h +--- firefox-78.9.0/widget/gtk/nsWindow.h.D110204-fscreen 2021-03-15 16:52:42.000000000 +0100 ++++ firefox-78.9.0/widget/gtk/nsWindow.h 2021-03-30 13:28:56.237009784 +0200 +@@ -703,6 +703,7 @@ class nsWindow final : public nsBaseWidg + nsRect mPreferredPopupRect; + bool mPreferredPopupRectFlushed; + bool mWaitingForMoveToRectCB; ++ bool mPendingFullscreen; + LayoutDeviceIntRect mPendingSizeRect; + + /** diff --git a/SOURCES/D87019-thin-vec-big-endian.diff b/SOURCES/D87019-thin-vec-big-endian.diff index bc8589b..4785900 100644 --- a/SOURCES/D87019-thin-vec-big-endian.diff +++ b/SOURCES/D87019-thin-vec-big-endian.diff @@ -1,24 +1,19 @@ -diff -up firefox-78.1.0/Cargo.lock.D87019-thin-vec-big-endian.diff firefox-78.1.0/Cargo.lock ---- firefox-78.1.0/Cargo.lock.D87019-thin-vec-big-endian.diff 2020-07-22 19:56:54.000000000 +0200 -+++ firefox-78.1.0/Cargo.lock 2020-08-17 17:04:24.133598583 +0200 -@@ -4792,12 +4792,9 @@ checksum = "8eaa81235c7058867fa8c0e7314f +--- firefox-78.9.0/Cargo.lock.D87019-thin-vec-big-endian.diff 2021-03-18 15:53:29.520861862 +0100 ++++ firefox-78.9.0/Cargo.lock 2021-03-18 15:56:14.193397228 +0100 +@@ -4792,9 +4792,9 @@ checksum = "8eaa81235c7058867fa8c0e7314f [[package]] name = "thin-vec" --version = "0.1.0" +-version = "0.1.2" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "73fdf4b84c65a85168477b7fb6c498e0716bc9487fba24623389ea7f51708044" --dependencies = [ -- "libc", --] +-checksum = "3a93c9ade36a827a69257925808463db46ffcf193442fad01eb9bdc1d31aed81" +checksum = "dcc760ada4a9f56fc6d0e81bd143984ebc7bb1b875a6891aa2fa613ca7394fc0" [[package]] name = "thiserror" -diff -up firefox-78.1.0/gfx/webrender_bindings/Cargo.toml.D87019-thin-vec-big-endian.diff firefox-78.1.0/gfx/webrender_bindings/Cargo.toml ---- firefox-78.1.0/gfx/webrender_bindings/Cargo.toml.D87019-thin-vec-big-endian.diff 2020-08-17 17:04:24.133598583 +0200 -+++ firefox-78.1.0/gfx/webrender_bindings/Cargo.toml 2020-08-17 17:05:26.984805590 +0200 +--- firefox-78.9.0/gfx/webrender_bindings/Cargo.toml.D87019-thin-vec-big-endian.diff 2021-03-15 16:52:33.000000000 +0100 ++++ firefox-78.9.0/gfx/webrender_bindings/Cargo.toml 2021-03-18 15:53:29.522861856 +0100 @@ -20,7 +20,7 @@ nsstring = { path = "../../xpcom/rust/ns bincode = "1.0" uuid = { version = "0.8", features = ["v4"] } @@ -28,18 +23,16 @@ diff -up firefox-78.1.0/gfx/webrender_bindings/Cargo.toml.D87019-thin-vec-big-en swgl = { path = "../wr/swgl" } [dependencies.webrender] -diff -up firefox-78.1.0/intl/l10n/rust/fluent-ffi/Cargo.toml.D87019-thin-vec-big-endian.diff firefox-78.1.0/intl/l10n/rust/fluent-ffi/Cargo.toml ---- firefox-78.1.0/intl/l10n/rust/fluent-ffi/Cargo.toml.D87019-thin-vec-big-endian.diff 2020-07-22 17:56:20.000000000 +0200 -+++ firefox-78.1.0/intl/l10n/rust/fluent-ffi/Cargo.toml 2020-08-17 17:04:24.134598587 +0200 +--- firefox-78.9.0/intl/l10n/rust/fluent-ffi/Cargo.toml.D87019-thin-vec-big-endian.diff 2021-03-15 16:52:33.000000000 +0100 ++++ firefox-78.9.0/intl/l10n/rust/fluent-ffi/Cargo.toml 2021-03-18 15:53:29.524861850 +0100 @@ -10,4 +10,4 @@ fluent-pseudo = "0.2" intl-memoizer = "0.4" unic-langid = "0.8" nsstring = { path = "../../../../xpcom/rust/nsstring" } -thin-vec = { version = "0.1.0", features = ["gecko-ffi"] } +thin-vec = { version = "0.2.1", features = ["gecko-ffi"] } -diff -up firefox-78.1.0/intl/locale/rust/fluent-langneg-ffi/Cargo.toml.D87019-thin-vec-big-endian.diff firefox-78.1.0/intl/locale/rust/fluent-langneg-ffi/Cargo.toml ---- firefox-78.1.0/intl/locale/rust/fluent-langneg-ffi/Cargo.toml.D87019-thin-vec-big-endian.diff 2020-07-22 17:56:20.000000000 +0200 -+++ firefox-78.1.0/intl/locale/rust/fluent-langneg-ffi/Cargo.toml 2020-08-17 17:04:24.134598587 +0200 +--- firefox-78.9.0/intl/locale/rust/fluent-langneg-ffi/Cargo.toml.D87019-thin-vec-big-endian.diff 2021-03-15 16:52:33.000000000 +0100 ++++ firefox-78.9.0/intl/locale/rust/fluent-langneg-ffi/Cargo.toml 2021-03-18 15:53:29.525861847 +0100 @@ -9,7 +9,7 @@ edition = "2018" nserror = { path = "../../../../xpcom/rust/nserror" } nsstring = { path = "../../../../xpcom/rust/nsstring" } @@ -49,9 +42,8 @@ diff -up firefox-78.1.0/intl/locale/rust/fluent-langneg-ffi/Cargo.toml.D87019-th fluent-langneg = { version = "0.12.1", features = ["cldr"] } unic-langid = "0.8" unic-langid-ffi = { path = "../unic-langid-ffi" } -diff -up firefox-78.1.0/intl/locale/rust/unic-langid-ffi/Cargo.toml.D87019-thin-vec-big-endian.diff firefox-78.1.0/intl/locale/rust/unic-langid-ffi/Cargo.toml ---- firefox-78.1.0/intl/locale/rust/unic-langid-ffi/Cargo.toml.D87019-thin-vec-big-endian.diff 2020-07-22 17:56:20.000000000 +0200 -+++ firefox-78.1.0/intl/locale/rust/unic-langid-ffi/Cargo.toml 2020-08-17 17:04:24.134598587 +0200 +--- firefox-78.9.0/intl/locale/rust/unic-langid-ffi/Cargo.toml.D87019-thin-vec-big-endian.diff 2021-03-15 16:52:33.000000000 +0100 ++++ firefox-78.9.0/intl/locale/rust/unic-langid-ffi/Cargo.toml 2021-03-18 15:53:29.526861844 +0100 @@ -9,5 +9,5 @@ edition = "2018" nserror = { path = "../../../../xpcom/rust/nserror" } nsstring = { path = "../../../../xpcom/rust/nsstring" } @@ -59,9 +51,8 @@ diff -up firefox-78.1.0/intl/locale/rust/unic-langid-ffi/Cargo.toml.D87019-thin- -thin-vec = { version = "0.1.0", features = ["gecko-ffi"] } +thin-vec = { version = "0.2.1", features = ["gecko-ffi"] } unic-langid = { version = "0.8", features = ["likelysubtags"] } -diff -up firefox-78.1.0/netwerk/socket/neqo_glue/Cargo.toml.D87019-thin-vec-big-endian.diff firefox-78.1.0/netwerk/socket/neqo_glue/Cargo.toml ---- firefox-78.1.0/netwerk/socket/neqo_glue/Cargo.toml.D87019-thin-vec-big-endian.diff 2020-08-17 17:04:24.134598587 +0200 -+++ firefox-78.1.0/netwerk/socket/neqo_glue/Cargo.toml 2020-08-17 17:05:10.352750807 +0200 +--- firefox-78.9.0/netwerk/socket/neqo_glue/Cargo.toml.D87019-thin-vec-big-endian.diff 2021-03-15 16:52:37.000000000 +0100 ++++ firefox-78.9.0/netwerk/socket/neqo_glue/Cargo.toml 2021-03-18 15:53:29.527861842 +0100 @@ -14,7 +14,7 @@ neqo-common = { tag = "v0.2.4", git = "h nserror = { path = "../../../xpcom/rust/nserror" } nsstring = { path = "../../../xpcom/rust/nsstring" } @@ -71,9 +62,8 @@ diff -up firefox-78.1.0/netwerk/socket/neqo_glue/Cargo.toml.D87019-thin-vec-big- [dependencies.neqo-crypto] tag = "v0.2.4" -diff -up firefox-78.1.0/security/manager/ssl/cert_storage/Cargo.toml.D87019-thin-vec-big-endian.diff firefox-78.1.0/security/manager/ssl/cert_storage/Cargo.toml ---- firefox-78.1.0/security/manager/ssl/cert_storage/Cargo.toml.D87019-thin-vec-big-endian.diff 2020-07-22 19:56:55.000000000 +0200 -+++ firefox-78.1.0/security/manager/ssl/cert_storage/Cargo.toml 2020-08-17 17:04:24.134598587 +0200 +--- firefox-78.9.0/security/manager/ssl/cert_storage/Cargo.toml.D87019-thin-vec-big-endian.diff 2021-03-15 16:52:37.000000000 +0100 ++++ firefox-78.9.0/security/manager/ssl/cert_storage/Cargo.toml 2021-03-18 15:53:29.528861839 +0100 @@ -18,6 +18,6 @@ rust_cascade = "0.6.0" sha2 = "^0.8" storage_variant = { path = "../../../../storage/variant" } @@ -82,9 +72,8 @@ diff -up firefox-78.1.0/security/manager/ssl/cert_storage/Cargo.toml.D87019-thin +thin-vec = { version = "0.2.1", features = ["gecko-ffi"] } time = "0.1" xpcom = { path = "../../../../xpcom/rust/xpcom" } -diff -up firefox-78.1.0/services/fxaccounts/rust-bridge/firefox-accounts-bridge/Cargo.toml.D87019-thin-vec-big-endian.diff firefox-78.1.0/services/fxaccounts/rust-bridge/firefox-accounts-bridge/Cargo.toml ---- firefox-78.1.0/services/fxaccounts/rust-bridge/firefox-accounts-bridge/Cargo.toml.D87019-thin-vec-big-endian.diff 2020-08-17 17:04:24.134598587 +0200 -+++ firefox-78.1.0/services/fxaccounts/rust-bridge/firefox-accounts-bridge/Cargo.toml 2020-08-17 17:04:52.432691786 +0200 +--- firefox-78.9.0/services/fxaccounts/rust-bridge/firefox-accounts-bridge/Cargo.toml.D87019-thin-vec-big-endian.diff 2021-03-15 16:52:38.000000000 +0100 ++++ firefox-78.9.0/services/fxaccounts/rust-bridge/firefox-accounts-bridge/Cargo.toml 2021-03-18 15:53:29.528861839 +0100 @@ -20,5 +20,5 @@ nserror = { path = "../../../../xpcom/ru nsstring = { path = "../../../../xpcom/rust/nsstring" } xpcom = { path = "../../../../xpcom/rust/xpcom" } @@ -92,9 +81,8 @@ diff -up firefox-78.1.0/services/fxaccounts/rust-bridge/firefox-accounts-bridge/ -thin-vec = { version = "0.1", features = ["gecko-ffi"] } +thin-vec = { version = "0.2.1", features = ["gecko-ffi"] } fxa-client = { git = "https://github.com/mozilla/application-services", rev = "61dcc364ac0d6d0816ab88a494bbf20d824b009b", features = ["gecko"] } -diff -up firefox-78.1.0/services/sync/golden_gate/Cargo.toml.D87019-thin-vec-big-endian.diff firefox-78.1.0/services/sync/golden_gate/Cargo.toml ---- firefox-78.1.0/services/sync/golden_gate/Cargo.toml.D87019-thin-vec-big-endian.diff 2020-07-22 17:56:24.000000000 +0200 -+++ firefox-78.1.0/services/sync/golden_gate/Cargo.toml 2020-08-17 17:04:24.134598587 +0200 +--- firefox-78.9.0/services/sync/golden_gate/Cargo.toml.D87019-thin-vec-big-endian.diff 2021-03-15 16:52:38.000000000 +0100 ++++ firefox-78.9.0/services/sync/golden_gate/Cargo.toml 2021-03-18 15:53:29.529861836 +0100 @@ -19,5 +19,5 @@ sync15-traits = { git = "https://github. xpcom = { path = "../../../xpcom/rust/xpcom" } @@ -102,52 +90,28 @@ diff -up firefox-78.1.0/services/sync/golden_gate/Cargo.toml.D87019-thin-vec-big -version = "0.1.0" +version = "0.2.1" features = ["gecko-ffi"] -diff -up firefox-78.1.0/third_party/rust/thin-vec/.cargo-checksum.json.D87019-thin-vec-big-endian.diff firefox-78.1.0/third_party/rust/thin-vec/.cargo-checksum.json ---- firefox-78.1.0/third_party/rust/thin-vec/.cargo-checksum.json.D87019-thin-vec-big-endian.diff 2020-07-22 17:56:29.000000000 +0200 -+++ firefox-78.1.0/third_party/rust/thin-vec/.cargo-checksum.json 2020-08-17 17:04:24.134598587 +0200 +--- firefox-78.9.0/third_party/rust/thin-vec/.cargo-checksum.json.D87019-thin-vec-big-endian.diff 2021-03-18 15:53:29.529861836 +0100 ++++ firefox-78.9.0/third_party/rust/thin-vec/.cargo-checksum.json 2021-03-18 15:57:43.631168890 +0100 @@ -1 +1 @@ --{"files":{"Cargo.toml":"fb96cad605ae48215811808c1cc1b9a50248f2b14542058094b23983e2f8d8a0","README.md":"c26d7101e3031e7dd8890ce938e50cad7a1e6adf7fc2f2b0d3c36b03afe68c0b","src/heap.rs":"fe84a4ff433568d5713685456d87597ac5dcdb9d5190061a3da8074240ba1bc3","src/lib.rs":"ce36db8e3464dddade7c1ddbe3ee1f5e525af5be492ea51a0d8a0776c1adfc28","src/range.rs":"bac59bcb6230367a39c7e28ac15263e4526f966cd8c72015873017f17c115aaa"},"package":"73fdf4b84c65a85168477b7fb6c498e0716bc9487fba24623389ea7f51708044"} +-{"files":{"Cargo.toml":"7b164cc8a702a204a4732cb4da2940711b8e3be915c258e2a972d4874d767b4c","README.md":"c26d7101e3031e7dd8890ce938e50cad7a1e6adf7fc2f2b0d3c36b03afe68c0b","src/lib.rs":"9f2a087cabfe0b6f83818323bb9004b45fe7548c51376816fd8d4572256bd0e8","src/range.rs":"bac59bcb6230367a39c7e28ac15263e4526f966cd8c72015873017f17c115aaa"},"package":"3a93c9ade36a827a69257925808463db46ffcf193442fad01eb9bdc1d31aed81"} \ No newline at end of file +{"files":{"Cargo.toml":"754c05523d17eb7591c3ea2c9294e47c05fbb257fed04b78546fb2ec7cafa8b4","README.md":"c26d7101e3031e7dd8890ce938e50cad7a1e6adf7fc2f2b0d3c36b03afe68c0b","src/lib.rs":"627c6094c3f0286dba25bc73f5672c06c5061c25b01c513d213cbdda100673a2"},"package":"dcc760ada4a9f56fc6d0e81bd143984ebc7bb1b875a6891aa2fa613ca7394fc0"} -\ No newline at end of file -diff -up firefox-78.1.0/third_party/rust/thin-vec/Cargo.toml.D87019-thin-vec-big-endian.diff firefox-78.1.0/third_party/rust/thin-vec/Cargo.toml ---- firefox-78.1.0/third_party/rust/thin-vec/Cargo.toml.D87019-thin-vec-big-endian.diff 2020-07-22 17:56:29.000000000 +0200 -+++ firefox-78.1.0/third_party/rust/thin-vec/Cargo.toml 2020-08-17 17:04:24.135598590 +0200 -@@ -3,7 +3,7 @@ - # When uploading crates to the registry Cargo will automatically - # "normalize" Cargo.toml files for maximal compatibility - # with all versions of Cargo and also rewrite `path` dependencies --# to registry (e.g. crates.io) dependencies -+# to registry (e.g., crates.io) dependencies - # - # If you believe there's an error in this file please file an - # issue against the rust-lang/cargo repository. If you're -@@ -11,16 +11,17 @@ +--- firefox-78.9.0/third_party/rust/thin-vec/Cargo.toml.D87019-thin-vec-big-endian.diff 2021-03-15 16:52:42.000000000 +0100 ++++ firefox-78.9.0/third_party/rust/thin-vec/Cargo.toml 2021-03-18 15:59:34.162886751 +0100 +@@ -11,8 +11,9 @@ # will likely look very different (and much more reasonable) [package] +edition = "2018" name = "thin-vec" --version = "0.1.0" +-version = "0.1.2" +version = "0.2.1" authors = ["Alexis Beingessner "] description = "a vec that takes up less space on the stack" homepage = "https://github.com/gankro/thin-vec" - readme = "README.md" - license = "MIT/Apache-2.0" - repository = "https://github.com/gankro/thin-vec" --[dependencies.libc] --version = "0.2" -+ -+[dependencies] - - [features] - default = [] -diff -up firefox-78.1.0/third_party/rust/thin-vec/src/heap.rs.D87019-thin-vec-big-endian.diff firefox-78.1.0/third_party/rust/thin-vec/src/heap.rs -diff -up firefox-78.1.0/third_party/rust/thin-vec/src/lib.rs.D87019-thin-vec-big-endian.diff firefox-78.1.0/third_party/rust/thin-vec/src/lib.rs ---- firefox-78.1.0/third_party/rust/thin-vec/src/lib.rs.D87019-thin-vec-big-endian.diff 2020-07-22 17:56:28.000000000 +0200 -+++ firefox-78.1.0/third_party/rust/thin-vec/src/lib.rs 2020-08-17 17:04:24.135598590 +0200 -@@ -1,50 +1,252 @@ +--- firefox-78.9.0/third_party/rust/thin-vec/src/lib.rs.D87019-thin-vec-big-endian.diff 2021-03-15 16:52:42.000000000 +0100 ++++ firefox-78.9.0/third_party/rust/thin-vec/src/lib.rs 2021-03-18 16:08:47.212871917 +0100 +@@ -1,47 +1,252 @@ -mod range; +//! ThinVec is exactly the same as Vec, except that it stores its `len` and `capacity` in the buffer +//! it allocates. @@ -297,23 +261,19 @@ diff -up firefox-78.1.0/third_party/rust/thin-vec/src/lib.rs.D87019-thin-vec-big -use std::ops::{Deref, DerefMut}; +use std::ops::{Deref, DerefMut, RangeBounds}; use std::marker::PhantomData; -+use std::alloc::*; + use std::alloc::*; use std::cmp::*; use std::hash::*; use std::borrow::*; -use range::RangeArgument; use std::ptr::NonNull; --// Heap shimming because reasons. This doesn't unfortunately match the heap api --// right now because reasons. --mod heap; -+use impl_details::*; - -#[cfg(not(feature = "gecko-ffi"))] -type SizeType = usize; -#[cfg(feature = "gecko-ffi")] -type SizeType = u32; -- ++use impl_details::*; + -#[cfg(feature = "gecko-ffi")] -const AUTO_MASK: u32 = 1 << 31; -#[cfg(feature = "gecko-ffi")] @@ -407,7 +367,8 @@ diff -up firefox-78.1.0/third_party/rust/thin-vec/src/lib.rs.D87019-thin-vec-big + #[cfg(target_endian = "big")] + pub fn is_auto(cap: SizeType) -> bool { + (cap & 1) != 0 -+ } + } +- x as SizeType + + #[inline] + pub fn assert_size(x: usize) -> SizeType { @@ -415,8 +376,7 @@ diff -up firefox-78.1.0/third_party/rust/thin-vec/src/lib.rs.D87019-thin-vec-big + panic!("nsTArray size may not exceed the capacity of a 32-bit sized int"); + } + x as SizeType - } -- x as SizeType ++ } + } @@ -427,7 +387,7 @@ diff -up firefox-78.1.0/third_party/rust/thin-vec/src/lib.rs.D87019-thin-vec-big #[repr(C)] struct Header { _len: SizeType, -@@ -56,38 +258,10 @@ impl Header { +@@ -53,38 +258,10 @@ impl Header { self._len as usize } @@ -466,7 +426,7 @@ diff -up firefox-78.1.0/third_party/rust/thin-vec/src/lib.rs.D87019-thin-vec-big fn data(&self) -> *mut T { let header_size = mem::size_of::
(); let padding = padding::(); -@@ -105,6 +279,41 @@ impl Header { +@@ -102,6 +279,41 @@ impl Header { } } @@ -508,7 +468,7 @@ diff -up firefox-78.1.0/third_party/rust/thin-vec/src/lib.rs.D87019-thin-vec-big /// Singleton that all empty collections share. /// Note: can't store non-zero ZSTs, we allocate in that case. We could /// optimize everything to not do that (basically, make ptr == len and branch -@@ -121,9 +330,7 @@ extern { +@@ -118,9 +330,7 @@ extern { // TODO: overflow checks everywhere @@ -519,35 +479,20 @@ diff -up firefox-78.1.0/third_party/rust/thin-vec/src/lib.rs.D87019-thin-vec-big fn alloc_size(cap: usize) -> usize { // Compute "real" header size with pointer math -@@ -156,15 +363,22 @@ fn alloc_align() -> usize { - max(mem::align_of::(), mem::align_of::
()) - } - --fn header_with_capacity(cap: usize) -> NonNull
{ -- debug_assert!(cap > 0); -+fn layout(cap: usize) -> Layout { +@@ -165,9 +375,10 @@ fn layout(cap: usize) -> Layout { + fn header_with_capacity(cap: usize) -> NonNull
{ + debug_assert!(cap > 0); unsafe { -- let header = heap::allocate( -+ Layout::from_size_align_unchecked( - alloc_size::(cap), - alloc_align::(), -- ) as *mut Header; -+ ) -+ } -+} - -- if header.is_null() { oom() } -+fn header_with_capacity(cap: usize) -> NonNull
{ -+ debug_assert!(cap > 0); -+ unsafe { +- let header = alloc(layout::(cap)) as *mut Header; + let layout = layout::(cap); + let header = alloc(layout) as *mut Header; -+ + +- if header.is_null() { oom() } + if header.is_null() { handle_alloc_error(layout) } // "Infinite" capacity for zero-sized types: (*header).set_cap(if mem::size_of::() == 0 { MAX_CAP } else { cap }); -@@ -176,28 +390,8 @@ fn header_with_capacity(cap: usize) - +@@ -179,28 +390,8 @@ fn header_with_capacity(cap: usize) - @@ -578,7 +523,7 @@ diff -up firefox-78.1.0/third_party/rust/thin-vec/src/lib.rs.D87019-thin-vec-big pub struct ThinVec { ptr: NonNull
, boo: PhantomData, -@@ -627,15 +821,15 @@ impl ThinVec { +@@ -630,15 +821,15 @@ impl ThinVec { } pub fn drain(&mut self, range: R) -> Drain @@ -597,35 +542,11 @@ diff -up firefox-78.1.0/third_party/rust/thin-vec/src/lib.rs.D87019-thin-vec-big Bound::Included(&n) => n + 1, Bound::Excluded(&n) => n, Bound::Unbounded => len, -@@ -666,9 +860,10 @@ impl ThinVec { - - unsafe fn deallocate(&mut self) { - if self.has_allocation() { -- heap::deallocate(self.ptr() as *mut u8, -- alloc_size::(self.capacity()), -- alloc_align::()); -+ dealloc( -+ self.ptr() as *mut u8, -+ layout::(self.capacity()), -+ ) - } - } +@@ -688,11 +879,30 @@ impl ThinVec { + alloc_size::(new_cap), + ) as *mut Header; -@@ -678,15 +873,36 @@ impl ThinVec { - debug_assert!(new_cap > 0); - if self.has_allocation() { - let old_cap = self.capacity(); -- let ptr = heap::reallocate(self.ptr() as *mut u8, -- alloc_size::(old_cap), -- alloc_size::(new_cap), -- alloc_align::()) as *mut Header; - if ptr.is_null() { oom() } -+ let ptr = realloc( -+ self.ptr() as *mut u8, -+ layout::(old_cap), -+ alloc_size::(new_cap), -+ ) as *mut Header; -+ + if ptr.is_null() { handle_alloc_error(layout::(new_cap)) } (*ptr).set_cap(new_cap); self.ptr = NonNull::new_unchecked(ptr); @@ -654,7 +575,7 @@ diff -up firefox-78.1.0/third_party/rust/thin-vec/src/lib.rs.D87019-thin-vec-big } } -@@ -1087,10 +1303,7 @@ mod tests { +@@ -1093,10 +1303,7 @@ mod tests { use std::mem::size_of; assert_eq!(size_of::>(), size_of::<&u8>()); @@ -666,7 +587,7 @@ diff -up firefox-78.1.0/third_party/rust/thin-vec/src/lib.rs.D87019-thin-vec-big } #[test] -@@ -1725,7 +1938,6 @@ mod std_tests { +@@ -1731,7 +1938,6 @@ mod std_tests { assert_eq!(v, &[(), ()]); } @@ -674,7 +595,7 @@ diff -up firefox-78.1.0/third_party/rust/thin-vec/src/lib.rs.D87019-thin-vec-big #[test] fn test_drain_inclusive_range() { let mut v = thin_vec!['a', 'b', 'c', 'd', 'e']; -@@ -1755,6 +1967,7 @@ mod std_tests { +@@ -1761,6 +1967,7 @@ mod std_tests { } #[test] @@ -682,7 +603,7 @@ diff -up firefox-78.1.0/third_party/rust/thin-vec/src/lib.rs.D87019-thin-vec-big fn test_drain_max_vec_size() { let mut v = ThinVec::<()>::with_capacity(usize::max_value()); unsafe { v.set_len(usize::max_value()); } -@@ -1775,7 +1988,6 @@ mod std_tests { +@@ -1781,7 +1988,6 @@ mod std_tests { let mut v = thin_vec![1, 2, 3, 4, 5]; v.drain(5..=5); } @@ -690,7 +611,7 @@ diff -up firefox-78.1.0/third_party/rust/thin-vec/src/lib.rs.D87019-thin-vec-big /* TODO: implement splice? #[test] -@@ -2181,7 +2393,7 @@ mod std_tests { +@@ -2187,7 +2393,7 @@ mod std_tests { assert!(v.capacity() >= 33) } @@ -699,10 +620,8 @@ diff -up firefox-78.1.0/third_party/rust/thin-vec/src/lib.rs.D87019-thin-vec-big #[test] fn test_try_reserve() { -diff -up firefox-78.1.0/third_party/rust/thin-vec/src/range.rs.D87019-thin-vec-big-endian.diff firefox-78.1.0/third_party/rust/thin-vec/src/range.rs -diff -up firefox-78.1.0/toolkit/components/cascade_bloom_filter/Cargo.toml.D87019-thin-vec-big-endian.diff firefox-78.1.0/toolkit/components/cascade_bloom_filter/Cargo.toml ---- firefox-78.1.0/toolkit/components/cascade_bloom_filter/Cargo.toml.D87019-thin-vec-big-endian.diff 2020-07-22 17:56:29.000000000 +0200 -+++ firefox-78.1.0/toolkit/components/cascade_bloom_filter/Cargo.toml 2020-08-17 17:04:24.135598590 +0200 +--- firefox-78.9.0/toolkit/components/cascade_bloom_filter/Cargo.toml.D87019-thin-vec-big-endian.diff 2021-03-15 16:52:42.000000000 +0100 ++++ firefox-78.9.0/toolkit/components/cascade_bloom_filter/Cargo.toml 2021-03-18 15:54:35.137670977 +0100 @@ -8,5 +8,5 @@ nserror = { path = "../../../xpcom/rust/ nsstring = { path = "../../../xpcom/rust/nsstring" } rental = "0.5.5" @@ -710,9 +629,8 @@ diff -up firefox-78.1.0/toolkit/components/cascade_bloom_filter/Cargo.toml.D8701 -thin-vec = { version = "0.1.0", features = ["gecko-ffi"] } +thin-vec = { version = "0.2.1", features = ["gecko-ffi"] } xpcom = { path = "../../../xpcom/rust/xpcom" } -diff -up firefox-78.1.0/toolkit/components/extensions/storage/webext_storage_bridge/Cargo.toml.D87019-thin-vec-big-endian.diff firefox-78.1.0/toolkit/components/extensions/storage/webext_storage_bridge/Cargo.toml ---- firefox-78.1.0/toolkit/components/extensions/storage/webext_storage_bridge/Cargo.toml.D87019-thin-vec-big-endian.diff 2020-07-22 17:56:30.000000000 +0200 -+++ firefox-78.1.0/toolkit/components/extensions/storage/webext_storage_bridge/Cargo.toml 2020-08-17 17:04:24.135598590 +0200 +--- firefox-78.9.0/toolkit/components/extensions/storage/webext_storage_bridge/Cargo.toml.D87019-thin-vec-big-endian.diff 2021-03-15 16:52:42.000000000 +0100 ++++ firefox-78.9.0/toolkit/components/extensions/storage/webext_storage_bridge/Cargo.toml 2021-03-18 15:54:35.139670971 +0100 @@ -13,7 +13,7 @@ moz_task = { path = "../../../../../xpco nserror = { path = "../../../../../xpcom/rust/nserror" } nsstring = { path = "../../../../../xpcom/rust/nsstring" } @@ -722,9 +640,8 @@ diff -up firefox-78.1.0/toolkit/components/extensions/storage/webext_storage_bri xpcom = { path = "../../../../../xpcom/rust/xpcom" } serde = "1" serde_json = "1" -diff -up firefox-78.1.0/toolkit/components/kvstore/Cargo.toml.D87019-thin-vec-big-endian.diff firefox-78.1.0/toolkit/components/kvstore/Cargo.toml ---- firefox-78.1.0/toolkit/components/kvstore/Cargo.toml.D87019-thin-vec-big-endian.diff 2020-07-22 17:56:30.000000000 +0200 -+++ firefox-78.1.0/toolkit/components/kvstore/Cargo.toml 2020-08-17 17:04:24.135598590 +0200 +--- firefox-78.9.0/toolkit/components/kvstore/Cargo.toml.D87019-thin-vec-big-endian.diff 2021-03-15 16:52:42.000000000 +0100 ++++ firefox-78.9.0/toolkit/components/kvstore/Cargo.toml 2021-03-18 15:54:35.141670966 +0100 @@ -18,7 +18,7 @@ rkv = "0.10.2" storage_variant = { path = "../../../storage/variant" } xpcom = { path = "../../../xpcom/rust/xpcom" } @@ -734,9 +651,8 @@ diff -up firefox-78.1.0/toolkit/components/kvstore/Cargo.toml.D87019-thin-vec-bi # Get rid of failure's dependency on backtrace. Eventually # backtrace will move into Rust core, but we don't need it here. -diff -up firefox-78.1.0/toolkit/components/places/bookmark_sync/Cargo.toml.D87019-thin-vec-big-endian.diff firefox-78.1.0/toolkit/components/places/bookmark_sync/Cargo.toml ---- firefox-78.1.0/toolkit/components/places/bookmark_sync/Cargo.toml.D87019-thin-vec-big-endian.diff 2020-07-22 17:56:30.000000000 +0200 -+++ firefox-78.1.0/toolkit/components/places/bookmark_sync/Cargo.toml 2020-08-17 17:04:24.135598590 +0200 +--- firefox-78.9.0/toolkit/components/places/bookmark_sync/Cargo.toml.D87019-thin-vec-big-endian.diff 2021-03-15 16:52:42.000000000 +0100 ++++ firefox-78.9.0/toolkit/components/places/bookmark_sync/Cargo.toml 2021-03-18 15:54:35.142670963 +0100 @@ -19,5 +19,5 @@ url = "2.0" xpcom = { path = "../../../../xpcom/rust/xpcom" } @@ -744,9 +660,8 @@ diff -up firefox-78.1.0/toolkit/components/places/bookmark_sync/Cargo.toml.D8701 -version = "0.1.0" +version = "0.2.1" features = ["gecko-ffi"] -diff -up firefox-78.1.0/tools/profiler/rust-helper/Cargo.toml.D87019-thin-vec-big-endian.diff firefox-78.1.0/tools/profiler/rust-helper/Cargo.toml ---- firefox-78.1.0/tools/profiler/rust-helper/Cargo.toml.D87019-thin-vec-big-endian.diff 2020-07-22 17:56:30.000000000 +0200 -+++ firefox-78.1.0/tools/profiler/rust-helper/Cargo.toml 2020-08-17 17:04:24.135598590 +0200 +--- firefox-78.9.0/tools/profiler/rust-helper/Cargo.toml.D87019-thin-vec-big-endian.diff 2021-03-15 16:52:42.000000000 +0100 ++++ firefox-78.9.0/tools/profiler/rust-helper/Cargo.toml 2021-03-18 15:54:35.143670960 +0100 @@ -23,7 +23,7 @@ features = ["endian_fd", "elf32", "elf64 default-features = false @@ -756,9 +671,8 @@ diff -up firefox-78.1.0/tools/profiler/rust-helper/Cargo.toml.D87019-thin-vec-bi features = ["gecko-ffi"] [features] -diff -up firefox-78.1.0/xpcom/rust/xpcom/Cargo.toml.D87019-thin-vec-big-endian.diff firefox-78.1.0/xpcom/rust/xpcom/Cargo.toml ---- firefox-78.1.0/xpcom/rust/xpcom/Cargo.toml.D87019-thin-vec-big-endian.diff 2020-07-22 17:56:30.000000000 +0200 -+++ firefox-78.1.0/xpcom/rust/xpcom/Cargo.toml 2020-08-17 17:04:24.136598593 +0200 +--- firefox-78.9.0/xpcom/rust/xpcom/Cargo.toml.D87019-thin-vec-big-endian.diff 2021-03-15 16:52:43.000000000 +0100 ++++ firefox-78.9.0/xpcom/rust/xpcom/Cargo.toml 2021-03-18 15:54:35.149670942 +0100 @@ -9,4 +9,4 @@ nsstring = { path = "../nsstring" } nserror = { path = "../nserror" } threadbound = "0.1" diff --git a/SOURCES/firefox-redhat-default-prefs.js b/SOURCES/firefox-redhat-default-prefs.js index 1e8bbec..9ead3a2 100644 --- a/SOURCES/firefox-redhat-default-prefs.js +++ b/SOURCES/firefox-redhat-default-prefs.js @@ -32,4 +32,4 @@ pref("security.use_sqldb", false); /* Use OS settings for UI language */ pref("intl.locale.requested", ""); /* See https://bugzilla.redhat.com/show_bug.cgi?id=1672424 */ -pref("storage.nfs_filesystem", true); +pref("storage.nfs_filesystem", true); \ No newline at end of file diff --git a/SOURCES/mozilla-1703636-slot-fail-workaround.patch b/SOURCES/mozilla-1703636-slot-fail-workaround.patch new file mode 100644 index 0000000..079a15b --- /dev/null +++ b/SOURCES/mozilla-1703636-slot-fail-workaround.patch @@ -0,0 +1,12 @@ +diff -up firefox-78.9.0/security/certverifier/NSSCertDBTrustDomain.cpp.slot-fail firefox-78.9.0/security/certverifier/NSSCertDBTrustDomain.cpp +--- firefox-78.9.0/security/certverifier/NSSCertDBTrustDomain.cpp.slot-fail 2021-04-08 08:02:13.879018493 +0200 ++++ firefox-78.9.0/security/certverifier/NSSCertDBTrustDomain.cpp 2021-04-08 08:05:56.713623197 +0200 +@@ -118,7 +118,7 @@ static Result FindRootsWithSubject(Uniqu + CERTCertificateList* rawResults = nullptr; + if (PK11_FindRawCertsWithSubject(rootsModule->slots[slotIndex], &subject, + &rawResults) != SECSuccess) { +- return Result::FATAL_ERROR_LIBRARY_FAILURE; ++ continue; + } + // rawResults == nullptr means we didn't find any matching certificates + if (!rawResults) { diff --git a/SPECS/firefox.spec b/SPECS/firefox.spec index 388339d..1286116 100644 --- a/SPECS/firefox.spec +++ b/SPECS/firefox.spec @@ -11,6 +11,9 @@ %global rhel_minor_version 4 %endif %if "%{?dist}" == ".el8" +%global rhel_minor_version 5 +%endif +%if "%{?dist}" == ".el8_4" %global rhel_minor_version 4 %endif %if "%{?dist}" == ".el8_3" @@ -215,8 +218,8 @@ Summary: Mozilla Firefox Web browser Name: firefox -Version: 78.8.0 -Release: 1%{?dist} +Version: 78.11.0 +Release: 3%{?dist} URL: https://www.mozilla.org/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ %if 0%{?rhel} == 7 @@ -228,7 +231,7 @@ ExclusiveArch: i686 x86_64 ppc64 s390x Source0: https://hg.mozilla.org/releases/mozilla-release/archive/firefox-%{version}%{?pre_version}.source.tar.xz %if %{build_langpacks} -Source1: firefox-langpacks-%{version}%{?pre_version}-20210217.tar.xz +Source1: firefox-langpacks-%{version}%{?pre_version}-20210531.tar.xz %endif Source2: cbindgen-vendor-0.14.3.tar.xz Source10: firefox-mozconfig @@ -307,6 +310,8 @@ Patch513: mozilla-bmo998749.patch Patch514: mozilla-s390x-skia-gradient.patch Patch515: mozilla-bmo1626236.patch Patch516: D87019-thin-vec-big-endian.diff +Patch517: mozilla-1703636-slot-fail-workaround.patch +Patch518: D110204-fscreen.diff # CentOS patches @@ -681,6 +686,8 @@ sed -ie 's|/usr/include|/app/include|' %_sourcedir/firefox-pipewire-0-3.patch %patch514 -p1 -b .mozilla-s390x-skia-gradient %patch515 -p1 -b .mozilla-bmo1626236 %patch516 -p1 -b .D87019-thin-vec-big-endian.diff +%patch517 -p1 -b .mozilla-1703636-slot-fail-workaround +%patch518 -p1 -b .D110204-fscreen.diff %patch1001 -p1 -b .ppc64le-inline @@ -1428,6 +1435,7 @@ SentUpstream: 2014-09-22 firefox.desktop CC0-1.0 + MPLv1.1 or GPLv2+ or LGPLv2+

Bringing together all kinds of awesomeness to make browsing better for you. @@ -1685,8 +1693,20 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog -* Tue Apr 06 2021 CentOS Sources - 78.8.0-1.el8.centos -- Apply debranding changes +* Mon May 31 2021 Eike Rathke - 78.11.0-3 +- Update to 78.11.0 build2 (release) + +* Thu May 27 2021 Eike Rathke - 78.11.0-2 +- Fix rhel_minor_version for dist .el8_4 and .el8 + +* Tue May 25 2021 Eike Rathke - 78.11.0-1 +- Update to 78.11.0 build1 + +* Tue Apr 20 2021 Eike Rathke - 78.10.0-1 +- Update to 78.10.0 + +* Wed Mar 17 2021 Eike Rathke - 78.9.0-1 +- Update to 78.9.0 build1 * Wed Feb 17 2021 Eike Rathke - 78.8.0-1 - Update to 78.8.0 build2