From nobody Fri May 27 09:55:02 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id A504B1B4ACE0; Fri, 27 May 2022 09:55:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4L8gCB3TYZz4Yy1; Fri, 27 May 2022 09:55:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653645302; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J2Wi8AxRL/Yz9CBkFLQmuZLttsnE4M9U1WqeFiHhies=; b=uuvNJZG7iptxU9r62HHbaqXNnX/FWDWW56NEhEl/u+wzgH4q1Nu0SCGMF9dSrfhJ78Vx2h BxTlWGMh0hGGjuwHB9WIeefQWhn7Ajz4BSwTnqc5rnRF0Wl9vcYmxIWX+EXoQXYpVwKnZU jd57bzR4Saxo417sH3TzXCH6boRlYsVgalbygkboHxjkLhVp6aHpA8JygRspgdFCK6jFEz QMlKuftPldTJvduICqexcxL9XKcQrYXfBPBeChU/CMO0YHJsV1m9EEaCyz4vWMO+ctooGH G1JATHEQDLUF+sJb0Lhpu+t2WpsKm+HlnHTa3zB35Z8IkeRSxpxSQXMI/YbeJg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 372AB1FFE3; Fri, 27 May 2022 09:55:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 24R9t2ZE069545; Fri, 27 May 2022 09:55:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24R9t2Sf069544; Fri, 27 May 2022 09:55:02 GMT (envelope-from git) Date: Fri, 27 May 2022 09:55:02 GMT Message-Id: <202205270955.24R9t2Sf069544@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Tijl Coosemans Subject: git: c5c7a990f192 - main - mail/dovecot-coi: fix build with recent dovecot List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tijl X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c5c7a990f192d993704ceae5a017c199acd2dead Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653645302; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J2Wi8AxRL/Yz9CBkFLQmuZLttsnE4M9U1WqeFiHhies=; b=jPwi9YMMkAaWfN46PqmawUGbqJOQklxk7LpTNE/NqMvPKyv5zByRLdwZmyTIfMl6dzTOOV NW09FONtmQQ+vSvuXBn0hOS68vm4bd/Siic4Y9f4f0KLlkUL1KtsN4tHq1MYO1AzwZw/9B YM5cmhA52fZVeJXWGw+f10asSfgU1Err9xOcyhufi4ugwFWysMi+Wq0oEfM4Sr4bSnn9S7 dH5fI3Z8225A/0pKAzS+8hj/NkP/WywekRWKeQHTHyt9X/lBpMg2Rr2Q8eKNXyW2y7rYFf u8wm/a+OqzBtQb/0g+p0j++9ed2waTqNAOMxQSVm6FdPu6UfMk7EZlH8XfpgAw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653645302; a=rsa-sha256; cv=none; b=pjD4GIROGya1pgZVUztqLskJCUNE0xA7Y3kwOb8Fk5ByKL367YnYt4RR/8Z/nEfcYHUu/J gf5CgEhqkRrqy9HQiegaeHAzmF2lB8S1s27P/y1sxzDwQoj/0bzAE8GY2sfXJzj+715XNi Vc46YTVqEFdq8AgNNcaoCEWTDEVMNl19F0Mqi0mmYUe9gtlPGNgxCNZnr3L8C7vMBP499S xhCz4UjJ9jyIrLWwXLVPFvxcA3j1qMHyXWXj0DRIUu96R5wppfyH0g88MZQpIhjc7q9xav nIgJCRd2JI7YbHT5qf5AGd+gMMVZLmLX6bI4eVu5IB+/1J2J54R4+ybRM9fYRA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tijl: URL: https://cgit.FreeBSD.org/ports/commit/?id=c5c7a990f192d993704ceae5a017c199acd2dead commit c5c7a990f192d993704ceae5a017c199acd2dead Author: Tijl Coosemans AuthorDate: 2022-05-20 15:58:51 +0000 Commit: Tijl Coosemans CommitDate: 2022-05-27 09:11:01 +0000 mail/dovecot-coi: fix build with recent dovecot PR: 263970 --- .../files/patch-src_lib-coi_coi-contact.c | 35 ++++++++++++++++++++++ .../files/patch-src_webpush_test-webpush-message.c | 10 +++++++ 2 files changed, 45 insertions(+) diff --git a/mail/dovecot-coi/files/patch-src_lib-coi_coi-contact.c b/mail/dovecot-coi/files/patch-src_lib-coi_coi-contact.c new file mode 100644 index 000000000000..ac29903a64fd --- /dev/null +++ b/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; + } diff --git a/mail/dovecot-coi/files/patch-src_webpush_test-webpush-message.c b/mail/dovecot-coi/files/patch-src_webpush_test-webpush-message.c new file mode 100644 index 000000000000..4982f1a1be09 --- /dev/null +++ b/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); + }