Hello community,

here is the log from the commit of package cyrus-imapd for openSUSE:Factory 
checked in at 2019-01-25 22:45:20
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cyrus-imapd (Old)
 and      /work/SRC/openSUSE:Factory/.cyrus-imapd.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "cyrus-imapd"

Fri Jan 25 22:45:20 2019 rev:73 rq:668460 version:2.4.20

Changes:
--------
--- /work/SRC/openSUSE:Factory/cyrus-imapd/cyrus-imapd.changes  2019-01-21 
10:57:53.663467161 +0100
+++ /work/SRC/openSUSE:Factory/.cyrus-imapd.new.28833/cyrus-imapd.changes       
2019-01-25 22:45:20.619081868 +0100
@@ -1,0 +2,9 @@
+Wed Jan 23 12:22:35 UTC 2019 - lie...@rz.uni-mannheim.de
+
+- Update to 2.4.20
+  * Fixed: lmtpd crash
+  * Fixed: auth_pts will now error if its configured socket path is
+    too long for its buffer
+- Removed cyrus-imapd-2.4.19-lmtpd_crash.patch
+
+-------------------------------------------------------------------

Old:
----
  cyrus-imapd-2.4.19-lmtpd_crash.patch
  cyrus-imapd-2.4.19.tar.gz
  cyrus-imapd-2.4.19.tar.gz.sig

New:
----
  cyrus-imapd-2.4.20.tar.gz
  cyrus-imapd-2.4.20.tar.gz.sig

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ cyrus-imapd.spec ++++++
--- /var/tmp/diff_new_pack.x7j8bq/_old  2019-01-25 22:45:21.563080704 +0100
+++ /var/tmp/diff_new_pack.x7j8bq/_new  2019-01-25 22:45:21.563080704 +0100
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via https://bugs.opensuse.org/
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
 
@@ -39,7 +39,7 @@
 %global _servicename    cyrus
 %endif
 Name:           cyrus-imapd
-Version:        2.4.19
+Version:        2.4.20
 Release:        0
 Summary:        The Cyrus IMAP and POP Mail Server
 License:        BSD-3-Clause
@@ -69,8 +69,6 @@
 Patch28:        cyrus-imapd-2.4.19-implicit_definitions.patch
 # PATCH-FIX-UPSTREAM -- Outlook 2013-compatible XLIST behaviour
 Patch31:        cyrus-imapd-2.4.18-D19-Outlook_2013_XLIST.patch
-# PATCH-FIX-UPSTREAM -- lmtpd: fix uninitialised variable crash
-Patch32:        cyrus-imapd-2.4.19-lmtpd_crash.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  bison
@@ -221,7 +219,6 @@
 %patch27 -p1
 %patch28 -p1
 %patch31 -p1
-%patch32 -p1
 
 # remove executable bit from docs
 find doc -type f -name '*.html' -exec chmod -x {} +

++++++ cyrus-imapd-2.4.19.tar.gz -> cyrus-imapd-2.4.20.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cyrus-imapd-2.4.19/Makefile.in 
new/cyrus-imapd-2.4.20/Makefile.in
--- old/cyrus-imapd-2.4.19/Makefile.in  2017-05-15 07:43:30.000000000 +0200
+++ new/cyrus-imapd-2.4.20/Makefile.in  2017-08-18 02:29:14.000000000 +0200
@@ -64,7 +64,7 @@
 COMPILE_ET = @COMPILE_ET@
 
 PACKAGE = cyrus-imapd
