Compare commits

...

No commits in common. 'c9' and 'i10cs' have entirely different histories.
c9 ... i10cs

@ -1,7 +1,7 @@
From 4b15ee2440b0e70e3c1eb5e164ded493e2d8f0c8 Mon Sep 17 00:00:00 2001
From: Yuya Higashi <higashi.yuya@fujitsu.com>
Date: Tue, 15 Nov 2022 13:56:21 +0900
Subject: [PATCH 1/2] virt-top: fix to explicitly disconnect from libvirtd
Subject: [PATCH 1/3] virt-top: fix to explicitly disconnect from libvirtd
To prevent libvirtd from printing virNetSocketReadWire I/O errors when
the virt-top command exits, explicitly disconnect from libvirtd.
@ -35,5 +35,5 @@ index 75fbcb9..cbe655a 100644
and get_key_press setup delay =
(* Read the next key, waiting up to 'delay' milliseconds. *)
--
2.31.1
2.42.0

@ -1,7 +1,7 @@
From 1d04fdfce6edea685596fbb18920799c70f1d7fa Mon Sep 17 00:00:00 2001
From: Yuya Higashi <higashi.yuya@fujitsu.com>
Date: Mon, 26 Dec 2022 09:18:15 +0900
Subject: [PATCH 2/2] virt-top: fix to parse init-file correctly
Subject: [PATCH 2/3] virt-top: fix to parse init-file correctly
This fixes the following runtime error when parsing init-file.
@ -34,5 +34,5 @@ index 1f00803..8dfb255 100644
Not_found -> str, ""
--
2.31.1
2.42.0

