Skip to content

Commit ec5a444

Browse files
KavyaSree2610kavyasree
andauthored
rust: Upgrade rust to 1.86.0 (#13785)
Co-authored-by: kavyasree <kkaitepalli@microsoft.com>
1 parent bb7bdf8 commit ec5a444

6 files changed

Lines changed: 33 additions & 21 deletions

File tree

SPECS-EXTENDED/389-ds-base/389-ds-base.spec

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ ExcludeArch: i686
6868
Summary: 389 Directory Server (%{variant})
6969
Name: 389-ds-base
7070
Version: 3.1.1
71-
Release: 3%{?dist}
71+
Release: 4%{?dist}
7272
License: GPL-3.0-or-later AND (0BSD OR Apache-2.0 OR MIT) AND (Apache-2.0 OR Apache-2.0 WITH LLVM-exception OR MIT) AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR MIT OR Zlib) AND (Apache-2.0 OR MIT) AND (CC-BY-4.0 AND MIT) AND (MIT OR Apache-2.0) AND Unicode-DFS-2016 AND (MIT OR CC0-1.0) AND (MIT OR Unlicense) AND 0BSD AND Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT AND MIT AND ISC AND MPL-2.0 AND PSF-2.0
7373
URL: https://www.port389.org
7474
Vendor: Microsoft Corporation
@@ -732,10 +732,13 @@ exit 0
732732
%endif
733733

734734
%changelog
735-
* Mon Apr 21 2025 Kavya Sree Kaitepalli <kkaitepalli@microsoft.com> 3.1.1-3
735+
* Wed May 14 2025 Kavya Sree Kaitepalli <kkaitepalli@microsoft.com> - 3.1.1-4
736+
- Bump release to rebuild with rust 1.86.0
737+
738+
* Mon Apr 21 2025 Kavya Sree Kaitepalli <kkaitepalli@microsoft.com> - 3.1.1-3
736739
- Bump release to build with rust 1.85.0
737740

738-
* Fri Sep 20 2024 Muhammad Falak <mwani@microsoft.com> 3.1.0-2
741+
* Fri Sep 20 2024 Muhammad Falak <mwani@microsoft.com> - 3.1.0-2
739742
- Initial Azure Linux import from Fedora 42 (license: MIT)
740743
- License verified
741744

SPECS-EXTENDED/ripgrep/ripgrep.spec

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
Name: ripgrep
2222
Version: 13.0.0
23-
Release: 6%{?dist}
23+
Release: 7%{?dist}
2424
Summary: A search tool that combines ag with grep
2525
License: MIT AND Unlicense
2626
Vendor: Microsoft Corporation
@@ -104,6 +104,9 @@ install -Dm 644 complete/_rg %{buildroot}%{_datadir}/zsh/site-functions/_rg
104104
%{_datadir}/zsh
105105

106106
%changelog
107+
* Wed May 14 2025 Kavya Sree Kaitepalli <kkaitepalli@microsoft.com> - 13.0.0-7
108+
- Bump release to rebuild with rust 1.86.0
109+
107110
* Mon Apr 21 2025 Kavya Sree Kaitepalli <kkaitepalli@microsoft.com> - 13.0.0-6
108111
- Bump release to build with rust 1.85.0
109112

SPECS-EXTENDED/rust-cbindgen/rust-cbindgen.spec

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
Summary: Tool for generating C bindings to Rust code
33
Name: rust-cbindgen
44
Version: 0.24.3
5-
Release: 2%{?dist}
5+
Release: 3%{?dist}
66
License: MIT
77
Vendor: Microsoft Corporation
88
Distribution: Azure Linux
@@ -96,6 +96,9 @@ RUSTFLAGS=%{rustflags} cargo test --release
9696
%endif
9797

9898
%changelog
99+
* Wed May 14 2025 Kavya Sree Kaitepalli <kkaitepalli@microsoft.com> - 0.24.3-3
100+
- Bump release to rebuild with rust 1.86.0
101+
99102
* Mon Apr 21 2025 Kavya Sree Kaitepalli <kkaitepalli@microsoft.com> - 0.24.3-2
100103
- Bump release to build with rust 1.85.0
101104

