Skip to content

Commit

Permalink
mail/dovecot-coi: fix build with recent dovecot
Browse files Browse the repository at this point in the history
PR:		263970
  • Loading branch information
TijlCoosemans committed May 27, 2022
1 parent ea52fdc commit c5c7a99
Show file tree
Hide file tree
Showing 2 changed files with 45 additions and 0 deletions.
35 changes: 35 additions & 0 deletions mail/dovecot-coi/files/patch-src_lib-coi_coi-contact.c
@@ -0,0 +1,35 @@
--- src/lib-coi/coi-contact.c.orig 2019-12-04 09:11:06 UTC
+++ src/lib-coi/coi-contact.c
@@ -500,7 +500,7 @@ static int lmtp_coi_mail_bodies_equal(struct mail *mai
if (mail_get_stream(mail1, &hdr_size, NULL, &input1) < 0) {
errstr = mailbox_get_last_error(mail1->box, &error);
if (error != MAIL_ERROR_EXPUNGED)
- e_error(mail1->event, "Contact merge failed: "
+ e_error(mail_event(mail1), "Contact merge failed: "
"Failed to read mail: %s", errstr);
return -1;
}
@@ -509,7 +509,7 @@ static int lmtp_coi_mail_bodies_equal(struct mail *mai
if (mail_get_stream(mail2, &hdr_size, NULL, &input2) < 0) {
errstr = mailbox_get_last_error(mail2->box, &error);
if (error != MAIL_ERROR_EXPUNGED)
- e_error(mail2->event, "Contact merge failed: "
+ e_error(mail_event(mail2), "Contact merge failed: "
"Failed to read mail: %s", errstr);
return -1;
}
@@ -534,12 +534,12 @@ static int lmtp_coi_mail_bodies_equal(struct mail *mai
i_assert(input1->eof && input2->eof);

if (input1->stream_errno != 0) {
- e_error(mail1->event, "Contact merge failed: "
+ e_error(mail_event(mail1), "Contact merge failed: "
"Failed to read mail: %s", i_stream_get_error(input1));
return -1;
}
if (input2->stream_errno != 0) {
- e_error(mail2->event, "Contact merge failed: "
+ e_error(mail_event(mail2), "Contact merge failed: "
"Failed to read mail: %s", i_stream_get_error(input2));
return -1;
}
10 changes: 10 additions & 0 deletions mail/dovecot-coi/files/patch-src_webpush_test-webpush-message.c
@@ -0,0 +1,10 @@
--- src/webpush/test-webpush-message.c.orig 2019-12-04 09:11:06 UTC
+++ src/webpush/test-webpush-message.c
@@ -334,6 +334,6 @@ int main(void)
NULL
};

- env_put("TZ=UTC");
+ env_put("TZ", "UTC");
return test_run(test_functions);
}

0 comments on commit c5c7a99

Please sign in to comment.