diff options
author | Tobias Geerinckx-Rice <me@tobias.gr> | 2020-07-15 14:04:20 +0200 |
---|---|---|
committer | Tobias Geerinckx-Rice <me@tobias.gr> | 2020-07-15 19:41:39 +0200 |
commit | 4fdf4b6cfaa154e91e80b76f04db009d97aee894 (patch) | |
tree | 8c0eff7d1db836c5fe2dff609abc50d2a40f31a6 /gnu/packages | |
parent | 6422615fc93e057269803dcbc2049a6ea17ec437 (diff) | |
download | guix-patches-4fdf4b6cfaa154e91e80b76f04db009d97aee894.tar guix-patches-4fdf4b6cfaa154e91e80b76f04db009d97aee894.tar.gz |
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.
Diffstat (limited to 'gnu/packages')
-rw-r--r-- | gnu/packages/mail.scm | 87 |
1 files changed, 39 insertions, 48 deletions
diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index ff9a136ff1..079c70ee80 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -2409,71 +2409,62 @@ to esoteric or niche requirements.") (define-public opensmtpd-extras (package (name "opensmtpd-extras") - (version "5.7.1") + (version "6.7.1") (source (origin (method url-fetch) (uri (string-append "https://www.opensmtpd.org/archives/" "opensmtpd-extras-" version ".tar.gz")) (sha256 (base32 - "1kld4hxgz792s0cb2gl7m2n618ikzqkj88w5dhaxdrxg4x2c4vdm")))) + "1b1mx71bvmv92lbm08wr2p60g3qhikvv3n15zsr6dcwbk9aqahzq")))) (build-system gnu-build-system) + (native-inputs + `(("pkg-config" ,pkg-config))) (inputs `(("libressl" ,libressl) ("libevent" ,libevent) - ("libasr" ,libasr) - ("python-2" ,python-2) + ("mysql" ,mysql) ("opensmtpd" ,opensmtpd) - ("perl" ,perl) - ("lua" ,lua) ("postgresql" ,postgresql) - ("sqlite" ,sqlite) - ("linux-pam" ,linux-pam))) - (native-inputs - `(("bison" ,bison) - ("pkg-config" ,pkg-config) - ("groff" ,groff) - ("automake" ,automake) - ("autoconf" ,autoconf))) + ("python" ,python-2) + ("sqlite" ,sqlite))) (arguments - `(;; We have to configure it like this because the default checks for for example - ;; python in /usr/local/bin, /usr/bin and fails otherwise. - #:configure-flags (list - "--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-ram" "--with-queue-stub" - - "--with-scheduler-python" "--with-scheduler-ram" - "--with-scheduler-stub" - - "--with-table-ldap" ; "--with-table-mysql" - "--with-table-passwd" "--with-table-postgres" - "--with-table-python" "--with-table-socketmap" - "--with-table-sqlite" "--with-table-stub" - ;;"--with-table-redis" ; TODO: package hiredis - - "--with-user=smtpd" "--with-privsep-user=smtpd" - "--localstatedir=/var" "--sysconfdir=/etc" - "--with-lua-type=lua" ; can use lua or luajit - - (string-append "--with-python=" - (assoc-ref %build-inputs "python-2")) - (string-append "--with-lua=" - (assoc-ref %build-inputs "lua"))))) - (license (list bsd-2 bsd-3 bsd-4 - public-domain isc license:openssl)) + `(#:configure-flags + (list "--sysconfdir=/etc" + "--localstatedir=/var" + + "--with-queue-null" + "--with-queue-python" + "--with-queue-ram" + "--with-queue-stub" + + "--with-table-ldap" + "--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-scheduler-ram" + "--with-scheduler-stub" + "--with-scheduler-python" + + "--with-user-smtpd=smtpd" + + ;; We have to configure it like this because the default checks for + ;; for example Python in /usr/{,local/}bin and fails otherwise. + (string-append "--with-python=" + (assoc-ref %build-inputs "python"))))) + (home-page "https://www.opensmtpd.org") (synopsis "Extra tables, filters, and various other addons for OpenSMTPD") (description "This package provides extra tables, filters, and various other addons 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 (package |