.cyrus-imapd.metadata

@@ -1,4 +1,2 @@
-616efd5bc85d00486a80c78a4d6cc12ebe07565f SOURCES/cassandane-693da61.tar.gz
+710d7c1c942240018d0f3693dbfec0a8299a0a5b SOURCES/cyrus-imapd-3.8.3.tar.gz
-fd08427d105d2306e95528eff407ab1723b31c69 SOURCES/cassandane-testdata-ca669d4b.tar.gz
+2cb01af57f5e1e2df8fd91aab28e94e7b566194b SOURCES/cyrus-imapd-3.8.3.tar.gz.sig
-8edfa3bca1f914ca30856e6f73d07e4de66173ed SOURCES/cyrus-imapd-3.4.1.tar.gz
-7eefe4d240d7033b1f460f85038f6607154e58f4 SOURCES/cyrus-manpages-3.2.6.tar.gz

.gitignore

@@ -1,4 +1,2 @@
-SOURCES/cassandane-693da61.tar.gz
+SOURCES/cyrus-imapd-3.8.3.tar.gz
-SOURCES/cassandane-testdata-ca669d4b.tar.gz
+SOURCES/cyrus-imapd-3.8.3.tar.gz.sig
-SOURCES/cyrus-imapd-3.4.1.tar.gz
-SOURCES/cyrus-manpages-3.2.6.tar.gz

SOURCES/cyrus-imapd-CVE-2021-33582.patch

