From owner-svn-ports-all@FreeBSD.ORG  Mon Jan  7 19:22:45 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 1EE9B867;
 Mon,  7 Jan 2013 19:22:45 +0000 (UTC) (envelope-from rea@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 06819EA;
 Mon,  7 Jan 2013 19:22:45 +0000 (UTC)
Received: from svn.freebsd.org (svn.FreeBSD.org [8.8.178.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r07JMIpD057573;
 Mon, 7 Jan 2013 19:22:28 GMT (envelope-from rea@svn.freebsd.org)
Received: (from rea@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r07JM5TU057521;
 Mon, 7 Jan 2013 19:22:05 GMT (envelope-from rea@svn.freebsd.org)
Message-Id: <201301071922.r07JM5TU057521@svn.freebsd.org>
From: Eygene Ryabinkin <rea@FreeBSD.org>
Date: Mon, 7 Jan 2013 19:21:57 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r310051 - 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.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 07 Jan 2013 19:22:45 -0000

Author: rea
Date: Mon Jan  7 19:21:57 2013
New Revision: 310051
URL: http://svnweb.freebsd.org/changeset/ports/310051

Log:
  Exim: add patch that avoids breaking messages with Spamooborona 1024
  
  SO 1024 sometimes give back new headers with '\r\n' as the end of line
  delimiter.  Such result should be treated properly to avoid adding extra
  '\n' to the message headers and turning some of them into body.

Added:
  head/mail/exim/files/extra-patch-so_1024-delimiter   (contents, props changed)
Modified:
  head/mail/exim/Makefile

Modified: head/mail/exim/Makefile
==============================================================================
--- head/mail/exim/Makefile	Mon Jan  7 18:06:55 2013	(r310050)
+++ head/mail/exim/Makefile	Mon Jan  7 19:21:57 2013	(r310051)
@@ -526,6 +526,7 @@ post-extract:
 .endif
 .if defined(WITH_SO_1024)
 	@cd ${WRKDIR} && ${GZIP_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/spamooborona1024-src-${SO_1024_VERSION}.tar.gz ${EXTRACT_AFTER_ARGS}
+	@cd ${WRKDIR} && ${PATCH} --quiet < ${FILESDIR}/extra-patch-so_1024-delimiter
 .endif
 
 do-configure:

Added: head/mail/exim/files/extra-patch-so_1024-delimiter
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/mail/exim/files/extra-patch-so_1024-delimiter	Mon Jan  7 19:21:57 2013	(r310051)
@@ -0,0 +1,13 @@
+Taken from: http://timofeev.biz/2010/10/14/151
+
+--- local_scan_1024.c	2009-11-27 14:02:06.000000000 +0300
++++ local_scan_1024.c	2012-12-30 22:18:53.491544089 +0400
+@@ -443,7 +443,7 @@
+     if (strncmp (answ, "SODAEMON ", 9) == 0)
+     {
+         strP = (char*) answ;
+-        for (tok = strtok (strP, "\n"); tok; tok = strtok (NULL, "\n"))
++        for (tok = strtok (strP, "\r\n"); tok; tok = strtok (NULL, "\r\n"))
+         {
+             /* signature always goes first */
+             if (strncmp (tok, "SODAEMON ", 9) == 0)