Merge branch 'master' into f29

ClamAV was updated in the stable Fedora branches to a version which
changes both the library version and the API.  This requires a rebuild
to avoid broken dependencies, but the rebuild requires a patch to
support the new API.

The patch was sent upstream in
https://github.com/cyrusimap/cyrus-imapd/issues/2621

.fmf/version

@@ -1 +0,0 @@
-1

.gitignore

@@ -2,6 +2,19 @@
 /.build-*.log
 /.*.swp
 /results_cyrus-imapd/
-/cyrus-imapd-*/
 /cyrus-imapd-*.tar.gz
-/cyrus-imapd-*.gz.sig
+/cyrus-imapd-*/
+/cassandane-testdata-20170523.tar.gz
+/cassandane-b97ba9c.tar.gz
+/cassandane-0a6c13e.tar.gz
+/cassandane-2f8f3f4.tar.gz
+/cassandane-6d33978.tar.gz
+/cassandane-6bd697c.tar.gz
+/cassandane-7cc17a1.tar.gz
+/cassandane-2b355ec.tar.gz
+/cassandane-50a1ec2.tar.gz
+/cassandane-389601b.tar.gz
+/cassandane-e4e97bb.tar.gz
+/cassandane-00bfe01.tar.gz
+/cassandane-8776dd6.tar.gz
+/cassandane-c8040fd.tar.gz

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

cyrus-imapd.service

@@ -1,6 +1,6 @@
 [Unit]
 Description=Cyrus-imapd IMAP/POP3 email server
-After=local-fs.target network-online.target
+After=local-fs.target network.target
 
 Requires=cyrus-imapd-init.service
 After=cyrus-imapd-init.service
@@ -9,7 +9,6 @@ After=cyrus-imapd-init.service
 Type=simple
 EnvironmentFile=/etc/sysconfig/cyrus-imapd
 ExecStart=/usr/libexec/cyrus-imapd/master $CYRUSOPTIONS
-ExecReload=/bin/kill -HUP $MAINPID
 PrivateTmp=true
 
 # Cyrus may spawn many processes in normal operation.  These figures are higher

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 -

ellie-pub.key

@@ -1,17 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBFU5pZUBCAC+m05W9nJnBkrfFO9I+iimF1WCsSZNFoASJ3WEeZxIkOQO9BZj
-aKf8EP/nK7nEfNGZ2m+OrAtQU/+I8Sk1ppHuwZgENLvRzLsBGbv80kDKBw31Nd1f
-sCpVQs4b8zlohXjq0UN8tT5NcGJnGE7ahoOHzJk/0Ll76oVmOZvSw+WHBp1945m2
-Q8CbIbfmyuv7NF6GtGDVilPeIPsDnh5w5usjpKsxjYHKpy6Rtf4MbcCLtkRbHFra
-KJD+xum0PgPdCAEEbQsSXQgwOd0TZ59avRVVef674PjWqIuudUGUhJ/f9OWOj7LG
-6QgJR6yvCy7Bc2eAN4RnIIzaUZGaJDKDCNozABEBAAG0ImVsbGllIHRpbW9uZXkg
-PGVsbGllQGZhc3RtYWlsLmNvbT6JATgEEwECACIFAlU5pZUCGwMGCwkIBwMCBhUI
-AgkKCwQWAgMBAh4BAheAAAoJEFVPBP6zY3jgb9gH/3GPDLGybo7SYZMtBmfe+Udf
-tcRkTtH+o2pf2rh6KwPhhEDuOXWVCIUPWXsWIVU2K5Y8AdBIHOEoSUp3n8juV57I
-u9CfDI718/WaHgEpYrq5DqyROAFr+sGahcb6C40+V/CeUSAmKVhFGniuALUSAQ+B
-XVj/i2EAFNg/5ALkPYDnDYDqm7Ak6odDbktYQz987y38sg3EMC/2wi2EoOG1VWeG
-twFD8HKmXZw+u6cYtFh9K1hOBZm+PhLHr3h1MHTuWYeBKkT3YqaGtXMwi704LlNr
-HU8beOHSNBSsVYJ61B4kgBA7p+qnx6xIpU2KfAJl8cgjCYwrq8yo+Lm9TazagfM=
-=dIwC
------END PGP PUBLIC KEY BLOCK-----

