Merge branch 'a9' into a9-plus

This commit is contained in:
eabdullin 2022-10-18 18:14:27 +00:00 committed by Stepan Oksanichenko
commit b85f0fe8d7
2 changed files with 74 additions and 19 deletions

25
SOURCES/D158770.diff Normal file
View File

@ -0,0 +1,25 @@
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,

View File

@ -159,7 +159,7 @@ end}
Summary: Mozilla Thunderbird mail/newsgroup client Summary: Mozilla Thunderbird mail/newsgroup client
Name: thunderbird Name: thunderbird
Version: 102.3.0 Version: 102.3.0
Release: 3%{?dist}.alma.plus Release: 4%{?dist}.alma.alma.plus
URL: http://www.mozilla.org/projects/thunderbird/ URL: http://www.mozilla.org/projects/thunderbird/
License: MPLv1.1 or GPLv2+ or LGPLv2+ License: MPLv1.1 or GPLv2+ or LGPLv2+
@ -237,6 +237,7 @@ Patch421: mozilla-s390-context.patch
Patch422: mozilla-s390x-skia-gradient.patch Patch422: mozilla-s390x-skia-gradient.patch
Patch423: one_swizzle_to_rule_them_all.patch Patch423: one_swizzle_to_rule_them_all.patch
Patch424: svg-rendering.patch Patch424: svg-rendering.patch
Patch425: D158770.diff
# PGO/LTO patches # PGO/LTO patches
Patch600: pgo.patch Patch600: pgo.patch
@ -447,52 +448,76 @@ BuildRequires: gcc-toolset-12-annobin-plugin-gcc
%endif %endif
%endif %endif
# Bundled libraries # Bundled libraries
Provides: bundled(angle) Provides: bundled(angle)
Provides: bundled(audioipc-2)
Provides: bundled(brotli)
Provides: bundled(bzip2)
Provides: bundled(cairo) 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(graphite2)
Provides: bundled(harfbuzz) Provides: bundled(harfbuzz)
Provides: bundled(ots) Provides: bundled(highway)
Provides: bundled(sfntly) Provides: bundled(intgemm)
Provides: bundled(skia) Provides: bundled(json-c)
Provides: bundled(thebes)
Provides: bundled(WebRender)
Provides: bundled(audioipc-2)
Provides: bundled(ffvpx)
Provides: bundled(kissfft) Provides: bundled(kissfft)
Provides: bundled(libaom) Provides: bundled(libaom)
Provides: bundled(libcubeb) Provides: bundled(libcubeb)
Provides: bundled(libdav1d) Provides: bundled(libdav1d)
Provides: bundled(libgcrypt)
Provides: bundled(libgpg-error)
Provides: bundled(libjpeg) Provides: bundled(libjpeg)
Provides: bundled(libjxl)
Provides: bundled(libjxl)
Provides: bundled(libmar)
Provides: bundled(libmkv) Provides: bundled(libmkv)
Provides: bundled(libnestegg) Provides: bundled(libnestegg)
Provides: bundled(libogg) Provides: bundled(libogg)
Provides: bundled(libopus) Provides: bundled(libopus)
Provides: bundled(libotr)
Provides: bundled(libpng) Provides: bundled(libpng)
Provides: bundled(libprio)
Provides: bundled(libsoundtouch) Provides: bundled(libsoundtouch)
Provides: bundled(libspeex_resampler) Provides: bundled(libspeex_resampler)
Provides: bundled(libsrtp)
Provides: bundled(libtheora) Provides: bundled(libtheora)
Provides: bundled(libtremor) Provides: bundled(libtremor)
Provides: bundled(libvorbis) Provides: bundled(libvorbis)
Provides: bundled(libvpx) Provides: bundled(libvpx)
Provides: bundled(libwebp) Provides: bundled(libwebp)
Provides: bundled(libwebrtc)
Provides: bundled(libyuv) Provides: bundled(libyuv)
Provides: bundled(mp4parse-rust) Provides: bundled(mp4parse-rust)
Provides: bundled(mp4parse-rust)
Provides: bundled(msgpack-c)
Provides: bundled(msgpack-c)
Provides: bundled(mtransport) Provides: bundled(mtransport)
Provides: bundled(niwcompat)
Provides: bundled(openmax_dl) Provides: bundled(openmax_dl)
Provides: bundled(double-conversion) Provides: bundled(openmax_il)
Provides: bundled(brotli) Provides: bundled(openmax_il)
Provides: bundled(fdlibm) Provides: bundled(ots)
Provides: bundled(freetype2) Provides: bundled(qcms)
Provides: bundled(libmar) 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(woff2) Provides: bundled(woff2)
Provides: bundled(xz-embedded) Provides: bundled(xz-embedded)
Provides: bundled(ycbcr)
Provides: bundled(zlib) 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} %if 0%{?bundle_nss}
Provides: bundled(nss) = 3.79.0 Provides: bundled(nss) = 3.79.0
@ -577,6 +602,7 @@ echo "use_rustts %{?use_rustts}"
%patch422 -p1 -b .mozilla-s390x-skia-gradient %patch422 -p1 -b .mozilla-s390x-skia-gradient
%patch423 -p1 -b .one_swizzle_to_rule_them_all %patch423 -p1 -b .one_swizzle_to_rule_them_all
%patch424 -p1 -b .svg-rendering %patch424 -p1 -b .svg-rendering
%patch425 -p1 -b .D158770.diff
# PGO patches # PGO patches
%if %{build_with_pgo} %if %{build_with_pgo}
@ -1198,9 +1224,13 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#=============================================================================== #===============================================================================
%changelog %changelog
* Fri Sep 30 2022 Eduard Abdullin <eabdullin@almalinux.org> - 102.3.0-3.alma.plus * Tue Oct 18 2022 Eduard Abdullin <eabdullin@almalinux.org> - 102.3.0-4.alma.alma.plus
- Debrand for AlmaLinux - Debrand for AlmaLinux
* Tue Oct 18 2022 Eduard Abdullin <eabdullin@almalinux.org> - 102.3.0-4.alma
- Debrand for AlmaLinux
* Wed Oct 12 2022 Jan Horak <jhorak@redhat.com> - 102.3.0-4
- Fix for expat CVE-2022-40674
* Fri Sep 16 2022 Jan Horak <jhorak@redhat.com> - 102.3.0-3 * Fri Sep 16 2022 Jan Horak <jhorak@redhat.com> - 102.3.0-3
- Update to 102.3.0 build1 - Update to 102.3.0 build1