From 9290c81e9bc1ad3c2f03e7b1258da290cc79b919 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Tue, 28 Jul 2020 06:31:01 -0400
Subject: [PATCH] import vhostmd-1.1-4.el8

---
 ...ax-virtio-requirement-in-config-file.patch | 42 +++++++++++++++++++
 SPECS/vhostmd.spec                            | 11 ++++-
 2 files changed, 52 insertions(+), 1 deletion(-)
 create mode 100644 SOURCES/0001-Relax-virtio-requirement-in-config-file.patch

diff --git a/SOURCES/0001-Relax-virtio-requirement-in-config-file.patch b/SOURCES/0001-Relax-virtio-requirement-in-config-file.patch
new file mode 100644
index 0000000..5f49e4c
--- /dev/null
+++ b/SOURCES/0001-Relax-virtio-requirement-in-config-file.patch
@@ -0,0 +1,42 @@
+From 83cc269f6892852be94467cea771b3ad1da8a369 Mon Sep 17 00:00:00 2001
+From: Jim Fehlig <jfehlig@suse.com>
+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 <virtio> 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 <jfehlig@suse.com>
+---
+ 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
+ -->
+ 
+ <!ELEMENT vhostmd (globals,metrics)>
+-<!ELEMENT globals (disk,virtio,update_period,path,transport+)>
++<!ELEMENT globals (disk,virtio*,update_period,path,transport+)>
+ 
+ <!ELEMENT disk (name,path,size)>
+ <!ELEMENT name (#PCDATA)>
+-- 
+2.24.1
+
diff --git a/SPECS/vhostmd.spec b/SPECS/vhostmd.spec
index fb642ba..d89ec37 100644
--- a/SPECS/vhostmd.spec
+++ b/SPECS/vhostmd.spec
@@ -3,7 +3,7 @@
 Summary:       Virtualization host metrics daemon
 Name:          vhostmd
 Version:       1.1
-Release:       3%{?dist}
+Release:       4%{?dist}
 License:       GPLv2+
 
 URL:           https://github.com/vhostmd/vhostmd
@@ -11,6 +11,11 @@ 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: gcc
 BuildRequires: chrpath
 BuildRequires: perl-generators
@@ -152,6 +157,10 @@ exit 0
 
 
 %changelog
+* Fri Jan 31 2020 Richard W.M. Jones <rjones@redhat.com> - 1.1-4.el8
+- Prevent updates from previous versions from breaking
+  resolves: rhbz#1782897
+
 * Mon Nov 25 2019 Richard W.M. Jones <rjones@redhat.com> - 1.1-3.el8
 - Fix URL
   resolves: rhbz#1775565