Merge branch 'c9' into a9
This commit is contained in:
eabdullin
Stepan Oksanichenko
commit
fb0bec1f78
4
.gitignore
vendored
4
.gitignore
vendored
@ -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.3.0.processed-source.tar.xz
|
||||
SOURCES/thunderbird-langpacks-102.3.0-20220916.tar.xz
|
||||
SOURCES/thunderbird-102.5.0.processed-source.tar.xz
|
||||
SOURCES/thunderbird-langpacks-102.5.0-20221115.tar.xz
|
||||
SOURCES/thunderbird-symbolic.svg
|
||||
|
||||
@ -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
|
||||
9344c5c96c40ea76f66ef594c16c73a6f72ecd7d SOURCES/thunderbird-102.3.0.processed-source.tar.xz
|
||||
acfcde32709f2dabf0c99ba19ddd8f4c6515b53a SOURCES/thunderbird-langpacks-102.3.0-20220916.tar.xz
|
||||
9aa205e4b8d075f7292d9b1941ca70f7f17ca914 SOURCES/thunderbird-102.5.0.processed-source.tar.xz
|
||||
cd691f3bb1cd19e1102bca10a3bac61e013f9e03 SOURCES/thunderbird-langpacks-102.5.0-20221115.tar.xz
|
||||
42e80b86948cdba0f69af5b15a69bc6a1274d938 SOURCES/thunderbird-symbolic.svg
|
||||
|
||||
25
SOURCES/D158770.diff
Normal file
25
SOURCES/D158770.diff
Normal 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,
|
||||
|
||||
11
SOURCES/build-rhel7-lower-node-min-version.patch
Normal file
11
SOURCES/build-rhel7-lower-node-min-version.patch
Normal file
@ -0,0 +1,11 @@
|
||||
--- 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")
|
||||
|
||||
|
||||
@ -158,8 +158,8 @@ end}
|
||||
|
||||
Summary: Mozilla Thunderbird mail/newsgroup client
|
||||
Name: thunderbird
|
||||
Version: 102.3.0
|
||||
Release: 3%{?dist}.alma
|
||||
Version: 102.5.0
|
||||
Release: 2%{?dist}.alma
|
||||
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}-20220916.tar.xz
|
||||
Source1: thunderbird-langpacks-%{version}-20221115.tar.xz
|
||||
%endif
|
||||
Source2: cbindgen-vendor.tar.xz
|
||||
Source3: process-official-tarball
|
||||
@ -214,6 +214,7 @@ 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
|
||||
@ -237,6 +238,7 @@ 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
|
||||
@ -447,52 +449,76 @@ 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(ots)
|
||||
Provides: bundled(sfntly)
|
||||
Provides: bundled(skia)
|
||||
Provides: bundled(thebes)
|
||||
Provides: bundled(WebRender)
|
||||
Provides: bundled(audioipc-2)
|
||||
Provides: bundled(ffvpx)
|
||||
Provides: bundled(highway)
|
||||
Provides: bundled(intgemm)
|
||||
Provides: bundled(json-c)
|
||||
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(double-conversion)
|
||||
Provides: bundled(brotli)
|
||||
Provides: bundled(fdlibm)
|
||||
Provides: bundled(freetype2)
|
||||
Provides: bundled(libmar)
|
||||
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(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
|
||||
@ -551,6 +577,9 @@ 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
|
||||
|
||||
@ -577,6 +606,7 @@ 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}
|
||||
@ -1198,9 +1228,20 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
|
||||
#===============================================================================
|
||||
|
||||
%changelog
|
||||
* Tue Nov 15 2022 Eduard Abdullin <eabdullin@almalinux.org> - 102.3.0-3.alma
|
||||
* Mon Nov 21 2022 Eduard Abdullin <eabdullin@almalinux.org> - 102.5.0-2.alma
|
||||
- Debrand for AlmaLinux
|
||||
|
||||
* Tue Nov 15 2022 Eike Rathke <erack@redhat.com> - 102.5.0-2
|
||||
- Update to 102.5.0 build2
|
||||
* Fri Nov 11 2022 Eike Rathke <erack@redhat.com> - 102.5.0-1
|
||||
- Update to 102.5.0 build1
|
||||
|
||||
* Mon Oct 17 2022 Eike Rathke <erack@redhat.com> - 102.4.0-1
|
||||
- Update to 102.4.0 build1
|
||||
|
||||
* 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
|
||||
- Update to 102.3.0 build1
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user