From patchwork Wed Jan 15 01:38:11 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tomas Volf <~@wolfsden.cz> X-Patchwork-Id: 37068 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 C6E7F27BBE2; Wed, 15 Jan 2025 01:39:22 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_ADSP_ALL,DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,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 9CEED27BBE9 for ; Wed, 15 Jan 2025 01:39:21 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tXsN8-0004A8-EX; Tue, 14 Jan 2025 20:39:06 -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 1tXsN5-00049d-2f for guix-patches@gnu.org; Tue, 14 Jan 2025 20:39:03 -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 1tXsN4-0006jE-LA for guix-patches@gnu.org; Tue, 14 Jan 2025 20:39:02 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:Subject; bh=Ww43FNNfhBKPWUmClFnOGu5m2sqFCXiuMFEMbV0f4WA=; b=a5L16yXsks1IQLytnKS99rGN2Ltob65TXcWJEKkGP4jP7bDH8Teo5hzGD1X1iLUNgIO+Kl/vrBOg1Q6qmPz13p4OUo0Ysky7/Y973rjHisquBxop1SWkzCns/RmRXowtXMs7EVgyjJpm/DX4nqa1gk9a5BuOO8ljBLx7/gODzYoLRnE8wV8JRCZOnLFiSfrdsI5U/2Qb3bOMCkdUakmg9M0WBy7UbtgwWS6nI4+rhUEE/peEZc6SXjUaMcgk2sK5WlBbM1efC2BLEDa85pmiY9zkLSAk9Gx+88DeL5Y5aGLbIQGVRloP9sy74EcAB+rRwwtIFinELyVxmWurF81Qag==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tXsN4-00065b-GR for guix-patches@gnu.org; Tue, 14 Jan 2025 20:39:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75571] [PATCH] gnu: opensmtpd: Fix fix for queuing of offline messages. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 15 Jan 2025 01:39:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 75571 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75571@debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.173690512923385 (code B ref -1); Wed, 15 Jan 2025 01:39:02 +0000 Received: (at submit) by debbugs.gnu.org; 15 Jan 2025 01:38:49 +0000 Received: from localhost ([127.0.0.1]:56339 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tXsMr-000656-3x for submit@debbugs.gnu.org; Tue, 14 Jan 2025 20:38:49 -0500 Received: from lists.gnu.org ([2001:470:142::17]:60834) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1tXsMo-00064n-NG for submit@debbugs.gnu.org; Tue, 14 Jan 2025 20:38:47 -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 <~@wolfsden.cz>) id 1tXsMj-00047r-EU for guix-patches@gnu.org; Tue, 14 Jan 2025 20:38:41 -0500 Received: from wolfsden.cz ([37.205.8.62]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <~@wolfsden.cz>) id 1tXsMh-0006iN-EV for guix-patches@gnu.org; Tue, 14 Jan 2025 20:38:41 -0500 Received: by wolfsden.cz (Postfix, from userid 104) id 0ECDA356039; Wed, 15 Jan 2025 01:38:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1736905115; bh=WIPo7DqKylXvHGNMwXUO2po9gXjdWtTQE2RNEthe5B4=; h=From:To:Cc:Subject:Date; b=PDyvP61M4dhg8OTSjoSd1yZD3cynQT5BjbfqxYH+Klkk1l9v/lY2gfyZFyhCBPBwD EneIiA9EWDSYIdYEv7aEr4+7cv3r7HvTQrkNWmg6depn4sWal3Kxb0PluoAg00fJ3m ozb9b9MeUHW6SmvhY0RW4xtHyZVrEB7AYfJnbttEOajqQ3JXZucHG2XqwQ9+hzC4Ym kaWrXbPQqh9K44QmsiFSmdvALeGhV+h38A44JOAPaNkKnaxKOBP6B0ghBb/BUgXEYm psssqm1PdwWU3OBq1rmZQIvnx/OG8SeS09dMpQUQwvefxtat2F2L3TRFPSXs0OQGuo aPOtHhRUdissBerA56pJYgThaC0kYjTx1tDWtoCAdMzFwNKfSiRogZxshtrxbi8GKE xEQvNBZLyWrOcLR/aBX963CAgn7alBrhFPJ0HD3tEsENVEezDCQ3u9LDsM9FgSigo1 GRC0C9bTZFTmdTB9kAnABseU31UWKxTJDJnKSuAmEXvCDNhAH25Wg4f+t4mdWtb9cS 43dj07wiiR6QQTisfuuptnF/xW/8NV6AeF6RRZC4K4JkiwUESzC3R0TQcmFqND2cul KSt/nDsILLgSMMCF2RvZ9Ebh3ZrqQdX639Op8/Fp6YR3nf8JXL/8s3AWpe3dqMGrKf SDKoxqruJTQKsZlSTwoS0Llw= Received: from localhost (unknown [193.32.127.158]) by wolfsden.cz (Postfix) with ESMTPSA id 218AA3555AB; Wed, 15 Jan 2025 01:38:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1736905114; bh=WIPo7DqKylXvHGNMwXUO2po9gXjdWtTQE2RNEthe5B4=; h=From:To:Cc:Subject:Date; b=fpJiVzXZWdK5HiO55SW/8xRhhYEz/X5a0LDUXqwooNlLU2qTclOnfb5rGYrm+xj/M tHoMKfqr45DQ94CFvuGngCL4GXEBQsRyYhNAhopqCuYx04mWV8cOg6AVj7GZ9fTlFk jo+pyf5JTsD9hmjaXcIfTEvsUqj8vNkpwuuqKHPP+aWG0S5Z/NuvI6izqaFWu+fOQK ENTPM1ZAGJyqsGegRhlkO8MDJEemEXz/ViJuLx3r/3T90CRh8LlrdndsLAV34qGD5E gemdfi1VzBvDAtr1RPFUUY17FReH2Fy1khR2DSbyRufp1E5Pk8pdkdQA6fAJZivCZd JjMrY7TWJMhE/2dbp2NlTmIo7zO6pXwmq1UGU1a4wQqs+Q6HuOQohS4kj/7CfCdl8S aEE0mnQFlEuwxO0vRNrhhkm2uhSIAL9BmFbUQ4pXi49shTvl3wAwqMdplmRmQZSMYb /NobpOMZ+4LHKCBZSQxHz+el8VABhNkKC9lwCHVjE4bDp0ZfNgieFtoIkwyKAZCm2v quVhINLLf3tcpbpxj4g1sd+dR4MH1RwkE/3UJNAj2nCdsMx9YsUOWyj94RM+WiaND4 sVHQqJe2p7fFzwj/rPSarfd24D0O7Fi7tJ5qOfXLk0eweoNw2vAX2rypDyFCE7rKWb X2AtsPJNkeUia1YXzvRC1cto= From: Tomas Volf <~@wolfsden.cz> Date: Wed, 15 Jan 2025 02:38:11 +0100 Message-ID: <819164cdd734cac9a531db6c3d0e940efdb579e3.1736905090.git.~@wolfsden.cz> X-Mailer: git-send-email 2.47.1 MIME-Version: 1.0 Received-SPF: pass client-ip=37.205.8.62; envelope-from=~@wolfsden.cz; helo=wolfsden.cz 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, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 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 The substituted path in smtpd.h was not used due to an #ifndef. The correct place to patch it seems to be mk/pathnames. This sadly triggers a bootstrap, so we need to add autoconf and automake to the native-inputs. * gnu/packages/mail.scm (opensmtpd)[arguments]<#:phases> {'patch-test-FHS-file-names}: Patch in mk/pathnames instead. [native-inputs]: Add autoconf and automake. Change-Id: I1d569b8aaae839d6fd4871ccb97c116e6930f1c9 --- gnu/packages/mail.scm | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 3744288fa3..5a16d670a3 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -3311,7 +3311,9 @@ (define-public opensmtpd libxcrypt zlib)) (native-inputs - (list bison + (list autoconf + automake + bison groff ;for man pages pkg-config)) (arguments @@ -3336,10 +3338,13 @@ (define-public opensmtpd ;; Fix some incorrectly hard-coded external tool file names. (add-after 'unpack 'patch-FHS-file-names (lambda* (#:key inputs #:allow-other-keys) - ;; avoids warning smtpd: couldn't enqueue offline message - ;; smtpctl exited abnormally - (substitute* "usr.sbin/smtpd/smtpd.h" - (("/usr/bin/smtpctl") "/run/privileged/bin/smtpctl")) + (substitute* "mk/pathnames" + ;; avoids warning smtpd: couldn't enqueue offline message + ;; smtpctl exited abnormally + (("(-DPATH_SMTPCTL=).*\\\\" all def) + (string-append def "\\\"/run/privileged/bin/smtpctl\\\" \\")) + (("(-DPATH_MAKEMAP=).*\\\\" all def) + (string-append def "\\\"/run/privileged/bin/makemap\\\" \\"))) (substitute* "usr.sbin/smtpd/smtpctl.c" ;; ‘gzcat’ is auto-detected at compile time, but ‘cat’ isn't. (("/bin/cat" file) (search-input-file inputs file)))