From cb0a4a80f5aa4b8de53670f632dde4d33d35754d Mon Sep 17 00:00:00 2001
From: Martin Osvald <mosvald@redhat.com>
Date: Tue, 1 Aug 2023 10:49:16 +0200
Subject: [PATCH] Fix rpminspect CI errors

Resolves: #2228035
---
 cyrus-imapd.spec | 13 +++++++++----
 rpminspect.yaml  | 10 ++++++++++
 2 files changed, 19 insertions(+), 4 deletions(-)
 create mode 100644 rpminspect.yaml

diff --git a/cyrus-imapd.spec b/cyrus-imapd.spec
index 5772b8c..ec3e5ef 100644
--- a/cyrus-imapd.spec
+++ b/cyrus-imapd.spec
@@ -14,7 +14,7 @@
 
 Name: cyrus-imapd
 Version: 3.4.1
-Release: 8%{?dist}
+Release: 9%{?dist}
 
 
 %define ssl_pem_file_prefix /etc/pki/%name/%name
@@ -156,7 +156,8 @@ BuildRequires: make
 Requires(pre): shadow-utils
 %{?systemd_requires}
 
-Requires: %name-utils = %version-%release
+Requires: cyrus-imapd-libs%{?_isa} = %{version}-%{release}
+Requires: cyrus-imapd-utils = %{version}-%{release}
 Requires: file sscg
 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -187,7 +188,7 @@ hierarchies.
 
 %package devel
 Summary: Cyrus IMAP server development files
-Requires: %name%{?_isa} = %version-%release
+Requires: cyrus-imapd-libs%{?_isa} = %{version}-%{release}
 Requires: pkgconfig
 
 %description devel
@@ -215,7 +216,7 @@ and the its utilities.
 
 %package utils
 Summary: Cyrus IMAP server administration utilities
-Requires: cyrus-imapd-libs = %{version}-%{release}
+Requires: cyrus-imapd-libs%{?_isa} = %{version}-%{release}
 Requires: perl-Cyrus = %{version}-%{release}
 
 %description utils
@@ -226,6 +227,7 @@ one running the server.
 
 %package virusscan
 Summary: Cyrus virus scanning utility
+Requires: cyrus-imapd-libs%{?_isa} = %{version}-%{release}
 
 %description virusscan
 The cyrus-imapd-virusscan package contains the cyr_virusscan utility.  It
@@ -665,6 +667,9 @@ getent passwd cyrus >/dev/null || /usr/sbin/useradd -c "Cyrus IMAP Server" -d /v
 
 
 %changelog
+* Tue Aug 01 2023 Martin Osvald <mosvald@redhat.com> - 3.4.1-9
+- Resolves: #2228035 - Fix rpminspect CI errors
+
 * Sun Jul 23 2023 Martin Osvald <mosvald@redhat.com> - 3.4.1-8
 - Resolves: #2169709 - Remove utils dependency on main package
 
diff --git a/rpminspect.yaml b/rpminspect.yaml
new file mode 100644
index 0000000..8355d23
--- /dev/null
+++ b/rpminspect.yaml
@@ -0,0 +1,10 @@
+---
+badfuncs:
+  allowed:
+    # mupdate uses gethostbyname (safely) to check if the IP address
+    # of the given hostname is local.
+    /usr/libexec/cyrus-imapd/mupdate:
+      - gethostbyname
+    # smmapd uses gethostbyname (safely) to verify user's host.
+    /usr/libexec/cyrus-imapd/smmapd:
+      - gethostbyname