From e564faf8effadbfdff00fe0384bc0b31c13e509d Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Thu, 4 Feb 2021 22:01:13 +0000 Subject: [PATCH] Merged update from upstream sources This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/vhostmd.git#6f8231b1f9d4339bbf511014d70c2b95b66567ab --- ...ax-virtio-requirement-in-config-file.patch | 42 +++++++++++++++++++ vhostmd.spec | 23 ++++++++-- 2 files changed, 61 insertions(+), 4 deletions(-) create mode 100644 0001-Relax-virtio-requirement-in-config-file.patch diff --git a/0001-Relax-virtio-requirement-in-config-file.patch b/0001-Relax-virtio-requirement-in-config-file.patch new file mode 100644 index 0000000..5f49e4c --- /dev/null +++ b/0001-Relax-virtio-requirement-in-config-file.patch @@ -0,0 +1,42 @@ +From 83cc269f6892852be94467cea771b3ad1da8a369 Mon Sep 17 00:00:00 2001 +From: Jim Fehlig +Date: Tue, 8 Oct 2019 20:56:18 -0600 +Subject: [PATCH] Relax virtio requirement in config file + +When the virtio transport was introduced the schema was changed to +require a transport in vhostmd.conf. When updating existing +deployments without a virtio transport specified in vhostmd.conf, +vhostmd fails to start + +/usr/sbin/vhostmd -d +/etc/vhostmd/vhostmd.conf:41: element globals: validity error : Element +globals content does not follow the DTD, expecting (disk , virtio , +update_period , path , transport+), got (disk update_period path transport ) +validate_config_file(): Failed to validate :/etc/vhostmd/vhostmd.conf +Config file: /etc/vhostmd/vhostmd.conf, fails DTD validation + +Relax the requirement for virtio transport in the schema. With the +introduction of multiple transports perhaps the others shoud be optional +as well, but requiring virtio is clearly a regression. + +Signed-off-by: Jim Fehlig +--- + vhostmd.dtd | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/vhostmd.dtd b/vhostmd.dtd +index db417fd..888270e 100644 +--- a/vhostmd.dtd ++++ b/vhostmd.dtd +@@ -9,7 +9,7 @@ Virtual Host Metrics Daemon (vhostmd). Configuration file DTD + --> + + +- ++ + + + +-- +2.24.1 + diff --git a/vhostmd.spec b/vhostmd.spec index 3f70550..6603a65 100644 --- a/vhostmd.spec +++ b/vhostmd.spec @@ -3,14 +3,20 @@ Summary: Virtualization host metrics daemon Name: vhostmd Version: 1.1 -Release: 3.1%{?dist} +Release: 6%{?dist} License: GPLv2+ -URL: http://gitorious.org/vhostmd +URL: https://github.com/vhostmd/vhostmd Source0: https://github.com/vhostmd/vhostmd/archive/v%{version}/%{name}-%{version}.tar.gz Source1: vhostmd.conf +# Prevents updates from previous versions with the old config file +# from breaking (RHBZ#1782897). +# https://github.com/vhostmd/vhostmd/commit/83cc269f6892852be94467cea771b3ad1da8a369 +Patch1: 0001-Relax-virtio-requirement-in-config-file.patch + +BuildRequires: make BuildRequires: gcc BuildRequires: chrpath BuildRequires: perl-generators @@ -26,6 +32,11 @@ BuildRequires: systemd BuildRequires: xen-devel %endif +# This is hopefully temporary, but required to run vhostmd.xml as +# currently written. For more information see: +# https://bugzilla.redhat.com/show_bug.cgi?id=1897130 +Requires: libvirt + %description vhostmd provides a "metrics communication channel" between a host and @@ -152,8 +163,12 @@ exit 0 %changelog -* Tue Dec 15 2020 Petr Šabata - 1.1-3.1 -- Manual bump for a gcc11 rebuild +* Thu Feb 04 2021 Richard W.M. Jones - 1.1-6 +- Increase release so > RHEL 8 (RHBZ#1924966). +- Unify spec files between RHEL and Fedora. + +* Wed Jan 27 2021 Fedora Release Engineering - 1.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild * Wed Jul 29 2020 Fedora Release Engineering - 1.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild