public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/bpftop] rawhide: Update circular-buffer dependency to version 2
@ 2026-07-17  5:05 Benjamin A. Beasley
  0 siblings, 0 replies; only message in thread
From: Benjamin A. Beasley @ 2026-07-17  5:05 UTC (permalink / raw)
  To: git-commits

            A new commit has been pushed.

            Repo   : rpms/bpftop
            Branch : rawhide
            Commit : 71427a5804de5ea3174a0b13d50b270a12207412
            Author : Benjamin A. Beasley <code@musicinmybrain.net>
            Date   : 2026-07-17T04:57:45+00:00
            Stats  : +49/-5 in 2 file(s)
            URL    : https://src.fedoraproject.org/rpms/bpftop/c/71427a5804de5ea3174a0b13d50b270a12207412?branch=rawhide

            Log:
            Update circular-buffer dependency to version 2

- Update License field based on a current build in Rawhide

---
diff --git a/bpftop-0.9.0-circular-buffer-2.patch b/bpftop-0.9.0-circular-buffer-2.patch
new file mode 100644
index 0000000..63a33f3
--- /dev/null
+++ b/bpftop-0.9.0-circular-buffer-2.patch
@@ -0,0 +1,43 @@
+diff --git a/Cargo.toml b/Cargo.toml
+index 444dc49..70e91d9 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -19,6 +19,6 @@ crossterm = "0.29.0"
+ anyhow = "1.0.99"
+ ratatui = { version = "0.30.0", default-features = false, features = ['crossterm'] }
+ nix = { version = "0.29.0", features = ["user", "net"] }
+-circular-buffer = "1.1.0"
++circular-buffer = "2.0.0"
+ tui-input = "0.15.0"
+ clap = { version = "4.5.45", features = ["derive"] }
+diff --git a/src/app.rs b/src/app.rs
+index 61db3d0..56ab0a6 100755
+--- a/src/app.rs
++++ b/src/app.rs
+@@ -20,7 +20,7 @@ use crate::{
+     bpf_program::{BpfProgram, Process},
+     helpers::program_type_as_str,
+ };
+-use circular_buffer::CircularBuffer;
++use circular_buffer::FixedCircularBuffer;
+ use libbpf_rs::{query::ProgInfoIter, Iter, Link};
+ use ratatui::widgets::ScrollbarState;
+ use ratatui::widgets::TableState;
+@@ -42,7 +42,7 @@ pub struct App {
+     pub vertical_scroll_state: ScrollbarState,
+     pub header_columns: [String; 7],
+     pub items: Arc<Mutex<Vec<BpfProgram>>>,
+-    pub data_buf: Arc<Mutex<CircularBuffer<20, PeriodMeasure>>>,
++    pub data_buf: Arc<Mutex<FixedCircularBuffer<PeriodMeasure, 20>>>,
+     pub max_cpu: f64,
+     pub max_eps: i64,
+     pub max_runtime: u64,
+@@ -140,7 +140,7 @@ impl App {
+                 String::from("Total CPU %"),
+             ],
+             items: Arc::new(Mutex::new(vec![])),
+-            data_buf: Arc::new(Mutex::new(CircularBuffer::<20, PeriodMeasure>::new())),
++            data_buf: Arc::new(Mutex::new(FixedCircularBuffer::<PeriodMeasure, 20>::new())),
+             max_cpu: 0.0,
+             max_eps: 0,
+             max_runtime: 0,

diff --git a/bpftop.spec b/bpftop.spec
index 76a2cb7..751f076 100644
--- a/bpftop.spec
+++ b/bpftop.spec
@@ -10,7 +10,6 @@ Release:        %autorelease
 Summary:        Dynamic real-time view of running eBPF programs
 
 SourceLicense:  Apache-2.0
-# 0BSD OR MIT OR Apache-2.0
 # Apache-2.0
 # Apache-2.0 OR BSL-1.0
 # Apache-2.0 OR MIT
@@ -20,7 +19,6 @@ SourceLicense:  Apache-2.0
 # LGPL-2.1-only OR BSD-2-Clause
 # MIT
 # MIT OR Apache-2.0
-# MIT OR Zlib OR Apache-2.0
 # Zlib
 License:        %{shrink:
     Apache-2.0 AND
@@ -28,15 +26,18 @@ License:        %{shrink:
     BSD-3-Clause AND
     MIT AND
     Zlib 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
-    (LGPL-2.1-only OR BSD-2-Clause) AND
-    (MIT OR Zlib OR Apache-2.0)
+    (LGPL-2.1-only OR BSD-2-Clause)
     }
 # LICENSE.dependencies contains a full license breakdown
 
+# Update the circular-buffer dependency from v1 to v2
+# https://github.com/jfernandez/bpftop/pull/234
+# Without changes to Cargo.lock
+Patch:          bpftop-0.9.0-circular-buffer-2.patch
+
 URL:            https://github.com/jfernandez/%{name}
 Source:         %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
 

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-07-17  5:05 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-07-17  5:05 [rpms/bpftop] rawhide: Update circular-buffer dependency to version 2 Benjamin A. Beasley

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox