upgrade rust to 1.85.0 (#11295)

Co-authored-by: kavyasree <[email protected]>

Author: KavyaSree2610

LICENSES-AND-NOTICES/SPECS/LICENSES-MAP.md

@@ -3074,6 +3074,7 @@
                 "rsyslog",
                 "ruby",
                 "rust",
+                "rust-1.75",
                 "scons",
                 "sed",
                 "sg3_utils",

LICENSES-AND-NOTICES/SPECS/data/licenses.json

@@ -68,7 +68,7 @@ ExcludeArch: i686
 Summary:          389 Directory Server (%{variant})
 Name:             389-ds-base
 Version:          3.1.1
-Release:          2%{?dist}
+Release:          3%{?dist}
 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
 URL:              https://www.port389.org
 Vendor:           Microsoft Corporation
@@ -732,6 +732,9 @@ exit 0
 %endif
 
 %changelog
+* Mon Apr 21 2025 Kavya Sree Kaitepalli <[email protected]> 3.1.1-3
+- Bump release to build with rust 1.85.0
+
 * Fri Sep 20 2024 Muhammad Falak <[email protected]> 3.1.0-2
 - Initial Azure Linux import from Fedora 42 (license: MIT)
 - License verified

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

@@ -20,7 +20,7 @@
 
 Name:           ripgrep
 Version:        13.0.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        A search tool that combines ag with grep
 License:        MIT AND Unlicense
 Vendor:         Microsoft Corporation
@@ -31,7 +31,7 @@ Source0:        %{url}/archive/%{version}/%{name}-%{version}.tar.gz
 Source1:        %{name}-%{version}-vendor.tar.xz
 Source2:        cargo_config
 BuildRequires:  cargo
-BuildRequires:  rust >= 1.31
+BuildRequires:  rust
 BuildRequires:  rubygem(asciidoctor)
 
 %description
@@ -104,6 +104,9 @@ install -Dm 644 complete/_rg %{buildroot}%{_datadir}/zsh/site-functions/_rg
 %{_datadir}/zsh
 
 %changelog
+* Mon Apr 21 2025 Kavya Sree Kaitepalli <[email protected]> - 13.0.0-6
+- Bump release to build with rust 1.85.0
+
 * Thu Sep 07 2023 Daniel McIlvaney <[email protected]> - 13.0.0-5
 - Bump package to rebuild with rust 1.72.0
 

SPECS-EXTENDED/ripgrep/ripgrep.spec

@@ -2,7 +2,7 @@
 Summary:        Tool for generating C bindings to Rust code
 Name:           rust-cbindgen
 Version:        0.24.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        MIT
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
@@ -20,8 +20,8 @@ Source2:        cargo_config
 %global rustflags '-Clink-arg=-Wl,-z,relro,-z,now'
 %global _description %{expand:
 A tool for generating C bindings to Rust code.}
-BuildRequires:  cargo >= 1.45
-BuildRequires:  rust >= 1.45
+BuildRequires:  cargo
+BuildRequires:  rust
 
 %description %{_description}
 
@@ -96,6 +96,9 @@ RUSTFLAGS=%{rustflags} cargo test --release
 %endif
 
 %changelog
+* Mon Apr 21 2025 Kavya Sree Kaitepalli <[email protected]> - 0.24.3-2
+- Bump release to build with rust 1.85.0
+
 * Mon Sep 25 2023 Shweta Bindal <[email protected]> - 0.24.3-1
 - Initial CBL-Mariner import from Fedora 38 (license: MIT).
 - License verified

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

@@ -1,7 +1,7 @@
 Summary:        Open source antivirus engine
 Name:           clamav
 Version:        1.0.7
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        ASL 2.0 AND BSD AND bzip2-1.0.4 AND GPLv2 AND LGPLv2+ AND MIT AND Public Domain AND UnRar
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
@@ -31,7 +31,7 @@ BuildRequires:  pcre2-devel
 BuildRequires:  python3
 BuildRequires:  python3-pip
 BuildRequires:  python3-pytest
-BuildRequires:  rust
+BuildRequires:  rust < 1.85.0
 BuildRequires:  systemd
 BuildRequires:  systemd-devel
 BuildRequires:  systemd-rpm-macros
@@ -136,6 +136,9 @@ fi
 %dir %attr(-,clamav,clamav) %{_sharedstatedir}/clamav
 
 %changelog
+* Mon Apr 21 2025 Kavya Sree Kaitepalli <[email protected]> - 1.0.7-2
+- Pin rust version
+
 * Fri Oct 18 2024 Archana Choudhary <[email protected]> - 1.0.7-1
 - Upgrade to version 1.0.7
 - Fixes CVE-2024-20506, CVE-2024-20505

SPECS/clamav/clamav.spec

@@ -5,7 +5,7 @@
 Name:           cloud-hypervisor-cvm
 Summary:        Cloud Hypervisor CVM is an open source Virtual Machine Monitor (VMM) that enables running SEV SNP enabled VMs on top of MSHV using the IGVM file format as payload.
 Version:        38.0.72.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 License:        ASL 2.0 OR BSD-3-clause
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
@@ -40,8 +40,8 @@ BuildRequires:  glibc-devel
 BuildRequires:  openssl-devel
 
 %if ! 0%{?using_rustup}
-BuildRequires:  rust >= 1.62.0
-BuildRequires:  cargo >= 1.62.0
+BuildRequires:  rust < 1.85.0
+BuildRequires:  cargo < 1.85.0
 %endif
 
 Requires: bash
@@ -148,6 +148,9 @@ cargo build --release --target=%{rust_musl_target} %{cargo_pkg_feature_opts} %{c
 %license LICENSE-BSD-3-Clause
 
 %changelog
+* Mon Apr 21 2025 Kavya Sree Kaitepalli <[email protected]> - 38.0.72.2-4
+- Pin rust version
+
 * Sun Feb 16 2025 Kanishk Bansal <[email protected]> - 38.0.72.2-3
 - Patch CVE-2024-12797
 

SPECS/cloud-hypervisor-cvm/cloud-hypervisor-cvm.spec

@@ -22,7 +22,7 @@
 Summary:        Influx data language
 Name:           flux
 Version:        0.194.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        MIT
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
@@ -43,9 +43,9 @@ Patch1:         disable-static-library.patch
 # Fixed upstream in 1.195.0, https://github.com/influxdata/flux/pull/5484.
 Patch2:         fix-build-warnings.patch
 Patch3:         fix-unsigned-char.patch
-BuildRequires:  cargo >= 1.45
+BuildRequires:  cargo < 1.85.0
 BuildRequires:  kernel-headers
-BuildRequires:  rust >= 1.45
+BuildRequires:  rust < 1.85.0
 
 %description
 Flux is a lightweight scripting language for querying databases (like InfluxDB)
@@ -144,6 +144,9 @@ RUSTFLAGS=%{rustflags} cargo test --release
 %{_includedir}/influxdata/flux.h
 
 %changelog
+* Mon Apr 21 2025 Kavya Sree Kaitepalli <[email protected]> - 0.194.5-3
+- Pin rust version
+
 * Mon Apr 14 2025 Tobias Brick <[email protected]> - 0.194.5-2
 - Add missing EOF for inline patch call.
 - Fix build warnings rather than suppressing them.

SPECS/flux/flux.spec

@@ -18,7 +18,7 @@
 Summary:        Scalable datastore for metrics, events, and real-time analytics
 Name:           influxdb
 Version:        2.7.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        MIT
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
@@ -68,7 +68,7 @@ BuildRequires:  clang
 BuildRequires:  golang
 BuildRequires:  kernel-headers
 BuildRequires:  protobuf-devel
-BuildRequires:  rust >= 1.60.0
+BuildRequires:  rust < 1.85.0
 BuildRequires:  systemd-rpm-macros
 BuildRequires:  tzdata
 # IMPORTANT:  when upgrading this, make sure the flux version matches what is required by go.mod file in the soure code of influxdb.
@@ -153,6 +153,9 @@ go test ./...
 %{_tmpfilesdir}/influxdb.conf
 
 %changelog
+* Mon Apr 21 2025 Kavya Sree Kaitepalli <[email protected]> - 2.7.5-3
+- Pin rust version
+
 * Mon Mar 03 2025 Kanishk Bansal <[email protected]> - 2.7.5-2
 - Fix CVE-2025-22868, CVE-2025-27144 with an upstream patch
 

SPECS/influxdb/influxdb.spec

@@ -3,7 +3,7 @@
 
 Name:         kata-containers-cc
 Version:      3.2.0.azl5
-Release:      1%{?dist}
+Release:      2%{?dist}
 Summary:      Kata Confidential Containers package developed for Confidential Containers on AKS
 License:      ASL 2.0
 URL:          https://github.com/microsoft/kata-containers
@@ -17,7 +17,7 @@ ExclusiveArch: x86_64
 BuildRequires:  azurelinux-release
 BuildRequires:  golang
 BuildRequires:  protobuf-compiler
-BuildRequires:  rust
+BuildRequires:  rust < 1.85.0
 BuildRequires:  libseccomp-devel
 BuildRequires:  openssl-devel
 BuildRequires:  clang
@@ -150,6 +150,9 @@ fi
 %{tools_pkg}/tools/osbuilder/node-builder/azure-linux/agent-install/usr/lib/systemd/system/kata-agent.service
 
 %changelog
+* Mon Apr 21 2025 Kavya Sree Kaitepalli <[email protected]> - 3.2.0.azl5-2
+- Pin rust version
+
 * Fri Mar 28 2025 CBL-Mariner Servicing Account <[email protected]> - 3.2.0.azl5-1
 - Auto-upgrade to 3.2.0.azl5
 

SPECS/kata-containers-cc/kata-containers-cc.spec

@@ -2,7 +2,7 @@
 
 Name:           kata-containers
 Version:        3.2.0.azl5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Kata Containers package developed for Pod Sandboxing on AKS
 License:        ASL 2.0
 URL:            https://github.com/microsoft/kata-containers
@@ -16,7 +16,7 @@ ExclusiveArch: x86_64
 BuildRequires:  azurelinux-release
 BuildRequires:  golang
 BuildRequires:  protobuf-compiler
-BuildRequires:  rust
+BuildRequires:  rust < 1.85.0
 BuildRequires:  libseccomp-devel
 BuildRequires:  openssl-devel
 BuildRequires:  clang
@@ -112,6 +112,9 @@ popd
 %{tools_pkg}/tools/osbuilder/node-builder/azure-linux/agent-install/usr/lib/systemd/system/kata-agent.service
 
 %changelog
+* Mon Apr 21 2025 Kavya Sree Kaitepalli <[email protected]> - 3.2.0.azl5-2
+- Pin rust version
+
 * Fri Mar 28 2025 CBL-Mariner Servicing Account <[email protected]> - 3.2.0.azl5-1
 - Auto-upgrade to 3.2.0.azl5
 

SPECS/kata-containers/kata-containers.spec

@@ -8,7 +8,7 @@
 Summary:        An SVG library based on cairo
 Name:           librsvg2
 Version:        2.58.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        LGPLv2+
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
@@ -31,7 +31,7 @@ BuildRequires:  gobject-introspection-devel
 BuildRequires:  harfbuzz-devel >= 2.0.0
 BuildRequires:  make
 BuildRequires:  pkgconfig
-BuildRequires:  rust
+BuildRequires:  rust < 1.85.0
 BuildRequires:  vala
 BuildRequires:  vala-devel
 BuildRequires:  vala-tools
@@ -125,6 +125,9 @@ rm -vrf %{buildroot}%{_docdir}
 %{_bindir}/rsvg-convert
 
 %changelog
+* Mon Apr 21 2025 Kavya Sree Kaitepalli <[email protected]> - 2.58.1-2
+- Pin rust version
+
 * Tue Jun 04 2024 Nicolas Guibourge <[email protected]> - 2.58.1-1
 - Upgrade to 2.58.1
 

SPECS/librsvg2/librsvg2.spec

@@ -67,7 +67,7 @@
 Name:           mesa
 Summary:        Mesa graphics libraries
 Version:        24.0.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        BSD
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
@@ -144,7 +144,7 @@ BuildRequires:  llvm-devel >= 7.0.0
 %if 0%{?with_opencl} || 0%{?with_nvk}
 BuildRequires:  clang-devel
 BuildRequires:  bindgen
-BuildRequires:  rust
+BuildRequires:  rust < 1.85.0
 BuildRequires:  pkgconfig(libclc)
 BuildRequires:  pkgconfig(SPIRV-Tools)
 BuildRequires:  pkgconfig(LLVMSPIRVLib)
@@ -741,6 +741,9 @@ popd
 %endif
 
 %changelog
+* Mon Apr 21 2025 Kavya Sree Kaitepalli <[email protected]> - 24.0.1-2
+- Pin rust version
+
 * Thu Feb 29 2024 Vince Perri <[email protected]> - 24.0.1-1
 - Upgrade to 24.0.1 based on Fedora 40.
 - License verified.

SPECS/mesa/mesa.spec

@@ -11,19 +11,19 @@
 
 Name:          netavark
 Version:       1.10.3
-Release:       1%{?dist}
+Release:       2%{?dist}
 Summary:       OCI network stack
 License:       ASL 2.0 and BSD and MIT
 Vendor:        Microsoft Corporation
 Distribution:   Azure Linux
 URL:           https://github.com/containers/%{name}
 Source0:       %{url}/archive/%{built_tag}/%{version}.tar.gz#/%{name}-%{version}.tar.gz
 Source1:       %{url}/releases/download/%{built_tag}/%{name}-%{built_tag}-vendor.tar.gz
-BuildRequires: cargo
+BuildRequires: cargo < 1.85.0
 BuildRequires: make
 BuildRequires: protobuf-c
 BuildRequires: protobuf-compiler
-BuildRequires: rust
+BuildRequires: rust < 1.85.0
 BuildRequires: git
 BuildRequires: go-md2man
 Recommends:    aardvark-dns >= 1.10.3-1
@@ -225,6 +225,9 @@ popd
 %{_unitdir}/%{name}-firewalld-reload.service
 
 %changelog
+* Mon Apr 21 2025 Kavya Sree Kaitepalli <kkaitepalli@microsoft.com> - 1.10.3-2
+- Pin rust version
+
 * Thu Feb 22 2024 Mitch Zhu <mitchzhu@microsoft.com> - 1.10.3-1
 - upgrade to v1.10.3
 

SPECS/netavark/netavark.spec

@@ -1,7 +1,7 @@
 Summary:        Commit RPMs to an OSTree repository
 Name:           rpm-ostree
 Version:        2024.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        LGPLv2+
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
@@ -15,7 +15,7 @@ BuildRequires:  autoconf
 BuildRequires:  autogen
 BuildRequires:  automake
 BuildRequires:  bubblewrap
-BuildRequires:  cargo
+BuildRequires:  cargo < 1.85.0
 BuildRequires:  check
 BuildRequires:  cppunit-devel
 BuildRequires:  createrepo_c
@@ -45,7 +45,7 @@ BuildRequires:  polkit-devel
 BuildRequires:  popt-devel
 BuildRequires:  python3-devel
 BuildRequires:  python3-pygments
-BuildRequires:  rust
+BuildRequires:  rust < 1.85.0
 BuildRequires:  sqlite-devel
 BuildRequires:  systemd-devel
 BuildRequires:  which
@@ -177,6 +177,9 @@ make check
 %{_datadir}/gir-1.0/*-1.0.gir
 
 %changelog
+* Mon Apr 21 2025 Kavya Sree Kaitepalli <[email protected]> - 2024.4-2
+- Pin rust version
+
 * Fri Apr 05 2024 Betty Lakes <[email protected]> - 2024.4-1
 - Upgrade to 2024.4 and remove libgsystem dependency