pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/devel/libextractor Changes 0.5.10:
details: https://anonhg.NetBSD.org/pkgsrc/rev/ea6456890a60
branches: trunk
changeset: 509195:ea6456890a60
user: adam <adam%pkgsrc.org@localhost>
date: Sun Mar 05 22:06:38 2006 +0000
description:
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
diffstat:
devel/libextractor/Makefile | 9 +--
devel/libextractor/PLIST | 4 +-
devel/libextractor/buildlink3.mk | 4 +-
devel/libextractor/distinfo | 16 ++----
devel/libextractor/patches/patch-aa | 14 ------
devel/libextractor/patches/patch-ab | 6 +-
devel/libextractor/patches/patch-ac | 10 ++--
devel/libextractor/patches/patch-ad | 77 -------------------------------------
devel/libextractor/patches/patch-ae | 24 -----------
devel/libextractor/patches/patch-af | 13 ------
10 files changed, 23 insertions(+), 154 deletions(-)
diffs (271 lines):
diff -r c28b8c27dbeb -r ea6456890a60 devel/libextractor/Makefile
--- a/devel/libextractor/Makefile Sun Mar 05 21:41:57 2006 +0000
+++ b/devel/libextractor/Makefile Sun Mar 05 22:06:38 2006 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2006/02/05 23:08:44 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2006/03/05 22:06:38 adam Exp $
-DISTNAME= libextractor-0.5.3
-PKGREVISION= 3
+DISTNAME= libextractor-0.5.10
CATEGORIES= devel
MASTER_SITES= http://gnunet.org/libextractor/download/
@@ -18,14 +17,14 @@
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 -r c28b8c27dbeb -r ea6456890a60 devel/libextractor/PLIST
--- a/devel/libextractor/PLIST Sun Mar 05 21:41:57 2006 +0000
+++ b/devel/libextractor/PLIST Sun Mar 05 22:06:38 2006 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2005/08/08 09:44:39 adam Exp $
+@comment $NetBSD: PLIST,v 1.4 2006/03/05 22:06:38 adam Exp $
bin/extract
include/extractor.h
lib/libextractor.la
@@ -32,6 +32,7 @@
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 @@
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 -r c28b8c27dbeb -r ea6456890a60 devel/libextractor/buildlink3.mk
--- a/devel/libextractor/buildlink3.mk Sun Mar 05 21:41:57 2006 +0000
+++ b/devel/libextractor/buildlink3.mk Sun Mar 05 22:06:38 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:08:44 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/03/05 22:06:38 adam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBEXTRACTOR_BUILDLINK3_MK:= ${LIBEXTRACTOR_BUILDLINK3_MK}+
@@ -16,4 +16,4 @@
BUILDLINK_PKGSRCDIR.libextractor?= ../../devel/libextractor
.endif # LIBEXTRACTOR_BUILDLINK3_MK
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff -r c28b8c27dbeb -r ea6456890a60 devel/libextractor/distinfo
--- a/devel/libextractor/distinfo Sun Mar 05 21:41:57 2006 +0000
+++ b/devel/libextractor/distinfo Sun Mar 05 22:06:38 2006 +0000
@@ -1,11 +1,7 @@
-$NetBSD: distinfo,v 1.9 2006/01/23 16:14:25 joerg Exp $
+$NetBSD: distinfo,v 1.10 2006/03/05 22:06:38 adam 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 (patch-af) = bfc2bab989e2d96d7bc3db20553584d7d3960b41
+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-ab) = f8f12217898b1c8f68f7f2280f59b7dcabdfb9d2
+SHA1 (patch-ac) = 0eec20698da281f26ed6077fefb0f49d4e5e3cdf
diff -r c28b8c27dbeb -r ea6456890a60 devel/libextractor/patches/patch-aa
--- a/devel/libextractor/patches/patch-aa Sun Mar 05 21:41:57 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/11/05 18:22:29 tv 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
-
-+#ifndef OF
-+#define OF(x) x
-+#endif
-
- #define ZLIB_FILEFUNC_SEEK_CUR (1)
- #define ZLIB_FILEFUNC_SEEK_END (2)
diff -r c28b8c27dbeb -r ea6456890a60 devel/libextractor/patches/patch-ab
--- a/devel/libextractor/patches/patch-ab Sun Mar 05 21:41:57 2006 +0000
+++ b/devel/libextractor/patches/patch-ab Sun Mar 05 22:06:38 2006 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2005/08/08 09:44:39 adam Exp $
+$NetBSD: patch-ab,v 1.3 2006/03/05 22:06:38 adam 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 -r c28b8c27dbeb -r ea6456890a60 devel/libextractor/patches/patch-ac
--- a/devel/libextractor/patches/patch-ac Sun Mar 05 21:41:57 2006 +0000
+++ b/devel/libextractor/patches/patch-ac Sun Mar 05 22:06:38 2006 +0000
@@ -1,12 +1,12 @@
-$NetBSD: patch-ac,v 1.3 2005/08/08 09:45:16 adam Exp $
+$NetBSD: patch-ac,v 1.4 2006/03/05 22:06:38 adam 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 -r c28b8c27dbeb -r ea6456890a60 devel/libextractor/patches/patch-ad
--- a/devel/libextractor/patches/patch-ad Sun Mar 05 21:41:57 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r c28b8c27dbeb -r ea6456890a60 devel/libextractor/patches/patch-ae
--- a/devel/libextractor/patches/patch-ae Sun Mar 05 21:41:57 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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;
- };
-
- //------------------------------------------------------------------------
diff -r c28b8c27dbeb -r ea6456890a60 devel/libextractor/patches/patch-af
--- a/devel/libextractor/patches/patch-af Sun Mar 05 21:41:57 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.1 2006/01/23 16:14:25 joerg Exp $
-
---- src/plugins/Makefile.in.orig 2006-01-03 10:16:08.000000000 +0000
-+++ src/plugins/Makefile.in
-@@ -610,7 +610,7 @@ libextractor_deb_la_SOURCES = \
-
- libextractor_deb_la_LDFLAGS = \
- $(top_builddir)/src/main/libextractor.la \
-- $(PLUGINFLAGS) -lz -lpthread
-+ $(PLUGINFLAGS) -lz ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
-
- libextractor_riff_la_SOURCES = \
- riffextractor.c
Home |
Main Index |
Thread Index |
Old Index