Request 3082 (accepted)

Overview

Request 3082 (accepted)

Rebased on 3.6.0 with support for delayed-delete mode patch.

Created by mollekopf almost 2 years ago
In state accepted
Open review for kolab-developers

Submit cyrus-imapd-3

Submit package Kolab:Winterfell / cyrus-imapd-3 to package Kolab:16:Testing / cyrus-imapd-3

cyrus-imapd.spec Changed

@@ -5,8 +5,8 @@
 %bcond_with cassandane
 
 Name: cyrus-imapd
-Version: 3.4.4
-Release: 3%{?dist}
+Version: 3.6.0
+Release: 0.1%{?dist}
 
 %define ssl_pem_file_prefix /etc/pki/%name/%name
 
@@ -24,7 +24,7 @@
 License: BSD
 URL: http://www.cyrusimap.org/
 
-Source0: https://github.com/cyrusimap/cyrus-imapd/releases/download/cyrus-imapd-%version/cyrus-imapd-%version.tar.gz
+Source0: https://github.com/cyrusimap/cyrus-imapd/releases/download/cyrus-imapd-%version/cyrus-imapd-%version-rc2.tar.gz
 
 
 # Adapt a timeout to handle our slower builders
@@ -50,6 +50,7 @@
 Patch6: 0001-Openssl-3.0-fixes.patch
 Patch7: 0003-Configurable-default-addressbook-display-name.patch
 Patch8: 0004-Autocreate-on-PROPFIND.patch
+Patch9: 0001-Add-support-for-delayed-delete-mode-in-sync_apply_un.patch
 
 Source10: cyrus-imapd.logrotate
 Source11: cyrus-imapd.pam-config
@@ -234,7 +235,7 @@
 
 
 %prep
-%autosetup -p1
+%autosetup -p1 -n cyrus-imapd-%version-rc2
 echo %version > VERSION
 
 # Install the Fedora-specific documentation file

0001-Add-support-for-delayed-delete-mode-in-sync_apply_un.patch Added

