From patchwork Thu Apr 27 21:14:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Morgan Smith X-Patchwork-Id: 49602 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 7E86327BBEA; Thu, 27 Apr 2023 22:26:23 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2AE0827BBE2 for ; Thu, 27 Apr 2023 22:26:22 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ps97u-0007zd-GK; Thu, 27 Apr 2023 17:26:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ps97t-0007zT-Fw for guix-patches@gnu.org; Thu, 27 Apr 2023 17:26:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ps97q-0008Jh-QC for guix-patches@gnu.org; Thu, 27 Apr 2023 17:26:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ps97q-0007r7-Kl for guix-patches@gnu.org; Thu, 27 Apr 2023 17:26:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63134] [PATCH] gnu: isync: Add patch to improve openssl-3 compatibility. Resent-From: Morgan.J.Smith@outlook.com Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 27 Apr 2023 21:26:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 63134 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63134@debbugs.gnu.org Cc: Morgan Smith X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.168263075630184 (code B ref -1); Thu, 27 Apr 2023 21:26:02 +0000 Received: (at submit) by debbugs.gnu.org; 27 Apr 2023 21:25:56 +0000 Received: from localhost ([127.0.0.1]:59944 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ps97k-0007ql-3Q for submit@debbugs.gnu.org; Thu, 27 Apr 2023 17:25:56 -0400 Received: from lists.gnu.org ([209.51.188.17]:43848) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ps97h-0007qb-74 for submit@debbugs.gnu.org; Thu, 27 Apr 2023 17:25:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ps97g-0007yw-60 for guix-patches@gnu.org; Thu, 27 Apr 2023 17:25:52 -0400 Received: from mail-mw2nam04olkn20827.outbound.protection.outlook.com ([2a01:111:f400:7e8c::827] helo=NAM04-MW2-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ps97A-00081q-H8 for guix-patches@gnu.org; Thu, 27 Apr 2023 17:25:51 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=X8zgAhGVmEvhty04UHCHq8a0Un7YtVMibrFynp8slR9HXqv4jd5bSiUiI7i8IVbOsH2G35HkfgCbY/nG8kIFy9luqG5gojAfzRU30GO/uZX6DytRFKDX63GvgLXi0cXIkKEieC1PZcN8r8n6a1y7tgU+/3k3/S17+8xStzK+72Mg7Sxnb0tCAJdMfjhkqa5KpDvwsma6St70cBon/fZ8OhYOY2Lp8G6eLnqfdUSoAEMhnvjkNA0o6pAJC3rtPmNaAgFyDEuW6LKcWFSCXysHrkBh9q5VycDjPhe8FuThaAASx4OjznqgiCgp1KVebhh67hE1xi2cjwPcQqcQeZlnVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=xQnGckh7uljBg7ocsQFygMOxjoCD+go23rA8I+l0RRU=; b=YM3kc0suTqE9kxI7H5EXCTQA4YppIQyGL055+nZd+gyJ3CinQFQL0KN8H75lUwjLYJmikrUHnZmxQxzfMHLyni+kpkIdDl0RmhVr325vx/h5v0nolYgkLTpLGrJxsBZseDAQSaJPTpe3uDE0v0zLkJ25x1v7BI+idVVbvHRVKpCIP0a8Z+HP7iYFrgqH1pmUGbMuihfakNAdHwC0peBU+YqNxCxGhW+sObMs2CYIzacqyzkYAkJDkwNK+jApHP0S0G3DN5HJ8oxKxvyswXkq9hP8iwd4Yc5OuzLpMDuTnBe+ds1B8GZvhWkzjjlEXLYwbo1O/i6Mh+FTEzaWYobWsg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=xQnGckh7uljBg7ocsQFygMOxjoCD+go23rA8I+l0RRU=; b=uqxuzFjdMtpWt13Ao3+c7jJ2j4V1NZLyXQvRMsWgbf6vBp7gOtxhesfb4H5TNiB7OgML+0U02/mRb80KjGDvIZl2YPn8HkrUviDCVAZf+yfcSc3XG8o/F5NLNv6q9lOpv0YYlkUgmTC2DqLDlKRMgAbYR3N2x2WtfHD7SzV4GxwPrOv+rgdks4einiXwXgKWA3j5rqXpvTsmTQ4t9UZZiwrl1myAP8HAjPtXhoDLfg0RW8BkAL+CJY2C4yJKb/yBn6VFQOR8Xn2wAHkuhSbiPlJNJD07SOuSfgqvjNstLMoxI8qX43gI279GEubiHqbs+uYta4To8jAuVv8ZY/ccpw== Received: from DM5PR03MB3163.namprd03.prod.outlook.com (2603:10b6:4:40::24) by SJ0PR03MB5453.namprd03.prod.outlook.com (2603:10b6:a03:28e::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6340.21; Thu, 27 Apr 2023 21:20:16 +0000 Received: from DM5PR03MB3163.namprd03.prod.outlook.com ([fe80::9a6e:a037:320a:19c6]) by DM5PR03MB3163.namprd03.prod.outlook.com ([fe80::9a6e:a037:320a:19c6%6]) with mapi id 15.20.6319.028; Thu, 27 Apr 2023 21:20:16 +0000 From: Morgan.J.Smith@outlook.com Date: Thu, 27 Apr 2023 17:14:47 -0400 Message-ID: X-Mailer: git-send-email 2.39.2 X-TMN: [f9LP7NSC0EXwHZkZluDakKrUZu/jwB2U] X-ClientProxiedBy: YQZPR01CA0091.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c01:84::26) To DM5PR03MB3163.namprd03.prod.outlook.com (2603:10b6:4:40::24) X-Microsoft-Original-Message-ID: <20230427211446.7060-1-Morgan.J.Smith@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM5PR03MB3163:EE_|SJ0PR03MB5453:EE_ X-MS-Office365-Filtering-Correlation-Id: ce7fc95e-b64a-43fc-41b3-08db4765324b X-MS-Exchange-SLBlob-MailProps: laRBL560oLQMdNZMLQ9pbkfFH0IYSDd2KR2+bW4gb2JegczTqXeWKDwg3JLGm3ar+6AmmOGg/4wnXvpp9YHSdTOvHO9/cU66/FpsW+giBWybF/ozYn+Gz7EHfTHc4uBaEuh+wg1F57HVxIRA/HQLdnuek4FafwAbBOZzEWMpVOU89DKL8+fmDOShZiv3NqjsNQiJSVtqHW/Rqy9PKf3sjDIR3BnlJsEiDxo2rlvLsK42WxBbA0dM05jxGuySV/aQuKM7p3XCxM3epJxf0YxfqNjY5Z6TSXIpcY1lM+oKQbqnPMSCzPzkszq4SBTTzIGZjFpfGGbUduEss0uK1FPjAMp2DTDPWfmSbCCPssIriI6/4OzihE2toEV+EzVNifI5sEvgUox/aEyNjRSFeBO45YJkXvtUjHK3xdpddImztz7jaty0dHD2bmPP9CUG28NUmnKmmdNqgaYCWjeQLv2cgsP4ws3Fe7Tz3Yn8ikzamrp2macByaXJEgDLuqJeJhwtJdNz1COmKqUgp/WxG60KhtPW3TwXAkKHYWbUj1BjhxXRrEYol2V1FQK4GAI+zi5vZRZL48DX79Zuo18h/jmb/oqv6j/mkBQO3vsEJFlpfCj204n42KpMGQjOVmGfMskbQwX08Hnq5XZmYnm2ZLzIFpg+zarMwRi2l50a6EXpSkz6LoXQ1CcM5oGSFc8zebCPIqAjoPp6RHz6eIWGK2IFucJpv0gEqw/418JZaoHOoZ2hHJX1q41ffvGKl/6m2DCyqqKHleERgcmc7caMmSkyInvFmRb4DqHQ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: GFgifEga/p5tenxSIciReZUJAk45fIUr1dt60lXO5aYLF7N4EE0PiuwPsUZiiJ+Z+dJalShUVcZtNZfhYrcGICkQIEr6aO6Te0OuW5W/suetUADMJ4qYkm/lqwjY25cj2js3T8XmlUs0KKSdSDE8HAQ+k9J07xk0h+7klzhClj4tlfcdG5dyEC+VrKWAe0IrML7tLWe3AB8i8En7vTbEbAtdqhBuJciM5dP1M/xgpzjv6WnyXE9UubB4E99eSOUJdeYN2yKPL6LuIelzUuN0prktfj5W9w6GKXd4rfY1x84PX04CeDrU4/85fp41SFxHx4JmsGxhdFnk6SBMiYT8q3SsUmeKNUbNE7JkJeKxu9UIdwwCRGq0UruxFc8ucpCTI68cHNMl98mcZ8grXOkRAOBOgmBcMzjRo9FBAhDp/GP8CO0KWnW+yVgli2bu6JuwvHGJ65oCWxW6hK0UDySzkCVGKDiHeo1PvRAbzSWpuuTveDjEiq5Dy5VAVUU71u4taP8Nbi5Kvk9czsMEXvu9E+W4hTZXHPS6GXxF9xSuG+uHpQr2/lZvdWazTuRduOIXQh7yvLHSNod858tgjjQZEeA45rweC+WMXj+6DFF5bJQ= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: t8I9QcshO5TyEDNk4/uQRo9lCQAsWzN632LupCx2YHgpBLTsWjuSCpkj5oPBQz4RfKDbPaF1pwsQ6Y4lvycQcewgpUCC3Za/AtX00tmZ48e+zOhtQSCKqQ1Um+f6cYdLVTyJlhozRNQoDwNJIuroapZVAwSOSUHSHdT720a4nJ3BBAVAqGZBq8px2fC2D6qkYkDS5tngR1Sfa7YxYy1MO8e104ryed6vOjSEMI+TlfNDXbOGzb+mlPsl0EObjQhNUSZKY04Bzp1af7Blh98j9uErs7SWyYduqwDb3EUixsosJX+xRtITUtisTW/68VFglyuCpYYeasLzgXNvdq8cr5mT2UIQIm3neUt3SVVmtIUMQxtoga8lvLFUp0umEzo8HjarUdslo7BTqZ/HpBqZFZzWur7LrOimH/gPpz0pC2tKe6x1XDo1F3oy3w+f5y/vipdKvNJExuqZm7yblXo8mclxT6XSlcuscPkC4nq9zIfMdAd83RRtYe/+bPb7QAkloZMILswhkhMYny4shJ1ya+XcZ5pWMgV6rfHlERmZfe8y+Q5yDRgy4UEPgesXSX2D9X64pvQH9uYVNJifaojiDFuGddcfPKQk9Eqrjy7GF5Jf6P5lZDcaWTzaHvT8QNvN7RcjVBfxP2p/PtUshNWa3MCKk6+MWq8R4efwerUrLt0ikBCEaJPKMrmE7ExXqC+zR7PhkVZEKT7ZTrrLorc3k8gU1ir4W7rreBqCYGxxDDWcRhV6QkXz0qFBSQ9cIom4V0vcyZEDAbIFnp0TOBJIQWv2Y0/JYwH9jU5GkUzNddcx60h5jXvUiOPSyulxzlpGlzIgNNgfye5dkQuHPeNTJpCrvkMkyzoSzbJBZ811Siu8LQZ83HWZO4qcS7+kJ1g99s0WyWY92HVumvc6tVlQESbRGWkKSQBFzMi8he+3gqmz1+ra8pz7Mah9r8Ca1Ih1KhsTGTcFg6s8aFIcvQ2XDXhqete7UJSapIclEvZjhp84PhLWhUDHa6xeLMeAEhZVRyIiH6JJJZFoQMR4+D+L584IpeZnfgSlU6u1D4GsXHaqZiX/DmcbCJmI5+IRIFCqOZuPwwBzJmGqsHm32Q6o79Abjots9EqxXTGSW1UcUOA8muj7E5gK0CRrW7dcxD3DGvwYs+KKwvvXCwgD4IGNVyiyxr3+msBh6QisravdILfzJ+f/sIBb1qN0Y/qvVbFCAUM0xG4bZo3Qklw/AePBJMIfpxvwjNz/isOcr1YGwf0= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ce7fc95e-b64a-43fc-41b3-08db4765324b X-MS-Exchange-CrossTenant-AuthSource: DM5PR03MB3163.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Apr 2023 21:20:16.8058 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR03MB5453 Received-SPF: pass client-ip=2a01:111:f400:7e8c::827; envelope-from=Morgan.J.Smith@outlook.com; helo=NAM04-MW2-obe.outbound.protection.outlook.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Morgan Smith * gnu/packages/patches/isync-openssl3-fix.patch: Add patch to fix behavior when using openssl-3. * gnu/local.mk (isync): Register patch. * gnu/packages/mail.scm (isync): Use patch. --- With the core-updates merge, isync now uses openssl-3. This will cause problems for some (but not all) users. This patch from upstream fixes that. The error that happens when running "mbsync -a": Socket error: secure read from imap.gmail.com (172.253.63.108:993): error:0A000126:SSL routines::unexpected eof while reading The thread that elucidated the fix: https://sourceforge.net/p/isync/mailman/isync-devel/thread/Y2jnr8hESp1PUW+6@bulldog/ gnu/local.mk | 1 + gnu/packages/mail.scm | 5 +- gnu/packages/patches/isync-openssl3-fix.patch | 81 +++++++++++++++++++ 3 files changed, 86 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/isync-openssl3-fix.patch diff --git a/gnu/local.mk b/gnu/local.mk index c0a5c721fc..6afb84b25c 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1367,6 +1367,7 @@ dist_patch_DATA = \ %D%/packages/patches/irrlicht-use-system-libs.patch \ %D%/packages/patches/irrlicht-link-against-needed-libs.patch \ %D%/packages/patches/isl-0.11.1-aarch64-support.patch \ + %D%/packages/patches/isync-openssl3-fix.patch \ %D%/packages/patches/itk-snap-alt-glibc-compat.patch \ %D%/packages/patches/jami-disable-integration-tests.patch \ %D%/packages/patches/jami-libjami-headers-search.patch \ diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 82fa8bc711..e7ae1c693f 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -2275,7 +2275,10 @@ (define-public isync (uri (string-append "mirror://sourceforge/isync/isync/" version "/isync-" version ".tar.gz")) (sha256 (base32 - "1zq0wwvmqsl9y71546dr0aygzn9gjjfiw19hlcq87s929y4p6ckw")))) + "1zq0wwvmqsl9y71546dr0aygzn9gjjfiw19hlcq87s929y4p6ckw")) + (patches + ;; Likely to be included in next version + (search-patches "isync-openssl3-fix.patch")))) (build-system gnu-build-system) (native-inputs (list perl)) diff --git a/gnu/packages/patches/isync-openssl3-fix.patch b/gnu/packages/patches/isync-openssl3-fix.patch new file mode 100644 index 0000000000..6a2363e972 --- /dev/null +++ b/gnu/packages/patches/isync-openssl3-fix.patch @@ -0,0 +1,81 @@ +Upstream status: Taken from master branch. Likely included in versions > 1.4.4 + +Fixes issues with OpenSSL3. See related thread: +https://sourceforge.net/p/isync/mailman/isync-devel/thread/Y2jnr8hESp1PUW+6@bulldog/ + +From b6c36624f04cd388873785c0631df3f2f9ac4bf0 Mon Sep 17 00:00:00 2001 +From: Oswald Buddenhagen +Date: Mon, 6 Jun 2022 11:55:37 +0200 +Subject: [PATCH] work around "unexpected EOF" error messages at end of SSL + connections + +gmail apparently doesn't send a close notification (SSL_shutdown()) +before closing the TCP socket. +--- + src/drv_imap.c | 7 +++++-- + src/socket.c | 9 +++++++++ + src/socket.h | 1 + + 3 files changed, 15 insertions(+), 2 deletions(-) + +diff --git a/src/drv_imap.c b/src/drv_imap.c +index fb8d165..6286045 100644 +--- a/src/drv_imap.c ++++ b/src/drv_imap.c +@@ -1620,6 +1620,7 @@ imap_socket_read( void *aux ) + error( "IMAP error: unexpected BYE response: %s\n", cmd ); + /* We just wait for the server to close the connection now. */ + ctx->expectEOF = 1; ++ socket_expect_eof( &ctx->conn ); + } else { + /* We still need to wait for the LOGOUT's tagged OK. */ + } +@@ -1882,10 +1883,12 @@ static void + imap_cleanup_p2( imap_store_t *ctx, + imap_cmd_t *cmd ATTR_UNUSED, int response ) + { +- if (response == RESP_NO) ++ if (response == RESP_NO) { + imap_cancel_store( &ctx->gen ); +- else if (response == RESP_OK) ++ } else if (response == RESP_OK) { + ctx->expectEOF = 1; ++ socket_expect_eof( &ctx->conn ); ++ } + } + + /******************* imap_open_store *******************/ +diff --git a/src/socket.c b/src/socket.c +index ac3c847..892cece 100644 +--- a/src/socket.c ++++ b/src/socket.c +@@ -810,6 +810,15 @@ socket_expect_activity( conn_t *conn, int expect ) + conf_wakeup( &conn->fd_timeout, expect ? conn->conf->timeout : -1 ); + } + ++void ++socket_expect_eof( conn_t *sock ) ++{ ++#ifdef SSL_OP_IGNORE_UNEXPECTED_EOF // implies HAVE_LIBSSL ++ if (sock->ssl) ++ SSL_set_options( sock->ssl, SSL_OP_IGNORE_UNEXPECTED_EOF ); ++#endif ++} ++ + int + socket_read( conn_t *conn, char *buf, uint len ) + { +diff --git a/src/socket.h b/src/socket.h +index 5b1edd0..af679aa 100644 +--- a/src/socket.h ++++ b/src/socket.h +@@ -142,6 +142,7 @@ void socket_start_tls(conn_t *conn, void (*cb)( int ok, void *aux ) ); + void socket_start_deflate( conn_t *conn ); + void socket_close( conn_t *sock ); + void socket_expect_activity( conn_t *sock, int expect ); ++void socket_expect_eof( conn_t *sock ); + int socket_read( conn_t *sock, char *buf, uint len ); /* never waits */ + char *socket_read_line( conn_t *sock ); /* don't free return value; never waits */ + typedef enum { KeepOwn = 0, GiveOwn } ownership_t; +-- +2.39.2 +