Pullup ticket 1225 - requested by Joerg Sonnenberger

security update for libextractor

Patch provided by the submitter.

   Module Name:		pkgsrc
   Committed By:	adam
   Date:		Sun Mar  5 22:06:38 UTC 2006

   Modified Files:
   	pkgsrc/devel/libextractor: Makefile PLIST buildlink3.mk distinfo
   	pkgsrc/devel/libextractor/patches: patch-ab patch-ac
   Removed Files:
   	pkgsrc/devel/libextractor/patches: patch-aa patch-ad patch-ae

   Log Message:
   Changes 0.5.10:
   * Yet another round of XPDF-related security fixes.
   * Mis-detection of man pages as part of TAR archives fixed.
   * More Mime-types for the OLE2 extractor.  Also ignore (harmless)
   	libc errors in plugins when extracting.
   * More TAR improvements: keywords 'date' and 'format' are
   	extracted. More checksums variants were added. Long filenames
   	as produced by GNU and Schilling tar (possibly Solaris pax also)
   	are extracted.

   Changes 0.5.9:
   * Made TAR extractor parsing more robust.
   * Fixing crash in MIME-extractor due to typo in the code.
   * Fixed security problems in PDF extractor
---
   Module Name:		pkgsrc
   Committed By:	joerg
   Date:		Thu Mar 16 14:04:58 UTC 2006

   Modified Files:
   	pkgsrc/devel/libextractor: distinfo
   Added Files:
   	pkgsrc/devel/libextractor/patches: patch-aa

   Log Message:
   Stupid code using zlib's prototype header. Patch away.

9 files changed, 35 insertions, 136 deletions

diff --git a/devel/libextractor/Makefile b/devel/libextractor/Makefile
index 3d9cd016224..6ed97ae4d9d 100644
--- a/devel/libextractor/Makefile
+++ b/devel/libextractor/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.10 2005/12/15 13:26:18 salo Exp $
+# $NetBSD: Makefile,v 1.10.2.1 2006/03/17 11:25:04 salo Exp $
 
-DISTNAME=	libextractor-0.5.3
-PKGREVISION=	1
+DISTNAME=	libextractor-0.5.10
 CATEGORIES=	devel
 MASTER_SITES=	http://gnunet.org/libextractor/download/
 
-MAINTAINER=	tv@duh.org
+MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://gnunet.org/libextractor/
 COMMENT=	Metadata extractor for various file data types
 
@@ -18,14 +17,14 @@ PTHREAD_OPTS+=		require
 CONFLICTS=		csound-{bath,dev}-*	# bin/extract
 
 # This package requires dlopen, so save on space by skipping non-PIC libs
-SHLIBTOOL_OVERRIDE=	${WRKSRC}/libtool
+SHLIBTOOL_OVERRIDE+=	${WRKSRC}/libtool
 
 .include "../../audio/libvorbis/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libltdl/convenience.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/ImageMagick/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/libextractor/PLIST b/devel/libextractor/PLIST
index fccbb5b1204..ce94e6272e1 100644
--- a/devel/libextractor/PLIST
+++ b/devel/libextractor/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2005/08/08 09:44:39 adam Exp $
+@comment $NetBSD: PLIST,v 1.3.4.1 2006/03/17 11:25:04 salo Exp $
 bin/extract
 include/extractor.h
 lib/libextractor.la
@@ -32,6 +32,7 @@ lib/libextractor/libextractor_printable_en.la
 lib/libextractor/libextractor_printable_es.la
 lib/libextractor/libextractor_printable_it.la
 lib/libextractor/libextractor_printable_no.la
+lib/libextractor/libextractor_printable_pt.la
 lib/libextractor/libextractor_ps.la
 lib/libextractor/libextractor_qt.la
 lib/libextractor/libextractor_real.la
