Kolab Groupware OBS

cyrus-imapd.spec Changed

@@ -18,9 +18,9 @@
 %global _cyrusgroup mail
 %global _cyrexecdir %{_exec_prefix}/lib/%{name}
 
-%global tag_version 2.5.11
-%global revision    41
-%global git_hash    gd53406f3f
+%global tag_version 2.5.12.25
+##%global revision    41
+##%global git_hash    gd53406f3f
 
 ##
 ## Options
@@ -37,12 +37,12 @@
 Name:               cyrus-imapd
 Summary:            A high-performance mail server with IMAP, POP3, NNTP and SIEVE support
 Version:            %{tag_version}
-Release:            0.%{revision}.%{git_hash}%{?dist}
+Release:            1%{?dist}
 License:            BSD
 Group:              System Environment/Daemons
 URL:                http://www.cyrusimap.org
 
-Source0:            ftp://ftp.andrew.cmu.edu/pub/cyrus/%{name}-%{tag_version}-%{revision}-%{git_hash}.tar.gz
+Source0:            ftp://ftp.andrew.cmu.edu/pub/cyrus/%{name}-%{tag_version}.tar.gz
 Source1:            cyrus-imapd.imap-2.3.x-conf
 Source2:            cyrus-imapd.cvt_cyrusdb_all
 Source3:            cyrus-imapd.magic
