Update to 0.4.3:

	- Fix selection crasher (Nickolay V. Shmyrev, #4402).
	- Fix printing problem for single page output (#4555).
	- Fix miscellaneous compile problems/warnings.
	- CVE-2005-3191 and CAN-2005-2097 security fixes.

7 files changed, 13 insertions, 149 deletions

diff --git a/print/poppler-qt/Makefile b/print/poppler-qt/Makefile
index f6a41e9bcf8..659f10e931b 100644
--- a/print/poppler-qt/Makefile
+++ b/print/poppler-qt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/12/11 10:07:31 markd Exp $
+# $NetBSD: Makefile,v 1.2 2005/12/31 00:35:56 wiz Exp $
 #
 
 DISTNAME=		poppler-${POPPLER_VERS}
@@ -15,7 +15,7 @@ USE_LIBTOOL=		yes
 PKGCONFIG_OVERRIDE+=	${WRKSRC}/poppler-qt.pc.in
 
 INCS=-I. `pkg-config poppler --cflags` -I${QTDIR}/include
-POPPLER_VERS=0.4.2
+POPPLER_VERS=0.4.3
 
 do-build:
 	(cd ${WRKSRC}/qt; \
diff --git a/print/poppler-qt/distinfo b/print/poppler-qt/distinfo
index b44ca2853de..62cf4793c32 100644
--- a/print/poppler-qt/distinfo
+++ b/print/poppler-qt/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/12/11 10:07:31 markd Exp $
+$NetBSD: distinfo,v 1.2 2005/12/31 00:35:56 wiz Exp $
 
-SHA1 (poppler-0.4.2.tar.gz) = fa1dec65f0df87f9348441563593915344caf9be
-RMD160 (poppler-0.4.2.tar.gz) = e81a8d900c4f3ca51b09ebec8f0ca62b0165d3a3
-Size (poppler-0.4.2.tar.gz) = 777935 bytes
+SHA1 (poppler-0.4.3.tar.gz) = 1817e811e49fa58facc0df2c76a25e0876e44377
+RMD160 (poppler-0.4.3.tar.gz) = 4c6b0d5e70d55655fb65bdd26621bb11720543cb
+Size (poppler-0.4.3.tar.gz) = 779582 bytes
diff --git a/print/poppler/Makefile b/print/poppler/Makefile
index 3d79af9bf7e..04b3b0e2692 100644
--- a/print/poppler/Makefile
+++ b/print/poppler/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2005/12/11 05:08:50 salo Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/31 00:35:55 wiz Exp $
 #
 
-DISTNAME=		poppler-0.4.2
-PKGREVISION=		2
+DISTNAME=		poppler-0.4.3
 CATEGORIES=		print
 MASTER_SITES=		http://poppler.freedesktop.org/
 
@@ -21,7 +20,7 @@ GNU_CONFIGURE=		yes
 
 INSTALLATION_DIRS+=	share/doc/poppler
 
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 # TODO: Later add an option to choose Splash versus Cairo backend.
 ## Don't build the Splash graphics backend.
 #CONFIGURE_ARGS+=	--disable-splash-output
diff --git a/print/poppler/distinfo b/print/poppler/distinfo
index 44a886c4476..2f9bf0c96f2 100644
--- a/print/poppler/distinfo
+++ b/print/poppler/distinfo
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.3 2005/12/11 05:08:50 salo Exp $
+$NetBSD: distinfo,v 1.4 2005/12/31 00:35:55 wiz Exp $
 
-SHA1 (poppler-0.4.2.tar.gz) = fa1dec65f0df87f9348441563593915344caf9be
-RMD160 (poppler-0.4.2.tar.gz) = e81a8d900c4f3ca51b09ebec8f0ca62b0165d3a3
-Size (poppler-0.4.2.tar.gz) = 777935 bytes
-SHA1 (patch-aa) = f6e79539b4b2c9edf5579fcca1a1a63808be2e1a
-SHA1 (patch-ab) = 2199d1770eed24818924823ddc53a463ebceee9a
-SHA1 (patch-ac) = 202615a7be0dc9c8f9e47c75ed878e68e0cbae36
+SHA1 (poppler-0.4.3.tar.gz) = 1817e811e49fa58facc0df2c76a25e0876e44377
+RMD160 (poppler-0.4.3.tar.gz) = 4c6b0d5e70d55655fb65bdd26621bb11720543cb
+Size (poppler-0.4.3.tar.gz) = 779582 bytes
diff --git a/print/poppler/patches/patch-aa b/print/poppler/patches/patch-aa
deleted file mode 100644
index b22536acc49..00000000000
--- a/print/poppler/patches/patch-aa
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2005/12/11 05:08:50 salo Exp $
-
-Security fix for CVE-2005-3193.
-
---- poppler/JPXStream.cc.orig	2005-03-03 20:46:03.000000000 +0100
-+++ poppler/JPXStream.cc	2005-12-11 05:58:51.000000000 +0100
-@@ -666,7 +666,7 @@
-   int segType;
-   GBool haveSIZ, haveCOD, haveQCD, haveSOT;
-   Guint precinctSize, style;
--  Guint segLen, capabilities, comp, i, j, r;
-+  Guint segLen, capabilities, nTiles, comp, i, j, r;
- 
-   //----- main header
-   haveSIZ = haveCOD = haveQCD = haveSOT = gFalse;
-@@ -701,8 +701,13 @@
- 	            / img.xTileSize;
-       img.nYTiles = (img.ySize - img.yTileOffset + img.yTileSize - 1)
- 	            / img.yTileSize;
--      img.tiles = (JPXTile *)gmalloc(img.nXTiles * img.nYTiles *
--				     sizeof(JPXTile));
-+      nTiles = img.nXTiles * img.nYTiles;
-+      // check for overflow before allocating memory
-+      if (nTiles == 0 || nTiles / img.nXTiles != img.nYTiles) {
-+        error(getPos(), "Bad tile count in JPX SIZ marker segment");
-+        return gFalse;
-+      }
-+      img.tiles = (JPXTile *)gmalloc(nTiles * sizeof(JPXTile));
-       for (i = 0; i < img.nXTiles * img.nYTiles; ++i) {
- 	img.tiles[i].tileComps = (JPXTileComp *)gmalloc(img.nComps *
- 							sizeof(JPXTileComp));
diff --git a/print/poppler/patches/patch-ab b/print/poppler/patches/patch-ab
deleted file mode 100644
index 57c4c116bba..00000000000
--- a/print/poppler/patches/patch-ab
+++ /dev/null
@@ -1,78 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2005/12/11 05:08:50 salo Exp $
-
-Security fix for CVE-2005-3191 and CVE-2005-3192.
-
---- poppler/Stream.cc.orig	2005-04-27 22:56:18.000000000 +0200
-+++ poppler/Stream.cc	2005-12-11 05:51:36.000000000 +0100
-@@ -415,18 +415,33 @@ 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() {
-@@ -1020,6 +1035,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;
-   }
-@@ -2907,6 +2926,14 @@ GBool DCTStream::readBaselineSOF() {
-   height = read16();
-   width = read16();
-   numComps = str->getChar();
-+  if (numComps <= 0 || numComps > 4) {
-+    error(getPos(), "Bad number of components in DCT stream", prec);
-+    return gFalse;
-+  }
-+  if (numComps <= 0 || numComps > 4) {
-+    error(getPos(), "Bad number of components in DCT stream", prec);
-+    return gFalse;
-+  }
-   if (prec != 8) {
-     error(getPos(), "Bad DCT precision %d", prec);
-     return gFalse;
-@@ -3268,6 +3295,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/print/poppler/patches/patch-ac b/print/poppler/patches/patch-ac
deleted file mode 100644
index e09dba96cfa..00000000000
--- a/print/poppler/patches/patch-ac
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2005/12/11 05:08:50 salo Exp $
-
-Security fix for CVE-2005-3192.
-
---- poppler/Stream.h.orig	2005-04-27 22:56:18.000000000 +0200
-+++ poppler/Stream.h	2005-12-11 05:51:36.000000000 +0100
-@@ -231,6 +231,8 @@ public:
- 
-   ~StreamPredictor();
- 
-+  GBool isOk() { return ok; }
-+
-   int lookChar();
-   int getChar();
- 
-@@ -248,6 +250,7 @@ private:
-   int rowBytes;			// bytes per line
-   Guchar *predLine;		// line buffer
-   int predIdx;			// current index in predLine
-+  GBool ok;
- };
- 
- //------------------------------------------------------------------------