@ -0,0 +1,33 @@
From dd205eeae9fb06ac113884e4c9e9f3a90eef7554 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Mon, 27 Nov 2023 14:09:04 +0000
Subject: [PATCH 3/3] src: Include <libxml/parser.h>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
libxml2 2.12.1 failed with this error:
xml-c.c:92:9: warning: implicit declaration of function xmlReadMemory; did you mean xmlInitMemory? [-Wimplicit-function-declaration]
92 | doc = xmlReadMemory (String_val (xmlv), caml_string_length (xmlv),
| ^~~~~~~~~~~~~
| xmlInitMemory
---
src/xml-c.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/xml-c.c b/src/xml-c.c
index 72042bf..6c546b9 100644
--- a/src/xml-c.c
+++ b/src/xml-c.c
@@ -28,6 +28,7 @@
#include <caml/memory.h>
#include <caml/mlvalues.h>
+#include <libxml/parser.h>
#include <libxml/xpath.h>
#include <libxml/xpathInternals.h>
--
2.42.0

@ -0,0 +1,28 @@
--- virt-top-1.1.1/configure.orig 2021-11-03 14:18:26.000000000 -0600
+++ virt-top-1.1.1/configure 2023-07-10 12:31:15.525435684 -0600
@@ -5357,7 +5357,7 @@ else
OCAMLOPT="$ac_cv_prog_OCAMLOPT"
fi
- OCAMLBEST=byte
+ OCAMLBEST=ocamlc
if test "$OCAMLOPT" = "no"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot find ocamlopt; bytecode compilation only." >&5
$as_echo "$as_me: WARNING: Cannot find ocamlopt; bytecode compilation only." >&2;}
--- virt-top-1.1.1/ocaml-link.sh.in.orig 2021-11-03 06:00:07.000000000 -0600
+++ virt-top-1.1.1/ocaml-link.sh.in 2023-07-10 12:31:41.012064849 -0600
@@ -49,10 +49,12 @@ if [ x"${V:-@AM_DEFAULT_VERBOSITY@}" = x
echo "$@" \
@OCAML_RUNTIME_VARIANT_PIC_OPTION@ \
-linkpkg \
- -cclib "'@LDFLAGS@ $cclib'"
+ -cclib "'@LDFLAGS@ $cclib'" \
+ -output-complete-exe
fi
# NB -cclib must come last.
exec "$@" \
@OCAML_RUNTIME_VARIANT_PIC_OPTION@ \
-linkpkg \
- -cclib "@LDFLAGS@ $cclib"
+ -cclib "@LDFLAGS@ $cclib" \
+ -output-complete-exe

@ -1,9 +1,11 @@
%undefine _package_note_flags
# OCaml packages not built on i686 since OCaml 5 / Fedora 39.
ExcludeArch: %{ix86}
Name: virt-top
Version: 1.1.1
Release: 9%{?dist}
Release: 21%{?dist}
Summary: Utility like top(1) for displaying virtualization stats
License: GPLv2+
License: GPL-2.0-or-later
%if 0%{?rhel}
# No qemu-kvm on POWER (RHBZ#1946532).
@ -28,9 +30,15 @@ Patch1: virt-top-1.0.9-processcsv-documentation.patch
# Fix "Input/output error" in journal (RHBZ#2148798)
Patch2: 0001-virt-top-fix-to-explicitly-disconnect-from-libvirtd.patch
# Fix parse error using --init-file option (RHBZ#2159549)
# Fix problem parsing init-file.
Patch3: 0002-virt-top-fix-to-parse-init-file-correctly.patch
# Fix libxml2 2.12.1 build problems.
Patch4: 0003-src-Include-libxml-parser.h.patch
# Fix linking problems on bytecode-only architectures
Patch5: virt-top-1.1.1-ocaml-bytecode.patch
BuildRequires: gcc
BuildRequires: make
BuildRequires: ocaml >= 3.10.2
@ -68,10 +76,17 @@ different virtualization systems.
%setup -q
%if 0%{?rhel} >= 6
%patch1 -p1
%patch -P1 -p1
%endif
%patch -P2 -p1
%patch -P3 -p1
%patch -P4 -p1
%ifnarch %{ocaml_native_compiler}
%patch -P5 -p1
%endif
%patch2 -p1
%patch3 -p1
# "ocamlfind byte" has been removed as an alias
sed -i 's/\(OCAMLBEST=\)byte/\1ocamlc/' configure
%build
@ -110,7 +125,8 @@ install -m 0644 processcsv.py.1 $RPM_BUILD_ROOT%{_mandir}/man1/
%files -f %{name}.lang
%doc COPYING README TODO
%doc README TODO
%license COPYING
%{_bindir}/virt-top
%{_mandir}/man1/virt-top.1*
%if 0%{?rhel} >= 6
@ -120,28 +136,97 @@ install -m 0644 processcsv.py.1 $RPM_BUILD_ROOT%{_mandir}/man1/
%changelog
* Tue Jan 10 2023 Richard W.M. Jones <rjones@redhat.com> - 1.1.1-9
- Fix parse error using --init-file option
resolves: rhbz#2159549
* Fri Oct 25 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 1.1.1-21
- Rebuilt for MSVSphere 10
* Tue Jun 25 2024 Troy Dawson <tdawson@redhat.com> - 1.1.1-21
- Bump release for June 2024 mass rebuild
* Wed Jun 19 2024 Richard W.M. Jones <rjones@redhat.com> - 1.1.1-20
- OCaml 5.2.0 ppc64le fix
* Thu May 30 2024 Richard W.M. Jones <rjones@redhat.com> - 1.1.1-19
- OCaml 5.2.0 for Fedora 41
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.1-18
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Mon Dec 18 2023 Richard W.M. Jones <rjones@redhat.com> - 1.1.1-17
- OCaml 5.1.1 + s390x code gen fix for Fedora 40
* Tue Dec 12 2023 Richard W.M. Jones <rjones@redhat.com> - 1.1.1-16
- OCaml 5.1.1 rebuild for Fedora 40
* Mon Nov 27 2023 Richard W.M. Jones <rjones@redhat.com> - 1.1.1-15
- Fix build issue with libxml2 2.12.1
* Thu Oct 05 2023 Richard W.M. Jones <rjones@redhat.com> - 1.1.1-14
- OCaml 5.1 rebuild for Fedora 40
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.1-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Tue Jul 11 2023 Richard W.M. Jones <rjones@redhat.com> - 1.1.1-12
- OCaml 5.0 rebuild for Fedora 39
* Mon Jul 10 2023 Jerry James <loganjerry@gmail.com> - 1.1.1-11
- OCaml 5.0.0 rebuild
- Add patch to fix linking on bytecode-only architectures
- Update deprecated %%patchN usage
- Use %%license macro
* Mon Jun 05 2023 Richard W.M. Jones <rjones@redhat.com> - 1.1.1-10
- Migrated to SPDX license
* Tue Jan 24 2023 Richard W.M. Jones <rjones@redhat.com> - 1.1.1-9
- Rebuild OCaml packages for F38
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.1-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Mon Nov 28 2022 Richard W.M. Jones <rjones@redhat.com> - 1.1.1-7
- Fix "Input/output error" in journal
resolves: rhbz#2148798
- Fix "Input/output error" in journal (RHBZ#2148798)
* Tue Oct 18 2022 Richard W.M. Jones <rjones@redhat.com> - 1.1.1-6
- Rebase to virt-top 1.1.1
resolves: rhbz#2135768
- Check tarball signature
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Sun Jun 19 2022 Richard W.M. Jones <rjones@redhat.com> - 1.1.1-4
- OCaml 4.14.0 rebuild
* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 1.0.9-21
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Fri Feb 04 2022 Richard W.M. Jones <rjones@redhat.com> - 1.1.1-3
- OCaml 4.13.1 rebuild to remove package notes
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Wed Nov 03 2021 Richard W.M. Jones <rjones@redhat.com> - 1.1.1-1
- New upstream development version 1.1.1
- No longer depends on ocaml-csv, ocaml-extlib or ocaml-xml-light
- Adds new dependency on libxml2
* Tue Oct 05 2021 Richard W.M. Jones <rjones@redhat.com> - 1.1.0-2
- OCaml 4.13.1 build
* Fri Oct 01 2021 Richard W.M. Jones <rjones@redhat.com> - 1.1.0-1
- New upstream development version 1.1.0
- Upstream switched to automake, simplifying the downstream build slightly.
- Remove Changelog file, no longer included upstream.
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.9-21
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Fri May 07 2021 Richard W.M. Jones <rjones@redhat.com> - 1.0.9-20
- Do not include the package on POWER on RHEL 9
resolves: rhbz#1956935
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.0.9-18
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Mon Mar 8 2021 Richard W.M. Jones <rjones@redhat.com> - 1.0.9-19
- Bump and rebuild for ocaml-gettext update.
* Tue Mar 2 10:06:37 GMT 2021 Richard W.M. Jones <rjones@redhat.com> - 1.0.9-18
- OCaml 4.12.0 build
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.9-17
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

Loading…
Cancel
Save