Bring in the c9s content into c10s

We have the same content everywhere. Related: RHEL-24330
2024-06-24 11:00:01 +02:00 · 2024-06-24 11:00:01 +02:00 · d4845d49ee
commit d4845d49ee
parent 58be0e5f7e
52 changed files with 2182 additions and 2769 deletions
--- a/.gitignore
+++ b/.gitignore
@ -436,3 +436,8 @@ thunderbird-langpacks-3.1.2-20100803.tar.bz2
 /thunderbird-langpacks-115.6.0-20231218.tar.xz
 /thunderbird-115.6.1.source.tar.xz
 /thunderbird-langpacks-115.6.1-20240110.tar.xz
 /nspr-4.35.0-1.el8_1.src.rpm
 /nss-3.90.0-2.el8_1.src.rpm
 /nss-3.90.0-3.el9_0.src.rpm
 /thunderbird-115.12.1.processed-source.tar.xz
 /thunderbird-langpacks-115.12.1-20240618.tar.xz
--- a/0001-GLIBCXX-fix-for-GCC-12.patch
+++ b/0001-GLIBCXX-fix-for-GCC-12.patch
@ -1,42 +0,0 @@
 From efd5bc0715e5477318be95a76811cda0a89e8289 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
 Date: Fri, 4 Mar 2022 12:00:26 +0100
 Subject: [PATCH] GLIBCXX fix for GCC 12?
 Borrowed from Firefox and adjusted to Thunderbird 91.7.0
 ---
 build/unix/stdc++compat/stdc++compat.cpp | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 diff --git a/build/unix/stdc++compat/stdc++compat.cpp b/build/unix/stdc++compat/stdc++compat.cpp
 --- thunderbird-91.7.0/build/unix/stdc++compat/stdc++compat.cpp.0001-GLIBCXX-fix-for-GCC-12	2022-03-07 20:34:15.000000000 +0100
 +++ thunderbird-91.7.0/build/unix/stdc++compat/stdc++compat.cpp	2022-03-15 22:50:03.161345590 +0100
@@ -24,6 +24,7 @@
    GLIBCXX_3.4.27 is from gcc 10
    GLIBCXX_3.4.28 is from gcc 10
    GLIBCXX_3.4.29 is from gcc 11
 +   GLIBCXX_3.4.30 is from gcc 12
 This file adds the necessary compatibility tricks to avoid symbols with
 version GLIBCXX_3.4.20 and bigger, keeping binary compatibility with
