me/guix
Archived
1
0
Fork 0
Code Activity

gnu: exim: Update to 4.93.0.4.

Browse source 
* gnu/packages/mail.scm (exim): Update to 4.93.0.4.
[source]: Add /fixes/ URI to the list.
[inputs]: Use gnutls/dane variant.
[native-inputs]: Add pkg-config.
[arguments]: Set USE_GNUTLS* variables to use the new inputs..
Add CC=gcc to #:make-flags.
This commit is contained in:
Tobias Geerinckx-Rice 2020-01-07 18:04:36 +01:00
parent a56430442e
commit cda8250b20
No known key found for this signature in database
GPG key ID: D889B0F018C5493C
1 changed files with 20 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
gnu/packages/mail.scm
View file

@ -22,7 +22,7 @@
;;; Copyright © 2016, 2018 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2016, 2018 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be> ;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
;;; Copyright © 2017 Kyle Meyer <kyle@kyleam.com> ;;; Copyright © 2017 Kyle Meyer <kyle@kyleam.com>
;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017, 2018 Rene Saavedra <pacoon@protonmail.com> ;;; Copyright © 2017, 2018 Rene Saavedra <pacoon@protonmail.com>
;;; Copyright © 2018, 2019 Pierre Langlois <pierre.langlois@gmx.com> ;;; Copyright © 2018, 2019 Pierre Langlois <pierre.langlois@gmx.com>
;;; Copyright © 2018 Alex Vong <alexvong1995@gmail.com> ;;; Copyright © 2018 Alex Vong <alexvong1995@gmail.com>
@ -1260,21 +1260,24 @@ delivery.")
(define-public exim (define-public exim
(package (package
(name "exim") (name "exim")
(version "4.92.3") (version "4.93.0.4")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (list (string-append "https://ftp.exim.org/pub/exim/exim4/exim-" (uri (list (string-append "https://ftp.exim.org/pub/exim/exim4/exim-"
version ".tar.bz2") version ".tar.bz2")
;; ‘Fix’ releases (exim-x.y.z.f) are kept separately.
(string-append "https://ftp.exim.org/pub/exim/exim4/fixes/exim-"
version ".tar.bz2")
;; After a new release the previous one is moved here.
(string-append "https://ftp.exim.org/pub/exim/exim4/old/exim-" (string-append "https://ftp.exim.org/pub/exim/exim4/old/exim-"
version ".tar.bz2"))) version ".tar.bz2")))
(sha256 (sha256
(base32 (base32 "1ng4flyv2jqjbw66dbdgma7kfnnph9h3s1yyc0q27n7q0sx3cwxn"))))
"0d0h0j9pl3yf089sc59ia60m3dqnkb3qh1qaz6vxfg2ja2mnm5i9"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("bdb" ,bdb-5.3) ; ‘#error Version 6 and later BDB API is not supported’ `(("bdb" ,bdb-5.3) ; ‘#error Version 6 and later BDB API is not supported’
("gnutls" ,gnutls) ("gnutls" ,gnutls/dane)
("gzip" ,gzip) ("gzip" ,gzip)
("bzip2" ,bzip2) ("bzip2" ,bzip2)
("xz" ,xz) ("xz" ,xz)
@ -1284,7 +1287,8 @@ delivery.")
("libxaw" ,libxaw))) ("libxaw" ,libxaw)))
(native-inputs (native-inputs
`(("pcre" ,pcre "bin") `(("pcre" ,pcre "bin")
("perl" ,perl))) ("perl" ,perl)
("pkg-config" ,pkg-config)))
(arguments (arguments
'(#:phases '(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
@ -1313,9 +1317,11 @@ delivery.")
(("(COMPRESS_COMMAND=).*" all var) (("(COMPRESS_COMMAND=).*" all var)
(string-append var gzip "/bin/gzip\n")) (string-append var gzip "/bin/gzip\n"))
(("(ZCAT_COMMAND=).*" all var) (("(ZCAT_COMMAND=).*" all var)
(string-append var gzip "/bin/zcat\n"))) (string-append var gzip "/bin/zcat\n"))
;; This file has hardcoded names for tools despite the zcat (("# (USE_GNUTLS(|_PC)=.*)" all line)
;; configuration above. (string-append line "\n")))
;; This file has hard-coded relative file names for tools despite
;; the zcat configuration above.
(substitute* '("src/exigrep.src") (substitute* '("src/exigrep.src")
(("'zcat'") (string-append "'" gzip "/bin/zcat'")) (("'zcat'") (string-append "'" gzip "/bin/zcat'"))
(("'bzcat'") (string-append "'" bzip2 "/bin/bzcat'")) (("'bzcat'") (string-append "'" bzip2 "/bin/bzcat'"))
@ -1332,8 +1338,11 @@ delivery.")
(substitute* '("scripts/Configure-eximon") (substitute* '("scripts/Configure-eximon")
(("#!/bin/sh") (string-append "#!" bash "/bin/sh")))) (("#!/bin/sh") (string-append "#!" bash "/bin/sh"))))
#t))) #t)))
#:make-flags '("INSTALL_ARG=-no_chown") #:make-flags
;; No 'check' target. (list "CC=gcc"
"INSTALL_ARG=-no_chown")
;; No 'check' target. There is a test suite in test/, which assumes that
;; certain build options were (not) used and that it can freely ‘sudo’.
#:tests? #f)) #:tests? #f))
(home-page "https://www.exim.org/") (home-page "https://www.exim.org/")
(synopsis (synopsis