@@ -756,6 +756,9 @@
 %{_libdir}/*.la
 
 %changelog
+* Wed Jan  2 2019 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 2.5.12.25-1
+- Rebase on to upstream 2.5.12
+
 * Tue Oct 17 2017 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 2.5.11-4
 - Fix potentially non-readable, non-writeable /dev/null

cyrus-imapd-2.5.11-41-gd53406f3f.tar.gz/xversion Deleted

cyrus-imapd-2.5.11-41-gd53406f3f.tar.gz/xversion.h Deleted

cyrus-imapd-2.5.11-41-gd53406f3f.tar.gz/.gitignore -> cyrus-imapd-2.5.12.25.tar.gz/.gitignore Changed

cyrus-imapd-2.5.11-41-gd53406f3f.tar.gz/Makefile.am -> cyrus-imapd-2.5.12.25.tar.gz/Makefile.am Changed

cyrus-imapd-2.5.11-41-gd53406f3f.tar.gz/docsrc/conf.py -> cyrus-imapd-2.5.12.25.tar.gz/docsrc/conf.py Changed

cyrus-imapd-2.5.11-41-gd53406f3f.tar.gz/docsrc/imap/admin/configs/cyrus.conf.rst -> cyrus-imapd-2.5.12.25.tar.gz/docsrc/imap/admin/configs/cyrus.conf.rst Changed

cyrus-imapd-2.5.12.25.tar.gz/docsrc/imap/release-notes/2.5/x/2.5.12.rst Added

@@ -0,0 +1,73 @@
+:tocdepth: 3
+
+===============================
+Cyrus IMAP 2.5.12 Release Notes
+===============================
+
+.. IMPORTANT::
+
+    This is a bug-fix release in the `stable 2.5 series <http://www.cyrusimap.org/stable>`_.
+
+    Refer to the Cyrus IMAP 2.5.0 Release Notes for important information
+    about the 2.5 series, including upgrading instructions.
+
+Download via HTTPS:
+
+    * https://github.com/cyrusimap/cyrus-imapd/releases/download/cyrus-imapd-2.5.12/cyrus-imapd-2.5.12.tar.gz
+    * https://github.com/cyrusimap/cyrus-imapd/releases/download/cyrus-imapd-2.5.12/cyrus-imapd-2.5.12.tar.gz.sig
+
+.. _relnotes-2.5.12-changes:
+
+Changes Since 2.5.11
+====================
+
+Release changes
+---------------
+
+We’re trialing using the Github Releases feature. If you have trouble
+downloading this release, please report this to the mailing lists. Thanks!
+
+Dependency changes
+------------------
+
+ClamAV now configures and builds correctly, using pkg-config for detection.
+You can use the ``--without-clamav`` option to configure if you have ClamAV
+installed but do *not* want to build Cyrus with support for it.  The old
+``--with-clamav=DIR`` variant no longer works (but it also didn't work before!)
+
+Cyrus should now build cleanly with LibreSSL 2.7 (thanks Bernard Spil).
+
+Other changes
+-------------
+
+* Cyrus release version is now preserved across autoreconf runs.  This means
+  it is now safe to run autoreconf on a release tarball source tree.
+
+Bug fixes
+---------
+
+* Fixed: cyr_virusscan now integrates with event notifications properly
+* Fixed: mailbox expunge event notifications no longer cause a crash
+* Fixed :issue:`2378`: ACLs containing spaces no longer break mailboxes.db
+* Fixed :issue:`2253`: master now rejects unix domain listen paths that are too
+  long
+* Fixed: smilint warnings for CYRUS-MASTER.mib fixed (thanks Fabrice Bacchella)
+* Fixed :issue:`2177`: backend connections no longer ignore STARTTLS failures
+  (thanks Wolfgang Breyha)
+* Fixed :issue:`2222`: dav_reconstruct no longer crashes on expunged entries
+* Fixed :issue:`2221`: dav_reconstruct no longer crashes given bad user id
+  (thanks Wolfgang Breyha)
+* Fixed: tls_prune memory leak
+* Fixed: tls_prune doesn't fail when tls_sessions.db is missing
+* Fixed :issue:`2199`: recovery from mupdate failure now in correct order
+  (thanks Michael Menge)
+* Fixed: backend connections no longer crash if no banner found
+* Fixed: backend connections no longer return success on certain types of failure
+* Fixed :issue:`2185`: squatter no longer tries to index non-IMAP mailboxes
+  (thanks Wolfgang Breyha)
+* Fixed: special-use proxying in murder (thanks Wolfgang Breyha)
+* Fixed :issue:`1090`: send OK NIL to subsequent ID commands
+* Fixed :issue:`1434`: auth_pts will now error when given a too-long socket file name
+* Fixed :issue:`1964`: correctly detect when librt is needed
+* Fixed :issue:`1967`: tell EXISTS count earlier when needed
+* Fixed: memory leak in httpd DAV support

cyrus-imapd-2.5.11-41-gd53406f3f.tar.gz/imap/backend.c -> cyrus-imapd-2.5.12.25.tar.gz/imap/backend.c Changed

cyrus-imapd-2.5.11-41-gd53406f3f.tar.gz/imap/caldav_db.c -> cyrus-imapd-2.5.12.25.tar.gz/imap/caldav_db.c Changed

cyrus-imapd-2.5.12.25.tar.gz/imap/cyr_buildinfo.c Added

@@ -0,0 +1,272 @@
+/* cyr_buildinfo.c -- report cyrus configured components
+ *
+ * Copyright (c) 2018 Carnegie Mellon University.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For permission or any legal
+ *    details, please contact
+ *      Carnegie Mellon University
+ *      Center for Technology Transfer and Enterprise Creation
+ *      4615 Forbes Avenue
+ *      Suite 302
+ *      Pittsburgh, PA  15213
+ *      (412) 268-7393, fax: (412) 268-7395
+ *      innovation@andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by Computing Services
+ *     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <config.h>
+
+#include <stdio.h>
+
+static int have_sections = 0;
+static int have_keys = 0;
+
+static void start_section(const char *name)
+{
+    if (have_sections)
+	putchar(',');
+    printf("\n  \"%s\": {", name);
+    have_sections++;
+}
+
+static void end_section(void)
+{
+    have_keys = 0;
+    printf("\n  }");
+}
+
+static void key_true(const char *key)
+{
+    if (have_keys)
+	putchar(',');
+    printf("\n    \"%s\": true", key);
+    have_keys++;
+}
+
+static void key_false(const char *key)
+{
+    if (have_keys)
+	putchar(',');
+    printf("\n    \"%s\": false", key);
+    have_keys++;
+}
+
+int main (int argc __attribute__((unused)),
+	  char **argv __attribute__((unused)))
+{
+    putchar('{');
+
+    start_section("component");
+#ifdef ENABLE_MBOXEVENT
+    key_true("event_notification");
+#else
+    key_false("event_notification");
+#endif
+#ifdef HAVE_GSSAPI_H
+    key_true("gssapi");
+#else
+    key_false("gssapi");
+#endif
+#ifdef USE_AUTOCREATE
+    key_true("autocreate");
+#else
+    key_false("autocreate");
+#endif
+#ifdef USE_IDLED
+    key_true("idled");
+#else
+    key_false("idled");
+#endif
+#ifdef USE_HTTPD
+    key_true("httpd");
+#else
+    key_false("httpd");
+#endif
+#ifdef HAVE_KRB
+    key_true("kerberos_v4");
+#else
+    key_false("kerberos_v4");
+#endif
+#ifdef USE_MURDER
+    key_true("murder");
+#else
+    key_false("murder");
+#endif
+#ifdef USE_NNTPD
+    key_true("nntpd");
+#else
+    key_false("nntpd");
+#endif
+#ifdef USE_REPLICATION
+    key_true("replication");
+#else
+    key_false("replication");
+#endif
+#ifdef USE_SIEVE
+    key_true("sieve");
+#else
+    key_false("sieve");
+#endif
+#ifdef USE_CALALARMD
+    key_true("calalarmd");
+#else
+    key_false("calalarmd");
+#endif
+#ifdef WITH_JMAP
+    key_true("jmap");
+#else
+    key_false("jmap");
+#endif
+#ifdef ENABLE_OBJECTSTORE
+    key_true("objectstore");
+#else
+    key_false("objectstore");
+#endif
+#ifdef ENABLE_BACKUP
+    key_true("backup");
+#else
+    key_false("backup");
+#endif
+#if defined(HAVE_UCDSNMP) || defined(HAVE_NETSNMP)
+    key_true("snmp");
+#else
+    key_false("snmp");
+#endif
+    end_section();
+
+    start_section("dependency");
+#ifdef HAVE_LDAP
+    key_true("ldap");
+#else
+    key_false("ldap");
+#endif
+#ifdef HAVE_SSL
+    key_true("openssl");
+#else
+    key_false("openssl");
+#endif
+#ifdef HAVE_ZLIB
+    key_true("zlib");
+#else
+    key_false("zlib");
+#endif
+#if defined(ENABLE_REGEX) && defined(HAVE_PCREPOSIX_H)
+    key_true("pcre");
+#else
+    key_false("pcre");
+#endif
+#ifdef HAVE_CLAMAV
+    key_true("clamav");
+#else
+    key_false("clamav");
+#endif
+#ifdef HAVE_UCDSNMP
+    key_true("ucdsnmp");
+#else
+    key_false("ucdsnmp");
+#endif
+#ifdef HAVE_NETSNMP
+    key_true("netsnmp");
+#else
+    key_false("netsnmp");
+#endif
+#ifdef WITH_OPENIO

cyrus-imapd-2.5.11-41-gd53406f3f.tar.gz/imap/cyr_virusscan.c -> cyrus-imapd-2.5.12.25.tar.gz/imap/cyr_virusscan.c Changed

@@ -91,10 +91,13 @@
 
 /* globals for callback functions */
 int disinfect = 0;