gating.yaml

@@ -1,25 +0,0 @@
---- !Policy
-product_versions:
-  - fedora-*
-decision_context: bodhi_update_push_testing
-subject_type: koji_build
-rules:
-  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/tier1-public.functional}
- 
-#Rawhide
---- !Policy
-product_versions:
-  - fedora-*
-decision_context: 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}

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-fix-annotator

@@ -1,14 +1,14 @@
-diff --git a/cassandane/utils/annotator.pl b/cassandane/utils/annotator.pl
-index 265c73f..8af3d58 100755
---- a/cassandane/utils/annotator.pl
-+++ b/cassandane/utils/annotator.pl
+diff --git a/utils/annotator.pl b/utils/annotator.pl
+index 94b84a2..0208831 100755
+--- a/utils/annotator.pl
++++ b/utils/annotator.pl
 @@ -140,6 +140,8 @@ GetOptions(
  xlog "annotator $$ starting";
  Cassandane::AnnotatorDaemon->run(
-         pid_file => $pidfile,
--        port => $port
+ 	pid_file => $pidfile,
+-	port => $port
 +	port => $port,
-+	user => (getpwuid($<))[0],
-+	group => (getgrgid($())[0],
++    user => (getpwuid($<))[0],
++    group => (getgrgid($())[0],
      );
  xlog "annotator $$ exiting";

patch-cassandane-no-syslog

@@ -1,8 +1,8 @@
-diff --git a/cassandane/Cassandane/Util/Log.pm b/cassandane/Cassandane/Util/Log.pm
-index a44005c..5bb5710 100644
---- a/cassandane/Cassandane/Util/Log.pm
-+++ b/cassandane/Cassandane/Util/Log.pm
-@@ -51,9 +51,6 @@ our @EXPORT = qw(
+diff --git a/Cassandane/Util/Log.pm b/Cassandane/Util/Log.pm
+index 9cd93d5..8d3b3c1 100644
+--- a/Cassandane/Util/Log.pm
++++ b/Cassandane/Util/Log.pm
+@@ -52,16 +52,12 @@ our @EXPORT = qw(
  
  my $verbose = 0;
  
@@ -11,69 +11,11 @@ index a44005c..5bb5710 100644
 -
  sub xlog
  {
-     my $id;
-@@ -87,7 +84,6 @@ sub xlog
-     else {
-         print STDERR "$msg\n";
-     }
+     my ($pkg, $file, $line) = caller;
+     $pkg =~ s/^Cassandane:://;
+     my $msg = "=====> " . $pkg . "[" . $line . "] " . join(' ', @_);
+     print STDERR "$msg\n";
 -    syslog(LOG_ERR, "$msg");
  }
  
  sub set_verbose
-diff --git a/cassandane/utils/syslog.c b/cassandane/utils/syslog.c
-index 20d3763..0238d82 100644
---- a/cassandane/utils/syslog.c
-+++ b/cassandane/utils/syslog.c
-@@ -116,14 +116,28 @@ EXPORTED void syslog(int priority, const char *format, ...)
-     va_start(ap, format);
-     fake_vsyslog(priority, format, ap);
-     va_end(ap);
-+}
-+
-+EXPORTED void
-+__attribute__((format(printf, 3, 4)))
-+__syslog_chk(int priority, int whatever __attribute__((unused)),
-+             const char *format, ...)
-+{
-+    va_list ap;
- 
-     va_start(ap, format);
--    real_vsyslog(priority, format, ap);
-+    fake_vsyslog(priority, format, ap);
-     va_end(ap);
- }
- 
- EXPORTED void vsyslog(int priority, const char *format, va_list ap)
- {
-     fake_vsyslog(priority, format, ap);
--    real_vsyslog(priority, format, ap);
-+}
-+
-+EXPORTED void
-+__attribute__((format(printf, 3, 0)))
-+__vsyslog_chk(int priority, int whatever __attribute__((unused)), const char *format, va_list ap)
-+{
-+    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-cyrus-default-configs

@@ -1,7 +1,8 @@
-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 {
+diff --git a/doc/examples/cyrus_conf/prefork.conf b/doc/examples/cyrus_conf/prefork.conf
+index 4ce2c0f..3b1e6d7 100644
+--- a/doc/examples/cyrus_conf/prefork.conf
++++ b/doc/examples/cyrus_conf/prefork.conf
+@@ -19,15 +19,15 @@ SERVICES {
  #  nntps         cmd="nntpd -s" listen="nntps" prefork=1
  
    # these are only necessary if using HTTP for CalDAV, CardDAV, or RSS
@@ -12,16 +13,19 @@ diff -uap cyrus-imapd-3.8.3/doc/examples/cyrus_conf/prefork.conf.2 cyrus-imapd-3
  
    # at least one LMTP is required for delivery
  #  lmtp          cmd="lmtpd" listen="lmtp" prefork=0
-@@ -51,5 +51,5 @@ EVENTS {
+-  lmtpunix      cmd="lmtpd" listen="/var/imap/socket/lmtp" prefork=1
++  lmtpunix      cmd="lmtpd" listen="/run/cyrus/socket/lmtp" prefork=1
  
- DAEMON {
-   # this is only necessary if using idled for IMAP IDLE
--#  idled         cmd="idled"
-+  idled         cmd="idled"
+   # this is only necessary if using notifications
+-#  notify        cmd="notifyd" listen="/var/imap/socket/notify" proto="udp" prefork=1
++#  notify        cmd="notifyd" listen="/run/cyrus/socket/notify" proto="udp" prefork=1
  }
-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
+ 
+ EVENTS {
+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
  ###################################################################
  
@@ -63,8 +67,8 @@ 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
++# Fedora default: enable all modules besides admin
++httpmodules: caldav carddav domainkey freebusy ischedule rss tzdist webdav
  
  # If enabled, the partitions will also be hashed, in addition to the
  # hashing done on configuration directories. This is recommended if one

patch-cyrus-perl-linking

@@ -0,0 +1,26 @@
+diff --git a/perl/imap/Makefile.PL.in b/perl/imap/Makefile.PL.in
+index a0fda4a..df71c0c 100644
+--- a/perl/imap/Makefile.PL.in
++++ b/perl/imap/Makefile.PL.in
+@@ -90,7 +90,7 @@ WriteMakefile(
+     'clean'	=> {'FILES' => 'libcyrperl.a cyradm'},
+     '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@"],
++    'LIBS'	=> [ "$LIB_SASL @SSL_LIBS@ @LIB_UUID@ @ZLIB@ -lpcreposix"],
+     'DEFINE'	=> '-DPERL_POLLUTE',    # e.g., '-DHAVE_SOMETHING' 
+     'INC'	=> "-I@top_srcdir@ -I@top_srcdir@/com_err/et @SASLFLAGS@ @SSL_CPPFLAGS@ -I@top_srcdir@/perl/imap", 
+     'EXE_FILES' => [cyradm],
+diff --git a/perl/sieve/managesieve/Makefile.PL.in b/perl/sieve/managesieve/Makefile.PL.in
+index 2a3415a..67fb2d1 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@ @ZLIB@ @SQLITE_LIBADD@ @MYSQL_LIBADD@ @PGSQL_LIBADD@"],
++    'LIBS'	=> ["$LIB_SASL @SSL_LIBS@ @LIB_UUID@ @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@",

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";

patch-cyrus-rename-quota

@@ -1,8 +1,8 @@
 diff --git a/imap/imapd.c b/imap/imapd.c
-index 3cc75f5..a22a356 100644
+index 586c9ad..efe00fc 100644
 --- a/imap/imapd.c
 +++ b/imap/imapd.c
-@@ -8022,7 +8022,7 @@ static void cmd_reconstruct(const char *tag, const char *name, int recursive)
+@@ -7636,7 +7636,7 @@ static void cmd_reconstruct(const char *tag, const char *name, int recursive)
              fclose(stdout);
              fclose(stderr);
  
@@ -10,4 +10,4 @@ index 3cc75f5..a22a356 100644
 +            ret = snprintf(buf, sizeof(buf), "%s/cyr_quota", SBIN_DIR);
              if(ret < 0 || ret >= (int) sizeof(buf)) {
                  /* in child, so fatailing won't disconnect our user */
-                 fatal("quota buffer not sufficiently big", EX_CONFIG);
+                 fatal("quota buffer not sufficiently big", EC_CONFIG);

patch-cyrus-testsuite-timeout

@@ -7,7 +7,7 @@ index 46dc358..ca37f22 100644
  
  /* Each test gets a maximum of 20 seconds. */
 -#define TEST_TIMEOUT_MS (20*1000)
-+#define TEST_TIMEOUT_MS (300*1000)
++#define TEST_TIMEOUT_MS (30*1000)
  
  static jmp_buf jbuf;
  static const char *code;

patch-vzic-proper-cflags

@@ -0,0 +1,25 @@
+diff --git a/tools/vzic/Makefile b/tools/vzic/Makefile
+index 8ae6afa..3882998 100644
+--- a/tools/vzic/Makefile
++++ b/tools/vzic/Makefile
+@@ -45,17 +45,17 @@ LIBICAL_LDADD = -lical
+ GLIB_CFLAGS = `pkg-config --cflags glib-2.0`
+ GLIB_LDADD = `pkg-config --libs glib-2.0`
+ 
+-CFLAGS = -g -I../.. -DOLSON_DIR=\"$(OLSON_DIR)\" -DPRODUCT_ID='"$(PRODUCT_ID)"' -DTZID_PREFIX='"$(TZID_PREFIX)"' $(GLIB_CFLAGS) $(LIBICAL_CFLAGS)
++CFLAGS += -I../.. -DOLSON_DIR=\"$(OLSON_DIR)\" -DPRODUCT_ID='"$(PRODUCT_ID)"' -DTZID_PREFIX='"$(TZID_PREFIX)"' $(GLIB_CFLAGS) $(LIBICAL_CFLAGS)
+ 
+ OBJECTS = vzic.o vzic-parse.o vzic-dump.o vzic-output.o
+ 
+ all: vzic
+ 
+ vzic: $(OBJECTS)
+-	$(CC) $(OBJECTS) $(GLIB_LDADD) -o vzic
++	$(CC) $(LDFLAGS) $(OBJECTS) $(GLIB_LDADD) -o vzic
+ 
+ test-vzic: test-vzic.o
+-	$(CC) test-vzic.o $(LIBICAL_LDADD) -o test-vzic
++	$(CC) $(LDFLAGS) test-vzic.o $(LIBICAL_LDADD) -o test-vzic
+ 
+ # Dependencies.
+ $(OBJECTS): vzic.h

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

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,3 @@
-SHA512 (cyrus-imapd-3.12.1.tar.gz) = ec2727eb0567ebf978ff4db9e9086bc01fdc2739b6e06cad73cf74f9af990c30a70130aa2474d822d8ca078e1012a60179101de90845bf40f7a9b47a8b5e4d92
-SHA512 (cyrus-imapd-3.12.1.tar.gz.sig) = a548769b7443a179cbfeabd20fce113d94b9ccbf134aab3c6aa5197edcad41f1a73f1d28ba8e2b80046457053949344385ca68b22489d47721d4760e42cd4dd4
+SHA512 (cassandane-testdata-20170523.tar.gz) = 705f5af6a31fe3b8d6e8027bbddbedb2f64d65997f8a06620ec07fcd30a95d98ac3f3fbef7af5080684ee21be1c5b8bcad2374b2749f0571099e780355a04420
+SHA512 (cassandane-c8040fd.tar.gz) = 58c0778be68628984f231aa1bb20abcb45a390f3660135e24bcdda163bfec2d7f5643aeb8d3f9deb03796f5b9b29a7e39515ffe375c1a2805c5ff3ec0f3c7d43
+SHA512 (cyrus-imapd-3.0.10.tar.gz) = 1ae153a8f181bbe020326bec2dc177b78ef3c442f94e24e89b7a719298d93701006596dd21fa1c3a40afd75f01162b03524cf793dd7438ec7192f9a13f7614d0

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 -