gnu: opensmtpd-extras: Update to 6.7.1.

* gnu/packages/mail.scm (opensmtpd-extras): Update to 6.7.1.
[native-inputs]: Remove bison, groff, automake, and autoconf.
[inputs]: Remove libasr, perl, lua, and linux-pam.  Add mysql.
[arguments]: Remove obsolete or ineffective options.
[license]: Update.
This commit is contained in:
Tobias Geerinckx-Rice 2020-07-15 14:04:20 +02:00
parent 6422615fc9
commit 4fdf4b6cfa
No known key found for this signature in database
GPG key ID: 0DB0FF884F556D79

View file

@ -2409,71 +2409,62 @@ (define-public opensmtpd
(define-public opensmtpd-extras (define-public opensmtpd-extras
(package (package
(name "opensmtpd-extras") (name "opensmtpd-extras")
(version "5.7.1") (version "6.7.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://www.opensmtpd.org/archives/" (uri (string-append "https://www.opensmtpd.org/archives/"
"opensmtpd-extras-" version ".tar.gz")) "opensmtpd-extras-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1kld4hxgz792s0cb2gl7m2n618ikzqkj88w5dhaxdrxg4x2c4vdm")))) "1b1mx71bvmv92lbm08wr2p60g3qhikvv3n15zsr6dcwbk9aqahzq"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)))
(inputs (inputs
`(("libressl" ,libressl) `(("libressl" ,libressl)
("libevent" ,libevent) ("libevent" ,libevent)
("libasr" ,libasr) ("mysql" ,mysql)
("python-2" ,python-2)
("opensmtpd" ,opensmtpd) ("opensmtpd" ,opensmtpd)
("perl" ,perl)
("lua" ,lua)
("postgresql" ,postgresql) ("postgresql" ,postgresql)
("sqlite" ,sqlite) ("python" ,python-2)
("linux-pam" ,linux-pam))) ("sqlite" ,sqlite)))
(native-inputs
`(("bison" ,bison)
("pkg-config" ,pkg-config)
("groff" ,groff)
("automake" ,automake)
("autoconf" ,autoconf)))
(arguments (arguments
`(;; We have to configure it like this because the default checks for for example `(#:configure-flags
;; python in /usr/local/bin, /usr/bin and fails otherwise. (list "--sysconfdir=/etc"
#:configure-flags (list "--localstatedir=/var"
"--with-filter-clamav" "--with-filter-dkim-signer"
"--with-filter-dnsbl" "--with-filter-lua"
"--with-filter-monkey" "--with-filter-pause"
"--with-filter-perl" "--with-filter-python"
"--with-filter-regex" "--with-filter-spamassassin"
"--with-filter-stub" "--with-filter-trace"
"--with-filter-void"
"--with-queue-null" "--with-queue-python" "--with-queue-null"
"--with-queue-ram" "--with-queue-stub" "--with-queue-python"
"--with-queue-ram"
"--with-queue-stub"
"--with-scheduler-python" "--with-scheduler-ram" "--with-table-ldap"
"--with-scheduler-stub" "--with-table-mysql"
"--with-table-postgres"
;; "--with-table-redis" ; TODO: package hiredis
"--with-table-socketmap"
"--with-table-passwd"
"--with-table-python"
"--with-table-sqlite"
"--with-table-stub"
"--with-table-ldap" ; "--with-table-mysql" "--with-scheduler-ram"
"--with-table-passwd" "--with-table-postgres" "--with-scheduler-stub"
"--with-table-python" "--with-table-socketmap" "--with-scheduler-python"
"--with-table-sqlite" "--with-table-stub"
;;"--with-table-redis" ; TODO: package hiredis
"--with-user=smtpd" "--with-privsep-user=smtpd" "--with-user-smtpd=smtpd"
"--localstatedir=/var" "--sysconfdir=/etc"
"--with-lua-type=lua" ; can use lua or luajit
(string-append "--with-python=" ;; We have to configure it like this because the default checks for
(assoc-ref %build-inputs "python-2")) ;; for example Python in /usr/{,local/}bin and fails otherwise.
(string-append "--with-lua=" (string-append "--with-python="
(assoc-ref %build-inputs "lua"))))) (assoc-ref %build-inputs "python")))))
(license (list bsd-2 bsd-3 bsd-4 (home-page "https://www.opensmtpd.org")
public-domain isc license:openssl))
(synopsis "Extra tables, filters, and various other addons for OpenSMTPD") (synopsis "Extra tables, filters, and various other addons for OpenSMTPD")
(description (description
"This package provides extra tables, filters, and various other addons "This package provides extra tables, filters, and various other addons
for OpenSMTPD to extend its functionality.") for OpenSMTPD to extend its functionality.")
(home-page "https://www.opensmtpd.org"))) (license (list bsd-2 bsd-3 ; openbsd-compat
isc)))) ; everything else
(define-public python-mailmanclient (define-public python-mailmanclient
(package (package