upgrade rust to 1.85.0 (#11295)

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

Author: 2 people

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

@@ -3081,6 +3081,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:        1%{?dist}
+Release:        3%{?dist}
 License:        MIT
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
@@ -40,10 +40,12 @@ Source0:        %{url}/archive/refs/tags/v%{version}.tar.gz#/%{name}-%{version}.
 Source1:        %{name}-%{version}-cargo.tar.gz
 Source2:        cargo_config
 Patch1:         disable-static-library.patch
-Patch2:         0001-libflux-unblock-build-by-allowing-warnings.patch
-BuildRequires:  cargo >= 1.45
+# 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.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)
@@ -139,6 +141,14 @@ 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.
+- Fix test build error on arm64.
+
 * Thu Feb 01 2024 Mykhailo Bykhovtsev <[email protected]> - 0.194.5-1
 - Upgrade to version 0.194.5
 

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:        3%{?dist}
+Release:        4%{?dist}
 License:        MIT
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
@@ -70,7 +70,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.
@@ -155,6 +155,9 @@ go test ./...
 %{_tmpfilesdir}/influxdb.conf
 
 %changelog
+* Mon Apr 21 2025 Kavya Sree Kaitepalli <[email protected]> - 2.7.5-4
+- Pin rust version
+
 * Mon Mar 24 2025 Sreeniavsulu Malavathula <[email protected]> - 2.7.5-3
 - Patch CVE-2025-22870, CVE-2024-51744
 

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