Skip site navigation (1)Skip section navigation (2) 
Date:      Wed, 21 Jun 2017 22:17:34 +0000 (UTC)
From:      Vsevolod Stakhov <vsevolod@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r444082 - in head/mail/exim: . files
Message-ID:  <201706212217.v5LMHYMm063286@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
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;

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201706212217.v5LMHYMm063286>