amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: opensmtpd: Set sysconfdir to /etc.

Browse source 
* gnu/packages/mail.scm (opensmtpd)[arguments]<#:configure-flags>: Add
--sysconfdir=/etc.
<#:phases>: Add fix-smtpd.conf-install-path phase.

Reviewed-by: 宋文武 <iyzsong@envs.net>
Change-Id: I949b8ec18e36b059cf3f56a109e750af1284b1d2
This commit is contained in:
Zheng Junjie 2025-02-06 22:41:55 +08:00
parent 0cd02f5e08
commit 169ef7616b
No known key found for this signature in database
GPG key ID: 3B5AA993E1A2DFF0
1 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

13
gnu/packages/mail.scm
View file

@ -57,7 +57,7 @@
;;; Copyright © 2023 Wilko Meyer <w@wmeyer.eu> ;;; Copyright © 2023 Wilko Meyer <w@wmeyer.eu>
;;; Copyright © 2024 Benjamin Slade <slade@lambda-y.net> ;;; Copyright © 2024 Benjamin Slade <slade@lambda-y.net>
;;; Copyright © 2024 Jean Simard <woshilapin@tuziwo.info> ;;; Copyright © 2024 Jean Simard <woshilapin@tuziwo.info>
;;; Copyright © 2024 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2024, 2025 Zheng Junjie <873216071@qq.com>
;;; Copyright © 2024 Ashish SHUKLA <ashish.is@lostca.se> ;;; Copyright © 2024 Ashish SHUKLA <ashish.is@lostca.se>
;;; Copyright © 2025 Tanguy Le Carrour <tanguy@bioneland.org> ;;; Copyright © 2025 Tanguy Le Carrour <tanguy@bioneland.org>
;;; Copyright © 2025 Sharlatan Hellseher <sharlatanus@gmail.com> ;;; Copyright © 2025 Sharlatan Hellseher <sharlatanus@gmail.com>
@ -3322,6 +3322,8 @@ from the Cyrus IMAP project.")
(list (list
#:configure-flags #:configure-flags
#~(list "--localstatedir=/var" #~(list "--localstatedir=/var"
;; Allow work with /etc/mailname.
"--sysconfdir=/etc"
"--with-libbsd" "--with-libbsd"
;; This is the default only if it exists at build time—it doesn't. ;; This is the default only if it exists at build time—it doesn't.
"--with-path-socket=/var/run" "--with-path-socket=/var/run"
@ -3352,6 +3354,15 @@ from the Cyrus IMAP project.")
(("/bin/cat" file) (search-input-file inputs file))) (("/bin/cat" file) (search-input-file inputs file)))
(substitute* "usr.sbin/smtpd/mda_unpriv.c" (substitute* "usr.sbin/smtpd/mda_unpriv.c"
(("/bin/sh" file) (search-input-file inputs file))))) (("/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 ;; OpenSMTPD provides a single smtpctl utility to control both the
;; daemon and the local submission subsystem. To accomodate systems ;; daemon and the local submission subsystem. To accomodate systems
;; that require historical interfaces such as sendmail, newaliases or ;; that require historical interfaces such as sendmail, newaliases or