Update to cyrus-imapd-3.6.0.

* release notes: https://www.cyrusimap.org/3.6/imap/download/release-notes/3.6/x/3.6.0.html
* upgrade notes: https://www.cyrusimap.org/3.6/imap/download/upgrade.html
This commit is contained in:
ajacoutot 2022-12-16 08:25:47 +00:00
parent 30ed9aa4f3
commit 036dc6971d
6 changed files with 48 additions and 16 deletions

View File

@ -2,7 +2,7 @@ PORTROACH= limitw:1,even
COMMENT= Cyrus IMAP server
V= 3.4.4
V= 3.6.0
DISTNAME= cyrus-imapd-${V}
SHARED_LIBS += cyrus 0.0 # 0.0

View File

@ -1,2 +1,2 @@
SHA256 (cyrus-imapd-3.4.4.tar.gz) = T9BnPJzDJHpBiknla4FMF/D5NxuJYrZ60kdjDCK5xRg=
SIZE (cyrus-imapd-3.4.4.tar.gz) = 13236335
SHA256 (cyrus-imapd-3.6.0.tar.gz) = g8YGiI/+vNubfNeGCrPGEmerDXkjPCz/VmR7Q/Fs26s=
SIZE (cyrus-imapd-3.6.0.tar.gz) = 13655557

View File

