any OKs for this? cathcart@'s account has expired. Index: Makefile =================================================================== RCS file: /cvs/ports/textproc/antiword/Makefile,v retrieving revision 1.26 diff -u -p -r1.26 Makefile --- Makefile 11 Mar 2013 11:42:40 -0000 1.26 +++ Makefile 1 Dec 2014 17:09:28 -0000 @@ -3,29 +3,27 @@ COMMENT= converts MSWord Documents to ASCII Text and PostScript DISTNAME= antiword-0.37 +REVISION= 0 CATEGORIES= textproc HOMEPAGE= http://www.winfield.demon.nl/ -MAINTAINER= David Cathcart <[email protected]> - MASTER_SITES= ${HOMEPAGE}/linux/ -# GPL +# GPLv2 PERMIT_PACKAGE_CDROM= Yes -WANTLIB= c + +WANTLIB += c MAKE_FLAGS= CC="${CC}" CFLAGS="${CFLAGS} -Wall -DNDEBUG" \ LD="${CC}" -USE_GROFF = Yes NO_TEST= Yes DOCS= FAQ Netscape QandA ReadMe Mutt pre-configure: - @perl -pi -e "s|%%PREFIX%%|${PREFIX}|g" \ - ${WRKSRC}/antiword.h + @${SUBST_CMD} ${WRKSRC}/antiword.h do-install: ${INSTALL_PROGRAM} ${WRKSRC}/antiword ${PREFIX}/bin Index: distinfo =================================================================== RCS file: /cvs/ports/textproc/antiword/distinfo,v retrieving revision 1.7 diff -u -p -r1.7 distinfo --- distinfo 5 Apr 2007 17:26:14 -0000 1.7 +++ distinfo 1 Dec 2014 17:09:28 -0000 @@ -1,5 +1,2 @@ -MD5 (antiword-0.37.tar.gz) = +Gjiomnty8Br936JpViY0Q== -RMD160 (antiword-0.37.tar.gz) = UGykp6f6n9RXQJJ5in//rNmjoKA= -SHA1 (antiword-0.37.tar.gz) = Q2T3+Zyy0399HVvBSjNczAxnKS4= SHA256 (antiword-0.37.tar.gz) = jiwAD8vG1kGw5v+V4TyEbaP/MQl4AehnAhJKIGiI9aw= SIZE (antiword-0.37.tar.gz) = 317884 Index: patches/patch-antiword_h =================================================================== RCS file: /cvs/ports/textproc/antiword/patches/patch-antiword_h,v retrieving revision 1.9 diff -u -p -r1.9 patch-antiword_h --- patches/patch-antiword_h 14 Nov 2005 02:03:20 -0000 1.9 +++ patches/patch-antiword_h 1 Dec 2014 17:09:28 -0000 @@ -6,7 +6,7 @@ $OpenBSD: patch-antiword_h,v 1.9 2005/11 #define FONTNAMES_FILE "fontnames" #else /* All others */ -#define GLOBAL_ANTIWORD_DIR "/usr/share/antiword" -+#define GLOBAL_ANTIWORD_DIR "%%PREFIX%%/share/antiword" ++#define GLOBAL_ANTIWORD_DIR "${PREFIX}/share/antiword" #define ANTIWORD_DIR ".antiword" #define FONTNAMES_FILE "fontnames" #endif /* __dos */ Index: patches/patch-wordole_c =================================================================== RCS file: patches/patch-wordole_c diff -N patches/patch-wordole_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-wordole_c 1 Dec 2014 17:09:28 -0000 @@ -0,0 +1,19 @@ +$OpenBSD$ + +Prevent overflow of atPPSlist[].szName[] +http://seclists.org/oss-sec/2014/q4/870 + +--- wordole.c.orig Fri Aug 26 20:49:57 2005 ++++ wordole.c Mon Dec 1 17:06:15 2014 +@@ -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) { Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/textproc/antiword/pkg/PLIST,v retrieving revision 1.12 diff -u -p -r1.12 PLIST --- pkg/PLIST 14 Nov 2005 02:03:20 -0000 1.12 +++ pkg/PLIST 1 Dec 2014 17:09:28 -0000 @@ -1,5 +1,5 @@ @comment $OpenBSD: PLIST,v 1.12 2005/11/14 02:03:20 cathcart Exp $ -bin/antiword +@bin bin/antiword @man man/man1/antiword.1 share/antiword/ share/antiword/8859-1.txt
