0020-implicit-function-declarations.patch

@@ -1,74 +0,0 @@
-From cf555d3bf079ff60b363dba4dc48a349dce5d3b4 Mon Sep 17 00:00:00 2001
-From: Yaakov Selkowitz <yselkowi@redhat.com>
-Date: Sun, 24 Dec 2023 14:54:09 -0500
-Subject: [PATCH] Fix implicit declarations
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Errors raised in Fedora rawhide and ELN which have added the
--Werror=implicit-function-declaration flag for C:
-
-virt-util.c:96:9: error: implicit declaration of function ‘calloc’
-virt-util.c:129:10: error: implicit declaration of function ‘free’
-
-virtio.c:160:9: error: implicit declaration of function ‘free’
-virtio.c:254:31: error: implicit declaration of function ‘bsearch’
-virtio.c:259:13: error: implicit declaration of function ‘qsort’
-virtio.c:586:33: error: implicit declaration of function ‘calloc’
-
-libmetrics.c:136:28: error: implicit declaration of function 'atoi'
-libmetrics.c:142:29: error: implicit declaration of function 'atoll'
-libmetrics.c:148:28: error: implicit declaration of function 'atof'
-libmetrics.c:170:12: error: implicit declaration of function 'calloc'
-libmetrics.c:189:12: error: implicit declaration of function 'free'
-libmetrics.c:311:7: error: implicit declaration of function 'posix_memalign'
-libmetrics.c:385:26: error: implicit declaration of function 'malloc'
-libmetrics.c:848:28: error: implicit declaration of function 'realloc'
-
-Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>
----
- libmetrics/libmetrics.c | 1 +
- vhostmd/virt-util.c     | 1 +
- vhostmd/virtio.c        | 1 +
- 3 files changed, 3 insertions(+)
-
-diff --git a/libmetrics/libmetrics.c b/libmetrics/libmetrics.c
-index 8819074..c83fd03 100644
---- a/libmetrics/libmetrics.c
-+++ b/libmetrics/libmetrics.c
-@@ -21,6 +21,7 @@
- #include <config.h>
- 
- #include <stdio.h>
-+#include <stdlib.h>
- #include <string.h>
- #include <fcntl.h>
- #include <unistd.h>
-diff --git a/vhostmd/virt-util.c b/vhostmd/virt-util.c
-index a94cccd..40765c3 100644
---- a/vhostmd/virt-util.c
-+++ b/vhostmd/virt-util.c
-@@ -21,6 +21,7 @@
- #include <config.h>
- 
- #include <stdio.h>
-+#include <stdlib.h>
- #include <string.h>
- #include <libvirt/libvirt.h>
- 
-diff --git a/vhostmd/virtio.c b/vhostmd/virtio.c
-index a6c2515..98340ce 100644
---- a/vhostmd/virtio.c
-+++ b/vhostmd/virtio.c
-@@ -30,6 +30,7 @@
- #include <search.h>
- #include <dirent.h>
- #include <pthread.h>
-+#include <stdlib.h>
- #include <libvirt/libvirt.h>
- 
- #include "util.h"
--- 
-2.43.0
-

rpminspect.yaml

@@ -1,5 +0,0 @@
-xml:
-    # Regular expression (man 7 regex) matching directories to ignore
-    # during the xml inspection. Skip DTD files, which
-    # contain a mix of XML and code.
-    exclude_path: .*(\.dtd)$

vhostmd.spec

@@ -3,7 +3,7 @@
 Summary:       Virtualization host metrics daemon
 Name:          vhostmd
 Version:       1.1
-Release:       19%{?dist}
+Release:       14%{?dist}
 License:       LGPL-2.1-or-later
 
 URL:           https://github.com/vhostmd/vhostmd
@@ -33,10 +33,6 @@ Patch0016:     0016-vhostmd-Check-return-value-of-file-functions.patch
 Patch0017:     0017-vhostmd-Check-for-valide-file-handle-before-calling-.patch
 Patch0018:     0018-vhostmd-Fix-memory-leak-in-vhostmd_run.patch
 Patch0019:     0019-virtio-Fix-strncpy-length-parameter.patch
-# https://github.com/vhostmd/vhostmd/pull/13
-Patch0020:     0020-implicit-function-declarations.patch
-
-ExcludeArch: %{ix86}
 
 BuildRequires: make
 BuildRequires: gcc
@@ -129,7 +125,11 @@ rm $RPM_BUILD_ROOT%{_datadir}/vhostmd/scripts/pagerate.pl
 
 %pre
 # UID:GID 112:112 reserved, see RHBZ#534109.
-%sysusers_create_inline u vhostmd 112 "Virtual Host Metrics Daemon" %{_datadir}/vhostmd /sbin/nologin
+getent group vhostmd >/dev/null || groupadd -g 112 -r vhostmd
+getent passwd vhostmd >/dev/null || \
+useradd -u 112 -r -g vhostmd -d %{_datadir}/vhostmd -s /sbin/nologin \
+-c "Virtual Host Metrics Daemon" vhostmd
+exit 0
 
 
 %post
@@ -181,21 +181,6 @@ rm $RPM_BUILD_ROOT%{_datadir}/vhostmd/scripts/pagerate.pl
 
 
 %changelog
-* Thu Oct  2 2025 Daniel P. Berrangé <berrange@redhat.com> - 1.1-19
-- Disable build on i686 architecture
-
-* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-18
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-17
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-16
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-15
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
 * Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild