diff --git a/SPECS/rust/rust.signatures.json b/SPECS/rust/rust.signatures.json index 0538e0da355..bfa35989849 100644 --- a/SPECS/rust/rust.signatures.json +++ b/SPECS/rust/rust.signatures.json @@ -1,12 +1,12 @@ { "Signatures": { - "cargo-1.89.0-aarch64-unknown-linux-gnu.tar.xz": "f9df3ee6d55a2387459b843477743fa386c3c0f126bd0be01691ee49309681b8", - "cargo-1.89.0-x86_64-unknown-linux-gnu.tar.xz": "99fc10be2aeedf2c23a484f217bfa76458494495a0eee33e280d3616bb08282d", - "rust-std-1.89.0-aarch64-unknown-linux-gnu.tar.xz": "abea0955dded88c68d731524ab9d29b162fae23bf5805b9f1dec063cba37c2aa", - "rust-std-1.89.0-x86_64-unknown-linux-gnu.tar.xz": "2719470dcd78b3f97d78b978c8f85a1a58d84ff11b62558294621c01bca34d49", - "rustc-1.89.0-aarch64-unknown-linux-gnu.tar.xz": "16ed8d8c7628a481c8501e7cd1022a123269b297bdedbb7f211f37a15e937e0e", - "rustc-1.89.0-x86_64-unknown-linux-gnu.tar.xz": "b42c254e1349df86bd40bc28fdf386172a1a46f2eeabe3c7a08a75cf1fb60e27", - "rustc-1.90.0-src-cargo.tar.gz": "72f6a52e8c4df6047b51bea1e6231faf7ff43a0cedddad6a91e14f9a6f924c17", - "rustc-1.90.0-src.tar.xz": "6bfeaddd90ffda2f063492b092bfed925c4b8c701579baf4b1316e021470daac" + "cargo-1.95.0-aarch64-unknown-linux-gnu.tar.xz": "7c070aeba9bbf12073646995a03f36c346bb5f541d0078ba6d9dc2a7adaaf6af", + "cargo-1.95.0-x86_64-unknown-linux-gnu.tar.xz": "e74edd2cf7d0f1f1383b4f00eb90c843750bc489e2ccf7214e6476678a907425", + "rust-std-1.95.0-aarch64-unknown-linux-gnu.tar.xz": "3a21b271b1ff973b94d69b25e7a39992f9fbcae1ab6d9475844a23e6ad3908ac", + "rust-std-1.95.0-x86_64-unknown-linux-gnu.tar.xz": "047ea7098803d3500fa1072e9cee5392697e21525559e4458128a2bf874aa382", + "rustc-1.95.0-aarch64-unknown-linux-gnu.tar.xz": "0fe3689eeaed603e5ef24572d11597d3edadaefd2cb181674ad621260f2501d2", + "rustc-1.95.0-x86_64-unknown-linux-gnu.tar.xz": "8426a3d170a5879f5682f5fbdd024a1779b3951e7baba685af2d6dc32a6dfc15", + "rustc-1.96.0-src-cargo.tar.gz": "4a7c769e681122c57b1ff753bcc5d81dad65546500449b30bfae9ea397284da0", + "rustc-1.96.0-src.tar.xz": "b99ce16cdf0ecfc761b585ac84d131b46733465a02f8ecd0ff2de9713c62ee09" } } \ No newline at end of file diff --git a/SPECS/rust/rust.spec b/SPECS/rust/rust.spec index 42306f851ba..4a70f8fd9e7 100644 --- a/SPECS/rust/rust.spec +++ b/SPECS/rust/rust.spec @@ -2,14 +2,14 @@ %global __requires_exclude ^librustc_driver- # Release date and version of stage 0 compiler can be found in "src/stage0" inside the extracted "Source0". -# Look for "date:" and "rustc:". -%define release_date 2025-08-07 -%define stage0_version 1.89.0 +# Look for "compiler_date=" and "compiler_version=". +%define release_date 2026-04-16 +%define stage0_version 1.95.0 Summary: Rust Programming Language Name: rust -Version: 1.90.0 -Release: 9%{?dist} +Version: 1.96.0 +Release: 1%{?dist} License: (ASL 2.0 OR MIT) AND BSD AND CC-BY-3.0 Vendor: Microsoft Corporation Distribution: Azure Linux @@ -41,38 +41,38 @@ Source4: https://static.rust-lang.org/dist/%{release_date}/rust-std-%{sta Source5: https://static.rust-lang.org/dist/%{release_date}/cargo-%{stage0_version}-aarch64-unknown-linux-gnu.tar.xz Source6: https://static.rust-lang.org/dist/%{release_date}/rustc-%{stage0_version}-aarch64-unknown-linux-gnu.tar.xz Source7: https://static.rust-lang.org/dist/%{release_date}/rust-std-%{stage0_version}-aarch64-unknown-linux-gnu.tar.xz -Patch0: CVE-2025-4574.patch -Patch1: CVE-2025-53605.patch -Patch2: CVE-2024-11738.patch -Patch3: CVE-2025-55159.patch -Patch4: CVE-2025-67873.patch -Patch5: CVE-2025-68114.patch -Patch6: CVE-2025-4207.patch -Patch7: CVE-2025-12818.patch -Patch8: CVE-2026-24116.patch -Patch9: CVE-2025-58160.patch -Patch10: CVE-2026-25541.patch -Patch11: CVE-2026-25727.patch -Patch12: CVE-2026-2006.patch -Patch13: CVE-2026-33056.patch -Patch14: CVE-2026-33055.patch -Patch15: CVE-2026-34743.patch -Patch16: CVE-2026-5222.patch -Patch17: CVE-2026-5223.patch -Patch18: CVE-2026-40034.patch +#Patch0: CVE-2025-4574.patch +#Patch1: CVE-2025-53605.patch +#Patch2: CVE-2024-11738.patch +#Patch3: CVE-2025-55159.patch +#Patch4: CVE-2025-67873.patch +#Patch5: CVE-2025-68114.patch +#Patch6: CVE-2025-4207.patch +#Patch7: CVE-2025-12818.patch +#Patch8: CVE-2026-24116.patch +#Patch9: CVE-2025-58160.patch +#Patch10: CVE-2026-25541.patch +#Patch11: CVE-2026-25727.patch +#Patch12: CVE-2026-2006.patch +#Patch13: CVE-2026-33056.patch +#Patch14: CVE-2026-33055.patch +#Patch15: CVE-2026-34743.patch +#Patch16: CVE-2026-5222.patch +#Patch17: CVE-2026-5223.patch +#Patch18: CVE-2026-40034.patch BuildRequires: binutils BuildRequires: cmake -# make sure rust relies on curl from CBL-Mariner (instead of using its vendored flavor) +# make sure rust relies on curl from Azure Linux (instead of using its vendored flavor) BuildRequires: curl-devel BuildRequires: git BuildRequires: glibc -# make sure rust relies on libgit2 from CBL-Mariner (instead of using its vendored flavor) +# make sure rust relies on libgit2 from Azure Linux (instead of using its vendored flavor) BuildRequires: libgit2-devel -# make sure rust relies on nghttp2 from CBL-Mariner (instead of using its vendored flavor) +# make sure rust relies on nghttp2 from Azure Linux (instead of using its vendored flavor) BuildRequires: nghttp2-devel BuildRequires: ninja-build -# make sure rust relies on openssl from CBL-Mariner (instead of using its vendored flavor) +# make sure rust relies on openssl from Azure Linux (instead of using its vendored flavor) BuildRequires: openssl-devel BuildRequires: python3 # make sure rust depends on system zlib @@ -132,7 +132,7 @@ sh ./configure \ --prefix=%{_prefix} \ --enable-extended \ --enable-profiler \ - --tools="cargo,clippy,rustfmt,rust-analyzer-proc-macro-srv" \ + --tools="cargo,clippy,rustfmt,rust-analyzer-proc-macro-srv,src,rustdoc" \ --release-channel="stable" \ --release-description="Azure Linux %{version}-%{release}" @@ -159,6 +159,10 @@ userdel -r test USER=root SUDO_USER=root %make_install mv %{buildroot}%{_docdir}/cargo/LICENSE-THIRD-PARTY . rm %{buildroot}%{_docdir}/rustc/{COPYRIGHT-library.html,COPYRIGHT.html} +# Move third-party licenses from docdir to licensedir to avoid duplicate classification +mkdir -p %{buildroot}%{_licensedir}/rust-doc +mv %{buildroot}%{_docdir}/rustc/licenses/* %{buildroot}%{_licensedir}/rust-doc/ +rmdir %{buildroot}%{_docdir}/rustc/licenses rm %{buildroot}%{_docdir}/cargo/{LICENSE-APACHE,LICENSE-MIT} rm %{buildroot}%{_docdir}/clippy/{LICENSE-APACHE,LICENSE-MIT} rm %{buildroot}%{_docdir}/rustfmt/{LICENSE-APACHE,LICENSE-MIT} @@ -183,10 +187,11 @@ rm %{buildroot}%{_docdir}/docs/html/.lock %{_bindir}/rustfmt %{_datadir}/zsh/* %{_sysconfdir}/bash_completion.d/cargo +%exclude %{_sysconfdir}/target-spec-json-schema.json %files doc %license LICENSE-APACHE LICENSE-MIT LICENSE-THIRD-PARTY COPYRIGHT -%license %{_docdir}/rustc/licenses/* +%license %{_licensedir}/rust-doc/* %doc %{_docdir}/rustc/README.md %doc %{_docdir}/cargo/* %doc %{_docdir}/rustfmt/* @@ -198,6 +203,9 @@ rm %{buildroot}%{_docdir}/docs/html/.lock %{_mandir}/man1/* %changelog +* Thu Jun 18 2026 Kavya Sree Kaitepalli - 1.96.0-1 +- Upgrade to v1.96.0 + * Thu Jun 04 2026 BinduSri Adabala - 1.90.0-9 - Add patch for CVE-2026-5222, CVE-2026-5223 & CVE-2026-40034 diff --git a/cgmanifest.json b/cgmanifest.json index e9c8fd38f6d..993f217639d 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -27794,8 +27794,8 @@ "type": "other", "other": { "name": "rust", - "version": "1.90.0", - "downloadUrl": "https://static.rust-lang.org/dist/rustc-1.90.0-src.tar.xz" + "version": "1.96.0", + "downloadUrl": "https://static.rust-lang.org/dist/rustc-1.96.0-src.tar.xz" } } }, diff --git a/toolkit/resources/manifests/package/license_file_exceptions.json b/toolkit/resources/manifests/package/license_file_exceptions.json index 150eb720945..ebf5b629c56 100644 --- a/toolkit/resources/manifests/package/license_file_exceptions.json +++ b/toolkit/resources/manifests/package/license_file_exceptions.json @@ -60,7 +60,27 @@ "IgnoredFilesRegexList": [ "^/usr/share/man/man3/SD_NOTICE\\.3\\.gz$" ] - } + }, + { + "PackageName": "rust", + "IgnoredFilesRegexList": [ + "^/usr/lib/rustlib/.*?/license-files/.*" + ] + }, + { + "_comment1": "Rust documentation contains font license files that are embedded in the documentation.", + "_comment2": "These are license files for fonts used in the web documentation, not the main package licenses.", + "PackageName": "rust-doc", + "IgnoredFilesRegexList": [ + "^/usr/share/doc/docs/html/.*/fonts/.*\\.txt$", + "^/usr/share/doc/docs/html/static\\.files/.*LICENSE.*\\.txt$", + "^/usr/share/doc/docs/html/static\\.files/.*COPYRIGHT.*\\.txt$", + "^/usr/share/doc/docs/html/static\\.files/.*LICENSE.*\\.md$", + "^/usr/share/doc/docs/html/core/.*/fn\\..*absd.*\\.html$", + "^/usr/share/doc/docs/html/rustc/platform-support/.*bsd.*\\.html$", + "^/usr/share/doc/docs/html/search\\.index/.*\\.js$" + ] + } ], "GlobalExceptionsRegexList": [ ]