Subject: bug#34706: closed (Re: [PATCH] gnu: Add opensmtpd-next.)

From: [email-masked] (GNU bug Tracking System)
Date: Sun, 10 Mar 2019 14:00:02 +0000

Your bug report

#34706: [PATCH] gnu: Add opensmtpd-next.

which was filed against the guix-patches package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to [email-masked].

-- 
34706: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=34706
GNU Bug Tracking System
Contact [email-masked] with problems

Subject: Re: [PATCH] gnu: Add opensmtpd-next.
From: Tobias Geerinckx-Rice <[email-masked]>
To: [email-masked]
Date: Sun, 10 Mar 2019 14:57:18 +0100
List-Id: <debbugs-submit.debbugs.gnu.org>

Guix,

I've been running OpenSMTPd 6.4 on Guix System for several weeks 
now without fail, so I've added opensmtpd-next in 
4eb57ca883e804897f7099ecf6e5a77161e46d9e.

Kind regards,

T G-R

Subject: [PATCH] gnu: Add opensmtpd-next.
From: Tobias Geerinckx-Rice <[email-masked]>
To: [email-masked]
Date: Sat, 2 Mar 2019 01:51:35 +0100
List-Id: <debbugs-submit.debbugs.gnu.org>

* gnu/packages/mail.scm (opensmtpd-next): New public variable.
---

Sent from my Guix System running OpenSMTPd 6.4.1p2.

 gnu/packages/mail.scm | 69 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 69 insertions(+)

diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 90bd79ae3c..1d2c033274 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -2045,6 +2045,75 @@ e-mails with other systems speaking the SMTP protocol.")
     (license (list bsd-2 bsd-3 bsd-4 (non-copyleft "file://COPYING")
                    public-domain isc license:openssl))))
 
+;; OpenSMTPd 6.4 introduced a new and incompatible configuration file format.
+;; Use a different name, for now, to avoid auto-upgrades and broken mail boxes.
+;; OPENSMTP-CONFIGURATION in (gnu services mail) will also need an overhaul.
+(define-public opensmtpd-next
+  (package
+    (name "opensmtpd-next")
+    (version "6.4.1p2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://www.opensmtpd.org/archives/"
+                           "opensmtpd-" version ".tar.gz"))
+       (sha256
+        (base32 "0cppqlx4fk6l8rbim5symh2fm1kzshf421256g596j6c9f9q96xn"))))
+    (build-system gnu-build-system)
+    (inputs
+     `(("bdb" ,bdb)
+       ("libressl" ,libressl)
+       ("libevent" ,libevent)
+       ("libasr" ,libasr)
+       ("linux-pam" ,linux-pam)
+       ("zlib" ,zlib)))
+    (native-inputs
+     `(("bison" ,bison)
+       ("groff" ,groff)))               ; for man pages
+    (arguments
+     `(#:configure-flags
+       (list "--localstatedir=/var"
+             ;; This is the default only if it exists at build time; it doesn't.
+             "--with-path-socket=/var/run"
+             "--with-path-CAfile=/etc/ssl/certs/ca-certificates.crt"
+             "--with-user-smtpd=smtpd"
+             "--with-user-queue=smtpq" "--with-group-queue=smtpq"
+             "--with-auth-pam"
+             "--with-table-db")
+       #:phases
+       (modify-phases %standard-phases
+         ;; Fix some incorrectly hard-coded external tool file names.
+         (add-after 'unpack 'patch-FHS-file-names
+           (lambda _
+             (substitute* "smtpd/smtpctl.c"
+               ;; ‘gzcat’ is auto-detected at compile time, but ‘cat’ isn't.
+               (("/bin/cat") (which "cat")))
+             (substitute* "smtpd/mda_unpriv.c"
+               (("/bin/sh") (which "sh")))
+             #t))
+         ;; OpenSMTPD provides a single utility smtpctl to control the daemon and
+         ;; the local submission subsystem.  To accomodate systems that require
+         ;; historical interfaces such as sendmail, newaliases or makemap, the
+         ;; smtpctl utility can operate in compatibility mode if called with the
+         ;; historical name.
+         (add-after 'install 'install-compability-links
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out  (assoc-ref outputs "out"))
+                    (sbin (string-append out "/sbin/")))
+               (for-each (lambda (command)
+                           (symlink "smtpctl" (string-append sbin command)))
+                         (list "makemap" "sendmail" "send-mail"
+                               "newaliases" "mailq")))
+             #t)))))
+    (synopsis "Lightweight SMTP daemon")
+    (description
+     "OpenSMTPD is an implementation of the server-side SMTP protocol, with
+some additional standard extensions.  It allows ordinary machines to exchange
+e-mails with other systems speaking the SMTP protocol.")
+    (home-page "https://www.opensmtpd.org")
+    (license (list bsd-2 bsd-3 bsd-4 (non-copyleft "file://COPYING")
+                   public-domain isc license:openssl))))
+
 (define-public opensmtpd-extras
   (package
     (name "opensmtpd-extras")
-- 
2.20.1