@@ -46,6 +47,7 @@ lib/libextractor/libextractor_zip.la
 man/man1/extract.1
 man/man3/libextractor.3
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/libextractor.mo
+${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/libextractor.mo
 ${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/libextractor.mo
 ${PKGLOCALEDIR}/locale/rw/LC_MESSAGES/libextractor.mo
 @dirrm lib/libextractor
diff --git a/devel/libextractor/buildlink3.mk b/devel/libextractor/buildlink3.mk
index 0b50093a6d9..0ee213dd4e3 100644
--- a/devel/libextractor/buildlink3.mk
+++ b/devel/libextractor/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2005/06/10 22:59:22 salo Exp $
+# $NetBSD: buildlink3.mk,v 1.2.6.1 2006/03/17 11:25:04 salo Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBEXTRACTOR_BUILDLINK3_MK:=	${LIBEXTRACTOR_BUILDLINK3_MK}+
@@ -12,8 +12,8 @@ BUILDLINK_PACKAGES+=	libextractor
 
 .if !empty(LIBEXTRACTOR_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.libextractor+=	libextractor>=0.3.10
-BUILDLINK_RECOMMENDED.libextractor+=	libextractor>=0.4.2
+BUILDLINK_RECOMMENDED.libextractor+=	libextractor>=0.5.3nb3
 BUILDLINK_PKGSRCDIR.libextractor?=	../../devel/libextractor
 .endif	# LIBEXTRACTOR_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/libextractor/distinfo b/devel/libextractor/distinfo
index 239da40883f..ff8660b6f0b 100644
--- a/devel/libextractor/distinfo
+++ b/devel/libextractor/distinfo
@@ -1,10 +1,8 @@
-$NetBSD: distinfo,v 1.8 2005/12/15 13:26:18 salo Exp $
+$NetBSD: distinfo,v 1.8.2.1 2006/03/17 11:25:04 salo Exp $
 
-SHA1 (libextractor-0.5.3.tar.gz) = 9535146c02897f522a34a756bee211ebeb764df5
-RMD160 (libextractor-0.5.3.tar.gz) = ba7bd534d975938778011358668a98fbbe4b1e28
-Size (libextractor-0.5.3.tar.gz) = 6018214 bytes
-SHA1 (patch-aa) = e3c770fd3a0cc918cf1f05f79cb1a148dd928533
-SHA1 (patch-ab) = f4d0ab325aba0a624da755dc60c7b4b99652566f
-SHA1 (patch-ac) = 8e6382b5052636cf0d9f85193465bcb0499acbfc
-SHA1 (patch-ad) = 80887bc7491aee65d86b102b0de2adb3f0e3d218
-SHA1 (patch-ae) = d3699327d5370022f8de70222f4f123813a7f412
+SHA1 (libextractor-0.5.10.tar.gz) = 3c8cb7390176cb16afb92f0d68a185f69b8922a2
+RMD160 (libextractor-0.5.10.tar.gz) = f2bb561876c4ed6681df416c97e625f385e1f641
+Size (libextractor-0.5.10.tar.gz) = 6149272 bytes
+SHA1 (patch-aa) = f0923e6cba8e6bb327a7959a3d7679bb78a530b2
+SHA1 (patch-ab) = f8f12217898b1c8f68f7f2280f59b7dcabdfb9d2
+SHA1 (patch-ac) = 0eec20698da281f26ed6077fefb0f49d4e5e3cdf
diff --git a/devel/libextractor/patches/patch-aa b/devel/libextractor/patches/patch-aa
index 1430b9a6da3..1c488976939 100644
--- a/devel/libextractor/patches/patch-aa
+++ b/devel/libextractor/patches/patch-aa
@@ -1,14 +1,15 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/11/05 18:22:29 tv Exp $
+$NetBSD: patch-aa,v 1.1.1.1.10.1 2006/03/17 11:25:04 salo Exp $
 
---- src/plugins/oo/ioapi.h.orig	2004-11-05 12:45:15.000000000 -0500
-+++ src/plugins/oo/ioapi.h
-@@ -9,6 +9,9 @@
- #ifndef _ZLIBIOAPI_H
- #define _ZLIBIOAPI_H
+--- src/plugins/oo/ooextractor.c.orig	2006-03-16 15:02:36.000000000 +0100
++++ src/plugins/oo/ooextractor.c
+@@ -23,6 +23,10 @@
+ #include "extractor.h"
+ #include "zlib.h"
  
 +#ifndef OF
 +#define OF(x) x
 +#endif
++
+ #define CASESENSITIVITY (0)
+ #define MAXFILENAME (256)
  
- #define ZLIB_FILEFUNC_SEEK_CUR (1)
- #define ZLIB_FILEFUNC_SEEK_END (2)
diff --git a/devel/libextractor/patches/patch-ab b/devel/libextractor/patches/patch-ab
index 36be353d620..174cd42769a 100644
--- a/devel/libextractor/patches/patch-ab
+++ b/devel/libextractor/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2005/08/08 09:44:39 adam Exp $
+$NetBSD: patch-ab,v 1.2.4.1 2006/03/17 11:25:04 salo Exp $
 
---- src/main/extractor.c.orig	2005-07-14 19:52:50.000000000 +0000
+--- src/main/extractor.c.orig	2006-02-12 04:03:13.000000000 +0100
 +++ src/main/extractor.c
-@@ -171,7 +171,6 @@ libextractor_id3v24:\
+@@ -186,7 +186,6 @@ libextractor_id3v24:\
  libextractor_mime:\
  libextractor_tar:\
  libextractor_dvi:\
diff --git a/devel/libextractor/patches/patch-ac b/devel/libextractor/patches/patch-ac
index ed576bdc4a4..ee14f0aff5f 100644
--- a/devel/libextractor/patches/patch-ac
+++ b/devel/libextractor/patches/patch-ac
@@ -1,12 +1,12 @@
-$NetBSD: patch-ac,v 1.3 2005/08/08 09:45:16 adam Exp $
+$NetBSD: patch-ac,v 1.3.4.1 2006/03/17 11:25:04 salo Exp $
 
---- src/main/Makefile.in.orig	2005-08-08 11:25:14.000000000 +0000
+--- src/main/Makefile.in.orig	2006-02-19 02:41:28.000000000 +0100
 +++ src/main/Makefile.in
-@@ -250,7 +250,6 @@ AM_CFLAGS = \
+@@ -263,7 +263,6 @@ AM_CFLAGS = \
  extract_LDADD = \
    $(top_builddir)/src/main/libextractor.la 
  
 -@MINGW_FALSE@dlflag = -ldl
+ @HAVE_ZLIB_TRUE@zlib = -lz
+ @HAVE_BZ2_TRUE@bz2lib = -lbz2
  libextractor_la_LDFLAGS = \
-   -export-dynamic -version-info 2:0:1 $(LIBICONV)
- 
diff --git a/devel/libextractor/patches/patch-ad b/devel/libextractor/patches/patch-ad
deleted file mode 100644
index 05ab8268fc9..00000000000
--- a/devel/libextractor/patches/patch-ad
+++ /dev/null
@@ -1,77 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2005/12/15 13:26:18 salo Exp $
-
-Security fix for CVE-2005-3191 and CVE-2005-3192.
-From libextractor 0.5.8.
-
---- src/plugins/pdf/Stream.cc.orig	2005-04-24 04:59:57.000000000 +0200
-+++ src/plugins/pdf/Stream.cc	2005-12-15 13:49:30.000000000 +0100
-@@ -410,18 +410,32 @@ void ImageStream::skipLine() {
- 
- StreamPredictor::StreamPredictor(Stream *strA, int predictorA,
- 				 int widthA, int nCompsA, int nBitsA) {
-+  int totalBits;
-+
-   str = strA;
-   predictor = predictorA;
-   width = widthA;
-   nComps = nCompsA;
-   nBits = nBitsA;
-+  predLine = NULL;
-+  ok = gFalse;
- 
-   nVals = width * nComps;
-+  totalBits = nVals * nBits;
-+  if (totalBits == 0 ||
-+       (totalBits / nBits) / nComps != width ||
-+       totalBits + 7 < 0) {
-+    return;
-+  }
-   pixBytes = (nComps * nBits + 7) >> 3;
--  rowBytes = ((nVals * nBits + 7) >> 3) + pixBytes;
-+  rowBytes = ((totalBits + 7) >> 3) + pixBytes;
-+  if (rowBytes < 0) {
-+   return;
-+  }
-   predLine = (Guchar *)gmalloc(rowBytes);
-   memset(predLine, 0, rowBytes);
-   predIdx = rowBytes;
-+  ok = gTrue;
- }
- 
- StreamPredictor::~StreamPredictor() {
-@@ -1015,6 +1029,10 @@ LZWStream::LZWStream(Stream *strA, int p
-     FilterStream(strA) {
-   if (predictor != 1) {
-     pred = new StreamPredictor(this, predictor, columns, colors, bits);
-+    if (! pred->isOk()) {
-+      delete pred;
-+      pred = NULL;
-+    }	    
-   } else {
-     pred = NULL;
-   }
-@@ -2900,6 +2918,13 @@ GBool DCTStream::readBaselineSOF() {
-   height = read16();
-   width = read16();
-   numComps = str->getChar();
-+  if (numComps <= 0 || numComps > 4) {
-+    return gFalse;
-+  }
-+  if (numComps <= 0 || numComps > 4) {
-+    return gFalse;
-+  }
-+
-   if (prec != 8) {
-     error(getPos(), "Bad DCT precision %d", prec);
-     return gFalse;
-@@ -3258,6 +3283,10 @@ FlateStream::FlateStream(Stream *strA, i
-     FilterStream(strA) {
-   if (predictor != 1) {
-     pred = new StreamPredictor(this, predictor, columns, colors, bits);
-+    if (! pred->isOk()) { 
-+      delete pred;
-+      pred = NULL;
-+    }  
-   } else {
-     pred = NULL;
-   }
diff --git a/devel/libextractor/patches/patch-ae b/devel/libextractor/patches/patch-ae
deleted file mode 100644
index 4ddec142605..00000000000
--- a/devel/libextractor/patches/patch-ae
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2005/12/15 13:26:18 salo Exp $
-
-Security fix for CVE-2005-3192.
-From libextractor 0.5.8.
-
---- src/plugins/pdf/Stream.h.orig	2005-04-24 04:59:57.000000000 +0200
-+++ src/plugins/pdf/Stream.h	2005-12-15 13:49:30.000000000 +0100
-@@ -231,6 +231,8 @@ public:
-   StreamPredictor(Stream *strA, int predictorA,
- 		  int widthA, int nCompsA, int nBitsA);
- 
-+  GBool isOk() { return ok; }
-+  
-   ~StreamPredictor();
- 
-   int lookChar();
-@@ -250,6 +252,7 @@ private:
-   int rowBytes;			// bytes per line
-   Guchar *predLine;		// line buffer
-   int predIdx;			// current index in predLine
-+  GBool ok;
- };
- 
- //------------------------------------------------------------------------