New version 3.6.4

.gitignore

@@ -3,5 +3,14 @@
 /.*.swp
 /results_cyrus-imapd/
 /cyrus-imapd-*/
-/cyrus-imapd-*.tar.gz
-/cyrus-imapd-*.gz.sig
+/cassandane-testdata-ca669d4b.tar.gz
+/cassandane-17d372f.tar.gz
+/cyrus-imapd-3.2.4.tar.gz
+/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-3.6.0.tar.gz
+/cyrus-imapd-3.6.0.tar.gz.sig
+/cyrus-imapd-3.6.4.tar.gz
+/cyrus-imapd-3.6.4.tar.gz.sig

cassandane.ini

@@ -4,8 +4,6 @@
 # The idea here is to run tests on the just-compiled version of cyrus-imapd.
 # However, many of the build locations are just random temporary directories, and
 # so this requires some finesse.
-#
-# Example config: https://github.com/cyrusimap/cyrus-imapd/blob/master/cassandane/cassandane.ini.example
 
 [cassandane]
 rootdir = CASSDIR/work
@@ -37,10 +35,9 @@ quota = cyr_quota
 # backupd = yes
 
 [config]
-# Keep altnamespace on by default, many tests fail when set to no
-#altnamespace = no
-#unixhierarchysep = no
-#client_timeout = 60
+altnamespace = no
+unixhierarchysep = no
+client_timeout = 60
 
 #[caldavtalk]
 #basedir = CASSDIR/cassandane/testdata

ci.fmf

@@ -1 +0,0 @@
-resultsdb-testcase: separate

cyrus-imapd-init.service

@@ -9,4 +9,4 @@ ConditionPathExists=!/etc/pki/cyrus-imapd/cyrus-imapd-ca.pem
 Type=oneshot
 Group=mail
 RemainAfterExit=no
-ExecStart=/usr/bin/sscg --cert-file /etc/pki/cyrus-imapd/cyrus-imapd.pem --cert-key-file /etc/pki/cyrus-imapd/cyrus-imapd-key.pem --ca-file /etc/pki/cyrus-imapd/cyrus-imapd-ca.pem --cert-key-mode=0640
+ExecStart=/usr/bin/sscg --package cyrus-imapd --cert-file /etc/pki/cyrus-imapd/cyrus-imapd.pem --cert-key-file /etc/pki/cyrus-imapd/cyrus-imapd-key.pem --ca-file /etc/pki/cyrus-imapd/cyrus-imapd-ca.pem --cert-key-mode=0640 

cyrus-imapd.tmpfiles.conf

@@ -0,0 +1,5 @@
+d /run/cyrus        0750 cyrus mail -
+d /run/cyrus/db     0700 cyrus mail -
+d /run/cyrus/lock   0700 cyrus mail -
+d /run/cyrus/proc   0700 cyrus mail -
+d /run/cyrus/socket 0750 cyrus mail -

gating.yaml

@@ -1,25 +1,16 @@
 --- !Policy
 product_versions:
   - fedora-*
-decision_context: bodhi_update_push_testing
+decision_contexts: [bodhi_update_push_testing]
 subject_type: koji_build
 rules:
-  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/tier1-public.functional}
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
  
-#Rawhide
+#gating rawhide
 --- !Policy
 product_versions:
   - fedora-*
-decision_context: bodhi_update_push_stable
+decision_contexts: [bodhi_update_push_stable]
 subject_type: koji_build
 rules:
-  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/tier1-public.functional}
- 
-#gating rhel
---- !Policy
-product_versions:
-  - rhel-*
-decision_context: osci_compose_gate
-rules:
-  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-public.functional}
-  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-internal.functional}
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}

patch-cassandane-build-info.patch

