Pullup ticket 551 - requested by Lubomir Sedlacik

security update for libextractor

Revisions pulled up:
- pkgsrc/devel/libextractor/Makefile		1.7
- pkgsrc/devel/libextractor/PLIST		1.2
- pkgsrc/devel/libextractor/distinfo		1.5
- pkgsrc/devel/libextractor/buildlink3.mk	1.2
- pkgsrc/devel/libextractor/patches/patch-ac	removed
- pkgsrc/devel/libextractor/patches/patch-ad	removed

    Module Name:    pkgsrc
    Committed By:   tv
    Date:           Fri Jun 10 17:03:35 UTC 2005

    Modified Files:
            pkgsrc/devel/libextractor: Makefile PLIST distinfo
    Removed Files:
            pkgsrc/devel/libextractor/patches: patch-ac patch-ad

    Log Message:
    Update libextractor to 0.4.2.

    Fixes (second half of) Secunia SA: http://secunia.com/advisories/15651/
    (first half was fixed in 0.3.11nb1)

    ChangeLog excerpts:

    Thu Feb 24 00:32:44 EST 2005
            Added extractor that extracts binary (!) thumbnails from
            images using ImageMagick.  Decoder function for the binary
            string is in the thumbnailextractor.c source.

    Sun Feb 20 16:36:17 EST 2005
            Fixed similar problem in REAL extractor.  Added support
            for new Helix/Real format to REAL extractor.

    Sun Feb 20 12:48:15 EST 2005
            Fixed (rare) integer overflow bug in PNG extractor.

    Fri Jan 21 15:23:43 PST 2005
            Fixed security problem in PDF extractor.

    Fri Dec 24 13:28:59 CET 2004
            Added support for Unicode to the pdf extractor.

    Thu Dec 23 18:14:10 CET 2004
            Avoided exporting symbol OPEN (conflicts on OSX
            with same symbol from GNUnet).  Added conversion
            to utf8 to various plugqins (see todo) and
            added conversion from utf8 to current locale to
            print keywords.
----
    Module Name:    pkgsrc
    Committed By:   salo
    Date:           Fri Jun 10 22:59:22 UTC 2005

    Modified Files:
            pkgsrc/devel/libextractor: buildlink3.mk

    Log Message:
    Set BUILDLINK_RECOMMENDED after recent security fixes. (hi tv!)

6 files changed, 21 insertions, 40 deletions

diff --git a/devel/libextractor/Makefile b/devel/libextractor/Makefile
index d8929f17bc4..ad8238877e4 100644
--- a/devel/libextractor/Makefile
+++ b/devel/libextractor/Makefile
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.4 2005/01/27 12:27:47 drochner Exp $
+# $NetBSD: Makefile,v 1.4.2.1 2005/06/13 21:36:08 snj Exp $
 #
 
-DISTNAME=		libextractor-0.3.11
-PKGREVISION=		1
+DISTNAME=		libextractor-0.4.2
 CATEGORIES=		devel
-MASTER_SITES=		http://ovmj.org/libextractor/download/
+MASTER_SITES=		http://gnunet.org/libextractor/download/
 
 MAINTAINER=		tv@duh.org
-HOMEPAGE=		http://ovmj.org/libextractor/
+HOMEPAGE=		http://gnunet.org/libextractor/
 COMMENT=		Metadata extractor for various file data types
 
 USE_BUILDLINK3=		yes
@@ -22,7 +21,12 @@ CONFLICTS=		csound-{bath,dev}-*	# bin/extract
 # This package requires dlopen, so save on space by skipping non-PIC libs
 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 "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/libextractor/PLIST b/devel/libextractor/PLIST
index 83109331653..de99e4285b0 100644
--- a/devel/libextractor/PLIST
+++ b/devel/libextractor/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/11/05 18:22:29 tv Exp $
+@comment $NetBSD: PLIST,v 1.1.1.1.4.1 2005/06/13 21:36:08 snj Exp $
 bin/extract
 include/extractor.h
 lib/libextractor.la
 lib/libextractor/libextractor_asf.la
+lib/libextractor/libextractor_deb.la
 lib/libextractor/libextractor_dvi.la
 lib/libextractor/libextractor_elf.la
 lib/libextractor/libextractor_filename.la
@@ -20,6 +21,7 @@ lib/libextractor/libextractor_man.la
 lib/libextractor/libextractor_mime.la
 lib/libextractor/libextractor_mp3.la
 lib/libextractor/libextractor_mpeg.la
+lib/libextractor/libextractor_ogg.la
 lib/libextractor/libextractor_oo.la
 lib/libextractor/libextractor_pdf.la
 lib/libextractor/libextractor_png.la