-int notify = 0;
+int email_notification = 0;
 struct infected_mbox *public = NULL;
 struct infected_mbox *user = NULL;
 
+/* current namespace */
+static struct namespace virusscan_namespace;
+
 int verbose = 1;
 
 /* abstract definition of a virus scan engine */
@@ -228,6 +231,7 @@
 int main (int argc, char *argv[]) {
     int option;		/* getopt() returns an int */
     char *alt_config = NULL;
+    int r;
 
     if ((geteuid()) == 0 && (become_cyrus(/*is_master*/0) != 0)) {
 	fatal("must run as the Cyrus user", EC_USAGE);
@@ -244,7 +248,7 @@
 	    break;
 
 	case 'n':
-	    notify = 1;
+	    email_notification = 1;
 	    break;
 
 	case 'h':
@@ -274,6 +278,15 @@
     /* setup for mailbox event notifications */
     mboxevent_init();
 
+    /* Set namespace -- force standard (internal) */
+    if ((r = mboxname_init_namespace(&virusscan_namespace, 1)) != 0) {
+	syslog(LOG_ERR, "%s", error_message(r));
+	fatal(error_message(r), EC_CONFIG);
+    }
+
+    mboxevent_setnamespace(&virusscan_namespace);
+
+
     if (optind == argc) { /* do the whole partition */
         mboxlist_findall(NULL, "*", 1, 0, 0, scan_me, NULL);
     } else {
@@ -282,7 +295,7 @@
 	}
     }
 
-    if (notify) append_notifications();
+    if (email_notification) append_notifications();
 
     sync_log_done();
 
@@ -314,7 +327,7 @@
 	    int maycreate __attribute__((unused)),
 	    void *rock __attribute__((unused)))
 {
-    struct mailbox *mailbox;
+    struct mailbox *mailbox = NULL;
     int r;
     struct infected_mbox *i_mbox = NULL;
 
@@ -328,7 +341,7 @@
 	return 0;
     }
 