@@ -73,6 +74,19 @@ void __attribute__((weak)) __throw_bad_a
 }  // namespace std
 #endif
 +
 +#if _GLIBCXX_RELEASE >= 12
 +namespace std {
 +
 +/* This avoids the GLIBCXX_3.4.30 symbol version. */
 +void __attribute__((weak))
 +__glibcxx_assert_fail(const char* __file, int __line, const char* __function,
 +                      const char* __condition) {
 +  MOZ_CRASH();
 +}
 +
 +}  // namespace std
 +#endif
 #if MOZ_LIBSTDCXX_VERSION >= GLIBCXX_VERSION(3, 4, 21)
 /* While we generally don't build with exceptions, we have some host tools
--- a/Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch
+++ b/Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch
@ -1,12 +0,0 @@
 diff -up thunderbird-60.5.0/mfbt/LinuxSignal.h.mozilla-1238661 thunderbird-60.5.0/mfbt/LinuxSignal.h
 --- thunderbird-60.5.0/mfbt/LinuxSignal.h.mozilla-1238661	2019-01-30 11:33:21.447003175 +0100
 +++ thunderbird-60.5.0/mfbt/LinuxSignal.h	2019-01-30 11:35:13.848537051 +0100
@@ -22,7 +22,7 @@ __attribute__((naked)) void SignalTrampo
                                              void* aContext) {
   asm volatile("nop; nop; nop; nop" : : : "memory");
 -  asm volatile("b %0" : : "X"(H) : "memory");
 +  asm volatile("bx %0" : : "r"(H), "l"(aSignal), "l"(aInfo), "l"(aContext) : "memory");
 }
 #define MOZ_SIGNAL_TRAMPOLINE(h) (mozilla::SignalTrampoline<h>)
--- a/CVE-2023-44488-libvpx.patch
+++ b/CVE-2023-44488-libvpx.patch
@ -0,0 +1,127 @@
 From 263682c9a29395055f3b3afe2d97be1828a6223f Mon Sep 17 00:00:00 2001
 From: Jerome Jiang <jianj@google.com>
 Date: Thu, 30 Jun 2022 13:48:56 -0400
 Subject: [PATCH] Fix bug with smaller width bigger size
 Fixed previous patch that clusterfuzz failed on.
 Bug: webm:1642
 Change-Id: If0e08e72abd2e042efe4dcfac21e4cc51afdfdb9
 ---
 test/resize_test.cc          | 11 +++--------
 vp9/common/vp9_alloccommon.c | 13 ++++++-------
 vp9/encoder/vp9_encoder.c    | 27 +++++++++++++++++++++++++--
 3 files changed, 34 insertions(+), 17 deletions(-)
 diff --git a/test/resize_test.cc b/test/resize_test.cc
 index fd1c2a92de6..20ad2229b46 100644
 --- a/test/resize_test.cc
 +++ b/test/resize_test.cc
@@ -102,11 +102,8 @@ void ScaleForFrameNumber(unsigned int frame, unsigned int initial_w,
     if (frame < 30) {
       return;
     }
 -    if (frame < 100) {
 -      *w = initial_w * 7 / 10;
 -      *h = initial_h * 16 / 10;
 -      return;
 -    }
 +    *w = initial_w * 7 / 10;
 +    *h = initial_h * 16 / 10;
     return;
   }
   if (frame < 10) {
@@ -559,9 +556,7 @@ TEST_P(ResizeRealtimeTest, TestExternalResizeWorks) {
   }
 }
 -// TODO(https://crbug.com/webm/1642): This causes a segfault in
 -// init_encode_frame_mb_context().
 -TEST_P(ResizeRealtimeTest, DISABLED_TestExternalResizeSmallerWidthBiggerSize) {
 +TEST_P(ResizeRealtimeTest, TestExternalResizeSmallerWidthBiggerSize) {
   ResizingVideoSource video;
   video.flag_codec_ = true;
   video.smaller_width_larger_size_ = true;
 diff --git a/vp9/common/vp9_alloccommon.c b/vp9/common/vp9_alloccommon.c
 index e53883f621d..9e73e40ea09 100644
 --- a/vp9/common/vp9_alloccommon.c
 +++ b/vp9/common/vp9_alloccommon.c
@@ -135,13 +135,6 @@ int vp9_alloc_context_buffers(VP9_COMMON *cm, int width, int height) {
     cm->free_mi(cm);
     if (cm->alloc_mi(cm, new_mi_size)) goto fail;
   }
 -
 -  if (cm->seg_map_alloc_size < cm->mi_rows * cm->mi_cols) {
 -    // Create the segmentation map structure and set to 0.
 -    free_seg_map(cm);
 -    if (alloc_seg_map(cm, cm->mi_rows * cm->mi_cols)) goto fail;
 -  }
 -
   if (cm->above_context_alloc_cols < cm->mi_cols) {
     vpx_free(cm->above_context);
     cm->above_context = (ENTROPY_CONTEXT *)vpx_calloc(
@@ -156,6 +149,12 @@ int vp9_alloc_context_buffers(VP9_COMMON *cm, int width, int height) {
     cm->above_context_alloc_cols = cm->mi_cols;
   }
 +  if (cm->seg_map_alloc_size < cm->mi_rows * cm->mi_cols) {
 +    // Create the segmentation map structure and set to 0.
 +    free_seg_map(cm);
 +    if (alloc_seg_map(cm, cm->mi_rows * cm->mi_cols)) goto fail;
 +  }
 +
   if (vp9_alloc_loop_filter(cm)) goto fail;
   return 0;
 diff --git a/vp9/encoder/vp9_encoder.c b/vp9/encoder/vp9_encoder.c
 index 69a4e3c314f..e3ba294c32f 100644
 --- a/vp9/encoder/vp9_encoder.c
 +++ b/vp9/encoder/vp9_encoder.c
@@ -2047,6 +2047,17 @@ static void alloc_copy_partition_data(VP9_COMP *cpi) {
   }
 }
 +static void free_copy_partition_data(VP9_COMP *cpi) {
 +  vpx_free(cpi->prev_partition);
 +  cpi->prev_partition = NULL;
 +  vpx_free(cpi->prev_segment_id);
 +  cpi->prev_segment_id = NULL;
 +  vpx_free(cpi->prev_variance_low);
 +  cpi->prev_variance_low = NULL;
 +  vpx_free(cpi->copied_frame_cnt);
 +  cpi->copied_frame_cnt = NULL;
 +}
 +
 void vp9_change_config(struct VP9_COMP *cpi, const VP9EncoderConfig *oxcf) {
   VP9_COMMON *const cm = &cpi->common;
   RATE_CONTROL *const rc = &cpi->rc;
@@ -2126,6 +2137,8 @@ void vp9_change_config(struct VP9_COMP *cpi, const VP9EncoderConfig *oxcf) {
     new_mi_size = cm->mi_stride * calc_mi_size(cm->mi_rows);
     if (cm->mi_alloc_size < new_mi_size) {
       vp9_free_context_buffers(cm);
 +      vp9_free_pc_tree(&cpi->td);
 +      vpx_free(cpi->mbmi_ext_base);
       alloc_compressor_data(cpi);
       realloc_segmentation_maps(cpi);
       cpi->initial_width = cpi->initial_height = 0;
@@ -2144,8 +2157,18 @@ void vp9_change_config(struct VP9_COMP *cpi, const VP9EncoderConfig *oxcf) {
     update_frame_size(cpi);
   if (last_w != cpi->oxcf.width || last_h != cpi->oxcf.height) {
 -    memset(cpi->consec_zero_mv, 0,
 -           cm->mi_rows * cm->mi_cols * sizeof(*cpi->consec_zero_mv));
 +    vpx_free(cpi->consec_zero_mv);
 +    CHECK_MEM_ERROR(
 +        &cm->error, cpi->consec_zero_mv,
 +        vpx_calloc(cm->mi_rows * cm->mi_cols, sizeof(*cpi->consec_zero_mv)));
 +
 +    vpx_free(cpi->skin_map);
 +    CHECK_MEM_ERROR(
 +        &cm->error, cpi->skin_map,
 +        vpx_calloc(cm->mi_rows * cm->mi_cols, sizeof(cpi->skin_map[0])));
 +
 +    free_copy_partition_data(cpi);
 +    alloc_copy_partition_data(cpi);
     if (cpi->oxcf.aq_mode == CYCLIC_REFRESH_AQ)
       vp9_cyclic_refresh_reset_resize(cpi);
     rc->rc_1_frame = 0;
--- a/bindgen-d0dfc52706f23db9dc9d74642eeebd89d73cb8d0.patch
+++ b/bindgen-d0dfc52706f23db9dc9d74642eeebd89d73cb8d0.patch
@ -1,171 +0,0 @@
 diff -up thunderbird-68.3.0/third_party/rust/bindgen/.cargo-checksum.json.bindgen thunderbird-68.3.0/third_party/rust/bindgen/.cargo-checksum.json
 --- thunderbird-68.3.0/third_party/rust/bindgen/.cargo-checksum.json.bindgen	2019-12-01 15:29:26.000000000 +0100
 +++ thunderbird-68.3.0/third_party/rust/bindgen/.cargo-checksum.json	2019-12-04 11:38:42.878975886 +0100
@@ -1 +1 @@
 -{"files":{"Cargo.toml":"9af635e7bad9021a49742a312faf6178b757dbd48aabc998931d6f491f14c179","LICENSE":"c23953d9deb0a3312dbeaf6c128a657f3591acee45067612fa68405eaa4525db","README.md":"5a1f556c6a57c0a6ccc65e19c27718e0f4b32381a8efcc80f6601b33c58c5d59","build.rs":"a9f6915c54d75f357ce32f96327bf4df53dc81a505b70831978f9dac6f43841d","src/callbacks.rs":"b24d7982332c6a35928f134184ddf4072fe4545a45546b97b9b0e0c1fbb77c08","src/clang.rs":"e9203eb5a1b432efebafcd011896e35e8c9145037bf99e7bb3709dc1b8e8e783","src/codegen/bitfield_unit.rs":"88b0604322dc449fc9284850eadc1f5d14b42fa747d4258bae0b6b9535f52dfd","src/codegen/bitfield_unit_tests.rs":"2073ac6a36e0bc9afaef5b1207966817c8fb7a1a9f6368c3b1b8f79822efbfba","src/codegen/error.rs":"2613af1d833377fd4a70719f4a09951d9d45dc9227827b9a2a938a1bcaaea2dd","src/codegen/helpers.rs":"fbd23e68dd51ccaddeb9761394d5df2db49baded0e2dccf6bbc52a2d6de502eb","src/codegen/impl_debug.rs":"f82969461d522fb758eca552ceaf189122a404cbb47fcc16008bfe52fc62aefa","src/codegen/impl_partialeq.rs":"d40d9ee2849c4d3d557b033c4d3af5e6de4a44347f67c0f016198086338811af","src/codegen/mod.rs":"238d989e13b7556e5d120a2bfe85b43332fba56cbe8df886d4c32e650fff1247","src/codegen/struct_layout.rs":"3fa5524aff82365ce292b0cc85080514c85a6dbd31bce90f001773b995dda28e","src/extra_assertions.rs":"494534bd4f18b80d89b180c8a93733e6617edcf7deac413e9a73fd6e7bc9ced7","src/features.rs":"c5fd7149f4a3b41fd4f89ade08505170942f4bc791bcb6a34fdddd3ae61856f8","src/ir/analysis/derive.rs":"325d4c1c1e6194e743f42a2316f1501b0ef852fe309f2e9cac3434825ad235f0","src/ir/analysis/has_destructor.rs":"63644f479738df35e531d3324ff892614083c3656e0747aa34d9f20dada878ec","src/ir/analysis/has_float.rs":"76162a309e4285a806755a08c687a3e7bc894a100a63da4e88584035e215b11d","src/ir/analysis/has_type_param_in_array.rs":"fdbc0af28a144c88ea2de83e6e6da5e1ffb40e3dd63fd7a708095d085bb06f94","src/ir/analysis/has_vtable.rs":"5788372d27bdbaaf0454bc17be31a5480918bc41a8a1c4832e8c61185c07f9cd","src/ir/analysis/mod.rs":"1f218e15c19f6666512908abc853fa7ff9ca5d0fafd94f026d9e4b0ce287ec3c","src/ir/analysis/sizedness.rs":"8dc10043d872e68e660ef96edca4d9733f95be45cdad4893462fa929b335014f","src/ir/analysis/template_params.rs":"6312c008bbc80f50e72a766756c8daddea0b6eeb31ec924b83a231df931e170e","src/ir/annotations.rs":"39a5ab19f4d5dfa617577e4a0d0d2b67b5369d480c7cca4b14d172458c9843f0","src/ir/comment.rs":"c48abe01c5af0f09f583a89f1394bc6c161b40f6c8f0f600bbfe3c907b47969b","src/ir/comp.rs":"ca439407faefbe3a198246f0a1dbdf4e40307e45eaaad317e85d1aab37bb31fc","src/ir/context.rs":"599226eb04d337a1b1b13af91af91bdb02dbd5f26f274cbc0ebc4489eb144fc0","src/ir/derive.rs":"34f9aa76b6c9c05136bb69dcd6455397faef571a567254d2c541d50a962994db","src/ir/dot.rs":"95ed2968fc3239d87892e9f1edf1ed6dd18630d949564961765967ea1d16960c","src/ir/enum_ty.rs":"9cc242d6b3c1866665594e8b306860ee39c0ea42d22198d46b7fded473fe3e84","src/ir/function.rs":"2d41d9df19f42b0c383f338be4c026c005853a8d1caf5f3e5a2f3a8dad202232","src/ir/int.rs":"07e0c7dbd2dd977177fae3acd2a14adf271c6cf9ff4b57cddc11d50734fd4801","src/ir/item.rs":"3bcdb69b793350e5744aec3577cdbb1e5068ece5220c38763cecd82dfb5e8f03","src/ir/item_kind.rs":"dbeae8c4fd0e5c9485d325aea040e056a1f2cd6d43fc927dee8fe1c0c59a7197","src/ir/layout.rs":"d49582081f5f86f7595afbe4845f38fb3b969a840b568f4a49b265e7d790bb5b","src/ir/mod.rs":"2eae90f207fad2e45957ec9287064992a419e3fc916aba84faff2ea25cbeb5ee","src/ir/module.rs":"c4d90bf38fe3672e01923734ccbdb7951ea929949d5f413a9c2aee12395a5094","src/ir/objc.rs":"758aa955a0c5d6ad82606c88a1f4cd1d93e666b71e82d43b18b1aaae96cf888a","src/ir/template.rs":"c0f8570b927dfd6a421fc4ce3094ec837a3ed936445225dbfac961e8e0842ae5","src/ir/traversal.rs":"ea751379a5aec02f93f8d2c61e18232776b1f000dbeae64b9a7195ba21a19dd6","src/ir/ty.rs":"952fb04cd6a71a2bca5c509aecacb42a1de0cae75824941541a38dc589f0993a","src/ir/var.rs":"8bdafb6d02f2c55ae11c28d88b19fb7a65ba8466da12ff039ae4c16c790b291e","src/lib.rs":"d5c8b404c515d30fc2d78b28eb84cff6b256f1f1e2dbd6aca280529bb2af6879","src/log_stubs.rs":"6dfdd908b7c6453da416cf232893768f9480e551ca4add0858ef88bf71ee6ceb","src/main.rs":"e519053bcdde6bc88f60f955246a02d53b3db1cc5ccd1612e6675b790b7460b0","src/options.rs":"041d635c8f6712ca32676a68f06d0245faed5577d9513786e058540ea2a69a7f","src/parse.rs":"be7d13cc84fae79ec7b3aa9e77063fa475a48d74a854423e2c72d75006a25202","src/regex_set.rs":"5cb72fc3714c0d79e9e942d003349c0775fafd7cd0c9603c65f5261883bbf9cf","src/time.rs":"3b763e6fee51d0eb01228dfe28bc28a9f692aff73b2a7b90a030902e0238fca6"},"package":"6bd7710ac8399ae1ebe1e3aac7c9047c4f39f2c94b33c997f482f49e96991f7c"}
 \ No newline at end of file
 +{"files":{"Cargo.toml":"9af635e7bad9021a49742a312faf6178b757dbd48aabc998931d6f491f14c179","LICENSE":"c23953d9deb0a3312dbeaf6c128a657f3591acee45067612fa68405eaa4525db","README.md":"5a1f556c6a57c0a6ccc65e19c27718e0f4b32381a8efcc80f6601b33c58c5d59","build.rs":"a9f6915c54d75f357ce32f96327bf4df53dc81a505b70831978f9dac6f43841d","src/callbacks.rs":"b24d7982332c6a35928f134184ddf4072fe4545a45546b97b9b0e0c1fbb77c08","src/clang.rs":"e9203eb5a1b432efebafcd011896e35e8c9145037bf99e7bb3709dc1b8e8e783","src/codegen/bitfield_unit.rs":"88b0604322dc449fc9284850eadc1f5d14b42fa747d4258bae0b6b9535f52dfd","src/codegen/bitfield_unit_tests.rs":"2073ac6a36e0bc9afaef5b1207966817c8fb7a1a9f6368c3b1b8f79822efbfba","src/codegen/error.rs":"2613af1d833377fd4a70719f4a09951d9d45dc9227827b9a2a938a1bcaaea2dd","src/codegen/helpers.rs":"fbd23e68dd51ccaddeb9761394d5df2db49baded0e2dccf6bbc52a2d6de502eb","src/codegen/impl_debug.rs":"f82969461d522fb758eca552ceaf189122a404cbb47fcc16008bfe52fc62aefa","src/codegen/impl_partialeq.rs":"d40d9ee2849c4d3d557b033c4d3af5e6de4a44347f67c0f016198086338811af","src/codegen/mod.rs":"238d989e13b7556e5d120a2bfe85b43332fba56cbe8df886d4c32e650fff1247","src/codegen/struct_layout.rs":"3fa5524aff82365ce292b0cc85080514c85a6dbd31bce90f001773b995dda28e","src/extra_assertions.rs":"494534bd4f18b80d89b180c8a93733e6617edcf7deac413e9a73fd6e7bc9ced7","src/features.rs":"c5fd7149f4a3b41fd4f89ade08505170942f4bc791bcb6a34fdddd3ae61856f8","src/ir/analysis/derive.rs":"325d4c1c1e6194e743f42a2316f1501b0ef852fe309f2e9cac3434825ad235f0","src/ir/analysis/has_destructor.rs":"63644f479738df35e531d3324ff892614083c3656e0747aa34d9f20dada878ec","src/ir/analysis/has_float.rs":"76162a309e4285a806755a08c687a3e7bc894a100a63da4e88584035e215b11d","src/ir/analysis/has_type_param_in_array.rs":"fdbc0af28a144c88ea2de83e6e6da5e1ffb40e3dd63fd7a708095d085bb06f94","src/ir/analysis/has_vtable.rs":"8c92a52c0f859c7bec7bfbc36b9d18f904baab0c8c9dc1b3e7af34de1a0b0da4","src/ir/analysis/mod.rs":"1f218e15c19f6666512908abc853fa7ff9ca5d0fafd94f026d9e4b0ce287ec3c","src/ir/analysis/sizedness.rs":"71f1a37f75b971ea5b0d8457473cc410947dbf706cb6d2c0338916910b78a675","src/ir/analysis/template_params.rs":"6312c008bbc80f50e72a766756c8daddea0b6eeb31ec924b83a231df931e170e","src/ir/annotations.rs":"39a5ab19f4d5dfa617577e4a0d0d2b67b5369d480c7cca4b14d172458c9843f0","src/ir/comment.rs":"c48abe01c5af0f09f583a89f1394bc6c161b40f6c8f0f600bbfe3c907b47969b","src/ir/comp.rs":"ca439407faefbe3a198246f0a1dbdf4e40307e45eaaad317e85d1aab37bb31fc","src/ir/context.rs":"599226eb04d337a1b1b13af91af91bdb02dbd5f26f274cbc0ebc4489eb144fc0","src/ir/derive.rs":"e5581852eec87918901a129284b4965aefc8a19394187a8095779a084f28fabe","src/ir/dot.rs":"95ed2968fc3239d87892e9f1edf1ed6dd18630d949564961765967ea1d16960c","src/ir/enum_ty.rs":"9cc242d6b3c1866665594e8b306860ee39c0ea42d22198d46b7fded473fe3e84","src/ir/function.rs":"2d41d9df19f42b0c383f338be4c026c005853a8d1caf5f3e5a2f3a8dad202232","src/ir/int.rs":"07e0c7dbd2dd977177fae3acd2a14adf271c6cf9ff4b57cddc11d50734fd4801","src/ir/item.rs":"3bcdb69b793350e5744aec3577cdbb1e5068ece5220c38763cecd82dfb5e8f03","src/ir/item_kind.rs":"dbeae8c4fd0e5c9485d325aea040e056a1f2cd6d43fc927dee8fe1c0c59a7197","src/ir/layout.rs":"d49582081f5f86f7595afbe4845f38fb3b969a840b568f4a49b265e7d790bb5b","src/ir/mod.rs":"2eae90f207fad2e45957ec9287064992a419e3fc916aba84faff2ea25cbeb5ee","src/ir/module.rs":"c4d90bf38fe3672e01923734ccbdb7951ea929949d5f413a9c2aee12395a5094","src/ir/objc.rs":"758aa955a0c5d6ad82606c88a1f4cd1d93e666b71e82d43b18b1aaae96cf888a","src/ir/template.rs":"c0f8570b927dfd6a421fc4ce3094ec837a3ed936445225dbfac961e8e0842ae5","src/ir/traversal.rs":"ea751379a5aec02f93f8d2c61e18232776b1f000dbeae64b9a7195ba21a19dd6","src/ir/ty.rs":"952fb04cd6a71a2bca5c509aecacb42a1de0cae75824941541a38dc589f0993a","src/ir/var.rs":"8bdafb6d02f2c55ae11c28d88b19fb7a65ba8466da12ff039ae4c16c790b291e","src/lib.rs":"d5c8b404c515d30fc2d78b28eb84cff6b256f1f1e2dbd6aca280529bb2af6879","src/log_stubs.rs":"6dfdd908b7c6453da416cf232893768f9480e551ca4add0858ef88bf71ee6ceb","src/main.rs":"e519053bcdde6bc88f60f955246a02d53b3db1cc5ccd1612e6675b790b7460b0","src/options.rs":"041d635c8f6712ca32676a68f06d0245faed5577d9513786e058540ea2a69a7f","src/parse.rs":"be7d13cc84fae79ec7b3aa9e77063fa475a48d74a854423e2c72d75006a25202","src/regex_set.rs":"5cb72fc3714c0d79e9e942d003349c0775fafd7cd0c9603c65f5261883bbf9cf","src/time.rs":"3b763e6fee51d0eb01228dfe28bc28a9f692aff73b2a7b90a030902e0238fca6"},"package":"6bd7710ac8399ae1ebe1e3aac7c9047c4f39f2c94b33c997f482f49e96991f7c"}
 diff -up thunderbird-68.3.0/third_party/rust/bindgen/src/ir/analysis/has_vtable.rs.bindgen thunderbird-68.3.0/third_party/rust/bindgen/src/ir/analysis/has_vtable.rs
 --- thunderbird-68.3.0/third_party/rust/bindgen/src/ir/analysis/has_vtable.rs.bindgen	2019-12-01 15:29:26.000000000 +0100
 +++ thunderbird-68.3.0/third_party/rust/bindgen/src/ir/analysis/has_vtable.rs	2019-12-04 11:33:09.631921359 +0100
@@ -9,17 +9,17 @@ use std::ops;
 use {HashMap, Entry};
 /// The result of the `HasVtableAnalysis` for an individual item.
 -#[derive(Copy, Clone, Debug, PartialEq, Eq, Ord)]
 +#[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord)]
 pub enum HasVtableResult {
 -    /// The item has a vtable, but the actual vtable pointer is in a base
 -    /// member.
 -    BaseHasVtable,
 +    /// The item does not have a vtable pointer.
 +    No,
     /// The item has a vtable and the actual vtable pointer is within this item.
     SelfHasVtable,
 -    /// The item does not have a vtable pointer.
 -    No
 +    /// The item has a vtable, but the actual vtable pointer is in a base
 +    /// member.
 +    BaseHasVtable,
 }
 impl Default for HasVtableResult {
@@ -28,21 +28,6 @@ impl Default for HasVtableResult {
     }
 }
 -impl cmp::PartialOrd for HasVtableResult {
 -    fn partial_cmp(&self, rhs: &Self) -> Option<cmp::Ordering> {
 -        use self::HasVtableResult::*;
 -
 -        match (*self, *rhs) {
 -            (x, y) if x == y => Some(cmp::Ordering::Equal),
 -            (BaseHasVtable, _) => Some(cmp::Ordering::Greater),
 -            (_, BaseHasVtable) => Some(cmp::Ordering::Less),
 -            (SelfHasVtable, _) => Some(cmp::Ordering::Greater),
 -            (_, SelfHasVtable) => Some(cmp::Ordering::Less),
 -            _ => unreachable!(),
 -        }
 -    }
 -}
 -
 impl HasVtableResult {
     /// Take the least upper bound of `self` and `rhs`.
     pub fn join(self, rhs: Self) -> Self {
 diff -up thunderbird-68.3.0/third_party/rust/bindgen/src/ir/analysis/sizedness.rs.bindgen thunderbird-68.3.0/third_party/rust/bindgen/src/ir/analysis/sizedness.rs
 --- thunderbird-68.3.0/third_party/rust/bindgen/src/ir/analysis/sizedness.rs.bindgen	2019-12-01 15:29:26.000000000 +0100
 +++ thunderbird-68.3.0/third_party/rust/bindgen/src/ir/analysis/sizedness.rs	2019-12-04 11:33:09.632921362 +0100
@@ -22,13 +22,14 @@ use {HashMap, Entry};
 ///
 /// We initially assume that all types are `ZeroSized` and then update our
 /// understanding as we learn more about each type.
 -#[derive(Copy, Clone, Debug, PartialEq, Eq, Ord)]
 +#[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord)]
 pub enum SizednessResult {
 -    /// Has some size that is known to be greater than zero. That doesn't mean
 -    /// it has a static size, but it is not zero sized for sure. In other words,
 -    /// it might contain an incomplete array or some other dynamically sized
 -    /// type.
 -    NonZeroSized,
 +    /// The type is zero-sized.
 +    ///
 +    /// This means that if it is a C++ type, and is not being used as a base
 +    /// member, then we must add an `_address` byte to enforce the
 +    /// unique-address-per-distinct-object-instance rule.
 +    ZeroSized,
     /// Whether this type is zero-sized or not depends on whether a type
     /// parameter is zero-sized or not.
@@ -52,12 +53,11 @@ pub enum SizednessResult {
     /// https://github.com/rust-lang-nursery/rust-bindgen/issues/586
     DependsOnTypeParam,
 -    /// The type is zero-sized.
 -    ///
 -    /// This means that if it is a C++ type, and is not being used as a base
 -    /// member, then we must add an `_address` byte to enforce the
 -    /// unique-address-per-distinct-object-instance rule.
 -    ZeroSized,
 +    /// Has some size that is known to be greater than zero. That doesn't mean
 +    /// it has a static size, but it is not zero sized for sure. In other words,
 +    /// it might contain an incomplete array or some other dynamically sized
 +    /// type.
 +    NonZeroSized,
 }
 impl Default for SizednessResult {
@@ -66,21 +66,6 @@ impl Default for SizednessResult {
     }
 }
 -impl cmp::PartialOrd for SizednessResult {
 -    fn partial_cmp(&self, rhs: &Self) -> Option<cmp::Ordering> {
 -        use self::SizednessResult::*;
 -
 -        match (*self, *rhs) {
 -            (x, y) if x == y => Some(cmp::Ordering::Equal),
 -            (NonZeroSized, _) => Some(cmp::Ordering::Greater),
 -            (_, NonZeroSized) => Some(cmp::Ordering::Less),
 -            (DependsOnTypeParam, _) => Some(cmp::Ordering::Greater),
 -            (_, DependsOnTypeParam) => Some(cmp::Ordering::Less),
 -            _ => unreachable!(),
 -        }
 -    }
 -}
 -
 impl SizednessResult {
     /// Take the least upper bound of `self` and `rhs`.
     pub fn join(self, rhs: Self) -> Self {
 diff -up thunderbird-68.3.0/third_party/rust/bindgen/src/ir/derive.rs.bindgen thunderbird-68.3.0/third_party/rust/bindgen/src/ir/derive.rs
 --- thunderbird-68.3.0/third_party/rust/bindgen/src/ir/derive.rs.bindgen	2019-12-01 15:29:26.000000000 +0100
 +++ thunderbird-68.3.0/third_party/rust/bindgen/src/ir/derive.rs	2019-12-04 11:33:09.632921362 +0100
@@ -92,10 +92,10 @@ pub trait CanDeriveOrd {
 ///
 /// Initially we assume that we can derive trait for all types and then
 /// update our understanding as we learn more about each type.
 -#[derive(Debug, Copy, Clone, PartialEq, Eq, Ord)]
 +#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord)]
 pub enum CanDerive {
 -    /// No, we cannot.
 -    No,
 +    /// Yes, we can derive automatically.
 +    Yes,
     /// The only thing that stops us from automatically deriving is that
     /// array with more than maximum number of elements is used.
@@ -103,8 +103,8 @@ pub enum CanDerive {
     /// This means we probably can "manually" implement such trait.
     Manually,
 -    /// Yes, we can derive automatically.
 -    Yes,
 +    /// No, we cannot.
 +    No,
 }
 impl Default for CanDerive {
@@ -113,22 +113,6 @@ impl Default for CanDerive {
     }
 }
 -impl cmp::PartialOrd for CanDerive {
 -    fn partial_cmp(&self, rhs: &Self) -> Option<cmp::Ordering> {
 -        use self::CanDerive::*;
 -
 -        let ordering = match (*self, *rhs) {
 -            (x, y) if x == y => cmp::Ordering::Equal,
 -            (No, _) => cmp::Ordering::Greater,
 -            (_, No) => cmp::Ordering::Less,
 -            (Manually, _) => cmp::Ordering::Greater,
 -            (_, Manually) => cmp::Ordering::Less,
 -            _ => unreachable!()
 -        };
 -        Some(ordering)
 -    }
 -}
 -
 impl CanDerive {
     /// Take the least upper bound of `self` and `rhs`.
     pub fn join(self, rhs: Self) -> Self {
--- a/build-big-endian-errors.patch
+++ b/build-big-endian-errors.patch
@ -0,0 +1,57 @@
 diff -up firefox-102.0/third_party/libwebrtc/common_audio/wav_file.cc.big-endian-errors firefox-102.0/third_party/libwebrtc/common_audio/wav_file.cc
 --- firefox-102.0/third_party/libwebrtc/common_audio/wav_file.cc.big-endian-errors	2022-08-17 13:19:53.056891028 +0200
 +++ firefox-102.0/third_party/libwebrtc/common_audio/wav_file.cc	2022-08-17 13:19:57.251879556 +0200
@@ -89,9 +89,6 @@ void WavReader::Reset() {
 size_t WavReader::ReadSamples(const size_t num_samples,
                               int16_t* const samples) {
 -#ifndef WEBRTC_ARCH_LITTLE_ENDIAN
 -#error "Need to convert samples to big-endian when reading from WAV file"
 -#endif
   size_t num_samples_left_to_read = num_samples;
   size_t next_chunk_start = 0;
@@ -129,9 +126,6 @@ size_t WavReader::ReadSamples(const size
 }
 size_t WavReader::ReadSamples(const size_t num_samples, float* const samples) {
 -#ifndef WEBRTC_ARCH_LITTLE_ENDIAN
 -#error "Need to convert samples to big-endian when reading from WAV file"
 -#endif
   size_t num_samples_left_to_read = num_samples;
   size_t next_chunk_start = 0;
@@ -213,9 +207,6 @@ WavWriter::WavWriter(FileWrapper file,
 }
 void WavWriter::WriteSamples(const int16_t* samples, size_t num_samples) {
 -#ifndef WEBRTC_ARCH_LITTLE_ENDIAN
 -#error "Need to convert samples to little-endian when writing to WAV file"
 -#endif
   for (size_t i = 0; i < num_samples; i += kMaxChunksize) {
     const size_t num_remaining_samples = num_samples - i;
@@ -243,9 +234,6 @@ void WavWriter::WriteSamples(const int16
 }
 void WavWriter::WriteSamples(const float* samples, size_t num_samples) {
 -#ifndef WEBRTC_ARCH_LITTLE_ENDIAN
 -#error "Need to convert samples to little-endian when writing to WAV file"
 -#endif
   for (size_t i = 0; i < num_samples; i += kMaxChunksize) {
     const size_t num_remaining_samples = num_samples - i;
 diff -up firefox-102.0/third_party/libwebrtc/common_audio/wav_header.cc.big-endian-errors firefox-102.0/third_party/libwebrtc/common_audio/wav_header.cc
 --- firefox-102.0/third_party/libwebrtc/common_audio/wav_header.cc.big-endian-errors	2022-08-17 13:18:04.688187393 +0200
 +++ firefox-102.0/third_party/libwebrtc/common_audio/wav_header.cc	2022-08-17 13:18:22.451138816 +0200
@@ -26,10 +26,6 @@
 namespace webrtc {
 namespace {
 -#ifndef WEBRTC_ARCH_LITTLE_ENDIAN
 -#error "Code not working properly for big endian platforms."
 -#endif
 -
 #pragma pack(2)
 struct ChunkHeader {
   uint32_t ID;
--- a/build-ppc64-abiv2.patch
+++ b/build-ppc64-abiv2.patch
@ -0,0 +1,12 @@
 diff -up firefox-115.0.2/security/nss/lib/freebl/sha512-p8.s.ppc-abiv2 firefox-115.0.2/security/nss/lib/freebl/sha512-p8.s
 --- firefox-115.0.2/security/nss/lib/freebl/sha512-p8.s.ppc-abiv2	2023-07-25 09:01:42.602375809 +0200
 +++ firefox-115.0.2/security/nss/lib/freebl/sha512-p8.s	2023-07-25 09:01:48.273373924 +0200
@@ -3,7 +3,7 @@
 # See the full LICENSE under scripts/.
 .machine	"any"
 -.abiversion	2
 +.abiversion	1
 .text
 .globl	sha512_block_p8
--- a/build-rhel7-lower-node-min-version.patch
+++ b/build-rhel7-lower-node-min-version.patch
@ -0,0 +1,11 @@
 --- firefox-115.8.0/python/mozbuild/mozbuild/nodeutil.py.lower-node-min-version	2024-02-12 21:53:56.000000000 +0200
 +++ firefox-115.8.0/python/mozbuild/mozbuild/nodeutil.py	2024-02-14 16:48:12.476182627 +0200
@@ -13,7 +13,7 @@ from mozboot.util import get_tools_dir
 from packaging.version import Version
 from six import PY3
 -NODE_MIN_VERSION = Version("12.22.12")
 +NODE_MIN_VERSION = Version("10.24.0")
 NPM_MIN_VERSION = Version("6.14.16")
--- a/build-rhel7-nasm-dwarf.patch
+++ b/build-rhel7-nasm-dwarf.patch
@ -0,0 +1,12 @@
 diff -up firefox-91.0.1/python/mozbuild/mozbuild/frontend/context.py.rhel7-nasm firefox-91.0.1/python/mozbuild/mozbuild/frontend/context.py
 --- firefox-91.0.1/python/mozbuild/mozbuild/frontend/context.py.rhel7-nasm	2021-08-31 08:02:10.814740774 +0200
 +++ firefox-91.0.1/python/mozbuild/mozbuild/frontend/context.py	2021-08-31 08:04:03.967146994 +0200
@@ -420,7 +420,7 @@ class AsmFlags(BaseCompileFlags):
                 if self._context.config.substs.get("OS_ARCH") == "WINNT":
                     debug_flags += ["-F", "cv8"]
                 elif self._context.config.substs.get("OS_ARCH") != "Darwin":
 -                    debug_flags += ["-F", "dwarf"]
 +                    debug_flags += ["-f", "elf32"]
             elif (
                 self._context.config.substs.get("OS_ARCH") == "WINNT"
                 and self._context.config.substs.get("CPU_ARCH") == "aarch64"
--- a/build-rnp.patch
+++ b/build-rnp.patch
@ -1,11 +0,0 @@
 diff -up thunderbird-115.0.1/comm/third_party/rnp/src/libsexp/include/sexp/sexp-error.h.build-rnp thunderbird-115.0.1/comm/third_party/rnp/src/libsexp/include/sexp/sexp-error.h
 --- thunderbird-115.0.1/comm/third_party/rnp/src/libsexp/include/sexp/sexp-error.h.build-rnp	2023-07-24 11:38:24.732782411 +0200
 +++ thunderbird-115.0.1/comm/third_party/rnp/src/libsexp/include/sexp/sexp-error.h	2023-07-24 11:38:46.824773498 +0200
@@ -32,6 +32,7 @@
 #include <exception>
 #include <iostream>
 #include <string>
 +#include <cstdint>
 namespace sexp {
--- a/build-tb-rnp-openssl.patch
+++ b/build-tb-rnp-openssl.patch
@ -0,0 +1,12 @@
 diff -up thunderbird-115.1.0/comm/third_party/rnp/moz.build.rnp-openssl thunderbird-115.1.0/comm/third_party/rnp/moz.build
 --- thunderbird-115.1.0/comm/third_party/rnp/moz.build.rnp-openssl	2023-08-07 16:38:39.272780256 +0200
 +++ thunderbird-115.1.0/comm/third_party/rnp/moz.build	2023-08-07 16:38:42.822780087 +0200
@@ -93,7 +93,7 @@ elif CONFIG["MZLA_LIBRNP_BACKEND"] == "o
         # Supported, but not with RHEL's OpenSSL, disabled for now;
         "ENABLE_BRAINPOOL": False,
     })
 -    rnp_defines["PACKAGE_STRING"] = rnp_defines["PACKAGE_STRING"][:-1] + '-openssl"'
 +    #rnp_defines["PACKAGE_STRING"] = rnp_defines["PACKAGE_STRING"][:-1] + '-openssl"'
     if CONFIG["MZLA_LIBRNP_OPENSSL_VERSION"][0] == "3":
         rnp_defines["CRYPTO_BACKEND_OPENSSL3"] = True
--- a/disable-openpgp-in-thunderbird.patch
+++ b/disable-openpgp-in-thunderbird.patch
@ -0,0 +1,12 @@
 diff -up thunderbird-102.2.1/comm/mail/extensions/openpgp/content/BondOpenPGP.jsm.disable-openpgp-in-thunderbird thunderbird-102.2.1/comm/mail/extensions/openpgp/content/BondOpenPGP.jsm
 --- thunderbird-102.2.1/comm/mail/extensions/openpgp/content/BondOpenPGP.jsm.disable-openpgp-in-thunderbird	2022-09-12 14:33:54.995339932 +0200
 +++ thunderbird-102.2.1/comm/mail/extensions/openpgp/content/BondOpenPGP.jsm	2022-09-12 14:39:26.784999636 +0200
@@ -51,6 +51,8 @@ var BondOpenPGP = {
   _alreadyTriedInit: false, // if already true, we will not try again
   async init() {
 +    // We don't have support for the opengpg in rhel ATM.
 +    return;
     if (this._alreadyTriedInit) {
       // We have previously attempted to init, don't try again.
       return;
--- a/expat-CVE-2022-25235.patch
+++ b/expat-CVE-2022-25235.patch
@ -1,49 +0,0 @@
 diff -up thunderbird-91.7.0/parser/expat/lib/xmltok.c.expat-CVE-2022-25235 thunderbird-91.7.0/parser/expat/lib/xmltok.c
 --- thunderbird-91.7.0/parser/expat/lib/xmltok.c.expat-CVE-2022-25235	2022-03-02 17:57:38.364361168 +0100
 +++ thunderbird-91.7.0/parser/expat/lib/xmltok.c	2022-03-02 17:58:22.235512399 +0100
@@ -65,13 +65,6 @@
                       + ((((byte)[2]) >> 5) & 1)] \
          & (1u << (((byte)[2]) & 0x1F)))
 -#define UTF8_GET_NAMING(pages, p, n) \
 -  ((n) == 2 \
 -  ? UTF8_GET_NAMING2(pages, (const unsigned char *)(p)) \
 -  : ((n) == 3 \
 -     ? UTF8_GET_NAMING3(pages, (const unsigned char *)(p)) \
 -     : 0))
 -
 /* Detection of invalid UTF-8 sequences is based on Table 3.1B
    of Unicode 3.2: http://www.unicode.org/unicode/reports/tr28/
    with the additional restriction of not allowing the Unicode
 diff -up thunderbird-91.7.0/parser/expat/lib/xmltok_impl.c.expat-CVE-2022-25235 thunderbird-91.7.0/parser/expat/lib/xmltok_impl.c
 --- thunderbird-91.7.0/parser/expat/lib/xmltok_impl.c.expat-CVE-2022-25235	2022-03-02 17:57:38.365361172 +0100
 +++ thunderbird-91.7.0/parser/expat/lib/xmltok_impl.c	2022-03-02 18:04:51.240853247 +0100
@@ -34,7 +34,7 @@
    case BT_LEAD ## n: \
      if (end - ptr < n) \
        return XML_TOK_PARTIAL_CHAR; \
 -     if (!IS_NAME_CHAR(enc, ptr, n)) { \
 +     if (IS_INVALID_CHAR(enc, ptr, n) || ! IS_NAME_CHAR(enc, ptr, n)) { \
        *nextTokPtr = ptr; \
        return XML_TOK_INVALID; \
      } \
@@ -62,7 +62,7 @@
    case BT_LEAD ## n: \
      if (end - ptr < n) \
        return XML_TOK_PARTIAL_CHAR; \
 -     if (!IS_NMSTRT_CHAR(enc, ptr, n)) { \
 +     if (IS_INVALID_CHAR(enc, ptr, n) || ! IS_NMSTRT_CHAR(enc, ptr, n)) { \
        *nextTokPtr = ptr; \
        return XML_TOK_INVALID; \
      } \
@@ -1090,6 +1090,10 @@ PREFIX(prologTok)(const ENCODING *enc, c
   case BT_LEAD ## n: \
     if (end - ptr < n) \
       return XML_TOK_PARTIAL_CHAR; \
 +    if (IS_INVALID_CHAR(enc, ptr, n)) {                                        \
 +      *nextTokPtr = ptr;                                                       \
 +      return XML_TOK_INVALID;                                                  \
 +    }                                                                          \
     if (IS_NMSTRT_CHAR(enc, ptr, n)) { \
       ptr += n; \
       tok = XML_TOK_NAME; \
--- a/expat-CVE-2022-25236.patch
+++ b/expat-CVE-2022-25236.patch
@ -1,40 +0,0 @@
 diff -up thunderbird-91.7.0/parser/expat/lib/xmlparse.c.expat-CVE-2022-25236 thunderbird-91.7.0/parser/expat/lib/xmlparse.c
 --- thunderbird-91.7.0/parser/expat/lib/xmlparse.c.expat-CVE-2022-25236	2022-03-02 18:08:40.085642028 +0100
 +++ thunderbird-91.7.0/parser/expat/lib/xmlparse.c	2022-03-02 18:13:31.838667958 +0100
@@ -700,8 +700,7 @@ XML_ParserCreate(const XML_Char *encodin
 XML_Parser XMLCALL
 XML_ParserCreateNS(const XML_Char *encodingName, XML_Char nsSep)
 {
 -  XML_Char tmp[2];
 -  *tmp = nsSep;
 +  XML_Char tmp[2] = {nsSep, 0};
   return XML_ParserCreate_MM(encodingName, NULL, tmp);
 }
 #endif
@@ -1276,8 +1275,7 @@ XML_ExternalEntityParserCreate(XML_Parse
      would be otherwise.
   */
   if (ns) {
 -    XML_Char tmp[2];
 -    *tmp = namespaceSeparator;
 +    XML_Char tmp[2] = {parser->m_namespaceSeparator, 0};
     parser = parserCreate(encodingName, &parser->m_mem, tmp, newDtd);
   }
   else {
@@ -3667,6 +3665,16 @@ addBinding(XML_Parser parser, PREFIX *pr
     if (!mustBeXML && isXMLNS
         && (len > xmlnsLen || uri[len] != xmlnsNamespace[len]))
       isXMLNS = XML_FALSE;
 +    // NOTE: While Expat does not validate namespace URIs against RFC 3986,
 +    //       we have to at least make sure that the XML processor on top of
 +    //       Expat (that is splitting tag names by namespace separator into
 +    //       2- or 3-tuples (uri-local or uri-local-prefix)) cannot be confused
 +    //       by an attacker putting additional namespace separator characters
 +    //       into namespace declarations.  That would be ambiguous and not to
 +    //       be expected.
 +    if (parser->m_ns && (uri[len] == parser->m_namespaceSeparator)) {
 +      return XML_ERROR_SYNTAX;
 +    }
   }
   isXML = isXML && len == xmlLen;
   isXMLNS = isXMLNS && len == xmlnsLen;
--- a/expat-CVE-2022-25315.patch
+++ b/expat-CVE-2022-25315.patch
@ -1,24 +0,0 @@
 diff -up thunderbird-91.7.0/parser/expat/lib/xmlparse.c.expat-CVE-2022-25315 thunderbird-91.7.0/parser/expat/lib/xmlparse.c
 --- thunderbird-91.7.0/parser/expat/lib/xmlparse.c.expat-CVE-2022-25315	2022-03-02 18:17:50.966583254 +0100
 +++ thunderbird-91.7.0/parser/expat/lib/xmlparse.c	2022-03-02 18:19:27.636924735 +0100
@@ -2479,6 +2479,7 @@ storeRawNames(XML_Parser parser)
   while (tag) {
     int bufSize;
     int nameLen = sizeof(XML_Char) * (tag->name.strLen + 1);
 +    size_t rawNameLen;
     char *rawNameBuf = tag->buf + nameLen;
     /* Stop if already stored.  Since tagStack is a stack, we can stop
        at the first entry that has already been copied; everything
@@ -2490,7 +2491,11 @@ storeRawNames(XML_Parser parser)
     /* For re-use purposes we need to ensure that the
        size of tag->buf is a multiple of sizeof(XML_Char).
     */
 -    bufSize = nameLen + ROUND_UP(tag->rawNameLength, sizeof(XML_Char));
 +    rawNameLen = ROUND_UP(tag->rawNameLength, sizeof(XML_Char));
 +    /* Detect and prevent integer overflow. */
 +    if (rawNameLen > (size_t)INT_MAX - nameLen)
 +      return XML_FALSE;
 +    bufSize = nameLen + (int)rawNameLen;
     if (bufSize > tag->bufEnd - tag->buf) {
       char *temp = (char *)REALLOC(tag->buf, bufSize);
       if (temp == NULL)
--- a/firefox-SIOCGSTAMP.patch
+++ b/firefox-SIOCGSTAMP.patch
@ -1,16 +0,0 @@
 diff -up firefox-68.0/media/libyuv/libyuv/tools_libyuv/autoroller/unittests/testdata/DEPS.chromium.old firefox-68.0/media/libyuv/libyuv/tools_libyuv/autoroller/unittests/testdata/DEPS.chromium
 diff -up firefox-68.0/media/webrtc/trunk/Makefile.old firefox-68.0/media/webrtc/trunk/Makefile
 diff -up firefox-68.0/media/webrtc/trunk/webrtc/rtc_base/physicalsocketserver.cc.old firefox-68.0/media/webrtc/trunk/webrtc/rtc_base/physicalsocketserver.cc
 --- firefox-68.0/media/webrtc/trunk/webrtc/rtc_base/physicalsocketserver.cc.old	2019-07-10 20:10:04.420328534 +0200
 +++ firefox-68.0/media/webrtc/trunk/webrtc/rtc_base/physicalsocketserver.cc	2019-07-10 20:13:48.766658793 +0200
@@ -62,6 +62,10 @@ typedef void* SockOptArg;
 #if defined(WEBRTC_POSIX) && !defined(WEBRTC_MAC) && !defined(WEBRTC_BSD) && !defined(__native_client__)
 +#ifndef SIOCGSTAMP
 +#define SIOCGSTAMP      0x8906          /* Get stamp (timeval) */
 +#endif
 +
 int64_t GetSocketRecvTimestamp(int socket) {
   struct timeval tv_ioctl;
   int ret = ioctl(socket, SIOCGSTAMP, &tv_ioctl);
--- a/firefox-enable-addons.patch
+++ b/firefox-enable-addons.patch
@ -0,0 +1,13 @@
 diff -up firefox-55.0/browser/app/profile/firefox.js.addons firefox-55.0/browser/app/profile/firefox.js
 --- firefox-55.0/browser/app/profile/firefox.js.addons	2017-08-02 10:58:30.566363833 +0200
 +++ firefox-55.0/browser/app/profile/firefox.js	2017-08-02 10:59:15.377216959 +0200
@@ -65,7 +65,8 @@ pref("extensions.systemAddon.update.url"
 // Disable add-ons that are not installed by the user in all scopes by default.
 // See the SCOPE constants in AddonManager.jsm for values to use here.
 -pref("extensions.autoDisableScopes", 15);
 +pref("extensions.autoDisableScopes", 0);
 +pref("extensions.showMismatchUI", false);
 // Scopes to scan for changes at startup.
 pref("extensions.startupScanScopes", 0);
--- a/firefox-gcc-build.patch
+++ b/firefox-gcc-build.patch
@ -0,0 +1,38 @@
 --- firefox-80.0.1/toolkit/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h	2020-08-31 10:04:19.000000000 -0400
 +++ firefox-80.0.1/toolkit/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h	2020-09-12 07:24:35.298931628 -0400
@@ -1962,7 +1962,7 @@ struct kernel_statfs {
                            LSS_ENTRYPOINT                                     \
                            "pop %%ebx"                                        \
                            args                                               \
 -                           : "esp", "memory");                                \
 +                           : "memory");                                       \
       LSS_RETURN(type,__res)
     #undef  _syscall0
     #define _syscall0(type,name)                                              \
@@ -2019,7 +2019,7 @@ struct kernel_statfs {
                              : "i" (__NR_##name), "ri" ((long)(arg1)),        \
                                "c" ((long)(arg2)), "d" ((long)(arg3)),        \
                                "S" ((long)(arg4)), "D" ((long)(arg5))         \
 -                             : "esp", "memory");                              \
 +                             : "memory");                                     \
         LSS_RETURN(type,__res);                                               \
       }
     #undef  _syscall6
@@ -2041,7 +2041,7 @@ struct kernel_statfs {
                              : "i" (__NR_##name),  "0" ((long)(&__s)),        \
                                "c" ((long)(arg2)), "d" ((long)(arg3)),        \
                                "S" ((long)(arg4)), "D" ((long)(arg5))         \
 -                             : "esp", "memory");                              \
 +                             : "memory");                                     \
         LSS_RETURN(type,__res);                                               \
       }
     LSS_INLINE int LSS_NAME(clone)(int (*fn)(void *), void *child_stack,
@@ -2127,7 +2127,7 @@ struct kernel_statfs {
                            : "0"(-EINVAL), "i"(__NR_clone),
                              "m"(fn), "m"(child_stack), "m"(flags), "m"(arg),
                              "m"(parent_tidptr), "m"(newtls), "m"(child_tidptr)
 -                           : "esp", "memory", "ecx", "edx", "esi", "edi");
 +                           : "memory", "ecx", "edx", "esi", "edi");
       LSS_RETURN(int, __res);
     }
--- a/firefox-nss-addon-hack.patch
+++ b/firefox-nss-addon-hack.patch
@ -0,0 +1,19 @@
 diff -up firefox-84.0.2/security/certverifier/NSSCertDBTrustDomain.cpp.nss-hack firefox-84.0.2/security/certverifier/NSSCertDBTrustDomain.cpp
 --- firefox-84.0.2/security/certverifier/NSSCertDBTrustDomain.cpp.nss-hack      2021-01-11 12:12:02.585514543 +0100
 +++ firefox-84.0.2/security/certverifier/NSSCertDBTrustDomain.cpp       2021-01-11 12:47:50.345984582 +0100
@@ -1619,6 +1619,15 @@ SECStatus InitializeNSS(const nsACString
     return srv;
   }
 +  /* Sets the NSS_USE_ALG_IN_ANY_SIGNATURE bit.
 +   * does not change NSS_USE_ALG_IN_CERT_SIGNATURE,
 +   * so policy will still disable use of sha1 in
 +   * certificate related signature processing. */
 +  srv = NSS_SetAlgorithmPolicy(SEC_OID_SHA1, NSS_USE_ALG_IN_ANY_SIGNATURE, 0);
 +  if (srv != SECSuccess) {
 +    NS_WARNING("Unable to use SHA1 for Add-ons, expect broken/disabled Add-ons. See https://bugzilla.redhat.com/show_bug.cgi?id=1908018 for details.");
 +  }
 +
   if (nssDbConfig == NSSDBConfig::ReadWrite) {
     UniquePK11SlotInfo slot(PK11_GetInternalKeySlot());
     if (!slot) {
--- a/gen_cbindgen-vendor.sh
+++ b/gen_cbindgen-vendor.sh
@ -1,32 +0,0 @@
 #!/bin/bash
 set -x
 # Dummy Cargo.toml file with cbindgen dependency
 cat > Cargo.toml <<EOL
 [package]
 name = "dummy"
 version = "0.0.1"
 description = """
 This is a dummy package which contains dependency on cbindgen
 to be used with 'cargo vendor' commmand.
 """
 [dependencies]
 cbindgen = "0.24.3"
 [[bin]]
 name = "dummy"
 path = "dummy.rs"
 doc = false
 EOL
 cargo install cargo-vendor
 cargo vendor
 cd vendor
 tar -cJf ../cbindgen-vendor.tar.xz *
 cd ..
 rm -f Cargo.toml
 rm -rf vendor
--- a/get-calendar-langpacks.sh
+++ b/get-calendar-langpacks.sh
@ -1,126 +0,0 @@
 #!/bin/bash
 #set -x
 set -e
 usage()
 {
 cat << EOF
 usage: $0 options
 This script downloads calendar langpacks for Thunderbird.
 OPTIONS:
   -h      Show this message
   -v      Version string (7.0.1)
   -b      Build number (1, 2, 3)
   -r      Reuse downloaded files (when you don't want to redownload)
 EOF
 }
 VER=
 BUILDNUM=
 LANG_DATE=`date "+%Y%m%d"`
 while getopts “hv:b:r” OPTION
 do
     case $OPTION in
         h)
             usage
             exit 1
             ;;
         v)
             VER=$OPTARG
             ;;
         b)
             BUILDNUM=$OPTARG
             ;;
         ?)
             usage
             exit
             ;;
     esac
 done
 if [ -z "$VER" -o -z "$BUILDNUM"  ]
 then
     echo "Missing version or build number."
     usage
     exit 1
 fi
 WHITE='\033[1;33m'
 NC='\033[0m' # No Color
 LOCALES=`curl -f https://archive.mozilla.org/pub/thunderbird/candidates/$VER-candidates/build$BUILDNUM/linux-i686/ | grep "a href"|sed -e "s|.*/\([^/]*\)/\".*|\1|"|tail -n+2 |grep -v xpi`
 #echo $LOCALES
 rm -rf lightning-langpacks
 mkdir -p lightning-langpacks
 cd lightning-langpacks
 LOCALE_COUNT=`echo $LOCALES| tr ' ' '\n' | wc -l`
 LOCALE_NUM=0
 for lang in $LOCALES; do
  LOCALE_NUM=$((LOCALE_NUM+1))
  echo -e "${WHITE}Processing calendar locale: $lang ($LOCALE_NUM/$LOCALE_COUNT)${NC}"
  mkdir -p extracted_lightning
  mkdir -p calendar-locales
  #echo Downloading TB binary for locale: $lang
  wget --quiet https://archive.mozilla.org/pub/thunderbird/candidates/$VER-candidates/build$BUILDNUM/linux-i686/$lang/thunderbird-$VER.tar.bz2
  cd extracted_lightning
  tar -xf ../thunderbird-$VER.tar.bz2 thunderbird/distribution/extensions/\{e2fda1a4-762b-4020-b5ad-a41df1933103\}.xpi
  set +e
  unzip -qq thunderbird/distribution/extensions/\{e2fda1a4-762b-4020-b5ad-a41df1933103\}.xpi
  set -e
  LIGHTNING_VERSION=`cat app.ini |grep "^Version="|sed -e 's/Version=//'`
  BUILD_ID=`cat app.ini |grep "^BuildID="|sed -e 's/BuildID=//'`
  MAX_VERSION=`cat app.ini |grep MaxVersion|sed -e s/MaxVersion=//`
  MIN_VERSION=`cat app.ini |grep MinVersion|sed -e s/MinVersion=//`
  rm -rf thunderbird
  mkdir -p ../calendar-locales/chrome
  cp -r chrome/calendar-$lang ../calendar-locales/chrome
  cp -r chrome/lightning-$lang ../calendar-locales/chrome
  cd -
  cd calendar-locales
  # create manifest
  cat > manifest.json <<EOL
 {
  "languages": {
    "$lang": {
      "chrome_resources": {
        "calendar": "chrome/calendar-$lang/locale/$lang/calendar/",
        "lightning": "chrome/lightning-$lang/locale/$lang/lightning/"
      },
      "version": "$LIGHTNING_VERSION"
    }
  },
  "applications": {
    "gecko": {
      "strict_min_version": "$MIN_VERSION",
      "id": "langpack-cal-$lang@lightning.mozilla.org",
      "strict_max_version": "$MAX_VERSION"
    }
  },
  "langpack_id": "$lang",
  "version": "7.$LIGHTNING_VERSION.$BUILD_ID",
  "name": "$lang Language Pack Calendar",
  "manifest_version": 2,
  "sources": {
    "browser": {
      "base_path": "browser/"
    }
  },
  "author": "Mozilla.cz (contributors: Pavel Cvrček, Pavel Franc, Michal Stanke, Michal Vašíček)",
  "description": "Language pack for Thunderbird for $lang, this was repacked by Fedora/RHEL package maintainer from original binaries."
 }
 EOL
  zip --quiet -r ../langpack-cal-$lang@lightning.mozilla.org.xpi *
  cd -
  rm -rf calendar-locales
  rm -rf extracted_lightning
  rm -f thunderbird-$VER.tar.bz2
 done
 echo "Creating lightning-langpacks-$VER.tar.xz..."
 tar cJf ../lightning-langpacks-$VER.tar.xz *.xpi
 cd ..
 rm -rf lightning-langpacks
