Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package MozillaThunderbird for openSUSE:Factory checked in at 2024-10-11 17:02:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/MozillaThunderbird (Old) and /work/SRC/openSUSE:Factory/.MozillaThunderbird.new.19354 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "MozillaThunderbird" Fri Oct 11 17:02:38 2024 rev:342 rq:1207082 version:128.3.1 Changes: -------- --- /work/SRC/openSUSE:Factory/MozillaThunderbird/MozillaThunderbird.changes 2024-09-09 14:46:10.763029892 +0200 +++ /work/SRC/openSUSE:Factory/.MozillaThunderbird.new.19354/MozillaThunderbird.changes 2024-10-11 17:03:08.492758205 +0200 @@ -1,0 +2,58 @@ +Thu Oct 10 17:11:15 UTC 2024 - Wolfgang Rosenauer <w...@rosenauer.org> + +- Mozilla Thunderbird 128.3.1 + https://www.thunderbird.net/en-US/thunderbird/128.0esr/releasenotes/ + and following release notes for minor version updates + MFSA 2024-52 (bsc#1231413) + * CVE-2024-9680 (bmo#1923344) + Use-after-free in Animation timeline + Mozilla Thunderbird 128.3.0 + MFSA 2024-32 (128.0) + MFSA 2024-37 (128.1) + MFSA 2024-43 (128.2) + MFSA 2024-49 (128.3) (bsc#1230979) + * CVE-2024-9392 (bmo#1899154, bmo#1905843) + Compromised content process can bypass site isolation + * CVE-2024-9393 (bmo#1918301) + Cross-origin access to PDF contents through multipart responses + * CVE-2024-9394 (bmo#1918874) + Cross-origin access to JSON contents through multipart responses + * CVE-2024-8900 (bmo#1872841) + Clipboard write permission bypass + * CVE-2024-9396 (bmo#1912471) + Potential memory corruption may occur when cloning certain objects + * CVE-2024-9397 (bmo#1916659) + Potential directory upload bypass via clickjacking + * CVE-2024-9398 (bmo#1881037) + External protocol handlers could be enumerated via popups + * CVE-2024-9399 (bmo#1907726) + Specially crafted WebTransport requests could lead to denial + of service + * CVE-2024-9400 (bmo#1915249) + Potential memory corruption during JIT compilation + * CVE-2024-9401 (bmo#1872744, bmo#1897792, bmo#1911317, bmo#1916476) + Memory safety bugs fixed in Firefox 131, Firefox ESR 115.16, + Firefox ESR 128.3, Thunderbird 131, and Thunderbird 128.3 + * CVE-2024-9402 (bmo#1872744, bmo#1897792, bmo#1911317, bmo#1913445, + bmo#1914106, bmo#1914475, bmo#1914963, bmo#1915008, bmo#1916476) + Memory safety bugs fixed in Firefox 131, Firefox ESR 128.3, + Thunderbird 131, and Thunderbird 128.3 +- removed obsolete patches + mozilla-bmo1504834-part3.patch + mozilla-bmo1512162.patch + mozilla-bmo1775202.patch + mozilla-bmo531915.patch + mozilla-fix-aarch64-libopus.patch + mozilla-fix-issues-with-llvm18.patch + mozilla-fix-top-level-asm.patch + mozilla-partial-revert-1768632.patch + mozilla-rust-disable-future-incompat.patch + thunderbird-fix-CVE-2024-34703.patch +- new patch thunderbird-silence-no-return.patch +- rebased + mozilla-bmo1504834-part1.patch + mozilla-kde.patch + mozilla-libavcodec58_91.patch + mozilla-silence-no-return-type.patch + +------------------------------------------------------------------- Old: ---- l10n-115.15.0.tar.xz mozilla-bmo1504834-part3.patch mozilla-bmo1512162.patch mozilla-bmo1775202.patch mozilla-bmo531915.patch mozilla-fix-aarch64-libopus.patch mozilla-fix-issues-with-llvm18.patch mozilla-fix-top-level-asm.patch mozilla-partial-revert-1768632.patch mozilla-rust-disable-future-incompat.patch thunderbird-115.15.0.source.tar.xz thunderbird-115.15.0.source.tar.xz.asc thunderbird-fix-CVE-2024-34703.patch New: ---- l10n-128.3.1esr.tar.xz thunderbird-128.3.1esr.source.tar.xz thunderbird-128.3.1esr.source.tar.xz.asc thunderbird-silence-no-return.patch BETA DEBUG BEGIN: Old:- removed obsolete patches mozilla-bmo1504834-part3.patch mozilla-bmo1512162.patch Old: mozilla-bmo1504834-part3.patch mozilla-bmo1512162.patch mozilla-bmo1775202.patch Old: mozilla-bmo1512162.patch mozilla-bmo1775202.patch mozilla-bmo531915.patch Old: mozilla-bmo1775202.patch mozilla-bmo531915.patch mozilla-fix-aarch64-libopus.patch Old: mozilla-bmo531915.patch mozilla-fix-aarch64-libopus.patch mozilla-fix-issues-with-llvm18.patch Old: mozilla-fix-aarch64-libopus.patch mozilla-fix-issues-with-llvm18.patch mozilla-fix-top-level-asm.patch Old: mozilla-fix-issues-with-llvm18.patch mozilla-fix-top-level-asm.patch mozilla-partial-revert-1768632.patch Old: mozilla-fix-top-level-asm.patch mozilla-partial-revert-1768632.patch mozilla-rust-disable-future-incompat.patch Old: mozilla-partial-revert-1768632.patch mozilla-rust-disable-future-incompat.patch thunderbird-fix-CVE-2024-34703.patch Old: mozilla-rust-disable-future-incompat.patch thunderbird-fix-CVE-2024-34703.patch - new patch thunderbird-silence-no-return.patch BETA DEBUG END: BETA DEBUG BEGIN: New: thunderbird-fix-CVE-2024-34703.patch - new patch thunderbird-silence-no-return.patch - rebased BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ MozillaThunderbird.spec ++++++ --- /var/tmp/diff_new_pack.3NdBtT/_old 2024-10-11 17:03:27.765574056 +0200 +++ /var/tmp/diff_new_pack.3NdBtT/_new 2024-10-11 17:03:27.765574056 +0200 @@ -2,7 +2,7 @@ # spec file for package MozillaThunderbird # # Copyright (c) 2024 SUSE LLC -# Copyright (c) 2006-2023 Wolfgang Rosenauer <w...@rosenauer.org> +# Copyright (c) 2006-2024 Wolfgang Rosenauer <w...@rosenauer.org> # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -28,10 +28,10 @@ # orig_suffix b3 # major 69 # mainver %%major.99 -%define major 115 -%define mainver %major.15.0 -%define orig_version 115.15.0 -%define orig_suffix %nil +%define major 128 +%define mainver %major.3.1 +%define orig_version 128.3.1 +%define orig_suffix esr %define update_channel release %define source_prefix thunderbird-%{orig_version} @@ -48,14 +48,19 @@ %bcond_without mozilla_tb_optimize_for_size # define if ccache should be used or not -%define useccache 0 +%define useccache 1 +# No i586 on SLE-12, as the rpmlints are broken and can't handle the big rpms resulting from this build. +%if 0%{?sle_version} >= 120000 && 0%{?sle_version} < 150000 +ExclusiveArch: aarch64 ppc64le x86_64 s390x +%else # Firefox only supports i686 %ifarch %ix86 ExclusiveArch: i586 i686 BuildArch: i686 %{expand:%%global optflags %(echo "%optflags"|sed -e s/i586/i686/) -march=i686 -mtune=generic -msse2} %endif +%endif %{expand:%%global optflags %(echo "%optflags"|sed -e s/-flto=auto//) } # general build definitions @@ -67,7 +72,7 @@ %define gnome_dir %{_prefix} %define desktop_file_name %{progname} %define __provides_exclude ^lib.*\\.so.*$ -%define __requires_exclude ^(libmoz.*|liblgpllibs.*|libxul.*|libldap.*|libldif.*|libprldap.*|librnp.*)$ +%define __requires_exclude ^(libmoz.*|liblgpllibs.*|libxul.*|libgk.*|libldap.*|libldif.*|libprldap.*|librnp.*)$ %define localize 1 %ifarch %ix86 x86_64 %define crashreporter 1 @@ -88,40 +93,47 @@ BuildRequires: alsa-devel BuildRequires: autoconf213 BuildRequires: dbus-1-glib-devel +BuildRequires: dejavu-fonts BuildRequires: fdupes BuildRequires: memory-constraints -%if 0%{?suse_version} >= 1699 -BuildRequires: gcc13 -BuildRequires: gcc13-c++ -%else %if 0%{?suse_version} < 1550 && 0%{?sle_version} <= 150600 BuildRequires: gcc13 BuildRequires: gcc13-c++ %else BuildRequires: gcc-c++ %endif -%endif -BuildRequires: cargo1.72 -BuildRequires: rust1.72 +BuildRequires: cargo1.78 +BuildRequires: rust1.78 %if 0%{useccache} != 0 BuildRequires: ccache %endif BuildRequires: libXcomposite-devel BuildRequires: libcurl-devel BuildRequires: mozilla-nspr-devel >= 4.35 -BuildRequires: mozilla-nss-devel >= 3.90 +BuildRequires: mozilla-nss-devel >= 3.101.1 BuildRequires: nasm >= 2.14 -BuildRequires: nodejs >= 12.22.12 -%if 0%{?sle_version} >= 150000 && 0%{?sle_version} <= 150600 +%if 0%{?sle_version} >= 120000 && 0%{?sle_version} <= 150000 +BuildRequires: libXtst-devel +BuildRequires: nodejs12 >= 12.22.12 +#BuildRequires: python-libxml2 BuildRequires: python39 BuildRequires: python39-curses BuildRequires: python39-devel %else +%if 0%{?sle_version} > 150000 && 0%{?sle_version} <= 150600 +BuildRequires: nodejs12 >= 12.22.12 +BuildRequires: python39 +BuildRequires: python39-curses +BuildRequires: python39-devel +%else +# ALP +BuildRequires: nodejs >= 12.22.12 BuildRequires: python3 >= 3.7 BuildRequires: python3-curses BuildRequires: python3-devel %endif -BuildRequires: rust-cbindgen >= 0.24.3 +%endif +BuildRequires: rust-cbindgen >= 0.26 BuildRequires: unzip BuildRequires: update-desktop-files BuildRequires: xorg-x11-libXt-devel @@ -133,10 +145,10 @@ %if 0%{?suse_version} < 1550 BuildRequires: pkgconfig(gconf-2.0) >= 1.2.1 %endif -%if (0%{?sle_version} >= 120000 && 0%{?sle_version} < 150000) -BuildRequires: clang6-devel +%if 0%{?suse_version} < 1599 +BuildRequires: clang15-devel %else -BuildRequires: clang-devel >= 5 +BuildRequires: clang18-devel %endif BuildRequires: pkgconfig(glib-2.0) >= 2.22 BuildRequires: pkgconfig(gobject-2.0) @@ -184,7 +196,7 @@ %endif Source9: thunderbird.appdata.xml Source13: spellcheck.js -Source14: https://github.com/openSUSE/firefox-scripts/raw/c3f287d/create-tar.sh +Source14: https://github.com/openSUSE/firefox-scripts/raw/913fab1a196e2a0623b5c554598bfde3b4b49e29/create-tar.sh Source20: https://ftp.mozilla.org/pub/%{srcname}/releases/%{version}%{orig_suffix}/source/%{srcname}-%{orig_version}%{orig_suffix}.source.tar.xz.asc Source21: https://ftp.mozilla.org/pub/%{srcname}/releases/%{version}%{orig_suffix}/KEY#/mozilla.keyring # Gecko/Toolkit @@ -194,29 +206,17 @@ %endif Patch3: mozilla-ntlm-full-path.patch Patch4: mozilla-aarch64-startup-crash.patch -Patch5: mozilla-fix-aarch64-libopus.patch Patch6: mozilla-s390-context.patch Patch7: mozilla-pgo.patch Patch8: mozilla-reduce-rust-debuginfo.patch -Patch9: mozilla-bmo1504834-part1.patch -Patch10: mozilla-bmo1504834-part3.patch -Patch11: mozilla-bmo1512162.patch -Patch12: mozilla-fix-top-level-asm.patch -Patch13: mozilla-bmo849632.patch -Patch14: mozilla-bmo998749.patch -Patch15: mozilla-libavcodec58_91.patch -Patch16: mozilla-silence-no-return-type.patch -Patch17: mozilla-bmo531915.patch -Patch18: one_swizzle_to_rule_them_all.patch -Patch19: svg-rendering.patch -Patch20: mozilla-partial-revert-1768632.patch -Patch21: mozilla-bmo1775202.patch -Patch22: mozilla-rust-disable-future-incompat.patch -Patch23: thunderbird-fix-CVE-2024-34703.patch -%if 0%{?product_libs_llvm_ver} > 17 -# LLVM18 breaks building Firefox ESR: -Patch30: mozilla-fix-issues-with-llvm18.patch -%endif +Patch10: mozilla-bmo1504834-part1.patch +Patch14: mozilla-bmo849632.patch +Patch15: mozilla-bmo998749.patch +Patch17: mozilla-libavcodec58_91.patch +Patch18: mozilla-silence-no-return-type.patch +Patch20: one_swizzle_to_rule_them_all.patch +Patch21: svg-rendering.patch +Patch22: thunderbird-silence-no-return.patch %endif BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: /bin/sh @@ -230,6 +230,12 @@ Recommends: libcanberra0 Recommends: libotr5 Recommends: libpulse0 +# To make security-keys (e.g. Yubikey) work with TB, it needs the udev-rules installed. +# A clean package with the most common rules exists only in SP3 onwards. `u2f-hosts` could be used on older +# code streams, but it contains more than just the rules, so we're not recommending it here. +%if 0%{?suse_version} >= 1600 || 0%{?sle_version} >= 150300 +Recommends: libfido2-udev +%endif Requires: %{name}-openpgp Suggests: %{name}-openpgp-librnp Requires(post): desktop-file-utils @@ -332,10 +338,6 @@ export MOZ_TELEMETRY_REPORTING=1 export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system export CFLAGS="%{optflags}" -%if 0%{?suse_version} >= 1699 -export CC=gcc-13 -export CXX=g++-13 -%else %if 0%{?suse_version} < 1550 && 0%{?sle_version} <= 150600 export CC=gcc-13 export CXX=g++-13 @@ -343,24 +345,18 @@ %if 0%{?clang_build} == 0 export CC=gcc export CXX=g++ -%if 0%{?gcc_version:%{gcc_version}} >= 12 -export CFLAGS="\$CFLAGS -fimplicit-constexpr" -%endif -%endif %endif %endif %ifarch %arm %ix86 +### NOTE: these sections are not required anymore. Alson --no-keep-memory + -Wl,-z,pack-relative-relocs causes +### ld to go OOM (https://sourceware.org/bugzilla/show_bug.cgi?id=30756) # Limit RAM usage during link -export LDFLAGS="\$LDFLAGS -Wl,--no-keep-memory -Wl,--reduce-memory-overheads" +# export LDFLAGS="\$LDFLAGS -Wl,--no-keep-memory -Wl,--reduce-memory-overheads -Wl,--no-map-whole-files -Wl,--hash-size=31" +# # A lie to prevent -Wl,--gc-sections being set which requires more memory than 32bit can offer -export GC_SECTIONS_BREAKS_DEBUG_RANGES=yes +#export GC_SECTIONS_BREAKS_DEBUG_RANGES=yes %endif export LDFLAGS="\$LDFLAGS -fPIC -Wl,-z,relro,-z,now" -%ifarch ppc64 ppc64le -%if 0%{?clang_build} == 0 -#export CFLAGS="\$CFLAGS -mminimal-toc" -%endif -%endif %ifarch %ix86 # Not enough memory on 32-bit systems, reduce debug info. export CFLAGS="\$CFLAGS -g1" @@ -380,7 +376,7 @@ mk_add_options MOZILLA_OFFICIAL=1 mk_add_options BUILD_OFFICIAL=1 mk_add_options MOZ_MAKE_FLAGS=%{?jobs:-j%jobs} -mk_add_options MOZ_OBJDIR=$RPM_BUILD_DIR/obj +mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/../obj ac_add_options --disable-bootstrap ac_add_options --prefix=%{_prefix} ac_add_options --libdir=%{_libdir} @@ -399,12 +395,6 @@ ac_add_options --enable-debug-symbols=-g1 %endif ac_add_options --disable-install-strip -# building with elf-hack started to fail everywhere with FF73 -#%%if 0%%{?suse_version} > 1549 -%ifarch %arm %ix86 x86_64 -ac_add_options --disable-elf-hack -%endif -#%%endif ac_add_options --with-system-nspr ac_add_options --with-system-nss %if 0%{useccache} != 0 @@ -418,7 +408,7 @@ ac_add_options --disable-tests ac_add_options --enable-alsa ac_add_options --disable-debug -ac_add_options --disable-necko-wifi +#ac_add_options --disable-necko-wifi ac_add_options --enable-update-channel=%{update_channel} ac_add_options --with-unsigned-addon-scopes=app ac_add_options --allow-addon-sideload @@ -447,7 +437,7 @@ %ifarch x86_64 # LTO needs newer toolchain stack only (at least GCC 8.2.1 (r268506) %if 0%{?suse_version} > 1500 -#ac_add_options --enable-lto +ac_add_options --enable-lto %if 0%{?do_profiling} ac_add_options MOZ_PGO=1 %endif @@ -474,6 +464,9 @@ # build additional locales %if %localize +# Work around the following Exception: Cannot use MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE="system" for any sites other than ('mach', 'build', 'common'). The current attempted site is "tb_common". +# by unsetting MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE, which we don't need for l10n-packages +unset MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE truncate -s 0 %{_tmppath}/translations.{common,other} # langpack-build can not be done in parallel easily (see https://bugzilla.mozilla.org/show_bug.cgi?id=1660943) # Therefore, we have to have a separate obj-dir for each language @@ -493,11 +486,10 @@ ac_add_options --enable-official-branding EOF -%ifarch %ix86 +#%%define njobs 0%{?jobs:%jobs} +# Weird race condition when building langpacks which comes and goes in OBS/IBS is hitting heavy with TB 128 +# so we have to build it sequentially, sadly. %define njobs 1 -%else -%define njobs 0%{?jobs:%jobs} -%endif mkdir -p $RPM_BUILD_DIR/langpacks_artifacts/ sed -r '/^(ja-JP-mac|ga-IE|en-US|)$/d;s/ .*$//' $RPM_BUILD_DIR/%{source_prefix}/comm/mail/locales/shipped-locales \ @@ -566,6 +558,9 @@ install -m 644 %{SOURCE1} \ %{buildroot}%{_datadir}/applications/%{desktop_file_name}.desktop %suse_update_desktop_file %{desktop_file_name} Network Email GTK +# additional mime-types +#mkdir -p %{buildroot}%{_datadir}/mime/packages +# cp %{SOURCE8} %{buildroot}%{_datadir}/mime/packages/%{progname}.xml # appdata mkdir -p %{buildroot}%{_datadir}/appdata cp %{SOURCE9} %{buildroot}%{_datadir}/appdata/%{desktop_file_name}.appdata.xml @@ -626,22 +621,17 @@ %{progdir}/*.so %exclude %{progdir}/librnp.so %{progdir}/glxtest -%if 0%{wayland_supported} %{progdir}/vaapitest -%endif %{progdir}/omni.ja %{progdir}/fonts/ %{progdir}/pingsender %{progdir}/platform.ini -%{progdir}/plugin-container %{progdir}/rnp-cli %{progdir}/rnpkeys %{progdir}/thunderbird-bin # crashreporter files %if %crashreporter %{progdir}/crashreporter -%{progdir}/crashreporter.ini -%{progdir}/Throbber-small.gif %{progdir}/minidump-analyzer %endif %dir %{progdir}/chrome/ ++++++ create-tar.sh ++++++ --- /var/tmp/diff_new_pack.3NdBtT/_old 2024-10-11 17:03:27.857577881 +0200 +++ /var/tmp/diff_new_pack.3NdBtT/_new 2024-10-11 17:03:27.865578214 +0200 @@ -84,6 +84,7 @@ FTP_URL="https://ftp.mozilla.org/pub/$PRODUCT/releases/$VERSION$VERSION_SUFFIX/source"; FTP_CANDIDATES_BASE_URL="https://ftp.mozilla.org/pub/%s/candidates"; LOCALES_URL="https://product-details.mozilla.org/1.0/l10n"; + FF_L10N_MONOREPO="https://github.com/mozilla-l10n/firefox-l10n"; PRODUCT_URL="https://product-details.mozilla.org/1.0"; ALREADY_EXTRACTED_LOCALES_FILE=0 } @@ -137,7 +138,7 @@ local BUILD_JSON=$(curl --silent --fail "$FTP_CANDIDATES_BASE_URL/$FTP_CANDIDATES_JSON_SUFFIX") || return 1; local REV=$(echo "$BUILD_JSON" | jq .moz_source_stamp) local SOURCE_REPO=$(echo "$BUILD_JSON" | jq .moz_source_repo) - local TIMESTAMP=$(echo "$BUILD_JSON" | jq .buildid) + TIMESTAMP=$(echo "$BUILD_JSON" | jq .buildid) echo "Extending $TAR_STAMP with:" echo "RELEASE_REPO=${SOURCE_REPO}" echo "RELEASE_TAG=${REV}" @@ -428,7 +429,7 @@ # get repo and source stamp local REV=$(hg -R . parent --template="{node|short}\n") local SOURCE_REPO=$(hg showconfig paths.default 2>/dev/null | head -n1 | sed -e "s/^ssh:/https:/") - local TIMESTAMP=$(date +%Y%m%d%H%M%S) + TIMESTAMP=$(date +%Y%m%d%H%M%S) if [ "$PRODUCT" = "thunderbird" ]; then pushd comm || exit 1 @@ -500,10 +501,6 @@ FF_L10N_BASE="l10n_ff" fi - test ! -d $FF_L10N_BASE && mkdir $FF_L10N_BASE - # No-op, if we are building FF: - test ! -d $FINAL_L10N_BASE && mkdir $FINAL_L10N_BASE - # This is only relevant for Thunderbird-builds # Here, the relevant directories we need to copy from FF and from TB # are specified in a python-file in the tarball @@ -512,33 +509,42 @@ tb_locale_template=$(get_locales_directories "COMM_STRINGS_PATTERNS") echo "Fetching Browser locales..." - jq -r 'to_entries[]| "\(.key) \(.value|.revision)"' "$FF_LOCALE_FILE" | \ - while read -r locale changeset ; do - case $locale in - ja-JP-mac|en-US) - ;; - *) - echo "reading changeset information for $locale" - echo "fetching $locale changeset $changeset ..." - if [ -d "$FF_L10N_BASE/$locale/.hg" ]; then - pushd "$FF_L10N_BASE/$locale" || exit 1 - hg pull || exit 1 - popd || exit 1 - else - hg clone "https://hg.mozilla.org/l10n-central/$locale"; "$FF_L10N_BASE/$locale" || exit 1 - fi - [ "$RELEASE_TAG" == "default" ] || hg -R "$FF_L10N_BASE/$locale" up -C -r "$changeset" || exit 1 + if [ -d "$FF_L10N_BASE/.git" ]; then + pushd "$FF_L10N_BASE/" || exit 1 + git fetch -a || exit 1 + popd || exit 1 + else + git clone "$FF_L10N_MONOREPO" "$FF_L10N_BASE" || exit 1 + fi + # Currently all locales show the same changeset-hash, as they moved to a monorepo. We just take the first one. + changeset=$(jq -r 'to_entries[0]| "\(.key) \(.value|.revision)"' "$FF_LOCALE_FILE" | cut -d " " -f 2) + [ "$RELEASE_TAG" == "default" ] || git -C "$FF_L10N_BASE/" switch --detach "$changeset" || exit 1 + + # No-op, if we are building FF: + test ! -d $FINAL_L10N_BASE && mkdir $FINAL_L10N_BASE - # If we are doing TB, we have to merge both l10n-repos - if [ "$PRODUCT" = "thunderbird" ] && test -d "$TB_L10N_BASE/$locale/" ; then + # If we are doing TB, we have to merge both l10n-repos + if [ "$PRODUCT" = "thunderbird" ] && test -d "$TB_L10N_BASE/$locale/" ; then + jq -r 'to_entries[]| "\(.key) \(.value|.revision)"' "$FF_LOCALE_FILE" | \ + while read -r locale changeset ; do + case $locale in + ja-JP-mac|en-US) + ;; + *) create_and_copy_locales "$locale" "$FF_L10N_BASE" "$ff_locale_template" "$FINAL_L10N_BASE" create_and_copy_locales "$locale" "$TB_L10N_BASE" "$tb_locale_template" "$FINAL_L10N_BASE" - fi - ;; - esac - done + ;; + esac + done + fi + echo "creating l10n archive..." local TAR_FLAGS="--exclude-vcs" + # For reproducable tarballs + # Convert TIMESTAMP to ISO-format, so tar can understand it, then set mtime to it + local MTIME=$(python3 -c "from datetime import datetime; print(datetime.strptime(${TIMESTAMP}, '%Y%m%d%H%M%S').isoformat())") + TAR_FLAGS="$TAR_FLAGS --sort=name --format=posix --pax-option=delete=atime,delete=ctime,exthdr.name=%d/PaxHeaders/%f --numeric-owner --owner=0 --group=0 --mode=go+u,go-w --clamp-mtime --mtime=$MTIME" + if [ "$PRODUCT" = "thunderbird" ]; then TAR_FLAGS="$TAR_FLAGS --exclude=suite" fi ++++++ mozilla-bmo1504834-part1.patch ++++++ --- /var/tmp/diff_new_pack.3NdBtT/_old 2024-10-11 17:03:27.881578879 +0200 +++ /var/tmp/diff_new_pack.3NdBtT/_new 2024-10-11 17:03:27.889579212 +0200 @@ -2,9 +2,10 @@ # 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 +Index: firefox-128.0/gfx/2d/DrawTargetSkia.cpp +=================================================================== +--- firefox-128.0.orig/gfx/2d/DrawTargetSkia.cpp ++++ firefox-128.0/gfx/2d/DrawTargetSkia.cpp @@ -156,7 +156,8 @@ static IntRect CalculateSurfaceBounds(co } @@ -15,9 +16,10 @@ 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 +Index: firefox-128.0/gfx/2d/Types.h +=================================================================== +--- firefox-128.0.orig/gfx/2d/Types.h ++++ firefox-128.0/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>. @@ -40,10 +42,11 @@ // 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 @@ +Index: firefox-128.0/gfx/skia/skia/modules/skcms/skcms.cc +=================================================================== +--- firefox-128.0.orig/gfx/skia/skia/modules/skcms/skcms.cc ++++ firefox-128.0/gfx/skia/skia/modules/skcms/skcms.cc +@@ -31,6 +31,8 @@ #include <avx512fintrin.h> #include <avx512dqintrin.h> #endif @@ -51,7 +54,7 @@ + #define SKCMS_PORTABLE #endif - static bool runtime_cpu_detection = true; + using namespace skcms_private; @@ -324,20 +326,28 @@ enum { static uint16_t read_big_u16(const uint8_t* ptr) { uint16_t be; ++++++ mozilla-kde.patch ++++++ ++++ 1094 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/MozillaThunderbird/mozilla-kde.patch ++++ and /work/SRC/openSUSE:Factory/.MozillaThunderbird.new.19354/mozilla-kde.patch ++++++ mozilla-libavcodec58_91.patch ++++++ --- /var/tmp/diff_new_pack.3NdBtT/_old 2024-10-11 17:03:27.925580709 +0200 +++ /var/tmp/diff_new_pack.3NdBtT/_new 2024-10-11 17:03:27.925580709 +0200 @@ -1,16 +1,12 @@ # HG changeset patch # Parent 60fc1933af9d4f1769025a6f1d9a60db6b899315 -diff --git a/dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp b/dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp ---- a/dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp -+++ b/dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp -@@ -36,16 +36,18 @@ static const char* sLibs[] = { - "libavcodec.54.dylib", - "libavcodec.53.dylib", - #elif defined(XP_OPENBSD) - "libavcodec.so", // OpenBSD hardly controls the major/minor library version - // of ffmpeg and update it regulary on ABI/API changes - #else +Index: firefox-127.0/dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp +=================================================================== +--- firefox-127.0.orig/dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp ++++ firefox-127.0/dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp +@@ -49,6 +49,8 @@ static const char* sLibs[] = { + "libavcodec.so.61", "libavcodec.so.60", "libavcodec.so.59", + "libavcodec.so.58.134", @@ -18,9 +14,4 @@ "libavcodec.so.58", "libavcodec-ffmpeg.so.58", "libavcodec-ffmpeg.so.57", - "libavcodec-ffmpeg.so.56", - "libavcodec.so.57", - "libavcodec.so.56", - "libavcodec.so.55", - "libavcodec.so.54", ++++++ mozilla-silence-no-return-type.patch ++++++ ++++ 694 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/MozillaThunderbird/mozilla-silence-no-return-type.patch ++++ and /work/SRC/openSUSE:Factory/.MozillaThunderbird.new.19354/mozilla-silence-no-return-type.patch ++++++ tar_stamps ++++++ --- /var/tmp/diff_new_pack.3NdBtT/_old 2024-10-11 17:03:28.073586864 +0200 +++ /var/tmp/diff_new_pack.3NdBtT/_new 2024-10-11 17:03:28.077587029 +0200 @@ -1,11 +1,11 @@ PRODUCT="thunderbird" -CHANNEL="esr115" -VERSION="115.15.0" -VERSION_SUFFIX="" -PREV_VERSION="115.14.0" +CHANNEL="esr128" +VERSION="128.3.1" +VERSION_SUFFIX="esr" +PREV_VERSION="128.3.0" PREV_VERSION_SUFFIX="" #SKIP_LOCALES="" # Uncomment to skip l10n and compare-locales-generation -RELEASE_REPO="https://hg.mozilla.org/releases/comm-esr115"; -RELEASE_TAG="aa5ac5425f0381ec6c3e3d9122b5b9d14cc7e60d" -RELEASE_TIMESTAMP="20240903191356" +RELEASE_REPO="https://hg.mozilla.org/releases/comm-esr128"; +RELEASE_TAG="13aaab4ee7a18182d6c6ee62415c8d32d115063c" +RELEASE_TIMESTAMP="20241009142959" ++++++ thunderbird-silence-no-return.patch ++++++ --- a/comm/mailnews/base/src/MboxMsgInputStream.cpp.old 2024-09-29 13:27:36.274947489 +0200 +++ b/comm/mailnews/base/src/MboxMsgInputStream.cpp 2024-09-29 13:27:47.384867824 +0200 @@ -241,6 +241,7 @@ default: MOZ_ASSERT_UNREACHABLE(); // should not happen } + return data; } // We're expecting a new message to start, or an EOF.