-    if (notify) {
+    if (email_notification) {
         const char *owner = mboxname_to_userid(name);
         if (owner) {
             if (!strcmp(owner, user->owner)) {
@@ -395,7 +408,7 @@
             printf("Virus detected in message %u: %s\n", record->uid, virname);
 	}
 	if (disinfect) {
-	    if (notify && i_mbox) {
+	    if (email_notification && i_mbox) {
                 create_digest(i_mbox, mailbox, record, virname);
 	    }
 	}

cyrus-imapd-2.5.11-41-gd53406f3f.tar.gz/imap/dlist.c -> cyrus-imapd-2.5.12.25.tar.gz/imap/dlist.c Changed

cyrus-imapd-2.5.11-41-gd53406f3f.tar.gz/imap/imapd.c -> cyrus-imapd-2.5.12.25.tar.gz/imap/imapd.c Changed

cyrus-imapd-2.5.11-41-gd53406f3f.tar.gz/imap/mailbox.c -> cyrus-imapd-2.5.12.25.tar.gz/imap/mailbox.c Changed

cyrus-imapd-2.5.11-41-gd53406f3f.tar.gz/imap/mboxlist.c -> cyrus-imapd-2.5.12.25.tar.gz/imap/mboxlist.c Changed

cyrus-imapd-2.5.11-41-gd53406f3f.tar.gz/imap/squatter.c -> cyrus-imapd-2.5.12.25.tar.gz/imap/squatter.c Changed

cyrus-imapd-2.5.11-41-gd53406f3f.tar.gz/imap/tls.c -> cyrus-imapd-2.5.12.25.tar.gz/imap/tls.c Changed

@@ -222,7 +222,7 @@
 }
 #endif
 
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
 /* replacements for new 1.1 API accessors */
 /* XXX probably put these somewhere central */
 static int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g)
@@ -1373,12 +1373,7 @@
     }
 
     ret = cyrusdb_open(DB, fname, 0, &sessdb);
-    if (ret != CYRUSDB_OK) {
-	syslog(LOG_ERR, "DBERROR: opening %s: %s",
-	       fname, cyrusdb_strerror(ret));
-	return 1;
-    }
-    else {
+    if (ret == CYRUSDB_OK) {
 	/* check each session in our database */
 	sess_dbopen = 1;
 	prock.count = prock.deletions = 0;
@@ -1390,10 +1385,19 @@
 	syslog(LOG_NOTICE, "tls_prune: purged %d out of %d entries",
 	       prock.deletions, prock.count);
     }
+    else if (ret == CYRUSDB_NOTFOUND) {
+	syslog(LOG_NOTICE, "tls_prune: %s not found, nothing to do", fname);
+	ret = 0;
+    }
+    else {
+	syslog(LOG_ERR, "DBERROR: opening %s: %s",
+	       fname, cyrusdb_strerror(ret));
+    }
 
-    free(tofree);
+    if (tofree)
+	free(tofree);
 
-    return 0;
+    return ret;
 }
 
 /* fill string buffer with info about tls connection */

cyrus-imapd-2.5.11-41-gd53406f3f.tar.gz/master/CYRUS-MASTER.mib -> cyrus-imapd-2.5.12.25.tar.gz/master/CYRUS-MASTER.mib Changed

@@ -1,7 +1,7 @@
 CYRUS-MASTER-MIB DEFINITIONS ::= BEGIN
 
 IMPORTS
-    MODULE-IDENTITY, OBJECT-TYPE, Counter32
+    MODULE-IDENTITY, OBJECT-TYPE, Counter32, TimeTicks, Gauge32
         FROM SNMPv2-SMI
     DisplayString
         FROM SNMPv2-TC
@@ -9,20 +9,22 @@
         FROM CMU-MIB;
 
 cyrusMasterMIB MODULE-IDENTITY
-    LAST-UPDATED "1704070437Z"          -- 2017 April 7
+    LAST-UPDATED "201801090840Z"        -- 2018 January 9
     ORGANIZATION "CMU Project Cyrus"
     CONTACT-INFO
                 "       WWW: https://github.com/cyrusimap/cyrus-imapd/
 
-		        Project Cyrus
+                        Project Cyrus
                         Computing Services
                         Carnegie Mellon University
                         Pittsburgh PA. 15213
                 "
     DESCRIPTION "A simple MIB for application status of the Cyrus
-	         master process.
-		"
-	::= { cmuCyrus 1 }
+                 master process.
+                "
+    REVISION    "201801090840Z"
+    DESCRIPTION "Running smilint on the module"
+        ::= { cmuCyrus 1 }
            -- cmuCyrus = .1.3.6.1.4.1.3.6
            -- cyrusMasterMIB = .1.3.6.1.4.1.3.6.1
 
@@ -32,161 +34,161 @@
 
   -- version information
 
-   cyrusMasterInfoDescr  OBJECT-TYPE 
+   cyrusMasterInfoDescr  OBJECT-TYPE
 
-                         SYNTAX     DisplayString (SIZE (0..255)) 
+                         SYNTAX     DisplayString (SIZE (0..255))
 
-                         ACCESS     read-only 
+                         MAX-ACCESS read-only
 
-                         STATUS     mandatory 
+                         STATUS     current
 
-                         DESCRIPTION   "A general textual description 
+                         DESCRIPTION   "A general textual description
 
-                                        of the Cyrus server." 
+                                        of the Cyrus server."
 
                          ::= { cyrusMasterInfo 1 }
 
-   cyrusMasterInfoVers   OBJECT-TYPE 
+   cyrusMasterInfoVers   OBJECT-TYPE
 
-                         SYNTAX     DisplayString (SIZE (0..255)) 
+                         SYNTAX     DisplayString (SIZE (0..255))
 
-                         ACCESS     read-only 
+                         MAX-ACCESS read-only
 
-                         STATUS     mandatory 
+                         STATUS     current
 
                          DESCRIPTION  "The version of the Cyrus server."
 
-                         ::= { cyrusMasterInfo 2 } 
+                         ::= { cyrusMasterInfo 2 }
 
    cyrusMasterInfoUptime OBJECT-TYPE
 
-                         SYNTAX	    TimeTicks
+                         SYNTAX     TimeTicks
 
-			 ACCESS	    read-only
-			 
-			 STATUS	    current
+                         MAX-ACCESS read-only
 
-			 DESCRIPTION "The amount of time since the master
-			              process was last started."
+                         STATUS     current
 
-			 ::= { cyrusMasterInfo 3 }
+                         DESCRIPTION "The amount of time since the master
+                                      process was last started."
+
+                         ::= { cyrusMasterInfo 3 }
 
    -- service table
 
-   serviceTable          OBJECT-TYPE 
+   serviceTable          OBJECT-TYPE
 
-                         SYNTAX     SEQUENCE OF serviceEntry
+                         SYNTAX     SEQUENCE OF ServiceEntry
 
-                         ACCESS     not-accessible 
+                         MAX-ACCESS not-accessible
 
-                         STATUS     mandatory 
+                         STATUS     current
 
                          ::= { cyrusMasterMIB 2 }
 
 
-   serviceEntry          OBJECT-TYPE 
+   serviceEntry          OBJECT-TYPE
 
-                         SYNTAX     ServiceEntry 
+                         SYNTAX     ServiceEntry
 
-                         ACCESS     not-accessible 
+                         MAX-ACCESS not-accessible
 
-                         STATUS     mandatory 
+                         STATUS     current
 
-                         INDEX     { serviceId } 
+                         INDEX     { serviceId }
 
-                         ::= { serviceTable 1 } 
+                         ::= { serviceTable 1 }
 
 
-   ServiceEntry      ::= SEQUENCE { 
+   ServiceEntry      ::= SEQUENCE {
 
-                         serviceForks		Counter32,
+                         serviceForks           Counter32,
 
-			 serviceActive		Gauge32,
+                         serviceActive          Gauge32,
 
-			 serviceName		DisplayString (SIZE (0..255)),
+                         serviceName            DisplayString (SIZE (0..255)),
 
-			 serviceId		INTEGER,
+                         serviceId              INTEGER,
 
                          serviceConnections     Counter32
 
-                         } 		   
+                         }
 
       -- forks since startup
-      serviceForks       OBJECT-TYPE 
+      serviceForks       OBJECT-TYPE
+
+                         SYNTAX     Counter32
 
-                         SYNTAX     Counter32 
+                         MAX-ACCESS read-only
 
-                         ACCESS     read-only 
+                         STATUS     current
 
-                         STATUS     mandatory 
+                         DESCRIPTION  "The total number of forks for this
+                                       service since initialization."
 
-                         DESCRIPTION  "The total number of forks for this 
-			               service since initialization." 
+                         ::= { serviceEntry 1 }
 
-                         ::= { serviceEntry 1 } 
 
-             
 
       -- active children
-      serviceActive      OBJECT-TYPE 
+      serviceActive      OBJECT-TYPE
 
-                         SYNTAX     Gauge32 
+                         SYNTAX     Gauge32
 
-                         ACCESS     read-only 
+                         MAX-ACCESS read-only
 
-                         STATUS     mandatory 
+                         STATUS     current
 
-                         DESCRIPTION  "The total number of children currently 
+                         DESCRIPTION  "The total number of children currently
 
-                                       active." 
+                                       active."
 
-                         ::= { serviceEntry 2 } 
+                         ::= { serviceEntry 2 }

cyrus-imapd-2.5.11-41-gd53406f3f.tar.gz/master/master.c -> cyrus-imapd-2.5.12.25.tar.gz/master/master.c Changed

cyrus-imapd.dsc Changed

debian.changelog Changed

Changes of Revision 42