From patchwork Thu Feb 6 16:02:29 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Z572 X-Patchwork-Id: 38328 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 B1FD627BBE9; Thu, 6 Feb 2025 16:03:48 +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.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI, PDS_OTHER_BAD_TLD,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, 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 4EAA627BBE2 for ; Thu, 6 Feb 2025 16:03:46 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tg4Lh-0000GS-75; Thu, 06 Feb 2025 11:03:29 -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 1tg4LJ-00008w-5c for guix-patches@gnu.org; Thu, 06 Feb 2025 11:03:06 -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 1tg4LG-0000kF-6W for guix-patches@gnu.org; Thu, 06 Feb 2025 11:03:03 -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:References:In-Reply-To:Date:From:To:Subject; bh=+0LvHnp1p/pBaoL64vKQO2RtrZG7a0H8hMR1VGtZOc0=; b=kT8FLIxuzuPOcXXrNJZ7hqZPuImc5V2X3fL8V1W2N3NTr6f7jekdi3hoYu6WtvAbKp1vJ+Wh5otUfW3QZoIDfi9wUn/NzqQCsiaZLUsPjqrGDhpNkJgD3UDiiPTULJoWQ6bPMHIHyd/8G6i+wnicXWGocNoZf/W+yZXFYBffYby08lthWYVG/+9h45hNsPipsclmz8pPlDSNgMaT+lcMulBQqWgodUvYpLcz2Q1Rqy1J2NbU/OZRJt/SSe8XQ76Hdpqay/CvNrVnQhs712idMtfszhblqBuR9IEHEvW+xrBq8Gsul2oaehCf3Z/71n9DHmXYRW2ftkVIpEImU+UFLw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tg4LG-0005jN-2O for guix-patches@gnu.org; Thu, 06 Feb 2025 11:03:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#76101] [PATCH 1/2] gnu: opensmtpd: Set sysconfdir to /etc. Resent-From: Zheng Junjie Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 06 Feb 2025 16:03:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 76101 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 76101@debbugs.gnu.org Received: via spool by 76101-submit@debbugs.gnu.org id=B76101.173885777021996 (code B ref 76101); Thu, 06 Feb 2025 16:03:02 +0000 Received: (at 76101) by debbugs.gnu.org; 6 Feb 2025 16:02:50 +0000 Received: from localhost ([127.0.0.1]:59141 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tg4L0-0005ia-LF for submit@debbugs.gnu.org; Thu, 06 Feb 2025 11:02:49 -0500 Received: from mail.z572.online ([88.99.160.180]:54614) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tg4Kw-0005iF-2S for 76101@debbugs.gnu.org; Thu, 06 Feb 2025 11:02:44 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=z572.online; s=me; t=1738858069; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+0LvHnp1p/pBaoL64vKQO2RtrZG7a0H8hMR1VGtZOc0=; b=j3XecGd4yXFUYKioe1nEJ1CWiGQfF+6DSr+c6WmXXwpJwIwmwzb2inbkBOxG6u20QhAwan ejCilpPFxw28xcSvs0HELxC4bCqV1Mur2/R5IMzoWNa1uRdqSFZ0sYN0Tlu3ZsfoKfsi3U LJe0gTjfxwnVgXmx2LeWxei1LU4UWc0= Received: from m.tailaa68d.ts.net (mail1.85362086.com [107.174.64.25]) by mail.z572.online (OpenSMTPD) with ESMTPSA id dc61dc48 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for <76101@debbugs.gnu.org>; Thu, 6 Feb 2025 16:07:48 +0000 (UTC) From: Zheng Junjie Date: Fri, 7 Feb 2025 00:02:29 +0800 Message-ID: X-Mailer: git-send-email 2.48.1 In-Reply-To: References: MIME-Version: 1.0 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 (opensmtpd)[arguments]<#:configure-flags>: Add --sysconfdir=/etc. <#:phases>: Add fix-smtpd.conf-install-path phase. Change-Id: I949b8ec18e36b059cf3f56a109e750af1284b1d2 --- gnu/packages/mail.scm | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 73b4c01bd7b..61b1ec60198 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -57,7 +57,7 @@ ;;; Copyright © 2023 Wilko Meyer ;;; Copyright © 2024 Benjamin Slade ;;; Copyright © 2024 Jean Simard -;;; Copyright © 2024 Zheng Junjie <873216071@qq.com> +;;; Copyright © 2024, 2025 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2024 Ashish SHUKLA ;;; ;;; This file is part of GNU Guix. @@ -3320,6 +3320,8 @@ (define-public opensmtpd (list #:configure-flags #~(list "--localstatedir=/var" + ;; Allow work with /etc/mailname. + "--sysconfdir=/etc" "--with-libbsd" ;; This is the default only if it exists at build time—it doesn't. "--with-path-socket=/var/run" @@ -3350,6 +3352,15 @@ (define-public opensmtpd (("/bin/cat" file) (search-input-file inputs file))) (substitute* "usr.sbin/smtpd/mda_unpriv.c" (("/bin/sh" file) (search-input-file inputs file))))) + ;; Avoid install smtpd.conf to /etc. + (add-after 'unpack 'fix-smtpd.conf-install-path + (lambda _ + (let ((etc (string-append (assoc-ref %outputs "out") + "/etc"))) + (mkdir-p etc) + (substitute* "mk/smtpd/Makefile.am" + (("\\$\\(DESTDIR\\)\\$\\(sysconfdir\\)/smtpd\\.conf") + (string-append etc "/smtpd.conf")))))) ;; OpenSMTPD provides a single smtpctl utility to control both the ;; daemon and the local submission subsystem. To accomodate systems ;; that require historical interfaces such as sendmail, newaliases or