-VERSION = 2.4.19
+VERSION = 2.4.20
 GIT_VERSION = $(VERSION).git$(shell date +'%Y%m%d%H%M')
 
 all:: xversion
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cyrus-imapd-2.4.19/autom4te.cache/requests 
new/cyrus-imapd-2.4.20/autom4te.cache/requests
--- old/cyrus-imapd-2.4.19/autom4te.cache/requests      2017-05-15 
07:53:39.000000000 +0200
+++ new/cyrus-imapd-2.4.20/autom4te.cache/requests      2017-08-18 
02:57:00.000000000 +0200
@@ -31,79 +31,79 @@
                         'configure.in'
                       ],
                       {
-                        'IPv6_CHECK_FUNC' => 1,
-                        'CMU_TEST_LIBPATH' => 1,
-                        'CMU_C_FPIC' => 1,
+                        'CMU_KRB_INC_WHERE' => 1,
+                        'AC_CONFIG_MACRO_DIR_TRACE' => 1,
                         'CMU_ADD_LIBPATH_TO' => 1,
-                        'CMU_SASL2' => 1,
-                        '_AM_AUTOCONF_VERSION' => 1,
-                        'CMU_AFS_LIB_WHERE1' => 1,
-                        'CMU_FIND_LIB_SUBDIR' => 1,
-                        'CYRUS_BERKELEY_DB_CHK' => 1,
-                        'CMU_SASL2_REQUIRE_VER' => 1,
                         'include' => 1,
-                        'm4_pattern_allow' => 1,
-                        'CMU_KRB_LIB_WHERE1' => 1,
-                        'AC_DEFUN' => 1,
+                        '_AM_AUTOCONF_VERSION' => 1,
+                        'CMU_AFS_WHERE' => 1,
+                        'CMU_KRB_SET_KEY_PROTO' => 1,
                         'CMU_SOCKETS' => 1,
-                        'CYRUS_BERKELEY_DB_CHK_LIB' => 1,
-                        'CMU_LIBSSL_LIB_WHERE' => 1,
+                        'CYRUS_SQLITE_CHK_LIB' => 1,
                         'CMU_UCDSNMP' => 1,
-                        'CMU_C___ATTRIBUTE__' => 1,
-                        'CYRUS_SQLITE_CHK' => 1,
+                        'CMU_KRB4' => 1,
                         'AU_DEFUN' => 1,
-                        'CMU_HAVE_ZLIB' => 1,
-                        'CMU_AFS_INC_WHERE1' => 1,
-                        'CYRUS_PGSQL_OPTS' => 1,
-                        'CYRUS_SQLITE_OPTS' => 1,
-                        'AC_DEFUN_ONCE' => 1,
-                        'CMU_KRB4_32_DEFN' => 1,
-                        'SASL_SET_GSSAPI_LIBS' => 1,
-                        'CMU_ADD_LIBPATH' => 1,
-                        'CMU_TEST_INCPATH' => 1,
-                        'CMU_LIBWRAP' => 1,
-                        'CMU_DB_INC_WHERE1' => 1,
-                        'CMU_AFS' => 1,
+                        'CMU_AFS_LIB_WHERE1' => 1,
+                        'CMU_C_FPIC' => 1,
                         'CMU_DB_LIB_WHERE' => 1,
-                        'IPv6_CHECK_SOCKLEN_T' => 1,
-                        'm4_include' => 1,
-                        'IPv6_CHECK_SS_FAMILY' => 1,
-                        'CYRUS_BERKELEY_DB_OPTS' => 1,
-                        'AC_CONFIG_MACRO_DIR_TRACE' => 1,
-                        'CYRUS_SQLITE_CHK_LIB' => 1,
                         'SASL_GSSAPI_CHK' => 1,
-                        'CMU_LIBSSL_INC_WHERE' => 1,
-                        '_m4_warn' => 1,
+                        'CMU_GUESS_RUNPATH_SWITCH' => 1,
+                        'CMU_KRB_INC_WHERE1' => 1,
+                        'CMU_LIBSSL_LIB_WHERE' => 1,
                         'CMU_NEEDS_AFS' => 1,
-                        'CMU_AFS_WHERE' => 1,
-                        'CMU_SASL2_REQUIRED' => 1,
-                        'CMU_USE_DB' => 1,
-                        '_AM_CONFIG_MACRO_DIRS' => 1,
-                        'IPv6_CHECK_SA_LEN' => 1,
-                        'CYRUS_MYSQL_CHK' => 1,
-                        'm4_pattern_forbid' => 1,
                         'CMU_LIBSSL' => 1,
-                        'CMU_KRB_RD_REQ_PROTO' => 1,
-                        'CMU_KRB4' => 1,
-                        'SASL2_CRYPT_CHK' => 1,
-                        'CMU_CHECK_HEADER_NOCACHE' => 1,
-                        'AC_CONFIG_MACRO_DIR' => 1,
-                        'CMU_KRB_SET_KEY_PROTO' => 1,
+                        'SASL_SET_GSSAPI_LIBS' => 1,
+                        'CMU_SASL2_REQUIRE_VER' => 1,
+                        'CMU_ADD_LIBPATH' => 1,
+                        'CMU_FIND_LIB_SUBDIR' => 1,
+                        'CMU_KRB_LIB_WHERE1' => 1,
+                        'CMU_HAVE_ZLIB' => 1,
+                        'CMU_LIBSSL_INC_WHERE1' => 1,
                         'CMU_KRB_LIB_WHERE' => 1,
-                        'CMU_DB_INC_WHERE' => 1,
-                        'CMU_DB4_LIB_WHERE1' => 1,
-                        'CYRUS_PGSQL_CHK' => 1,
-                        'CMU_KRB_SENDAUTH_PROTO' => 1,
-                        'CMU_SASL2_CHECKAPOP_REQUIRED' => 1,
+                        'm4_include' => 1,
+                        'CYRUS_MYSQL_CHK' => 1,
+                        'CMU_USE_DB' => 1,
+                        'CMU_LIBWRAP' => 1,
+                        '_AM_CONFIG_MACRO_DIRS' => 1,
+                        'IPv6_CHECK_FUNC' => 1,
+                        'CYRUS_SQLITE_OPTS' => 1,
+                        'CYRUS_BERKELEY_DB_CHK' => 1,
+                        'CMU_TEST_INCPATH' => 1,
+                        'CMU_LIBSSL_INC_WHERE' => 1,
                         'CMU_DB3_LIB_WHERE1' => 1,
-                        'CMU_KRB_INC_WHERE' => 1,
+                        'CMU_KRB4_32_DEFN' => 1,
+                        'CMU_SASL2_REQUIRED' => 1,
+                        'CYRUS_BERKELEY_DB_CHK_LIB' => 1,
+                        'CMU_SASL2' => 1,
+                        'CMU_LIBSSL_LIB_WHERE1' => 1,
                         'CYRUS_MYSQL_CHK_LIB' => 1,
-                        'CMU_KRB_INC_WHERE1' => 1,
-                        'CMU_LIBSSL_INC_WHERE1' => 1,
+                        '_m4_warn' => 1,
+                        'IPv6_CHECK_SS_FAMILY' => 1,
+                        'CMU_DB_INC_WHERE' => 1,
+                        'CYRUS_PGSQL_CHK' => 1,
+                        'm4_pattern_allow' => 1,
+                        'IPv6_CHECK_SOCKLEN_T' => 1,
+                        'CYRUS_BERKELEY_DB_OPTS' => 1,
                         'CYRUS_MYSQL_OPTS' => 1,
-                        'CMU_GUESS_RUNPATH_SWITCH' => 1,
+                        'AC_DEFUN' => 1,
+                        'AC_DEFUN_ONCE' => 1,
+                        'CYRUS_PGSQL_OPTS' => 1,
                         'CYRUS_PGSQL_CHK_LIB' => 1,
-                        'CMU_LIBSSL_LIB_WHERE1' => 1
+                        'SASL2_CRYPT_CHK' => 1,
+                        'm4_pattern_forbid' => 1,
+                        'IPv6_CHECK_SA_LEN' => 1,
+                        'CMU_AFS' => 1,
+                        'AC_CONFIG_MACRO_DIR' => 1,
+                        'CMU_DB_INC_WHERE1' => 1,
+                        'CMU_KRB_RD_REQ_PROTO' => 1,
+                        'CMU_CHECK_HEADER_NOCACHE' => 1,
+                        'CMU_SASL2_CHECKAPOP_REQUIRED' => 1,
+                        'CMU_TEST_LIBPATH' => 1,
+                        'CMU_KRB_SENDAUTH_PROTO' => 1,
+                        'CYRUS_SQLITE_CHK' => 1,
+                        'CMU_DB4_LIB_WHERE1' => 1,
+                        'CMU_C___ATTRIBUTE__' => 1,
+                        'CMU_AFS_INC_WHERE1' => 1
                       }
                     ], 'Autom4te::Request' ),
              bless( [
@@ -118,64 +118,64 @@
                         'configure.in'
                       ],
                       {
-                        '_m4_warn' => 1,
+                        'AM_PROG_CXX_C_O' => 1,
+                        'AM_PROG_FC_C_O' => 1,
+                        'm4_include' => 1,
+                        'AC_FC_PP_DEFINE' => 1,
+                        'AM_PATH_GUILE' => 1,
+                        'LT_INIT' => 1,
+                        'AC_CANONICAL_TARGET' => 1,
                         'AC_FC_SRCEXT' => 1,
-                        'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
-                        'm4_pattern_allow' => 1,
-                        'AC_CONFIG_LIBOBJ_DIR' => 1,
-                        'AC_CONFIG_HEADERS' => 1,
-                        '_LT_AC_TAGCONFIG' => 1,
-                        'include' => 1,
-                        'AM_PROG_LIBTOOL' => 1,
-                        'AC_CANONICAL_HOST' => 1,
-                        'AC_PROG_LIBTOOL' => 1,
-                        'AC_FC_PP_SRCEXT' => 1,
-                        'AC_SUBST' => 1,
+                        'AM_INIT_AUTOMAKE' => 1,
+                        'AH_OUTPUT' => 1,
+                        'AC_CONFIG_LINKS' => 1,
+                        'AM_XGETTEXT_OPTION' => 1,
                         'AM_SILENT_RULES' => 1,
+                        'm4_pattern_forbid' => 1,
+                        'AM_PROG_LIBTOOL' => 1,
                         '_AM_COND_IF' => 1,
-                        'LT_CONFIG_LTDL_DIR' => 1,
-                        'AM_PATH_GUILE' => 1,
-                        'AM_PROG_F77_C_O' => 1,
+                        'AM_POT_TOOLS' => 1,
                         '_AM_MAKEFILE_INCLUDE' => 1,
-                        'sinclude' => 1,
-                        '_AM_SUBST_NOTMAKE' => 1,
-                        'AC_CANONICAL_BUILD' => 1,
                         'AM_PROG_CC_C_O' => 1,
-                        'm4_include' => 1,
-                        'AM_XGETTEXT_OPTION' => 1,
-                        'AC_REQUIRE_AUX_FILE' => 1,
-                        'AM_PROG_MOC' => 1,
-                        'AM_PROG_AR' => 1,
+                        '_LT_AC_TAGCONFIG' => 1,
+                        'AM_PROG_F77_C_O' => 1,
+                        'AC_INIT' => 1,
+                        'sinclude' => 1,
                         '_AM_COND_ENDIF' => 1,
+                        'm4_sinclude' => 1,
                         'LT_SUPPORTED_TAG' => 1,
-                        'AC_INIT' => 1,
-                        'AM_AUTOMAKE_VERSION' => 1,
+                        'AC_LIBSOURCE' => 1,
                         'AC_FC_FREEFORM' => 1,
-                        'LT_INIT' => 1,
-                        'AC_FC_PP_DEFINE' => 1,
-                        'AM_INIT_AUTOMAKE' => 1,
-                        'AM_PROG_FC_C_O' => 1,
-                        'AM_ENABLE_MULTILIB' => 1,
-                        'AC_CONFIG_SUBDIRS' => 1,
                         'AC_SUBST_TRACE' => 1,
+                        'AC_CONFIG_SUBDIRS' => 1,
+                        'AC_CONFIG_LIBOBJ_DIR' => 1,
+                        'AC_CONFIG_HEADERS' => 1,
+                        'include' => 1,
+                        'AC_PROG_LIBTOOL' => 1,
+                        'AC_CANONICAL_HOST' => 1,
+                        'AM_MAINTAINER_MODE' => 1,
+                        'AC_CANONICAL_BUILD' => 1,
                         'AC_CONFIG_FILES' => 1,
-                        'AC_CONFIG_LINKS' => 1,
-                        'AC_DEFINE_TRACE_LITERAL' => 1,
-                        'AC_CANONICAL_TARGET' => 1,
                         'AM_NLS' => 1,
-                        'm4_pattern_forbid' => 1,
-                        'm4_sinclude' => 1,
-                        'AC_LIBSOURCE' => 1,
-                        'AM_GNU_GETTEXT' => 1,
-                        'AM_POT_TOOLS' => 1,
-                        'AM_MAINTAINER_MODE' => 1,
+                        '_m4_warn' => 1,
                         'AC_CANONICAL_SYSTEM' => 1,
-                        'AH_OUTPUT' => 1,
+                        'AM_GNU_GETTEXT' => 1,
                         '_AM_COND_ELSE' => 1,
-                        'AM_PROG_CXX_C_O' => 1,
                         'AM_MAKEFILE_INCLUDE' => 1,
+                        'AC_SUBST' => 1,
+                        'AM_PROG_AR' => 1,
+                        'AM_ENABLE_MULTILIB' => 1,
+                        'AM_CONDITIONAL' => 1,
                         'AC_CONFIG_AUX_DIR' => 1,
-                        'AM_CONDITIONAL' => 1
+                        'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
+                        'm4_pattern_allow' => 1,
+                        'AM_PROG_MOC' => 1,
+                        'AM_AUTOMAKE_VERSION' => 1,
+                        '_AM_SUBST_NOTMAKE' => 1,
+                        'AC_DEFINE_TRACE_LITERAL' => 1,
+                        'LT_CONFIG_LTDL_DIR' => 1,
+                        'AC_FC_PP_SRCEXT' => 1,
+                        'AC_REQUIRE_AUX_FILE' => 1
                       }
                     ], 'Autom4te::Request' )
            );
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cyrus-imapd-2.4.19/doc/changes.html 
new/cyrus-imapd-2.4.20/doc/changes.html
--- old/cyrus-imapd-2.4.19/doc/changes.html     2017-05-15 07:43:30.000000000 
+0200
+++ new/cyrus-imapd-2.4.20/doc/changes.html     2017-08-18 02:29:14.000000000 
+0200
@@ -8,6 +8,13 @@
 </head>
 <body>
 
+<h1>Changes to the Cyrus IMAP Server since 2.4.19</h1>
+<ul>
+<li>Fixed: lmtpd crash</li>
+<li>Fixed: auth_pts will now error if its configured socket path is too
+long for its buffer</li>
+</ul>
+
 <h1>Changes to the Cyrus IMAP Server since 2.4.18</h1>
 <ul>
 <li>Complete backport of the new (2.5 and later) IMAP IDLE implementation
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cyrus-imapd-2.4.19/doc/man/arbitron.8.html 
new/cyrus-imapd-2.4.20/doc/man/arbitron.8.html
--- old/cyrus-imapd-2.4.19/doc/man/arbitron.8.html      2017-05-15 
07:53:40.000000000 +0200
+++ new/cyrus-imapd-2.4.20/doc/man/arbitron.8.html      2017-08-18 
02:57:00.000000000 +0200
@@ -1,5 +1,5 @@
 <!-- Creator     : groff version 1.22.3 -->
-<!-- CreationDate: Mon May 15 05:53:40 2017 -->
+<!-- CreationDate: Fri Aug 18 00:57:00 2017 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd";>
 <html>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cyrus-imapd-2.4.19/doc/man/chk_cyrus.8.html 
new/cyrus-imapd-2.4.20/doc/man/chk_cyrus.8.html
--- old/cyrus-imapd-2.4.19/doc/man/chk_cyrus.8.html     2017-05-15 
07:53:40.000000000 +0200
+++ new/cyrus-imapd-2.4.20/doc/man/chk_cyrus.8.html     2017-08-18 
02:57:00.000000000 +0200
@@ -1,5 +1,5 @@
 <!-- Creator     : groff version 1.22.3 -->
-<!-- CreationDate: Mon May 15 05:53:40 2017 -->
+<!-- CreationDate: Fri Aug 18 00:57:00 2017 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd";>
 <html>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cyrus-imapd-2.4.19/doc/man/ctl_cyrusdb.8.html 
new/cyrus-imapd-2.4.20/doc/man/ctl_cyrusdb.8.html
--- old/cyrus-imapd-2.4.19/doc/man/ctl_cyrusdb.8.html   2017-05-15 
07:53:40.000000000 +0200
+++ new/cyrus-imapd-2.4.20/doc/man/ctl_cyrusdb.8.html   2017-08-18 
02:57:00.000000000 +0200
@@ -1,5 +1,5 @@
 <!-- Creator     : groff version 1.22.3 -->
-<!-- CreationDate: Mon May 15 05:53:40 2017 -->
+<!-- CreationDate: Fri Aug 18 00:57:00 2017 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd";>
 <html>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cyrus-imapd-2.4.19/doc/man/ctl_deliver.8.html 
