aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/mail.scm
diff options
context:
space:
mode:
Diffstat (limited to 'gnu/packages/mail.scm')
-rw-r--r--gnu/packages/mail.scm49
1 files changed, 26 insertions, 23 deletions
diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 77d935171a..114b1a21bb 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -1034,7 +1034,7 @@ delivery.")
(define-public exim
(package
(name "exim")
- (version "4.89")
+ (version "4.89.1")
(source
(origin
(method url-fetch)
@@ -1042,10 +1042,9 @@ delivery.")
version ".tar.bz2")
(string-append "ftp://ftp.exim.org/pub/exim/exim4/old/exim-"
version ".tar.bz2")))
- (patches (search-patches "exim-CVE-2017-1000369.patch"))
(sha256
(base32
- "1c0syp7yxngmq7y8vqsrvijinzin5m941vn0ljihdfld7kh2wbwi"))))
+ "133sjkcm9wlhpcxflr5v865varc1995bqa1y3vjs1w6zc34kp18w"))))
(build-system gnu-build-system)
(inputs
`(("bdb" ,bdb)
@@ -1611,7 +1610,8 @@ deliver it in various ways.")
;; getline() in formail.c. The patch is provided by Debian as
;; patch 24.
(patches (search-patches "procmail-ambiguous-getline-debian.patch"
- "procmail-CVE-2014-3618.patch"))))
+ "procmail-CVE-2014-3618.patch"
+ "procmail-CVE-2017-16844.patch"))))
(arguments
`(#:phases (modify-phases %standard-phases
(replace 'configure
@@ -2107,9 +2107,9 @@ installation on systems where resources are limited. Its features include:
@end enumerate\n")
(license license:expat)))
-(define-public python-django-mailman3
+(define-public python2-django-mailman3
(package
- (name "python-django-mailman3")
+ (name "python2-django-mailman3")
(version "1.0.1")
(source
(origin
@@ -2119,16 +2119,28 @@ installation on systems where resources are limited. Its features include:
(base32
"1adxyh8knw9knjlh73xq0jpn5adml0ck4alsv0swakm95wfyx46z"))))
(build-system python-build-system)
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (replace 'check
+ (lambda _
+ (zero?
+ (system*
+ "django-admin"
+ "test"
+ "--settings=django_mailman3.tests.settings_test"
+ "django_mailman3")))))
+ #:python ,python-2))
(inputs
- `(("python-django" ,python-django)))
+ `(("python2-django" ,python2-django)))
(propagated-inputs
- `(("python-requests" ,python-requests)
- ("python-requests-oauthlib" ,python-requests-oauthlib)
- ("python-openid" ,python-openid)
- ("python-mailmanclient" ,python-mailmanclient)
- ("python-django-allauth" ,python-django-allauth)
- ("python-django-gravatar2" ,python-django-gravatar2)
- ("python-pytz" ,python-pytz)))
+ `(("python2-requests" ,python2-requests)
+ ("python2-requests-oauthlib" ,python2-requests-oauthlib)
+ ("python2-openid" ,python2-openid)
+ ("python2-mailmanclient" ,python2-mailmanclient)
+ ("python2-django-allauth" ,python2-django-allauth)
+ ("python2-django-gravatar2" ,python2-django-gravatar2)
+ ("python2-pytz" ,python2-pytz)))
(home-page "https://gitlab.com/mailman/django-mailman3")
(synopsis "Django library for Mailman UIs")
(description
@@ -2136,15 +2148,6 @@ installation on systems where resources are limited. Its features include:
interacting with Mailman.")
(license gpl3+)))
-(define-public python2-django-mailman3
- (let ((base (package-with-python2
- python-django-mailman3)))
- (package
- (inherit base)
- (propagated-inputs
- `(("python2-openid" ,python2-openid)
- ,@(package-propagated-inputs base))))))
-
(define-public postorius
(package
(name "postorius")