From bb8d51e86a2d62e0c050cd5524d5496fbe3453fa Mon Sep 17 00:00:00 2001
From: Martin Osvald <mosvald@redhat.com>
Date: Mon, 25 Mar 2024 11:08:04 +0100
Subject: [PATCH] Do not create mail group to prevent dependency loop

Resolves: RHEL-27161
---
 cyrus-imapd.spec     | 5 ++++-
 cyrus-imapd.sysusers | 1 -
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/cyrus-imapd.spec b/cyrus-imapd.spec
index bb67055..7eb7c46 100644
--- a/cyrus-imapd.spec
+++ b/cyrus-imapd.spec
@@ -10,7 +10,7 @@
 
 Name: cyrus-imapd
 Version: 3.8.1
-Release: 8%{?dist}
+Release: 9%{?dist}
 
 %define ssl_pem_file_prefix /etc/pki/%name/%name
 
@@ -829,6 +829,9 @@ sudo -u cyrus LD_LIBRARY_PATH=%buildroot/%_libdir ./testrunner.pl %{?_smp_mflags
 %{_mandir}/man3/Cyrus::SIEVE::managesieve.3pm*
 
 %changelog
+* Mon Mar 25 2024 Martin Osvald <mosvald@redhat.com> - 3.8.1-9
+- Do not create mail group to prevent dependency loop (RHEL-27161)
+
 * Wed Jan 31 2024 Pete Walter <pwalter@fedoraproject.org> - 3.8.1-8
 - Rebuild for ICU 74
 
diff --git a/cyrus-imapd.sysusers b/cyrus-imapd.sysusers
index 589008b..3986c28 100644
--- a/cyrus-imapd.sysusers
+++ b/cyrus-imapd.sysusers
@@ -1,5 +1,4 @@
 #Type Name     ID             GECOS                 Home directory Shell
 g     saslauth 76
-g     mail     12
 u     cyrus    76:mail        "Cyrus IMAP Server"   /var/lib/imap  /sbin/nologin
 m     cyrus    saslauth