From owner-svn-ports-all@freebsd.org  Wed Jun 21 22:17:35 2017
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id B6AE4D9A04F;
 Wed, 21 Jun 2017 22:17:35 +0000 (UTC)
 (envelope-from vsevolod@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 6FA9780397;
 Wed, 21 Jun 2017 22:17:35 +0000 (UTC)
 (envelope-from vsevolod@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v5LMHYwS063288;
 Wed, 21 Jun 2017 22:17:34 GMT (envelope-from vsevolod@FreeBSD.org)
Received: (from vsevolod@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v5LMHYMm063286;
 Wed, 21 Jun 2017 22:17:34 GMT (envelope-from vsevolod@FreeBSD.org)
Message-Id: <201706212217.v5LMHYMm063286@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: vsevolod set sender to
 vsevolod@FreeBSD.org using -f
From: Vsevolod Stakhov <vsevolod@FreeBSD.org>
Date: Wed, 21 Jun 2017 22:17:34 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r444082 - in head/mail/exim: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 21 Jun 2017 22:17:35 -0000

Author: vsevolod
Date: Wed Jun 21 22:17:34 2017
New Revision: 444082
URL: https://svnweb.freebsd.org/changeset/ports/444082

Log:
  - Add workaround for CVE-2017-1000369
  
  MFH:		2017Q2

Added:
  head/mail/exim/files/patch-CVE-2017-1000369   (contents, props changed)
Modified:
  head/mail/exim/Makefile

Modified: head/mail/exim/Makefile
==============================================================================
--- head/mail/exim/Makefile	Wed Jun 21 22:05:50 2017	(r444081)
+++ head/mail/exim/Makefile	Wed Jun 21 22:17:34 2017	(r444082)
@@ -3,6 +3,7 @@
 
 PORTNAME=	exim
 PORTVERSION?=	${EXIM_VERSION}
+PORTREVISION=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	EXIM:exim
 MASTER_SITE_SUBDIR=	/exim4/:exim \

Added: head/mail/exim/files/patch-CVE-2017-1000369
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/mail/exim/files/patch-CVE-2017-1000369	Wed Jun 21 22:17:34 2017	(r444082)
@@ -0,0 +1,37 @@
+diff --git a/src/src/exim.c b/src/src/exim.c
+index 67583e58..88e11977 100644
+--- src/exim.c
++++ src/exim.c
+@@ -3106,7 +3106,14 @@ for (i = 1; i < argc; i++)
+ 
+       /* -oMr: Received protocol */
+ 
+-      else if (Ustrcmp(argrest, "Mr") == 0) received_protocol = argv[++i];
++      else if (Ustrcmp(argrest, "Mr") == 0)
++
++        if (received_protocol)
++          {
++          fprintf(stderr, "received_protocol is set already\n");
++          exit(EXIT_FAILURE);
++          }
++        else received_protocol = argv[++i];
+ 
+       /* -oMs: Set sender host name */
+ 
+@@ -3202,7 +3209,15 @@ for (i = 1; i < argc; i++)
+ 
+     if (*argrest != 0)
+       {
+-      uschar *hn = Ustrchr(argrest, ':');
++      uschar *hn;
++
++      if (received_protocol)
++        {
++        fprintf(stderr, "received_protocol is set already\n");
++        exit(EXIT_FAILURE);
++        }
++
++      hn = Ustrchr(argrest, ':');
+       if (hn == NULL)
+         {
+         received_protocol = argrest;