@@ -0,0 +1,76 @@
+From 56cd822d3570c8837c5475a0864192351dc28f8f Mon Sep 17 00:00:00 2001
+From: "Jeroen van Meeuwen (Apheleia IT)" <vanmeeuwen@apheleia-it.ch>
+Date: Tue, 29 Nov 2022 11:38:25 +0100
+Subject: PATCH Add support for delayed delete mode in sync_apply_unmailbox()
+ and sync_apply_unuser()
+
+Signed-off-by: Jeroen van Meeuwen (Apheleia IT) <vanmeeuwen@apheleia-it.ch>
+---
+ imap/sync_support.c | 33 +++++++++++++++++++++++++++++----
+ 1 file changed, 29 insertions(+), 4 deletions(-)
+
+diff --git a/imap/sync_support.c b/imap/sync_support.c
+index e6e558d6f..20d84e30f 100644
+--- a/imap/sync_support.c
++++ b/imap/sync_support.c
+@@ -3630,6 +3630,7 @@ bail:
+ int sync_apply_unmailbox(struct dlist *kin, struct sync_state *sstate)
+ {
+     const char *mboxname = kin->sval;
++    int r;
+ 
+     struct mboxlock *namespacelock = mboxname_usernamespacelock(mboxname);
+ 
+@@ -3637,9 +3638,20 @@ int sync_apply_unmailbox(struct dlist *kin, struct sync_state *sstate)
+     int delflags = MBOXLIST_DELETE_FORCE | MBOXLIST_DELETE_SILENT;
+     if (sstate->flags & SYNC_FLAG_LOCALONLY)
+         delflags |= MBOXLIST_DELETE_LOCALONLY;
+-    int r = mboxlist_deletemailbox(mboxname, sstate->userisadmin,
++
++    if (!mboxlist_delayed_delete_isenabled()) {
++        r = mboxlist_deletemailbox(mboxname, sstate->userisadmin,
++                                   sstate->userid, sstate->authstate,
++                                   NULL, delflags);
++    } else if (mboxname_isdeletedmailbox(mboxname, NULL)) {
++        r = mboxlist_deletemailbox(mboxname, sstate->userisadmin,
+                                    sstate->userid, sstate->authstate,
+                                    NULL, delflags);
++    } else {
++        r = mboxlist_delayed_deletemailbox(mboxname, sstate->userisadmin,
++                                           sstate->userid, sstate->authstate,
++                                           NULL, delflags);
++    }
+ 
+     mboxname_release(&namespacelock);
+ 
+@@ -3972,11 +3984,24 @@ int sync_apply_unuser(struct dlist *kin, struct sync_state *sstate)
+     int delflags = MBOXLIST_DELETE_FORCE;
+     if (sstate->flags & SYNC_FLAG_LOCALONLY)
+         delflags |= MBOXLIST_DELETE_LOCALONLY;
++
+     for (i = list->count; i; i--) {
+         const char *name = strarray_nth(list, i-1);
+-        r = mboxlist_deletemailbox(name, sstate->userisadmin,
+-                                   sstate->userid, sstate->authstate,
+-                                   NULL, delflags);
++
++        if (!mboxlist_delayed_delete_isenabled()) {
++            r = mboxlist_deletemailbox(name, sstate->userisadmin,
++                                       sstate->userid, sstate->authstate,
++                                       NULL, delflags);
++        } else if (mboxname_isdeletedmailbox(name, NULL)) {
++            r = mboxlist_deletemailbox(name, sstate->userisadmin,
++                                       sstate->userid, sstate->authstate,
++                                       NULL, delflags);
++        } else {
++            r = mboxlist_delayed_deletemailbox(name, sstate->userisadmin,
++                                               sstate->userid, sstate->authstate,
++                                               NULL, delflags);
++        }
++
+         if (r) goto done;
+     }
+ 
+-- 
+2.37.3
+

0001-Fixed-CALDAV-PUT-requests-while-proxying.patch Changed

@@ -1,23 +1,22 @@
-From 44855ed9ae645725f03ae87ace647b066e0e74fb Mon Sep 17 00:00:00 2001
-From: Christian Mollekopf <mollekopf@apheleia-it.ch>
-Date: Tue, 4 Oct 2022 13:48:02 +0200
-Subject: PATCH 1/4 Fixed CALDAV PUT requests while proxying
+From 4ceab01d26d7c44af3832c2513abc5deb4133a7d Mon Sep 17 00:00:00 2001
+From: "Jeroen van Meeuwen (Apheleia IT)" <vanmeeuwen@apheleia-it.ch>
+Date: Tue, 29 Nov 2022 13:05:06 +0100
+Subject: PATCH Port PR 4302
 
-txn->req_tgt.namespace->mboxtype is MBTYPE_REMOTE in the proxy.
 ---
  imap/http_dav.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/imap/http_dav.c b/imap/http_dav.c
-index abc6da42c..7c13d783b 100644
+index c5c94f8dd..071ff1f6e 100644
 --- a/imap/http_dav.c
 +++ b/imap/http_dav.c
-@@ -7097,7 +7097,7 @@ int meth_put(struct transaction_t *txn, void *params)
+@@ -7102,7 +7102,7 @@ int meth_put(struct transaction_t *txn, void *params)
      }
  
      /* Make sure mailbox type is correct */
--    if (txn->req_tgt.mbentry->mbtype != txn->req_tgt.namespace->mboxtype)
-+    if (txn->req_tgt.mbentry->mbtype != txn->req_tgt.namespace->mboxtype && txn->req_tgt.mbentry->mbtype != MBTYPE_REMOTE)
+-    if (mbtype_isa(txn->req_tgt.mbentry->mbtype) != txn->req_tgt.namespace->mboxtype)
++    if (mbtype_isa(txn->req_tgt.mbentry->mbtype) != txn->req_tgt.namespace->mboxtype && txn->req_tgt.mbentry->mbtype != MBTYPE_REMOTE)
          return HTTP_FORBIDDEN;
  
      /* Make sure Content-Range isn't specified */

cyrus-imapd-3.4.4.tar.gz Deleted

cyrus-imapd-3.6.0-rc2.tar.gz Added

Build Results
RPM Lint

Refresh

Comments for request 3082 0

Request History

mollekopf created request almost 2 years ago

Rebased on 3.6.0 with support for delayed-delete mode patch.

mollekopf accepted request almost 2 years ago