[bug#35619] WIP version of postfix.scm

[bug#35619] WIP version of postfix.scm

[Brant Gardner]

[-- Attachment #1.1: Type: text/plain, Size: 315 bytes --]

I've gotten it to the point where it builds but does not install - Postfix seems to have a non-standard install procedure and I'm not sure how to proceed.

'guix lint' is mostly happy with it and I tried to follow standards but I'm still new at this so any comments are appreciated.

Thank you!

--
Brant Gardner



[-- Attachment #1.2: Type: text/html, Size: 706 bytes --]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-Add-postfix-WIP.patch --]
[-- Type: text/x-patch; name="0001-gnu-Add-postfix-WIP.patch", Size: 4429 bytes --]

From 212731a40d9ad0f41c757d42aacc98efbf3f9ddf Mon Sep 17 00:00:00 2001
From: Brant Gardner <brantcgardner@brantware.com>
Date: Tue, 7 May 2019 10:09:08 -0500
Subject: [PATCH] gnu: Add postfix WIP.

* gnu/packages/postfix.scm (postfix): New public variable.
---
 gnu/packages/postfix.scm | 85 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 85 insertions(+)
 create mode 100644 gnu/packages/postfix.scm

diff --git a/gnu/packages/postfix.scm b/gnu/packages/postfix.scm
new file mode 100644
index 0000000000..6585c108e4
--- /dev/null
+++ b/gnu/packages/postfix.scm
@@ -0,0 +1,85 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2019 Brant Gardner <bcg@member.fsf.org>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages postfix)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix build-system gnu)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (gnu packages autotools)
+  #:use-module (gnu packages base)
+  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages dbm)
+  #:use-module (gnu packages onc-rpc)
+  #:use-module (gnu packages perl))
+
+(define-public postfix
+  (package
+    (name "postfix")
+    (version "3.4.5")
+    (source (origin
+              (method url-fetch)
+              (uri
+               (string-append
+                "ftp://ftp.porcupine.org/mirrors/project-history/postfix/official/postfix-"
+                version ".tar.gz"))
+              (sha256
+               (base32
+                "17riwr21i9p1h17wpagfiwkpx9bbx7dy4gpdl219a11akm7saawb"))))
+    (build-system gnu-build-system)
+    (arguments '(#:phases
+                 (modify-phases %standard-phases
+                   (add-before 'build 'patch-/bin/sh
+                     (lambda _
+                       (substitute* (find-files "." "^Makefile.in")
+                         (("/bin/sh") (which "sh")))
+                       #t))
+                   (add-before 'build 'auxlibs
+                     (lambda _
+                       (setenv "AUXLIBS"
+                               "-lnsl -lresolv") ; Required, but postfix OS
+                                                 ; detection in leaves these
+                                                 ; unset for Guix
+                       #t))
+                   (add-before 'build 'patch-/usr/include
+                     (lambda* (#:key inputs #:allow-other-keys)
+                       (substitute* '("makedefs")
+                         (("/usr/include") (string-append (assoc-ref
+                                                           inputs "bdb")
+                                                          "/include"))) #t))
+                   (add-before 'build 'configure-postfix ; Move configuration folder
+                     (lambda* (#:key outputs #:allow-other-keys)
+                       (invoke "make" "makefiles"
+                               (string-append "CCARGS=-DDEF_CONFIG_DIR=\\\""
+                                (assoc-ref outputs "out") "/etc\\\"")) #t))
+                   (delete 'configure) ; no configure script
+                   (delete 'check)))) ; no check
+    (inputs `(("bdb" ,bdb)
+              ("libnsl" ,libnsl)))
+    (native-inputs
+     `(("autoconf" ,autoconf)
+       ("automake" ,automake)
+       ("libtool" ,libtool)
+       ("perl" ,perl)
+       ("pkg-config" ,pkg-config)))
+    (synopsis "Full-featured & secure sendmail replacement")
+    (description "Postfix attempts to be fast, easy to administer, and
+secure.  The outside has a definite Sendmail-ish flavor, but the inside is
+completely different.")
+    (home-page "https://www.postfix.org/")
+    (license license:ibmpl1.0)))
-- 
2.21.0

[bug#35619] [PATCH 1/5] gnu: postfix-minimal: Updato to 3.5.0.

[Jan (janneke) Nieuwenhuizen]

* gnu/packages/mail.scm (postfix-minimal): Update to 3.5.0.  Fixes build with
glibc-2.30.
---
 gnu/packages/mail.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index a2708ed1a2..94236bbbcd 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -3558,7 +3558,7 @@ based on asyncio.")
 (define-public postfix-minimal
   (package
     (name "postfix-minimal")
-    (version "3.4.8")
+    (version "3.5.0")
     (source (origin
               (method url-fetch)
               (uri (string-append "http://cdn.postfix.johnriley.me/"
@@ -3566,7 +3566,7 @@ based on asyncio.")
                                   "postfix-" version ".tar.gz"))
               (sha256
                (base32
-                "0hw9kbr05qdzvfqhxi4dp4n3s9xvdh0gr0la08a4bip06ybl4pcd"))))
+                "1k2mxx9yx8lif804ff7zjyllizv4najfv3dca912k6j46fbr5b12"))))
     (build-system gnu-build-system)
     (arguments
      '(#:phases
-- 
Jan Nieuwenhuizen <janneke@gnu.org> | GNU LilyPond http://lilypond.org
Freelance IT http://JoyofSource.com | Avatar® http://AvatarAcademy.com

[bug#35619] [PATCH 2/5] system: examples: Add postfix.tmpl.

[Jan (janneke) Nieuwenhuizen]

* gnu/system/examples/postfix.tmpl: New file.
---
 gnu/system/examples/postfix.tmpl | 52 ++++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 gnu/system/examples/postfix.tmpl

diff --git a/gnu/system/examples/postfix.tmpl b/gnu/system/examples/postfix.tmpl
new file mode 100644
index 0000000000..e0b335954e
--- /dev/null
+++ b/gnu/system/examples/postfix.tmpl
@@ -0,0 +1,52 @@
+;; This is an operating system configuration template for testing postfix.
+
+(use-modules (gnu))
+(use-service-modules mail networking ssh)
+(use-package-modules ssh)
+
+(operating-system
+  (host-name "komputilo")
+  (timezone "Europe/Berlin")
+  (locale "en_US.utf8")
+
+  ;; Boot in "legacy" BIOS mode, assuming /dev/sdX is the
+  ;; target hard disk, and "my-root" is the label of the target
+  ;; root file system.
+  (bootloader (bootloader-configuration
+                (bootloader grub-bootloader)
+                (target "/dev/sdX")))
+
+  ;; Allow run-vm.sh --nographic
+  (kernel-arguments '("console=tty0" "console=ttyS0"))
+  (file-systems (cons (file-system
+                        (device (file-system-label "guix"))
+                        (mount-point "/")
+                        (type "ext4"))
+                      %base-file-systems))
+
+  ;; This is where user accounts are specified.  The "root"
+  ;; account is implicit, and is initially created with the
+  ;; empty password.
+  (users (cons (user-account
+                (name "alice")
+                (comment "Bob's sister")
+                (group "users")
+
+                ;; Adding the account to the "wheel" group
+                ;; makes it a sudoer.
+                (supplementary-groups '("wheel")))
+               %base-user-accounts))
+
+  ;; Add services to the baseline: a DHCP client, POSTFIX and
+  ;; an SSH server.
+  (services (append (list (service dhcp-client-service-type)
+                          (service openssh-service-type
+                             (openssh-configuration
+                              (openssh openssh-sans-x)
+                              (use-pam? #f)
+                              (port-number 2222)
+                              (permit-root-login #t)
+                              (allow-empty-passwords? #t)
+                              (password-authentication? #t)))
+                          (service postfix-service-type))
+                    %base-services)))
-- 
Jan Nieuwenhuizen <janneke@gnu.org> | GNU LilyPond http://lilypond.org
Freelance IT http://JoyofSource.com | Avatar® http://AvatarAcademy.com

[bug#35619] [PATCH 3/5] gnu: postfix-minimal: Fix startup warnings.

[Jan (janneke) Nieuwenhuizen]

This avoids kind of funny replacements like these of `rm'

    find -prune -perm -020
=>
    find -prune -pe/gnu/store/zibwkb5xavnv6z3gzknfqjsxb9b0izh0-coreutils-8.31/bin/rm -020

* gnu/packages/mail.scm (postfix-minimal)[phases]: Set PATH rather than
substituting individual commands.
---
 gnu/packages/mail.scm | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 94236bbbcd..5f622595c9 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -35,6 +35,7 @@
 ;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
 ;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
 ;;; Copyright © 2020 Brant Gardner <brantcgardner@brantware.com>
+;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -3569,7 +3570,10 @@ based on asyncio.")
                 "1k2mxx9yx8lif804ff7zjyllizv4najfv3dca912k6j46fbr5b12"))))
     (build-system gnu-build-system)
     (arguments
-     '(#:phases
+     '(#:modules ((srfi srfi-26)
+                  (guix build utils)
+                  (guix build gnu-build-system))
+       #:phases
        (modify-phases %standard-phases
          (add-before 'build 'patch-/bin/sh
            (lambda _
@@ -3601,14 +3605,20 @@ based on asyncio.")
            (lambda _
              (invoke "make" "makefiles" "pie=yes" "dynamicmaps=yes")))
          (add-before 'install 'fix-postfix-scripts-path
-           (lambda _
-             (for-each
-              (lambda (command)
-                (substitute* '("postfix-install" "conf/post-install" "conf/postfix-script")
-                  (((string-append command " ")) (string-append (which command) " "))))
-              '("awk" "chmod" "chown" "chgrp" "cp" "find" "ln" "mkdir" "mv" "rm" "sed"
-                "sleep" "sort" "touch" "uname"))
-             #t))
+           (lambda* (#:key inputs #:allow-other-keys)
+             (let ((path (string-join
+                          (map (compose (cute string-append <> "/bin")
+                                        (cute assoc-ref inputs <>))
+                               '("bash" "coreutils" "findutils" "gawk" "grep"
+                                 "sed"))
+                          ":")))
+               (substitute* '("postfix-install"
+                              "conf/post-install"
+                              "conf/postfix-script")
+                 (("^SHELL=/bin/sh")
+                  (string-append "PATH=" path "\n"
+                                 "SHELL=" (assoc-ref inputs "bash") "/bin/sh")))
+               #t)))
          (add-before 'install 'configure-install
            (lambda* (#:key outputs #:allow-other-keys)
              (let ((out (assoc-ref outputs "out")))
-- 
Jan Nieuwenhuizen <janneke@gnu.org> | GNU LilyPond http://lilypond.org
Freelance IT http://JoyofSource.com | Avatar® http://AvatarAcademy.com

[bug#35619] [PATCH 4/5] service: postfix: Use mail-aliases-service-type.

[Jan (janneke) Nieuwenhuizen]

* gnu/services/mail.scm (postfix-service-type): Extend mail-aliases-service-type.
(postfix-shepherd-service): Generate /etc/aliases.db if necessary.
---
 gnu/services/mail.scm | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/gnu/services/mail.scm b/gnu/services/mail.scm
index 59cb373fbf..9a0066d920 100644
--- a/gnu/services/mail.scm
+++ b/gnu/services/mail.scm
@@ -5,6 +5,7 @@
 ;;; Copyright © 2017, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2019 Kristofer Buffington <kristoferbuffington@gmail.com>
 ;;; Copyright © 2020 Gábor Boskovits <boskovits@gmail.com>
+;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1956,9 +1957,17 @@ inet_protocols = ipv4
   (match-record config <postfix-configuration>
     (postfix)
     (let* ((postfix-binary (file-append postfix "/postfix"))
+           (postalias-binary (file-append postfix "/postalias"))
            (postfix-action
             (lambda (action)
               #~(lambda _
+                  (when (or (not (file-exists? "/etc/aliases.db"))
+                            (> (stat:mtime (stat "/etc/aliases"))
+                               (stat:mtime (stat "/etc/aliases.db"))))
+                    (invoke #$postalias-binary
+                            "-c"
+                            #$(postfix-configuration-directory config)
+                            "/etc/aliases"))
                   (invoke #$postfix-binary "-c"
                           #$(postfix-configuration-directory config)
                           #$action)))))
@@ -1974,6 +1983,7 @@ inet_protocols = ipv4
    (name 'postfix)
    (extensions (list (service-extension account-service-type postfix-accounts)
                      (service-extension activation-service-type postfix-activation)
-                     (service-extension shepherd-root-service-type postfix-shepherd-service)))
+                     (service-extension shepherd-root-service-type postfix-shepherd-service)
+                     (service-extension mail-aliases-service-type (const '()))))
    (description "Run the Postfix MTA.")
    (default-value (postfix-configuration))))
-- 
Jan Nieuwenhuizen <janneke@gnu.org> | GNU LilyPond http://lilypond.org
Freelance IT http://JoyofSource.com | Avatar® http://AvatarAcademy.com

[bug#35619] [PATCH 5/5] system: postfix.tmpl: Add mail-aliases-service.

[Jan (janneke) Nieuwenhuizen]

* gnu/system/examples/postfix.tmpl: Add mail-aliases-service-type.
---
 gnu/system/examples/postfix.tmpl | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gnu/system/examples/postfix.tmpl b/gnu/system/examples/postfix.tmpl
index e0b335954e..7ebc8544f5 100644
--- a/gnu/system/examples/postfix.tmpl
+++ b/gnu/system/examples/postfix.tmpl
@@ -48,5 +48,7 @@
                               (permit-root-login #t)
                               (allow-empty-passwords? #t)
                               (password-authentication? #t)))
+                          (service mail-aliases-service-type
+                                   '(("postmaster" "root")))
                           (service postfix-service-type))
                     %base-services)))
-- 
Jan Nieuwenhuizen <janneke@gnu.org> | GNU LilyPond http://lilypond.org
Freelance IT http://JoyofSource.com | Avatar® http://AvatarAcademy.com

[bug#35619] [PATCH 5/5] system: postfix.tmpl: Add mail-aliases-service.

[Christine Lemmer-Webber]

Now that the new setuid tooling is in, we should probably try updating
this and getting it going again.  The wip-postfix branch should probably
be rebased as a first step and adjusted to use the new setuid tooling?

Anything else that should be done to make it happen?

 - Christine

[bug#35619] [PATCH 5/5] system: postfix.tmpl: Add mail-aliases-service.

[Gábor Boskovits]

[-- Attachment #1: Type: text/plain, Size: 621 bytes --]

Hello,

yup, that should be the first step. Once that is done I can have a look at
this again, and see what is missing.


Christine Lemmer-Webber <cwebber@dustycloud.org> ezt írta (időpont: 2021.
júl. 29., Cs, 18:22):

> Now that the new setuid tooling is in, we should probably try updating
> this and getting it going again.  The wip-postfix branch should probably
> be rebased as a first step and adjusted to use the new setuid tooling?
>
> Anything else that should be done to make it happen?
>
>  - Christine
>


-- 
OpenPGP Key Fingerprint: 7988:3B9F:7D6A:4DBF:3719:0367:2506:A96C:CF63:0B21

[-- Attachment #2: Type: text/html, Size: 1044 bytes --]

[bug#35619] [PATCH 5/5] system: postfix.tmpl: Add mail-aliases-service.

[Christine Lemmer-Webber]

I've rebased wip-postfix and pushed it up.

The new setuid stuff is not yet added, I just rebased the older commits
on top.

Gábor Boskovits writes:

> Hello,
>
> yup, that should be the first step. Once that is done I can have a look at
> this again, and see what is missing.
>
>
> Christine Lemmer-Webber <cwebber@dustycloud.org> ezt írta (időpont: 2021.
> júl. 29., Cs, 18:22):
>
>> Now that the new setuid tooling is in, we should probably try updating
>> this and getting it going again.  The wip-postfix branch should probably
>> be rebased as a first step and adjusted to use the new setuid tooling?
>>
>> Anything else that should be done to make it happen?
>>
>>  - Christine
>>

[bug#35619] WIP version of postfix.scm

[Ricardo Wurmus]

I just rebased all of this, changed the input style to plain lists,
removed trailing #t from build phases, and upgraded postfix to 3.7.

What is missing to get this merged?

-- 
Ricardo

[bug#35619] WIP version of postfix.scm

[Ricardo Wurmus]

I rebased again and upgraded to 3.7.7.

What remains to be done?  People above mentioned something about setuid,
but I don’t know if that’s something that needs to change in the service
definition or the example configuration, or both.

-- 
Ricardo

[bug#35619] WIP version of postfix.scm

[Ricardo Wurmus]

Okay, I made a few more changes:

- fixed typos

- fixed installation locations so the executables aren’t dumped into
  the prefix directory
  
- let the postfix-service-type conditionally extend
  setuid-program-service-type to setgid on the executables

What’s missing:

- rough tests to see if this works at all
- documentation of the service

Any takers?

-- 
Ricardo