Browse Source

Backport packages from upstream

main
Nicolas Massé 3 weeks ago
committed by github-actions[bot]
parent
commit
500528a44a
  1. 42
      fedora-44/SOURCES/0001-scripts-avoid-matching-char-as-string-for-systemtap.patch
  2. 7
      fedora-44/SPECS/libvirt.spec

42
fedora-44/SOURCES/0001-scripts-avoid-matching-char-as-string-for-systemtap.patch

@ -0,0 +1,42 @@
From cb33103c4afbce68134be112ecc5d0251e542650 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
Date: Mon, 16 Feb 2026 10:00:48 +0000
Subject: [PATCH] scripts: avoid matching 'char **' as string for systemtap
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Daniel P. Berrangé <berrange@redhat.com>
When a probe argument is declared "char *" we reference the userspace
string value using 'user_string(...)' for systemtap.
Unfortunately our code generator also matches on args declared "char **"
and generates bogus code
*cert = user_string($arg4);
which is a syntax error for systemtap.
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
scripts/dtrace2systemtap.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/dtrace2systemtap.py b/scripts/dtrace2systemtap.py
index 506db9c503..361dab1075 100755
--- a/scripts/dtrace2systemtap.py
+++ b/scripts/dtrace2systemtap.py
@@ -124,7 +124,7 @@ for file in filelist:
for idx in range(len(argbits)):
arg = argbits[idx]
isstr = False
- if 'char *' in arg:
+ if re.match(r'''.*char\s\*[^\*].*''', arg) is not None:
isstr = True
m = re.search(r'''^.*\s\*?(\S+)$''', arg)
--
2.55.0

7
fedora-44/SPECS/libvirt.spec

@ -288,7 +288,7 @@
Summary: Library providing a simple virtualization API Summary: Library providing a simple virtualization API
Name: libvirt Name: libvirt
Version: 12.0.0 Version: 12.0.0
Release: 3%{?dist} Release: 5%{?dist}
License: GPL-2.0-or-later AND LGPL-2.1-only AND LGPL-2.1-or-later AND OFL-1.1 License: GPL-2.0-or-later AND LGPL-2.1-only AND LGPL-2.1-or-later AND OFL-1.1
URL: https://libvirt.org/ URL: https://libvirt.org/
@ -300,6 +300,8 @@ Source: https://download.libvirt.org/%{?mainturl}libvirt-%{version}.tar.xz
# Fix IPv6 connections to ESXi # Fix IPv6 connections to ESXi
# Upstream in > 12.0.0 # Upstream in > 12.0.0
Patch: 0001-esx-Allow-connecting-to-IPv6-server.patch Patch: 0001-esx-Allow-connecting-to-IPv6-server.patch
# Fix systemtap types
Patch: 0001-scripts-avoid-matching-char-as-string-for-systemtap.patch
Requires: libvirt-daemon = %{version}-%{release} Requires: libvirt-daemon = %{version}-%{release}
Requires: libvirt-daemon-config-network = %{version}-%{release} Requires: libvirt-daemon-config-network = %{version}-%{release}
@ -2688,6 +2690,9 @@ exit 0
%changelog %changelog
* Wed Sep 30 2026 Daniel P. Berrangé <berrange@redhat.com> - 12.0.0-5
- Backport fix for systemtap probes (rhbz#2432568)
* Mon Jan 26 2026 Richard W.M. Jones <rjones@redhat.com> - 12.0.0-3 * Mon Jan 26 2026 Richard W.M. Jones <rjones@redhat.com> - 12.0.0-3
- Backport fix for IPv6 connections to ESXi - Backport fix for IPv6 connections to ESXi

Loading…
Cancel
Save