--- a/1
+++ b/1
@ -0,0 +1 @@
 AIzaSyBPGXa4AYD4FC3HJK7LnIKxm4fDusVuuco
--- a/1
+++ b/1
@ -0,0 +1 @@
 AIzaSyB2h2OuRcUgy5N-5hsZqiPW6sH3n_rptiQ
--- a/mozilla-1245783.patch
+++ b/mozilla-1245783.patch
@ -1,17 +0,0 @@
 # Remove when mozbz#1269319 lands
 --- firefox-45.0.1-orig/js/src/Makefile.in	2016-05-17 14:53:58.753178403 +0200
 +++ firefox-45.0.1/js/src/Makefile.in	2016-05-17 14:53:28.432817862 +0200
@@ -144,6 +144,11 @@ distclean::
 CFLAGS += $(MOZ_ZLIB_CFLAGS)
 +# Avoid GNU gcc bug #70526
 +# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=70526#c14
 +CFLAGS += -fno-schedule-insns2
 +CXXFLAGS += -fno-schedule-insns2
 +
 # Silence warnings on AIX/HP-UX from non-GNU compilers
 ifndef GNU_CC
 ifeq ($(OS_ARCH),AIX)
--- a/mozilla-1512162.patch
+++ b/mozilla-1512162.patch
@ -1,21 +0,0 @@
 diff -up thunderbird-68.1.0/js/xpconnect/src/XPCWrappedNative.cpp.mozbz-1512162 thunderbird-68.1.0/js/xpconnect/src/XPCWrappedNative.cpp
 --- thunderbird-68.1.0/js/xpconnect/src/XPCWrappedNative.cpp.mozbz-1512162	2019-09-10 01:43:33.000000000 +0200
 +++ thunderbird-68.1.0/js/xpconnect/src/XPCWrappedNative.cpp	2019-09-12 16:16:52.644123766 +0200
