add vulnerability fix + rev bump

7 files changed, 101 insertions, 160 deletions

diff --git a/app-text/wv/ChangeLog b/app-text/wv/ChangeLog
index 7d3dbb14ee0a..ea4eafcbc680 100644
--- a/app-text/wv/ChangeLog
+++ b/app-text/wv/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/wv
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/wv/ChangeLog,v 1.19 2004/06/24 22:56:07 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/wv/ChangeLog,v 1.20 2004/07/12 16:41:06 foser Exp $
+
+*wv-1.0.0-r1 (12 Jul 2004)
+
+  12 Jul 2004; foser <foser@gentoo.org> wv-1.0.0-r1.ebuild , wv-1.0.0-fix_overflow.patch, metadata.xml:
+  Add security fix (#56595)
+  Make wmf support USE switchable
+  Added to gnome herd for now with me as maintainer
 
   17 Feb 2004; Aron Griffis <agriffis@gentoo.org> wv-1.0.0.ebuild:
   stable on alpha and ia64
diff --git a/app-text/wv/Manifest b/app-text/wv/Manifest
index 74d93583a22c..99f097703fea 100644
--- a/app-text/wv/Manifest
+++ b/app-text/wv/Manifest
@@ -1,4 +1,7 @@
-MD5 0ea741808268fedd109524c906d40c8b wv-1.0.0.ebuild 870
+MD5 44b5375f3fe6905cb6d6d4a9357a77b4 wv-1.0.0-r1.ebuild 1033
+MD5 e28c60d231ece625af1cf8244d877cf6 wv-1.0.0.ebuild 994
 MD5 a6f4060fdef7e40734d0a9d18464a13c ChangeLog 1915
+MD5 97079efa2a5256ad07ada6260b7ec298 files/digest-wv-1.0.0-r1 60
+MD5 29b026d4ff443552a80797b397d37ec6 files/wv-1.0.0-fix_overflow.patch 1693
 MD5 fe85d1375bb12fb4245f9be59895f923 files/wv-0.7.1-rvt.patch 4470
 MD5 97079efa2a5256ad07ada6260b7ec298 files/digest-wv-1.0.0 60
diff --git a/app-text/wv/files/digest-wv-1.0.0 b/app-text/wv/files/digest-wv-1.0.0-r1
index 31d1553f8c03..31d1553f8c03 100644
--- a/app-text/wv/files/digest-wv-1.0.0
+++ b/app-text/wv/files/digest-wv-1.0.0-r1
diff --git a/app-text/wv/files/wv-0.7.1-rvt.patch b/app-text/wv/files/wv-0.7.1-rvt.patch
deleted file mode 100644
index 080bcf8f1675..000000000000
--- a/app-text/wv/files/wv-0.7.1-rvt.patch
+++ /dev/null
@@ -1,155 +0,0 @@
-diff -Naur wv/escher.c wv.mod/escher.c
---- wv/escher.c	Wed Apr 11 01:27:47 2001
-+++ wv.mod/escher.c	Wed Jan 16 13:33:08 2002
-@@ -215,8 +215,7 @@
- 		count +=
- 		    wvGetSpgrContainer (&
- 					(item->spgrcontainer
--					 [item->no_spgrcontainer - 1]),
--&amsofbh, fd);
-+					 [item->no_spgrcontainer - 1]), &amsofbh, fd);
- 		break;
- 	    default:
- 		count += wvEatmsofbt (&amsofbh, fd);
-@@ -303,8 +302,7 @@
- 		count +=
- 		    wvGetSpgrContainer (&
- 					(item->spgrcontainer
--					 [item->no_spgrcontainer - 1]),
--&amsofbh, fd);
-+					 [item->no_spgrcontainer - 1]), &amsofbh, fd);
- 		break;
- 	    default:
- 		count += wvEatmsofbt (&amsofbh, fd);
-@@ -684,10 +682,14 @@
- U32
- wvEatmsofbt (MSOFBH * amsofbh, wvStream * fd)
- {
-+    /* Ries (rvt@dds.nl)
-+       Changed read to bound to 32bit instead of 8bit 
-+       MS prolly does 32 bit bounderaries ??? */
-     U32 i;
--    for (i = 0; i < amsofbh->cbLength; i++)
--	read_8ubit (fd);
--    return (amsofbh->cbLength);
-+    U32 check=(amsofbh->cbLength + 3) >> 2;
-+    for (i = 0; i < check; i++)
-+	read_32ubit (fd);
-+    return (check << 2);
- }
- 
- void
-diff -Naur wv/picf.c wv.mod/picf.c
---- wv/picf.c	Wed Jan  2 20:33:34 2002
-+++ wv.mod/picf.c	Wed Jan 16 13:33:08 2002
-@@ -218,13 +218,19 @@
- 		break;
- 	    default:
- 		{
--		    U32 len = entry - 2;
-+		    U32 lene2 = entry - 2;
- 		    U32 i;
- 		    wvTrace (
--			     ("len is %d, predict end of %x\n", len,
-+			     ("lene2 is %d, predict end of %x\n", len,
- 			      wvStream_tell (fd) + (entry - 2) * 2));
--		    for (i = 0; i < len; i++)
-+		    /* RIES (rvt@dds.nl)
-+		       prolly a dirty patch because I check count
-+		       everytime it's incremnented against lene2.
-+		       This seems twork very well I tried it on around 15.000
-+		       word documents and it seems to work! */
-+		    for (i = 0; i < lene2; i++)
- 		      {
-+		          if ( (count + 1) >= len) return (count);
- 			  test = read_16ubit (fd);
- 			  if ((i == 0)
- 			      && ((test == 0x0f43) || (test == 0x0b41)))
-@@ -232,11 +238,13 @@
- 				wvTrace (
- 					 ("Found a Bitmap, Will strip header and return with bitmap data\n"));
- 				count += 2;
-+    		        	if ( (count + 1) >= len) return (count);
- 				pad = test;
- 				test = read_32ubit (fd);	/*0x00cc0020 */
- 				if (test != 0x00cc0020)
- 				    wvTrace (("Old Graphic\n"));
- 				count += 4;
-+    		        	if ( (count + 1) >= len) return (count);
- 
- 				if (pad == 0x0f43)
- 				  {
-@@ -244,20 +252,26 @@
- 				      if (test != 0x0000)
- 					  wvTrace (("Old Graphic\n"));
- 				      count += 2;
-+			              if ( (count + 1) >= len) return (count);
- 				  }
- 
- 				read_16ubit (fd);	/*width */
- 				count += 2;
-+    		        	if ( (count + 1) >= len) return (count);
- 				read_16ubit (fd);	/*height */
- 				count += 2;
-+    		        	if ( (count + 1) >= len) return (count);
- 				test = read_32ubit (fd);	/*0x00000000L */
- 				if (test != 0x00000000L)
- 				    wvTrace (("Old Graphic\n"));
- 				count += 4;
-+    		        	if ( (count + 1) >= len) return (count);
- 				read_16ubit (fd);	/*width */
- 				count += 2;
-+    		        	if ( (count + 1) >= len) return (count);
- 				read_16ubit (fd);	/*height */
- 				count += 2;
-+    		        	if ( (count + 1) >= len) return (count);
- 				test = read_32ubit (fd);	/*0x00000000L */
- 				if (test != 0x00000000L)
- 				    wvTrace (("Old Graphic\n"));
-@@ -265,6 +279,7 @@
- 				return (count);
- 			    }
- 			  count += 2;
-+	        	  if ( (count + 1) >= len) return (count);
- 		      }
- 		}
- 		break;
-diff -Naur wv/wvText.in wv.mod/wvText.in
---- wv/wvText.in	Sun Mar 11 20:00:24 2001
-+++ wv.mod/wvText.in	Wed Jan 16 13:33:08 2002
-@@ -3,6 +3,7 @@
- prefix=@prefix@
- exec_prefix=@exec_prefix@
- datadir=@datadir@
-+tmpdir=/tmp
- 
- # argument checking
- if [ ${#} -ne "2" ]; then
-@@ -29,23 +30,23 @@
-     fi
- 
-     # intermediate file
--    TMP_FILE="/tmp/wv$$.html"
-+    TMP_FILE="wv$$.html"
- 
--    wvHtml "${1}" "${TMP_FILE}" >/dev/null 2>&1
-+    wvHtml "${1}" --targetdir="${tmpdir}" "${TMP_FILE}" >/dev/null 2>&1
-     if [ ${?} -ne "0" ]; then
- 	echo "Could not convert into HTML"
- 	exit 1
-     fi
- 
-     # lynx actually does quite well
--    TERM=vt100 lynx -dump -force_html "${TMP_FILE}" > "${2}"
-+    TERM=vt100 lynx -dump -force_html "${tmpdir}/${TMP_FILE}" > "${2}"
-     if [ ${?} -ne "0" ]; then
- 	    echo "Could not convert into Text"
- 	    exit 1
-     fi
- 
-     # clean up
--    rm -f ${TMP_FILE}
-+    rm -f "${tmpdir}/${TMP_FILE}"
- 
- else
-     # fall back onto our cruddy output
diff --git a/app-text/wv/files/wv-1.0.0-fix_overflow.patch b/app-text/wv/files/wv-1.0.0-fix_overflow.patch
new file mode 100644
index 000000000000..975f7e0c020d
--- /dev/null
+++ b/app-text/wv/files/wv-1.0.0-fix_overflow.patch
@@ -0,0 +1,65 @@
+diff -uNr wv-1.0.0/field.c wv-1.0.0.patched/field.c
+--- wv-1.0.0/field.c	2002-12-29 17:37:00.000000000 +0100
++++ wv-1.0.0.patched/field.c	2004-07-12 18:06:48.621848624 +0200
+@@ -98,18 +98,21 @@
+ 		  case 1:
+ 		      sprintf (temp, "%d", current->tm_mon+1);
+ 		      strcat (timestr, temp);
++		      consumed += strlen (temp);
+ 		      break;
+ 		  case 2:
+ 		      strcat (timestr, "%m");
++		      consumed += 2;
+ 		      break;
+ 		  case 3:
+ 		      strcat (timestr, "%b");
++		      consumed += 2;
+ 		      break;
+ 		  default:
+ 		      strcat (timestr, "%B");
++		      consumed += 2;
+ 		      break;
+ 		  }
+-		consumed += 2;
+ 		break;
+ 	    case 's':
+ 	    case 'S':
+@@ -139,6 +142,7 @@
+ 		  case 1:
+ 		      consumed += sprintf (temp, "%d", current->tm_wday);
+ 		      strcat (timestr, temp);
++		      consumed += strlen (temp);
+ 		      break;
+ 		  case 2:
+ 		      strcat (timestr, "%d");
+@@ -182,12 +186,13 @@
+ 		  case 1:
+ 		      sprintf (temp, "%d", current->tm_hour % 12);
+ 		      strcat (timestr, temp);
++		      consumed += strlen (temp);
+ 		      break;
+ 		  default:
+ 		      strcat (timestr, "%I");
++		      consumed += 2;
+ 		      break;
+ 		  }
+-		consumed += 2;
+ 		break;
+ 	    case 'H':
+ 		no = lookahead (token, 'H', 'H');
+@@ -197,6 +202,7 @@
+ 		  case 1:
+ 		      consumed += sprintf (temp, "%d", current->tm_hour);
+ 		      strcat (timestr, temp);
++		      consumed += strlen (temp);
+ 		      break;
+ 		  default:
+ 		      strcat (timestr, "%H");
+@@ -212,6 +218,7 @@
+ 		  case 1:
+ 		      consumed += sprintf (temp, "%d", current->tm_min);
+ 		      strcat (timestr, temp);
++		      consumed += strlen (temp);
+ 		      break;
+ 		  default:
+ 		      strcat (timestr, "%M");
diff --git a/app-text/wv/metadata.xml b/app-text/wv/metadata.xml
new file mode 100644
index 000000000000..152847681e52
--- /dev/null
+++ b/app-text/wv/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gnome</herd>
+<maintainer>
+  <email>foser@gentoo.org</email>
+    <description>Lib used by abiword, so I'm temporarily taking maintainership until someone wants to take over</description>
+</maintainer>
+</pkgmetadata>
diff --git a/app-text/wv/wv-1.0.0.ebuild b/app-text/wv/wv-1.0.0-r1.ebuild
index 16d4b6c4026a..912c95b3b31a 100644
--- a/app-text/wv/wv-1.0.0.ebuild
+++ b/app-text/wv/wv-1.0.0-r1.ebuild
@@ -1,25 +1,37 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/wv/wv-1.0.0.ebuild,v 1.9 2004/06/24 22:56:07 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/wv/wv-1.0.0-r1.ebuild,v 1.1 2004/07/12 16:41:06 foser Exp $
+
+inherit eutils
 
 DESCRIPTION="Tool for conversion of MSWord doc and rtf files to something readable"
 SRC_URI="mirror://sourceforge/wvware/${P}.tar.gz"
 HOMEPAGE="http://www.wvware.com"
 
-IUSE="xml2"
+IUSE="xml2 wmf"
 KEYWORDS="x86 ppc sparc hppa alpha ia64 amd64"
 SLOT="0"
 LICENSE="GPL-2"
 
 DEPEND="sys-libs/zlib
 	media-libs/libpng
-	>=media-libs/libwmf-0.2.2
+	wmf? ( >=media-libs/libwmf-0.2.2 )
 	xml2? ( dev-libs/libxml2 )"
 
+src_unpack() {
+
+	unpack ${A}
+
+	# Fix vulnerability (#56595)
+	epatch ${FILESDIR}/${P}-fix_overflow.patch
+
+}
+
 src_compile() {
 
 	econf \
 		`use_with xml2 libxml2` \
+		`use_with wmf libwmf` \
 		--with-docdir=/usr/share/doc/${PF} \
 		|| die