From patchwork Sat Mar 27 17:34:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Rovanion Luckey X-Patchwork-Id: 28139 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 DEF8427BC5C; Sat, 27 Mar 2021 17:42:43 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,HTML_MESSAGE,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 90A8327BC5D for ; Sat, 27 Mar 2021 17:42:41 +0000 (GMT) Received: from localhost ([::1]:46170 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lQCxM-0000g1-ND for patchwork@mira.cbaines.net; Sat, 27 Mar 2021 13:42:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37592) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lQCpy-0003ye-4T for guix-patches@gnu.org; Sat, 27 Mar 2021 13:35:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33333) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lQCpx-0004K3-T8 for guix-patches@gnu.org; Sat, 27 Mar 2021 13:35:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lQCpx-000278-QS for guix-patches@gnu.org; Sat, 27 Mar 2021 13:35:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47435] gnu: mail: Make the sendmail package actually output its binary Resent-From: Rovanion Luckey Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 27 Mar 2021 17:35:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 47435 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 47435@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16168664778076 (code B ref -1); Sat, 27 Mar 2021 17:35:01 +0000 Received: (at submit) by debbugs.gnu.org; 27 Mar 2021 17:34:37 +0000 Received: from localhost ([127.0.0.1]:44877 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lQCpZ-00026B-6y for submit@debbugs.gnu.org; Sat, 27 Mar 2021 13:34:37 -0400 Received: from lists.gnu.org ([209.51.188.17]:34172) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lQCpV-000262-1R for submit@debbugs.gnu.org; Sat, 27 Mar 2021 13:34:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37422) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lQCpU-0003Ar-MG for guix-patches@gnu.org; Sat, 27 Mar 2021 13:34:32 -0400 Received: from mail-il1-x134.google.com ([2607:f8b0:4864:20::134]:39617) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lQCpS-0003zS-TP for guix-patches@gnu.org; Sat, 27 Mar 2021 13:34:32 -0400 Received: by mail-il1-x134.google.com with SMTP id y17so7772669ila.6 for ; Sat, 27 Mar 2021 10:34:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=7/ATixOCtnn7SlI9rs9I2zPDfDq4pVvr5UqY9QQve1A=; b=PUoLLdxilSi3SbT7tQX03oRi3hS0Es5yRyNTsz8ZxbU5Zi4TQEGe34u8vZlaP7tpCj xZ0cxJZSGCChr/pWyrkPja48iBOpGRnhBFht3M2CYEBX+Mzpn6VvRsm/j6ZqckzfEdur Q9N9UsUTnCDQiRjarf8D8ZSphu4rYaTirrZhqcpHr77jCxvdPVUwIpgoqcNBy40lPfel 2071LsZEFIoZay3R1H9dAwVWyWUfSri8dclzfDfzNio4SnTaagoKtRE4xm0x7nwd1Ir2 9IFGhT3fRTbO2Ed8bGKP6POrs5tqCLpEii6JK5bnpuLBlw8qsY8PF6hDsCjmo4pYv0f+ NnHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=7/ATixOCtnn7SlI9rs9I2zPDfDq4pVvr5UqY9QQve1A=; b=XL6/SUxUd+Kobd67NuCnYFx3rt7gVd/vuR3elmLU8kkbSayh5TyBXFfZO2irra043h +vaL2jCJ+0rp2i3xzedPrG21dAitI4nnz3Dby25BMX31LXnGiJXnEHEpRPv5UW9hbBbn PHqn+QT8upQQv4vMC5PU4EQNo0KfeZwOoanaHoVjj4K4pqC8gU8e1aMTrqhc1Bbl2A8U X7vzKVxLTmc5UXADiatq7m/m7qtYdXmHzXT+Qmy9WTiUzrpitXy6TK7mJtbnd0/9ng2r E9LHGlqg8HxZaS7GxOqvpZgOk1hiEJ/ca/WxU2sU3DhI7CjNDoSwsU5APq3Imzp2qlq/ Opsg== X-Gm-Message-State: AOAM5325vszFpCAbEB0QZ5RfygzefLuqRqDZ17FlU6UOQTeYZoEgTi3X Tg1NuFL51O7Vz4lJgbBhM//7+y1pbzvQWkTzhpiVh7Cn1I8= X-Google-Smtp-Source: ABdhPJy9/wr5TDoG2+UZc8mZ+bqzHf0aZKR+1Ez1GAnGQWr0MH7+NgLXhuO1IKgHT5YsXowgJQ7LjTlpxh2LxDs/SmE= X-Received: by 2002:a05:6e02:214b:: with SMTP id d11mr14850563ilv.135.1616866469350; Sat, 27 Mar 2021 10:34:29 -0700 (PDT) MIME-Version: 1.0 From: Rovanion Luckey Date: Sat, 27 Mar 2021 18:34:03 +0100 Message-ID: Received-SPF: pass client-ip=2607:f8b0:4864:20::134; envelope-from=rovanion.luckey@gmail.com; helo=mail-il1-x134.google.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, HTML_MESSAGE=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=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" X-getmail-retrieved-from-mailbox: Patches This is an attempt at getting the sendmail package working. Currently installing the package does not make the `sendmail` executable appear in `$PATH`: > └$ guix environment --ad-hoc sendmail > └$ sendmail > bash: sendmail: command not found This patch fixes that. Though there are questions that still need to be resolved. While this patch does fix what it sets out to fix, the solutions aren't neccicerily correct. It configures a "helpfile" to be put in "$out/usr/share" and the same goes for its "statistics" file. I have no idea what these does and where they should go in reality. If someone happens to know, please do tell. From db5c0cf1b4686410f365b36d708aceed1742efec Mon Sep 17 00:00:00 2001 From: Rovanion Luckey Date: Sat, 27 Mar 2021 18:28:02 +0100 Subject: [PATCH] gnu: mail: Make the sendmail package actually output its binary The binary sendmail was not installed when sendmail was installed. This patch fixes this. --- gnu/packages/mail.scm | 33 +++++++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index b02f547e03..6fefc15d65 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -2761,23 +2761,41 @@ powerful user customization features.") (("SHELL=/bin/sh") (string-append "SHELL=" (which "sh")))) #t)) (replace 'configure - (lambda _ + (lambda* (#:key outputs #:allow-other-keys) ;; Render harmless any attempts to chown or chgrp (substitute* "devtools/bin/install.sh" (("owner=\\$2") "owner=''") (("group=\\$2") "group=''")) - (with-output-to-file "devtools/Site/site.config.m4" - (lambda () - (format #t " + (let ((out (assoc-ref outputs "out"))) + (with-output-to-file "devtools/Site/site.config.m4" + (lambda () + ;; See 'devtools/M4/UNIX/defines.m4' for the list of + ;; installation directories. + (format #t " define(`confCC', `gcc') define(`confOPTIMIZE', `-g -O2') define(`confLIBS', `-lresolv') define(`confINSTALL', `~a/devtools/bin/install.sh') define(`confDEPEND_TYPE', `CC-M') define(`confINST_DEP', `') -" (getcwd)))) + +define(`confHFDIR', `~a/share') +define(`confSTDIR', `~a/share') +define(`confMBINDIR', `~a/bin') +define(`confUBINDIR', `~a/bin') +define(`confSBINDIR', `~a/sbin') +define(`confEBINDIR', `~a/libexec') +define(`confMANROOT', `~a/share/man')~%" + (getcwd) + out out out out out out out)))) + + (substitute* "cf/cf/Makefile" + (("^MAILDIR=.*") + (string-append "MAILDIR = " + (assoc-ref outputs "out") + "/etc/mail\n"))) #t)) (replace 'build (lambda _ @@ -2789,10 +2807,9 @@ define(`confINST_DEP', `') (add-before 'install 'pre-install (lambda _ (let ((out (assoc-ref %outputs "out"))) - (mkdir-p (string-append out "/usr/bin")) - (mkdir-p (string-append out "/usr/sbin")) + (mkdir-p (string-append out "/bin")) + (mkdir-p (string-append out "/sbin")) (mkdir-p (string-append out "/etc/mail")) - (setenv "DESTDIR" out) (with-directory-excursion "cf/cf" (invoke "sh" "Build" "install-cf")) #t)))) -- 2.30.0