@@ -1092,7 +1092,7 @@ class MOZ_STACK_CLASS CallMethodHelper f
   MOZ_ALWAYS_INLINE bool GetOutParamSource(uint8_t paramIndex,
                                            MutableHandleValue srcp) const;
 -  MOZ_ALWAYS_INLINE bool GatherAndConvertResults();
 +  bool GatherAndConvertResults();
   MOZ_ALWAYS_INLINE bool QueryInterfaceFastPath();
@@ -1139,7 +1139,7 @@ class MOZ_STACK_CLASS CallMethodHelper f
   ~CallMethodHelper();
 -  MOZ_ALWAYS_INLINE bool Call();
 +  bool Call();
   // Trace implementation so we can put our CallMethodHelper in a Rooted<T>.
   void trace(JSTracer* aTrc);
--- a/mozilla-526293.patch
+++ b/mozilla-526293.patch
@ -1,14 +0,0 @@
 diff -up firefox-60.6.0/widget/gtk/nsFilePicker.cpp.old firefox-60.6.0/widget/gtk/nsFilePicker.cpp
 --- firefox-60.6.0/widget/gtk/nsFilePicker.cpp.old	2019-03-27 10:29:47.918560620 +0100
 +++ firefox-60.6.0/widget/gtk/nsFilePicker.cpp	2019-03-27 10:30:08.384491717 +0100