@@ -1,170 +0,0 @@
-diff --git a/imap/http_dav.c b/imap/http_dav.c
-index d5f7c114a2..abc6da42ca 100644
---- a/imap/http_dav.c
-+++ b/imap/http_dav.c
-@@ -6108,7 +6108,7 @@ EXPORTED int meth_propfind(struct transaction_t *txn, void *params)
-     xmlDocPtr indoc = NULL, outdoc = NULL;
-     xmlNodePtr root, cur = NULL, props = NULL;
-     xmlNsPtr ns[NUM_NAMESPACE];
--    struct hash_table ns_table = { 0, NULL, NULL };
-+    struct hash_table ns_table = HASH_TABLE_INITIALIZER;
-     struct propfind_ctx fctx;
- 
-     memset(&fctx, 0, sizeof(struct propfind_ctx));
-@@ -8083,7 +8083,7 @@ int meth_report(struct transaction_t *txn, void *params)
-     xmlNodePtr inroot = NULL, outroot = NULL, cur, prop = NULL, props = NULL;
-     const struct report_type_t *report = NULL;
-     xmlNsPtr ns[NUM_NAMESPACE];
--    struct hash_table ns_table = { 0, NULL, NULL };
-+    struct hash_table ns_table = HASH_TABLE_INITIALIZER;
-     struct propfind_ctx fctx;
- 
-     memset(&fctx, 0, sizeof(struct propfind_ctx));
-diff --git a/imap/jmap_mail.c b/imap/jmap_mail.c
-index 7f2d9cb563..84845d273b 100644
---- a/imap/jmap_mail.c
-+++ b/imap/jmap_mail.c
-@@ -4334,7 +4334,7 @@ static void _email_querychanges_collapsed(jmap_req_t *req,
-     memset(&touched_ids, 0, sizeof(hash_table));
-     construct_hash_table(&touched_ids, mdcount + 1, 0);
- 
--    hashu64_table touched_cids = HASH_TABLE_INITIALIZER;
-+    hashu64_table touched_cids = HASHU64_TABLE_INITIALIZER;
-     memset(&touched_cids, 0, sizeof(hashu64_table));
-     construct_hashu64_table(&touched_cids, mdcount + 1, 0);
- 
-diff --git a/lib/hash.c b/lib/hash.c
-index 639b6997e6..593f1bf968 100644
---- a/lib/hash.c
-+++ b/lib/hash.c
-@@ -43,10 +43,11 @@ EXPORTED hash_table *construct_hash_table(hash_table *table, size_t size, int us
-       assert(table);
-       assert(size);
- 
--      table->size  = size;
-+      table->size = size;
-+      table->seed = rand(); /* might be zero, that's okay */
- 
-       /* Allocate the table -- different for using memory pools and not */
--      if(use_mpool) {
-+      if (use_mpool) {
-           /* Allocate an initial memory pool for 32 byte keys + the hash table
-            * + the buckets themselves */
-           table->pool =
-@@ -72,7 +73,7 @@ EXPORTED hash_table *construct_hash_table(hash_table *table, size_t size, int us
- 
- EXPORTED void *hash_insert(const char *key, void *data, hash_table *table)
- {
--      unsigned val = strhash(key) % table->size;
-+      unsigned val = strhash_seeded(table->seed, key) % table->size;
-       bucket *ptr, *newptr;
-       bucket **prev;
- 
-@@ -159,7 +160,7 @@ EXPORTED void *hash_lookup(const char *key, hash_table *table)
-       if (!table->size)
-           return NULL;
- 
--      val = strhash(key) % table->size;
-+      val = strhash_seeded(table->seed, key) % table->size;
- 
-       if (!(table->table)[val])
-             return NULL;
-@@ -183,7 +184,7 @@ EXPORTED void *hash_lookup(const char *key, hash_table *table)
-  * since it will leak memory until you get rid of the entire hash table */
- EXPORTED void *hash_del(const char *key, hash_table *table)
- {
--      unsigned val = strhash(key) % table->size;
-+      unsigned val = strhash_seeded(table->seed, key) % table->size;
-       bucket *ptr, *last = NULL;
- 
-       if (!(table->table)[val])
-diff --git a/lib/hash.h b/lib/hash.h
-index e49037d614..e476de77da 100644
---- a/lib/hash.h
-+++ b/lib/hash.h
-@@ -3,10 +3,11 @@
- #define HASH__H
- 
- #include <stddef.h>           /* For size_t     */
-+#include <stdint.h>
- #include "mpool.h"
- #include "strarray.h"
- 
--#define HASH_TABLE_INITIALIZER {0, NULL, NULL}
-+#define HASH_TABLE_INITIALIZER {0, 0, NULL, NULL}
- 
- /*
- ** A hash table consists of an array of these buckets.  Each bucket
-@@ -32,6 +33,7 @@ typedef struct bucket {
- 
- typedef struct hash_table {
-     size_t size;
-+    uint32_t seed;
-     bucket **table;
-     struct mpool *pool;
- } hash_table;
-diff --git a/lib/strhash.c b/lib/strhash.c
-index d7c1741d2a..1b3251db73 100644
---- a/lib/strhash.c
-+++ b/lib/strhash.c
-@@ -42,17 +42,32 @@
- 
- #include "config.h"
- 
--EXPORTED unsigned strhash(const char *string)
-+#include "lib/strhash.h"
-+
-+/* The well-known djb2 algorithm (e.g. http://www.cse.yorku.ca/~oz/hash.html),
-+ * with the addition of an optional seed to limit predictability.
-+ *
-+ * XXX return type 'unsigned' for back-compat to previous version, but
-+ * XXX ought to be 'uint32_t'
-+ */
-+EXPORTED unsigned strhash_seeded_djb2(uint32_t seed, const char *string)
- {
--      unsigned ret_val = 0;
--      int i;
-+    const unsigned char *ustr = (const unsigned char *) string;
-+    unsigned hash = 5381;
-+    int c;
- 
--      while (*string)
--      {
--            i = (int) *string;
--            ret_val ^= i;
--            ret_val <<= 1;
--            string ++;
--      }
--      return ret_val;
-+    if (seed) {
-+        /* treat the bytes of the seed as a prefix to the string */
-+        unsigned i;
-+        for (i = 0; i < sizeof seed; i++) {
-+            c = seed & 0xff;
-+            hash = ((hash << 5) + hash) ^ c;
-+            seed >>= 8;
-+        }
-+    }
-+
-+    while ((c = *ustr++))
-+        hash = ((hash << 5) + hash) ^ c;
-+
-+    return hash;
- }
-diff --git a/lib/strhash.h b/lib/strhash.h
-index 34533fdffa..27339bb288 100644
---- a/lib/strhash.h
-+++ b/lib/strhash.h
-@@ -41,7 +41,11 @@
-  */
- 
- #ifndef _STRHASH_H_
-+#include <stdint.h>
- 
--unsigned strhash(const char *string);
-+unsigned strhash_seeded_djb2(uint32_t seed, const char *string);
-+
-+#define strhash(in)             strhash_seeded_djb2((0),  (in))
-+#define strhash_seeded(sd, in)  strhash_seeded_djb2((sd), (in))
- 
- #endif /* _STRHASH_H_ */

SOURCES/cyrus-imapd-squatter-assert-crash.patch

@@ -1,20 +0,0 @@
-diff --git a/imap/squatter.c b/imap/squatter.c
-index 4419379..d00f003 100644
---- a/imap/squatter.c
-+++ b/imap/squatter.c
-@@ -408,8 +408,13 @@ static void expand_mboxnames(strarray_t *sa, int nmboxnames,
-         else {
-             /* Translate any separators in mailboxname */
-             char *intname = mboxname_from_external(mboxnames[i], &squat_namespace, NULL);
--            int flags = recursive_flag ? 0 : MBOXTREE_SKIP_CHILDREN;
--            mboxlist_mboxtree(intname, addmbox, sa, flags);
-+            if (!intname || *intname == '\0') {
-+                fprintf(stderr, "Mailbox %s: %s\n",
-+                        mboxnames[i], error_message(IMAP_MAILBOX_BADNAME));
-+            } else {
-+                int flags = recursive_flag ? 0 : MBOXTREE_SKIP_CHILDREN;
-+                mboxlist_mboxtree(intname, addmbox, sa, flags);
-+            }
-             free(intname);
-         }
- 

SOURCES/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

SOURCES/ellie-pub.key

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

SOURCES/fix-broken-delivery-to-shared-mailboxes.patch

@@ -1,25 +0,0 @@
-commit a8ccdaf109b85cedfd609678d95f7b7d5fdb91f5
-Author: ellie timoney <ellie@fastmail.com>
-Date:   Mon Jun 7 12:00:27 2021 +1000
-
-    lmtpd: shared mailboxes don't have conversations to lock
-    
-    Fixes #3488
-
-diff --git a/imap/lmtpd.c b/imap/lmtpd.c
-index 498bb8765..dc9ca21bc 100644
---- a/imap/lmtpd.c
-+++ b/imap/lmtpd.c
-@@ -843,8 +843,10 @@ int deliver(message_data_t *msgdata, char *authuser,
-             // lock conversations for the duration of delivery, so nothing else can read
-             // the state of any mailbox while the delivery is half done
-             struct conversations_state *state = NULL;
--            r = conversations_open_user(mbname_userid(mbname), 0/*shared*/, &state);
--            if (r) goto setstatus;
-+            if (mbname_userid(mbname)) {
-+                r = conversations_open_user(mbname_userid(mbname), 0/*shared*/, &state);
-+                if (r) goto setstatus;
-+            }
- 
-             /* local mailbox */
-             mydata.cur_rcpt = n;

SOURCES/patch-cassandane-fix-annotator

@@ -1,7 +1,7 @@
-diff --git a/utils/annotator.pl b/utils/annotator.pl
+diff --git a/cassandane/utils/annotator.pl b/cassandane/utils/annotator.pl
 index 265c73f..8af3d58 100755
---- a/utils/annotator.pl
+--- a/cassandane/utils/annotator.pl
-+++ b/utils/annotator.pl
++++ b/cassandane/utils/annotator.pl
 @@ -140,6 +140,8 @@ GetOptions(
  xlog "annotator $$ starting";
  Cassandane::AnnotatorDaemon->run(

SOURCES/patch-cassandane-no-syslog

@@ -1,7 +1,7 @@
-diff --git a/Cassandane/Util/Log.pm b/Cassandane/Util/Log.pm
+diff --git a/cassandane/Cassandane/Util/Log.pm b/cassandane/Cassandane/Util/Log.pm
-index 17d2cc7..11b747f 100644
+index a44005c..5bb5710 100644
---- a/Cassandane/Util/Log.pm
+--- a/cassandane/Cassandane/Util/Log.pm
-+++ b/Cassandane/Util/Log.pm
++++ b/cassandane/Cassandane/Util/Log.pm
 @@ -51,9 +51,6 @@ our @EXPORT = qw(
  
  my $verbose = 0;
@@ -12,30 +12,46 @@ index 17d2cc7..11b747f 100644
  sub xlog
  {
      my $id;
-@@ -70,7 +67,6 @@ sub xlog
+@@ -87,7 +84,6 @@ sub xlog
-     $msg .= "($id) " if $id;
+     else {
-     $msg .= join(' ', @_);
          print STDERR "$msg\n";
+     }
 -    syslog(LOG_ERR, "$msg");
  }
  
  sub set_verbose
-diff --git a/Cassandane/Instance.pm b/Cassandane/Instance.pm
+diff --git a/cassandane/utils/syslog.c b/cassandane/utils/syslog.c
-index bdfa44f..e852599 100644
+index 20d3763..0238d82 100644
---- a/Cassandane/Instance.pm
+--- a/cassandane/utils/syslog.c
-+++ b/Cassandane/Instance.pm
++++ b/cassandane/utils/syslog.c
-@@ -2030,12 +2030,8 @@ sub setup_syslog_replacement
+@@ -116,14 +116,28 @@ EXPORTED void syslog(int priority, const char *format, ...)
- {
+     va_start(ap, format);
-     my ($self) = @_;
+     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;
  
--    if (not(-e 'utils/syslog.so') || not(-e 'utils/syslog_probe')) {
+     va_start(ap, format);
--        xlog "utils/syslog.so not found (do you need to run 'make'?)";
+-    real_vsyslog(priority, format, ap);
--        xlog "tests will not examine syslog output";
++    fake_vsyslog(priority, format, ap);
--        $self->{have_syslog_replacement} = 0;
+     va_end(ap);
--        return;
+ }
--    }
-+    $self->{have_syslog_replacement} = 0;
-+    return;
  
-     $self->{syslog_fname} = "$self->{basedir}/conf/log/syslog";
+ EXPORTED void vsyslog(int priority, const char *format, va_list ap)
-     $self->{have_syslog_replacement} = 1;
+ {
+     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);
+ }

SOURCES/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 ))

SOURCES/patch-cyrus-default-configs

@@ -44,7 +44,7 @@ index 95b54e9..3935b77 100644
 -# 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 rss webdav
++httpmodules: caldav carddav domainkey freebusy ischedule jmap rss webdav
  
  # If enabled, the partitions will also be hashed, in addition to the
  # hashing done on configuration directories. This is recommended if one

SOURCES/patch-cyrus-perl-linking

@@ -7,7 +7,7 @@ index 7180b98..d589ebe 100644
      '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"],
++    'LIBS'	=> ["$LIB_SASL @SSL_LIBS@ @LIB_UUID@ @LIB_REGEX@ @ZLIB@ @SQLITE_LIBADD@ @MYSQL_LIBADD@ @PGSQL_LIBADD@ -lpcre2-posix"],
      '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@",
@@ -20,7 +20,7 @@ index 71416cc..f76cda6 100644
      '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"],
++    'LIBS'	=> [ "$LIB_SASL @SSL_LIBS@ @LIB_UUID@ @ZLIB@ @GCOV_LIBS@ @LIBCAP_LIBS@ -lpcre2-posix"],
      '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],

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

@@ -0,0 +1,13 @@
+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)
+ {

SOURCES/patch-cyrus-rename-imtest

@@ -0,0 +1,40 @@
+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";

SOURCES/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 (30*1000)
++#define TEST_TIMEOUT_MS (300*1000)
  
  static jmp_buf jbuf;
  static const char *code;