From patchwork Tue May 28 12:45:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Wilko Meyer X-Patchwork-Id: 64924 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 1C6BE27BBE9; Tue, 28 May 2024 15:22:12 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 497F827BBE2 for ; Tue, 28 May 2024 15:22:10 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sBxi6-0004Eu-Uj; Tue, 28 May 2024 10:21: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 1sBxi5-0004Ea-Jp for guix-patches@gnu.org; Tue, 28 May 2024 10:21:53 -0400 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 1sBxi5-00010H-Ba for guix-patches@gnu.org; Tue, 28 May 2024 10:21:53 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sBxiE-0002d8-7n for guix-patches@gnu.org; Tue, 28 May 2024 10:22:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71241] [PATCH] gnu: exim: Update to 4.97.1. Resent-From: Wilko Meyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 28 May 2024 14:22:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 71241 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71241@debbugs.gnu.org Cc: Wilko Meyer X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.17169060669982 (code B ref -1); Tue, 28 May 2024 14:22:02 +0000 Received: (at submit) by debbugs.gnu.org; 28 May 2024 14:21:06 +0000 Received: from localhost ([127.0.0.1]:46775 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sBxhG-0002ac-Ay for submit@debbugs.gnu.org; Tue, 28 May 2024 10:21:05 -0400 Received: from lists.gnu.org ([209.51.188.17]:51480) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sBxhE-0002aF-QM for submit@debbugs.gnu.org; Tue, 28 May 2024 10:21:01 -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 1sBxh4-000422-U9 for guix-patches@gnu.org; Tue, 28 May 2024 10:20:51 -0400 Received: from mail.wmeyer.eu ([95.216.196.112]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sBxgx-0000ot-2x for guix-patches@gnu.org; Tue, 28 May 2024 10:20:49 -0400 From: Wilko Meyer DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wmeyer.eu; s=mail; t=1716906038; bh=nvbNYW+GXs57CemHC4YnDRVkQ327Uk2xLx1uzGHcdvo=; h=From:To:Cc:Subject:Date; b=gCfFifW321gSlcOFJnu6XGhCvsgP3okQQE/sG1J7X9CE9Ng9+cRSGXfU6zGmZrVrX cQ9YPxtVnIIRMGR1wWwWgdS2npBOqXoT1K+rsKphmerVQprUCI2Jqlzy2PDPfdLfpA rceh8Ba6X8MzEP7wr4FIe3WXfxG+Rg+PUHed+mbw= Date: Tue, 28 May 2024 14:45:41 +0200 Message-ID: <20240528142011.19766-1-w@wmeyer.eu> MIME-Version: 1.0 Received-SPF: pass client-ip=95.216.196.112; envelope-from=w@wmeyer.eu; helo=mail.wmeyer.eu 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, 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-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 * gnu/packages/mail.scm (exim): Update to 4.97.1. [inputs]: Add perl-file-fcntllock. [arguments]: Add fix-perl-file-names phase. Change-Id: Ide1ba09368c2b23fd8ab6d6cdae8887ccb7edbeb --- Hi Guix, Updated Exim to the newest version till date, 4.97.1. Newer exim versions seem to depend on perl-file-fcntllock so I added that to inputs; also I had to add a phase that fixes the PERL_COMMAND variable, to be able to build exim properly. Cheers! gnu/packages/mail.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index b15d891609..686fe7bf48 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1949,7 +1949,7 @@ (define-public msmtp (define-public exim (package (name "exim") - (version "4.96.1") + (version "4.97.1") (source (origin (method url-fetch) @@ -1963,7 +1963,7 @@ (define-public exim (string-append "https://ftp.exim.org/pub/exim/exim4/old/" file-name)))) (sha256 - (base32 "0g83cxkq3znh5b3r2a3990qxysw7d2l71jwcxaxzvq8pqdahgb4k")))) + (base32 "1afzxyffjqm2xm5v6b731hbfm1fi4q35ja45a29kaycsa1bj0y5x")))) (build-system gnu-build-system) (arguments (list #:phases @@ -2016,6 +2016,12 @@ (define-public exim (substitute* "scripts/Configure-config.h" (("\\| /bin/sh") "| sh")) (patch-shebang "scripts/Configure-eximon"))) + (add-before 'build 'fix-perl-file-names + (lambda _ + (substitute* (list "Local/Makefile" + "OS/Makefile-Default") + (("PERL_COMMAND=/usr/bin/perl") + (string-append "PERL_COMMAND=" #$perl "/bin/perl"))))) (add-before 'build 'build-reproducibly (lambda _ ;; The ‘compilation number’ increments on every build in the @@ -2040,6 +2046,7 @@ (define-public exim libxaw libxt perl + perl-file-fcntllock xz)) (home-page "https://www.exim.org/") (synopsis