@@ -366,9 +366,7 @@ nsFilePicker::Open(nsIFilePickerShownCal
   // If we have --enable-proxy-bypass-protection, then don't allow
   // remote URLs to be used.
 #ifndef MOZ_PROXY_BYPASS_PROTECTION
 -  if (mAllowURLs) {
 -    gtk_file_chooser_set_local_only(GTK_FILE_CHOOSER(file_chooser), FALSE);
 -  }
 +  gtk_file_chooser_set_local_only(GTK_FILE_CHOOSER(file_chooser), FALSE);
 #endif
   if (action == GTK_FILE_CHOOSER_ACTION_OPEN ||
--- a/1
+++ b/1
@ -0,0 +1 @@
 9008bb7e-1e22-4038-94fe-047dd48ccc0b
--- a/mozilla-bmo1170092.patch
+++ b/mozilla-bmo1170092.patch
--- a/mozilla-bmo1504834-part1.patch
+++ b/mozilla-bmo1504834-part1.patch
@ -0,0 +1,89 @@
 # HG changeset patch
 # Parent  9fcbd287056a40084b1e679f787bf683b291f323
 Taken from https://bugzilla.mozilla.org/show_bug.cgi?id=1504834
 diff --git a/gfx/2d/DrawTargetSkia.cpp b/gfx/2d/DrawTargetSkia.cpp
 --- a/gfx/2d/DrawTargetSkia.cpp
 +++ b/gfx/2d/DrawTargetSkia.cpp
@@ -156,7 +156,8 @@ static IntRect CalculateSurfaceBounds(co
 }
 static const int kARGBAlphaOffset =
 -    SurfaceFormat::A8R8G8B8_UINT32 == SurfaceFormat::B8G8R8A8 ? 3 : 0;
 +    0;  // Skia is always BGRA SurfaceFormat::A8R8G8B8_UINT32 ==
 +        // SurfaceFormat::B8G8R8A8 ? 3 : 0;
 static bool VerifyRGBXFormat(uint8_t* aData, const IntSize& aSize,
                              const int32_t aStride, SurfaceFormat aFormat) {
 diff --git a/gfx/2d/Types.h b/gfx/2d/Types.h
 --- a/gfx/2d/Types.h
 +++ b/gfx/2d/Types.h
@@ -89,18 +89,11 @@ enum class SurfaceFormat : int8_t {
   // This represents the unknown format.
   UNKNOWN,  // TODO: Replace uses with Maybe<SurfaceFormat>.
 -// The following values are endian-independent synonyms. The _UINT32 suffix
 -// indicates that the name reflects the layout when viewed as a uint32_t
 -// value.
 -#if MOZ_LITTLE_ENDIAN()
 +  // The following values are endian-independent synonyms. The _UINT32 suffix
 +  // indicates that the name reflects the layout when viewed as a uint32_t
 +  // value.
   A8R8G8B8_UINT32 = B8G8R8A8,  // 0xAARRGGBB
   X8R8G8B8_UINT32 = B8G8R8X8,  // 0x00RRGGBB
 -#elif MOZ_BIG_ENDIAN()
 -  A8R8G8B8_UINT32 = A8R8G8B8,  // 0xAARRGGBB
 -  X8R8G8B8_UINT32 = X8R8G8B8,  // 0x00RRGGBB
 -#else
 -#  error "bad endianness"
 -#endif
   // The following values are OS and endian-independent synonyms.
   //
 diff --git a/gfx/skia/skia/modules/skcms/skcms.cc b/gfx/skia/skia/modules/skcms/skcms.cc
 --- a/gfx/skia/skia/modules/skcms/skcms.cc
 +++ b/gfx/skia/skia/modules/skcms/skcms.cc
@@ -30,6 +30,8 @@
         #include <avx512fintrin.h>
         #include <avx512dqintrin.h>
     #endif
 +#else
 +    #define SKCMS_PORTABLE
 #endif
 static bool runtime_cpu_detection = true;
@@ -324,20 +326,28 @@ enum {
 static uint16_t read_big_u16(const uint8_t* ptr) {
     uint16_t be;
     memcpy(&be, ptr, sizeof(be));
 -#if defined(_MSC_VER)
 -    return _byteswap_ushort(be);
 +#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
 +    return be;
 #else
 -    return __builtin_bswap16(be);
 +    #if defined(_MSC_VER)
 +     return _byteswap_ushort(be);
 +    #else
 +     return __builtin_bswap16(be);
 +    #endif
 #endif
 }
 static uint32_t read_big_u32(const uint8_t* ptr) {
     uint32_t be;
     memcpy(&be, ptr, sizeof(be));
 -#if defined(_MSC_VER)
 -    return _byteswap_ulong(be);
 +#if __BYTE_ORDER == __ORDER_BIG_ENDIAN__
 +    return be;
 #else
 -    return __builtin_bswap32(be);
 +    #if defined(_MSC_VER)
 +     return _byteswap_ulong(be);
 +    #else
 +     return __builtin_bswap32(be);
 +    #endif
 #endif
 }
--- a/mozilla-bmo1504834-part3.patch
+++ b/mozilla-bmo1504834-part3.patch
@ -0,0 +1,17 @@
 # HG changeset patch
 # Parent  09cd4ac2cc607e85aa572425b824fbab386af607
 For FF68, AntiAliasing of XULTexts seem to be broken on big endian (s390x). Text and icons of the sandwich-menu to the
 right of the address bar, as well as plugin-windows appears transparant, which usually means unreadable (white on white).
 diff --git a/gfx/skia/skia/src/opts/SkBlitMask_opts.h b/gfx/skia/skia/src/opts/SkBlitMask_opts.h
 --- a/gfx/skia/skia/src/opts/SkBlitMask_opts.h
 +++ b/gfx/skia/skia/src/opts/SkBlitMask_opts.h
@@ -210,6 +210,8 @@ namespace SK_OPTS_NS {
             //   ~~~>
             // a = 1*aa + d(1-1*aa) = aa + d(1-aa)
             // c = 0*aa + d(1-1*aa) =      d(1-aa)
 +            // TODO: Check this for endian-issues!
 +            //       Do we need to switch 255 to the front for all of those tuples?
             return (aa & Sk4px(skvx::byte16{0,0,0,255, 0,0,0,255, 0,0,0,255, 0,0,0,255}))
                  + d.approxMulDiv255(aa.inv());
         };
--- a/mozilla-bmo1670333.patch
+++ b/mozilla-bmo1670333.patch
@ -0,0 +1,69 @@
 diff -up firefox-115.0/dom/media/mp4/MP4Demuxer.cpp.1670333 firefox-115.0/dom/media/mp4/MP4Demuxer.cpp
 --- firefox-115.0/dom/media/mp4/MP4Demuxer.cpp.1670333	2023-06-06 23:14:43.000000000 +0200
 +++ firefox-115.0/dom/media/mp4/MP4Demuxer.cpp	2023-06-08 08:15:48.214109403 +0200
@@ -32,6 +32,8 @@ mozilla::LogModule* GetDemuxerLog() { re
   DDMOZ_LOG(gMediaDemuxerLog, mozilla::LogLevel::Debug, "::%s: " arg, \
             __func__, ##__VA_ARGS__)
 +extern bool gUseKeyframeFromContainer;
 +
 namespace mozilla {
 using TimeUnit = media::TimeUnit;
@@ -404,6 +406,12 @@ already_AddRefed<MediaRawData> MP4TrackD
           [[fallthrough]];
         case H264::FrameType::OTHER: {
           bool keyframe = type == H264::FrameType::I_FRAME;
 +          if (gUseKeyframeFromContainer) {
 +            if (sample->mKeyframe && sample->mKeyframe != keyframe) {
 +              sample->mKeyframe = keyframe;
 +            }
 +            break;
 +          }
           if (sample->mKeyframe != keyframe) {
             NS_WARNING(nsPrintfCString("Frame incorrectly marked as %skeyframe "
                                        "@ pts:%" PRId64 " dur:%" PRId64
 diff -up firefox-115.0/dom/media/platforms/PDMFactory.cpp.1670333 firefox-115.0/dom/media/platforms/PDMFactory.cpp
 --- firefox-115.0/dom/media/platforms/PDMFactory.cpp.1670333	2023-06-06 23:14:44.000000000 +0200
 +++ firefox-115.0/dom/media/platforms/PDMFactory.cpp	2023-06-08 08:09:33.145289602 +0200
@@ -67,6 +67,8 @@
 #include <functional>
 +bool gUseKeyframeFromContainer = false;
 +
 using DecodeSupport = mozilla::media::DecodeSupport;
 using DecodeSupportSet = mozilla::media::DecodeSupportSet;
 using MediaCodec = mozilla::media::MediaCodec;
@@ -562,7 +564,7 @@ void PDMFactory::CreateRddPDMs() {
 #ifdef MOZ_FFMPEG
   if (StaticPrefs::media_ffmpeg_enabled() &&
       StaticPrefs::media_rdd_ffmpeg_enabled() &&
 -      !CreateAndStartupPDM<FFmpegRuntimeLinker>()) {
 +      !(mFFmpegUsed = CreateAndStartupPDM<FFmpegRuntimeLinker>())) {
     mFailureFlags += GetFailureFlagBasedOnFFmpegStatus(
         FFmpegRuntimeLinker::LinkStatusCode());
   }
@@ -738,9 +740,10 @@ void PDMFactory::CreateDefaultPDMs() {
   CreateAndStartupPDM<AgnosticDecoderModule>();
 -  if (StaticPrefs::media_gmp_decoder_enabled() &&
 +  if (StaticPrefs::media_gmp_decoder_enabled() && !mFFmpegUsed &&
       !StartupPDM(GMPDecoderModule::Create(),
                   StaticPrefs::media_gmp_decoder_preferred())) {
 +    gUseKeyframeFromContainer = true;
     mFailureFlags += DecoderDoctorDiagnostics::Flags::GMPPDMFailedToStartup;
   }
 }
 diff -up firefox-115.0/dom/media/platforms/PDMFactory.h.1670333 firefox-115.0/dom/media/platforms/PDMFactory.h
 --- firefox-115.0/dom/media/platforms/PDMFactory.h.1670333	2023-06-06 23:14:42.000000000 +0200
 +++ firefox-115.0/dom/media/platforms/PDMFactory.h	2023-06-08 08:09:33.145289602 +0200
@@ -103,6 +103,7 @@ class PDMFactory final {
   RefPtr<PlatformDecoderModule> mNullPDM;
   DecoderDoctorDiagnostics::FlagsSet mFailureFlags;
 +  bool mFFmpegUsed = false;
   friend class RemoteVideoDecoderParent;
   static void EnsureInit();
--- a/mozilla-bmo1716707-svg.patch
+++ b/mozilla-bmo1716707-svg.patch
@ -0,0 +1,29 @@
 # HG changeset patch
 # User M. Sirringhaus <msirringhaus@suse.de>
 # Date 1645518286 -3600
 #      Tue Feb 22 09:24:46 2022 +0100
 # Node ID 81832d035e101471dcf52dd91de287268add7a91
 # Parent  66f7ce16eb4965108687280e5443edd610631efb
 imported patch svg-rendering.patch
 diff --git a/image/imgFrame.cpp b/image/imgFrame.cpp
 --- a/image/imgFrame.cpp
 +++ b/image/imgFrame.cpp
@@ -372,6 +372,17 @@ nsresult imgFrame::InitWithDrawable(gfxD
     return NS_ERROR_OUT_OF_MEMORY;
   }
 +#if MOZ_BIG_ENDIAN()
 +  if (aBackend == gfx::BackendType::SKIA && canUseDataSurface) {
 +      // SKIA is lying about what format it returns on big endian
 +      for (int ii=0; ii < mRawSurface->GetSize().Height()*mRawSurface->Stride() / 4; ++ii) {
 +        uint32_t *vals = (uint32_t*)(mRawSurface->GetData());
 +        uint32_t val = ((vals[ii] << 8) & 0xFF00FF00 ) | ((vals[ii] >> 8) & 0xFF00FF );
 +        vals[ii] = (val << 16) | (val >> 16);
 +      }
 +  }
 +#endif
 +
   if (!canUseDataSurface) {
     // We used an offscreen surface, which is an "optimized" surface from
     // imgFrame's perspective.
--- a/mozilla-bmo1716707-swizzle.patch
+++ b/mozilla-bmo1716707-swizzle.patch
@ -0,0 +1,34 @@
 # HG changeset patch
 # User M. Sirringhaus <msirringhaus@suse.de>
 # Date 1645518286 -3600
 #      Tue Feb 22 09:24:46 2022 +0100
 # Node ID 494640792b4677f6462e95b90a54a4e22aeb738b
 # Parent  81832d035e101471dcf52dd91de287268add7a91
 imported patch one_swizzle_to_rule_them_all.patch
 Index: firefox-102.0/gfx/webrender_bindings/RenderCompositorSWGL.cpp
 ===================================================================
 --- firefox-102.0.orig/gfx/webrender_bindings/RenderCompositorSWGL.cpp
 +++ firefox-102.0/gfx/webrender_bindings/RenderCompositorSWGL.cpp
@@ -7,6 +7,7 @@
 #include "RenderCompositorSWGL.h"
 #include "mozilla/gfx/Logging.h"
 +#include "mozilla/gfx/Swizzle.h"
 #include "mozilla/widget/CompositorWidget.h"
 #ifdef MOZ_WIDGET_GTK
@@ -235,6 +237,13 @@ void RenderCompositorSWGL::CommitMappedB
   }
   mDT->Flush();
 +#if MOZ_BIG_ENDIAN()
 +  // One swizzle to rule them all.
 +  gfx::SwizzleData(mMappedData, mMappedStride, gfx::SurfaceFormat::B8G8R8A8,
 +                   mMappedData, mMappedStride, gfx::SurfaceFormat::A8R8G8B8,
 +                   mDT->GetSize());
 +#endif
 +
   // Done with the DT. Hand it back to the widget and clear out any trace of it.
   mWidget->EndRemoteDrawingInRegion(mDT, mDirtyRegion);
   mDirtyRegion.SetEmpty();
--- a/mozilla-bmo1789216-disable-av1.patch
+++ b/mozilla-bmo1789216-disable-av1.patch
@ -0,0 +1,89 @@
 diff --git a/media/ffvpx/libavcodec/allcodecs.c b/media/ffvpx/libavcodec/allcodecs.c
 --- a/media/ffvpx/libavcodec/allcodecs.c
 +++ b/media/ffvpx/libavcodec/allcodecs.c
@@ -755,12 +755,15 @@
 extern FFCodec ff_libaom_av1_encoder;
 extern const FFCodec ff_libaribb24_decoder;
 extern const FFCodec ff_libcelt_decoder;
 extern const FFCodec ff_libcodec2_encoder;
 extern const FFCodec ff_libcodec2_decoder;
 +#if CONFIG_MOZ_AV1
 extern const FFCodec ff_libdav1d_decoder;
 extern const FFCodec ff_libdavs2_decoder;
 +extern const FFCodec ff_libuavs3d_decoder;
 +#endif
 extern const FFCodec ff_libfdk_aac_encoder;
 extern const FFCodec ff_libfdk_aac_decoder;
 extern const FFCodec ff_libgsm_encoder;
 extern const FFCodec ff_libgsm_decoder;
 extern const FFCodec ff_libgsm_ms_encoder;
@@ -783,11 +786,10 @@
 extern const FFCodec ff_libspeex_encoder;
 extern const FFCodec ff_libspeex_decoder;
 extern const FFCodec ff_libsvtav1_encoder;
 extern const FFCodec ff_libtheora_encoder;
 extern const FFCodec ff_libtwolame_encoder;
 -extern const FFCodec ff_libuavs3d_decoder;
 extern const FFCodec ff_libvo_amrwbenc_encoder;
 extern const FFCodec ff_libvorbis_encoder;
 extern const FFCodec ff_libvorbis_decoder;
 extern const FFCodec ff_libvpx_vp8_encoder;
 extern const FFCodec ff_libvpx_vp8_decoder;
 diff --git a/media/ffvpx/libavcodec/codec_list.c b/media/ffvpx/libavcodec/codec_list.c
 --- a/media/ffvpx/libavcodec/codec_list.c
 +++ b/media/ffvpx/libavcodec/codec_list.c
@@ -9,12 +9,14 @@
     &ff_flac_decoder,
 #endif
 #if CONFIG_MP3_DECODER
     &ff_mp3_decoder,
 #endif
 +#if CONFIG_MOZ_AV1
 #if CONFIG_LIBDAV1D
     &ff_libdav1d_decoder,
 #endif
 #if CONFIG_AV1_DECODER
     &ff_av1_decoder,
 #endif
 +#endif
     NULL };
 diff --git a/media/ffvpx/libavcodec/moz.build b/media/ffvpx/libavcodec/moz.build
 --- a/media/ffvpx/libavcodec/moz.build
 +++ b/media/ffvpx/libavcodec/moz.build
@@ -84,11 +84,10 @@
         'cbs.c',
         'cbs_av1.c',
         'golomb.c',
         'h264pred.c',
         'imgconvert.c',
 -        'libdav1d.c',
         'mathtables.c',
         'qsv_api.c',
         'raw.c',
         'videodsp.c',
         'vp8.c',
@@ -107,14 +106,19 @@
         'vp9mvs.c',
         'vp9prob.c',
         'vp9recon.c',
         'vpx_rac.c',
     ]
 -    USE_LIBS += [
 -        'dav1d',
 -        'media_libdav1d_asm',
 -    ]
 +    if CONFIG['MOZ_AV1']:
 +        USE_LIBS += [
 +            'dav1d',
 +            'media_libdav1d_asm',
 +        ]
 +        SOURCES += [
 +            'libdav1d.c',
 +        ]
 +
     if CONFIG['MOZ_WAYLAND']:
         LOCAL_INCLUDES += ['/media/mozva']
         SOURCES += [
             'vaapi_av1.c',
             'vaapi_decode.c',
--- a/mozilla-bmo849632.patch
+++ b/mozilla-bmo849632.patch
@ -0,0 +1,26 @@
 # HG changeset patch
 # Parent  3de59fe1b8708c01e134ce698c4232b8a854f617
 Problem:  webGL sites are displayed in the wrong color (usually blue-ish)
 Solution: Problem is with skia once again. Output of webgl seems endian-correct, but skia only
          knows how to deal with little endian.
          So we swizzle the output of webgl after reading it from readpixels()
 Note:     This does not fix all webGL sites, but is a step in the right direction
 Index: firefox-115.0/gfx/gl/GLContext.h
 ===================================================================
 --- firefox-115.0.orig/gfx/gl/GLContext.h
 +++ firefox-115.0/gfx/gl/GLContext.h
@@ -1560,6 +1560,13 @@ class GLContext : public GenericAtomicRe
     BEFORE_GL_CALL;
     mSymbols.fReadPixels(x, y, width, height, format, type, pixels);
     OnSyncCall();
 +#if MOZ_BIG_ENDIAN()
 +    uint8_t* itr = (uint8_t*)pixels;
 +    for (GLsizei i = 0; i < width * height; i++) {
 +      NativeEndian::swapToLittleEndianInPlace((uint32_t*)itr, 1);
 +      itr += 4;
 +    }
 +#endif
     AFTER_GL_CALL;
     mHeavyGLCallsSinceLastFlush = true;
   }
--- a/mozilla-bmo998749.patch
+++ b/mozilla-bmo998749.patch
@ -0,0 +1,29 @@
 # HG changeset patch
 # User msirringhaus@suse.de
 # Date 1583738770 -3600
 #      Mon Mar 09 08:26:10 2020 +0100
 # Node ID 34676feac1a542e409e22acf5b98735f8313b1ce
 # Parent  506857dace0a08d1c9685e3ac264646590b3e27f
 [mq]: mozilla-bmo998749.patch
 diff -r 506857dace0a -r 34676feac1a5 gfx/2d/FilterProcessing.h
 --- a/gfx/2d/FilterProcessing.h	Fri Feb 28 12:31:51 2020 +0100
 +++ b/gfx/2d/FilterProcessing.h	Mon Mar 09 08:26:10 2020 +0100
@@ -13,10 +13,17 @@
 namespace mozilla {
 namespace gfx {
 +#if MOZ_BIG_ENDIAN()
 +const ptrdiff_t B8G8R8A8_COMPONENT_BYTEOFFSET_B = 3;
 +const ptrdiff_t B8G8R8A8_COMPONENT_BYTEOFFSET_G = 2;
 +const ptrdiff_t B8G8R8A8_COMPONENT_BYTEOFFSET_R = 1;
 +const ptrdiff_t B8G8R8A8_COMPONENT_BYTEOFFSET_A = 0;
 +#else
 const ptrdiff_t B8G8R8A8_COMPONENT_BYTEOFFSET_B = 0;
 const ptrdiff_t B8G8R8A8_COMPONENT_BYTEOFFSET_G = 1;
 const ptrdiff_t B8G8R8A8_COMPONENT_BYTEOFFSET_R = 2;
 const ptrdiff_t B8G8R8A8_COMPONENT_BYTEOFFSET_A = 3;
 +#endif
 class FilterProcessing {
  public:
--- a/mozilla-build-arm.patch
+++ b/mozilla-build-arm.patch
@ -1,12 +0,0 @@
 diff -up firefox-29.0/mozilla-release/gfx/ycbcr/moz.build.arm firefox-29.0/mozilla-release/gfx/ycbcr/moz.build
 --- firefox-29.0/mozilla-release/gfx/ycbcr/moz.build.arm	2014-04-22 07:27:47.000000000 +0200
 +++ firefox-29.0/mozilla-release/gfx/ycbcr/moz.build	2014-04-22 16:40:34.862849368 +0200
@@ -61,7 +61,7 @@ else:
         'yuv_row_other.cpp',
     ]
 -if CONFIG['CPU_ARCH'] == 'arm' and CONFIG['HAVE_ARM_NEON']:
 +if CONFIG['HAVE_ARM_NEON']:
     SOURCES += [
         'yuv_row_arm.s',
     ]
--- a/2
+++ b/2
@ -1,2 +1,2 @@
 #!/bin/sh
-exec /usr/bin/node "$@" 2>&1 | cat -
+exec node "$@" 2>&1 | cat -
--- a/nss-setup-flags-env.inc
+++ b/nss-setup-flags-env.inc
@ -0,0 +1,7 @@
 sed -i 's@%{bundled_install_path}@%{_buildrootdir}%{bundled_install_path}@g' %{_buildrootdir}%{bundled_install_path}/%{_lib}/pkgconfig/nss*.pc
 export LDFLAGS="-L%{_buildrootdir}%{bundled_install_path}/%{_lib} $LDFLAGS"
 export LDFLAGS="-Wl,-rpath,%{bundled_install_path}/%{_lib} $LDFLAGS"
 export LDFLAGS="-Wl,-rpath-link,%{_buildrootdir}%{bundled_install_path}/%{_lib} $LDFLAGS"
 export PKG_CONFIG_PATH=%{_buildrootdir}%{bundled_install_path}/%{_lib}/pkgconfig
 export PATH="{_buildrootdir}%{bundled_install_path}/bin:$PATH"
--- a/23
+++ b/23
@ -0,0 +1,23 @@
 #!/bin/sh
 rm -rf ./process-tarball-dir
 mkdir ./process-tarball-dir
 tar -xJf $1 --directory process-tarball-dir
 rm -vf ./process-tarball-dir/*/testing/web-platform/tests/conformance-checkers/html-rdfa/0030-isvalid.html
 rm -vf ./process-tarball-dir/*/testing/web-platform/tests/conformance-checkers/html-rdfa/0008-isvalid.html
 rm -vf ./process-tarball-dir/*/testing/web-platform/tests/conformance-checkers/html-rdfalite/0030-isvalid.html
 rm -vf ./process-tarball-dir/*/testing/web-platform/tests/css/css-ui/support/cursors/woolly-64.svg
 rm -vf ./process-tarball-dir/*/testing/web-platform/tests/css/css-ui/support/cursors/woolly.svg
 rm -vf ./process-tarball-dir/*/testing/web-platform/tests/conformance-checkers/html-rdfa/0230-novalid.html
 rm -vf ./process-tarball-dir/*/testing/web-platform/tests/conformance-checkers/html-rdfa/0231-isvalid.html
 rm -vf ./process-tarball-dir/*/layout/inspector/tests/chrome/test_fontVariationsAPI.css
 processed_tarball=${1/source/processed-source}
 cd ./process-tarball-dir
 tar -cf - ./* | xz -9 -T 0 -f > $processed_tarball
 mv $processed_tarball ..
 cd ..
 rm -rf ./process-tarball-dir
--- a/rhbz-1173156.patch
+++ b/rhbz-1173156.patch
@ -0,0 +1,12 @@
 diff -up firefox-60.5.0/extensions/auth/nsAuthSambaNTLM.cpp.rhbz-1173156 firefox-60.5.0/extensions/auth/nsAuthSambaNTLM.cpp
 --- firefox-60.5.0/extensions/auth/nsAuthSambaNTLM.cpp.rhbz-1173156	2019-01-22 10:36:09.284069020 +0100
 +++ firefox-60.5.0/extensions/auth/nsAuthSambaNTLM.cpp	2019-01-22 10:37:12.669757744 +0100
@@ -161,7 +161,7 @@ nsresult nsAuthSambaNTLM::SpawnNTLMAuthH
   const char* username = PR_GetEnv("USER");
   if (!username) return NS_ERROR_FAILURE;
 -  const char* const args[] = {"ntlm_auth",
 +  const char* const args[] = {"/usr/bin/ntlm_auth",
                               "--helper-protocol",
                               "ntlmssp-client-1",
                               "--use-cached-creds",
--- a/rhbz-1219542-s390-build.patch
+++ b/rhbz-1219542-s390-build.patch
@ -1,23 +0,0 @@
 diff -up firefox-55.0/js/src/old-configure.in.rhbz-1219542-s390 firefox-55.0/js/src/old-configure.in
 --- firefox-55.0/js/src/old-configure.in.rhbz-1219542-s390	2017-07-31 18:20:48.000000000 +0200
 +++ firefox-55.0/js/src/old-configure.in	2017-08-02 14:31:32.190243669 +0200
@@ -541,7 +541,7 @@ case "$host" in
 *-linux*|*-kfreebsd*-gnu|*-gnu*)
     HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX"
 -    HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}"
 +    HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O1}"
     ;;
 *)
@@ -617,8 +617,8 @@ case "$target" in
 *-*linux*)
     if test "$GNU_CC" -o "$GNU_CXX"; then
 -        MOZ_PGO_OPTIMIZE_FLAGS="-O3"
 -        MOZ_OPTIMIZE_FLAGS="-O3"
 +        MOZ_PGO_OPTIMIZE_FLAGS="-O1"
 +        MOZ_OPTIMIZE_FLAGS="-O1"
         if test -z "$CLANG_CC"; then
            MOZ_OPTIMIZE_FLAGS="-freorder-blocks $MOZ_OPTIMIZE_FLAGS"
         fi
--- a/rhbz-1354671.patch
+++ b/rhbz-1354671.patch
@ -1,12 +1,12 @@
-diff -up firefox-60.5.0/layout/base/nsIPresShell.h.1354671 firefox-60.5.0/layout/base/nsIPresShell.h
+diff -up firefox-70.0/layout/base/PresShell.h.1354671 firefox-70.0/layout/base/PresShell.h
--- firefox-60.5.0/layout/base/nsIPresShell.h.1354671	2019-01-22 16:08:40.796539950 +0100
+--- firefox-70.0/layout/base/PresShell.h.1354671	2019-10-22 12:33:12.987775587 +0200
-+++ firefox-60.5.0/layout/base/nsIPresShell.h	2019-01-22 16:10:25.106069228 +0100
+++ firefox-70.0/layout/base/PresShell.h	2019-10-22 12:36:39.999366086 +0200
-@@ -204,7 +204,7 @@ class nsIPresShell : public nsStubDocume
+@@ -257,7 +257,7 @@ class PresShell final : public nsStubDoc
    * to the same aSize value.  AllocateFrame is infallible and will abort
    * on out-of-memory.
    */
 -  void* AllocateFrame(nsQueryFrame::FrameIID aID, size_t aSize) {
 +  void* __attribute__((optimize("no-lifetime-dse"))) AllocateFrame(nsQueryFrame::FrameIID aID, size_t aSize) {
-     void* result = mFrameArena.AllocateByFrameID(aID, aSize);
+ #define FRAME_ID(classname, ...)                                  \
-     RecordAlloc(result);
+   static_assert(size_t(nsQueryFrame::FrameIID::classname##_id) == \
-     return result;
+                     size_t(eArenaObjectID_##classname),           \
--- a/rustflags-commasplit.patch
+++ b/rustflags-commasplit.patch
@ -1,76 +0,0 @@
 --- thunderbird-102.10.0/build/moz.configure/rust.configure.rustflags-commasplit	2023-03-21 06:16:03.000000000 -0700
 +++ thunderbird-102.10.0/build/moz.configure/rust.configure	2023-04-05 08:57:29.403219120 -0700
@@ -593,7 +593,7 @@
 # ==============================================================
 -option(env="RUSTFLAGS", nargs=1, help="Rust compiler flags")
 +option(env="RUSTFLAGS", nargs=1, help="Rust compiler flags", comma_split=False)
 set_config("RUSTFLAGS", depends("RUSTFLAGS")(lambda flags: flags))
 --- thunderbird-102.10.0/python/mozbuild/mozbuild/configure/options.py.rustflags-commasplit	2023-03-21 06:16:09.000000000 -0700
 +++ thunderbird-102.10.0/python/mozbuild/mozbuild/configure/options.py	2023-04-05 08:57:31.270193468 -0700
@@ -191,6 +191,10 @@
       to instantiate an option indirectly. Set this to a positive integer to
       force the script to look into a deeper stack frame when inferring the
       `category`.
 +    - `comma_split` specifies whether the value string should be split on
 +      commas. The default is True. Setting it False is necessary for things
 +      like compiler flags which should be a single string that may contain
 +      commas.
     """
     __slots__ = (
@@ -205,6 +209,7 @@
         "possible_origins",
         "category",
         "define_depth",
 +        "comma_split",
     )
     def __init__(
@@ -218,6 +223,7 @@
         category=None,
         help=None,
         define_depth=0,
 +        comma_split=True,
     ):
         if not name and not env:
             raise InvalidOptionError(
@@ -335,9 +341,10 @@
         self.choices = choices
         self.help = help
         self.category = category or _infer_option_category(define_depth)
 +        self.comma_split = comma_split
     @staticmethod
 -    def split_option(option):
 +    def split_option(option, comma_split=True):
         """Split a flag or variable into a prefix, a name and values
         Variables come in the form NAME=values (no prefix).
@@ -350,7 +357,13 @@
         elements = option.split("=", 1)
         name = elements[0]
 -        values = tuple(elements[1].split(",")) if len(elements) == 2 else ()
 +        if len(elements) == 2:
 +            if comma_split:
 +                values = tuple(elements[1].split(","))
 +            else:
 +                values = (elements[1],)
 +        else:
 +            values = ()
         if name.startswith("--"):
             name = name[2:]
             if not name.islower():
@@ -426,7 +439,7 @@
                 % (option, origin, ", ".join(self.possible_origins))
             )
 -        prefix, name, values = self.split_option(option)
 +        prefix, name, values = self.split_option(option, self.comma_split)
         option = self._join_option(prefix, name)
         assert name in (self.name, self.env)
--- a/7
+++ b/7
@ -1,3 +1,6 @@
 SHA512 (cbindgen-vendor.tar.xz) = 161811f4adfc74e5d92871c78139704d32e1e1ad6b615c85353de300d9647a68f1ca8b1c953f7cc5539d861e9e8d8e42892cae757a3eafea78804e19bc323c16
-SHA512 (thunderbird-115.6.1.source.tar.xz) = f2efaff8b209234b202671b5322fb14a367b955e28c4b24b139af091b838186126e3d387ca21e57ed089629af876e86b38588789b1ef3db14f4f8703095467b3
+SHA512 (nspr-4.35.0-1.el8_1.src.rpm) = 5123a443fcc42602e31104999be339ae899eb7b1f1e2f1ea87ba4f283eb894d08ab568e421dba1df4770f23be91ff88aa6a0748bce7feef31ed88bee5bdecb2c
-SHA512 (thunderbird-langpacks-115.6.1-20240110.tar.xz) = 4f0e52e05ef3c4445f1a0ac2fe0df7a5056db13d656b8af3960ddda05c2e4e0ac1bc75ce194f0961fe9a63e19c4bcc92500b5322ebb5f238f22188714db443cd
+SHA512 (nss-3.90.0-2.el8_1.src.rpm) = 850cd6a343e62d34ad28ac356db03371f0b1f018274901cc700cc4f8138c9929eb159bbb1ebe167f727a69f6499423a54581ca65ed655ee468f1cae8450df85c
 SHA512 (nss-3.90.0-3.el9_0.src.rpm) = f321b9c1bda0b09eee564e2903023435851a4ff2e55bdd5b03012ca51be7999b18d85061f874065d0b25913721eb574f49746a3111f8f1cdd5b21268dddd8367
 SHA512 (thunderbird-115.12.1.processed-source.tar.xz) = bef06c1136069d5ba76ce4ca759f2268b61e1424ff14de9ec831a49198954fb1e39f3d28709e838f5eb8b119b35454c40f03bc3f98ec7f7325c52ae05cb3c575
 SHA512 (thunderbird-langpacks-115.12.1-20240618.tar.xz) = 033d0641b2c1445fa0af7aa3a0e629bdbcea2d408f356519a689d502bac547bcf74f262fc414bc103cc646ac06be754bd1beb68e86e0d144b73faa74c5ee04d7
--- a/58
+++ b/58
@ -1,44 +1,40 @@
 mk_add_options MOZ_CO_PROJECT=mail
 ac_add_options --enable-application=comm/mail
-ac_add_options --with-system-zlib
+ac_add_options --allow-addon-sideload
 ac_add_options --disable-bootstrap
 ac_add_options --disable-crashreporter
 #ac_add_options --disable-elf-hack
 ac_add_options --disable-jemalloc
 ac_add_options --disable-strip
-#ac_add_options --enable-libnotify
+ac_add_options --disable-tests
 ac_add_options --enable-necko-wifi
 ac_add_options --disable-updater
 ac_add_options --enable-chrome-format=omni
-ac_add_options --enable-pulseaudio
+ac_add_options --enable-default-toolkit=cairo-gtk3-wayland
 ac_add_options --enable-av1
 ac_add_options --without-system-icu
 ac_add_options --enable-release
 ac_add_options --update-channel=release
 ac_add_options --allow-addon-sideload
 ac_add_options --enable-js-shell
-ac_add_options --with-unsigned-addon-scopes=app,system
+ac_add_options --enable-necko-wifi
-ac_add_options --without-wasm-sandboxed-libraries
+ac_add_options --enable-official-branding
-ac_add_options --disable-bootstrap
+ac_add_options --enable-official-branding
 ac_add_options --enable-pulseaudio
 ac_add_options --enable-release
 ac_add_options --enable-system-ffi
 ac_add_options --libdir="$LIBDIR"
 ac_add_options --prefix="$PREFIX"
 ac_add_options --update-channel=release
 ac_add_options --with-google-location-service-api-keyfile=../google-api-key
 ac_add_options --with-google-safebrowsing-api-keyfile=../google-api-key
 ac_add_options --with-mozilla-api-keyfile=../mozilla-api-key
 ac_add_options --without-sysroot
-
+ac_add_options --without-system-icu
-
+ac_add_options --without-wasm-sandboxed-libraries
-
+ac_add_options --with-system-jpeg
-#mk_add_options AUTOCONF=autoconf-2.13
+ac_add_options --with-system-jpeg
-
+ac_add_options --with-system-zlib
-#ac_add_options --enable-default-toolkit=cairo-gtk3-wayland
+ac_add_options --with-unsigned-addon-scopes=app,system
 #ac_add_options --prefix="$PREFIX"
 #ac_add_options --libdir="$LIBDIR"
 #ac_add_options --with-system-jpeg
 #ac_add_options --with-system-zlib
 #ac_add_options --with-system-libvpx
 #ac_add_options --disable-tests
 #ac_add_options --disable-strip
 ## temporary disable system cairo, because compilation fails
 #ac_add_options --disable-necko-wifi
 #ac_add_options --disable-updater
 #ac_add_options --with-system-icu
 export BUILD_OFFICIAL=1
 export MOZILLA_OFFICIAL=1
 export MOZ_UPDATE_CHANNEL=release
 mk_add_options BUILD_OFFICIAL=1
 mk_add_options MOZ_CO_PROJECT=mail
 mk_add_options MOZILLA_OFFICIAL=1
 mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
--- a/1
+++ b/1
@ -1 +0,0 @@
 ac_add_options --enable-official-branding
--- a/thunderbird-redhat-default-prefs.js
+++ b/thunderbird-redhat-default-prefs.js
@ -2,7 +2,7 @@ pref("app.update.enabled", false);
 pref("app.update.autoInstallEnabled", false);
 /* Allow users to set custom colors*/
 /* pref("browser.display.use_system_colors",   true);*/
-pref("general.useragent.vendor", "Fedora");
+pref("general.useragent.vendor", "Red Hat");
 pref("general.useragent.vendorSub", "THUNDERBIRD_RPM_VR");
 pref("intl.locale.matchOS", true);
 pref("mail.shell.checkDefaultClient", false);
--- a/thunderbird-wayland.desktop
+++ b/thunderbird-wayland.desktop
@ -1,30 +0,0 @@
 [Desktop Entry]
 Version=1.0
 Name=Thunderbird on Wayland
 GenericName=Email
 Comment=Send and Receive Email
 Exec=thunderbird-wayland --name thunderbird-wayland %u
 TryExec=thunderbird-wayland
 Icon=thunderbird
 Terminal=false
 Type=Application
 MimeType=message/rfc822;x-scheme-handler/mailto;
 StartupNotify=true
 Categories=Network;Email;
 Name[cs]=Poštovní klient Thunderbird
 Name[ca]=Client de correu Thunderbird
 Name[fi]=Thunderbird-sähköposti
 Name[fr]=Messagerie Thunderbird
 Name[pl]=Klient poczty Thunderbird
 Name[pt_BR]=Cliente de E-mail Thunderbird
 Name[sv]=E-postklienten Thunderbird
 Comment[ca]=Llegiu i escriviu correu
 Comment[cs]=Čtení a psaní pošty
 Comment[de]=Emails lesen und verfassen
 Comment[fi]=Lue ja kirjoita sähköposteja
 Comment[fr]=Lire et écrire des courriels
 Comment[it]=Leggere e scrivere email
 Comment[ja]=メールの読み書き
 Comment[pl]=Czytanie i wysyłanie e-maili
 Comment[pt_BR]=Ler e escrever suas mensagens
 Comment[sv]=Läs och skriv e-post
--- a/thunderbird-wayland.sh.in
+++ b/thunderbird-wayland.sh.in
@ -1,6 +0,0 @@
 #!/bin/bash
 #
 # Run Thunderbird under Wayland
 #
 export MOZ_ENABLE_WAYLAND=1
 exec __PREFIX__/bin/thunderbird "$@"
--- a/thunderbird.sh.in
+++ b/thunderbird.sh.in
@ -34,7 +34,22 @@ MOZ_DIST_BIN="$MOZ_LIB_DIR/thunderbird"
 MOZ_PROGRAM="$MOZ_DIST_BIN/thunderbird"
 MOZ_LANGPACKS_DIR="$MOZ_DIST_BIN/langpacks"
 MOZ_EXTENSIONS_PROFILE_DIR="$HOME/.mozilla/extensions/{3550f703-e582-4d05-9a08-453d09bdfdc6}"
-MOZ_LAUNCHER="$MOZ_DIST_BIN/thunderbird"
+
 ##
 ## Enable Wayland backend?
 ##
 %DISABLE_WAYLAND_PLACEHOLDER%
 if ! [ $MOZ_DISABLE_WAYLAND ] && [ "$WAYLAND_DISPLAY" ]; then
  if [ "$XDG_CURRENT_DESKTOP" == "GNOME" ]; then
    export MOZ_ENABLE_WAYLAND=1
  fi
 ##  Enable Wayland on KDE/Sway
 ##
  if [ "$XDG_SESSION_TYPE" == "wayland" ]; then
    export MOZ_ENABLE_WAYLAND=1
  fi
 fi
 ##
 ## Set MOZ_ENABLE_PANGO is no longer used because Pango is enabled by default
@ -59,12 +74,6 @@ export GNOME_DISABLE_CRASH_DIALOG
 ##
 export G_SLICE=always-malloc
 ##
 ## Allow downgrade because during distro upgrade the build time can be
 ## older in newer version than the previous one.
 ##
 export MOZ_ALLOW_DOWNGRADE=1
 ##
 ## To disable the use of Firefox localization, set MOZ_DISABLE_LANGPACKS=1
 ## in your environment before launching Firefox.
@ -74,13 +83,6 @@ export MOZ_ALLOW_DOWNGRADE=1
 # export MOZ_DISABLE_LANGPACKS
 #
 ##
 ## Use D-Bus remote exclusively when there's Wayland display.
 ##
 if [ "$WAYLAND_DISPLAY" ]; then
  export MOZ_DBUS_REMOTE=1
 fi
 ##
 ## Automatically installed langpacks are tracked by .fedora-langpack-install
 ## config file.
@ -137,36 +139,4 @@ fi
 NSS_SSL_CBC_RANDOM_IV=${NSS_SSL_CBC_RANDOM_IV-1}
 export NSS_SSL_CBC_RANDOM_IV
 # Prepare command line arguments
 script_args=""
 pass_arg_count=0
 while [ $# -gt $pass_arg_count ]
 do
  case "$1" in
    -g | --debug)
      script_args="$script_args -g"
      debugging=1
      shift
      ;;
    -d | --debugger)
      if [ $# -gt 1 ]; then
        script_args="$script_args -d $2"
        shift 2
      else
        shift
      fi
      ;;
    *)
      # Move the unrecognized argument to the end of the list.
      arg="$1"
      shift
      set -- "$@" "$arg"
      pass_arg_count=`expr $pass_arg_count + 1`
      ;;
  esac
 done
 # Don't throw "old profile" dialog box.
 export MOZ_ALLOW_DOWNGRADE=1
 exec $MOZ_PROGRAM "$@"
--- a/thunderbird.spec
+++ b/thunderbird.spec
`@ -1,2 +1,2 @@`
	`#!/bin/sh`	`#!/bin/sh`
	`exec /usr/bin/node "$@" 2>&1 \| cat -`	`exec node "$@" 2>&1 \| cat -`