From 70f4fac5981340c44c4d94e53e75e08938e12247 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jul 2023 23:03:12 +0000 Subject: [PATCH 01/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 097546cd95f1d703c1c5da59c3dea6842d0e0611 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Mon, 7 Aug 2023 23:41:43 +0200 Subject: [PATCH 02/15] Regenerate with rust2rpm v24 --- README.md | 3 --- rust-rd-agent.spec | 51 ++++++++++++++++++---------------------------- 2 files changed, 20 insertions(+), 34 deletions(-) delete mode 100644 README.md diff --git a/README.md b/README.md deleted file mode 100644 index 5131718..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# rust-rd-agent - -The rust-rd-agent package diff --git a/rust-rd-agent.spec b/rust-rd-agent.spec index 1d80f74..9c244bf 100644 --- a/rust-rd-agent.spec +++ b/rust-rd-agent.spec @@ -1,46 +1,29 @@ -# Generated by rust2rpm 18 +# Generated by rust2rpm 24 %bcond_without check -%global __cargo_skip_build 0 %global crate rd-agent -%if 0%{?el8} -# el8 doesn't have these macros -%global __crates_url https://crates.io/api/v1/crates/ -%global crates_source %{__crates_url}%{crate}/%{version}/download#/%{crate}-%{version}.crate -%global version_no_tilde %{version} -%endif - %global selinuxtype targeted %bcond_without selinux -Name: rust-%{crate} +Name: rust-rd-agent Version: 2.1.2 Release: %autorelease Summary: Management agent for resctl-demo -# Upstream license specification: Apache-2.0 -License: ASL 2.0 and MIT +License: Apache-2.0 URL: https://crates.io/crates/rd-agent Source: %{crates_source} # Used as a data file by rd-agent for the compile sideload -Source1: https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.8.11.tar.xz -# Vendored dependencies for EPEL, update with ./update-vendor-tarball.sh -Source2: %{crate}-%{version}-vendor.tar.gz +Source: https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.8.11.tar.xz # SELinux policy Source10: %{crate}.fc Source11: %{crate}.if Source12: %{crate}.te -ExclusiveArch: %{rust_arches} +BuildRequires: rust-packaging >= 23 -%if 0%{?el8} -BuildRequires: rust-toolset -%else -BuildRequires: rust-packaging -%endif - -%if 0%{?with_selinux} +%if %{with selinux} BuildRequires: selinux-policy-devel %endif @@ -51,6 +34,16 @@ Management agent for resctl-demo.} %package -n %{crate} Summary: %{summary} +# (MIT OR Apache-2.0) AND Unicode-DFS-2016 +# 0BSD OR MIT OR Apache-2.0 +# Apache-2.0 +# Apache-2.0 OR BSL-1.0 +# MIT +# MIT OR Apache-2.0 +# MIT OR Zlib OR Apache-2.0 +# Unlicense OR MIT +License: Apache-2.0 AND MIT AND Unicode-DFS-2016 AND (0BSD OR MIT OR Apache-2.0) AND (Apache-2.0 OR BSL-1.0) AND (MIT OR Apache-2.0) AND (MIT OR Zlib OR Apache-2.0) AND (Unlicense OR MIT) +# LICENSE.dependencies contains a full license breakdown %if 0%{?with_selinux} Requires: (%{crate}-selinux if selinux-policy-%{selinuxtype}) @@ -69,6 +62,7 @@ Recommends: xz %files -n %{crate} %license LICENSE +%license LICENSE.dependencies %doc README.md %{_bindir}/rd-agent %attr(2775, root, wheel) %dir %{_sharedstatedir}/resctl-demo @@ -114,24 +108,19 @@ fi %prep %autosetup -n %{crate}-%{version_no_tilde} -p1 - +%cargo_prep %if 0%{?with_selinux} mkdir selinux cp -p %{SOURCE10} %{SOURCE11} %{SOURCE12} selinux %endif -%if 0%{?el8} -%cargo_prep -V 2 -%else -%cargo_prep - %generate_buildrequires %cargo_generate_buildrequires -%endif %build %cargo_build - +%{cargo_license_summary} +%{cargo_license} > LICENSE.dependencies %if 0%{?with_selinux} make -C selinux -f %{_datadir}/selinux/devel/Makefile %{crate}.pp bzip2 -9 selinux/%{crate}.pp From 0b560a2998fc104f1ff8311c347eecad146f74d8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jan 2024 23:28:16 +0000 Subject: [PATCH 03/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From f37de2156f19cefe948692c2534da144961b2148 Mon Sep 17 00:00:00 2001 From: Davide Cavalca Date: Wed, 1 May 2024 14:18:32 -0700 Subject: [PATCH 04/15] Update to 2.2.5; Fixes: RHBZ#2081989, RHBZ#2214221 --- .gitignore | 1 + rd-agent-enum-iterator.patch | 68 ++++++++++++++++++++++++++++++++++++ rd-agent-fix-metadata.diff | 11 ++++++ rust-rd-agent.spec | 17 ++++++--- sources | 3 +- 5 files changed, 93 insertions(+), 7 deletions(-) create mode 100644 rd-agent-enum-iterator.patch create mode 100644 rd-agent-fix-metadata.diff diff --git a/.gitignore b/.gitignore index 6195b17..4c47732 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /linux-5.8.11.tar.xz /rd-agent-2.1.2.crate /rd-agent-2.1.2-vendor.tar.gz +/rd-agent-2.2.5.crate diff --git a/rd-agent-enum-iterator.patch b/rd-agent-enum-iterator.patch new file mode 100644 index 0000000..3e64a9c --- /dev/null +++ b/rd-agent-enum-iterator.patch @@ -0,0 +1,68 @@ +diff --git a/src/report.rs b/src/report.rs +index 4d825fd9..cebdfd7f 100644 +--- a/src/report.rs ++++ b/src/report.rs +@@ -2,7 +2,6 @@ + use anyhow::{anyhow, bail, Result}; + use chrono::prelude::*; + use crossbeam::channel::{self, select, Receiver, Sender}; +-use enum_iterator::IntoEnumIterator; + use log::{debug, error, info, trace, warn}; + use nix::sys::signal::{kill, Signal}; + use nix::unistd::Pid; +@@ -266,7 +265,7 @@ impl UsageTracker { + }; + + us.usages.insert(ROOT_SLICE.into(), Default::default()); +- for slice in Slice::into_enum_iter() { ++ for slice in enum_iterator::all::() { + us.usages.insert(slice.name().into(), Default::default()); + } + +@@ -281,7 +280,7 @@ impl UsageTracker { + + let (us, cpu_total) = read_system_usage(self.devnr)?; + usages.insert(ROOT_SLICE.into(), us); +- for slice in Slice::into_enum_iter() { ++ for slice in enum_iterator::all::() { + usages.insert( + slice.name().to_string(), + read_cgroup_usage(slice.cgrp(), self.devnr), +diff --git a/src/slices.rs b/src/slices.rs +index 2053e7bb..b575cc8b 100644 +--- a/src/slices.rs ++++ b/src/slices.rs +@@ -1,6 +1,5 @@ + // Copyright (c) Facebook, Inc. and its affiliates. + use anyhow::{Context, Result}; +-use enum_iterator::IntoEnumIterator; + use glob::glob; + use log::{debug, error, info, trace, warn}; + use scan_fmt::scan_fmt; +@@ -246,7 +245,7 @@ pub fn apply_slices(knobs: &mut SliceKnobs, hashd_mem_size: u64, cfg: &Config) - + } + + let mut updated = false; +- for slice in Slice::into_enum_iter() { ++ for slice in enum_iterator::all::() { + let enforce_mem = slice_enforce_mem(&cfg.enforce, slice); + + if !cfg.enforce.cpu && !enforce_mem && !cfg.enforce.io { +@@ -353,7 +352,7 @@ fn clear_one_slice(slice: Slice, ecfg: &EnforceConfig) -> Result { + + pub fn clear_slices(ecfg: &EnforceConfig) -> Result<()> { + let mut updated = false; +- for slice in Slice::into_enum_iter() { ++ for slice in enum_iterator::all::() { + let enforce_mem = slice_enforce_mem(ecfg, slice); + + if !ecfg.cpu && !enforce_mem && !ecfg.io { +@@ -597,7 +596,7 @@ pub fn verify_and_fix_slices( + + let recursive_mem_prot = cfg.memcg_recursive_prot(); + +- for slice in Slice::into_enum_iter() { ++ for slice in enum_iterator::all::() { + let sk = knobs.slices.get(slice.name()).unwrap(); + + let path = slice.cgrp(); diff --git a/rd-agent-fix-metadata.diff b/rd-agent-fix-metadata.diff new file mode 100644 index 0000000..2807508 --- /dev/null +++ b/rd-agent-fix-metadata.diff @@ -0,0 +1,11 @@ +--- rd-agent-2.2.5/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ rd-agent-2.2.5/Cargo.toml 2024-04-25T18:33:02.024271+00:00 +@@ -30,7 +30,7 @@ + version = "0.8" + + [dependencies.enum-iterator] +-version = "0.7" ++version = "2.0" + + [dependencies.glob] + version = "0.3" diff --git a/rust-rd-agent.spec b/rust-rd-agent.spec index 9c244bf..70d39c7 100644 --- a/rust-rd-agent.spec +++ b/rust-rd-agent.spec @@ -1,4 +1,4 @@ -# Generated by rust2rpm 24 +# Generated by rust2rpm 26 %bcond_without check %global crate rd-agent @@ -7,7 +7,7 @@ %bcond_without selinux Name: rust-rd-agent -Version: 2.1.2 +Version: 2.2.5 Release: %autorelease Summary: Management agent for resctl-demo @@ -16,12 +16,17 @@ URL: https://crates.io/crates/rd-agent Source: %{crates_source} # Used as a data file by rd-agent for the compile sideload Source: https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.8.11.tar.xz +# Manually created patch for downstream crate metadata changes +# * bump enum-iterator to 2.0 +Patch: rd-agent-fix-metadata.diff +# https://github.com/facebookexperimental/resctl-demo/commit/f65eedf9017332255ef0a48649664c26b45b9c07 +Patch: rd-agent-enum-iterator.patch # SELinux policy Source10: %{crate}.fc Source11: %{crate}.if Source12: %{crate}.te -BuildRequires: rust-packaging >= 23 +BuildRequires: cargo-rpm-macros >= 24 %if %{with selinux} BuildRequires: selinux-policy-devel @@ -38,11 +43,13 @@ Summary: %{summary} # 0BSD OR MIT OR Apache-2.0 # Apache-2.0 # Apache-2.0 OR BSL-1.0 +# Apache-2.0 OR MIT +# Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT # MIT # MIT OR Apache-2.0 # MIT OR Zlib OR Apache-2.0 # Unlicense OR MIT -License: Apache-2.0 AND MIT AND Unicode-DFS-2016 AND (0BSD OR MIT OR Apache-2.0) AND (Apache-2.0 OR BSL-1.0) AND (MIT OR Apache-2.0) AND (MIT OR Zlib OR Apache-2.0) AND (Unlicense OR MIT) +License: ((MIT OR Apache-2.0) AND Unicode-DFS-2016) AND (0BSD OR MIT OR Apache-2.0) AND Apache-2.0 AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND MIT AND (MIT OR Apache-2.0) AND (MIT OR Zlib OR Apache-2.0) AND (Unlicense OR MIT) # LICENSE.dependencies contains a full license breakdown %if 0%{?with_selinux} @@ -107,7 +114,7 @@ fi %endif %prep -%autosetup -n %{crate}-%{version_no_tilde} -p1 +%autosetup -n %{crate}-%{version} -p1 %cargo_prep %if 0%{?with_selinux} mkdir selinux diff --git a/sources b/sources index 314aeaa..15a40ce 100644 --- a/sources +++ b/sources @@ -1,3 +1,2 @@ -SHA512 (rd-agent-2.1.2.crate) = 15dae4e8d6cb2466130eeb208e387e5cc2bc1c0179dd1261057f657738c7f1dc5b54cb29d4a37074aba7196d535b91ee5058b90403c27a12115dfa1ce87712d0 +SHA512 (rd-agent-2.2.5.crate) = c06d65a1b6bc94e3dea8b006a5418d2d336b0521e24caa1bbfa4b75375249d47487e379383a9a303236f40ab8e494a1b78d8c1bb80182f587bb105407cad6e81 SHA512 (linux-5.8.11.tar.xz) = bb6994f09aabfb0076f3023dd8359c5c569a4b398d3a3c3c8d6b27052092cab56ad675f45dd6ceba7fe431f2a6a587858f3c21415b5a00adb346bd2c68d85b0f -SHA512 (rd-agent-2.1.2-vendor.tar.gz) = 67bbbd761c7788c3689f1d67e720e4cafc38442b2f64e3ff384927a90ccad458b0e648224e1fa46c41550a554e17819cc7a23606d2598d1e40589fe02377ed39 From d417f923f0471690dc11aa57809884322f717660 Mon Sep 17 00:00:00 2001 From: Davide Cavalca Date: Thu, 2 May 2024 14:21:38 -0700 Subject: [PATCH 05/15] Rebuild for rd-util update From d2b07b02d49e1c45f2881a5497862068154994e9 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Thu, 23 May 2024 19:12:28 +0200 Subject: [PATCH 06/15] Rebuild with Rust 1.78 to fix incomplete debuginfo and backtraces From 129954626931ed28d82c71c89c3fb36023b7f172 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 01:49:51 +0000 Subject: [PATCH 07/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From ce2b59face9dc7ec2f266086271cf3f88a1d3be3 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 5 Dec 2024 11:36:22 -0500 Subject: [PATCH 08/15] Allow procfs 0.17 --- rd-agent-fix-metadata.diff | 11 ++++++++++- rust-rd-agent.spec | 6 ++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/rd-agent-fix-metadata.diff b/rd-agent-fix-metadata.diff index 2807508..288f100 100644 --- a/rd-agent-fix-metadata.diff +++ b/rd-agent-fix-metadata.diff @@ -1,5 +1,5 @@ --- rd-agent-2.2.5/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ rd-agent-2.2.5/Cargo.toml 2024-04-25T18:33:02.024271+00:00 ++++ rd-agent-2.2.5/Cargo.toml 2024-12-05T16:35:27.976983+00:00 @@ -30,7 +30,7 @@ version = "0.8" @@ -9,3 +9,12 @@ [dependencies.glob] version = "0.3" +@@ -61,7 +61,7 @@ + version = "0.3" + + [dependencies.procfs] +-version = "0.16" ++version = ">=0.16, <0.18" + + [dependencies.rd-agent-intf] + version = "2.2.5" diff --git a/rust-rd-agent.spec b/rust-rd-agent.spec index 70d39c7..2f37c23 100644 --- a/rust-rd-agent.spec +++ b/rust-rd-agent.spec @@ -1,5 +1,5 @@ -# Generated by rust2rpm 26 -%bcond_without check +# Generated by rust2rpm 27 +%bcond check 1 %global crate rd-agent @@ -18,6 +18,8 @@ Source: %{crates_source} Source: https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.8.11.tar.xz # Manually created patch for downstream crate metadata changes # * bump enum-iterator to 2.0 +# * allow procfs 0.17: +# https://github.com/facebookexperimental/resctl-demo/pull/326 Patch: rd-agent-fix-metadata.diff # https://github.com/facebookexperimental/resctl-demo/commit/f65eedf9017332255ef0a48649664c26b45b9c07 Patch: rd-agent-enum-iterator.patch From fea015f6475fd7f36a5d45a88c87034c3f73dd35 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 5 Dec 2024 11:38:03 -0500 Subject: [PATCH 09/15] Use the same bcond style for selinux that rust2rpm 27 uses for check This works in EPEL9 and later, and is less confusing than bcond_with/bcond_without. [skip changelog] --- rust-rd-agent.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust-rd-agent.spec b/rust-rd-agent.spec index 2f37c23..44e6341 100644 --- a/rust-rd-agent.spec +++ b/rust-rd-agent.spec @@ -4,7 +4,7 @@ %global crate rd-agent %global selinuxtype targeted -%bcond_without selinux +%bcond selinux 1 Name: rust-rd-agent Version: 2.2.5 From ccad1edf86e4a8d1ad9e25d823376f6052a75640 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 5 Dec 2024 11:38:40 -0500 Subject: [PATCH 10/15] Use consistent style when branching on bconds [skip changelog] --- rust-rd-agent.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/rust-rd-agent.spec b/rust-rd-agent.spec index 44e6341..ff488ea 100644 --- a/rust-rd-agent.spec +++ b/rust-rd-agent.spec @@ -54,7 +54,7 @@ Summary: %{summary} License: ((MIT OR Apache-2.0) AND Unicode-DFS-2016) AND (0BSD OR MIT OR Apache-2.0) AND Apache-2.0 AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND MIT AND (MIT OR Apache-2.0) AND (MIT OR Zlib OR Apache-2.0) AND (Unlicense OR MIT) # LICENSE.dependencies contains a full license breakdown -%if 0%{?with_selinux} +%if %{with selinux} Requires: (%{crate}-selinux if selinux-policy-%{selinuxtype}) %endif Recommends: rd-hashd = %{version} @@ -86,7 +86,7 @@ This package contains data files for %{crate}. %files -n %{crate}-data %{_datadir}/resctl-demo -%if 0%{?with_selinux} +%if %{with selinux} %package -n %{crate}-selinux Summary: SELinux policy for %{crate} BuildArch: noarch @@ -118,7 +118,7 @@ fi %prep %autosetup -n %{crate}-%{version} -p1 %cargo_prep -%if 0%{?with_selinux} +%if %{with selinux} mkdir selinux cp -p %{SOURCE10} %{SOURCE11} %{SOURCE12} selinux %endif @@ -130,7 +130,7 @@ cp -p %{SOURCE10} %{SOURCE11} %{SOURCE12} selinux %cargo_build %{cargo_license_summary} %{cargo_license} > LICENSE.dependencies -%if 0%{?with_selinux} +%if %{with selinux} make -C selinux -f %{_datadir}/selinux/devel/Makefile %{crate}.pp bzip2 -9 selinux/%{crate}.pp %endif @@ -140,7 +140,7 @@ bzip2 -9 selinux/%{crate}.pp install -Dpm0644 %SOURCE1 %{buildroot}%{_datadir}/resctl-demo/linux.tar.xz mkdir -p %{buildroot}%{_sharedstatedir}/resctl-demo -%if 0%{?with_selinux} +%if %{with selinux} install -Dm0644 selinux/%{crate}.pp.bz2 \ %{buildroot}%{_datadir}/selinux/packages/%{selinuxtype}/%{crate}.pp.bz2 %endif From b70659717faa3ff9dbf70f8b5224975b5e808591 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 5 Dec 2024 11:46:09 -0500 Subject: [PATCH 11/15] Update License Use the latest %cargo_license_summary output. --- rust-rd-agent.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/rust-rd-agent.spec b/rust-rd-agent.spec index ff488ea..f74e424 100644 --- a/rust-rd-agent.spec +++ b/rust-rd-agent.spec @@ -42,16 +42,18 @@ Management agent for resctl-demo.} %package -n %{crate} Summary: %{summary} # (MIT OR Apache-2.0) AND Unicode-DFS-2016 +# 0BSD # 0BSD OR MIT OR Apache-2.0 # Apache-2.0 # Apache-2.0 OR BSL-1.0 # Apache-2.0 OR MIT # Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT +# BSD-2-Clause OR Apache-2.0 OR MIT # MIT # MIT OR Apache-2.0 # MIT OR Zlib OR Apache-2.0 # Unlicense OR MIT -License: ((MIT OR Apache-2.0) AND Unicode-DFS-2016) AND (0BSD OR MIT OR Apache-2.0) AND Apache-2.0 AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND MIT AND (MIT OR Apache-2.0) AND (MIT OR Zlib OR Apache-2.0) AND (Unlicense OR MIT) +License: ((MIT OR Apache-2.0) AND Unicode-DFS-2016) AND 0BSD AND (0BSD OR MIT OR Apache-2.0) AND Apache-2.0 AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND (BSD-2-Clause OR Apache-2.0 OR MIT) AND MIT AND (MIT OR Apache-2.0) AND (MIT OR Zlib OR Apache-2.0) AND (Unlicense OR MIT) # LICENSE.dependencies contains a full license breakdown %if %{with selinux} From 86131092cf924f426f60b04575bc7907aa01a917 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 5 Dec 2024 15:37:02 -0500 Subject: [PATCH 12/15] Deduplicate the License expression --- rust-rd-agent.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust-rd-agent.spec b/rust-rd-agent.spec index f74e424..02468c2 100644 --- a/rust-rd-agent.spec +++ b/rust-rd-agent.spec @@ -53,7 +53,7 @@ Summary: %{summary} # MIT OR Apache-2.0 # MIT OR Zlib OR Apache-2.0 # Unlicense OR MIT -License: ((MIT OR Apache-2.0) AND Unicode-DFS-2016) AND 0BSD AND (0BSD OR MIT OR Apache-2.0) AND Apache-2.0 AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND (BSD-2-Clause OR Apache-2.0 OR MIT) AND MIT AND (MIT OR Apache-2.0) AND (MIT OR Zlib OR Apache-2.0) AND (Unlicense OR MIT) +License: 0BSD AND Apache-2.0 AND MIT AND Unicode-DFS-2016 AND (0BSD OR MIT OR Apache-2.0) AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND (BSD-2-Clause OR Apache-2.0 OR MIT) AND (MIT OR Zlib OR Apache-2.0) AND (Unlicense OR MIT) # LICENSE.dependencies contains a full license breakdown %if %{with selinux} From 484fc8760450e80185f5cda5b89d42f311e0660f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 06:49:49 +0000 Subject: [PATCH 13/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 05ee9e5059403e0688c301925a0b9b1c88e4bfaf Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 16:13:57 +0000 Subject: [PATCH 14/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From dd5a0ac0e4475721beaeb7523dcc4bec0954f001 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Mon, 5 Jan 2026 10:01:36 +0000 Subject: [PATCH 15/15] Allow procfs 0.18 --- rd-agent-fix-metadata.diff | 4 ++-- rust-rd-agent.spec | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/rd-agent-fix-metadata.diff b/rd-agent-fix-metadata.diff index 288f100..f15bc30 100644 --- a/rd-agent-fix-metadata.diff +++ b/rd-agent-fix-metadata.diff @@ -1,5 +1,5 @@ --- rd-agent-2.2.5/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ rd-agent-2.2.5/Cargo.toml 2024-12-05T16:35:27.976983+00:00 ++++ rd-agent-2.2.5/Cargo.toml 2026-01-05T10:01:01.383431+00:00 @@ -30,7 +30,7 @@ version = "0.8" @@ -14,7 +14,7 @@ [dependencies.procfs] -version = "0.16" -+version = ">=0.16, <0.18" ++version = ">=0.16, <0.19" [dependencies.rd-agent-intf] version = "2.2.5" diff --git a/rust-rd-agent.spec b/rust-rd-agent.spec index 02468c2..88b45fe 100644 --- a/rust-rd-agent.spec +++ b/rust-rd-agent.spec @@ -1,4 +1,4 @@ -# Generated by rust2rpm 27 +# Generated by rust2rpm 28 %bcond check 1 %global crate rd-agent @@ -18,8 +18,9 @@ Source: %{crates_source} Source: https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.8.11.tar.xz # Manually created patch for downstream crate metadata changes # * bump enum-iterator to 2.0 -# * allow procfs 0.17: -# https://github.com/facebookexperimental/resctl-demo/pull/326 +# * allow procfs 0.17, +# https://github.com/facebookexperimental/resctl-demo/pull/326, and 0.18, +# https://github.com/facebookexperimental/resctl-demo/pull/335 Patch: rd-agent-fix-metadata.diff # https://github.com/facebookexperimental/resctl-demo/commit/f65eedf9017332255ef0a48649664c26b45b9c07 Patch: rd-agent-enum-iterator.patch