[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
06/08: gnu: sendmail: Install executables to $prefix/sbin and $prefix/bi
From: |
guix-commits |
Subject: |
06/08: gnu: sendmail: Install executables to $prefix/sbin and $prefix/bin directories. |
Date: |
Tue, 10 Aug 2021 11:33:48 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit e6d0264b8218ba2354547a5925f6e6e89af42d37
Author: Ivan Gankevich <i.gankevich@spbu.ru>
AuthorDate: Fri Jul 23 21:15:39 2021 +0300
gnu: sendmail: Install executables to $prefix/sbin and $prefix/bin
directories.
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.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
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 6efea78..8917a49 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -1624,7 +1624,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)))))
@@ -2871,6 +2871,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 _
@@ -2882,6 +2889,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')
@@ -2900,13 +2912,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 ac61b97..9517525 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)
- branch master updated (b0a6b1f -> 1e16e19), guix-commits, 2021/08/10
- 01/08: store: Add 'map/accumulate-builds' cutoff to address pathological cases., guix-commits, 2021/08/10
- 02/08: gnu: dealii-openmpi: Add Trilinos dependency., guix-commits, 2021/08/10
- 03/08: gnu: rocksdb: set TEST_TMPDIR for faster test i/o., guix-commits, 2021/08/10
- 04/08: etc/committer: Support custom commit messages., guix-commits, 2021/08/10
- 05/08: etc/committer: Pass command-line arguments to main., guix-commits, 2021/08/10
- 06/08: gnu: sendmail: Install executables to $prefix/sbin and $prefix/bin directories.,
guix-commits <=
- 07/08: gnu: Add task-spooler., guix-commits, 2021/08/10
- 08/08: gnu: python-libusb1: Update to 1.9.3., guix-commits, 2021/08/10