@@ -36,9 +38,12 @@ lib/libextractor/libextractor_riff.la
 lib/libextractor/libextractor_rpm.la
 lib/libextractor/libextractor_split.la
 lib/libextractor/libextractor_tar.la
+lib/libextractor/libextractor_thumbnail.la
 lib/libextractor/libextractor_tiff.la
+lib/libextractor/libextractor_translit.la
 lib/libextractor/libextractor_wav.la
 lib/libextractor/libextractor_zip.la
 man/man1/extract.1
 man/man3/libextractor.3
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/libextractor.mo
 @dirrm lib/libextractor
diff --git a/devel/libextractor/buildlink3.mk b/devel/libextractor/buildlink3.mk
index 2e0c1a9f739..06083dcf1ea 100644
--- a/devel/libextractor/buildlink3.mk
+++ b/devel/libextractor/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/11/05 18:26:19 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.1.4.1 2005/06/13 21:36:08 snj Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBEXTRACTOR_BUILDLINK3_MK:=	${LIBEXTRACTOR_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	libextractor
 
 .if !empty(LIBEXTRACTOR_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.libextractor+=	libextractor>=0.3.10
+BUILDLINK_RECOMMENDED.libextractor+=	libextractor>=0.4.2
 BUILDLINK_PKGSRCDIR.libextractor?=	../../devel/libextractor
 .endif	# LIBEXTRACTOR_BUILDLINK3_MK
 
diff --git a/devel/libextractor/distinfo b/devel/libextractor/distinfo
index 8dc737783d4..8b48c5e4237 100644
--- a/devel/libextractor/distinfo
+++ b/devel/libextractor/distinfo
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.4 2005/02/23 22:24:18 agc Exp $
+$NetBSD: distinfo,v 1.4.2.1 2005/06/13 21:36:08 snj Exp $
 
-SHA1 (libextractor-0.3.11.tar.gz) = 8b4e04121764f2221d162a7bf9c751fd15c7a5da
-RMD160 (libextractor-0.3.11.tar.gz) = 8e567b085cc81346750a577890aa9ed6eabecda8
-Size (libextractor-0.3.11.tar.gz) = 5766585 bytes
+SHA1 (libextractor-0.4.2.tar.gz) = b294392590e03c634a055153af09cba7940300f5
+RMD160 (libextractor-0.4.2.tar.gz) = 72d3af052020b0972c158538f74978169b1f81ed
+Size (libextractor-0.4.2.tar.gz) = 5887095 bytes
 SHA1 (patch-aa) = e3c770fd3a0cc918cf1f05f79cb1a148dd928533
 SHA1 (patch-ab) = 3d8cf383a9edf340b6289cb2b4fa98e3029efdef
-SHA1 (patch-ac) = ddc548f3252f4ddb13df5777518092721f03f594
-SHA1 (patch-ad) = 1b8f99cd823c20dd134aedf6914f00019e3bda76
diff --git a/devel/libextractor/patches/patch-ac b/devel/libextractor/patches/patch-ac
deleted file mode 100644
index 4eabe88f99c..00000000000
--- a/devel/libextractor/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2004/11/05 18:22:29 tv Exp $
-
---- src/plugins/Makefile.in.orig	2004-10-23 14:35:51.000000000 -0400
-+++ src/plugins/Makefile.in
-@@ -290,7 +290,7 @@ LIBINTL = @LIBINTL@
- LIBLTDL = @LIBLTDL@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
--LIBTOOL = @LIBTOOL@
-+LIBTOOL = shlibtool
- LN_S = @LN_S@
- LTDLINCL = @LTDLINCL@
- LTLIBICONV = @LTLIBICONV@
diff --git a/devel/libextractor/patches/patch-ad b/devel/libextractor/patches/patch-ad
deleted file mode 100644
index 280f24cf2bc..00000000000
--- a/devel/libextractor/patches/patch-ad
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2005/01/27 12:27:47 drochner Exp $
-
---- src/plugins/pdf/XRef.cc.orig	2004-10-05 22:19:23.000000000 +0200
-+++ src/plugins/pdf/XRef.cc
-@@ -757,6 +757,9 @@ GBool XRef::checkEncrypted(GString *owne
- 	} else {
- 	  keyLength = 5;
- 	}
-+	if (keyLength > 16) {
-+	  keyLength = 16;
-+	}
- 	permFlags = permissions.getInt();
- 	if (encVersion >= 1 && encVersion <= 2 &&
- 	    encRevision >= 2 && encRevision <= 3) {