diff --git a/firefox-115.9.0esr.source.tar.xz b/firefox-115.12.0esr.source.tar.xz similarity index 100% rename from firefox-115.9.0esr.source.tar.xz rename to firefox-115.12.0esr.source.tar.xz diff --git a/firefox-115.12.0esr.source.tar.xz.asc b/firefox-115.12.0esr.source.tar.xz.asc new file mode 100644 index 0000000000000000000000000000000000000000..42d37d9cc62374c6a2fc7bdad1fdcbc1f9ca5e1d --- /dev/null +++ b/firefox-115.12.0esr.source.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEErdcHlHlwDcrf3VM34207E/PZMnQFAmZd9scACgkQ4207E/PZ +MnSujA/8CPJt/HWe7h11g7s3QmhbP8KR2k7XrEwZZCRvEBmD21a46JsAs/hg1Dci +QRjtJuh5dFyKiW+H+52w5A5nPFJqE0kInvdro4ag2mwOjIYHsWw9PiGcYQ/gxmvQ +OZqx+GqgsuAZzsg3z9IRt7faFydpwr/BIfjWnJCENU2s6/HGlUzM9oT1CLKG9aDZ +iXxdgJ76EZTOdAUr3ZT8sDNwmFdGYxdMuKOt2MoOiZ2JZOUfHm0+mNyXQQ9z8WK7 +w0fxsntaqwF5F2ISA2G5sjG8R0cLwWM4t5xcD71UrMF8OK60HzyiA0K73mNbAoUK +/9YJvcHOFjbVCRMkbTr05HJjricqfVWYPrzIfpMK6olmWmtu5DDtkacZkg78HPca +4Y+k7Z8NqDDQy3EJ3p4gV116hxhAQpQNddNda1i/QO3I4gRPeNug1cbQvtvGi3Jo +Yijw2VOODOxR525ZCvnSyM9ovT4pZjbqx8mSuMNFft5MgMdXCeW4+Kr57iOUWDXw +sR3dOhJwUoVvsQCtlrEXUm90f/KHr/ggd1zHXaQkb9BqRR2BLLiKK6cJTpzZxvcN +MOSNRJT4R1RkkRXCwHgwFo5MgbsEKGTQdIllneGT2J0qLqbutYfSfiDuJIzt0u73 +g8T11OyayQhc8YRbG/lKbcwXjeemPIxvnS0T5yIjNSNyD0ntIHs= +=5hQj +-----END PGP SIGNATURE----- diff --git a/firefox-115.9.0esr.source.tar.xz.asc b/firefox-115.9.0esr.source.tar.xz.asc deleted file mode 100644 index dbd93c57d0974d2e39b4cef0b31bcdd410ff9df2..0000000000000000000000000000000000000000 --- a/firefox-115.9.0esr.source.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEErdcHlHlwDcrf3VM34207E/PZMnQFAmXyisMACgkQ4207E/PZ -MnTDRhAAmTBt2/CYTWrNfBxz71vSR/brjJJHTSavv3M/VvgQl8iLMh4DOrCX6J+I -bAoRXjmlmv2nwUITQZgkMZ0spnhhJ9eIN4U0yBSwrBWk2Fe3sPwPWp97vdg9PsRG -xYFIhFFLzxep/9F0Dktw8/hy6hV00utOcr9qBTlG07PQQRv5wQVCFtFtGOJYu4hi -qTdJIvlnOj8ZEgv0cNtVmpLqbD/7hspapVfACiQ8LvgggTD33Yx/QQ1SaRRla+p9 -YOd2Mwyyb7/MZHfypM0qDvtU0uOyZp6HB0ca40L4VPfrYi42JKfmDgGuDmww1Nnk -DPOzTWjZ57eCgAHxW5zvqu7XA6TgOT7mqRlRYv5GX+uo+YXsp4mYcaKZqwyX25P8 -c3aQfNdwSzX8K31qLlh3XaeX+xObNDus6u2paPmIkjo48nJV9Bu18/mHAQJ5p+7c -MgtVGpiK4u8/dcpgmIpjiL/S+Srg/anjPchV3DPSusb7d3eEIpSat46u98718Zbj -d+oM0oURd4ErtgtovsLqWkqrA/PE/qeFriZfywGvMWpUb5rhWPOsz4HLP7dAqFKi -yLGe+U7owcffEslvpgyliuUnbef5rGxbthEKEp+uJ4iq9Hpvp6PY1Tjm3JuWC/0M -0vhjYo/TxInfjobdS8oGolp1r1NOArXuJ6l6n/qIN9ESu75lIP8= -=WePS ------END PGP SIGNATURE----- diff --git a/firefox-langpacks-115.9.0esr.tar.xz b/firefox-langpacks-115.12.0esr.tar.xz similarity index 78% rename from firefox-langpacks-115.9.0esr.tar.xz rename to firefox-langpacks-115.12.0esr.tar.xz index 910da92b247007abef2920e2deb27dffa0e918fa..cd2313aa94d834902d1dd9482a9701f9412ef7f7 100644 Binary files a/firefox-langpacks-115.9.0esr.tar.xz and b/firefox-langpacks-115.12.0esr.tar.xz differ diff --git a/firefox.spec b/firefox.spec index d11915c04132d1c7a497747e22a8c9564ae0acc9..0cf6fd7d8a6c651b8241280412e3a9febcd9d1a0 100644 --- a/firefox.spec +++ b/firefox.spec @@ -44,8 +44,8 @@ Summary: Mozilla Firefox Web browser Name: firefox -Version: 115.9.0 -Release: 3 +Version: 115.12.0 +Release: 1 URL: https://www.mozilla.org/firefox/ License: MPL-1.1 or GPL-2.0-or-later or LGPL-2.0-or-later Source0: https://ftp.mozilla.org/pub/firefox/releases/%{version}esr/source/firefox-%{version}esr.source.tar.xz @@ -79,7 +79,6 @@ Source37: mochitest-python.tar.gz # Build patches Patch01: disable-glean-sdk,psutil,zstandard.patch Patch02: firefox-gcc-build.patch -Patch03: fix-rust-1.78-unknown-feature-stdsimd-error.patch # -- Upstreamed patches -- @@ -385,7 +384,7 @@ to run Firefox explicitly on X11. %prep # download source0 and gpg check -wget -O %{SOURCE0} https://user-repo.openeuler.openatom.cn/lfs-tar/firefox/firefox-%{version}esr.source.tar.xz +wget -qO %{SOURCE0} https://user-repo.openeuler.openatom.cn/lfs-tar/firefox/firefox-%{version}esr.source.tar.xz gpg --import %{SOURCE6} gpg --verify %{SOURCE5} %{SOURCE0} @@ -404,7 +403,6 @@ rm -vf ./*/layout/inspector/tests/chrome/test_fontVariationsAPI.css # Build patches %patch -P1 -p1 %patch -P2 -p1 -b .firefox-gcc-build -%patch -P3 -p1 # -- Upstreamed patches -- %patch -P51 -p1 -b .mozilla-bmo1170092 @@ -972,6 +970,14 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %endif %changelog +* Thu Jun 13 2024 wangkai <13474090681@163.com> - 115.12.0-1 +- Update to 115.12.0 +- Fix CVE-2024-29944 CVE-2024-3302 CVE-2024-3852 CVE-2024-3854 + CVE-2024-3857 CVE-2024-3859 CVE-2024-3861 CVE-2024-3864 CVE-2024-4367 + CVE-2024-4767 CVE-2024-4768 CVE-2024-4769 CVE-2024-4770 CVE-2024-4777 + CVE-2024-5688 CVE-2024-5690 CVE-2024-5691 CVE-2024-5692 CVE-2024-5693 + CVE-2024-5696 CVE-2024-5700 CVE-2024-5702 + * Wed May 29 2024 Wenlong Zhang - 115.9.0-3 - fix build error for loongarch64 @@ -1082,6 +1088,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : * Mon May 25 2020 Captain Wei - 62.0.3-5 - fix unstable_name_collisions problem when compile -* Wen Feb 26 2020 xuxijian - 62.0.3-4 +* Wed Feb 26 2020 xuxijian - 62.0.3-4 - Package init diff --git a/fix-rust-1.78-unknown-feature-stdsimd-error.patch b/fix-rust-1.78-unknown-feature-stdsimd-error.patch deleted file mode 100644 index 9d31d3d0aefdd1e72f9b41d905399f63834db3d7..0000000000000000000000000000000000000000 --- a/fix-rust-1.78-unknown-feature-stdsimd-error.patch +++ /dev/null @@ -1,92 +0,0 @@ -Origin: https://hg.mozilla.org/integration/autoland/rev/e9b01ce8e2fe - -# HG changeset patch -# User Jeff Muizelaar -# Date 1709608348 0 -# Node ID e9b01ce8e2fe053ffef77505f05cf18ed0b9fcd2 -# Parent 171664703051d94e1be995b74ad97a9dff5beea5 -Bug 1882291. Switch to stdarch_arm_neon_intrinsics feature on rust >=1.78. r=glandium - -We only need this on ARM32 because the ARM64 intrinsics are stable. - -stdarch_arm_neon_intrinsics was split out from stdsimd here: -https://github.com/rust-lang/stdarch/pull/1486 - -Differential Revision: https://phabricator.services.mozilla.com/D203039 - -diff --git a/Cargo.lock b/Cargo.lock ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -4579,16 +4579,17 @@ dependencies = [ - "libc", - ] - - [[package]] - name = "qcms" - version = "0.2.0" - dependencies = [ - "libc", -+ "version_check", - ] - - [[package]] - name = "qlog" - version = "0.4.0" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "8777d5490145d6907198d48b3a907447689ce80e071b3d8a16a9d9fb3df02bc1" - dependencies = [ -diff --git a/gfx/qcms/Cargo.toml b/gfx/qcms/Cargo.toml ---- a/gfx/qcms/Cargo.toml -+++ b/gfx/qcms/Cargo.toml -@@ -15,8 +15,11 @@ categories = ["graphics"] - default = ["iccv4-enabled", "cmyk"] - c_bindings = ["libc"] - neon = [] - iccv4-enabled = [] - cmyk = [] - - [dependencies] - libc = {version = "0.2", optional = true } -+ -+[build-dependencies] -+version_check = "0.9" -diff --git a/gfx/qcms/build.rs b/gfx/qcms/build.rs -new file mode 100644 ---- /dev/null -+++ b/gfx/qcms/build.rs -@@ -0,0 +1,7 @@ -+extern crate version_check as rustc; -+ -+fn main() { -+ if rustc::is_min_version("1.78.0").unwrap_or(false) { -+ println!("cargo:rustc-cfg=stdsimd_split"); -+ } -+} -diff --git a/gfx/qcms/src/lib.rs b/gfx/qcms/src/lib.rs ---- a/gfx/qcms/src/lib.rs -+++ b/gfx/qcms/src/lib.rs -@@ -2,19 +2,21 @@ - */ - - #![allow(dead_code)] - #![allow(non_camel_case_types)] - #![allow(non_snake_case)] - #![allow(non_upper_case_globals)] - // These are needed for the neon SIMD code and can be removed once the MSRV supports the - // instrinsics we use --#![cfg_attr(feature = "neon", feature(stdsimd))] -+#![cfg_attr(all(stdsimd_split, target_arch = "arm", feature = "neon"), feature(stdarch_arm_neon_intrinsics))] -+#![cfg_attr(all(stdsimd_split, target_arch = "arm", feature = "neon"), feature(stdarch_arm_feature_detection))] -+#![cfg_attr(all(not(stdsimd_split), target_arch = "arm", feature = "neon"), feature(stdsimd))] - #![cfg_attr( -- feature = "neon", -+ all(target_arch = "arm", feature = "neon"), - feature(arm_target_feature, raw_ref_op) - - )] - - /// These values match the Rendering Intent values from the ICC spec - #[repr(C)] - #[derive(Clone, Copy, Debug)] - pub enum Intent { -