From owner-svn-ports-all@FreeBSD.ORG  Wed Feb  6 04:49:02 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id D71407E2;
 Wed,  6 Feb 2013 04:49:02 +0000 (UTC)
 (envelope-from bdrewery@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 985DECB9;
 Wed,  6 Feb 2013 04:49:02 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r164n2As076449;
 Wed, 6 Feb 2013 04:49:02 GMT (envelope-from bdrewery@svn.freebsd.org)
Received: (from bdrewery@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r164n2GS076446;
 Wed, 6 Feb 2013 04:49:02 GMT (envelope-from bdrewery@svn.freebsd.org)
Message-Id: <201302060449.r164n2GS076446@svn.freebsd.org>
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Wed, 6 Feb 2013 04:49:02 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r311743 - in head/mail: qmail qmail-spamcontrol
 qmail/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: Wed, 06 Feb 2013 04:49:02 -0000

Author: bdrewery
Date: Wed Feb  6 04:49:01 2013
New Revision: 311743
URL: http://svnweb.freebsd.org/changeset/ports/311743

Log:
  - Fix runtime crash when using SMTPEXTFORK option due to
    calling strtok(3) without string.h included.
    Not reported "upstream" as the last update was 2009
    and the site is dead.
  
  Reported by:	Christopher Weimann <christopher@weimann.us>

Added:
  head/mail/qmail/files/extra-patch-smtpextfork-qmail-smtpd.c   (contents, props changed)
Modified:
  head/mail/qmail-spamcontrol/Makefile
  head/mail/qmail/Makefile

Modified: head/mail/qmail-spamcontrol/Makefile
==============================================================================
--- head/mail/qmail-spamcontrol/Makefile	Wed Feb  6 02:35:29 2013	(r311742)
+++ head/mail/qmail-spamcontrol/Makefile	Wed Feb  6 04:49:01 2013	(r311743)
@@ -2,7 +2,7 @@
 
 PORTNAME=	qmail
 PORTVERSION=	${QMAIL_VERSION}.${SPAMCONTROL_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES+=	http://www.fehcom.de/qmail/spamcontrol/:spamcontrol \
 		${MASTER_SITE_LOCAL:S/$/:spamcontrol/}

Modified: head/mail/qmail/Makefile
==============================================================================
--- head/mail/qmail/Makefile	Wed Feb  6 02:35:29 2013	(r311742)
+++ head/mail/qmail/Makefile	Wed Feb  6 04:49:01 2013	(r311743)
@@ -703,6 +703,7 @@ post-patch:
 . endif
 . if ${PORT_OPTIONS:MSMTPEXTFORK}
 	@${PATCH} -d ${WRKSRC} < ${DISTDIR}/${DIST_SUBDIR}/${SMTPEXTFORK_PATCH}
+	@${PATCH} -d ${WRKSRC} < ${FILESDIR}/extra-patch-smtpextfork-qmail-smtpd.c
 .  if ${PORT_OPTIONS:MXF_QUITASAP}
 	@${REINPLACE_CMD} 's!//#define XF_QUITASAP!#define XF_QUITASAP!g' \
 		${WRKSRC}/qmail-smtpd.c

Added: head/mail/qmail/files/extra-patch-smtpextfork-qmail-smtpd.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/mail/qmail/files/extra-patch-smtpextfork-qmail-smtpd.c	Wed Feb  6 04:49:01 2013	(r311743)
@@ -0,0 +1,7 @@
+--- qmail-smtpd.c.orig	2013-02-05 21:28:49.477460299 -0600
++++ qmail-smtpd.c	2013-02-05 21:29:23.512455333 -0600
+@@ -1,3 +1,4 @@
++#include <string.h>
+ #include "readwrite.h"
+ #include "stralloc.h"
+ #include "substdio.h"