From unknown Tue Jun 17 01:50:45 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26446: [PATCH 1/1] gnu: dovecot: Update to 2.2.29 [fixes CVE-2017-2669]. Resent-From: Leo Famulari Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 11 Apr 2017 17:02:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 26446 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 26446@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.149193010717842 (code B ref -1); Tue, 11 Apr 2017 17:02:01 +0000 Received: (at submit) by debbugs.gnu.org; 11 Apr 2017 17:01:47 +0000 Received: from localhost ([127.0.0.1]:43195 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cxzAl-0004df-1n for submit@debbugs.gnu.org; Tue, 11 Apr 2017 13:01:47 -0400 Received: from eggs.gnu.org ([208.118.235.92]:54715) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cxzAh-0004dQ-76 for submit@debbugs.gnu.org; Tue, 11 Apr 2017 13:01:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cxzAa-0006ls-Bv for submit@debbugs.gnu.org; Tue, 11 Apr 2017 13:01:33 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:35493) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cxzAa-0006lm-8q for submit@debbugs.gnu.org; Tue, 11 Apr 2017 13:01:32 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45676) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cxzAY-00072O-Al for guix-patches@gnu.org; Tue, 11 Apr 2017 13:01:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cxzAU-0006kZ-C1 for guix-patches@gnu.org; Tue, 11 Apr 2017 13:01:30 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:49771) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cxzAU-0006kF-1N for guix-patches@gnu.org; Tue, 11 Apr 2017 13:01:26 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 0CD9F20993; Tue, 11 Apr 2017 13:01:24 -0400 (EDT) Received: from frontend1 ([10.202.2.160]) by compute4.internal (MEProxy); Tue, 11 Apr 2017 13:01:24 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=date:from:message-id:subject:to:x-me-sender:x-me-sender :x-sasl-enc:x-sasl-enc; s=mesmtp; bh=4mENW748msbovJJgDpXmBo+QFs2 8akNUYKuKddogLoQ=; b=t5jQXrmeI/rEuXQiuNFpxzCyRIRyFyjFza4bpXFdoOB VjHF9MMHb1O5O8L15cpJW9smXgLAyIBVHDWlq+plcd9+u2At4zf1B14jotoI7NkP AuJFvLWTw3I190zlryEOxwzvPNf0RNizXL4kHbpX/ea+2KmRti2LZqfSHp4sbYJQ = DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=date:from:message-id:subject:to :x-me-sender:x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=4mENW7 48msbovJJgDpXmBo+QFs28akNUYKuKddogLoQ=; b=KnlBf+RysyP68M5zNHp7it +khxQ80fMO/9bGcWxR9pX6h3mUC3ctbVDdGMRP08PH0OfPfW1LEz3Au7BEoZpOqw R6PZ2dp1a2UsCO1bcVpCDsgAm9pKtFfQJ6JeLcwxGa1Z98WpywHYwwmn+KHm+nkp nk64lTaMR09jn5U1k37mD6QS8h4YizQRyxfleVKUiyiWsg0MqAyzqMKHV5DraGin nTj/BGVlZAAyhNNirY+1v/BjLFLpaNHcMBaXqfqVfURqZmNkIc0thRBtBc02bZ9X 7Lbja8JotTKmgcftLlSvj2hWVX2HVxw2Qqwdt/1tJ/EJTnoo9Q2Cn+EcIEUozMYA == X-ME-Sender: X-Sasl-enc: wdusqgZnphmzMVqOqQPwbVLEb1Q0xz46xeIuCwIPGI9P 1491930083 Received: from localhost.localdomain (unknown [172.56.29.149]) by mail.messagingengine.com (Postfix) with ESMTPA id 5BA687E04B for ; Tue, 11 Apr 2017 13:01:23 -0400 (EDT) From: Leo Famulari Date: Tue, 11 Apr 2017 13:01:16 -0400 Message-Id: <2919fdbaede514be581f29e0edc6531d3f7333af.1491930076.git.leo@famulari.name> X-Mailer: git-send-email 2.12.2 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.1 (----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.1 (----) * gnu/packages/mail.scm (dovecot): Update to 2.2.29. [source]: Use 'dovecot-fix-failing-test.patch'. * gnu/packages/patches/dovecot-fix-failing-test.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/mail.scm | 8 +- .../patches/dovecot-fix-failing-test.patch | 118 +++++++++++++++++++++ 3 files changed, 124 insertions(+), 3 deletions(-) create mode 100644 gnu/packages/patches/dovecot-fix-failing-test.patch diff --git a/gnu/local.mk b/gnu/local.mk index f3a4e54af..212228d5c 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -539,6 +539,7 @@ dist_patch_DATA = \ %D%/packages/patches/diffutils-gets-undeclared.patch \ %D%/packages/patches/doc++-include-directives.patch \ %D%/packages/patches/doc++-segfault-fix.patch \ + %D%/packages/patches/dovecot-fix-failing-test.patch \ %D%/packages/patches/doxygen-test.patch \ %D%/packages/patches/elfutils-tests-ptrace.patch \ %D%/packages/patches/elixir-disable-failing-tests.patch \ diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 49fdb32e8..1a6c505ef 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1086,15 +1086,17 @@ facilities for checking incoming mail.") (define-public dovecot (package (name "dovecot") - (version "2.2.28") + (version "2.2.29") (source (origin (method url-fetch) (uri (string-append "https://www.dovecot.org/releases/" (version-major+minor version) "/" name "-" version ".tar.gz")) - (sha256 (base32 - "098zpkmkk93372qnv6drgbfg8hp5mynspzc1735qgar6wdcqya70")))) + (patches (search-patches "dovecot-fix-failing-test.patch")) + (sha256 + (base32 + "19irf7b5mjqq68mrpdd38gxc0zp2nqib942kjp3aif3f2acylffr")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) diff --git a/gnu/packages/patches/dovecot-fix-failing-test.patch b/gnu/packages/patches/dovecot-fix-failing-test.patch new file mode 100644 index 000000000..343bab03f --- /dev/null +++ b/gnu/packages/patches/dovecot-fix-failing-test.patch @@ -0,0 +1,118 @@ +This patch fixes a test failure in dovecot 2.2.29, like this [0]: + +------ +Making check in lib-imap-client +make[2]: Entering directory +`/builddir/build/BUILD/dovecot-2.2.29/src/lib-imap-client' +for bin in test-imapc-client; do \ + if ! ./$bin; then exit 1; fi; \ + done +Warning: imapc(127.0.0.1:0): connect(127.0.0.1, 0) failed: Connection +refused - reconnecting (delay 10 ms) +Error: imapc(127.0.0.1:0): connect(127.0.0.1, 0) failed: Connection +refused - disconnecting +test: random seed #1 was 1492054294 +imapc connect failed ................................................. : ok +Warning: imapc(127.0.0.1:42704): connect(127.0.0.1, 42704) timed out +after 0 seconds - reconnecting (delay 0 ms) +Error: imapc(127.0.0.1:42704): connect(127.0.0.1, 42704) timed out after +0 seconds - disconnecting +imapc banner hangs ................................................... : ok +Warning: imapc(127.0.0.1:36762): Authentication timed out after 0 +seconds - reconnecting (delay 0 ms) +Error: imapc(127.0.0.1:36762): Authentication failed: Disconnected from +server +imapc login hangs .................................................... : ok +test-imapc-client.c:358: Assert failed: test_imapc_cmd_last_reply_pop() +== IMAPC_COMMAND_STATE_OK +imapc reconnect ...................................................... : +FAILED +imapc reconnect resend commands ...................................... : ok +imapc reconnect resend commands failed ............................... : ok +imapc reconnect mailbox .............................................. : ok +1 / 7 tests failed +------ + +Patch copied from upstream source repository: + +https://github.com/dovecot/core/commit/3a1c64363a64cdfe9153eb6292d8923f38955d82 + +[0] +https://dovecot.org/pipermail/dovecot/2017-April/107751.html + +From 3a1c64363a64cdfe9153eb6292d8923f38955d82 Mon Sep 17 00:00:00 2001 +From: Timo Sirainen +Date: Mon, 10 Apr 2017 17:07:28 +0300 +Subject: [PATCH] lib-imap-client: Fix reconnection + +There was already code for reconnection. We just shouldn't have gone very +far in imapc_connection_connect() if we were still waiting for reconnection +delay to pass. +--- + src/lib-imap-client/imapc-connection.c | 25 +++++++++---------------- + 1 file changed, 9 insertions(+), 16 deletions(-) + +diff --git a/src/lib-imap-client/imapc-connection.c b/src/lib-imap-client/imapc-connection.c +index 95067e6..6eaf1ab 100644 +--- a/src/lib-imap-client/imapc-connection.c ++++ b/src/lib-imap-client/imapc-connection.c +@@ -130,6 +130,7 @@ struct imapc_connection { + struct timeout *to_throttle, *to_throttle_shrink; + + unsigned int reconnecting:1; ++ unsigned int reconnect_waiting:1; + unsigned int reconnect_ok:1; + unsigned int idling:1; + unsigned int idle_stopping:1; +@@ -504,6 +505,7 @@ static bool imapc_connection_can_reconnect(struct imapc_connection *conn) + static void imapc_connection_reconnect(struct imapc_connection *conn) + { + conn->reconnect_ok = FALSE; ++ conn->reconnect_waiting = FALSE; + + if (conn->selected_box != NULL) + imapc_client_mailbox_reconnect(conn->selected_box); +@@ -536,6 +538,7 @@ imapc_connection_try_reconnect(struct imapc_connection *conn, + imapc_connection_disconnect_full(conn, TRUE); + conn->to = timeout_add(delay_msecs, imapc_connection_reconnect, conn); + conn->reconnect_count++; ++ conn->reconnect_waiting = TRUE; + } + } + } +@@ -1785,6 +1788,12 @@ void imapc_connection_connect(struct imapc_connection *conn) + + if (conn->fd != -1 || conn->dns_lookup != NULL) + return; ++ if (conn->reconnect_waiting) { ++ /* wait for the reconnection delay to finish before ++ doing anything. */ ++ return; ++ } ++ + conn->reconnecting = FALSE; + /* if we get disconnected before we've finished all the pending + commands, don't reconnect */ +@@ -1792,22 +1801,6 @@ void imapc_connection_connect(struct imapc_connection *conn) + array_count(&conn->cmd_send_queue); + + imapc_connection_input_reset(conn); +- +- int msecs_since_last_connect = +- timeval_diff_msecs(&ioloop_timeval, &conn->last_connect); +- if (!conn->reconnect_ok && +- msecs_since_last_connect < (int)conn->client->set.connect_retry_interval_msecs) { +- if (conn->to != NULL) +- timeout_remove(&conn->to); +- conn->reconnecting = TRUE; +- imapc_connection_set_disconnected(conn); +- /* don't wait longer than necessary */ +- unsigned int delay_msecs = +- conn->client->set.connect_retry_interval_msecs - +- msecs_since_last_connect; +- conn->to = timeout_add(delay_msecs, imapc_connection_reconnect, conn); +- return; +- } + conn->last_connect = ioloop_timeval; + + if (conn->client->set.debug) { -- 2.12.2 From unknown Tue Jun 17 01:50:45 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26446: [PATCH 1/1] gnu: dovecot: Update to 2.2.29 [fixes CVE-2017-2669]. Resent-From: Kei Kebreau Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 11 Apr 2017 17:59:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26446 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Leo Famulari Cc: 26446@debbugs.gnu.org Received: via spool by 26446-submit@debbugs.gnu.org id=B26446.149193353529878 (code B ref 26446); Tue, 11 Apr 2017 17:59:02 +0000 Received: (at 26446) by debbugs.gnu.org; 11 Apr 2017 17:58:55 +0000 Received: from localhost ([127.0.0.1]:43237 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cy044-0007lm-0I for submit@debbugs.gnu.org; Tue, 11 Apr 2017 13:58:55 -0400 Received: from lb1.openmailbox.org ([5.79.108.160]:39006 helo=mail.openmailbox.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cy03z-0007lb-Em for 26446@debbugs.gnu.org; Tue, 11 Apr 2017 13:58:51 -0400 Received: by mail.openmailbox.org (Postfix, from userid 20002) id 48F5F50C6D0; Tue, 11 Apr 2017 19:58:45 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=openmailbox.org; s=openmailbox; t=1491933526; bh=OV/qGVUfhWAtRqOreuf8+6kH3wSLAzqP+ejwJUI8HJQ=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=PDYUZhSbRWvhWRoICMzJtBzasZm2E7TpkBMYmV2kk8oC89hUeu+h+p3EeBX0txRTz bM9EqceU/+/mxzd2fEJP9bVyeYz7P++6tJOWx/W2EGd1oAvnhVJeiuAW07sAungTpL 6gXRnKHScIq5xOsYsb0RXXx85p/i0JlOKI7CYorQ= X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ZDZR003 X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=NO_RECEIVED,NO_RELAYS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=disabled version=3.4.0 From: Kei Kebreau DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=openmailbox.org; s=openmailbox; t=1491933524; bh=OV/qGVUfhWAtRqOreuf8+6kH3wSLAzqP+ejwJUI8HJQ=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=IcM5Z7BgOVqf26P5LLQg55lOYKWj2nQcVT0rHQujeuvchQ+4o+5G4yBEcke51wwI6 HPp+pRgM02VMgA9VIpYaF4x4nNFmRlPwus/aIWUXKj0S5FVs+C7GKszMWw6FU202ag gmaV9NB7DTV+uqWdmq1dnoTJ2jZqMWVlc7mbp/X0= In-Reply-To: <2919fdbaede514be581f29e0edc6531d3f7333af.1491930076.git.leo@famulari.name> (Leo Famulari's message of "Tue, 11 Apr 2017 13:01:16 -0400") References: <2919fdbaede514be581f29e0edc6531d3f7333af.1491930076.git.leo@famulari.name> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.1 (gnu/linux) Date: Tue, 11 Apr 2017 13:58:32 -0400 Message-ID: <87lgr63jxz.fsf@openmailbox.org> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-Spam-Score: 2.7 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Leo Famulari writes: > * gnu/packages/mail.scm (dovecot): Update to 2.2.29. > [source]: Use 'dovecot-fix-failing-test.patch'. > * gnu/packages/patches/dovecot-fix-failing-test.patch: New file. > * gnu/local.mk (dist_patch_DATA): Add it. > --- > gnu/local.mk | 1 + > gnu/packages/mail.scm | 8 +- > .../patches/dovecot-fix-failing-test.patch | 118 +++++++++++++++++++++ > 3 files changed, 124 insertions(+), 3 deletions(-) > create mode 100644 gnu/packages/patches/dovecot-fix-failing-test.patch > > diff --git a/gnu/local.mk b/gnu/local.mk > index f3a4e54af..212228d5c 100644 > --- a/gnu/local.mk > +++ b/gnu/local.mk > @@ -539, 6 +539, 7 @@ dist_patch_DATA = \ > %D%/packages/patches/diffutils-gets-undeclared.patch \ > %D%/packages/patches/doc++-include-directives.patch \ > %D%/packages/patches/doc++-segfault-fix.patch \ > + %D%/packages/patches/dovecot-fix-failing-test.patch \ > %D%/packages/patches/doxygen-test.patch \ > %D%/packages/patches/elfutils-tests-ptrace.patch \ > %D%/packages/patches/elixir-disable-failing-tests.patch \ > diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm > index 49fdb32e8..1a6c505ef 100644 > --- a/gnu/packages/mail.scm > +++ b/gnu/packages/mail.scm > @@ -1086, 15 +1086, 17 @@ facilities for checking incoming mail.") > (define-public dovecot > (package > (name "dovecot") > - (version "2.2.28") > + (version "2.2.29") > (source > (origin > (method url-fetch) > (uri (string-append "https://www.dovecot.org/releases/" > (version-major+minor version) "/" > name "-" version ".tar.gz")) > - (sha256 (base32 > - "098zpkmkk93372qnv6drgbfg8hp5mynspzc1735qgar6wdcqya70")))) > + (patches (search-patches "dovecot-fix-failing-test.patch")) > + (sha256 > + (base32 > + "19irf7b5mjqq68mrpdd38gxc0zp2nqib942kjp3aif3f2acylffr")))) > (build-system gnu-build-system) > (native-inputs > `(("pkg-config" , pkg-config))) > diff --git a/gnu/packages/patches/dovecot-fix-failing-test.patch b/gnu/packages/patches/dovecot-fix-failing-test.patch > new file mode 100644 > index 000000000..343bab03f > --- /dev/null > +++ [...] Content analysis details: (2.7 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 2.7 RCVD_IN_PSBL RBL: Received via a relay in PSBL [5.79.108.160 listed in psbl.surriel.com] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain 0.0 T_DKIM_INVALID DKIM-Signature header exists but is not valid X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 2.7 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Leo Famulari writes: > * gnu/packages/mail.scm (dovecot): Update to 2.2.29. > [source]: Use 'dovecot-fix-failing-test.patch'. > * gnu/packages/patches/dovecot-fix-failing-test.patch: New file. > * gnu/local.mk (dist_patch_DATA): Add it. > --- > gnu/local.mk | 1 + > gnu/packages/mail.scm | 8 +- > .../patches/dovecot-fix-failing-test.patch | 118 +++++++++++++++++++++ > 3 files changed, 124 insertions(+), 3 deletions(-) > create mode 100644 gnu/packages/patches/dovecot-fix-failing-test.patch > > diff --git a/gnu/local.mk b/gnu/local.mk > index f3a4e54af..212228d5c 100644 > --- a/gnu/local.mk > +++ b/gnu/local.mk > @@ -539,6 +539,7 @@ dist_patch_DATA = \ > %D%/packages/patches/diffutils-gets-undeclared.patch \ > %D%/packages/patches/doc++-include-directives.patch \ > %D%/packages/patches/doc++-segfault-fix.patch \ > + %D%/packages/patches/dovecot-fix-failing-test.patch \ > %D%/packages/patches/doxygen-test.patch \ > %D%/packages/patches/elfutils-tests-ptrace.patch \ > %D%/packages/patches/elixir-disable-failing-tests.patch \ > diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm > index 49fdb32e8..1a6c505ef 100644 > --- a/gnu/packages/mail.scm > +++ b/gnu/packages/mail.scm > @@ -1086,15 +1086,17 @@ facilities for checking incoming mail.") > (define-public dovecot > (package > (name "dovecot") > - (version "2.2.28") > + (version "2.2.29") > (source > (origin > (method url-fetch) > (uri (string-append "https://www.dovecot.org/releases/" > (version-major+minor version) "/" > name "-" version ".tar.gz")) > - (sha256 (base32 > - "098zpkmkk93372qnv6drgbfg8hp5mynspzc1735qgar6wdcqya70")))) > + (patches (search-patches "dovecot-fix-failing-test.patch")) > + (sha256 > + (base32 > + "19irf7b5mjqq68mrpdd38gxc0zp2nqib942kjp3aif3f2acylffr")))) > (build-system gnu-build-system) > (native-inputs > `(("pkg-config" ,pkg-config))) > diff --git a/gnu/packages/patches/dovecot-fix-failing-test.patch b/gnu/packages/patches/dovecot-fix-failing-test.patch > new file mode 100644 > index 000000000..343bab03f > --- /dev/null > +++ [...] Content analysis details: (2.7 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 2.7 RCVD_IN_PSBL RBL: Received via a relay in PSBL [5.79.108.160 listed in psbl.surriel.com] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain 0.0 T_DKIM_INVALID DKIM-Signature header exists but is not valid --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Leo Famulari writes: > * gnu/packages/mail.scm (dovecot): Update to 2.2.29. > [source]: Use 'dovecot-fix-failing-test.patch'. > * gnu/packages/patches/dovecot-fix-failing-test.patch: New file. > * gnu/local.mk (dist_patch_DATA): Add it. > --- > gnu/local.mk | 1 + > gnu/packages/mail.scm | 8 +- > .../patches/dovecot-fix-failing-test.patch | 118 +++++++++++++++= ++++++ > 3 files changed, 124 insertions(+), 3 deletions(-) > create mode 100644 gnu/packages/patches/dovecot-fix-failing-test.patch > > diff --git a/gnu/local.mk b/gnu/local.mk > index f3a4e54af..212228d5c 100644 > --- a/gnu/local.mk > +++ b/gnu/local.mk > @@ -539,6 +539,7 @@ dist_patch_DATA =3D \ > %D%/packages/patches/diffutils-gets-undeclared.patch \ > %D%/packages/patches/doc++-include-directives.patch \ > %D%/packages/patches/doc++-segfault-fix.patch \ > + %D%/packages/patches/dovecot-fix-failing-test.patch \ > %D%/packages/patches/doxygen-test.patch \ > %D%/packages/patches/elfutils-tests-ptrace.patch \ > %D%/packages/patches/elixir-disable-failing-tests.patch \ > diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm > index 49fdb32e8..1a6c505ef 100644 > --- a/gnu/packages/mail.scm > +++ b/gnu/packages/mail.scm > @@ -1086,15 +1086,17 @@ facilities for checking incoming mail.") > (define-public dovecot > (package > (name "dovecot") > - (version "2.2.28") > + (version "2.2.29") > (source > (origin > (method url-fetch) > (uri (string-append "https://www.dovecot.org/releases/" > (version-major+minor version) "/" > name "-" version ".tar.gz")) > - (sha256 (base32 > - "098zpkmkk93372qnv6drgbfg8hp5mynspzc1735qgar6wdcqya70"))= )) > + (patches (search-patches "dovecot-fix-failing-test.patch")) > + (sha256 > + (base32 > + "19irf7b5mjqq68mrpdd38gxc0zp2nqib942kjp3aif3f2acylffr")))) > (build-system gnu-build-system) > (native-inputs > `(("pkg-config" ,pkg-config))) > diff --git a/gnu/packages/patches/dovecot-fix-failing-test.patch b/gnu/pa= ckages/patches/dovecot-fix-failing-test.patch > new file mode 100644 > index 000000000..343bab03f > --- /dev/null > +++ b/gnu/packages/patches/dovecot-fix-failing-test.patch > @@ -0,0 +1,118 @@ > +This patch fixes a test failure in dovecot 2.2.29, like this [0]: > + > +------ > +Making check in lib-imap-client > +make[2]: Entering directory > +`/builddir/build/BUILD/dovecot-2.2.29/src/lib-imap-client' > +for bin in test-imapc-client; do \ > + if ! ./$bin; then exit 1; fi; \ > + done > +Warning: imapc(127.0.0.1:0): connect(127.0.0.1, 0) failed: Connection > +refused - reconnecting (delay 10 ms) > +Error: imapc(127.0.0.1:0): connect(127.0.0.1, 0) failed: Connection > +refused - disconnecting > +test: random seed #1 was 1492054294 > +imapc connect failed ................................................. := ok > +Warning: imapc(127.0.0.1:42704): connect(127.0.0.1, 42704) timed out > +after 0 seconds - reconnecting (delay 0 ms) > +Error: imapc(127.0.0.1:42704): connect(127.0.0.1, 42704) timed out after > +0 seconds - disconnecting > +imapc banner hangs ................................................... := ok > +Warning: imapc(127.0.0.1:36762): Authentication timed out after 0 > +seconds - reconnecting (delay 0 ms) > +Error: imapc(127.0.0.1:36762): Authentication failed: Disconnected from > +server > +imapc login hangs .................................................... := ok > +test-imapc-client.c:358: Assert failed: test_imapc_cmd_last_reply_pop() > +=3D=3D IMAPC_COMMAND_STATE_OK > +imapc reconnect ...................................................... : > +FAILED > +imapc reconnect resend commands ...................................... := ok > +imapc reconnect resend commands failed ............................... := ok > +imapc reconnect mailbox .............................................. := ok > +1 / 7 tests failed > +------ > + > +Patch copied from upstream source repository: > + > +https://github.com/dovecot/core/commit/3a1c64363a64cdfe9153eb6292d8923f3= 8955d82 > + > +[0] > +https://dovecot.org/pipermail/dovecot/2017-April/107751.html > + > +From 3a1c64363a64cdfe9153eb6292d8923f38955d82 Mon Sep 17 00:00:00 2001 > +From: Timo Sirainen > +Date: Mon, 10 Apr 2017 17:07:28 +0300 > +Subject: [PATCH] lib-imap-client: Fix reconnection > + > +There was already code for reconnection. We just shouldn't have gone very > +far in imapc_connection_connect() if we were still waiting for reconnect= ion > +delay to pass. > +--- > + src/lib-imap-client/imapc-connection.c | 25 +++++++++---------------- > + 1 file changed, 9 insertions(+), 16 deletions(-) > + > +diff --git a/src/lib-imap-client/imapc-connection.c b/src/lib-imap-clien= t/imapc-connection.c > +index 95067e6..6eaf1ab 100644 > +--- a/src/lib-imap-client/imapc-connection.c > ++++ b/src/lib-imap-client/imapc-connection.c > +@@ -130,6 +130,7 @@ struct imapc_connection { > + struct timeout *to_throttle, *to_throttle_shrink; > +=20 > + unsigned int reconnecting:1; > ++ unsigned int reconnect_waiting:1; > + unsigned int reconnect_ok:1; > + unsigned int idling:1; > + unsigned int idle_stopping:1; > +@@ -504,6 +505,7 @@ static bool imapc_connection_can_reconnect(struct im= apc_connection *conn) > + static void imapc_connection_reconnect(struct imapc_connection *conn) > + { > + conn->reconnect_ok =3D FALSE; > ++ conn->reconnect_waiting =3D FALSE; > +=20 > + if (conn->selected_box !=3D NULL) > + imapc_client_mailbox_reconnect(conn->selected_box); > +@@ -536,6 +538,7 @@ imapc_connection_try_reconnect(struct imapc_connecti= on *conn, > + imapc_connection_disconnect_full(conn, TRUE); > + conn->to =3D timeout_add(delay_msecs, imapc_connection_reconnect, co= nn); > + conn->reconnect_count++; > ++ conn->reconnect_waiting =3D TRUE; > + } > + } > + } > +@@ -1785,6 +1788,12 @@ void imapc_connection_connect(struct imapc_connec= tion *conn) > +=20 > + if (conn->fd !=3D -1 || conn->dns_lookup !=3D NULL) > + return; > ++ if (conn->reconnect_waiting) { > ++ /* wait for the reconnection delay to finish before > ++ doing anything. */ > ++ return; > ++ } > ++ > + conn->reconnecting =3D FALSE; > + /* if we get disconnected before we've finished all the pending > + commands, don't reconnect */ > +@@ -1792,22 +1801,6 @@ void imapc_connection_connect(struct imapc_connec= tion *conn) > + array_count(&conn->cmd_send_queue); > +=20 > + imapc_connection_input_reset(conn); > +- > +- int msecs_since_last_connect =3D > +- timeval_diff_msecs(&ioloop_timeval, &conn->last_connect); > +- if (!conn->reconnect_ok && > +- msecs_since_last_connect < (int)conn->client->set.connect_retry_in= terval_msecs) { > +- if (conn->to !=3D NULL) > +- timeout_remove(&conn->to); > +- conn->reconnecting =3D TRUE; > +- imapc_connection_set_disconnected(conn); > +- /* don't wait longer than necessary */ > +- unsigned int delay_msecs =3D > +- conn->client->set.connect_retry_interval_msecs - > +- msecs_since_last_connect; > +- conn->to =3D timeout_add(delay_msecs, imapc_connection_reconnect, con= n); > +- return; > +- } > + conn->last_connect =3D ioloop_timeval; > +=20 > + if (conn->client->set.debug) { What a coincidence! I was just looking at upgrading this package. LGTM. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEg7ZwOtzKO2lLzi2m5qXuPBlGeg0FAljtGUgACgkQ5qXuPBlG eg0xcg/7BReB5AuId469HUn/ZSTX+sNkwXRwgnjYeSRjQmjxguIM89RbSJVBIQvJ IRsJyvAODGfg2tGjBVfzmcxUi6A5g7blUtu8oOqzGMFr3Nk0eCK1vTYzi7kFux8N lk6SYwzCcqydWNOYmuuOZ6APjWoY5cR/4dXCEvrYrCiozHTMcYPz7JdOG8fLLMux s5R4ZabdSQLSIWQdmtwFzYPq2SPR/symv9M7DygjJhX/tLZDEBoTYGTCsbRoquNS dVo36ubmkLyAV/axwUWOvcwqtd5iPWDvoIN29xv1zP9Ru5Y+p/Vv3ZdRDuUYxi9+ 565POrDY9iuptaFibPYvhkALu7pmcTJsmwsh4LoSnAtD87Uis2EsvO29xaFLoFFd HQrXJ3X62awJsVLTVr4MC19FF3NosP/8/+8OEjD2YYvNyqXMAMRNbh6XyDfl4R4g e5F6VliKlLTyWCkWVyvhiRD2GRxjhKIT4PxibtZYQVBqZpVouP6FqrY8QU5VZJ3A JMiBJM2osNyS/z0FjmwrLmFjeYDrrKzpyDJOiR3Ebth0HDeA/Bagb1NttKsSk+Ih UvFkq2KV8Hqpps0F93RWSkHU2v1sZqXDA/+C+q01rzzXP+pRvYweg5G/LBt2VBxj QD9aGWuNVL0Z05xw2eB0yBdzuSYeOOwXcVuMwlsco/s/14rRmh0= =e553 -----END PGP SIGNATURE----- --=-=-=-- From unknown Tue Jun 17 01:50:45 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26446: [PATCH 1/1] gnu: dovecot: Update to 2.2.29 [fixes CVE-2017-2669]. Resent-From: Tobias Geerinckx-Rice Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 11 Apr 2017 18:16:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26446 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: kei@openmailbox.org, leo@famulari.name Cc: 26446@debbugs.gnu.org Received: via spool by 26446-submit@debbugs.gnu.org id=B26446.149193452531499 (code B ref 26446); Tue, 11 Apr 2017 18:16:01 +0000 Received: (at 26446) by debbugs.gnu.org; 11 Apr 2017 18:15:25 +0000 Received: from localhost ([127.0.0.1]:43262 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cy0K4-0008Bz-QH for submit@debbugs.gnu.org; Tue, 11 Apr 2017 14:15:24 -0400 Received: from relay8-d.mail.gandi.net ([217.70.183.201]:37526) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cy0K1-0008Bp-SZ for 26446@debbugs.gnu.org; Tue, 11 Apr 2017 14:15:23 -0400 Received: from mfilter31-d.gandi.net (mfilter31-d.gandi.net [217.70.178.162]) by relay8-d.mail.gandi.net (Postfix) with ESMTP id 08EB8405B6; Tue, 11 Apr 2017 20:15:21 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mfilter31-d.gandi.net Received: from relay8-d.mail.gandi.net ([IPv6:::ffff:217.70.183.201]) by mfilter31-d.gandi.net (mfilter31-d.gandi.net [::ffff:10.0.15.180]) (amavisd-new, port 10024) with ESMTP id KuOn2oysP3af; Tue, 11 Apr 2017 20:12:13 +0200 (CEST) X-Originating-IP: 81.240.210.34 Received: from [192.168.1.24] (34.210-240-81.adsl-dyn.isp.belgacom.be [81.240.210.34]) (Authenticated sender: me@tobias.gr) by relay8-d.mail.gandi.net (Postfix) with ESMTPSA id 17FC6406BF; Tue, 11 Apr 2017 20:12:11 +0200 (CEST) References: <2919fdbaede514be581f29e0edc6531d3f7333af.1491930076.git.leo@famulari.name> <87lgr63jxz.fsf@openmailbox.org> From: Tobias Geerinckx-Rice Message-ID: Date: Tue, 11 Apr 2017 20:13:15 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.8.0 MIME-Version: 1.0 In-Reply-To: <87lgr63jxz.fsf@openmailbox.org> Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="W3Q6Aj51o20sVqmSfj4nUo8dj2LC0UxmX" X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --W3Q6Aj51o20sVqmSfj4nUo8dj2LC0UxmX Content-Type: multipart/mixed; boundary="r4RbkEB2qJhteAbuS4rnfomK84RKBFGxm"; protected-headers="v1" From: Tobias Geerinckx-Rice To: kei@openmailbox.org, leo@famulari.name Cc: 26446@debbugs.gnu.org Message-ID: Subject: Re: bug#26446: [PATCH 1/1] gnu: dovecot: Update to 2.2.29 [fixes CVE-2017-2669]. References: <2919fdbaede514be581f29e0edc6531d3f7333af.1491930076.git.leo@famulari.name> <87lgr63jxz.fsf@openmailbox.org> In-Reply-To: <87lgr63jxz.fsf@openmailbox.org> --r4RbkEB2qJhteAbuS4rnfomK84RKBFGxm Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 11/04/17 19:58, Kei Kebreau wrote: > What a coincidence! I was just looking at upgrading this package. That makes three of us :-) > LGTM. Indeed! Thanks for keeping on top of these, Leo. Kind regards, T G-R --r4RbkEB2qJhteAbuS4rnfomK84RKBFGxm-- --W3Q6Aj51o20sVqmSfj4nUo8dj2LC0UxmX Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- iQFBBAEBCgArFiEEeqzfDJ8DWw5d4xcqkczbm0hUG5kFAljtHLsNHG1lQHRvYmlh cy5ncgAKCRCRzNubSFQbmXG2B/4rn9epO+W74pRKmYRTcqfd7EbaIK3e6llxMYMO qUqxD7JIPZ1ijlfV1am/m5ri0lvSjNzDIXaOcwpYTGUei+d1pYU8UT4WKU+k7FeV unbhV7kWrjTRYhrjoS20d0neBT/iHAETRzKzLQT3Kr3wNHnyUaxkH2YPPsKPeEgW tNdcNwyyZunrhg7C1PhzGjT1FB/WAUFC1TGYiNgvXX00U8Aw9SxC0tllF7OzYtaj Udqj23vr8MpVqP6RT7DZavTZ91oiRv+rVikLCvyVlTkK/487tYFAijnkorjWV2Jq xPTNTK7YnQQzZgnYWc2TxdNSrRtcbCkgz8ruyH8AX8dQvrnY =nkOZ -----END PGP SIGNATURE----- --W3Q6Aj51o20sVqmSfj4nUo8dj2LC0UxmX-- From unknown Tue Jun 17 01:50:45 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Leo Famulari Subject: bug#26446: closed (Re: bug#26446: [PATCH 1/1] gnu: dovecot: Update to 2.2.29 [fixes CVE-2017-2669].) Message-ID: References: <20170412012201.GA8075@jasmine> <2919fdbaede514be581f29e0edc6531d3f7333af.1491930076.git.leo@famulari.name> X-Gnu-PR-Message: they-closed 26446 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 26446@debbugs.gnu.org Date: Wed, 12 Apr 2017 01:23:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1491960182-13664-1" This is a multi-part message in MIME format... ------------=_1491960182-13664-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #26446: [PATCH 1/1] gnu: dovecot: Update to 2.2.29 [fixes CVE-2017-2669]. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 26446@debbugs.gnu.org. --=20 26446: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D26446 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1491960182-13664-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 26446-done) by debbugs.gnu.org; 12 Apr 2017 01:22:06 +0000 Received: from localhost ([127.0.0.1]:43490 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cy6yz-0003X1-Tu for submit@debbugs.gnu.org; Tue, 11 Apr 2017 21:22:06 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:50693) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cy6yx-0003Ws-UJ for 26446-done@debbugs.gnu.org; Tue, 11 Apr 2017 21:22:04 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 525AA20BBC; Tue, 11 Apr 2017 21:22:03 -0400 (EDT) Received: from frontend2 ([10.202.2.161]) by compute4.internal (MEProxy); Tue, 11 Apr 2017 21:22:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=cc:content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=mesmtp; bh=1vbBwrY7L/RZ/ah6/8BO1wLDx3DJaPxv7fiXDU gaHhw=; b=RNYugV6+/axUw1azoUe/643rGsMfESh4ZfaQ2zyMFxVjCAoMwafFmD MzQUVmvVvCUOYZdA7Pe2cVH4gQXasXTVaJH3nRlB0bZ3w1HvtOxyDIAbNscLMLs9 R+S1pwqeADtetJnWbyzyeTjgLvvaWWZQkknQTkrUfcCxvzwZ25H7o= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=1vbBwrY7L/RZ/ah6/8 BO1wLDx3DJaPxv7fiXDUgaHhw=; b=axXFAWkvOBMtSFxHOXjEq1VZKNlo0+S8Zf IBMhZ6U1bp4Xc2b5beKv++lq7VzfvGfAsHBiM0MnifZu24A41f87J6PyjcI8+Pc9 hKzE2Ws4ONNCwUeKgMq2G7AF6HtXs6C9i6W0xitVQCvwlN2uKV7Ij6g/7WOnTvw2 VcJ8Y2FHNe9gk4HQ2EHxP6axSK6OnPdqar1WhjC6tZ/p1B/Gui/iPKyKBTepKOxh nmphvbVMOE/ETlndOK989AViVXStdZnsBx0+vIE3q6oP41WTguMJV/YbY5YtXjQR dj8QwiYnzdFs1Qi7b9ohzvTvLtquwVAb3JcIKX5TcptwJErsbNyg== X-ME-Sender: X-Sasl-enc: FEIdkXOEz/vnjrcWcZBffWUtst2nVLXYuH7eVwOyFs8R 1491960123 Received: from localhost (c-73-165-108-70.hsd1.pa.comcast.net [73.165.108.70]) by mail.messagingengine.com (Postfix) with ESMTPA id 117CD24432; Tue, 11 Apr 2017 21:22:03 -0400 (EDT) Date: Tue, 11 Apr 2017 21:22:01 -0400 From: Leo Famulari To: Tobias Geerinckx-Rice Subject: Re: bug#26446: [PATCH 1/1] gnu: dovecot: Update to 2.2.29 [fixes CVE-2017-2669]. Message-ID: <20170412012201.GA8075@jasmine> References: <2919fdbaede514be581f29e0edc6531d3f7333af.1491930076.git.leo@famulari.name> <87lgr63jxz.fsf@openmailbox.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="zhXaljGHf11kAtnf" Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.8.0 (2017-02-23) X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 26446-done Cc: 26446-done@debbugs.gnu.org, kei@openmailbox.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) --zhXaljGHf11kAtnf Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Apr 11, 2017 at 08:13:15PM +0200, Tobias Geerinckx-Rice wrote: > On 11/04/17 19:58, Kei Kebreau wrote: > > What a coincidence! I was just looking at upgrading this package. >=20 > That makes three of us :-) >=20 > > LGTM. >=20 > Indeed! Thanks for keeping on top of these, Leo. Thanks for the review! Pushed as 0adb47bdc7d15e53b8c4c443ad19ebdfcc4177a0. --zhXaljGHf11kAtnf Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEsFFZSPHn08G5gDigJkb6MLrKfwgFAljtgTkACgkQJkb6MLrK fwiujw//e5tlacKxKb2Q173m94VB2zSr0nEiUB4vCYFFOcLPk0AyhmoztLInD6f7 UbRrK5FenTgtjhY/YG1zSEbI1ylBjqL20DGcUvJevYGHm4O0hqaHMftczr68F4qu 4c4+uYPEgUKOI8PqCQNs/PreaFrfbhXxWBfGUS6UslOfrs+L/170JY3b3GwC7saW wpbe0yiq2ycM/y1Qn2SBimfguyOnWpyJaGehEJIQ5zyKgWL1ublGQKx53oPF7oQn /Tf/uPgKA0GxQdDgUxdK00UKAzeTqSoZ9jgsZrLJb4bDzbvC0lGK61wASyDTqMvN OH7OvAg0yFvD6HV/01ImeoBls60ol4CEMHoe0zqxGq51aUTM9Slh4hKhz9bCQxld ezC97IFjAjioHDwhYuxPkbofC6tIAZADRiVQKjy0fmg5eho+PFlUekH1vlb7KdOr lAzaPlCpLWi7cL0lb0e+L2jdjd9HBFg2y2iTmRqUxSnyp1WW1o3SByR4rjzUyoix 95TUUehfr/FLNa5v7FdKb3qVOCGxTz8/EnX6qyUdGromzP4hyDvl7kCdJI0j8N8r eI7F9DvZ4+eY53orEipaV6MAd5PIWk+a238PkN4A3KPY2IfU88YJns6FLxG1WAjt VyMST4+GuZqQ1th2/aokNU2r6Y990G2onYJl4UxrZ+jUdd1UjII= =Didj -----END PGP SIGNATURE----- --zhXaljGHf11kAtnf-- ------------=_1491960182-13664-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 11 Apr 2017 17:01:47 +0000 Received: from localhost ([127.0.0.1]:43195 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cxzAl-0004df-1n for submit@debbugs.gnu.org; Tue, 11 Apr 2017 13:01:47 -0400 Received: from eggs.gnu.org ([208.118.235.92]:54715) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cxzAh-0004dQ-76 for submit@debbugs.gnu.org; Tue, 11 Apr 2017 13:01:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cxzAa-0006ls-Bv for submit@debbugs.gnu.org; Tue, 11 Apr 2017 13:01:33 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:35493) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cxzAa-0006lm-8q for submit@debbugs.gnu.org; Tue, 11 Apr 2017 13:01:32 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45676) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cxzAY-00072O-Al for guix-patches@gnu.org; Tue, 11 Apr 2017 13:01:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cxzAU-0006kZ-C1 for guix-patches@gnu.org; Tue, 11 Apr 2017 13:01:30 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:49771) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cxzAU-0006kF-1N for guix-patches@gnu.org; Tue, 11 Apr 2017 13:01:26 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 0CD9F20993; Tue, 11 Apr 2017 13:01:24 -0400 (EDT) Received: from frontend1 ([10.202.2.160]) by compute4.internal (MEProxy); Tue, 11 Apr 2017 13:01:24 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=date:from:message-id:subject:to:x-me-sender:x-me-sender :x-sasl-enc:x-sasl-enc; s=mesmtp; bh=4mENW748msbovJJgDpXmBo+QFs2 8akNUYKuKddogLoQ=; b=t5jQXrmeI/rEuXQiuNFpxzCyRIRyFyjFza4bpXFdoOB VjHF9MMHb1O5O8L15cpJW9smXgLAyIBVHDWlq+plcd9+u2At4zf1B14jotoI7NkP AuJFvLWTw3I190zlryEOxwzvPNf0RNizXL4kHbpX/ea+2KmRti2LZqfSHp4sbYJQ = DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=date:from:message-id:subject:to :x-me-sender:x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=4mENW7 48msbovJJgDpXmBo+QFs28akNUYKuKddogLoQ=; b=KnlBf+RysyP68M5zNHp7it +khxQ80fMO/9bGcWxR9pX6h3mUC3ctbVDdGMRP08PH0OfPfW1LEz3Au7BEoZpOqw R6PZ2dp1a2UsCO1bcVpCDsgAm9pKtFfQJ6JeLcwxGa1Z98WpywHYwwmn+KHm+nkp nk64lTaMR09jn5U1k37mD6QS8h4YizQRyxfleVKUiyiWsg0MqAyzqMKHV5DraGin nTj/BGVlZAAyhNNirY+1v/BjLFLpaNHcMBaXqfqVfURqZmNkIc0thRBtBc02bZ9X 7Lbja8JotTKmgcftLlSvj2hWVX2HVxw2Qqwdt/1tJ/EJTnoo9Q2Cn+EcIEUozMYA == X-ME-Sender: X-Sasl-enc: wdusqgZnphmzMVqOqQPwbVLEb1Q0xz46xeIuCwIPGI9P 1491930083 Received: from localhost.localdomain (unknown [172.56.29.149]) by mail.messagingengine.com (Postfix) with ESMTPA id 5BA687E04B for ; Tue, 11 Apr 2017 13:01:23 -0400 (EDT) From: Leo Famulari To: guix-patches@gnu.org Subject: [PATCH 1/1] gnu: dovecot: Update to 2.2.29 [fixes CVE-2017-2669]. Date: Tue, 11 Apr 2017 13:01:16 -0400 Message-Id: <2919fdbaede514be581f29e0edc6531d3f7333af.1491930076.git.leo@famulari.name> X-Mailer: git-send-email 2.12.2 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.1 (----) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.1 (----) * gnu/packages/mail.scm (dovecot): Update to 2.2.29. [source]: Use 'dovecot-fix-failing-test.patch'. * gnu/packages/patches/dovecot-fix-failing-test.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/mail.scm | 8 +- .../patches/dovecot-fix-failing-test.patch | 118 +++++++++++++++++++++ 3 files changed, 124 insertions(+), 3 deletions(-) create mode 100644 gnu/packages/patches/dovecot-fix-failing-test.patch diff --git a/gnu/local.mk b/gnu/local.mk index f3a4e54af..212228d5c 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -539,6 +539,7 @@ dist_patch_DATA = \ %D%/packages/patches/diffutils-gets-undeclared.patch \ %D%/packages/patches/doc++-include-directives.patch \ %D%/packages/patches/doc++-segfault-fix.patch \ + %D%/packages/patches/dovecot-fix-failing-test.patch \ %D%/packages/patches/doxygen-test.patch \ %D%/packages/patches/elfutils-tests-ptrace.patch \ %D%/packages/patches/elixir-disable-failing-tests.patch \ diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 49fdb32e8..1a6c505ef 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1086,15 +1086,17 @@ facilities for checking incoming mail.") (define-public dovecot (package (name "dovecot") - (version "2.2.28") + (version "2.2.29") (source (origin (method url-fetch) (uri (string-append "https://www.dovecot.org/releases/" (version-major+minor version) "/" name "-" version ".tar.gz")) - (sha256 (base32 - "098zpkmkk93372qnv6drgbfg8hp5mynspzc1735qgar6wdcqya70")))) + (patches (search-patches "dovecot-fix-failing-test.patch")) + (sha256 + (base32 + "19irf7b5mjqq68mrpdd38gxc0zp2nqib942kjp3aif3f2acylffr")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) diff --git a/gnu/packages/patches/dovecot-fix-failing-test.patch b/gnu/packages/patches/dovecot-fix-failing-test.patch new file mode 100644 index 000000000..343bab03f --- /dev/null +++ b/gnu/packages/patches/dovecot-fix-failing-test.patch @@ -0,0 +1,118 @@ +This patch fixes a test failure in dovecot 2.2.29, like this [0]: + +------ +Making check in lib-imap-client +make[2]: Entering directory +`/builddir/build/BUILD/dovecot-2.2.29/src/lib-imap-client' +for bin in test-imapc-client; do \ + if ! ./$bin; then exit 1; fi; \ + done +Warning: imapc(127.0.0.1:0): connect(127.0.0.1, 0) failed: Connection +refused - reconnecting (delay 10 ms) +Error: imapc(127.0.0.1:0): connect(127.0.0.1, 0) failed: Connection +refused - disconnecting +test: random seed #1 was 1492054294 +imapc connect failed ................................................. : ok +Warning: imapc(127.0.0.1:42704): connect(127.0.0.1, 42704) timed out +after 0 seconds - reconnecting (delay 0 ms) +Error: imapc(127.0.0.1:42704): connect(127.0.0.1, 42704) timed out after +0 seconds - disconnecting +imapc banner hangs ................................................... : ok +Warning: imapc(127.0.0.1:36762): Authentication timed out after 0 +seconds - reconnecting (delay 0 ms) +Error: imapc(127.0.0.1:36762): Authentication failed: Disconnected from +server +imapc login hangs .................................................... : ok +test-imapc-client.c:358: Assert failed: test_imapc_cmd_last_reply_pop() +== IMAPC_COMMAND_STATE_OK +imapc reconnect ...................................................... : +FAILED +imapc reconnect resend commands ...................................... : ok +imapc reconnect resend commands failed ............................... : ok +imapc reconnect mailbox .............................................. : ok +1 / 7 tests failed +------ + +Patch copied from upstream source repository: + +https://github.com/dovecot/core/commit/3a1c64363a64cdfe9153eb6292d8923f38955d82 + +[0] +https://dovecot.org/pipermail/dovecot/2017-April/107751.html + +From 3a1c64363a64cdfe9153eb6292d8923f38955d82 Mon Sep 17 00:00:00 2001 +From: Timo Sirainen +Date: Mon, 10 Apr 2017 17:07:28 +0300 +Subject: [PATCH] lib-imap-client: Fix reconnection + +There was already code for reconnection. We just shouldn't have gone very +far in imapc_connection_connect() if we were still waiting for reconnection +delay to pass. +--- + src/lib-imap-client/imapc-connection.c | 25 +++++++++---------------- + 1 file changed, 9 insertions(+), 16 deletions(-) + +diff --git a/src/lib-imap-client/imapc-connection.c b/src/lib-imap-client/imapc-connection.c +index 95067e6..6eaf1ab 100644 +--- a/src/lib-imap-client/imapc-connection.c ++++ b/src/lib-imap-client/imapc-connection.c +@@ -130,6 +130,7 @@ struct imapc_connection { + struct timeout *to_throttle, *to_throttle_shrink; + + unsigned int reconnecting:1; ++ unsigned int reconnect_waiting:1; + unsigned int reconnect_ok:1; + unsigned int idling:1; + unsigned int idle_stopping:1; +@@ -504,6 +505,7 @@ static bool imapc_connection_can_reconnect(struct imapc_connection *conn) + static void imapc_connection_reconnect(struct imapc_connection *conn) + { + conn->reconnect_ok = FALSE; ++ conn->reconnect_waiting = FALSE; + + if (conn->selected_box != NULL) + imapc_client_mailbox_reconnect(conn->selected_box); +@@ -536,6 +538,7 @@ imapc_connection_try_reconnect(struct imapc_connection *conn, + imapc_connection_disconnect_full(conn, TRUE); + conn->to = timeout_add(delay_msecs, imapc_connection_reconnect, conn); + conn->reconnect_count++; ++ conn->reconnect_waiting = TRUE; + } + } + } +@@ -1785,6 +1788,12 @@ void imapc_connection_connect(struct imapc_connection *conn) + + if (conn->fd != -1 || conn->dns_lookup != NULL) + return; ++ if (conn->reconnect_waiting) { ++ /* wait for the reconnection delay to finish before ++ doing anything. */ ++ return; ++ } ++ + conn->reconnecting = FALSE; + /* if we get disconnected before we've finished all the pending + commands, don't reconnect */ +@@ -1792,22 +1801,6 @@ void imapc_connection_connect(struct imapc_connection *conn) + array_count(&conn->cmd_send_queue); + + imapc_connection_input_reset(conn); +- +- int msecs_since_last_connect = +- timeval_diff_msecs(&ioloop_timeval, &conn->last_connect); +- if (!conn->reconnect_ok && +- msecs_since_last_connect < (int)conn->client->set.connect_retry_interval_msecs) { +- if (conn->to != NULL) +- timeout_remove(&conn->to); +- conn->reconnecting = TRUE; +- imapc_connection_set_disconnected(conn); +- /* don't wait longer than necessary */ +- unsigned int delay_msecs = +- conn->client->set.connect_retry_interval_msecs - +- msecs_since_last_connect; +- conn->to = timeout_add(delay_msecs, imapc_connection_reconnect, conn); +- return; +- } + conn->last_connect = ioloop_timeval; + + if (conn->client->set.debug) { -- 2.12.2 ------------=_1491960182-13664-1--