new/cyrus-imapd-2.4.20/doc/man/ctl_deliver.8.html
--- old/cyrus-imapd-2.4.19/doc/man/ctl_deliver.8.html   2017-05-15 
07:53:40.000000000 +0200
+++ new/cyrus-imapd-2.4.20/doc/man/ctl_deliver.8.html   2017-08-18 
02:57:01.000000000 +0200
@@ -1,5 +1,5 @@
 <!-- Creator     : groff version 1.22.3 -->
-<!-- CreationDate: Mon May 15 05:53:40 2017 -->
+<!-- CreationDate: Fri Aug 18 00:57:01 2017 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd";>
 <html>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cyrus-imapd-2.4.19/doc/man/ctl_mboxlist.8.html 
new/cyrus-imapd-2.4.20/doc/man/ctl_mboxlist.8.html
--- old/cyrus-imapd-2.4.19/doc/man/ctl_mboxlist.8.html  2017-05-15 
07:53:40.000000000 +0200
+++ new/cyrus-imapd-2.4.20/doc/man/ctl_mboxlist.8.html  2017-08-18 
02:57:01.000000000 +0200
@@ -1,5 +1,5 @@
 <!-- Creator     : groff version 1.22.3 -->
-<!-- CreationDate: Mon May 15 05:53:40 2017 -->
+<!-- CreationDate: Fri Aug 18 00:57:01 2017 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd";>
 <html>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cyrus-imapd-2.4.19/doc/man/cvt_cyrusdb.8.html 
new/cyrus-imapd-2.4.20/doc/man/cvt_cyrusdb.8.html
--- old/cyrus-imapd-2.4.19/doc/man/cvt_cyrusdb.8.html   2017-05-15 
07:53:41.000000000 +0200
+++ new/cyrus-imapd-2.4.20/doc/man/cvt_cyrusdb.8.html   2017-08-18 
02:57:01.000000000 +0200
@@ -1,5 +1,5 @@
 <!-- Creator     : groff version 1.22.3 -->
-<!-- CreationDate: Mon May 15 05:53:41 2017 -->
+<!-- CreationDate: Fri Aug 18 00:57:01 2017 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd";>
 <html>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cyrus-imapd-2.4.19/doc/man/cyr_dbtool.8.html 
new/cyrus-imapd-2.4.20/doc/man/cyr_dbtool.8.html
--- old/cyrus-imapd-2.4.19/doc/man/cyr_dbtool.8.html    2017-05-15 
07:53:41.000000000 +0200
+++ new/cyrus-imapd-2.4.20/doc/man/cyr_dbtool.8.html    2017-08-18 
02:57:01.000000000 +0200
@@ -1,5 +1,5 @@
 <!-- Creator     : groff version 1.22.3 -->
-<!-- CreationDate: Mon May 15 05:53:41 2017 -->
+<!-- CreationDate: Fri Aug 18 00:57:01 2017 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd";>
 <html>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cyrus-imapd-2.4.19/doc/man/cyr_df.8.html 
new/cyrus-imapd-2.4.20/doc/man/cyr_df.8.html
--- old/cyrus-imapd-2.4.19/doc/man/cyr_df.8.html        2017-05-15 
07:53:41.000000000 +0200
+++ new/cyrus-imapd-2.4.20/doc/man/cyr_df.8.html        2017-08-18 
02:57:01.000000000 +0200
@@ -1,5 +1,5 @@
 <!-- Creator     : groff version 1.22.3 -->
-<!-- CreationDate: Mon May 15 05:53:41 2017 -->
+<!-- CreationDate: Fri Aug 18 00:57:01 2017 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd";>
 <html>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cyrus-imapd-2.4.19/doc/man/cyr_expire.8.html 
new/cyrus-imapd-2.4.20/doc/man/cyr_expire.8.html
--- old/cyrus-imapd-2.4.19/doc/man/cyr_expire.8.html    2017-05-15 
07:53:41.000000000 +0200
+++ new/cyrus-imapd-2.4.20/doc/man/cyr_expire.8.html    2017-08-18 
02:57:01.000000000 +0200
@@ -1,5 +1,5 @@
 <!-- Creator     : groff version 1.22.3 -->
-<!-- CreationDate: Mon May 15 05:53:41 2017 -->
+<!-- CreationDate: Fri Aug 18 00:57:01 2017 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd";>
 <html>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cyrus-imapd-2.4.19/doc/man/cyr_synclog.8.html 
new/cyrus-imapd-2.4.20/doc/man/cyr_synclog.8.html
--- old/cyrus-imapd-2.4.19/doc/man/cyr_synclog.8.html   2017-05-15 
07:53:41.000000000 +0200
+++ new/cyrus-imapd-2.4.20/doc/man/cyr_synclog.8.html   2017-08-18 
02:57:01.000000000 +0200
@@ -1,5 +1,5 @@
 <!-- Creator     : groff version 1.22.3 -->
-<!-- CreationDate: Mon May 15 05:53:41 2017 -->
+<!-- CreationDate: Fri Aug 18 00:57:01 2017 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd";>
 <html>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cyrus-imapd-2.4.19/doc/man/cyrus.conf.5.html 
new/cyrus-imapd-2.4.20/doc/man/cyrus.conf.5.html
--- old/cyrus-imapd-2.4.19/doc/man/cyrus.conf.5.html    2017-05-15 
07:53:41.000000000 +0200
+++ new/cyrus-imapd-2.4.20/doc/man/cyrus.conf.5.html    2017-08-18 
02:57:01.000000000 +0200
@@ -1,5 +1,5 @@
 <!-- Creator     : groff version 1.22.3 -->
-<!-- CreationDate: Mon May 15 05:53:41 2017 -->
+<!-- CreationDate: Fri Aug 18 00:57:01 2017 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd";>
 <html>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cyrus-imapd-2.4.19/doc/man/deliver.8.html 
new/cyrus-imapd-2.4.20/doc/man/deliver.8.html
--- old/cyrus-imapd-2.4.19/doc/man/deliver.8.html       2017-05-15 
07:53:41.000000000 +0200
+++ new/cyrus-imapd-2.4.20/doc/man/deliver.8.html       2017-08-18 
02:57:02.000000000 +0200
@@ -1,5 +1,5 @@
 <!-- Creator     : groff version 1.22.3 -->
-<!-- CreationDate: Mon May 15 05:53:41 2017 -->
+<!-- CreationDate: Fri Aug 18 00:57:02 2017 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd";>
 <html>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cyrus-imapd-2.4.19/doc/man/fetchnews.8.html 
new/cyrus-imapd-2.4.20/doc/man/fetchnews.8.html
--- old/cyrus-imapd-2.4.19/doc/man/fetchnews.8.html     2017-05-15 
07:53:42.000000000 +0200
+++ new/cyrus-imapd-2.4.20/doc/man/fetchnews.8.html     2017-08-18 
02:57:02.000000000 +0200
@@ -1,5 +1,5 @@
 <!-- Creator     : groff version 1.22.3 -->
-<!-- CreationDate: Mon May 15 05:53:42 2017 -->
+<!-- CreationDate: Fri Aug 18 00:57:02 2017 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd";>
 <html>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cyrus-imapd-2.4.19/doc/man/fud.8.html 
new/cyrus-imapd-2.4.20/doc/man/fud.8.html
--- old/cyrus-imapd-2.4.19/doc/man/fud.8.html   2017-05-15 07:53:42.000000000 
+0200
+++ new/cyrus-imapd-2.4.20/doc/man/fud.8.html   2017-08-18 02:57:02.000000000 
+0200
@@ -1,5 +1,5 @@
 <!-- Creator     : groff version 1.22.3 -->
-<!-- CreationDate: Mon May 15 05:53:42 2017 -->
+<!-- CreationDate: Fri Aug 18 00:57:02 2017 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd";>
 <html>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cyrus-imapd-2.4.19/doc/man/idled.8.html 
new/cyrus-imapd-2.4.20/doc/man/idled.8.html
--- old/cyrus-imapd-2.4.19/doc/man/idled.8.html 2017-05-15 07:53:42.000000000 
+0200
+++ new/cyrus-imapd-2.4.20/doc/man/idled.8.html 2017-08-18 02:57:02.000000000 
+0200
@@ -1,5 +1,5 @@
 <!-- Creator     : groff version 1.22.3 -->
-<!-- CreationDate: Mon May 15 05:53:42 2017 -->
+<!-- CreationDate: Fri Aug 18 00:57:02 2017 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd";>
 <html>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cyrus-imapd-2.4.19/doc/man/imapd.8.html 
new/cyrus-imapd-2.4.20/doc/man/imapd.8.html
--- old/cyrus-imapd-2.4.19/doc/man/imapd.8.html 2017-05-15 07:53:42.000000000 
+0200
+++ new/cyrus-imapd-2.4.20/doc/man/imapd.8.html 2017-08-18 02:57:02.000000000 
+0200
@@ -1,5 +1,5 @@
 <!-- Creator     : groff version 1.22.3 -->
-<!-- CreationDate: Mon May 15 05:53:42 2017 -->
+<!-- CreationDate: Fri Aug 18 00:57:02 2017 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd";>
 <html>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cyrus-imapd-2.4.19/doc/man/imapd.conf.5.html 
new/cyrus-imapd-2.4.20/doc/man/imapd.conf.5.html
--- old/cyrus-imapd-2.4.19/doc/man/imapd.conf.5.html    2017-05-15 
07:53:42.000000000 +0200
+++ new/cyrus-imapd-2.4.20/doc/man/imapd.conf.5.html    2017-08-18 
02:57:03.000000000 +0200
@@ -1,5 +1,5 @@
 <!-- Creator     : groff version 1.22.3 -->
-<!-- CreationDate: Mon May 15 05:53:42 2017 -->
+<!-- CreationDate: Fri Aug 18 00:57:03 2017 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd";>
 <html>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cyrus-imapd-2.4.19/doc/man/imclient.3.html 
new/cyrus-imapd-2.4.20/doc/man/imclient.3.html
--- old/cyrus-imapd-2.4.19/doc/man/imclient.3.html      2017-05-15 
07:53:42.000000000 +0200
+++ new/cyrus-imapd-2.4.20/doc/man/imclient.3.html      2017-08-18 
02:57:03.000000000 +0200
@@ -1,5 +1,5 @@
 <!-- Creator     : groff version 1.22.3 -->