SPECS/rust/rust.signatures.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
22
"Signatures": {
3-
"cargo-1.84.0-aarch64-unknown-linux-gnu.tar.xz": "68d4ad239b6d1e810e7b8591636dc408cb2c1e89661329fed906febf9c0a9d98",
4-
"cargo-1.84.0-x86_64-unknown-linux-gnu.tar.xz": "6c2371488db92a09cd50a1b4045c022f3cf2c643285b3b21105ab5f9b64fd6b6",
5-
"rust-std-1.84.0-aarch64-unknown-linux-gnu.tar.xz": "023f0b6153b23ac0e9686c2ab95bc393ee3e295b166bb36de3b4dfb53e3913e0",
6-
"rust-std-1.84.0-x86_64-unknown-linux-gnu.tar.xz": "770237080b9310d126350c3bd70820bd91064c2e96c29ab5f2e002b31b5bd067",
7-
"rustc-1.84.0-aarch64-unknown-linux-gnu.tar.xz": "9f5650aece53e083b933a57e5a8e0e2db4479f52ec897d5b6d0f77be6cd50498",
8-
"rustc-1.84.0-x86_64-unknown-linux-gnu.tar.xz": "a1737d86f80b31a6d48a6726726275dc068ecb930c9635b13aa59999486de837",
9-
"rustc-1.85.0-src-cargo.tar.gz": "aebfabef6090c81fff583d6172fbb4cf1d42d203df7ce6a9bba349abc3fc086c",
10-
"rustc-1.85.0-src.tar.xz": "d542c397217b5ba5bac7eb274f5ca62d031f61842c3ba4cc5328c709c38ea1e7"
3+
"cargo-1.85.0-aarch64-unknown-linux-gnu.tar.xz": "cdebe48b066d512d664c13441e8fae2d0f67106c2080aa44289d98b24192b8bc",
4+
"cargo-1.85.0-x86_64-unknown-linux-gnu.tar.xz": "0aff33b57b0e0b102d762a2b53042846c1ca346cff4b7bd96b5c03c9e8e51d81",
5+
"rust-std-1.85.0-aarch64-unknown-linux-gnu.tar.xz": "8af1d793f7820e9ad0ee23247a9123542c3ea23f8857a018651c7788af9bc5b7",
6+
"rust-std-1.85.0-x86_64-unknown-linux-gnu.tar.xz": "285e105d25ebdf501341238d4c0594ecdda50ec9078f45095f793a736b1f1ac2",
7+
"rustc-1.85.0-aarch64-unknown-linux-gnu.tar.xz": "e742b768f67303010b002b515f6613c639e69ffcc78cd0857d6fe7989e9880f6",
8+
"rustc-1.85.0-x86_64-unknown-linux-gnu.tar.xz": "7436f13797475082cd87aa65547449e01659d6a810b4cd5f8aedc48bb9f89dfb",
9+
"rustc-1.86.0-src-cargo.tar.gz": "65af8d68e71d9ee7849d680434bffc527125442da38bba9a14bb3c12abef0595",
10+
"rustc-1.86.0-src.tar.xz": "d939eada065dc827a9d4dbb55bd48533ad14c16e7f0a42e70147029c82a7707b"
1111
}
1212
}

SPECS/rust/rust.spec

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33

44
# Release date and version of stage 0 compiler can be found in "src/stage0" inside the extracted "Source0".
55
# Look for "date:" and "rustc:".
6-
%define release_date 2025-01-09
7-
%define stage0_version 1.84.0
6+
%define release_date 2025-02-20
7+
%define stage0_version 1.85.0
88

99
Summary: Rust Programming Language
1010
Name: rust
11-
Version: 1.85.0
12-
Release: 2%{?dist}
11+
Version: 1.86.0
12+
Release: 1%{?dist}
1313
License: (ASL 2.0 OR MIT) AND BSD AND CC-BY-3.0
1414
Vendor: Microsoft Corporation
1515
Distribution: Azure Linux
@@ -43,7 +43,6 @@ Source6: https://static.rust-lang.org/dist/%{release_date}/rustc-%{stage0
4343
Source7: https://static.rust-lang.org/dist/%{release_date}/rust-std-%{stage0_version}-aarch64-unknown-linux-gnu.tar.xz
4444
# These ci tests are expecting rust source to be git repository, since we are using a tarball
4545
# we are missing git metadata so these tests are failing, hence ignoring these tests
46-
Patch0: Ignore_failing_ci_tests.patch
4746
BuildRequires: binutils
4847
BuildRequires: cmake
4948
# make sure rust relies on curl from CBL-Mariner (instead of using its vendored flavor)
@@ -141,7 +140,7 @@ userdel -r test
141140
%install
142141
USER=root SUDO_USER=root %make_install
143142
mv %{buildroot}%{_docdir}/cargo/LICENSE-THIRD-PARTY .
144-
rm %{buildroot}%{_docdir}/rustc/{COPYRIGHT,LICENSE-APACHE,LICENSE-MIT}
143+
rm %{buildroot}%{_docdir}/rustc/{COPYRIGHT-library.html,COPYRIGHT.html}
145144
rm %{buildroot}%{_docdir}/cargo/{LICENSE-APACHE,LICENSE-MIT}
146145
rm %{buildroot}%{_docdir}/clippy/{LICENSE-APACHE,LICENSE-MIT}
147146
rm %{buildroot}%{_docdir}/rustfmt/{LICENSE-APACHE,LICENSE-MIT}
@@ -169,6 +168,7 @@ rm %{buildroot}%{_docdir}/docs/html/.lock
169168

170169
%files doc
171170
%license LICENSE-APACHE LICENSE-MIT LICENSE-THIRD-PARTY COPYRIGHT
171+
%license %{_docdir}/rustc/licenses/*
172172
%doc %{_docdir}/rustc/README.md
173173
%doc %{_docdir}/cargo/*
174174
%doc %{_docdir}/rustfmt/*
@@ -180,6 +180,9 @@ rm %{buildroot}%{_docdir}/docs/html/.lock
180180
%{_mandir}/man1/*
181181

182182
%changelog
183+
* Tue May 13 2025 Kavya Sree Kaitepalli <kkaitepalli@microsoft.com> - 1.86.0-1
184+
- Upgrade to 1.86.0
185+
183186
* Mon May 12 2025 Andrew Phelps <anphel@microsoft.com> - 1.85.0-2
184187
- Bump to rebuild with updated glibc
185188

cgmanifest.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27464,8 +27464,8 @@
2746427464
"type": "other",
2746527465
"other": {
2746627466
"name": "rust",
27467-
"version": "1.85.0",
27468-
"downloadUrl": "https://static.rust-lang.org/dist/rustc-1.85.0-src.tar.xz"
27467+
"version": "1.86.0",
27468+
"downloadUrl": "https://static.rust-lang.org/dist/rustc-1.86.0-src.tar.xz"
2746927469
}
2747027470
}
2747127471
},

0 commit comments

Comments
 (0)