@ -0,0 +1,12 @@
Index: imap/cyr_cd.sh
--- imap/cyr_cd.sh.orig
+++ imap/cyr_cd.sh
@@ -44,7 +44,7 @@
# This script should be sourced from the command line of from within .bashrc
-function cyr_cd() {
+cyr_cd() {
path=`mbpath $@`
if test ${#path} -ne 0
then

View File

@ -1,16 +1,16 @@
Index: lib/imapoptions
--- lib/imapoptions.orig
+++ lib/imapoptions
@@ -769,7 +769,7 @@ Blank lines and lines beginning with ``#'' are ignored
@@ -780,7 +780,7 @@ Blank lines and lines beginning with ``#'' are ignored
is a C format string that gets 3 options: the first is the name of the
executable (as specified in the cmd parameter in cyrus.conf). The second
is the pid (integer) and the third is the service ID.
- Example: /usr/local/bin/gdb /usr/cyrus/bin/%s %d */
+ Example: /usr/bin/gdb /usr/local/cyrus/bin/%s %d */
{ "defaultacl", "anyone lrs", STRING, "2.3.17" }
/* The Access Control List (ACL) placed on a newly-created (non-user)
@@ -2308,7 +2308,7 @@ If all partitions are over that limit, this feature is
{ "debug_writefail_guid", NULL, STRING, "3.6.0" }
/* If set, any arriving message with this guid will fail as if the underlying
@@ -2402,7 +2402,7 @@ If all partitions are over that limit, this feature is
{ "seenstate_db", "twoskip", STRINGLIST("flat", "skiplist", "twoskip", "zeroskip"), "3.1.6" }
/* The cyrusdb backend to use for the seen state. */
@ -19,7 +19,7 @@ Index: lib/imapoptions
/* The pathname of the sendmail executable. Sieve invokes sendmail
for sending rejections, redirects and vacation responses. */
@@ -2441,7 +2441,7 @@ product version in the capabilities
@@ -2538,7 +2538,7 @@ product version in the capabilities
For backward compatibility, if no unit is specified, seconds is
assumed. */

View File

@ -1,7 +1,7 @@
Index: man/imapd.conf.5
--- man/imapd.conf.5.orig
+++ man/imapd.conf.5
@@ -1213,7 +1213,7 @@ Debug command to be used by processes started with \-D
@@ -1236,7 +1236,7 @@ Debug command to be used by processes started with \-D
is a C format string that gets 3 options: the first is the name of the
executable (as specified in the cmd parameter in cyrus.conf). The second
is the pid (integer) and the third is the service ID.
@ -10,7 +10,7 @@ Index: man/imapd.conf.5
.UNINDENT
.UNINDENT
.sp
@@ -3859,7 +3859,7 @@ Allowed values: \fIflat\fP, \fIskiplist\fP, \fItwoskip
@@ -3999,7 +3999,7 @@ Allowed values: \fIflat\fP, \fIskiplist\fP, \fItwoskip
.UNINDENT
.UNINDENT
.sp
@ -19,7 +19,7 @@ Index: man/imapd.conf.5
.INDENT 0.0
.INDENT 3.5
The pathname of the sendmail executable. Sieve invokes sendmail
@@ -4070,7 +4070,7 @@ assumed.
@@ -4217,7 +4217,7 @@ assumed.
.UNINDENT
.UNINDENT
.sp

View File

@ -101,12 +101,14 @@ cyrus/sbin/
@bin cyrus/sbin/cvt_cyrusdb
@bin cyrus/sbin/cvt_xlist_specialuse
@bin cyrus/sbin/cyr_buildinfo
cyrus/sbin/cyr_cd.sh
@bin cyrus/sbin/cyr_dbtool
@bin cyrus/sbin/cyr_deny
@bin cyrus/sbin/cyr_df
@bin cyrus/sbin/cyr_expire
@bin cyrus/sbin/cyr_info
@bin cyrus/sbin/cyr_sequence
@bin cyrus/sbin/cyr_ls
@bin cyrus/sbin/cyr_pwd
@bin cyrus/sbin/cyr_synclog
@bin cyrus/sbin/cyr_userseen
@bin cyrus/sbin/cyr_virusscan
@ -118,6 +120,7 @@ cyrus/sbin/
@bin cyrus/sbin/mbtool
@bin cyrus/sbin/quota
@bin cyrus/sbin/reconstruct
@bin cyrus/sbin/relocate_by_id
@bin cyrus/sbin/sievec
@bin cyrus/sbin/sieved
@bin cyrus/sbin/squatter
@ -140,6 +143,7 @@ include/cyrus/crc32.h
include/cyrus/cyr_lock.h
include/cyrus/cyr_qsort_r.h
include/cyrus/cyrusdb.h
include/cyrus/dynarray.h
include/cyrus/glob.h
include/cyrus/gmtoff.h
include/cyrus/hash.h
@ -163,10 +167,12 @@ include/cyrus/parseaddr.h
include/cyrus/procinfo.h
include/cyrus/retry.h
include/cyrus/rfc822tok.h
include/cyrus/seqset.h
include/cyrus/sieve/
include/cyrus/sieve/sieve_err.h
include/cyrus/sieve/sieve_interface.h
include/cyrus/signals.h
include/cyrus/smallarrayu64.h
include/cyrus/sqldb.h
include/cyrus/strarray.h
include/cyrus/strhash.h
@ -202,7 +208,6 @@ libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/Cyrus/
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/Cyrus/IMAP/
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/Cyrus/IMAP.pm
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/Cyrus/IMAP/Admin.pm
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/Cyrus/IMAP/IMSP.pm
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/Cyrus/IMAP/Shell.pm
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/Cyrus/SIEVE/
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/Cyrus/SIEVE/managesieve.pm
@ -218,7 +223,6 @@ libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/Cyrus/SIEVE/managesieve/
@man man/man3p/Cyrus::Annotator::Message.3p
@man man/man3p/Cyrus::IMAP.3p
@man man/man3p/Cyrus::IMAP::Admin.3p
@man man/man3p/Cyrus::IMAP::IMSP.3p
@man man/man3p/Cyrus::IMAP::Shell.3p
@man man/man3p/Cyrus::SIEVE::managesieve.3p
share/doc/cyrus-imapd/
@ -514,6 +518,21 @@ share/doc/cyrus-imapd/html/imap/download/release-notes/3.4/x/3.4.3.html
share/doc/cyrus-imapd/html/imap/download/release-notes/3.4/x/3.4.4.html
share/doc/cyrus-imapd/html/imap/download/release-notes/3.5/
share/doc/cyrus-imapd/html/imap/download/release-notes/3.5/index.html
share/doc/cyrus-imapd/html/imap/download/release-notes/3.5/x/
share/doc/cyrus-imapd/html/imap/download/release-notes/3.5/x/3.5.0-alpha0.html
share/doc/cyrus-imapd/html/imap/download/release-notes/3.6/
share/doc/cyrus-imapd/html/imap/download/release-notes/3.6/index.html
share/doc/cyrus-imapd/html/imap/download/release-notes/3.6/x/
share/doc/cyrus-imapd/html/imap/download/release-notes/3.6/x/3.6.0-beta1.html
share/doc/cyrus-imapd/html/imap/download/release-notes/3.6/x/3.6.0-beta2.html
share/doc/cyrus-imapd/html/imap/download/release-notes/3.6/x/3.6.0-beta3.html
share/doc/cyrus-imapd/html/imap/download/release-notes/3.6/x/3.6.0-rc1.html
share/doc/cyrus-imapd/html/imap/download/release-notes/3.6/x/3.6.0-rc2.html
share/doc/cyrus-imapd/html/imap/download/release-notes/3.6/x/3.6.0.html
share/doc/cyrus-imapd/html/imap/download/release-notes/3.7/
share/doc/cyrus-imapd/html/imap/download/release-notes/3.7/index.html
share/doc/cyrus-imapd/html/imap/download/release-notes/3.7/x/
share/doc/cyrus-imapd/html/imap/download/release-notes/3.7/x/3.7.0-alpha0.html
share/doc/cyrus-imapd/html/imap/download/release-notes/index.html
share/doc/cyrus-imapd/html/imap/download/upgrade.html
share/doc/cyrus-imapd/html/imap/installing.html
@ -608,11 +627,11 @@ share/doc/cyrus-imapd/html/imap/reference/faqs/r-pop3-logging.html
share/doc/cyrus-imapd/html/imap/reference/faqs/r-publicssharedfolders.html
share/doc/cyrus-imapd/html/imap/reference/faqs/r-subfolders.html
share/doc/cyrus-imapd/html/imap/reference/manpages/
share/doc/cyrus-imapd/html/imap/reference/manpages/commands.html
share/doc/cyrus-imapd/html/imap/reference/manpages/configs/
share/doc/cyrus-imapd/html/imap/reference/manpages/configs/cyrus.conf.html
share/doc/cyrus-imapd/html/imap/reference/manpages/configs/imapd.conf.html
share/doc/cyrus-imapd/html/imap/reference/manpages/configs/krb.equiv.html
share/doc/cyrus-imapd/html/imap/reference/manpages/index.html
share/doc/cyrus-imapd/html/imap/reference/manpages/systemcommands/
share/doc/cyrus-imapd/html/imap/reference/manpages/systemcommands/arbitron.html
share/doc/cyrus-imapd/html/imap/reference/manpages/systemcommands/backupd.html
@ -632,7 +651,7 @@ share/doc/cyrus-imapd/html/imap/reference/manpages/systemcommands/cyr_deny.html
share/doc/cyrus-imapd/html/imap/reference/manpages/systemcommands/cyr_df.html
share/doc/cyrus-imapd/html/imap/reference/manpages/systemcommands/cyr_expire.html
share/doc/cyrus-imapd/html/imap/reference/manpages/systemcommands/cyr_info.html
share/doc/cyrus-imapd/html/imap/reference/manpages/systemcommands/cyr_sequence.html
share/doc/cyrus-imapd/html/imap/reference/manpages/systemcommands/cyr_ls.html
share/doc/cyrus-imapd/html/imap/reference/manpages/systemcommands/cyr_synclog.html
share/doc/cyrus-imapd/html/imap/reference/manpages/systemcommands/cyr_userseen.html
share/doc/cyrus-imapd/html/imap/reference/manpages/systemcommands/cyr_virusscan.html
@ -667,6 +686,7 @@ share/doc/cyrus-imapd/html/imap/reference/manpages/systemcommands/ptloader.html
share/doc/cyrus-imapd/html/imap/reference/manpages/systemcommands/quota.html
share/doc/cyrus-imapd/html/imap/reference/manpages/systemcommands/reconstruct.html
share/doc/cyrus-imapd/html/imap/reference/manpages/systemcommands/rehash.html
share/doc/cyrus-imapd/html/imap/reference/manpages/systemcommands/relocate_by_id.html
share/doc/cyrus-imapd/html/imap/reference/manpages/systemcommands/restore.html
share/doc/cyrus-imapd/html/imap/reference/manpages/systemcommands/sievec.html
share/doc/cyrus-imapd/html/imap/reference/manpages/systemcommands/sieved.html