New version 3.4.4

Fix FTBFS caused by missing pcre-devel in BuildRequires (#2109395)

.gitignore

@@ -9,3 +9,4 @@
 /cassandane-8d3fced.tar.gz
 /cyrus-imapd-3.2.6.tar.gz
 /cyrus-imapd-3.4.3.tar.gz
+/cyrus-imapd-3.4.4.tar.gz

cyrus-imapd.spec

@@ -5,8 +5,8 @@
 %bcond_with cassandane
 
 Name: cyrus-imapd
-Version: 3.4.3
-Release: 2%{?dist}
+Version: 3.4.4
+Release: 1%{?dist}
 
 %define ssl_pem_file_prefix /etc/pki/%name/%name
 
@@ -41,13 +41,10 @@ Patch2: patch-cyrus-rename-quota
 # libpcreposix, which causes them to fail to load.
 # https://bugzilla.redhat.com/show_bug.cgi?id=1668723
 # https://github.com/cyrusimap/cyrus-imapd/issues/2629#issuecomment-456925909
-Patch4: patch-cyrus-perl-linking
-
-# https://github.com/cyrusimap/cyrus-imapd/issues/4123
-Patch5: patch-cyrus-perl-assert
+Patch3: patch-cyrus-perl-linking
 
 # https://github.com/cyrusimap/cyrus-imapd/pull/3892
-Patch6: patch-cyrus-squatter-assert-crash
+Patch4: patch-cyrus-squatter-assert-crash
 
 
 Source10: cyrus-imapd.logrotate
@@ -97,7 +94,7 @@ BuildRequires: clamav-devel shapelib-devel
 BuildRequires: CUnit-devel cyrus-sasl-devel glib2-devel
 BuildRequires: jansson-devel krb5-devel libical-devel libicu-devel
 BuildRequires: libnghttp2-devel libxml2-devel mariadb-devel net-snmp-devel
-BuildRequires: openldap-devel openssl-devel libpq-devel
+BuildRequires: openldap-devel openssl-devel pcre-devel libpq-devel
 BuildRequires: sqlite-devel xapian-core-devel
 
 # Miscellaneous modules needed for 'make check' to function:
@@ -557,14 +554,10 @@ exclude+=("!Master.maxforkrate")
 
 
 %pre
-# /bin/sh does not declare it before the first use
-PIPESTATUS=( 0 )
 # Create 'cyrus' user on target host
 getent group saslauth >/dev/null || /usr/sbin/groupadd -g %gid -r saslauth
 getent passwd cyrus >/dev/null || /usr/sbin/useradd -c "Cyrus IMAP Server" -d /var/lib/imap -g %cyrusgroup \
-  -G saslauth -s /sbin/nologin -u %uid -r %cyrususer 2>&1 | grep -v 'outside of the SYS_UID_MIN' | tee
-# exit if useradd fails
-if [ ${PIPESTATUS[0]} -ne 0 ]; then exit 1; fi
+  -G saslauth -s /sbin/nologin -u %uid -r %cyrususer
 
 %post
 %systemd_post cyrus-imapd.service
@@ -677,6 +670,10 @@ if [ ${PIPESTATUS[0]} -ne 0 ]; then exit 1; fi
 
 
 %changelog
+* Thu Jul 21 2022 Martin Osvald <mosvald@redhat.com> - 3.4.4-1
+- New version 3.4.4
+- Fix FTBFS caused by missing pcre-devel in BuildRequires (#2109395)
+
 * Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
 

patch-cyrus-perl-assert

@@ -1,20 +0,0 @@
-diff --git a/lib/assert.h b/lib/assert.h
-index d7e2512..ddf316b 100644
---- a/lib/assert.h
-+++ b/lib/assert.h
-@@ -43,6 +43,8 @@
- #ifndef INCLUDED_ASSERT_H
- #define INCLUDED_ASSERT_H
- 
-+#ifndef PERL_POLLUTE
-+
- #ifdef __STDC__
- #define assert(ex)      {if (!(ex))assertionfailed(__FILE__, __LINE__, #ex);}
- void assertionfailed(const char *file, int line, const char *expr);
-@@ -50,4 +52,6 @@ void assertionfailed(const char *file, int line, const char *expr);
- #define assert(ex)      {if (!(ex))assertionfailed(__FILE__, __LINE__, (char*)0);}
- #endif
- 
-+#endif
-+
- #endif /* INCLUDED_ASSERT_H */

sources

@@ -1,2 +1,2 @@
-SHA512 (cyrus-imapd-3.4.3.tar.gz) = 5c4db2a0c26d2323332c1ba67f7b207acfad15f0442f20c6c8a205b5423498465524398315946213c8168bc7eba1fd9f7dc573a91efac6708bfbaf2cb57e9276
 SHA512 (cassandane-testdata-ca669d4b.tar.gz) = c153ab0a57d04d9deeabc5ef724eaecc05030c23b170abaa44eaea2e7df409efcdeb24871f7896759e85d64193fb9f289a470b0af9a593a740ffcc45c80033ff
+SHA512 (cyrus-imapd-3.4.4.tar.gz) = 7904a9d0535e9d606bbb7748a4886e10092e2b682180dddf94933199f19402ae6f5cc4472a3797decf9ef20d3a8b7f1715ab00f6751037f14b19cd7322942dc2