From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id ao4bNRoO+2CNWwAAgWs5BA (envelope-from ) for ; Fri, 23 Jul 2021 20:44:42 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id MIdUMBoO+2CPFwAA1q6Kng (envelope-from ) for ; Fri, 23 Jul 2021 18:44:42 +0000 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 558D4CDE8 for ; Fri, 23 Jul 2021 20:44:42 +0200 (CEST) Received: from localhost ([::1]:44470 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m6zmM-0008AY-5X for larch@yhetil.org; Fri, 23 Jul 2021 14:20:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52420) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m6zmE-0008AA-Qe for guix-patches@gnu.org; Fri, 23 Jul 2021 14:20:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33033) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m6zmE-00027g-IY for guix-patches@gnu.org; Fri, 23 Jul 2021 14:20:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1m6zmE-0002DJ-4q for guix-patches@gnu.org; Fri, 23 Jul 2021 14:20:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49685] [PATCH] gnu: sendmail: Install executables to $prefix/sbin and $prefix/bin directories. References: <20210721183504.9388-1-i.gankevich@spbu.ru> In-Reply-To: <20210721183504.9388-1-i.gankevich@spbu.ru> Resent-From: Ivan Gankevich Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 23 Jul 2021 18:20:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49685 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49685@debbugs.gnu.org Cc: Ivan Gankevich Received: via spool by 49685-submit@debbugs.gnu.org id=B49685.16270643668382 (code B ref 49685); Fri, 23 Jul 2021 18:20:02 +0000 Received: (at 49685) by debbugs.gnu.org; 23 Jul 2021 18:19:26 +0000 Received: from localhost ([127.0.0.1]:44572 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m6zle-0002B8-2w for submit@debbugs.gnu.org; Fri, 23 Jul 2021 14:19:26 -0400 Received: from mail.spbu.ru ([195.70.197.23]:57335 helo=cgp2.pu.ru) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m6zlQ-0002Ad-Vb for 49685@debbugs.gnu.org; Fri, 23 Jul 2021 14:19:24 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=simple/simple; d=spbu.ru; s=20180812; bh=fOLy2ghORIfusXr8o51t0zcEYosDI62zJYsECoax1Qw=; h=Content-Transfer-Encoding:MIME-Version:Message-Id:Date:Subject:Cc:To:From; b=TAS44N1UflkbrcKFbJslAF6PeL/XScs5mlieMc416Se+bIEX4TBAPHKU1ml/wJP1rAPqV2MOJI Mqgq5pUSK4HLVSQKsTBPbIGb0MZQERqfEj2sBFJ6J/jsEv3O7SOWwfpZurTEyQ+SQUX8PS3qMZpII 74TJntry61IdReCTcRvGKvB/xAQnTvhaJL77Gx8v1BC+AJ8/IpXZiHtwnDvIExE0AZrBS3nX9VrQ1 NDWWFC+KnT65k0L/4+bMWuBM8V7FT0SaSWvM3k6Y4tT8r0lCkbTKAACjBJBaLDYHPLTmRBUS1TBgP 7cNz4cP1hENY9Hj/Fmi/FVBuTpkZJBSN7esmg== Received: from [172.27.221.159] (account st018947@spbu.ru HELO localhost.localdomain) by spbu.ru (CommuniGate Pro SMTP 6.2.15) with ESMTPSA id 173762293; Fri, 23 Jul 2021 21:18:50 +0300 From: Ivan Gankevich Date: Fri, 23 Jul 2021 21:15:39 +0300 Message-Id: <20210723181538.8402-1-i.gankevich@spbu.ru> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1627065882; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=dMciP9+iGckqM/VYiwDYJxMrHYIcFqcCGnIkmPwIAw4=; b=hjvVGTwml49LxBFSc4/YuAa87vB2aZsrnlmRHoBJH989bqpuagus5MmCV8GegHSsM/CdMy 75jRXXqZSF7xVfozugMEkBrsqk0E2CwK2cdChNvhMaxuZgrJ7OdQpCtbxfkq0K0PDn6w6d AHIh+RbeJO+eqDUF5sGgVssdxzYjK8bRJPwiQmejqg+LkHCZZA+jYhpuKr3gUjuZ6WrAwF wkq1PrJDA5HTyNykaHk+KVWU8GId9vCnqJ8TxfF9hog9pNDc/BIrSLEQCqIAF75h8emNv3 1lR//xlvvPGWW9i0OOeerntBG7yXVYqin2f56AlVwnDcWNnwOTA2D0XY458wEA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1627065882; a=rsa-sha256; cv=none; b=dYMcf3LeRhQejII5PD6pUctTG1VSX52Y4J31qiguMMg5EFz1/yfJWuIarom7wCRNNYRf0O RA96CTKuN1QjwtPdZob8CWG8iMBeiquFm3GESHfz4//1VM0GXniUtrptD7McRt64tLI5da yQAKqLVGEZxI9kO+LQjxQUe5My2h3dSKvWb7ekZZFYVZLgGq2KyytRIweydIULXjfuB/qX lFVJ/dVlUymmnDsEsQfAjyB/ra2hnnsC8kNc1ut5DOwTY2lUBOPNykRqtENfq4eivdV1ia Mr3uoYCWr7NlTI1gbhBjfPAE6KpPaEPx5j/vIeWw/YyAX7uwO3/uPn1p1VCcXA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=spbu.ru header.s=20180812 header.b=TAS44N1U; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: 6.08 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=spbu.ru header.s=20180812 header.b=TAS44N1U; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 558D4CDE8 X-Spam-Score: 6.08 X-Migadu-Scanner: scn0.migadu.com X-TUID: F6E2xAkvQsU4 Currently "sendmail" installs executables to $PREFIX/usr/sbin and $PREFIX/usr/bin directories. This patch changes them to $PREFIX/sbin and $PREFIX/bin respectively. Also this patch fixes broken symlinks in $PREFIX/bin and updates package definitions that use old sendmail paths. * gnu/packages/mail.scm (sendmail): Set new paths. [arguments]<#:phases>{replace-/usr}: Remove /usr prefix. [arguments]<#:phases>{post-install}: Fix broken symlinks [arguments]<#:phases>{configure}: Set paths without /usr prefix. * gnu/packages/mail.scm (claws-mail): Use new sendmail paths. * gnu/packages/version-control.scm (python-git-multimail): Use new sendmail paths. --- gnu/packages/mail.scm | 28 ++++++++++++++++++++++++---- gnu/packages/version-control.scm | 2 +- 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index f0f1540cc9..a76a56694c 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1635,7 +1635,7 @@ compresses it.") (let* ((mailutils (assoc-ref inputs "mailutils")) (inc (string-append mailutils "/bin/mu-mh/inc")) (send-mail (assoc-ref inputs "sendmail")) - (sendmail (string-append send-mail "/usr/sbin/sendmail"))) + (sendmail (string-append send-mail "/sbin/sendmail"))) (substitute* "src/common/defs.h" (("/usr/bin/mh/inc") inc) (("/usr/sbin/sendmail") sendmail))))) @@ -2881,6 +2881,13 @@ powerful user customization features.") (substitute* "devtools/bin/Build" (("SHELL=/bin/sh") (string-append "SHELL=" (which "sh")))) #t)) + (add-before 'build 'replace-/usr + (lambda _ + (substitute* + '("devtools/OS/Linux" + "cf/ostype/mklinux.m4" + "cf/ostype/linux.m4") + (("/usr/sbin") "/sbin")))) (replace 'configure (lambda _ @@ -2892,6 +2899,11 @@ powerful user customization features.") (with-output-to-file "devtools/Site/site.config.m4" (lambda () (format #t " +define(`confEBINDIR', `/sbin') +define(`confSBINDIR', `/sbin') +define(`confMBINDIR', `/sbin') +define(`confUBINDIR', `/bin') +define(`confLINKS', `') define(`confCC', `gcc') define(`confOPTIMIZE', `-g -O2') define(`confLIBS', `-lresolv') @@ -2910,13 +2922,21 @@ 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)))) + #t))) + (add-after 'install 'post-install + (lambda _ + ;; Make symbolic links manually, because build script uses + ;; absolute paths for them and ignores DESTDIR. + (for-each + (lambda (name) + (symlink "../sbin/sendmail" (string-append %output "/bin/" name))) + '("hoststat" "newaliases" "mailq" "purgestat"))))) ;; There is no make check. There are some post installation tests, but those ;; require root privileges #:tests? #f)) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 7c1dbe8b26..814a87904e 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1036,7 +1036,7 @@ a built-in cache to decrease server I/O pressure.") "'")) (("/usr/sbin/sendmail") (string-append (assoc-ref inputs "sendmail") - "/usr/sbin/sendmail"))) + "/sbin/sendmail"))) #t))))) (inputs `(("git" ,git) -- 2.32.0