aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVsevolod Stakhov <vsevolod@FreeBSD.org>2016-12-25 14:18:33 +0000
committerVsevolod Stakhov <vsevolod@FreeBSD.org>2016-12-25 14:18:33 +0000
commit4a2d48674599687c71b9f1d250dffe6095f07114 (patch)
tree7b397efa875c61bd10e129fd4b742e34747dbd5d
parent159607b2e40ea0694c739056d169ae6ab5057c5f (diff)
downloadports-4a2d48674599687c71b9f1d250dffe6095f07114.tar.gz
ports-4a2d48674599687c71b9f1d250dffe6095f07114.zip
MFH: r429426
- Update to 4.87.1 (security release) - Fix subdirs to allow download of the distfiles Security: CVE-2016-9963 Approved by: ports-secteam (blanket)
Notes
Notes: svn path=/branches/2016Q4/; revision=429429
-rw-r--r--mail/exim-doc-html/Makefile6
-rw-r--r--mail/exim-doc-html/distinfo1
-rw-r--r--mail/exim/Makefile6
-rw-r--r--mail/exim/distinfo5
4 files changed, 12 insertions, 6 deletions
diff --git a/mail/exim-doc-html/Makefile b/mail/exim-doc-html/Makefile
index 19db06f9e784..58b451ddf87c 100644
--- a/mail/exim-doc-html/Makefile
+++ b/mail/exim-doc-html/Makefile
@@ -4,10 +4,12 @@
PORTNAME= exim
PORTVERSION= 4.87
CATEGORIES= mail
-MASTER_SITES= EXIM/exim4/:exim
+MASTER_SITES= EXIM
+MASTER_SITE_SUBDIR= /exim4/ \
+ /exim4/old/
PKGNAMESUFFIX= -doc-${DOCFORMAT}
DISTNAME= exim-${DISTDOCFORMAT}-${PORTVERSION}
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:exim
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
DIST_SUBDIR= exim
MAINTAINER= vsevolod@FreeBSD.org
diff --git a/mail/exim-doc-html/distinfo b/mail/exim-doc-html/distinfo
index cf0296d60de7..084034d5ac39 100644
--- a/mail/exim-doc-html/distinfo
+++ b/mail/exim-doc-html/distinfo
@@ -1,3 +1,4 @@
+TIMESTAMP = 1482674149
SHA256 (exim/exim-html-4.87.tar.bz2) = 8f87876d4a392f59d1009ba64ac461862951a3f4eed9c0b14a49be7bcbdc1f12
SIZE (exim/exim-html-4.87.tar.bz2) = 478953
SHA256 (exim/exim-pdf-4.87.tar.bz2) = 52c6205ec31fe8162a7068ba86dfd1ac6e370c76a5377bdc7bd29555f8d6ca0c
diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index e77600687552..e8446b9ed9e7 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -4,7 +4,9 @@
PORTNAME= exim
PORTVERSION?= ${EXIM_VERSION}
CATEGORIES= mail ipv6
-MASTER_SITES= EXIM/exim4/:exim
+MASTER_SITES= EXIM:exim
+MASTER_SITE_SUBDIR= /exim4/:exim \
+ /exim4/old/:exim
DISTNAME= ${PORTNAME}-${EXIM_VERSION}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:exim
DIST_SUBDIR= exim
@@ -94,7 +96,7 @@ MASTER_SITES+= http://marc.merlins.org/linux/exim/files/:sa_exim \
DISTFILES+= sa-exim-${SA_EXIM_VERSION}.tar.gz:sa_exim
.endif
-EXIM_VERSION= 4.87
+EXIM_VERSION= 4.87.1
SA_EXIM_VERSION=4.2
EXIM_INSTALL_ARG+= "-no_chown" "-no_symlink"
diff --git a/mail/exim/distinfo b/mail/exim/distinfo
index 5561dc8d7d88..0cc4cb1cb491 100644
--- a/mail/exim/distinfo
+++ b/mail/exim/distinfo
@@ -1,4 +1,5 @@
-SHA256 (exim/exim-4.87.tar.bz2) = 74691e0dff4d1b5d387e9c33c86f96a8f6d2adbc781c0dec9d2061a847b07dc9
-SIZE (exim/exim-4.87.tar.bz2) = 1801422
+TIMESTAMP = 1482673582
+SHA256 (exim/exim-4.87.1.tar.bz2) = d4b7994c89240d2f9a9fcd7a2dffa4b72f14379001a24266f4dbb0fbe5131514
+SIZE (exim/exim-4.87.1.tar.bz2) = 1789634
SHA256 (exim/sa-exim-4.2.tar.gz) = 72e0a735547f18b05785e6c58a71d24623858f0f5234a5dc0e24cb453999e99a
SIZE (exim/sa-exim-4.2.tar.gz) = 66575