Pullup ticket 2053 - requested by rillig

security update for libwpd

Revisions pulled up:
- pkgsrc/converters/libwpd/Makefile			1.13
- pkgsrc/converters/libwpd/distinfo			1.4
- pkgsrc/converters/libwpd/patches/patch-aa		1.1

   Module Name:		pkgsrc
   Committed By:	rillig
   Date:		Sun Mar 18 20:41:28 UTC 2007

   Modified Files:
   	pkgsrc/converters/libwpd: Makefile distinfo

   Log Message:
   Updated libwpd to 0.8.9.

   CHANGES:
   0.8.8 - 0.8.9
   - Fix http://qa.openoffice.org/issues/show_bug.cgi?id=74134, a bug in WP1
     document type detection where we could try to seek to a negative place
     in document (Fridrich)
   - Fix a regression wrt. 0.8.7 preventing the conversion of tab table in
     WP1 and WP3 file-format (Fridrich)
   - Fixed several overflow bugs reported by iDefense. An attacker could
     create a carefully crafted Word Perfect file that could cause an
     application linked with libwpd, such as OpenOffice, to crash or possibly
     execute arbitrary code if the file was opened by a victim. (CVE-2007-0002)
     (iDefense's Sean Larsson, Fridrich)

   0.8.7 - 0.8.8
   - Add unit tests for the stream class (Fridrich & Andrew Ziem)
   - Ignore foot/endnotes that are referenced inside other foot/endnotes
     (Fridrich); fixes http://www.openoffice.org/issues/show_bug.cgi?id=71487
   - Handle graciously unsupported password-protected documents; (Fridrich)
     fixes http://www.openoffice.org/issues/show_bug.cgi?id=72307
   - Remove warnings on main OpenOffice.org platforms (Fridrich)
   - Remove some potential memory leaks in the WPXPropertyList class
     and optimize the WPXPropertyList subscription operator (Fridrich)
   - When possible, pass WPXStrings by reference instead of passing them
     by copy (Fridrich)
   - Refactor WPXString to not cast from and to void*; refactor
     WPXPropertyList and WPXPropertyListVector classes as to save a bunch
     of virtual calls (Fridrich)
---
   Module Name:		pkgsrc
   Committed By:	rillig
   Date:		Sun Mar 18 20:41:50 UTC 2007

   Added Files:
   	pkgsrc/converters/libwpd/patches: patch-aa

   Log Message:
   ... and a patch for NetBSD 3.0.

3 files changed, 27 insertions, 6 deletions

diff --git a/converters/libwpd/Makefile b/converters/libwpd/Makefile
index a3b00fe6108..d4b6eea7459 100644
--- a/converters/libwpd/Makefile
+++ b/converters/libwpd/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2006/11/18 22:02:28 wiz Exp $
+# $NetBSD: Makefile,v 1.12.2.1 2007/03/20 15:15:01 salo Exp $
 
-DISTNAME=	libwpd-0.8.7
+DISTNAME=	libwpd-0.8.9
 CATEGORIES=	converters
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=libwpd/}
 
diff --git a/converters/libwpd/distinfo b/converters/libwpd/distinfo
index ce194a94faa..cf19462606a 100644
--- a/converters/libwpd/distinfo
+++ b/converters/libwpd/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.3 2006/11/18 22:02:28 wiz Exp $
+$NetBSD: distinfo,v 1.3.2.1 2007/03/20 15:15:01 salo Exp $
 
-SHA1 (libwpd-0.8.7.tar.gz) = 80f2930acda85fc553207adadc5a4dba01846f64
-RMD160 (libwpd-0.8.7.tar.gz) = f954409c57cbe0ac8b2fae8d9e32c9d920238ff0
-Size (libwpd-0.8.7.tar.gz) = 564750 bytes
+SHA1 (libwpd-0.8.9.tar.gz) = f5751f76dca619618659f480f32b35b9b7d88737
+RMD160 (libwpd-0.8.9.tar.gz) = c69853e8f86ee5c936102e00960a7fdea7984ab7
+Size (libwpd-0.8.9.tar.gz) = 569384 bytes
+SHA1 (patch-aa) = 4c91375938db1761200af1b68cacd4714a4da004
diff --git a/converters/libwpd/patches/patch-aa b/converters/libwpd/patches/patch-aa
new file mode 100644
index 00000000000..4a9f90e9591
--- /dev/null
+++ b/converters/libwpd/patches/patch-aa
@@ -0,0 +1,20 @@
+$NetBSD: patch-aa,v 1.1.2.2 2007/03/20 15:15:01 salo Exp $
+
+NetBSD 3.0 is missing the extern "C" around the definition of
+vsnprintf() in <stdio.h>. In NetBSD 4.99.4, it is fixed.
+
+--- src/lib/WPXString.cpp.orig	2007-03-04 10:44:21.000000000 +0100
++++ src/lib/WPXString.cpp	2007-03-18 21:29:54.000000000 +0100
+@@ -24,6 +24,12 @@
+  * Corel Corporation or Corel Corporation Limited."
+  */
+ 
++#if defined(__NetBSD__)
++extern "C" {
++#include <stdio.h>
++}
++#endif
++
+ #include "WPXString.h"
+ #include "libwpd_internal.h"
+