Accepting request 1330339 from Base:System

Workaround boo#1257253

OBS-URL: https://build.opensuse.org/request/show/1330339
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/bpftool?expand=0&rev=17

bpftool-libbpf-v7.6.0-sources.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:786dd16887fa97649eb6abed42c56aa45fd4592c8bd3a7aa4d4e7ca5d1b5f2fb
+size 1527883

bpftool.changes

@@ -1,3 +1,38 @@
+-------------------------------------------------------------------
+Fri Jan 30 08:07:39 UTC 2026 - Shung-Hsi Yu <shung-hsi.yu@suse.com>
+
+- Simplify LLVM-version detection to use product_libs_llvm_ver
+  * Macro available in SLES as well since 15-SP7
+- Make bpftool-bash-completion noarch
+- Export CFLAGS to properly propagate optflags to sub-make
+  * Ensure bundled libbpf builds with system flags
+
+-------------------------------------------------------------------
+Fri Jul 25 20:11:11 UTC 2025 - Fredrik Lönnegren <fredrik.lonnegren@suse.com>
+
+- Update to version 7.6.0:
+  * Add new commands bpftool tracelog <stdout|stderr> PROG to print the BPF
+    streams content of a given BPF program. (faad8ad)
+  * Allow users to specify a custom path for BTF information when loading
+    programs with bpftool. (6977b71)
+  * Add a root_id argument when dumping a BTF object, in order to have bpftool
+    print a minimized dump (type and dependencies) of a specific type from the
+    BTF object. (2c5b7fd)
+  * Add probe for ISA v4 instruction set extensions. New BPF instructions
+    include: BPF_{SDIV,SMOD} (signed div and mod), BPF_{LD,LDX,ST,STX,MOV}
+    (sign-extended load/store/move), 32-bit BPF_JA (unconditional jump),
+    target-independent BPF_ALU64 BSWAP (byte-swapping 16/32/64). Availability
+    is now probed as part of bpftool feature probe. (a5c0580)
+  * Display additional information about BPF links, such as ref_ctr_offset for
+    uprobe links, cookies for raw_tp probes and tracing probes. (1375884,
+    c4c2dd0, 2406596)
+  * Support "load-acquire" and "store-release" atomic instructions in the
+    disassembler for translated programs. (452f644)
+  * Make bpftool request fewer permissions, via libbpf's options, when possible
+    for map operations: use read-only access for operations that don't require
+    write access (for example, map creation requires write access, map dump can
+    work with read-only access). (224edf4)
+
 -------------------------------------------------------------------
 Sun May 25 04:18:20 UTC 2025 - Bernhard Wiedemann <bwiedemann@suse.com>
 

bpftool.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package bpftool
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2026 SUSE LLC and contributors
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,25 +16,8 @@
 #
 
 
-# Use latest version by default on Tumbleweed (as of 2025-02-25: llvm 19)
-%define llvm_major_version %{nil}
-
-# Default versions are too old on Leap 15 and SLES 15, overwrite llvm_major_version
-%if 0%{?suse_version} == 1500
-%define llvm_major_version 17
-%endif
-%if 0%{?sle_version} == 150600
-%define llvm_major_version 17
-%endif
-%if 0%{?sle_version} == 150500
-%define llvm_major_version 15
-%endif
-%if 0%{?sle_version} == 150400
-%define llvm_major_version 11
-%endif
-
 Name:           bpftool
-Version:        7.5.0
+Version:        7.6.0
 Release:        0
 Summary:        Tool for inspection and manipulation of BPF programs and maps
 License:        GPL-2.0-only
@@ -44,13 +27,13 @@ Source0:        https://github.com/libbpf/bpftool/releases/download/v%{version}/
 Patch0:         binutils-2.40.patch
 BuildRequires:  binutils-devel
 # Needed for compiling included BPF program (i.e. skeletons)
-BuildRequires:  clang%{llvm_major_version}
+BuildRequires:  clang%{product_libs_llvm_ver}
 BuildRequires:  docutils
 BuildRequires:  libcap-devel
 BuildRequires:  libelf-devel
 BuildRequires:  libzstd-devel
 # llvm-strip is needed for the included BPF program (i.e. skeletons)
-BuildRequires:  llvm%{llvm_major_version}
+BuildRequires:  llvm%{product_libs_llvm_ver}
 
 %description
 bpftool allows for inspection and simple modification of BPF objects (programs
@@ -59,6 +42,7 @@ and maps) on the system.
 %package bash-completion
 Summary:        Bash completion for bpftool
 Group:          System/Shells
+BuildArch:      noarch
 Requires:       %{name}
 Requires:       bash-completion
 Supplements:    (%{name} and bash-completion)
@@ -68,9 +52,9 @@ bash command line completion support for bpftool.
 
 %prep
 %autosetup -p1 -n bpftool-libbpf-v%{version}-sources
-sed -i -e 's/CFLAGS += -O2/CFLAGS = $(RPM_OPT_FLAGS)/' src/Makefile
 
 %build
+export CFLAGS="%{optflags}"
 %make_build -C src V=1 \
     feature-reallocarray=1 \
     feature-libbfd-liberty=1 \