Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 6 Feb 2013 04:49:02 +0000 (UTC)
From:      Bryan Drewery <bdrewery@FreeBSD.org>
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
Message-ID:  <201302060449.r164n2GS076446@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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"



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