From owner-svn-ports-head@FreeBSD.ORG Thu Dec 11 16:59:30 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 918FA496; Thu, 11 Dec 2014 16:59:30 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 72587E9C; Thu, 11 Dec 2014 16:59:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBBGxUT2048201; Thu, 11 Dec 2014 16:59:30 GMT (envelope-from leeym@FreeBSD.org) Received: (from leeym@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBBGxTQv048196; Thu, 11 Dec 2014 16:59:29 GMT (envelope-from leeym@FreeBSD.org) Message-Id: <201412111659.sBBGxTQv048196@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: leeym set sender to leeym@FreeBSD.org using -f From: Yen-Ming Lee Date: Thu, 11 Dec 2014 16:59:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374539 - in head/textproc/antiword: . 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-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Dec 2014 16:59:30 -0000 Author: leeym Date: Thu Dec 11 16:59:28 2014 New Revision: 374539 URL: https://svnweb.freebsd.org/changeset/ports/374539 QAT: https://qat.redports.org/buildarchive/r374539/ Log: - add patch to prevent buffer overflow - bump PORTREVISION PR: 195558 Submitted by: fk@fabiankeil.de Added: head/textproc/antiword/files/ head/textproc/antiword/files/patch-wordole.c (contents, props changed) Modified: head/textproc/antiword/Makefile head/textproc/antiword/pkg-plist Modified: head/textproc/antiword/Makefile ============================================================================== --- head/textproc/antiword/Makefile Thu Dec 11 16:52:40 2014 (r374538) +++ head/textproc/antiword/Makefile Thu Dec 11 16:59:28 2014 (r374539) @@ -3,13 +3,15 @@ PORTNAME= antiword PORTVERSION= 0.37 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= textproc MASTER_SITES= http://www.winfield.demon.nl/linux/ MAINTAINER= leeym@FreeBSD.org COMMENT= Application for displaying Microsoft(R) Word documents +OPTIONS_DEFINE= DEBUG + LICENSE= GPLv2 BUILD_DEPENDS= ${LOCALBASE}/share/ghostscript/fonts/n022003l.afm:${PORTSDIR}/print/gsfonts @@ -24,11 +26,17 @@ INSTALL_TARGET= global_install PORTDOCS= COPYING ChangeLog Emacs Exmh FAQ History Mozilla Mutt Netscape \ QandA ReadMe antiword.1 antiword.man antiword.php testdoc.doc +.include + +.if ${PORT_OPTIONS:MDEBUG} +CFLAGS+= -DDEBUG +.else CFLAGS+= -DNDEBUG +.endif post-patch: @${REINPLACE_CMD} -E 's,/usr/share,${LOCALBASE}/share,g; s,fonts2,fonts,' ${WRKSRC}/Unix-only/fontinfo.pl - @${REINPLACE_CMD} -E 's|LD|CC|g; /^(CC|CFLAGS)/d; s,/usr/share,${PREFIX}/share,g; s|/usr/local/bin|${PREFIX}/bin|g' ${WRKSRC}/${MAKEFILE} + @${REINPLACE_CMD} -E 's|LD|CC|g; /^(CC|CFLAGS|OPT)/d; s,/usr/share,${PREFIX}/share,g; s|/usr/local/bin|${PREFIX}/bin|g' ${WRKSRC}/${MAKEFILE} @${REINPLACE_CMD} -E 's,/usr/share,${PREFIX}/share,g' ${WRKSRC}/antiword.h post-install: Added: head/textproc/antiword/files/patch-wordole.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/antiword/files/patch-wordole.c Thu Dec 11 16:59:28 2014 (r374539) @@ -0,0 +1,14 @@ +--- wordole.c ++++ wordole.c +@@ -259,6 +259,11 @@ bGetPPS(FILE *pFile, + } + tNameSize = (size_t)usGetWord(0x40, aucBytes); + tNameSize = (tNameSize + 1) / 2; ++ if (tNameSize >= sizeof(atPPSlist[0].szName)) { ++ werr(0, "PPS %d appears to be invalid.", iIndex); ++ atPPSlist = xfree(atPPSlist); ++ return FALSE; ++ } + vName2String(atPPSlist[iIndex].szName, aucBytes, tNameSize); + atPPSlist[iIndex].ucType = ucGetByte(0x42, aucBytes); + if (atPPSlist[iIndex].ucType == 5) { Modified: head/textproc/antiword/pkg-plist ============================================================================== --- head/textproc/antiword/pkg-plist Thu Dec 11 16:52:40 2014 (r374538) +++ head/textproc/antiword/pkg-plist Thu Dec 11 16:59:28 2014 (r374539) @@ -32,3 +32,4 @@ man/man1/antiword.1.gz %%DATADIR%%/koi8-r.txt %%DATADIR%%/koi8-u.txt %%DATADIR%%/roman.txt +@dirrmtry %%DATADIR%%