@@ -1,13 +0,0 @@
-diff --git a/cassandane/Cassandane/BuildInfo.pm b/cassandane/Cassandane/BuildInfo.pm
-index f98bf2d..19720ec 100644
---- a/cassandane/Cassandane/BuildInfo.pm
-+++ b/cassandane/Cassandane/BuildInfo.pm
-@@ -71,7 +71,7 @@ sub _read_buildinfo
-     my ($destdir, $prefix) = @_;
- 
-     my $cyr_buildinfo;
--    foreach my $bindir (qw(sbin cyrus/bin)) {
-+    foreach my $bindir (qw(bin sbin cyrus/bin)) {
-         my $p = "$destdir$prefix/$bindir/cyr_buildinfo";
-         if (-x $p) {
-             $cyr_buildinfo = $p;

patch-cassandane-no-syslog

@@ -55,25 +55,3 @@ index 20d3763..0238d82 100644
 +{
 +    fake_vsyslog(priority, format, ap);
  }
-diff --git a/cassandane/Cassandane/Instance.pm b/cassandane/Cassandane/Instance.pm
-index 77ddd54..3162fc6 100644
---- a/cassandane/Cassandane/Instance.pm
-+++ b/cassandane/Cassandane/Instance.pm
-@@ -2347,17 +2347,6 @@ sub setup_syslog_replacement
-         return;
-     }
- 
--    # Can't reliably replace syslog when source fortification is in play,
--    # and syslog_probe can't reliably detect whether the replacement has
--    # worked or not in this case, so just turn syslog replacement off if
--    # we detect source fortification
--    if ($self->{buildinfo}->get('version', 'FORTIFY_LEVEL')) {
--        xlog "Cyrus was built with -D_FORTIFY_SOURCE";
--        xlog "tests will not examine syslog output";
--        $self->{have_syslog_replacement} = 0;
--        return;
--    }
--
-     $self->{syslog_fname} = "$self->{basedir}/conf/log/syslog";
-     $self->{have_syslog_replacement} = 1;
- 

patch-cassandane-xapian-delve-path

@@ -0,0 +1,15 @@
+diff --git a/cassandane/Cassandane/Instance.pm b/cassandane/Cassandane/Instance.pm
+index 78e7100..edf6f5d 100644
+--- a/cassandane/Cassandane/Instance.pm
++++ b/cassandane/Cassandane/Instance.pm
+@@ -492,9 +492,7 @@ sub _find_binary
+     my $base = $self->{cyrus_destdir} . $self->{cyrus_prefix};
+ 
+     if ($name eq 'delve') {
+-        my $lib = `ldd $base/libexec/imapd` || die "can't ldd imapd";
+-        $lib =~ m{(/\S+)/lib/libxapian-([0-9.]+)\.so};
+-        return "$1/bin/xapian-delve-$2";
++        return "/bin/xapian-delve";
+     }
+ 
+     foreach (qw( bin sbin libexec libexec/cyrus-imapd lib cyrus/bin ))

patch-cyrus-default-configs

@@ -1,27 +1,7 @@
-diff -uap cyrus-imapd-3.8.3/doc/examples/cyrus_conf/prefork.conf.2 cyrus-imapd-3.8.3/doc/examples/cyrus_conf/prefork.conf
---- cyrus-imapd-3.8.3/doc/examples/cyrus_conf/prefork.conf.2	2024-04-26 01:59:22.000000000 +0100
-+++ cyrus-imapd-3.8.3/doc/examples/cyrus_conf/prefork.conf	2025-01-15 15:56:40.112544167 +0000
-@@ -19,8 +19,8 @@ SERVICES {
- #  nntps         cmd="nntpd -s" listen="nntps" prefork=1
- 
-   # these are only necessary if using HTTP for CalDAV, CardDAV, or RSS
--#  http          cmd="httpd" listen="http" prefork=3
--#  https         cmd="httpd -s" listen="https" prefork=1
-+  http          cmd="httpd" listen="http" prefork=3
-+  https         cmd="httpd -s" listen="https" prefork=1
- 
-   # at least one LMTP is required for delivery
- #  lmtp          cmd="lmtpd" listen="lmtp" prefork=0
-@@ -51,5 +51,5 @@ EVENTS {
- 
- DAEMON {
-   # this is only necessary if using idled for IMAP IDLE
--#  idled         cmd="idled"
-+  idled         cmd="idled"
- }
-diff -uap cyrus-imapd-3.8.3/doc/examples/imapd_conf/normal.conf.2 cyrus-imapd-3.8.3/doc/examples/imapd_conf/normal.conf
---- cyrus-imapd-3.8.3/doc/examples/imapd_conf/normal.conf.2	2024-04-08 04:46:02.000000000 +0100
-+++ cyrus-imapd-3.8.3/doc/examples/imapd_conf/normal.conf	2025-01-15 15:55:44.361093153 +0000
+diff --git a/doc/examples/imapd_conf/normal.conf b/doc/examples/imapd_conf/normal.conf
+index 95b54e9..3935b77 100644
+--- a/doc/examples/imapd_conf/normal.conf
++++ b/doc/examples/imapd_conf/normal.conf
 @@ -10,7 +10,7 @@ admins: cyrus
  ###################################################################
  
@@ -64,7 +44,7 @@ diff -uap cyrus-imapd-3.8.3/doc/examples/imapd_conf/normal.conf.2 cyrus-imapd-3.
 -# Allowed values: caldav, carddav, domainkey, ischedule, rss
 -httpmodules: caldav carddav
 +# Fedora default: enable all modules besides admin and tzdist
-+httpmodules: caldav carddav domainkey freebusy ischedule jmap rss webdav
++httpmodules: caldav carddav domainkey freebusy ischedule rss webdav
  
  # If enabled, the partitions will also be hashed, in addition to the
  # hashing done on configuration directories. This is recommended if one
@@ -108,3 +88,18 @@ diff -uap cyrus-imapd-3.8.3/doc/examples/imapd_conf/normal.conf.2 cyrus-imapd-3.
  # File containing the global certificate used for ALL services (imap,
  # pop3, lmtp, sieve)
  #tls_server_cert: /etc/ssl/certs/ssl-cert-snakeoil.pem
+diff --git a/doc/examples/cyrus_conf/prefork.conf b/doc/examples/cyrus_conf/prefork.conf
+index 186fe66..ab97848 100644
+--- a/doc/examples/cyrus_conf/prefork.conf
++++ b/doc/examples/cyrus_conf/prefork.conf
+@@ -19,8 +19,8 @@ SERVICES {
+ #  nntps         cmd="nntpd -s" listen="nntps" prefork=1
+ 
+   # these are only necessary if using HTTP for CalDAV, CardDAV, or RSS
+-#  http          cmd="httpd" listen="http" prefork=3
+-#  https         cmd="httpd -s" listen="https" prefork=1
++  http          cmd="httpd" listen="http" prefork=3
++  https         cmd="httpd -s" listen="https" prefork=1
+ 
+   # at least one LMTP is required for delivery
+ #  lmtp          cmd="lmtpd" listen="lmtp" prefork=0

patch-cyrus-perl-linking

@@ -0,0 +1,26 @@
+diff --git a/perl/sieve/managesieve/Makefile.PL.in b/perl/sieve/managesieve/Makefile.PL.in
+index 7180b98..d589ebe 100644
+--- a/perl/sieve/managesieve/Makefile.PL.in
++++ b/perl/sieve/managesieve/Makefile.PL.in
+@@ -69,7 +69,7 @@ WriteMakefile(
+     'ABSTRACT'  => 'Cyrus Sieve management interface',
+     'VERSION_FROM' => "@top_srcdir@/perl/sieve/managesieve/managesieve.pm", # finds $VERSION
+     'MYEXTLIB'  => '../lib/.libs/libisieve.a @top_builddir@/perl/.libs/libcyrus.a @top_builddir@/perl/.libs/libcyrus_min.a',
+-    'LIBS'	=> ["$LIB_SASL @SSL_LIBS@ @LIB_UUID@ @LIB_REGEX@ @ZLIB@ @SQLITE_LIBADD@ @MYSQL_LIBADD@ @PGSQL_LIBADD@"],
++    'LIBS'	=> ["$LIB_SASL @SSL_LIBS@ @LIB_UUID@ @LIB_REGEX@ @ZLIB@ @SQLITE_LIBADD@ @MYSQL_LIBADD@ @PGSQL_LIBADD@ -lpcreposix"],
+     'CCFLAGS'	=> '@GCOV_CFLAGS@',
+     'DEFINE'	=> '-DPERL_POLLUTE',     # e.g., '-DHAVE_SOMETHING' 
+     'INC'	=> "-I@top_srcdir@/lib -I@top_srcdir@/perl/sieve -I@top_srcdir@/perl/sieve/lib @SASLFLAGS@ @SSL_CPPFLAGS@",
+diff --git a/perl/imap/Makefile.PL.in b/perl/imap/Makefile.PL.in
+index 71416cc..f76cda6 100644
+--- a/perl/imap/Makefile.PL.in
++++ b/perl/imap/Makefile.PL.in
+@@ -91,7 +91,7 @@ WriteMakefile(
+     'LD'       => $Config{ld} . ' @GCOV_LDFLAGS@',
+     'OBJECT'    => 'IMAP.o',
+     'MYEXTLIB'  => '@top_builddir@/perl/.libs/libcyrus.a @top_builddir@/perl/.libs/libcyrus_min.a',
+-    'LIBS'	=> [ "$LIB_SASL @SSL_LIBS@ @LIB_UUID@ @ZLIB@ @GCOV_LIBS@ @LIBCAP_LIBS@"],
++    'LIBS'	=> [ "$LIB_SASL @SSL_LIBS@ @LIB_UUID@ @ZLIB@ @GCOV_LIBS@ @LIBCAP_LIBS@ -lpcreposix"],
+     'DEFINE'	=> '-DPERL_POLLUTE',    # e.g., '-DHAVE_SOMETHING'
+     'INC'	=> "-I@top_srcdir@ -I@top_srcdir@/com_err/et @SASLFLAGS@ @SSL_CPPFLAGS@ @GCOV_CFLAGS@ -I@top_srcdir@/perl/imap",
+     'EXE_FILES' => [cyradm],

patch-cyrus-remove-always-inline-for-buf-len

@@ -1,13 +0,0 @@
-diff --git a/lib/util.c b/lib/util.c
-index a2eae15..ef8c25b 100644
---- a/lib/util.c
-+++ b/lib/util.c
-@@ -1188,7 +1188,7 @@ EXPORTED int buf_getline(struct buf *buf, FILE *fp)
- 
- #ifdef HAVE_DECLARE_OPTIMIZE
- EXPORTED inline size_t buf_len(const struct buf *buf)
--    __attribute__((always_inline, optimize("-O3")));
-+    __attribute__((optimize("-O3")));
- #endif
- EXPORTED inline size_t buf_len(const struct buf *buf)
- {

patch-cyrus-rename-imtest

@@ -1,40 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 71333b0..52317da 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -2092,14 +2092,14 @@ endif
- ## The @$(MKDIR_P) line is added due to a bug in Automake 1.10 and can be removed if using Automake 1.12.
- 	@$(MKDIR_P) $(DESTDIR)$(bindir)
- 	cd $(DESTDIR)$(bindir) && \
--	  $(LN_S) -f imtest httptest && \
--	  $(LN_S) -f imtest lmtptest && \
--	  $(LN_S) -f imtest mupdatetest && \
--	  $(LN_S) -f imtest nntptest && \
--	  $(LN_S) -f imtest pop3test && \
--	  $(LN_S) -f imtest sivtest && \
--	  $(LN_S) -f imtest smtptest && \
--	  $(LN_S) -f imtest synctest
-+	  $(LN_S) -f cyr_imtest httptest && \
-+	  $(LN_S) -f cyr_imtest lmtptest && \
-+	  $(LN_S) -f cyr_imtest mupdatetest && \
-+	  $(LN_S) -f cyr_imtest nntptest && \
-+	  $(LN_S) -f cyr_imtest pop3test && \
-+	  $(LN_S) -f cyr_imtest sivtest && \
-+	  $(LN_S) -f cyr_imtest smtptest && \
-+	  $(LN_S) -f cyr_imtest synctest
- 
- uninstall-hook: cyrus-makemaker-uninstall-workaround
- if PERL
-diff --git a/imtest/imtest.c b/imtest/imtest.c
-index 725ff62..d9406e1 100644
---- a/imtest/imtest.c
-+++ b/imtest/imtest.c
-@@ -3040,7 +3040,7 @@ int main(int argc, char **argv)
-     }
- 
-     if (!*prot) {
--        if (!strcasecmp(prog, "imtest"))
-+        if (!strcasecmp(prog, "cyr_imtest"))
-             prot = "imap";
-         else if (!strcasecmp(prog, "pop3test"))
-             prot = "pop3";

plans.fmf

@@ -1,35 +0,0 @@
-/tier1-internal:
-  plan:
-    import:
-      url: https://gitlab.com/redhat/centos-stream/tests/cyrus-imapd.git
-      name: /plans/tier1/internal
- 
-/tier1-public:
-  plan:
-    import:
-      url: https://gitlab.com/redhat/centos-stream/tests/cyrus-imapd.git
-      name: /plans/tier1/public
- 
-/tier2-tier3-internal:
-  plan:
-    import:
-      url: https://gitlab.com/redhat/centos-stream/tests/cyrus-imapd.git
-      name: /plans/tier2-tier3/internal
- 
-/tier2-tier3-public:
-  plan:
-    import:
-      url: https://gitlab.com/redhat/centos-stream/tests/cyrus-imapd.git
-      name: /plans/tier2-tier3/public
- 
-/others-internal:
-  plan:
-    import:
-      url: https://gitlab.com/redhat/centos-stream/tests/cyrus-imapd.git
-      name: /plans/others/internal
- 
-/others-public:
-  plan:
-    import:
-      url: https://gitlab.com/redhat/centos-stream/tests/cyrus-imapd.git
-      name: /plans/others/public

plans/all.fmf

@@ -0,0 +1,6 @@
+summary: Test plan with all Fedora tests
+discover:
+    how: fmf
+    url: https://src.fedoraproject.org/tests/cyrus-imapd.git
+execute:
+    how: tmt

rpminspect.yaml

@@ -1,10 +0,0 @@
----
-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

sources

@@ -1,2 +1,2 @@
-SHA512 (cyrus-imapd-3.12.1.tar.gz) = ec2727eb0567ebf978ff4db9e9086bc01fdc2739b6e06cad73cf74f9af990c30a70130aa2474d822d8ca078e1012a60179101de90845bf40f7a9b47a8b5e4d92
-SHA512 (cyrus-imapd-3.12.1.tar.gz.sig) = a548769b7443a179cbfeabd20fce113d94b9ccbf134aab3c6aa5197edcad41f1a73f1d28ba8e2b80046457053949344385ca68b22489d47721d4760e42cd4dd4
+SHA512 (cyrus-imapd-3.6.4.tar.gz) = 4bad368b894c7bc376e18734249c43d3ad8f50d691435cbd4f80411e86007abf343f40a41fc336e4f432cd8e073fddb07bc738a6ce231bd8282681f59bb8f25b
+SHA512 (cyrus-imapd-3.6.4.tar.gz.sig) = f906569e2fe86677c3f3aebfdf8dea788dc48f437324033c426849e51ad041da9373075770733b0fde5a73e2d7cbb8ecbcb8d3f3be59616936f8b17d41f601a0

systemd-sysusers.conf

@@ -1,4 +0,0 @@
-#Type Name     ID             GECOS                 Home directory Shell
-g     saslauth 76
-u     cyrus    76:mail        "Cyrus IMAP Server"   /var/lib/imap  /sbin/nologin
-m     cyrus    saslauth

systemd-tmpfiles.conf

@@ -1,21 +0,0 @@
-d /run/cyrus             0750 cyrus mail -
-d /run/cyrus/db          0700 cyrus mail -
-d /run/cyrus/lock        0700 cyrus mail -
-d /run/cyrus/proc        0700 cyrus mail -
-d /run/cyrus/socket      0750 cyrus mail -
-d /var/lib/imap          0750 cyrus mail -
-d /var/lib/imap/backup   0700 cyrus mail -
-d /var/lib/imap/db       0700 cyrus mail -
-d /var/lib/imap/log      0700 cyrus mail -
-d /var/lib/imap/meta     0700 cyrus mail -
-d /var/lib/imap/md5      0700 cyrus mail -
-d /var/lib/imap/msg      0700 cyrus mail -
-d /var/lib/imap/proc     0700 cyrus mail -
-d /var/lib/imap/ptclient 0700 cyrus mail -
-d /var/lib/imap/quota    0700 cyrus mail -
-d /var/lib/imap/rpm      0700 cyrus mail -
-d /var/lib/imap/sieve    0700 cyrus mail -
-d /var/lib/imap/socket   0750 cyrus mail -
-d /var/lib/imap/sync     0700 cyrus mail -
-d /var/lib/imap/user     0700 cyrus mail -
-d /var/spool/imap        0700 cyrus mail -