-<!-- CreationDate: Mon May 15 05:53:42 2017 -->
+<!-- CreationDate: Fri Aug 18 00:57:03 2017 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd";>
 <html>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cyrus-imapd-2.4.19/doc/man/imtest.1.html 
new/cyrus-imapd-2.4.20/doc/man/imtest.1.html
--- old/cyrus-imapd-2.4.19/doc/man/imtest.1.html        2017-05-15 
07:53:43.000000000 +0200
+++ new/cyrus-imapd-2.4.20/doc/man/imtest.1.html        2017-08-18 
02:57:03.000000000 +0200
@@ -1,5 +1,5 @@
 <!-- Creator     : groff version 1.22.3 -->
-<!-- CreationDate: Mon May 15 05:53:43 2017 -->
+<!-- CreationDate: Fri Aug 18 00:57:03 2017 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd";>
 <html>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cyrus-imapd-2.4.19/doc/man/installsieve.1.html 
new/cyrus-imapd-2.4.20/doc/man/installsieve.1.html
--- old/cyrus-imapd-2.4.19/doc/man/installsieve.1.html  2017-05-15 
07:53:43.000000000 +0200
+++ new/cyrus-imapd-2.4.20/doc/man/installsieve.1.html  2017-08-18 
02:57:03.000000000 +0200
@@ -1,5 +1,5 @@
 <!-- Creator     : groff version 1.22.3 -->
-<!-- CreationDate: Mon May 15 05:53:43 2017 -->
+<!-- CreationDate: Fri Aug 18 00:57:03 2017 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd";>
 <html>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cyrus-imapd-2.4.19/doc/man/ipurge.8.html 
new/cyrus-imapd-2.4.20/doc/man/ipurge.8.html
--- old/cyrus-imapd-2.4.19/doc/man/ipurge.8.html        2017-05-15 
07:53:43.000000000 +0200
+++ new/cyrus-imapd-2.4.20/doc/man/ipurge.8.html        2017-08-18 
02:57:03.000000000 +0200
@@ -1,5 +1,5 @@
 <!-- Creator     : groff version 1.22.3 -->
-<!-- CreationDate: Mon May 15 05:53:43 2017 -->
+<!-- CreationDate: Fri Aug 18 00:57:03 2017 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd";>
 <html>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cyrus-imapd-2.4.19/doc/man/krb.equiv.5.html 
new/cyrus-imapd-2.4.20/doc/man/krb.equiv.5.html
--- old/cyrus-imapd-2.4.19/doc/man/krb.equiv.5.html     2017-05-15 
07:53:43.000000000 +0200
+++ new/cyrus-imapd-2.4.20/doc/man/krb.equiv.5.html     2017-08-18 
02:57:03.000000000 +0200
@@ -1,5 +1,5 @@
 <!-- Creator     : groff version 1.22.3 -->
-<!-- CreationDate: Mon May 15 05:53:43 2017 -->
+<!-- CreationDate: Fri Aug 18 00:57:03 2017 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd";>
 <html>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cyrus-imapd-2.4.19/doc/man/lmtpd.8.html 
new/cyrus-imapd-2.4.20/doc/man/lmtpd.8.html
--- old/cyrus-imapd-2.4.19/doc/man/lmtpd.8.html 2017-05-15 07:53:43.000000000 
+0200
+++ new/cyrus-imapd-2.4.20/doc/man/lmtpd.8.html 2017-08-18 02:57:03.000000000 
+0200
@@ -1,5 +1,5 @@
 <!-- Creator     : groff version 1.22.3 -->
-<!-- CreationDate: Mon May 15 05:53:43 2017 -->
+<!-- CreationDate: Fri Aug 18 00:57:03 2017 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd";>
 <html>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cyrus-imapd-2.4.19/doc/man/lmtptest.1.html 
new/cyrus-imapd-2.4.20/doc/man/lmtptest.1.html
--- old/cyrus-imapd-2.4.19/doc/man/lmtptest.1.html      2017-05-15 
07:53:43.000000000 +0200
+++ new/cyrus-imapd-2.4.20/doc/man/lmtptest.1.html      2017-08-18 
02:57:04.000000000 +0200
@@ -1,5 +1,5 @@
 <!-- Creator     : groff version 1.22.3 -->
-<!-- CreationDate: Mon May 15 05:53:43 2017 -->
+<!-- CreationDate: Fri Aug 18 00:57:04 2017 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd";>
 <html>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cyrus-imapd-2.4.19/doc/man/master.8.html 
new/cyrus-imapd-2.4.20/doc/man/master.8.html
--- old/cyrus-imapd-2.4.19/doc/man/master.8.html        2017-05-15 
07:53:43.000000000 +0200
+++ new/cyrus-imapd-2.4.20/doc/man/master.8.html        2017-08-18 
02:57:04.000000000 +0200
@@ -1,5 +1,5 @@
 <!-- Creator     : groff version 1.22.3 -->
-<!-- CreationDate: Mon May 15 05:53:43 2017 -->
+<!-- CreationDate: Fri Aug 18 00:57:04 2017 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd";>
 <html>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cyrus-imapd-2.4.19/doc/man/mbexamine.8.html 
new/cyrus-imapd-2.4.20/doc/man/mbexamine.8.html
--- old/cyrus-imapd-2.4.19/doc/man/mbexamine.8.html     2017-05-15 
07:53:43.000000000 +0200
+++ new/cyrus-imapd-2.4.20/doc/man/mbexamine.8.html     2017-08-18 
02:57:04.000000000 +0200
@@ -1,5 +1,5 @@
 <!-- Creator     : groff version 1.22.3 -->
-<!-- CreationDate: Mon May 15 05:53:43 2017 -->
+<!-- CreationDate: Fri Aug 18 00:57:04 2017 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd";>
 <html>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cyrus-imapd-2.4.19/doc/man/mbpath.8.html 
new/cyrus-imapd-2.4.20/doc/man/mbpath.8.html
--- old/cyrus-imapd-2.4.19/doc/man/mbpath.8.html        2017-05-15 
07:53:43.000000000 +0200
+++ new/cyrus-imapd-2.4.20/doc/man/mbpath.8.html        2017-08-18 
02:57:04.000000000 +0200
@@ -1,5 +1,5 @@
 <!-- Creator     : groff version 1.22.3 -->
-<!-- CreationDate: Mon May 15 05:53:43 2017 -->
+<!-- CreationDate: Fri Aug 18 00:57:04 2017 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd";>
 <html>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cyrus-imapd-2.4.19/doc/man/mupdatetest.1.html 
new/cyrus-imapd-2.4.20/doc/man/mupdatetest.1.html
--- old/cyrus-imapd-2.4.19/doc/man/mupdatetest.1.html   2017-05-15 
07:53:43.000000000 +0200
+++ new/cyrus-imapd-2.4.20/doc/man/mupdatetest.1.html   2017-08-18 
02:57:04.000000000 +0200
@@ -1,5 +1,5 @@
 <!-- Creator     : groff version 1.22.3 -->
-<!-- CreationDate: Mon May 15 05:53:43 2017 -->
+<!-- CreationDate: Fri Aug 18 00:57:04 2017 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd";>
 <html>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cyrus-imapd-2.4.19/doc/man/nntpd.8.html 
new/cyrus-imapd-2.4.20/doc/man/nntpd.8.html
--- old/cyrus-imapd-2.4.19/doc/man/nntpd.8.html 2017-05-15 07:53:44.000000000 
+0200
+++ new/cyrus-imapd-2.4.20/doc/man/nntpd.8.html 2017-08-18 02:57:04.000000000 
+0200
@@ -1,5 +1,5 @@
 <!-- Creator     : groff version 1.22.3 -->
-<!-- CreationDate: Mon May 15 05:53:44 2017 -->
+<!-- CreationDate: Fri Aug 18 00:57:04 2017 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd";>
 <html>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cyrus-imapd-2.4.19/doc/man/nntptest.1.html 
new/cyrus-imapd-2.4.20/doc/man/nntptest.1.html
--- old/cyrus-imapd-2.4.19/doc/man/nntptest.1.html      2017-05-15 
07:53:44.000000000 +0200
+++ new/cyrus-imapd-2.4.20/doc/man/nntptest.1.html      2017-08-18 
02:57:04.000000000 +0200
@@ -1,5 +1,5 @@
 <!-- Creator     : groff version 1.22.3 -->
-<!-- CreationDate: Mon May 15 05:53:44 2017 -->
+<!-- CreationDate: Fri Aug 18 00:57:04 2017 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd";>
 <html>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cyrus-imapd-2.4.19/doc/man/notifyd.8.html 
new/cyrus-imapd-2.4.20/doc/man/notifyd.8.html
--- old/cyrus-imapd-2.4.19/doc/man/notifyd.8.html       2017-05-15 
07:53:44.000000000 +0200
+++ new/cyrus-imapd-2.4.20/doc/man/notifyd.8.html       2017-08-18 
02:57:04.000000000 +0200
@@ -1,5 +1,5 @@
 <!-- Creator     : groff version 1.22.3 -->
-<!-- CreationDate: Mon May 15 05:53:44 2017 -->
+<!-- CreationDate: Fri Aug 18 00:57:04 2017 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd";>
 <html>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cyrus-imapd-2.4.19/doc/man/pop3d.8.html 
new/cyrus-imapd-2.4.20/doc/man/pop3d.8.html
--- old/cyrus-imapd-2.4.19/doc/man/pop3d.8.html 2017-05-15 07:53:44.000000000 
+0200
+++ new/cyrus-imapd-2.4.20/doc/man/pop3d.8.html 2017-08-18 02:57:05.000000000 
+0200
@@ -1,5 +1,5 @@
 <!-- Creator     : groff version 1.22.3 -->
-<!-- CreationDate: Mon May 15 05:53:44 2017 -->
+<!-- CreationDate: Fri Aug 18 00:57:05 2017 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd";>
 <html>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cyrus-imapd-2.4.19/doc/man/pop3test.1.html 
new/cyrus-imapd-2.4.20/doc/man/pop3test.1.html
--- old/cyrus-imapd-2.4.19/doc/man/pop3test.1.html      2017-05-15 
07:53:44.000000000 +0200
+++ new/cyrus-imapd-2.4.20/doc/man/pop3test.1.html      2017-08-18 
02:57:05.000000000 +0200
@@ -1,5 +1,5 @@
 <!-- Creator     : groff version 1.22.3 -->
