From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id 4NPUIUKvqmWHGQEAe85BDQ:P1 (envelope-from ) for ; Fri, 19 Jan 2024 18:20:02 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id 4NPUIUKvqmWHGQEAe85BDQ (envelope-from ) for ; Fri, 19 Jan 2024 18:20:02 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=oscarnajera.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1705684786; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=0ENZN4kqUZA971y/I6jW1YmUhqQmTKubgi19QNivfsY=; b=Gfmh6TPj3irrsXZ6vE4lEvxA5gwGDm8pnnw3LjB0ci6ZUi8O+inWV0UVF+HzzX9bYLC4fn OgO25o9aYlO5UycymrmQA+CYtu71yC0hNr7DY4gDAVmGbgU1ZqdDNEprD9gK/OgCJ9sRLp XZSmhRME1cZqyg9lE4zg+A1+V2OzN+JPbqvJKaVoZ7EhZw4PxtO1Quqzavgxua2626OAwJ w+4Z4+kddv2WU0fbGyTJhgUwMzAIXQZrUqkWWrf8uY1ovcJOLgS8uMeVJMWDHmJNeuojjz DLuCPLmJ3a3gFwmj+rSkrFGiz/EBl8VVaVJV2pwkNyA8pxvBu3NtdGNPqYBCGg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=oscarnajera.com (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1705684786; a=rsa-sha256; cv=none; b=h/jXuBBrhV2pYrQa3eTbIE84NDdb8LtmbmwEgU2L8agJOvaOfQIdXJDs9aev88BOLrujyb BxEFmItjAi6cuN9PtqmijH9QivsEQRiUYlsNjxDSvHIcC78MzeC4rzKGC8zZFtyeQe9Gkn pwt4Kf4Mvj6ZSP01K3m1hZ9n5DxA1yiJZ5cD+E17yP8uRZjwjx/OHqdZDJNXz30dXnwhWe 43RRMdpO2sVVBIhB+Y5QCNqSy5/2AScGkw3+gtUiq+CwvzAGYiepwDbdxBRYx+X+NFy9T0 dKgL8z2EFNZUFtkiYWaPWH8jltABnssuzhK4jpkI/WqwxyenAoxn2GxRVF2HEQ== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 95AE845907 for ; Fri, 19 Jan 2024 18:19:46 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rQsWs-0007av-Kb; Fri, 19 Jan 2024 12:19:42 -0500 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 1rQre0-0005LD-W5 for guix-patches@gnu.org; Fri, 19 Jan 2024 11:23:01 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rQre0-0006Oz-ME for guix-patches@gnu.org; Fri, 19 Jan 2024 11:23:00 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rQre2-000810-IL for guix-patches@gnu.org; Fri, 19 Jan 2024 11:23:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68590] [PATCH] gnu: notmuch: update to version 0.38.2 Resent-From: Oscar Najera Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 19 Jan 2024 16:23:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 68590 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68590@debbugs.gnu.org Cc: Oscar Najera X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.170568132330727 (code B ref -1); Fri, 19 Jan 2024 16:23:02 +0000 Received: (at submit) by debbugs.gnu.org; 19 Jan 2024 16:22:03 +0000 Received: from localhost ([127.0.0.1]:60015 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rQrd2-0007zD-Cc for submit@debbugs.gnu.org; Fri, 19 Jan 2024 11:22:03 -0500 Received: from lists.gnu.org ([2001:470:142::17]:54112) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rQpwC-0002Tq-Ex for submit@debbugs.gnu.org; Fri, 19 Jan 2024 09:33:43 -0500 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 1rQpw4-0002Iq-PI for guix-patches@gnu.org; Fri, 19 Jan 2024 09:33:32 -0500 Received: from vmd57947.contaboserver.net ([95.111.247.99] helo=mail.oscarnajera.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rQpw0-0001VY-Bb for guix-patches@gnu.org; Fri, 19 Jan 2024 09:33:32 -0500 Received: from [127.0.0.1] (localhost [127.0.0.1]) (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) (No client certificate requested) by mail.oscarnajera.com (Postfix) with ESMTPSA id 1BBFE40095; Fri, 19 Jan 2024 14:33:18 +0000 (UTC) From: Oscar Najera Date: Fri, 19 Jan 2024 15:32:53 +0100 Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=95.111.247.99; envelope-from=hi@oscarnajera.com; helo=mail.oscarnajera.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Fri, 19 Jan 2024 11:22:00 -0500 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Mailman-Approved-At: Fri, 19 Jan 2024 12:19:41 -0500 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -0.67 X-Migadu-Queue-Id: 95AE845907 X-Spam-Score: -0.67 X-Migadu-Scanner: mx11.migadu.com X-TUID: pDZQ7hMo5JmV Change-Id: Ic0037d6307a2beda2d81bd6747b136398f63df31 --- gnu/packages/mail.scm | 8 +- .../patches/notmuch-emacs-test-output.patch | 89 ------------------- 2 files changed, 3 insertions(+), 94 deletions(-) delete mode 100644 gnu/packages/patches/notmuch-emacs-test-output.patch diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 4466e5e6d9..b941979a7b 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -54,6 +54,7 @@ ;;; Copyright © 2023 Timo Wilken ;;; Copyright © 2023 Arjan Adriaanse ;;; Copyright © 2023 Wilko Meyer +;;; Copyright © 2023 Oscar Najera ;;; ;;; This file is part of GNU Guix. ;;; @@ -1373,17 +1374,14 @@ (define-public notifymuch (define-public notmuch (package (name "notmuch") - (version "0.37") + (version "0.38.2") (source (origin (method url-fetch) (uri (string-append "https://notmuchmail.org/releases/notmuch-" version ".tar.xz")) (sha256 - (base32 "1xl64xh0ijfkx265lcj9cqv1wkzha8gsn9jn4fw4xgvqigr6sxhf")) - (patches - ;; Output for some tests varies slightly in Emacs 29. - (search-patches "notmuch-emacs-test-output.patch")))) + (base32 "0zll3s39s065pl9228xpklkjklllkyb3bf1szh0fw0rbfkjfp0jj")))) (build-system gnu-build-system) (arguments (list diff --git a/gnu/packages/patches/notmuch-emacs-test-output.patch b/gnu/packages/patches/notmuch-emacs-test-output.patch deleted file mode 100644 index 3c6d472d6b..0000000000 --- a/gnu/packages/patches/notmuch-emacs-test-output.patch +++ /dev/null @@ -1,89 +0,0 @@ -From e9e779ead4d703ad423e46c23abd0c9afd7d5ed2 Mon Sep 17 00:00:00 2001 -From: Arjan Adriaanse -Date: Tue, 15 Aug 2023 00:00:05 +0200 -Subject: [PATCH] test: fix expected output for Emacs 29 - ---- - test/T453-emacs-reply.sh | 1 - - test/T454-emacs-dont-reply-names.sh | 9 +++------ - .../notmuch-reply-duplicate-4 | 1 - - 3 files changed, 3 insertions(+), 8 deletions(-) - -diff --git a/test/T453-emacs-reply.sh b/test/T453-emacs-reply.sh -index 0a27d066..de400b85 100755 ---- a/test/T453-emacs-reply.sh -+++ b/test/T453-emacs-reply.sh -@@ -17,7 +17,6 @@ cat < EXPECTED - From: Notmuch Test Suite - To: Antoine Beaupré - Subject: Re: bug: "no top level messages" crash on Zen email loops --In-Reply-To: <874llc2bkp.fsf@curie.anarc.at> - Fcc: MAIL_DIR/sent - --text follows this line-- - Antoine Beaupré writes: -diff --git a/test/T454-emacs-dont-reply-names.sh b/test/T454-emacs-dont-reply-names.sh -index 3a770177..9ed4f18b 100755 ---- a/test/T454-emacs-dont-reply-names.sh -+++ b/test/T454-emacs-dont-reply-names.sh -@@ -17,13 +17,12 @@ test_emacs '(let ((message-dont-reply-to-names "notmuchmail\\|noreply\\|harvard" - (test-visible-output "OUTPUT-FULL.raw"))' - - notmuch_dir_sanitize < OUTPUT-FULL.raw > OUTPUT-FULL --head -6 OUTPUT-FULL > OUTPUT -+head -5 OUTPUT-FULL > OUTPUT - - cat < EXPECTED - From: Notmuch Test Suite - To: Mikhail Gusarov - Subject: Re: [notmuch] Working with Maildir storage? --In-Reply-To: <20091117203301.GV3165@dottiness.seas.harvard.edu> - Fcc: MAIL_DIR/sent - --text follows this line-- - EOF -@@ -38,14 +37,13 @@ test_emacs '(let ((message-dont-reply-to-names - (test-visible-output "OUTPUT-FULL-PRED.raw"))' - - notmuch_dir_sanitize < OUTPUT-FULL-PRED.raw > OUTPUT-FULL-PRED --head -7 OUTPUT-FULL-PRED > OUTPUT-PRED -+head -6 OUTPUT-FULL-PRED > OUTPUT-PRED - - cat < EXPECTED-PRED - From: Notmuch Test Suite - To: Lars Kellogg-Stedman - Cc: notmuch@notmuchmail.org - Subject: Re: [notmuch] Working with Maildir storage? --In-Reply-To: <20091117203301.GV3165@dottiness.seas.harvard.edu> - Fcc: MAIL_DIR/sent - --text follows this line-- - EOF -@@ -59,14 +57,13 @@ test_emacs '(let ((message-dont-reply-to-names nil)) - (test-visible-output "OUTPUT-FULL-NIL.raw"))' - - notmuch_dir_sanitize < OUTPUT-FULL-NIL.raw > OUTPUT-FULL-NIL --head -7 OUTPUT-FULL-NIL > OUTPUT-NIL -+head -6 OUTPUT-FULL-NIL > OUTPUT-NIL - - cat < EXPECTED-NIL - From: Notmuch Test Suite - To: Lars Kellogg-Stedman , Mikhail Gusarov - Cc: notmuch@notmuchmail.org - Subject: Re: [notmuch] Working with Maildir storage? --In-Reply-To: <20091117203301.GV3165@dottiness.seas.harvard.edu> - Fcc: MAIL_DIR/sent - --text follows this line-- - EOF -diff --git a/test/emacs-reply.expected-output/notmuch-reply-duplicate-4 b/test/emacs-reply.expected-output/notmuch-reply-duplicate-4 -index 836f77b1..44b8c7a6 100644 ---- a/test/emacs-reply.expected-output/notmuch-reply-duplicate-4 -+++ b/test/emacs-reply.expected-output/notmuch-reply-duplicate-4 -@@ -1,7 +1,6 @@ - From: Notmuch Test Suite - To: Sean Whitton , 916811@bugs.debian.org, 916805@bugs.debian.org, 916807@bugs.debian.org, 916808@bugs.debian.org, 916809@bugs.debian.org, 916811@bugs.debian.org, 916867@bugs.debian.org, 916869@bugs.debian.org, 916872@bugs.debian.org, 916875@bugs.debian.org, 916876@bugs.debian.org - Subject: Re: [Pkg-emacsen-addons] Bug#916811: Increase severity to 'serious' --In-Reply-To: <87r2ecrr6x.fsf@zephyr.silentflame.com> - Fcc: MAIL_DIR/sent - --text follows this line-- - Sean Whitton writes: --- -2.41.0 - base-commit: 0eadd486484fcf9a234758842f74ba28361640db -- 2.43.0