svn commit: r429429 - in branches/2016Q4/mail: exim exim-doc-html

[Vsevolod Stakhov]

Author: vsevolod
Date: Sun Dec 25 14:18:33 2016
New Revision: 429429
URL: https://svnweb.freebsd.org/changeset/ports/429429

Log:
  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)

Modified:
  branches/2016Q4/mail/exim-doc-html/Makefile
  branches/2016Q4/mail/exim-doc-html/distinfo
  branches/2016Q4/mail/exim/Makefile
  branches/2016Q4/mail/exim/distinfo
Directory Properties:
  branches/2016Q4/   (props changed)

Modified: branches/2016Q4/mail/exim-doc-html/Makefile
==============================================================================
--- branches/2016Q4/mail/exim-doc-html/Makefile	Sun Dec 25 14:13:29 2016	(r429428)
+++ branches/2016Q4/mail/exim-doc-html/Makefile	Sun Dec 25 14:18:33 2016	(r429429)
@@ -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 at FreeBSD.org

Modified: branches/2016Q4/mail/exim-doc-html/distinfo
==============================================================================
--- branches/2016Q4/mail/exim-doc-html/distinfo	Sun Dec 25 14:13:29 2016	(r429428)
+++ branches/2016Q4/mail/exim-doc-html/distinfo	Sun Dec 25 14:18:33 2016	(r429429)
@@ -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

Modified: branches/2016Q4/mail/exim/Makefile
==============================================================================
--- branches/2016Q4/mail/exim/Makefile	Sun Dec 25 14:13:29 2016	(r429428)
+++ branches/2016Q4/mail/exim/Makefile	Sun Dec 25 14:18:33 2016	(r429429)
@@ -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/l
 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"
 

Modified: branches/2016Q4/mail/exim/distinfo
==============================================================================
--- branches/2016Q4/mail/exim/distinfo	Sun Dec 25 14:13:29 2016	(r429428)
+++ branches/2016Q4/mail/exim/distinfo	Sun Dec 25 14:18:33 2016	(r429429)
@@ -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