-<!-- CreationDate: Mon May 15 05:53:44 2017 -->
+<!-- CreationDate: Fri Aug 18 00:57:05 2017 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd";>
 <html>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cyrus-imapd-2.4.19/doc/man/quota.8.html 
new/cyrus-imapd-2.4.20/doc/man/quota.8.html
--- old/cyrus-imapd-2.4.19/doc/man/quota.8.html 2017-05-15 07:53:44.000000000 
+0200
+++ new/cyrus-imapd-2.4.20/doc/man/quota.8.html 2017-08-18 02:57:05.000000000 
+0200
@@ -1,5 +1,5 @@
 <!-- Creator     : groff version 1.22.3 -->
-<!-- CreationDate: Mon May 15 05:53:44 2017 -->
+<!-- CreationDate: Fri Aug 18 00:57:05 2017 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd";>
 <html>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cyrus-imapd-2.4.19/doc/man/reconstruct.8.html 
new/cyrus-imapd-2.4.20/doc/man/reconstruct.8.html
--- old/cyrus-imapd-2.4.19/doc/man/reconstruct.8.html   2017-05-15 
07:53:44.000000000 +0200
+++ new/cyrus-imapd-2.4.20/doc/man/reconstruct.8.html   2017-08-18 
02:57:05.000000000 +0200
@@ -1,5 +1,5 @@
 <!-- Creator     : groff version 1.22.3 -->
-<!-- CreationDate: Mon May 15 05:53:44 2017 -->
+<!-- CreationDate: Fri Aug 18 00:57:05 2017 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd";>
 <html>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cyrus-imapd-2.4.19/doc/man/rmnews.8.html 
new/cyrus-imapd-2.4.20/doc/man/rmnews.8.html
--- old/cyrus-imapd-2.4.19/doc/man/rmnews.8.html        2017-05-15 
07:53:44.000000000 +0200
+++ new/cyrus-imapd-2.4.20/doc/man/rmnews.8.html        2017-08-18 
02:57:05.000000000 +0200
@@ -1,5 +1,5 @@
 <!-- Creator     : groff version 1.22.3 -->
-<!-- CreationDate: Mon May 15 05:53:44 2017 -->
+<!-- CreationDate: Fri Aug 18 00:57:05 2017 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd";>
 <html>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cyrus-imapd-2.4.19/doc/man/sivtest.1.html 
new/cyrus-imapd-2.4.20/doc/man/sivtest.1.html
--- old/cyrus-imapd-2.4.19/doc/man/sivtest.1.html       2017-05-15 
07:53:45.000000000 +0200
+++ new/cyrus-imapd-2.4.20/doc/man/sivtest.1.html       2017-08-18 
02:57:05.000000000 +0200
@@ -1,5 +1,5 @@
 <!-- Creator     : groff version 1.22.3 -->
-<!-- CreationDate: Mon May 15 05:53:45 2017 -->
+<!-- CreationDate: Fri Aug 18 00:57:05 2017 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd";>
 <html>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cyrus-imapd-2.4.19/doc/man/smmapd.8.html 
new/cyrus-imapd-2.4.20/doc/man/smmapd.8.html
--- old/cyrus-imapd-2.4.19/doc/man/smmapd.8.html        2017-05-15 
07:53:45.000000000 +0200
+++ new/cyrus-imapd-2.4.20/doc/man/smmapd.8.html        2017-08-18 
02:57:05.000000000 +0200
@@ -1,5 +1,5 @@
 <!-- Creator     : groff version 1.22.3 -->
-<!-- CreationDate: Mon May 15 05:53:45 2017 -->
+<!-- CreationDate: Fri Aug 18 00:57:05 2017 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd";>
 <html>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cyrus-imapd-2.4.19/doc/man/smtptest.1.html 
new/cyrus-imapd-2.4.20/doc/man/smtptest.1.html
--- old/cyrus-imapd-2.4.19/doc/man/smtptest.1.html      2017-05-15 
07:53:45.000000000 +0200
+++ new/cyrus-imapd-2.4.20/doc/man/smtptest.1.html      2017-08-18 
02:57:05.000000000 +0200
@@ -1,5 +1,5 @@
 <!-- Creator     : groff version 1.22.3 -->
-<!-- CreationDate: Mon May 15 05:53:45 2017 -->
+<!-- CreationDate: Fri Aug 18 00:57:05 2017 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd";>
 <html>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cyrus-imapd-2.4.19/doc/man/squatter.8.html 
new/cyrus-imapd-2.4.20/doc/man/squatter.8.html
--- old/cyrus-imapd-2.4.19/doc/man/squatter.8.html      2017-05-15 
07:53:45.000000000 +0200
+++ new/cyrus-imapd-2.4.20/doc/man/squatter.8.html      2017-08-18 
02:57:05.000000000 +0200
@@ -1,5 +1,5 @@
 <!-- Creator     : groff version 1.22.3 -->
-<!-- CreationDate: Mon May 15 05:53:45 2017 -->
+<!-- CreationDate: Fri Aug 18 00:57:05 2017 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd";>
 <html>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cyrus-imapd-2.4.19/doc/man/sync_client.8.html 
new/cyrus-imapd-2.4.20/doc/man/sync_client.8.html
--- old/cyrus-imapd-2.4.19/doc/man/sync_client.8.html   2017-05-15 
07:53:45.000000000 +0200
+++ new/cyrus-imapd-2.4.20/doc/man/sync_client.8.html   2017-08-18 
02:57:05.000000000 +0200
@@ -1,5 +1,5 @@
 <!-- Creator     : groff version 1.22.3 -->
-<!-- CreationDate: Mon May 15 05:53:45 2017 -->
+<!-- CreationDate: Fri Aug 18 00:57:05 2017 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd";>
 <html>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cyrus-imapd-2.4.19/doc/man/sync_reset.8.html 
new/cyrus-imapd-2.4.20/doc/man/sync_reset.8.html
--- old/cyrus-imapd-2.4.19/doc/man/sync_reset.8.html    2017-05-15 
07:53:45.000000000 +0200
+++ new/cyrus-imapd-2.4.20/doc/man/sync_reset.8.html    2017-08-18 
02:57:06.000000000 +0200
@@ -1,5 +1,5 @@
 <!-- Creator     : groff version 1.22.3 -->
-<!-- CreationDate: Mon May 15 05:53:45 2017 -->
+<!-- CreationDate: Fri Aug 18 00:57:06 2017 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd";>
 <html>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cyrus-imapd-2.4.19/doc/man/sync_server.8.html 
new/cyrus-imapd-2.4.20/doc/man/sync_server.8.html
--- old/cyrus-imapd-2.4.19/doc/man/sync_server.8.html   2017-05-15 
07:53:45.000000000 +0200
+++ new/cyrus-imapd-2.4.20/doc/man/sync_server.8.html   2017-08-18 
02:57:06.000000000 +0200
@@ -1,5 +1,5 @@
 <!-- Creator     : groff version 1.22.3 -->
-<!-- CreationDate: Mon May 15 05:53:45 2017 -->
+<!-- CreationDate: Fri Aug 18 00:57:06 2017 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd";>
 <html>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cyrus-imapd-2.4.19/doc/man/syncnews.8.html 
new/cyrus-imapd-2.4.20/doc/man/syncnews.8.html
--- old/cyrus-imapd-2.4.19/doc/man/syncnews.8.html      2017-05-15 
07:53:45.000000000 +0200
+++ new/cyrus-imapd-2.4.20/doc/man/syncnews.8.html      2017-08-18 
02:57:06.000000000 +0200
@@ -1,5 +1,5 @@
 <!-- Creator     : groff version 1.22.3 -->
-<!-- CreationDate: Mon May 15 05:53:45 2017 -->
+<!-- CreationDate: Fri Aug 18 00:57:06 2017 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd";>
 <html>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cyrus-imapd-2.4.19/doc/man/timsieved.8.html 
new/cyrus-imapd-2.4.20/doc/man/timsieved.8.html
--- old/cyrus-imapd-2.4.19/doc/man/timsieved.8.html     2017-05-15 
07:53:46.000000000 +0200
+++ new/cyrus-imapd-2.4.20/doc/man/timsieved.8.html     2017-08-18 
02:57:06.000000000 +0200
@@ -1,5 +1,5 @@
 <!-- Creator     : groff version 1.22.3 -->
-<!-- CreationDate: Mon May 15 05:53:46 2017 -->
+<!-- CreationDate: Fri Aug 18 00:57:06 2017 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd";>
 <html>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cyrus-imapd-2.4.19/doc/man/tls_prune.8.html 
new/cyrus-imapd-2.4.20/doc/man/tls_prune.8.html
--- old/cyrus-imapd-2.4.19/doc/man/tls_prune.8.html     2017-05-15 
07:53:46.000000000 +0200
+++ new/cyrus-imapd-2.4.20/doc/man/tls_prune.8.html     2017-08-18 
02:57:06.000000000 +0200
@@ -1,5 +1,5 @@
 <!-- Creator     : groff version 1.22.3 -->
-<!-- CreationDate: Mon May 15 05:53:46 2017 -->
+<!-- CreationDate: Fri Aug 18 00:57:06 2017 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd";>
 <html>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cyrus-imapd-2.4.19/doc/man/unexpunge.8.html 
new/cyrus-imapd-2.4.20/doc/man/unexpunge.8.html
--- old/cyrus-imapd-2.4.19/doc/man/unexpunge.8.html     2017-05-15 
07:53:46.000000000 +0200
+++ new/cyrus-imapd-2.4.20/doc/man/unexpunge.8.html     2017-08-18 
02:57:06.000000000 +0200
@@ -1,5 +1,5 @@
 <!-- Creator     : groff version 1.22.3 -->
-<!-- CreationDate: Mon May 15 05:53:46 2017 -->
+<!-- CreationDate: Fri Aug 18 00:57:06 2017 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd";>
 <html>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cyrus-imapd-2.4.19/doc/text/changes 
