From c5e281bcc6683a9897cf41959fc378fbc6562df8 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Nov 15 2022 06:37:18 +0000 Subject: import firefox-102.3.0-6.el9 --- diff --git a/.firefox.metadata b/.firefox.metadata index 46a55fa..1e6295c 100644 --- a/.firefox.metadata +++ b/.firefox.metadata @@ -1,6 +1,6 @@ 52f2d51d0e17d137571bf3a766f514d34e28e556 SOURCES/cbindgen-vendor.tar.xz -cd92cc1af9b71503bc3f495f80bd1731ba8c64b2 SOURCES/firefox-102.4.0esr.processed-source.tar.xz -22af4a12cac3c237e75c8bbe76b71103320f850c SOURCES/firefox-langpacks-102.4.0esr-20221012.tar.xz +8161b83c675a6a598a89e377bc50c675cb0bf43c SOURCES/firefox-102.3.0esr.processed-source.tar.xz +e7f01e90e3d0ca5dfa84d44e9e8b9a0770585d72 SOURCES/firefox-langpacks-102.3.0esr-20220913.tar.xz da39a3ee5e6b4b0d3255bfef95601890afd80709 SOURCES/mochitest-python.tar.gz af58b3c87a8b5491dde63b07efaeb3d7f1ec56c1 SOURCES/nspr-4.34.0-3.el8_1.src.rpm fc5297c6830f0a1e88f84b94b0b066487664061b SOURCES/nss-3.79.0-6.el8_1.src.rpm diff --git a/.gitignore b/.gitignore index bc104a3..e1d19cc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ SOURCES/cbindgen-vendor.tar.xz -SOURCES/firefox-102.4.0esr.processed-source.tar.xz -SOURCES/firefox-langpacks-102.4.0esr-20221012.tar.xz +SOURCES/firefox-102.3.0esr.processed-source.tar.xz +SOURCES/firefox-langpacks-102.3.0esr-20220913.tar.xz SOURCES/mochitest-python.tar.gz SOURCES/nspr-4.34.0-3.el8_1.src.rpm SOURCES/nss-3.79.0-6.el8_1.src.rpm diff --git a/README.debrand b/README.debrand deleted file mode 100644 index 01c46d2..0000000 --- a/README.debrand +++ /dev/null @@ -1,2 +0,0 @@ -Warning: This package was configured for automatic debranding, but the changes -failed to apply. 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/webrtc-nss-fix.patch b/SOURCES/webrtc-nss-fix.patch deleted file mode 100644 index 78b458d..0000000 --- a/SOURCES/webrtc-nss-fix.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -up firefox-102.3.0/third_party/libsrtp/src/crypto/cipher/aes_gcm_nss.c.webrtc-fix firefox-102.3.0/third_party/libsrtp/src/crypto/cipher/aes_gcm_nss.c ---- firefox-102.3.0/third_party/libsrtp/src/crypto/cipher/aes_gcm_nss.c.webrtc-fix 2022-10-04 18:58:30.563683229 +0200 -+++ firefox-102.3.0/third_party/libsrtp/src/crypto/cipher/aes_gcm_nss.c 2022-10-04 18:58:44.583652963 +0200 -@@ -293,7 +293,7 @@ static srtp_err_status_t srtp_aes_gcm_ns - - int rv; - SECItem param = { siBuffer, (unsigned char *)&c->params, -- sizeof(CK_GCM_PARAMS) }; -+ sizeof(CK_NSS_GCM_PARAMS) }; - if (encrypt) { - rv = PK11_Encrypt(c->key, CKM_AES_GCM, ¶m, buf, enc_len, - *enc_len + 16, buf, *enc_len); -diff -up firefox-102.3.0/third_party/libsrtp/src/crypto/include/aes_gcm.h.webrtc-fix firefox-102.3.0/third_party/libsrtp/src/crypto/include/aes_gcm.h ---- firefox-102.3.0/third_party/libsrtp/src/crypto/include/aes_gcm.h.webrtc-fix 2022-10-04 18:59:16.635583764 +0200 -+++ firefox-102.3.0/third_party/libsrtp/src/crypto/include/aes_gcm.h 2022-10-04 18:59:31.848550924 +0200 -@@ -101,7 +101,7 @@ typedef struct { - uint8_t iv[12]; - uint8_t aad[MAX_AD_SIZE]; - int aad_size; -- CK_GCM_PARAMS params; -+ CK_NSS_GCM_PARAMS params; - uint8_t tag[16]; - } srtp_aes_gcm_ctx_t; - -diff -up firefox-102.3.0/third_party/prio/prio/encrypt.c.webrtc-fix firefox-102.3.0/third_party/prio/prio/encrypt.c diff --git a/SPECS/firefox.spec b/SPECS/firefox.spec index 83f4999..2fa485e 100644 --- a/SPECS/firefox.spec +++ b/SPECS/firefox.spec @@ -200,8 +200,8 @@ end} Summary: Mozilla Firefox Web browser Name: firefox -Version: 102.4.0 -Release: 1%{?dist} +Version: 102.3.0 +Release: 6%{?dist} URL: https://www.mozilla.org/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -225,7 +225,7 @@ ExcludeArch: aarch64 s390 ppc # Link to original tarball: https://archive.mozilla.org/pub/firefox/releases/%{version}%{?pre_version}/source/firefox-%{version}%{?pre_version}.source.tar.xz Source0: firefox-%{version}%{?pre_version}.processed-source.tar.xz %if %{with langpacks} -Source1: firefox-langpacks-%{version}%{?pre_version}-20221012.tar.xz +Source1: firefox-langpacks-%{version}%{?pre_version}-20220913.tar.xz %endif Source2: cbindgen-vendor.tar.xz Source3: process-official-tarball @@ -289,7 +289,6 @@ Patch226: rhbz-1354671.patch Patch228: disable-openh264-download.patch Patch229: firefox-nss-addon-hack.patch Patch230: D110204-fscreen.diff -Patch231: webrtc-nss-fix.patch # Upstream patches Patch415: mozilla-1670333.patch @@ -301,7 +300,6 @@ Patch420: mozilla-bmo998749.patch Patch421: mozilla-s390x-skia-gradient.patch Patch422: one_swizzle_to_rule_them_all.patch Patch423: svg-rendering.patch -Patch424: D158770.diff # PGO/LTO patches Patch600: pgo.patch @@ -515,66 +513,50 @@ BuildRequires: gcc-toolset-12-annobin-plugin-gcc # Bundled libraries Provides: bundled(angle) -Provides: bundled(audioipc-2) -Provides: bundled(brotli) 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(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(libjpeg) -Provides: bundled(libjxl) -Provides: bundled(libjxl) -Provides: bundled(libmar) Provides: bundled(libmkv) Provides: bundled(libnestegg) Provides: bundled(libogg) Provides: bundled(libopus) 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(openmax_dl) -Provides: bundled(openmax_il) -Provides: bundled(openmax_il) -Provides: bundled(ots) -Provides: bundled(qcms) -Provides: bundled(rlbox_sandboxing_api) -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 @@ -651,7 +633,6 @@ echo "use_rustts %{?use_rustts}" %patch228 -p1 -b .disable-openh264-download %patch229 -p1 -b .firefox-nss-addon-hack %patch230 -p1 -b .D110204-fscreen.diff -%patch231 -p1 -b .webrtc-nss-fix %patch415 -p1 -b .1670333 %patch416 -p1 -b .mozilla-bmo1005535 @@ -662,7 +643,6 @@ echo "use_rustts %{?use_rustts}" %patch421 -p1 -b .mozilla-s390x-skia-gradient %patch422 -p1 -b .one_swizzle_to_rule_them_all %patch423 -p1 -b .svg-rendering -%patch424 -p1 -b .D158770.diff # PGO patches %if %{build_with_pgo} @@ -1421,15 +1401,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog -* Thu Oct 20 2022 CentOS Sources - 102.4.0-1.el9.centos -- Apply debranding changes - -* Wed Oct 12 2022 Eike Rathke - 102.4.0-1 -- Update to 102.4.0 build1 - -* Tue Oct 11 2022 Jan Horak - 102.3.0-7 -- Fix for expat CVE-2022-40674 and non functional webrtc - * Tue Sep 13 2022 Jan Horak - 102.3.0-6 - Update to 102.3.0 build1