From d03d1d933b7253a62bc6e81df0c7deb3ddbd23f6 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 15 Nov 2022 01:37:05 -0500 Subject: [PATCH] import thunderbird-102.3.0-3.el9_1 --- .gitignore | 4 +- .thunderbird.metadata | 4 +- SOURCES/D158770.diff | 25 ------ .../build-rhel7-lower-node-min-version.patch | 11 --- SPECS/thunderbird.spec | 76 +++++-------------- 5 files changed, 24 insertions(+), 96 deletions(-) delete mode 100644 SOURCES/D158770.diff delete mode 100644 SOURCES/build-rhel7-lower-node-min-version.patch diff --git a/.gitignore b/.gitignore index 0aa56dc..f98ec04 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ SOURCES/cbindgen-vendor.tar.xz SOURCES/nspr-4.34.0-3.el8_1.src.rpm SOURCES/nss-3.79.0-6.el8_1.src.rpm -SOURCES/thunderbird-102.4.0.processed-source.tar.xz -SOURCES/thunderbird-langpacks-102.4.0-20221017.tar.xz +SOURCES/thunderbird-102.3.0.processed-source.tar.xz +SOURCES/thunderbird-langpacks-102.3.0-20220916.tar.xz SOURCES/thunderbird-symbolic.svg diff --git a/.thunderbird.metadata b/.thunderbird.metadata index f4e62cf..5b3140c 100644 --- a/.thunderbird.metadata +++ b/.thunderbird.metadata @@ -1,6 +1,6 @@ 2a430d6252dbea45482ba316a6e9fa605c15e747 SOURCES/cbindgen-vendor.tar.xz af58b3c87a8b5491dde63b07efaeb3d7f1ec56c1 SOURCES/nspr-4.34.0-3.el8_1.src.rpm fc5297c6830f0a1e88f84b94b0b066487664061b SOURCES/nss-3.79.0-6.el8_1.src.rpm -7aa61b1e427a4d57366bcde2f8f322e943675ebf SOURCES/thunderbird-102.4.0.processed-source.tar.xz -635be6d8a3af371c45d1668fbbdd37e728a6b13d SOURCES/thunderbird-langpacks-102.4.0-20221017.tar.xz +9344c5c96c40ea76f66ef594c16c73a6f72ecd7d SOURCES/thunderbird-102.3.0.processed-source.tar.xz +acfcde32709f2dabf0c99ba19ddd8f4c6515b53a SOURCES/thunderbird-langpacks-102.3.0-20220916.tar.xz 42e80b86948cdba0f69af5b15a69bc6a1274d938 SOURCES/thunderbird-symbolic.svg diff --git a/SOURCES/D158770.diff b/SOURCES/D158770.diff deleted file mode 100644 index 1d76995..0000000 --- a/SOURCES/D158770.diff +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/parser/expat/lib/xmlparse.c b/parser/expat/lib/xmlparse.c ---- a/parser/expat/lib/xmlparse.c -+++ b/parser/expat/lib/xmlparse.c -@@ -5652,12 +5652,18 @@ - else - #endif /* XML_DTD */ - { - processor = contentProcessor; - /* see externalEntityContentProcessor vs contentProcessor */ -- return doContent(parser, parentParser ? 1 : 0, encoding, s, end, -- nextPtr, (XML_Bool)!ps_finalBuffer); -+ result = doContent(parser, parser->m_parentParser ? 1 : 0, -+ parser->m_encoding, s, end, nextPtr, -+ (XML_Bool)! parser->m_parsingStatus.finalBuffer); -+ if (result == XML_ERROR_NONE) { -+ if (! storeRawNames(parser)) -+ return XML_ERROR_NO_MEMORY; -+ } -+ return result; - } - } - - static enum XML_Error PTRCALL - errorProcessor(XML_Parser parser, - diff --git a/SOURCES/build-rhel7-lower-node-min-version.patch b/SOURCES/build-rhel7-lower-node-min-version.patch deleted file mode 100644 index 3dce244..0000000 --- a/SOURCES/build-rhel7-lower-node-min-version.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- thunderbird-102.4.0/python/mozbuild/mozbuild/nodeutil.py.build-rhel7-lower-node-min-version 2022-10-14 21:42:10.000000000 +0200 -+++ thunderbird-102.4.0/python/mozbuild/mozbuild/nodeutil.py 2022-10-17 18:49:44.490667820 +0200 -@@ -13,7 +13,7 @@ from mozboot.util import get_tools_dir - from mozfile import which - from six import PY3 - --NODE_MIN_VERSION = StrictVersion("10.24.1") -+NODE_MIN_VERSION = StrictVersion("10.24.0") - NPM_MIN_VERSION = StrictVersion("6.14.12") - - diff --git a/SPECS/thunderbird.spec b/SPECS/thunderbird.spec index f3361a7..7d4959b 100644 --- a/SPECS/thunderbird.spec +++ b/SPECS/thunderbird.spec @@ -158,8 +158,8 @@ end} Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird -Version: 102.4.0 -Release: 1%{?dist} +Version: 102.3.0 +Release: 3%{?dist} URL: http://www.mozilla.org/projects/thunderbird/ License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -180,7 +180,7 @@ ExcludeArch: aarch64 s390 ppc #Source0: https://archive.mozilla.org/pub/thunderbird/releases/%{version}%{?pre_version}/source/thunderbird-%{version}%{?pre_version}.processed-source.tar.xz Source0: thunderbird-%{version}%{?pre_version}.processed-source.tar.xz %if %{build_langpacks} -Source1: thunderbird-langpacks-%{version}-20221017.tar.xz +Source1: thunderbird-langpacks-%{version}-20220916.tar.xz %endif Source2: cbindgen-vendor.tar.xz Source3: process-official-tarball @@ -214,7 +214,6 @@ Patch73: build-ascii-decode-fail-rhel7.patch Patch75: build-big-endian-errors.patch Patch76: firefox-nss-version.patch Patch77: mozilla-1775202.patch -Patch78: build-rhel7-lower-node-min-version.patch # Fedora specific patches Patch215: firefox-enable-addons.patch @@ -238,7 +237,6 @@ Patch421: mozilla-s390-context.patch Patch422: mozilla-s390x-skia-gradient.patch Patch423: one_swizzle_to_rule_them_all.patch Patch424: svg-rendering.patch -Patch425: D158770.diff # PGO/LTO patches Patch600: pgo.patch @@ -449,76 +447,52 @@ BuildRequires: gcc-toolset-12-annobin-plugin-gcc %endif %endif - # Bundled libraries Provides: bundled(angle) -Provides: bundled(audioipc-2) -Provides: bundled(brotli) -Provides: bundled(bzip2) Provides: bundled(cairo) -Provides: bundled(cfworker) -Provides: bundled(d3.js) -Provides: bundled(double-conversion) -Provides: bundled(expat) -Provides: bundled(fdlibm) -Provides: bundled(ffvpx) -Provides: bundled(freetype2) Provides: bundled(graphite2) Provides: bundled(harfbuzz) -Provides: bundled(highway) -Provides: bundled(intgemm) -Provides: bundled(json-c) +Provides: bundled(ots) +Provides: bundled(sfntly) +Provides: bundled(skia) +Provides: bundled(thebes) +Provides: bundled(WebRender) +Provides: bundled(audioipc-2) +Provides: bundled(ffvpx) Provides: bundled(kissfft) Provides: bundled(libaom) Provides: bundled(libcubeb) Provides: bundled(libdav1d) -Provides: bundled(libgcrypt) -Provides: bundled(libgpg-error) Provides: bundled(libjpeg) -Provides: bundled(libjxl) -Provides: bundled(libjxl) -Provides: bundled(libmar) Provides: bundled(libmkv) Provides: bundled(libnestegg) Provides: bundled(libogg) Provides: bundled(libopus) -Provides: bundled(libotr) Provides: bundled(libpng) -Provides: bundled(libprio) Provides: bundled(libsoundtouch) Provides: bundled(libspeex_resampler) -Provides: bundled(libsrtp) Provides: bundled(libtheora) Provides: bundled(libtremor) Provides: bundled(libvorbis) Provides: bundled(libvpx) Provides: bundled(libwebp) -Provides: bundled(libwebrtc) Provides: bundled(libyuv) Provides: bundled(mp4parse-rust) -Provides: bundled(mp4parse-rust) -Provides: bundled(msgpack-c) -Provides: bundled(msgpack-c) Provides: bundled(mtransport) -Provides: bundled(niwcompat) Provides: bundled(openmax_dl) -Provides: bundled(openmax_il) -Provides: bundled(openmax_il) -Provides: bundled(ots) -Provides: bundled(qcms) -Provides: bundled(rlbox_sandboxing_api) -Provides: bundled(rnp) -Provides: bundled(sfntly) -Provides: bundled(sipcc) -Provides: bundled(skia) -Provides: bundled(sqlite3) -Provides: bundled(thebes) -Provides: bundled(wasm2c) -Provides: bundled(WebRender) +Provides: bundled(double-conversion) +Provides: bundled(brotli) +Provides: bundled(fdlibm) +Provides: bundled(freetype2) +Provides: bundled(libmar) Provides: bundled(woff2) Provides: bundled(xz-embedded) -Provides: bundled(ycbcr) Provides: bundled(zlib) +Provides: bundled(expat) +Provides: bundled(msgpack-c) +Provides: bundled(libprio) +Provides: bundled(rlbox_sandboxing_api) +Provides: bundled(sqlite3) %if 0%{?bundle_nss} Provides: bundled(nss) = 3.79.0 @@ -577,9 +551,6 @@ echo "use_rustts %{?use_rustts}" %patch77 -p1 -b .mozilla-1775202 %patch73 -p1 -b .build-ascii-decode-fail-rhel7 -%if 0%{?rhel} == 7 -%patch78 -p1 -b .build-rhel7-lower-node-min-version -%endif # Test patches @@ -606,7 +577,6 @@ echo "use_rustts %{?use_rustts}" %patch422 -p1 -b .mozilla-s390x-skia-gradient %patch423 -p1 -b .one_swizzle_to_rule_them_all %patch424 -p1 -b .svg-rendering -%patch425 -p1 -b .D158770.diff # PGO patches %if %{build_with_pgo} @@ -1228,12 +1198,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #=============================================================================== %changelog -* Mon Oct 17 2022 Eike Rathke - 102.4.0-1 -- Update to 102.4.0 build1 - -* Wed Oct 12 2022 Jan Horak - 102.3.0-4 -- Fix for expat CVE-2022-40674 - * Fri Sep 16 2022 Jan Horak - 102.3.0-3 - Update to 102.3.0 build1