svn commit: r310051 - in head/mail/exim: . files

[Eygene Ryabinkin]

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)