new/cyrus-imapd-2.4.20/doc/text/changes
--- old/cyrus-imapd-2.4.19/doc/text/changes     2017-05-15 07:53:47.000000000 
+0200
+++ new/cyrus-imapd-2.4.20/doc/text/changes     2017-08-18 02:57:07.000000000 
+0200
@@ -1,3 +1,9 @@
+Changes to the Cyrus IMAP Server since 2.4.19
+
+      * Fixed: lmtpd crash 
+      * Fixed: auth_pts will now error if its configured socket path is too
+        long for its buffer 
+
 Changes to the Cyrus IMAP Server since 2.4.18
 
       * Complete backport of the new (2.5 and later) IMAP IDLE
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cyrus-imapd-2.4.19/imap/lmtpd.c 
new/cyrus-imapd-2.4.20/imap/lmtpd.c
--- old/cyrus-imapd-2.4.19/imap/lmtpd.c 2017-05-15 07:43:30.000000000 +0200
+++ new/cyrus-imapd-2.4.20/imap/lmtpd.c 2017-08-18 02:29:14.000000000 +0200
@@ -712,9 +712,10 @@
 
     /* loop through each recipient, attempting delivery for each */
     for (n = 0; n < nrcpts; n++) {
-       char namebuf[MAX_MAILBOX_BUFFER] = "", *server;
+       char namebuf[MAX_MAILBOX_BUFFER] = "";
        char userbuf[MAX_MAILBOX_BUFFER];
        const char *rcpt, *user, *domain, *mailbox;
+       char *server = NULL;
        int r = 0;
 
        rcpt = msg_getrcptall(msgdata, n);
@@ -954,7 +955,7 @@
     }
 
     if (!r) {
-       char *server, *acl;
+       char *server = NULL, *acl = NULL;
        long aclcheck = !user ? ACL_POST : 0;
        /*
         * check to see if mailbox exists and we can append to it:
@@ -1061,8 +1062,9 @@
        (don't bother if we're only a proxy) */
     n = isproxy ? 0 : msg_getnumrcpt(msgdata);
     for (i = 0; !f && (i < n); i++) {
-       char namebuf[MAX_MAILBOX_BUFFER] = "", *server;
+       char namebuf[MAX_MAILBOX_BUFFER] = "";
        const char *user, *domain, *mailbox;
+       char *server = NULL;
        int r;
 
        /* build the mailboxname from the recipient address */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cyrus-imapd-2.4.19/imap/lmtpstats.c 
new/cyrus-imapd-2.4.20/imap/lmtpstats.c
--- old/cyrus-imapd-2.4.19/imap/lmtpstats.c     2017-05-15 07:53:40.000000000 
+0200
+++ new/cyrus-imapd-2.4.20/imap/lmtpstats.c     2017-08-18 02:57:00.000000000 
+0200
@@ -85,27 +85,27 @@
 
     switch (evt) {
 
-        case SERVER_NAME_VERSION: return "Name and version string for server";
+        case SIEVE_FILEINTO: return "sieve fileintos";
+        case AUTHENTICATION_YES: return "Successful authentication of given 
mechanism";
         case SIEVE_VACATION_REPLIED: return "vacation messages sent";
-        case SIEVE_NOTIFY: return "sieve notifications sent";
-        case mtaReceivedMessages: return "Messages we've received";
-        case mtaTransmittedMessages: return "Messages stored to disk";
-        case TOTAL_CONNECTIONS: return "Count of the total number of 
connections since the beginning of time";
-        case AUTHENTICATION_NO: return "Failed authentication of given 
mechanism";
-        case SIEVE_DISCARD: return "sieve discards";
-        case SIEVE_REJECT: return "sieve rejects";
+        case mtaSuccessfulConvertedMessages: return "Messages converted 
because of 8bit foo";
         case mtaTransmittedVolume: return "Kbytes stored to disk";
+        case mtaReceivedVolume: return "Kbytes received";
         case ACTIVE_CONNECTIONS: return "Count of the active number of 
connections";
-        case AUTHENTICATION_YES: return "Successful authentication of given 
mechanism";
+        case mtaReceivedRecipients: return "Recipients accepted";
+        case mtaTransmittedMessages: return "Messages stored to disk";
+        case mtaReceivedMessages: return "Messages we've received";
         case SERVER_UPTIME: return "Amount of time server has been running";
-        case mtaSuccessfulConvertedMessages: return "Messages converted 
because of 8bit foo";
+        case SIEVE_DISCARD: return "sieve discards";
+        case SIEVE_VACATION_TOTAL: return "vacation messages considered";
         case SIEVE_KEEP: return "sieve messages kept";
-        case SIEVE_MESSAGES_PROCESSED: return "Number of messages processed by 
Sieve scripts";
-        case mtaReceivedVolume: return "Kbytes received";
-        case mtaReceivedRecipients: return "Recipients accepted";
+        case AUTHENTICATION_NO: return "Failed authentication of given 
mechanism";
         case SIEVE_REDIRECT: return "sieve redirects";
-        case SIEVE_FILEINTO: return "sieve fileintos";
-        case SIEVE_VACATION_TOTAL: return "vacation messages considered";
+        case TOTAL_CONNECTIONS: return "Count of the total number of 
connections since the beginning of time";
+        case SERVER_NAME_VERSION: return "Name and version string for server";
+        case SIEVE_REJECT: return "sieve rejects";
+        case SIEVE_NOTIFY: return "sieve notifications sent";
+        case SIEVE_MESSAGES_PROCESSED: return "Number of messages processed by 
Sieve scripts";
 
     }
 
@@ -123,27 +123,27 @@
 
     switch (evt) {
 
-        case SERVER_NAME_VERSION: 
snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.2.3.0"); return buf;
+        case SIEVE_FILEINTO: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.3.4.4"); 
return buf;
+        case AUTHENTICATION_YES: 
snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.2.2.%d.0",varvalue(VARIABLE_AUTH)); 
return buf;
         case SIEVE_VACATION_REPLIED: 
snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.3.4.7"); return buf;
-        case SIEVE_NOTIFY: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.3.4.6"); 
return buf;
-        case mtaReceivedMessages: 
snprintf(buf,buflen,"1.3.6.1.2.1.28.1.%d.1",varvalue(VARIABLE_MTA)); return buf;
-        case mtaTransmittedMessages: 
snprintf(buf,buflen,"1.3.6.1.2.1.28.1.%d.3",varvalue(VARIABLE_MTA)); return buf;
-        case TOTAL_CONNECTIONS: 
snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.2.1.1"); return buf;
-        case AUTHENTICATION_NO: 
snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.2.2.%d.1",varvalue(VARIABLE_AUTH)); 
return buf;
-        case SIEVE_DISCARD: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.3.4.2"); 
return buf;
-        case SIEVE_REJECT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.3.4.3"); 
return buf;
+        case mtaSuccessfulConvertedMessages: 
snprintf(buf,buflen,"1.3.6.1.2.1.28.1.%d.10",varvalue(VARIABLE_MTA)); return 
buf;
         case mtaTransmittedVolume: 
snprintf(buf,buflen,"1.3.6.1.2.1.28.1.%d.6",varvalue(VARIABLE_MTA)); return buf;
+        case mtaReceivedVolume: 
snprintf(buf,buflen,"1.3.6.1.2.1.28.1.%d.4",varvalue(VARIABLE_MTA)); return buf;
         case ACTIVE_CONNECTIONS: 
snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.2.1.2"); return buf;
-        case AUTHENTICATION_YES: 
snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.2.2.%d.0",varvalue(VARIABLE_AUTH)); 
return buf;
+        case mtaReceivedRecipients: 
snprintf(buf,buflen,"1.3.6.1.2.1.28.1.%d.7",varvalue(VARIABLE_MTA)); return buf;
+        case mtaTransmittedMessages: 
snprintf(buf,buflen,"1.3.6.1.2.1.28.1.%d.3",varvalue(VARIABLE_MTA)); return buf;
+        case mtaReceivedMessages: 
snprintf(buf,buflen,"1.3.6.1.2.1.28.1.%d.1",varvalue(VARIABLE_MTA)); return buf;
         case SERVER_UPTIME: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.2.3.1"); 
return buf;
-        case mtaSuccessfulConvertedMessages: 
snprintf(buf,buflen,"1.3.6.1.2.1.28.1.%d.10",varvalue(VARIABLE_MTA)); return 
buf;
+        case SIEVE_DISCARD: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.3.4.2"); 
return buf;
+        case SIEVE_VACATION_TOTAL: 
snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.3.4.8"); return buf;
         case SIEVE_KEEP: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.3.4.5"); 
return buf;
-        case SIEVE_MESSAGES_PROCESSED: 
snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.3.4.0"); return buf;
-        case mtaReceivedVolume: 
snprintf(buf,buflen,"1.3.6.1.2.1.28.1.%d.4",varvalue(VARIABLE_MTA)); return buf;
-        case mtaReceivedRecipients: 
snprintf(buf,buflen,"1.3.6.1.2.1.28.1.%d.7",varvalue(VARIABLE_MTA)); return buf;
+        case AUTHENTICATION_NO: 
snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.2.2.%d.1",varvalue(VARIABLE_AUTH)); 
return buf;
         case SIEVE_REDIRECT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.3.4.1"); 
return buf;
-        case SIEVE_FILEINTO: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.3.4.4"); 
return buf;
-        case SIEVE_VACATION_TOTAL: 
snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.3.4.8"); return buf;
+        case TOTAL_CONNECTIONS: 
snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.2.1.1"); return buf;
+        case SERVER_NAME_VERSION: 
snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.2.3.0"); return buf;
+        case SIEVE_REJECT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.3.4.3"); 
return buf;
+        case SIEVE_NOTIFY: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.3.4.6"); 
return buf;
+        case SIEVE_MESSAGES_PROCESSED: 
snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.3.4.0"); return buf;
 
     }
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cyrus-imapd-2.4.19/imap/lmtpstats.h 
new/cyrus-imapd-2.4.20/imap/lmtpstats.h
--- old/cyrus-imapd-2.4.19/imap/lmtpstats.h     2017-05-15 07:53:40.000000000 
+0200
+++ new/cyrus-imapd-2.4.20/imap/lmtpstats.h     2017-08-18 02:57:00.000000000 
+0200
@@ -21,12 +21,12 @@
 
 
 
-#define SNMPDEFINE_cmulmtp "1.3.6.1.4.1.3.2.2.3.2"
-#define SNMPDEFINE_cmutree "1.3.6.1.4.1.3.2.2.3"
-#define SNMPDEFINE_mib2 "1.3.6.1.2.1"
 #define SNMPDEFINE_mgmt "1.3.6.1.2"
-#define SNMPDEFINE_mtamib "1.3.6.1.2.1.28"
+#define SNMPDEFINE_mib2 "1.3.6.1.2.1"
 #define SNMPDEFINE_cmusieve "1.3.6.1.4.1.3.2.2.3.3"
+#define SNMPDEFINE_cmulmtp "1.3.6.1.4.1.3.2.2.3.2"
+#define SNMPDEFINE_mtamib "1.3.6.1.2.1.28"
+#define SNMPDEFINE_cmutree "1.3.6.1.4.1.3.2.2.3"
 
 
 
@@ -68,27 +68,27 @@
 
 typedef enum {
 
-    SERVER_NAME_VERSION,
+    SIEVE_FILEINTO,
+    AUTHENTICATION_YES,
     SIEVE_VACATION_REPLIED,
-    SIEVE_NOTIFY,
-    mtaReceivedMessages,
-    mtaTransmittedMessages,
-    TOTAL_CONNECTIONS,
-    AUTHENTICATION_NO,
-    SIEVE_DISCARD,
-    SIEVE_REJECT,
+    mtaSuccessfulConvertedMessages,
     mtaTransmittedVolume,
+    mtaReceivedVolume,
     ACTIVE_CONNECTIONS,
-    AUTHENTICATION_YES,
+    mtaReceivedRecipients,
+    mtaTransmittedMessages,
+    mtaReceivedMessages,
     SERVER_UPTIME,
-    mtaSuccessfulConvertedMessages,
+    SIEVE_DISCARD,
+    SIEVE_VACATION_TOTAL,
     SIEVE_KEEP,
-    SIEVE_MESSAGES_PROCESSED,
-    mtaReceivedVolume,
-    mtaReceivedRecipients,
+    AUTHENTICATION_NO,
     SIEVE_REDIRECT,
-    SIEVE_FILEINTO,
-    SIEVE_VACATION_TOTAL
+    TOTAL_CONNECTIONS,
+    SERVER_NAME_VERSION,
+    SIEVE_REJECT,
+    SIEVE_NOTIFY,
+    SIEVE_MESSAGES_PROCESSED
 } lmtpstats_t;
 
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cyrus-imapd-2.4.19/imap/pushstats.c 
new/cyrus-imapd-2.4.20/imap/pushstats.c
--- old/cyrus-imapd-2.4.19/imap/pushstats.c     2017-05-15 07:53:40.000000000 
+0200
+++ new/cyrus-imapd-2.4.20/imap/pushstats.c     2017-08-18 02:57:00.000000000 
+0200
@@ -85,58 +85,58 @@
 
     switch (evt) {
 
-        case AUTHENTICATION_YES: return "Successful authentication of given 
mechanism";
-        case UNSELECT_COUNT: return "Number of unselect";
-        case ACTIVE_CONNECTIONS: return "Count of the active number of 
connections";
-        case SERVER_UPTIME: return "Amount of time server has been running";
-        case GETACL_COUNT: return "Number of getacl";
-        case GETANNOTATION_COUNT: return "Number of getannotation";
-        case AUTHENTICATE_COUNT: return "Number of authenticate";
-        case SCAN_COUNT: return "Number of list";
-        case GETUIDS_COUNT: return "Number of getuids";
-        case COMPRESS_COUNT: return "Number of compress";
-        case THREAD_COUNT: return "Number of thread";
-        case RENAME_COUNT: return "Number of rename";
-        case FIND_COUNT: return "Number of find";
-        case EXAMINE_COUNT: return "Number of examine";
-        case STORE_COUNT: return "Number of store";
-        case EXPUNGE_COUNT: return "Number of expunge";
-        case CAPABILITY_COUNT: return "Number of capability";
-        case CLOSE_COUNT: return "Number of close";
-        case NAMESPACE_COUNT: return "Number of namespace";
-        case ID_COUNT: return "Number of id";
+        case AUTHENTICATION_NO: return "Failed authentication of given 
mechanism";
+        case SETANNOTATION_COUNT: return "Number of setannotation";
+        case SETQUOTA_COUNT: return "Number of setquota";
+        case DELETEACL_COUNT: return "Number of deleteacl";
         case COPY_COUNT: return "Number of copy";
-        case STARTTLS_COUNT: return "Number of starttls";
-        case CHECK_COUNT: return "Number of check";
-        case FETCH_COUNT: return "Number of fetch";
+        case UNSUBSCRIBE_COUNT: return "Number of unsubscribe";
+        case SERVER_NAME_VERSION: return "Name and version string for server";
+        case EXPUNGE_COUNT: return "Number of expunge";
+        case STATUS_COUNT: return "Number of status";
         case SEARCH_COUNT: return "Number of search";
+        case CREATE_COUNT: return "Number of create";
+        case APPEND_COUNT: return "Number of append";
+        case THREAD_COUNT: return "Number of thread";
+        case CLOSE_COUNT: return "Number of close";
+        case SETACL_COUNT: return "Number of setacl";
         case PARTIAL_COUNT: return "Number of partial";
+        case EXAMINE_COUNT: return "Number of examine";
+        case SCAN_COUNT: return "Number of list";
+        case GETANNOTATION_COUNT: return "Number of getannotation";
+        case ID_COUNT: return "Number of id";
+        case GETQUOTAROOT_COUNT: return "Number of getquotaroot";
+        case LOGOUT_COUNT: return "Number of logout";
         case LIST_COUNT: return "Number of list";
-        case SETQUOTA_COUNT: return "Number of setquota";
         case TOTAL_CONNECTIONS: return "Count of the total number of 
connections since the beginning of time";
-        case SETACL_COUNT: return "Number of setacl";
-        case BBOARD_COUNT: return "Number of bboard";
-        case GETQUOTA_COUNT: return "Number of getquota";
-        case SETANNOTATION_COUNT: return "Number of setannotation";
-        case GETQUOTAROOT_COUNT: return "Number of getquotaroot";
-        case UNSUBSCRIBE_COUNT: return "Number of unsubscribe";
+        case STORE_COUNT: return "Number of store";
+        case ACTIVE_CONNECTIONS: return "Count of the active number of 
connections";
+        case UNSELECT_COUNT: return "Number of unselect";
+        case COMPRESS_COUNT: return "Number of compress";
         case LOGIN_COUNT: return "Number of login";
-        case DELETEACL_COUNT: return "Number of deleteacl";
-        case SERVER_NAME_VERSION: return "Name and version string for server";
-        case AUTHENTICATION_NO: return "Failed authentication of given 
mechanism";
-        case MYRIGHTS_COUNT: return "Number of myrights";
-        case SUBSCRIBE_COUNT: return "Number of subscribe";
-        case NOOP_COUNT: return "Number of noop";
+        case LSUB_COUNT: return "Number of lsub";
         case SORT_COUNT: return "Number of sort";
-        case CREATE_COUNT: return "Number of create";
-        case SELECT_COUNT: return "Number of select";
+        case NOOP_COUNT: return "Number of noop";
+        case GETUIDS_COUNT: return "Number of getuids";
+        case BBOARD_COUNT: return "Number of bboard";
+        case SERVER_UPTIME: return "Amount of time server has been running";
+        case AUTHENTICATE_COUNT: return "Number of authenticate";
+        case NAMESPACE_COUNT: return "Number of namespace";
+        case STARTTLS_COUNT: return "Number of starttls";
+        case SUBSCRIBE_COUNT: return "Number of subscribe";
+        case CHECK_COUNT: return "Number of check";
+        case LISTRIGHTS_COUNT: return "Number of listrights";
+        case FETCH_COUNT: return "Number of fetch";
+        case CAPABILITY_COUNT: return "Number of capability";
+        case GETACL_COUNT: return "Number of getacl";
+        case FIND_COUNT: return "Number of find";
+        case AUTHENTICATION_YES: return "Successful authentication of given 
mechanism";
         case DELETE_COUNT: return "Number of delete";
-        case LOGOUT_COUNT: return "Number of logout";
+        case SELECT_COUNT: return "Number of select";
         case IDLE_COUNT: return "Number of idle";
-        case STATUS_COUNT: return "Number of status";
-        case LSUB_COUNT: return "Number of lsub";
-        case LISTRIGHTS_COUNT: return "Number of listrights";
-        case APPEND_COUNT: return "Number of append";
+        case RENAME_COUNT: return "Number of rename";
+        case GETQUOTA_COUNT: return "Number of getquota";
+        case MYRIGHTS_COUNT: return "Number of myrights";
 
     }
 
@@ -154,58 +154,58 @@
 
     switch (evt) {
 
-        case AUTHENTICATION_YES: 
snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.2.%d.0",varvalue(VARIABLE_AUTH)); 
return buf;
-        case UNSELECT_COUNT: 
snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.45"); return buf;
-        case ACTIVE_CONNECTIONS: 
snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.1.2"); return buf;
-        case SERVER_UPTIME: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.3.1"); 
return buf;
-        case GETACL_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.15"); 
return buf;
-        case GETANNOTATION_COUNT: 
snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.16"); return buf;
-        case AUTHENTICATE_COUNT: 
snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.0"); return buf;
-        case SCAN_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.32"); 
return buf;
-        case GETUIDS_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.19"); 
return buf;
-        case COMPRESS_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.8"); 
return buf;
-        case THREAD_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.43"); 
return buf;
-        case RENAME_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.31"); 
return buf;
-        case FIND_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.14"); 
return buf;
-        case EXAMINE_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.12"); 
return buf;
-        case STORE_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.34"); 
return buf;
-        case EXPUNGE_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.11"); 
return buf;
-        case CAPABILITY_COUNT: 
snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.3"); return buf;
-        case CLOSE_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.7"); 
return buf;
-        case NAMESPACE_COUNT: 
snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.29"); return buf;
-        case ID_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.20"); 
return buf;
+        case AUTHENTICATION_NO: 
snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.2.%d.1",varvalue(VARIABLE_AUTH)); 
return buf;
+        case SETANNOTATION_COUNT: 
snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.39"); return buf;
+        case SETQUOTA_COUNT: 
snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.40"); return buf;
+        case DELETEACL_COUNT: 
snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.10"); return buf;
         case COPY_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.5"); 
return buf;
-        case STARTTLS_COUNT: 
snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.33"); return buf;
-        case CHECK_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.4"); 
return buf;
-        case FETCH_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.13"); 
return buf;
+        case UNSUBSCRIBE_COUNT: 
snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.44"); return buf;
+        case SERVER_NAME_VERSION: 
snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.3.0"); return buf;
+        case EXPUNGE_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.11"); 
return buf;
+        case STATUS_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.41"); 
return buf;
         case SEARCH_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.36"); 
return buf;
+        case CREATE_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.6"); 
return buf;
+        case APPEND_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.1"); 
return buf;
+        case THREAD_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.43"); 
return buf;
+        case CLOSE_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.7"); 
return buf;
+        case SETACL_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.38"); 
return buf;
         case PARTIAL_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.30"); 
return buf;
+        case EXAMINE_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.12"); 
return buf;
+        case SCAN_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.32"); 
return buf;
+        case GETANNOTATION_COUNT: 
snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.16"); return buf;
+        case ID_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.20"); 
return buf;
+        case GETQUOTAROOT_COUNT: 
snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.18"); return buf;
+        case LOGOUT_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.23"); 
return buf;
         case LIST_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.24"); 
return buf;
-        case SETQUOTA_COUNT: 
snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.40"); return buf;
         case TOTAL_CONNECTIONS: 
snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.1.1"); return buf;
-        case SETACL_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.38"); 
return buf;
-        case BBOARD_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.2"); 
return buf;
-        case GETQUOTA_COUNT: 
snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.17"); return buf;
-        case SETANNOTATION_COUNT: 
snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.39"); return buf;
-        case GETQUOTAROOT_COUNT: 
snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.18"); return buf;
-        case UNSUBSCRIBE_COUNT: 
snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.44"); return buf;
+        case STORE_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.34"); 
return buf;
+        case ACTIVE_CONNECTIONS: 
snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.1.2"); return buf;
+        case UNSELECT_COUNT: 
snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.45"); return buf;
+        case COMPRESS_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.8"); 
return buf;
         case LOGIN_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.22"); 
return buf;
-        case DELETEACL_COUNT: 
snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.10"); return buf;
-        case SERVER_NAME_VERSION: 
snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.3.0"); return buf;
-        case AUTHENTICATION_NO: 
snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.2.%d.1",varvalue(VARIABLE_AUTH)); 
return buf;
-        case MYRIGHTS_COUNT: 
snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.27"); return buf;
-        case SUBSCRIBE_COUNT: 
snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.37"); return buf;
-        case NOOP_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.28"); 
return buf;
+        case LSUB_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.25"); 
return buf;
         case SORT_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.42"); 
return buf;
-        case CREATE_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.6"); 
return buf;
-        case SELECT_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.35"); 
return buf;
+        case NOOP_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.28"); 
return buf;
+        case GETUIDS_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.19"); 
return buf;
+        case BBOARD_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.2"); 
return buf;
+        case SERVER_UPTIME: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.3.1"); 
return buf;
+        case AUTHENTICATE_COUNT: 
snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.0"); return buf;
+        case NAMESPACE_COUNT: 
snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.29"); return buf;
+        case STARTTLS_COUNT: 
snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.33"); return buf;
+        case SUBSCRIBE_COUNT: 
snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.37"); return buf;
+        case CHECK_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.4"); 
return buf;
+        case LISTRIGHTS_COUNT: 
snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.26"); return buf;
+        case FETCH_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.13"); 
return buf;
+        case CAPABILITY_COUNT: 
snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.3"); return buf;
+        case GETACL_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.15"); 
return buf;
+        case FIND_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.14"); 
return buf;
+        case AUTHENTICATION_YES: 
snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.2.%d.0",varvalue(VARIABLE_AUTH)); 
return buf;
         case DELETE_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.9"); 
return buf;
-        case LOGOUT_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.23"); 
return buf;
+        case SELECT_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.35"); 
return buf;
         case IDLE_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.21"); 
return buf;
-        case STATUS_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.41"); 
return buf;
-        case LSUB_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.25"); 
return buf;
-        case LISTRIGHTS_COUNT: 
snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.26"); return buf;
-        case APPEND_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.1"); 
return buf;
+        case RENAME_COUNT: snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.31"); 
return buf;
+        case GETQUOTA_COUNT: 
snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.17"); return buf;
+        case MYRIGHTS_COUNT: 
snprintf(buf,buflen,"1.3.6.1.4.1.3.2.2.3.1.4.27"); return buf;
 
     }
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cyrus-imapd-2.4.19/imap/pushstats.h 
new/cyrus-imapd-2.4.20/imap/pushstats.h
--- old/cyrus-imapd-2.4.19/imap/pushstats.h     2017-05-15 07:53:40.000000000 
+0200
+++ new/cyrus-imapd-2.4.20/imap/pushstats.h     2017-08-18 02:57:00.000000000 
+0200
@@ -64,58 +64,58 @@
 
 typedef enum {
 
-    AUTHENTICATION_YES,
-    UNSELECT_COUNT,
-    ACTIVE_CONNECTIONS,
-    SERVER_UPTIME,
-    GETACL_COUNT,
-    GETANNOTATION_COUNT,
-    AUTHENTICATE_COUNT,
-    SCAN_COUNT,
-    GETUIDS_COUNT,
-    COMPRESS_COUNT,
-    THREAD_COUNT,
-    RENAME_COUNT,
-    FIND_COUNT,
-    EXAMINE_COUNT,
-    STORE_COUNT,
-    EXPUNGE_COUNT,
-    CAPABILITY_COUNT,
-    CLOSE_COUNT,
-    NAMESPACE_COUNT,
-    ID_COUNT,
+    AUTHENTICATION_NO,
+    SETANNOTATION_COUNT,
+    SETQUOTA_COUNT,
+    DELETEACL_COUNT,
     COPY_COUNT,
-    STARTTLS_COUNT,
-    CHECK_COUNT,
-    FETCH_COUNT,
+    UNSUBSCRIBE_COUNT,
+    SERVER_NAME_VERSION,
+    EXPUNGE_COUNT,
+    STATUS_COUNT,
     SEARCH_COUNT,
+    CREATE_COUNT,
+    APPEND_COUNT,
+    THREAD_COUNT,
+    CLOSE_COUNT,
+    SETACL_COUNT,
     PARTIAL_COUNT,
+    EXAMINE_COUNT,
+    SCAN_COUNT,
+    GETANNOTATION_COUNT,
+    ID_COUNT,
+    GETQUOTAROOT_COUNT,
+    LOGOUT_COUNT,
     LIST_COUNT,
-    SETQUOTA_COUNT,
     TOTAL_CONNECTIONS,
-    SETACL_COUNT,
-    BBOARD_COUNT,
-    GETQUOTA_COUNT,
-    SETANNOTATION_COUNT,
-    GETQUOTAROOT_COUNT,
-    UNSUBSCRIBE_COUNT,
+    STORE_COUNT,
+    ACTIVE_CONNECTIONS,
+    UNSELECT_COUNT,
+    COMPRESS_COUNT,
     LOGIN_COUNT,
-    DELETEACL_COUNT,
-    SERVER_NAME_VERSION,
-    AUTHENTICATION_NO,
-    MYRIGHTS_COUNT,
-    SUBSCRIBE_COUNT,
-    NOOP_COUNT,
+    LSUB_COUNT,
     SORT_COUNT,
-    CREATE_COUNT,
-    SELECT_COUNT,
+    NOOP_COUNT,
+    GETUIDS_COUNT,
+    BBOARD_COUNT,
+    SERVER_UPTIME,
+    AUTHENTICATE_COUNT,
+    NAMESPACE_COUNT,
+    STARTTLS_COUNT,
+    SUBSCRIBE_COUNT,
+    CHECK_COUNT,
+    LISTRIGHTS_COUNT,
+    FETCH_COUNT,
+    CAPABILITY_COUNT,
+    GETACL_COUNT,
+    FIND_COUNT,
+    AUTHENTICATION_YES,
     DELETE_COUNT,
-    LOGOUT_COUNT,
+    SELECT_COUNT,
     IDLE_COUNT,
-    STATUS_COUNT,
-    LSUB_COUNT,
-    LISTRIGHTS_COUNT,
-    APPEND_COUNT
+    RENAME_COUNT,
+    GETQUOTA_COUNT,
+    MYRIGHTS_COUNT
 } pushstats_t;
 
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cyrus-imapd-2.4.19/lib/auth_pts.c 
new/cyrus-imapd-2.4.20/lib/auth_pts.c
--- old/cyrus-imapd-2.4.19/lib/auth_pts.c       2017-05-15 07:43:30.000000000 
+0200
+++ new/cyrus-imapd-2.4.20/lib/auth_pts.c       2017-08-18 02:29:14.000000000 
+0200
@@ -430,6 +430,13 @@
        fname = tofree;
     }
 
+    if (strlen(fname) >= sizeof(srvaddr.sun_path)) {
+       syslog(LOG_ERR, "ptload(): socket filename %s too long for " SIZE_T_FMT 
"-byte buffer",
+                       fname, sizeof(srvaddr.sun_path));
+       rc = -1;
+       goto done;
+    }
+
     memset((char *)&srvaddr, 0, sizeof(srvaddr));
     srvaddr.sun_family = AF_UNIX;
     strcpy(srvaddr.sun_path, fname);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cyrus-imapd-2.4.19/man/sieveshell.1 
new/cyrus-imapd-2.4.20/man/sieveshell.1
--- old/cyrus-imapd-2.4.19/man/sieveshell.1     2017-05-15 07:53:46.000000000 
+0200
+++ new/cyrus-imapd-2.4.20/man/sieveshell.1     2017-08-18 02:57:06.000000000 
+0200
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SIEVESHELL 1"
-.TH SIEVESHELL 1 "2017-05-15" "perl v5.24.1" "User Contributed Perl 
Documentation"
+.TH SIEVESHELL 1 "2017-08-18" "perl v5.24.1" "User Contributed Perl 
Documentation"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/cyrus-imapd-2.4.19/xversion.h 
new/cyrus-imapd-2.4.20/xversion.h
--- old/cyrus-imapd-2.4.19/xversion.h   2017-05-15 07:53:38.000000000 +0200
+++ new/cyrus-imapd-2.4.20/xversion.h   2017-08-18 02:56:58.000000000 +0200
@@ -1,3 +1,3 @@
-/* Release cyrus-imapd-2.4.19 */
-#define _CYRUS_VERSION "v2.4.19"
-#define CYRUS_GITVERSION "bfc80b31 2017-05-15"
+/* Release cyrus-imapd-2.4.20 */
+#define _CYRUS_VERSION "v2.4.20"
+#define CYRUS_GITVERSION "01258fac 2017-08-18"


Reply via email to